Hello community, here is the log from the commit of package apache-rpm-macros for openSUSE:Factory checked in at 2015-12-20 10:51:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.apache-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-rpm-macros" Changes: -------- --- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes 2015-11-24 22:29:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 2015-12-20 10:51:07.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Nov 26 08:51:19 UTC 2015 - [email protected] + +- version 20151211 +- %apache_test_module_start_apache: + * declare -p switch in function header + * fix wording of messages when apache start failed + * report unsuccessful start also to stderr to see it in build + log, when stdout is redirected to a file (see apache-test: + when apache test failed, macro is exiting 1, so the log is + not cat'ed to output) + * %{apache_branch} converted to a number: 204 for 2.4, + 202 for 2.2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.IMjALv/_old 2015-12-20 10:51:08.000000000 +0100 +++ /var/tmp/diff_new_pack.IMjALv/_new 2015-12-20 10:51:08.000000000 +0100 @@ -22,9 +22,9 @@ %define ap_major 2 %if 0%{?suse_version} -%define ap_branch %(rpm -q --qf "%%{version}" apache%{ap_major} | sed "s:\\(\\..*\\)\\..*:\\1:") +%define ap_branch %(rpm -q --qf "%%{version}" apache%{ap_major} | tr '.' ' ' | { read maj min patch; printf "%d%02d" $maj $min; }) %else -%define ap_branch %(rpm -q --qf "%%{version}" httpd | sed "s:\\(\\..*\\)\\..*:\\1:") +%define ap_branch %(rpm -q --qf "%%{version}" httpd | tr '.' ' ' | { read maj min patch; printf "%d%02d" $maj $min; }) %endif %define ap_pname apache%{ap_major} %define ap_apxs %(ls -1 /usr/{,s}bin/apxs{,2} 2>/dev/null | head -n 1) @@ -57,7 +57,7 @@ %endif %define macros_file macros.apache Name: apache-rpm-macros -Version: 20150930 +Version: 20151211 Release: 0 Summary: Apache RPM Macros License: Apache-2.0 ++++++ macros.apache-module-test ++++++ --- /var/tmp/diff_new_pack.IMjALv/_old 2015-12-20 10:51:08.000000000 +0100 +++ /var/tmp/diff_new_pack.IMjALv/_new 2015-12-20 10:51:08.000000000 +0100 @@ -39,7 +39,7 @@ # [default value: prefork] # # -%apache_test_module_start_apache(m:,i:,r:,u:,g:,t:) \ +%apache_test_module_start_apache(m:,i:,r:,u:,g:,p:,t:) \ # constants \ TEST_DIR='%{__test_dir}' \ # arguments \ @@ -71,7 +71,6 @@ TEST_MPM='%{__test_mpm}' \ fi \ # helpers \ - APACHE_BRANCH=$(echo %{apache_branch} | tr -d '.') \ # begin \ echo "-----------------------------------------------------------" \ echo "APACHE MODULE TEST" \ @@ -93,7 +92,7 @@ echo "ErrorLog $TEST_DIR/error_log" >> $TEST_CONF_FILE \ echo "LoadModule dir_module $SYSTEM_MODULE_PATH/mod_dir.so" >> $TEST_CONF_FILE \ echo "LoadModule auth_basic_module $SYSTEM_MODULE_PATH/mod_auth_basic.so" >> $TEST_CONF_FILE \ - if [ $APACHE_BRANCH -ge 24 ]; then \ + if [ %{apache_branch} -ge 204 ]; then \ echo "LoadModule authz_core_module $SYSTEM_MODULE_PATH/mod_authz_core.so" >> $TEST_CONF_FILE \ fi \ echo "LoadModule authz_host_module $SYSTEM_MODULE_PATH/mod_authz_host.so" >> $TEST_CONF_FILE \ @@ -131,9 +130,12 @@ # wait to be sure apache finished start \ sleep 2 \ if [ ! -f $TEST_DIR/pid ]; then \ - echo "FAILED:" \ + echo "FAILED, $TEST_DIR/error_log: >&2" \ + cat $TEST_DIR/error_log >&2 \ + echo "See $TEST_DIR for details" >&2 \ + echo "FAILED, $TEST_DIR/error_log:" \ cat $TEST_DIR/error_log \ - echo "See $PWD/$TEST_DIR for details" \ + echo "See $TEST_DIR for details" \ exit 1 \ fi \ echo "SUCCESS" \ @@ -142,13 +144,16 @@ # # macro: apache_test_module_stop_apache -- stops apache previously started with *_start_apache # -# usage: apache_test_module_stop_apache +# usage: apache_test_module_stop_apache [-f] # -%apache_test_module_stop_apache() \ +# -f: force +# +%apache_test_module_stop_apache(f) \ TEST_DIR='%{__test_dir}' \ + SIGNAL=%{!-f:TERM}%{-f:KILL} \ # stop apache \ echo "Stopping Apache ..." \ - kill -TERM `cat $TEST_DIR/pid` \ + kill -$SIGNAL -$(cat $TEST_DIR/pid) \ echo "Done." \ echo "-----------------------------------------------------------" \ %nil
