commit resource-agents for openSUSE:Factory
Hello community, here is the log from the commit of package resource-agents for openSUSE:Factory checked in at 2016-05-04 08:17:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/resource-agents (Old) and /work/SRC/openSUSE:Factory/.resource-agents.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "resource-agents" Changes: -------- --- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes 2016-03-26 15:20:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.resource-agents.new/resource-agents.changes 2016-05-04 08:17:26.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Apr 26 15:24:19 UTC 2016 - kgronlund@suse.com + +- Update to version 3.9.7+git.1461679689.18a78f5: + + Medium: symlink: Handle missing directories in target (bsc#973054) + + oracle: "shutdown immediate;" is needed after cleanup to be able to recover from the ORA-01081 error + + oracle: inform user that monprofile must start with C## for container databases + + tickle_tcp: Fix "Failed to open raw socket (Invalid argument)" issue + +------------------------------------------------------------------- Old: ---- resource-agents-3.9.7+git.1458512170.48350a9.tar.xz New: ---- resource-agents-3.9.7+git.1461679689.18a78f5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resource-agents.spec ++++++ --- /var/tmp/diff_new_pack.080mjK/_old 2016-05-04 08:17:27.000000000 +0200 +++ /var/tmp/diff_new_pack.080mjK/_new 2016-05-04 08:17:27.000000000 +0200 @@ -48,7 +48,7 @@ Summary: Open Source HA Reusable Cluster Resource Scripts License: GPL-2.0 and LGPL-2.1+ and GPL-3.0+ Group: Productivity/Clustering/HA -Version: 3.9.7+git.1458512170.48350a9 +Version: 3.9.7+git.1461679689.18a78f5 Release: 0 Url: http://linux-ha.org/ Source: resource-agents-%{version}.tar.xz ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.080mjK/_old 2016-05-04 08:17:27.000000000 +0200 +++ /var/tmp/diff_new_pack.080mjK/_new 2016-05-04 08:17:27.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/resource-agents.git</param> - <param name="changesrevision">48350a981b242dd91e27bb1b49a887e3e6cb0440</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">18a78f523b8ad57d4926dee45df778e623da990e</param></service></servicedata> \ No newline at end of file ++++++ resource-agents-3.9.7+git.1458512170.48350a9.tar.xz -> resource-agents-3.9.7+git.1461679689.18a78f5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-3.9.7+git.1458512170.48350a9/heartbeat/ocf-directories.in new/resource-agents-3.9.7+git.1461679689.18a78f5/heartbeat/ocf-directories.in --- old/resource-agents-3.9.7+git.1458512170.48350a9/heartbeat/ocf-directories.in 2016-03-21 10:02:59.000000000 +0100 +++ new/resource-agents-3.9.7+git.1461679689.18a78f5/heartbeat/ocf-directories.in 2016-04-26 17:24:19.000000000 +0200 @@ -18,5 +18,5 @@ : ${HA_RESOURCEDIR:=$HA_DIR/resource.d} : ${HA_DOCDIR:=@datadir@/doc/heartbeat} : ${__SCRIPT_NAME:=`basename $0`} -: ${HA_VARRUN:=@localstatedir@/run/} -: ${HA_VARLOCK:=@localstatedir@/lock/subsys/} +: ${HA_VARRUN:=@localstatedir@/run} +: ${HA_VARLOCK:=@localstatedir@/lock/subsys} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-3.9.7+git.1458512170.48350a9/heartbeat/oracle new/resource-agents-3.9.7+git.1461679689.18a78f5/heartbeat/oracle --- old/resource-agents-3.9.7+git.1458512170.48350a9/heartbeat/oracle 2016-03-21 10:02:59.000000000 +0100 +++ new/resource-agents-3.9.7+git.1461679689.18a78f5/heartbeat/oracle 2016-04-26 17:24:19.000000000 +0200 @@ -402,6 +402,9 @@ output=`dbasql mk_mon_profile show_mon_profile` if echo "$output" | grep -iw "^$MONPROFILE" >/dev/null; then return 0 + elif echo "$output" | grep ORA-65140 >/dev/null 2>&1; then + ocf_exit_reason "monprofile must start with C## for container databases" + return $OCF_ERR_CONFIGURED else ocf_exit_reason "could not create $MONPROFILE oracle profile" ocf_log err "sqlplus output: $output" @@ -611,6 +614,7 @@ if echo "$output" | grep ORA-01081 >/dev/null 2>&1; then ocf_log info "ORA-01081 error found, trying to cleanup oracle (dbstart_mount output: $output)" ora_cleanup + output=`dbasql dbstop_immediate` output=`dbasql dbstart_mount` fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-3.9.7+git.1458512170.48350a9/heartbeat/shellfuncs.in new/resource-agents-3.9.7+git.1461679689.18a78f5/heartbeat/shellfuncs.in --- old/resource-agents-3.9.7+git.1458512170.48350a9/heartbeat/shellfuncs.in 2016-03-21 10:02:59.000000000 +0100 +++ new/resource-agents-3.9.7+git.1461679689.18a78f5/heartbeat/shellfuncs.in 2016-04-26 17:24:19.000000000 +0200 @@ -78,7 +78,7 @@ fi if - [ -f $HA_VARLOCK/var/lock/subsys/${base}.pid ] + [ -f $HA_VARLOCK/${base}.pid ] then echo "${base} dead but lock file exists" return 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-3.9.7+git.1458512170.48350a9/heartbeat/symlink new/resource-agents-3.9.7+git.1461679689.18a78f5/heartbeat/symlink --- old/resource-agents-3.9.7+git.1458512170.48350a9/heartbeat/symlink 2016-03-21 10:02:59.000000000 +0100 +++ new/resource-agents-3.9.7+git.1461679689.18a78f5/heartbeat/symlink 2016-04-26 17:24:19.000000000 +0200 @@ -123,7 +123,7 @@ ocf_log debug "$OCF_RESKEY_link exists but is not a symbolic link, will be moved to ${OCF_RESKEY_link}${OCF_RESKEY_backup_suffix} on start" rc=$OCF_NOT_RUNNING fi - elif readlink -f "$OCF_RESKEY_link" | egrep -q "^${OCF_RESKEY_target}$"; then + elif readlink -m "$OCF_RESKEY_link" | egrep -q "^${OCF_RESKEY_target}$"; then ocf_log debug "$OCF_RESKEY_link exists and is a symbolic link to ${OCF_RESKEY_target}." rc=$OCF_SUCCESS else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-3.9.7+git.1458512170.48350a9/tools/tickle_tcp.c new/resource-agents-3.9.7+git.1461679689.18a78f5/tools/tickle_tcp.c --- old/resource-agents-3.9.7+git.1458512170.48350a9/tools/tickle_tcp.c 2016-03-21 10:02:59.000000000 +0100 +++ new/resource-agents-3.9.7+git.1461679689.18a78f5/tools/tickle_tcp.c 2016-04-26 17:24:19.000000000 +0200 @@ -245,7 +245,7 @@ ip4pkt.tcp.window = htons(1234); ip4pkt.tcp.check = tcp_checksum((uint16_t *)&ip4pkt.tcp, sizeof(ip4pkt.tcp), &ip4pkt.ip); - s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW)); + s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); if (s == -1) { fprintf(stderr, "Failed to open raw socket (%s)\n", strerror(errno)); return -1;
participants (1)
-
root@hilbert.suse.de