apply fixsimilar to http://cvs.openpkg.org/chngview?cn=17929, restarting daemons unconditionally when any logfile rotation happens

22 years ago · 151d04ffb6
23 changed files with 52 additions and 52 deletions
--- a/apache2/apache2.spec
+++ b/apache2/apache2.spec
@ -34,7 +34,7 @@ Class:        PLUS
 Group:        Web
 License:      ASF
 Version:      2.0.50
-Release:      20040725
+Release:      20040730

 #   package options (suexec related)
 %option       with_suexec               yes
--- a/apache2/rc.apache2
+++ b/apache2/rc.apache2
@ -58,13 +58,13 @@
        -n ${apache2_log_rotsteps} -s ${apache2_log_rotminsize} -d \
        -z ${apache2_log_rotcomplevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "$apache2_log_rotprolog" \
-        -E "$apache2_log_rotepilog && echo 1 >$hintfile" \
+        -E "$apache2_log_rotepilog; echo 1 >$hintfile" \
        ${apache2_log_files}
    shtool rotate -f \
        -n ${apache2_err_rotsteps} -s ${apache2_err_rotminsize} -d \
        -z ${apache2_err_rotcomplevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "$apache2_err_rotprolog" \
-        -E "$apache2_err_rotepilog && echo 1 >$hintfile" \
+        -E "$apache2_err_rotepilog; echo 1 >$hintfile" \
        ${apache2_err_files}
    if [ -s $hintfile ]; then
        @l_prefix@/sbin/apachectl restart
--- a/cups/cups.spec
+++ b/cups/cups.spec
@ -34,7 +34,7 @@ Class:        EVAL
 Group:        Print
 License:      GPL/LGPL with exceptions
 Version:      1.1.20
-Release:      20040207
+Release:      20040730

 #   package options
 %option       with_ssl   no
--- a/cups/rc.cups
+++ b/cups/rc.cups
@ -65,19 +65,19 @@
        -n ${cups_access_numfiles} -s ${cups_access_minsize} -d \
        -z ${cups_access_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "${cups_access_prolog}" \
-        -E "${cups_access_epilog} && echo 1 >$hintfile" \
+        -E "${cups_access_epilog}; echo 1 >$hintfile" \
        ${cups_access_file}
    shtool rotate -f \
        -n ${cups_error_numfiles} -s ${cups_error_minsize} -d \
        -z ${cups_error_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "${cups_error_prolog}" \
-        -E "${cups_error_epilog} && echo 1 >$hintfile" \
+        -E "${cups_error_epilog}; echo 1 >$hintfile" \
        ${cups_error_file}
    shtool rotate -f \
        -n ${cups_page_numfiles} -s ${cups_page_minsize} -d \
        -z ${cups_page_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "${cups_page_prolog}" \
-        -E "${cups_page_epilog} && echo 1 >$hintfile" \
+        -E "${cups_page_epilog}; echo 1 >$hintfile" \
        ${cups_page_file}
    if [ -s $hintfile ]; then
        rc cups restart
--- a/imapd/rc.imapd
+++ b/imapd/rc.imapd
@ -94,37 +94,37 @@
        -n ${imapd_cyrdel_numfiles} -s ${imapd_cyrdel_minsize} -d \
        -z ${imapd_cyrdel_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
        -P "${imapd_cyrdel_prolog}" \
-        -E "${imapd_cyrdel_epilog} && echo 1 >$hintfile" \
+        -E "${imapd_cyrdel_epilog}; echo 1 >$hintfile" \
        ${imapd_cyrdel_file}
    shtool rotate -f \
        -n ${imapd_imapd_numfiles} -s ${imapd_imapd_minsize} -d \
        -z ${imapd_imapd_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
        -P "${imapd_imapd_prolog}" \
-        -E "${imapd_imapd_epilog} && echo 1 >$hintfile" \
+        -E "${imapd_imapd_epilog}; echo 1 >$hintfile" \
        ${imapd_imapd_file}
    shtool rotate -f \
        -n ${imapd_lmtpd_numfiles} -s ${imapd_lmtpd_minsize} -d \
        -z ${imapd_lmtpd_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
        -P "${imapd_lmtpd_prolog}" \
-        -E "${imapd_lmtpd_epilog} && echo 1 >$hintfile" \
+        -E "${imapd_lmtpd_epilog}; echo 1 >$hintfile" \
        ${imapd_lmtpd_file}
    shtool rotate -f \
        -n ${imapd_master_numfiles} -s ${imapd_master_minsize} -d \
        -z ${imapd_master_complevel} -o @l_susr@ -g @l_rgrp@ -m 644 \
        -P "${imapd_master_prolog}" \
-        -E "${imapd_master_epilog} && echo 1 >$hintfile" \
+        -E "${imapd_master_epilog}; echo 1 >$hintfile" \
        ${imapd_master_file}
    shtool rotate -f \
        -n ${imapd_popd_numfiles} -s ${imapd_popd_minsize} -d \
        -z ${imapd_popd_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
        -P "${imapd_popd_prolog}" \
-        -E "${imapd_popd_epilog} && echo 1 >$hintfile" \
+        -E "${imapd_popd_epilog}; echo 1 >$hintfile" \
        ${imapd_popd_file}
    shtool rotate -f \
        -n ${imapd_misc_numfiles} -s ${imapd_misc_minsize} -d \
        -z ${imapd_misc_complevel} -o @l_rusr@ -g @l_rgrp@ -m 666 \
        -P "${imapd_misc_prolog}" \
-        -E "${imapd_misc_epilog} && echo 1 >$hintfile" \
+        -E "${imapd_misc_epilog}; echo 1 >$hintfile" \
        ${imapd_misc_file}
    if [ -s $hintfile ]; then
        rc imapd restart
--- a/jabberd/jabberd.spec
+++ b/jabberd/jabberd.spec
@ -38,7 +38,7 @@ Class:        EVAL
 Group:        Network
 License:      JOSL/GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20040207
+Release:      20040730

 #   list of sources
 Source0:      http://jabberd.jabberstudio.org/%{V_major}/dist/jabberd-%{version}.tar.gz
--- a/jabberd/rc.jabberd
+++ b/jabberd/rc.jabberd
@ -65,13 +65,13 @@
        -n ${jabberd_error_numfiles} -s ${jabberd_error_minsize} -d \
        -z ${jabberd_error_complevel} -o @l_nusr@ -g @l_ngrp@ -m 644 \
        -P "${jabberd_error_prolog}" \
-        -E "${jabberd_error_epilog} && echo 1 >$hintfile" \
+        -E "${jabberd_error_epilog}; echo 1 >$hintfile" \
        ${jabberd_error_file}
    shtool rotate -f \
        -n ${jabberd_record_numfiles} -s ${jabberd_record_minsize} -d \
        -z ${jabberd_record_complevel} -o @l_nusr@ -g @l_ngrp@ -m 644 \
        -P "${jabberd_record_prolog}" \
-        -E "${jabberd_record_epilog} && echo 1 >$hintfile" \
+        -E "${jabberd_record_epilog}; echo 1 >$hintfile" \
        ${jabberd_record_file}
    if [ -s $hintfile ]; then
        rc jabberd restart
--- a/kerberos/kerberos.spec
+++ b/kerberos/kerberos.spec
@ -38,7 +38,7 @@ Class:        BASE
 Group:        Cryptography
 License:      MIT subject to US EAR
 Version:      %{V_major}.%{V_minor}
-Release:      20040702
+Release:      20040730

 #   package options
 %option       with_fsl  yes
--- a/kerberos/rc.kerberos
+++ b/kerberos/rc.kerberos
@ -76,19 +76,19 @@
        -n ${kerberos_kdc_numfiles} -s ${kerberos_kdc_minsize} -d \
        -z ${kerberos_kdc_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "${kerberos_kdc_prolog}" \
-        -E "${kerberos_kdc_epilog} && echo 1 >$hintfile" \
+        -E "${kerberos_kdc_epilog}; echo 1 >$hintfile" \
        ${kerberos_kdc_log}
    shtool rotate -f \
        -n ${kerberos_admin_numfiles} -s ${kerberos_admin_minsize} -d \
        -z ${kerberos_admin_complevel} -o @s_susr@ -g @m_mgrp@ -m 644 \
        -P "${kerberos_admin_prolog}" \
-        -E "${kerberos_admin_epilog} && echo 1 >$hintfile" \
+        -E "${kerberos_admin_epilog}; echo 1 >$hintfile" \
        ${kerberos_admin_log}
    shtool rotate -f \
        -n ${kerberos_def_numfiles} -s ${kerberos_def_minsize} -d \
        -z ${kerberos_def_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "${kerberos_def_prolog}" \
-        -E "${kerberos_def_epilog} && echo 1 >$hintfile" \
+        -E "${kerberos_def_epilog}; echo 1 >$hintfile" \
        ${kerberos_def_log}
    if [ -s $hintfile ]; then
        rc kerberos restart
--- a/mysql/mysql.spec
+++ b/mysql/mysql.spec
@ -40,7 +40,7 @@ Class:        BASE
 Group:        Database
 License:      GPL
 Version:      %{V_opkg}
-Release:      20040715
+Release:      20040730

 #   package options
 %option       with_bdb       yes
--- a/mysql/rc.mysql
+++ b/mysql/rc.mysql
@ -77,19 +77,19 @@
        -n ${mysql_common_numfiles} -s ${mysql_common_minsize} -d \
        -z ${mysql_common_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
        -P "${mysql_common_prolog}" \
-        -E "${mysql_common_epilog} && echo 1 >$hintfile" \
+        -E "${mysql_common_epilog}; echo 1 >$hintfile" \
        ${mysql_common_log}
    shtool rotate -f \
        -n ${mysql_update_numfiles} -s ${mysql_update_minsize} -d \
        -z ${mysql_update_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
        -P "${mysql_update_prolog}" \
-        -E "${mysql_update_epilog} && echo 1 >$hintfile" \
+        -E "${mysql_update_epilog}; echo 1 >$hintfile" \
        ${mysql_update_log}
    shtool rotate -f \
        -n ${mysql_err_numfiles} -s ${mysql_err_minsize} -d \
        -z ${mysql_err_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
        -P "${mysql_err_prolog}" \
-        -E "${mysql_err_epilog} && echo 1 >$hintfile" \
+        -E "${mysql_err_epilog}; echo 1 >$hintfile" \
        ${mysql_err_log}
    if [ -s $hintfile ]; then
        rc mysql restart
--- a/mysql3/mysql3.spec
+++ b/mysql3/mysql3.spec
@ -38,7 +38,7 @@ Class:        EVAL
 Group:        Database
 License:      GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20040701
+Release:      20040730

 #   package options
 %option       with_bdb         yes
--- a/mysql3/rc.mysql3
+++ b/mysql3/rc.mysql3
@ -77,19 +77,19 @@
        -n ${mysql3_common_numfiles} -s ${mysql3_common_minsize} -d \
        -z ${mysql3_common_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
        -P "${mysql3_common_prolog}" \
-        -E "${mysql3_common_epilog} && echo 1 >$hintfile" \
+        -E "${mysql3_common_epilog}; echo 1 >$hintfile" \
        ${mysql3_common_log}
    shtool rotate -f \
        -n ${mysql3_update_numfiles} -s ${mysql3_update_minsize} -d \
        -z ${mysql3_update_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
        -P "${mysql3_update_prolog}" \
-        -E "${mysql3_update_epilog} && echo 1 >$hintfile" \
+        -E "${mysql3_update_epilog}; echo 1 >$hintfile" \
        ${mysql3_update_log}
    shtool rotate -f \
        -n ${mysql3_err_numfiles} -s ${mysql3_err_minsize} -d \
        -z ${mysql3_err_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
        -P "${mysql3_err_prolog}" \
-        -E "${mysql3_err_epilog} && echo 1 >$hintfile" \
+        -E "${mysql3_err_epilog}; echo 1 >$hintfile" \
        ${mysql3_err_log}
    if [ -s $hintfile ]; then
        rc mysql3 restart
--- a/mysql41/mysql41.spec
+++ b/mysql41/mysql41.spec
@ -40,7 +40,7 @@ Class:        PLUS
 Group:        Database
 License:      GPL
 Version:      %{V_opkg}
-Release:      20040727
+Release:      20040730

 #   package options
 %option       with_bdb       yes
--- a/mysql41/rc.mysql
+++ b/mysql41/rc.mysql
@ -77,19 +77,19 @@
        -n ${mysql_common_numfiles} -s ${mysql_common_minsize} -d \
        -z ${mysql_common_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
        -P "${mysql_common_prolog}" \
-        -E "${mysql_common_epilog} && echo 1 >$hintfile" \
+        -E "${mysql_common_epilog}; echo 1 >$hintfile" \
        ${mysql_common_log}
    shtool rotate -f \
        -n ${mysql_update_numfiles} -s ${mysql_update_minsize} -d \
        -z ${mysql_update_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
        -P "${mysql_update_prolog}" \
-        -E "${mysql_update_epilog} && echo 1 >$hintfile" \
+        -E "${mysql_update_epilog}; echo 1 >$hintfile" \
        ${mysql_update_log}
    shtool rotate -f \
        -n ${mysql_err_numfiles} -s ${mysql_err_minsize} -d \
        -z ${mysql_err_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
        -P "${mysql_err_prolog}" \
-        -E "${mysql_err_epilog} && echo 1 >$hintfile" \
+        -E "${mysql_err_epilog}; echo 1 >$hintfile" \
        ${mysql_err_log}
    if [ -s $hintfile ]; then
        rc mysql restart
--- a/proftpd/proftpd.spec
+++ b/proftpd/proftpd.spec
@ -34,7 +34,7 @@ Class:        BASE
 Group:        FTP
 License:      GPL
 Version:      1.2.10rc3
-Release:      20040725
+Release:      20040730

 #   package options
 %option       with_ifsession  no
--- a/proftpd/rc.proftpd
+++ b/proftpd/rc.proftpd
@ -75,25 +75,25 @@
        -n ${proftpd_acc_numfiles} -s ${proftpd_acc_minsize} -d \
        -z ${proftpd_acc_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
        -P "${proftpd_acc_prolog}" \
-        -E "${proftpd_acc_epilog} && echo 1 >$hintfile" \
+        -E "${proftpd_acc_epilog}; echo 1 >$hintfile" \
        ${proftpd_acc_file}
    shtool rotate -f \
        -n ${proftpd_auth_numfiles} -s ${proftpd_auth_minsize} -d \
        -z ${proftpd_auth_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
        -P "${proftpd_auth_prolog}" \
-        -E "${proftpd_auth_epilog} && echo 1 >$hintfile" \
+        -E "${proftpd_auth_epilog}; echo 1 >$hintfile" \
        ${proftpd_auth_file}
    shtool rotate -f \
        -n ${proftpd_sys_numfiles} -s ${proftpd_sys_minsize} -d \
        -z ${proftpd_sys_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
        -P "${proftpd_sys_prolog}" \
-        -E "${proftpd_sys_epilog} && echo 1 >$hintfile" \
+        -E "${proftpd_sys_epilog}; echo 1 >$hintfile" \
        ${proftpd_sys_file}
    shtool rotate -f \
        -n ${proftpd_xfer_numfiles} -s ${proftpd_xfer_minsize} -d \
        -z ${proftpd_xfer_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
        -P "${proftpd_xfer_prolog}" \
-        -E "${proftpd_xfer_epilog} && echo 1 >$hintfile" \
+        -E "${proftpd_xfer_epilog}; echo 1 >$hintfile" \
        ${proftpd_xfer_file}
    if [ -s $hintfile ]; then
        rc proftpd restart
--- a/radius/radius.spec
+++ b/radius/radius.spec
@ -34,7 +34,7 @@ Class:        PLUS
 Group:        Network
 License:      GPL
 Version:      1.2
-Release:      20040207
+Release:      20040730

 #   list of sources
 Source0:      ftp://ftp.gnu.org/gnu/radius/radius-%{version}.tar.gz
--- a/radius/rc.radius
+++ b/radius/rc.radius
@ -83,31 +83,31 @@
        -n ${radius_debug_numfiles} -s ${radius_debug_minsize} -d \
        -z ${radius_debug_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "${radius_debug_prolog}" \
-        -E "${radius_debug_epilog} && echo 1 >$hintfile" \
+        -E "${radius_debug_epilog}; echo 1 >$hintfile" \
        ${radius_debug_file}
    shtool rotate -f \
        -n ${radius_info_numfiles} -s ${radius_info_minsize} -d \
        -z ${radius_info_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "${radius_info_prolog}" \
-        -E "${radius_info_epilog} && echo 1 >$hintfile" \
+        -E "${radius_info_epilog}; echo 1 >$hintfile" \
        ${radius_info_file}
    shtool rotate -f \
        -n ${radius_main_numfiles} -s ${radius_main_minsize} -d \
        -z ${radius_main_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "${radius_main_prolog}" \
-        -E "${radius_main_epilog} && echo 1 >$hintfile" \
+        -E "${radius_main_epilog}; echo 1 >$hintfile" \
        ${radius_main_file}
    shtool rotate -f \
        -n ${radius_stat_numfiles} -s ${radius_stat_minsize} -d \
        -z ${radius_stat_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "${radius_stat_prolog}" \
-        -E "${radius_stat_epilog} && echo 1 >$hintfile" \
+        -E "${radius_stat_epilog}; echo 1 >$hintfile" \
        ${radius_stat_file}
    shtool rotate -f \
        -n ${radius_stderr_numfiles} -s ${radius_stderr_minsize} -d \
        -z ${radius_stderr_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "${radius_stderr_prolog}" \
-        -E "${radius_stderr_epilog} && echo 1 >$hintfile" \
+        -E "${radius_stderr_epilog}; echo 1 >$hintfile" \
        ${radius_stderr_file}
    if [ -s $hintfile ]; then
        rc radius restart
--- a/tomcat/rc.tomcat
+++ b/tomcat/rc.tomcat
@ -84,31 +84,31 @@
        -n ${tomcat_examples_numfiles} -s ${tomcat_examples_minsize} -d \
        -z ${tomcat_examples_complevel} -o @l_susr@ -g @l_rgrp@ -m 644 \
        -P "${tomcat_examples_prolog}" \
-        -E "${tomcat_examples_epilog} && echo 1 >$hintfile" \
+        -E "${tomcat_examples_epilog}; echo 1 >$hintfile" \
        ${tomcat_examples_file}
    shtool rotate -f \
        -n ${tomcat_jasper_numfiles} -s ${tomcat_jasper_minsize} -d \
        -z ${tomcat_jasper_complevel} -o @l_susr@ -g @l_rgrp@ -m 644 \
        -P "${tomcat_jasper_prolog}" \
-        -E "${tomcat_jasper_epilog} && echo 1 >$hintfile" \
+        -E "${tomcat_jasper_epilog}; echo 1 >$hintfile" \
        ${tomcat_jasper_file}
    shtool rotate -f \
        -n ${tomcat_servlet_numfiles} -s ${tomcat_servlet_minsize} -d \
        -z ${tomcat_servlet_complevel} -o @l_susr@ -g @l_rgrp@ -m 644 \
        -P "${tomcat_servlet_prolog}" \
-        -E "${tomcat_servlet_epilog} && echo 1 >$hintfile" \
+        -E "${tomcat_servlet_epilog}; echo 1 >$hintfile" \
        ${tomcat_servlet_file}
    shtool rotate -f \
        -n ${tomcat_servexample_numfiles} -s ${tomcat_servexample_minsize} -d \
        -z ${tomcat_servexample_complevel} -o @l_susr@ -g @l_rgrp@ -m 644 \
        -P "${tomcat_servexample_prolog}" \
-        -E "${tomcat_servexample_epilog} && echo 1 >$hintfile" \
+        -E "${tomcat_servexample_epilog}; echo 1 >$hintfile" \
        ${tomcat_servexample_file}
    shtool rotate -f \
        -n ${tomcat_tomcat_numfiles} -s ${tomcat_tomcat_minsize} -d \
        -z ${tomcat_tomcat_complevel} -o @l_susr@ -g @l_rgrp@ -m 644 \
        -P "${tomcat_tomcat_prolog}" \
-        -E "${tomcat_tomcat_epilog} && echo 1 >$hintfile" \
+        -E "${tomcat_tomcat_epilog}; echo 1 >$hintfile" \
        ${tomcat_tomcat_file}
    if [ -s $hintfile ]; then
        rc tomcat restart
--- a/tomcat/tomcat.spec
+++ b/tomcat/tomcat.spec
@ -34,7 +34,7 @@ Class:        EVAL
 Group:        Web
 License:      Apache Software License 1.1
 Version:      3.3.1a
-Release:      20040207
+Release:      20040730

 #   list of sources
 Source0:      http://www.apache.org/dist/jakarta/tomcat-3/src/jakarta-tomcat-%{version}.tar.gz
--- a/tsmc/rc.tsmc
+++ b/tsmc/rc.tsmc
@ -64,13 +64,13 @@
        -n ${tsmc_sched_numfiles} -s ${tsmc_sched_minsize} -d \
        -z ${tsmc_sched_complevel} -o @l_susr@ -g @l_sgrp@ -m 644 \
        -P "${tsmc_sched_prolog}" \
-        -E "${tsmc_sched_epilog} && echo 1 >$hintfile" \
+        -E "${tsmc_sched_epilog}; echo 1 >$hintfile" \
        ${tsmc_sched_file}
    shtool rotate -f \
        -n ${tsmc_error_numfiles} -s ${tsmc_error_minsize} -d \
        -z ${tsmc_error_complevel} -o @l_susr@ -g @l_sgrp@ -m 644 \
        -P "${tsmc_error_prolog}" \
-        -E "${tsmc_error_epilog} && echo 1 >$hintfile" \
+        -E "${tsmc_error_epilog}; echo 1 >$hintfile" \
        ${tsmc_error_file}
    if [ -s $hintfile ]; then
        rc tsmc restart
--- a/tsmc/tsmc.spec
+++ b/tsmc/tsmc.spec
@ -34,7 +34,7 @@ Class:        EVAL
 Group:        System
 License:      Commercial
 Version:      5.1.6.2
-Release:      20040503
+Release:      20040730

 #   list of sources
 Source0:      ftp://service.boulder.ibm.com/storage/tivoli-storage-management/patches/client/v5r1/Linux/Linux86/v516/TIVsm-BA.i386.rpm