Hello community, here is the log from the commit of package resource-agents for openSUSE:Factory checked in at 2014-07-24 06:58:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-10 14:55:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.resource-agents.new/resource-agents.changes 2014-07-24 06:58:40.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 21 15:41:32 UTC 2014 - [email protected] + +- Revised fix for apache RA on SUSE distributions (bnc#884674) +- Add apache-fix-bnc884674.patch + +------------------------------------------------------------------- New: ---- apache-fix-bnc884674.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resource-agents.spec ++++++ --- /var/tmp/diff_new_pack.8mEgLM/_old 2014-07-24 06:58:42.000000000 +0200 +++ /var/tmp/diff_new_pack.8mEgLM/_new 2014-07-24 06:58:42.000000000 +0200 @@ -77,6 +77,8 @@ Patch21: xen-replace-xm-with-xl.patch # PATCH-FIX-OPENSUSE: VirtualDomain: Try xen-list if no emulator is set (bnc#885292) Patch22: 0001-Medium-VirtualDomain-Try-xen-list-if-no-emulator-is-.patch +# PATCH-FIX-UPSTREAM: Revised fix for apache RA on SUSE distributions (bnc#884674) +Patch23: apache-fix-bnc884674.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: heartbeat-resources @@ -162,6 +164,7 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 ########################################################### %build ++++++ apache-fix-bnc884674.patch ++++++ commit 79c2ac579232bddd16595bec054823ba7ed575af Author: Kristoffer Grönlund <[email protected]> Date: Mon Jul 21 11:21:53 2014 +0200 Medium: apache: Revised fix for init script reference on SUSE (bnc#884674) Previous fix for this issue was incorrect, the failed -e test caused the function to return 1. This inversed test will return 0 if the configtest is skipped. diff --git a/heartbeat/apache b/heartbeat/apache index 66efca4e984b..1e573375da69 100755 --- a/heartbeat/apache +++ b/heartbeat/apache @@ -157,17 +157,20 @@ validate_default_config() { # that include, we run "/etc/init.d/apache2 configtest" to ensure # the relevant config is generated and valid. We're also taking # this opportunity to enable mod_status if it's not present. -# Note: no longer necessary with systemd validate_default_suse_config() { if [ "$CONFIGFILE" = "$DEFAULT_SUSECONFIG" ] && \ grep -Eq '^Include[[:space:]]+/etc/apache2/sysconfig.d/include.conf' "$CONFIGFILE" then [ -x "/usr/sbin/a2enmod" ] && ocf_run -q /usr/sbin/a2enmod status - [ -e "/etc/init.d/apache2" ] && ocf_run -q /etc/init.d/apache2 configtest - return - else - return 0 + # init script style, for crusty old SUSE + if [ -e "/etc/init.d/apache2" ]; then + ocf_run -q /etc/init.d/apache2 configtest || return 1 + # systemd style, for shiny new SUSE + elif [ -e "/usr/sbin/start_apache2" ]; then + ocf_run -q /usr/sbin/start_apache2 -t || return 1 + fi fi + return 0 } apache_start() { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
