Hello community, here is the log from the commit of package resource-agents for openSUSE:Factory checked in at 2014-02-28 17:46:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-01-31 09:44:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.resource-agents.new/resource-agents.changes 2014-02-28 17:46:33.000000000 +0100 @@ -1,0 +2,39 @@ +Thu Feb 27 16:32:21 UTC 2014 - [email protected] + +- ldirectord: Add systemd unit file (bnc#863250) +- ldirectord: fix the list output to include ops flag (bnc#847005) +- VirtualDomain: Fixes parsing domain name from xml file +- nfsclient.sh: Add 'sec=' as a valid exports option +- CTDB: Detect default persistent database directory +- CTDB: Ensure logfile directory exists so CTDB can start +- VirtualDomain: Attempt to determine vm status even when libvirt + is unavailable +- apache.sh: Add ability to set custom httpd binary +- findif: Update default value for best_netmask +- VirtualDomain: avoid running "virsh uri" if hypervisor is set +- VirtualDomain: check process table for qemu-system-* too +- mysql: handle %secs_behind = NULL +- logging: Fix syntax errors with logging functions in LVM and + asterisk agents +- upstream cs: 935b92fd + +- added patches: + * 0001-Low-ldirectord-fix-the-list-output-to-include-ops-fl.patch + * 0001-ldirectord-Add-systemd-unit-file-bnc-863250.patch +------------------------------------------------------------------- +Tue Feb 25 17:10:16 UTC 2014 - [email protected] + +- oracle: Require monitoring user as parameter (bnc#850589, bnc#859683) + +- added patches: + * 0001-High-oracle-Require-monitoring-user-as-parameter-bnc.patch +- removed patches: + * 0003-Medium-oracle-Create-profile-for-OCFMON-user-bnc-850.patch + * 0004-High-oracle-Make-monitoring-user-configurable-bnc-85.patch + +------------------------------------------------------------------- +Mon Feb 24 03:33:46 UTC 2014 - [email protected] + +-Fate#312345-add fix-sg_persist-for-code-normalization.patch + +------------------------------------------------------------------- @@ -52 +91 @@ -- Add resource-agents-new-sg_persist.patch: RA for persistent +- Fate#312345-Add resource-agents-new-sg_persist.patch: RA for persistent Old: ---- 0003-Medium-oracle-Create-profile-for-OCFMON-user-bnc-850.patch 0004-High-oracle-Make-monitoring-user-configurable-bnc-85.patch resource-agents-3.9.5.tar.xz New: ---- 0001-High-oracle-Require-monitoring-user-as-parameter-bnc.patch 0001-Low-ldirectord-fix-the-list-output-to-include-ops-fl.patch 0001-ldirectord-Add-systemd-unit-file-bnc-863250.patch fix-sg_persist-for-code-normalization.patch resource-agents-3.9.5+git335.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resource-agents.spec ++++++ --- /var/tmp/diff_new_pack.n4sd1I/_old 2014-02-28 17:46:34.000000000 +0100 +++ /var/tmp/diff_new_pack.n4sd1I/_new 2014-02-28 17:46:34.000000000 +0100 @@ -40,7 +40,7 @@ Summary: Open Source HA Reusable Cluster Resource Scripts License: GPL-2.0 and LGPL-2.1+ Group: Productivity/Clustering/HA -Version: 3.9.5 +Version: 3.9.5+git335 Release: 0 Url: http://linux-ha.org/ Source: resource-agents-%{version}.tar.xz @@ -55,12 +55,16 @@ Patch4: no-var-lock-subsys.patch # PATCH-FEATURE-OPENSUSE: add sg_persist RA, [email protected] Patch5: resource-agents-new-sg_persist.patch -# PATCH-FIX-UPSTREAM: oracle: Create profile for OCFMON user (bnc#850589), [email protected] -Patch6: 0003-Medium-oracle-Create-profile-for-OCFMON-user-bnc-850.patch -# PATCH-FIX-UPSTREAM: oracle: Make monitoring user configurable (bnc#859683), [email protected] -Patch7: 0004-High-oracle-Make-monitoring-user-configurable-bnc-85.patch # PATCH-FIX-OPENSUSE: Revert moving binaries to /usr/libexec Patch8: 0006-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch +# PATCH-FIX-OPENSUSE: fix sg_persist for code normalization +Patch10: fix-sg_persist-for-code-normalization.patch +# PATCH-FIX-UPSTREAM: Require monitoring user as parameter (bnc#850589, bnc#859683), [email protected] +Patch12: 0001-High-oracle-Require-monitoring-user-as-parameter-bnc.patch +# PATCH-FIX-UPSTREAM: ldirectord: Fix the list output to include ops flag (bnc#847005) +Patch13: 0001-Low-ldirectord-fix-the-list-output-to-include-ops-fl.patch +# PATCH-FEATURE-UPSTREAM: ldirectord: Add systemd unit file (bnc#863250) +Patch14: 0001-ldirectord-Add-systemd-unit-file-bnc-863250.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: heartbeat-resources @@ -112,6 +116,10 @@ Requires(post): /sbin/chkconfig Requires(preun):/sbin/chkconfig %endif +%if %{defined systemd_requires} +BuildRequires: systemd +%{?systemd_requires} +%endif %description -n ldirectord The Linux Director Daemon (ldirectord) was written by Jacob Rief. @@ -132,17 +140,26 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 %patch8 -p1 +%patch10 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 ########################################################### %build CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" export CFLAGS +%if %{defined _unitdir} +CONF_OPTS="--with-ras-set=linux-ha \ + --enable-fatal-warnings=yes \ + --with-systemdsystemunitdir=%{_unitdir} \ + --with-pkg-name=%{name}" +%else CONF_OPTS="--with-ras-set=linux-ha \ --enable-fatal-warnings=yes \ - --with-package-name=%{name}" + --with-pkg-name=%{name}" +%endif ./autogen.sh #because quilt push changed the permissions of sg_persist. chmod 775 heartbeat/sg_persist @@ -167,7 +184,11 @@ test -d $RPM_BUILD_ROOT/sbin || mkdir $RPM_BUILD_ROOT/sbin ( cd $RPM_BUILD_ROOT/sbin +%if %{defined _unitdir} + ln -s /usr/sbin/service rcldirectord +%else ln -sf /etc/init.d/ldirectord rcldirectord +%endif ) || true # Dont package static libs or compiled python find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f @@ -205,11 +226,26 @@ %if 0%{?suse_version} %preun -n ldirectord +%if %{defined _unitdir} +%service_del_preun ldirectord.service +%else %stop_on_removal ldirectord +%endif %postun -n ldirectord +%if %{defined _unitdir} +%service_del_postun ldirectord.service +%else %insserv_cleanup %endif + +%post -n ldirectord +%if %{defined _unitdir} +%service_add_post ldirectord.service +%endif + +%endif + %if 0%{?fedora} %preun -n ldirectord @@ -219,6 +255,7 @@ %post -n ldirectord /sbin/chkconfig --add ldirectord + %endif %files @@ -273,8 +310,13 @@ #%doc %{_mandir}/man8/supervise-ldirectord-config.8* %{_sbindir}/ldirectord /sbin/rcldirectord -#%{_sbindir}/supervise-ldirectord-config +%if %{defined _unitdir} +%{_unitdir}/ldirectord.service +%exclude %{_sysconfdir}/init.d/ldirectord +%else %{_sysconfdir}/init.d/ldirectord +%endif +#%{_sbindir}/supervise-ldirectord-config %{_sysconfdir}/ha.d/resource.d/ldirectord %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord ++++++ 0001-High-oracle-Require-monitoring-user-as-parameter-bnc.patch ++++++ >From 577f0bd94f55a62a4d1070cea69c9667f81867a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <[email protected]> Date: Thu, 5 Dec 2013 13:15:47 +0100 Subject: [PATCH] High: oracle: Require monitoring user as parameter (bnc#859683) Remove the automatic creation of a monitoring user. Require it to be created by the database administrator and supplied as the monuser parameter. The monpassword parameter is optional and defaults to the same value as monuser. --- heartbeat/oracle | 52 +++++++++++++++++++++++++++++++++++----------------- tools/ocft/oracle | 1 + 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/heartbeat/oracle b/heartbeat/oracle index d6b2c50244a9..8e10aad15f9a 100755 --- a/heartbeat/oracle +++ b/heartbeat/oracle @@ -27,6 +27,8 @@ # OCF_RESKEY_ipcrm (optional; defaults to "instance") # OCF_RESKEY_clear_backupmode (optional; default to "false") # OCF_RESKEY_shutdown_method (optional; default to "checkpoint/abort") +# OCF_RESKEY_monuser +# OCF_RESKEY_monpassword (optional; default to same as monuser) # # Initialization: @@ -100,6 +102,27 @@ If this does not work for you, just set it explicitely. <content type="string" default="" /> </parameter> +<parameter name="monuser" unique="0" required="1"> +<longdesc lang="en"> +Monitoring user name. Every connection as +sysdba is logged in an audit log. This can +result in a large number of new files created. +Make sure that the password for this user does +not expire. +</longdesc> +<shortdesc lang="en">monuser</shortdesc> +<content type="string" default="OCFMON" /> +</parameter> + +<parameter name="monpassword" unique="0"> +<longdesc lang="en"> +Password for the monitoring user. Make sure +that the password for this user does not expire. +</longdesc> +<shortdesc lang="en">monpassword</shortdesc> +<content type="string" default="OCFMON" /> +</parameter> + <parameter name="ipcrm" unique="0"> <longdesc lang="en"> Sometimes IPC objects (shared memory segments and semaphores) @@ -250,7 +273,7 @@ dbasql() { runsql "connect / as sysdba" $* } monsql() { - runsql "connect $MONUSR/$MONUSR" $* + runsql "connect $MONUSR/\"$MONPWD\"" $* } # use dbasql_one if the query should result in a single line output # at times people stuff commands in oracle .profile @@ -328,22 +351,13 @@ getipc() { show_mon_user() { echo "select USERNAME, ACCOUNT_STATUS from dba_users where USERNAME='$MONUSR';" } -mk_mon_user() { - cat<<EOF -create user $MONUSR identified by $MONUSR; -grant create session to $MONUSR; -grant select on v_\$instance to $MONUSR; -EOF -} check_mon_user() { local output - dbasql show_mon_user | grep -w "^$MONUSR" >/dev/null && - return 0 - output=`dbasql mk_mon_user show_mon_user` - if echo "$output" | grep -w "^$MONUSR" >/dev/null; then + output=`dbasql show_mon_user` + if echo "$output" | grep -iw "^$MONUSR" >/dev/null; then return 0 else - ocf_log err "could not create $MONUSR oracle user" + ocf_log err "$MONUSR oracle user does not exist" ocf_log err "sqlplus output: $output" return 1 fi @@ -417,7 +431,7 @@ ipcdesc() { } rmipc() { local what=$1 id=$2 - ipcs -$what | filteroraipc | grep -w $id >/dev/null 2>&1 || + ipcs -$what | filteroraipc | grep -iw $id >/dev/null 2>&1 || return ocf_log info "Removing `ipcdesc $what` $id." ipcrm -$what $id @@ -541,7 +555,7 @@ oracle_start() { fi output=`dbasql dbopen` - # check/create the monitor user + # check the monitor user if ! check_mon_user; then return $OCF_ERR_GENERIC fi @@ -650,8 +664,12 @@ show_procs() { proc_pids() { show_procs | awk '{print $1}'; } PROCS_CLEANUP_TIME="30" -MONUSR="OCFMON" -OCF_REQUIRED_PARAMS="sid" +MONUSR=$(echo ${OCF_RESKEY_monuser} | awk '{print toupper($0)}') + +: ${OCF_RESKEY_monpassword=${MONUSR}} + +MONPWD="$OCF_RESKEY_monpassword" +OCF_REQUIRED_PARAMS="sid monuser" OCF_REQUIRED_BINARIES="sqlplus" ocf_rarun $* diff --git a/tools/ocft/oracle b/tools/ocft/oracle index 6f145c7d6db4..3da8015fe54a 100644 --- a/tools/ocft/oracle +++ b/tools/ocft/oracle @@ -20,6 +20,7 @@ CASE-BLOCK set_testenv CASE-BLOCK crm_setting Env OCF_RESKEY_sid=$OCFT_sid + Env OCF_RESKEY_monuser=OCFMON Env OCF_RESKEY_CRM_meta_timeout=30000 CASE-BLOCK default_status -- 1.8.4.5 ++++++ 0001-Low-ldirectord-fix-the-list-output-to-include-ops-fl.patch ++++++ >From 0d35d3a98be4931b7bf3fed1edf5cf657ce882fe Mon Sep 17 00:00:00 2001 From: Paul Zirnik <[email protected]> Date: Wed, 26 Feb 2014 12:12:21 +0100 Subject: [PATCH] Low: ldirectord: fix the list output to include ops flag (bnc#847005) --- ldirectord/ldirectord.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ldirectord/ldirectord.in b/ldirectord/ldirectord.in index b871509163fe..50e35e17e95c 100644 --- a/ldirectord/ldirectord.in +++ b/ldirectord/ldirectord.in @@ -700,6 +700,13 @@ The log format is: Default: no separate logging of service checks. +B<ops = >B<yes> | B<no> + +Specify that a virtual service uses one-packet scheduling. This option +can be used only for UDP services. If this option is specified, all connections +are created only to schedule one packet. Option is useful to schedule +UDP packets from same client port to different real servers. + =head1 IPv6 Directives for IPv6 are virtual6, real6, fallback6. @@ -1362,6 +1369,7 @@ sub read_config $vsrv{num_connects} = 0; $vsrv{httpmethod} = "GET"; $vsrv{secret} = ""; + $vsrv{ops} = "no"; push(@VIRTUAL, \%vsrv); while(<CFGFILE>) { $line++; @@ -1495,6 +1503,12 @@ sub read_config } else { &config_error($line, "invalid protocol"); } + } elsif ($rcmd =~ /^ops\s*=\s*(.*)/) { + if ($1 eq "yes" || $1 eq "no") { + $vsrv{ops} = $1; + } else { + &config_error($line, "ops must be 'yes' or 'no'"); + } } elsif ($rcmd =~ /^service\s*=\s*(.*)/) { $1 =~ /(\w+)/ && ($1 eq "dns" || $1 eq "ftp" || @@ -2237,6 +2251,9 @@ sub ld_setup $$v{proto} = "-f"; } $$v{flags} = "$$v{proto} " . &get_virtual_option($v) . " "; + if ($$v{protocol} eq "udp" && $$v{ops} eq "yes") { + $$v{flags} .= "-o "; + } $$v{flags} .= "-s $$v{scheduler} " if defined ($$v{scheduler}); if (defined $$v{persistent}) { $$v{flags} .= "-p $$v{persistent} "; -- 1.8.4.5 ++++++ 0001-ldirectord-Add-systemd-unit-file-bnc-863250.patch ++++++ >From bf45a3ad6e916a908e7a38368f8c8d5b13aa7123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <[email protected]> Date: Wed, 26 Feb 2014 13:55:00 +0100 Subject: [PATCH] ldirectord: Add systemd unit file (bnc#863250) Systemd unit file for the ldirectord service. --- configure.ac | 27 ++++++++++++++++++++++----- ldirectord/Makefile.am | 2 +- ldirectord/systemd/Makefile.am | 24 ++++++++++++++++++++++++ ldirectord/systemd/ldirectord.service.in | 11 +++++++++++ 4 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 ldirectord/systemd/Makefile.am create mode 100644 ldirectord/systemd/ldirectord.service.in diff --git a/configure.ac b/configure.ac index 84bef31931ba..b82c21adcc82 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,26 @@ AC_ARG_WITH(pkg-name, [ --with-pkg-name=name Override package name (if you're a packager needing to pretend) ], [ PACKAGE_NAME="$withval" ]) +AC_PATH_PROGS(PKGCONFIG, pkg-config) +if test x"${PKGCONFIG}" = x""; then + AC_MSG_ERROR(You need pkgconfig installed in order to build ${PACKAGE}) +fi + +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + dnl dnl AM_INIT_AUTOMAKE([1.11.1 foreign dist-bzip2 dist-xz]) dnl @@ -451,7 +471,6 @@ AC_PATH_PROGS(PING, ping, /bin/ping) AC_PATH_PROGS(IFCONFIG, ifconfig, /sbin/ifconfig) AC_PATH_PROGS(MAILCMD, mailx mail, mail) AC_PATH_PROGS(EGREP, egrep) -AC_PATH_PROGS(PKGCONFIG, pkg-config) AC_SUBST(MAILCMD) AC_SUBST(EGREP) @@ -487,10 +506,6 @@ dnl =============================================== AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(gnugetopt, getopt_long) dnl if available -if test x"${PKGCONFIG}" = x""; then - AC_MSG_ERROR(You need pkgconfig installed in order to build ${PACKAGE}) -fi - if test "x${enable_thread_safe}" = "xyes"; then GPKGNAME="gthread-2.0" else @@ -861,6 +876,8 @@ ldirectord/ldirectord \ ldirectord/init.d/ldirectord \ ldirectord/init.d/ldirectord.debian \ ldirectord/init.d/ldirectord.debian.default \ + ldirectord/systemd/Makefile \ + ldirectord/systemd/ldirectord.service \ ldirectord/logrotate.d/Makefile \ ldirectord/OCF/Makefile \ ldirectord/OCF/ldirectord \ diff --git a/ldirectord/Makefile.am b/ldirectord/Makefile.am index 71461f9a6231..5641e0786860 100644 --- a/ldirectord/Makefile.am +++ b/ldirectord/Makefile.am @@ -22,7 +22,7 @@ CLEANFILES = ldirectord.8 EXTRA_DIST = ldirectord ldirectord.cf -SUBDIRS = logrotate.d init.d OCF +SUBDIRS = logrotate.d init.d OCF systemd ldirectord.8: ldirectord $(POD2MAN) --section=8 $< > $@ diff --git a/ldirectord/systemd/Makefile.am b/ldirectord/systemd/Makefile.am new file mode 100644 index 000000000000..d349184901c2 --- /dev/null +++ b/ldirectord/systemd/Makefile.am @@ -0,0 +1,24 @@ +# +# ldirectord: Linux-HA heartbeat code +# +# Copyright (C) 2001 Michael Moerz +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +MAINTAINERCLEANFILES = Makefile.in + +if HAVE_SYSTEMD +systemdsystemunit_DATA = ldirectord.service +endif diff --git a/ldirectord/systemd/ldirectord.service.in b/ldirectord/systemd/ldirectord.service.in new file mode 100644 index 000000000000..b0c9b8d9036c --- /dev/null +++ b/ldirectord/systemd/ldirectord.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=Monitor and administer real servers in a LVS cluster of load balanced virtual servers + +[Service] +ExecStart=@sbindir@/ldirectord start +ExecStartPost=touch /var/lock/subsys/ldirectord +ExecStop=@sbindir@/ldirectord stop +ExecStopPost=rm -f /var/lock/subsys/ldirectord +ExecReload=@sbindir@/ldirectord reload +PIDFile=/var/run/ldirectord.ldirectord.pid +Type=forking -- 1.8.4.5 ++++++ fix-sg_persist-for-code-normalization.patch ++++++ ++++ 1001 lines (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
