OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 24-Jul-2003 09:03:20
Branch: HEAD Handle: 2003072408031009
Modified files:
openpkg-src/amd amd.spec rc.amd
openpkg-src/cvs cvs.spec rc.cvs
openpkg-src/dhcpd dhcpd.conf dhcpd.spec rc.dhcpd
openpkg-src/ircd ircd.spec rc.ircd
openpkg-src/openldap openldap.spec rc.openldap
openpkg-src/portsentry portsentry.spec rc.portsentry
openpkg-src/postfix postfix.spec rc.postfix
openpkg-src/prngd prngd.spec rc.prngd
openpkg-src/pureftpd pureftpd.spec rc.pureftpd
openpkg-src/samba rc.samba samba.spec
openpkg-src/smtpfeed rc.smtpfeed smtpfeed.spec
openpkg-src/uucp rc.uucp uucp.spec
openpkg-src/zebra rc.zebra zebra.spec
openpkg-web news.txt
Log:
prepare related issues for PR#202 but no run-time check done
Summary:
Revision Changes Path
1.47 +15 -1 openpkg-src/amd/amd.spec
1.11 +7 -3 openpkg-src/amd/rc.amd
1.71 +1 -1 openpkg-src/cvs/cvs.spec
1.18 +2 -0 openpkg-src/cvs/rc.cvs
1.2 +2 -2 openpkg-src/dhcpd/dhcpd.conf
1.46 +15 -1 openpkg-src/dhcpd/dhcpd.spec
1.12 +21 -3 openpkg-src/dhcpd/rc.dhcpd
1.47 +15 -1 openpkg-src/ircd/ircd.spec
1.14 +8 -5 openpkg-src/ircd/rc.ircd
1.85 +22 -1 openpkg-src/openldap/openldap.spec
1.15 +6 -4 openpkg-src/openldap/rc.openldap
1.39 +15 -1 openpkg-src/portsentry/portsentry.spec
1.16 +7 -6 openpkg-src/portsentry/rc.portsentry
1.163 +1 -1 openpkg-src/postfix/postfix.spec
1.22 +2 -3 openpkg-src/postfix/rc.postfix
1.38 +15 -1 openpkg-src/prngd/prngd.spec
1.10 +9 -2 openpkg-src/prngd/rc.prngd
1.55 +21 -5 openpkg-src/pureftpd/pureftpd.spec
1.15 +7 -6 openpkg-src/pureftpd/rc.pureftpd
1.15 +21 -4 openpkg-src/samba/rc.samba
1.51 +21 -5 openpkg-src/samba/samba.spec
1.20 +7 -2 openpkg-src/smtpfeed/rc.smtpfeed
1.55 +15 -1 openpkg-src/smtpfeed/smtpfeed.spec
1.11 +21 -3 openpkg-src/uucp/rc.uucp
1.36 +15 -1 openpkg-src/uucp/uucp.spec
1.12 +10 -4 openpkg-src/zebra/rc.zebra
1.42 +13 -6 openpkg-src/zebra/zebra.spec
1.5774 +13 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amd/amd.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 amd.spec
--- openpkg-src/amd/amd.spec 22 Jul 2003 08:10:37 -0000 1.46
+++ openpkg-src/amd/amd.spec 24 Jul 2003 07:03:11 -0000 1.47
@@ -33,7 +33,7 @@
Group: System
License: BSD
Version: 6.0.9
-Release: 20030722
+Release: 20030724
# list of sources
Source0: ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz
@@ -129,4 +129,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} amd status 2>/dev/null`
+ [ ".$amd_active" = .yes ] && %{l_rc} amd restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} amd stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/amd/amd.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/amd/rc.amd
============================================================================
$ cvs diff -u -r1.10 -r1.11 rc.amd
--- openpkg-src/amd/rc.amd 22 Jul 2003 08:10:37 -0000 1.10
+++ openpkg-src/amd/rc.amd 24 Jul 2003 07:03:11 -0000 1.11
@@ -28,17 +28,19 @@
%start -u @l_susr@
rcService amd enable yes || exit 0
+ rcService amd active yes && exit 0
@l_prefix@/sbin/amd -F @l_prefix@/etc/amd/amd.conf >/dev/null 2>&1
%stop -u @l_susr@
rcService amd enable yes || exit 0
+ rcService amd active no && exit 0
amd_signal TERM
+ sleep 2
%restart -u @l_susr@
rcService amd enable yes || exit 0
- amd_signal TERM
- sleep 2
- @l_prefix@/sbin/amd -F @l_prefix@/etc/amd/amd.conf >/dev/null 2>&1
+ rcService amd active no && exit 0
+ rc amd stop start
%reload -u @l_susr@
rcService amd enable yes || exit 0
@@ -48,6 +50,8 @@
%daily -u @l_susr@
rcService amd enable yes || exit 0
+
+ # rotate logfile
shtool rotate -f \
-n ${amd_log_numfiles} -s ${amd_log_minsize} -d \
-z ${amd_log_complevel} -o @l_musr@ -g @l_mgrp@ -m 644 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.spec
============================================================================
$ cvs diff -u -r1.70 -r1.71 cvs.spec
--- openpkg-src/cvs/cvs.spec 23 Jul 2003 19:07:05 -0000 1.70
+++ openpkg-src/cvs/cvs.spec 24 Jul 2003 07:03:12 -0000 1.71
@@ -37,7 +37,7 @@
Group: SCM
License: GPL
Version: %{V_cvs}
-Release: 20030723
+Release: 20030724
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/rc.cvs
============================================================================
$ cvs diff -u -r1.17 -r1.18 rc.cvs
--- openpkg-src/cvs/rc.cvs 22 Jul 2003 14:09:43 -0000 1.17
+++ openpkg-src/cvs/rc.cvs 24 Jul 2003 07:03:12 -0000 1.18
@@ -51,6 +51,8 @@
%daily -u @l_susr@
rcService cvs enable yes || exit 0
+
+ # rotate logfile
shtool rotate -f \
-n ${cvs_log_numfiles} -s ${cvs_log_minsize} -d \
-z ${cvs_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.conf
============================================================================
$ cvs diff -u -r1.1.1.1 -r1.2 dhcpd.conf
--- openpkg-src/dhcpd/dhcpd.conf 18 Sep 2001 09:48:28 -0000 1.1.1.1
+++ openpkg-src/dhcpd/dhcpd.conf 24 Jul 2003 07:03:13 -0000 1.2
@@ -3,7 +3,7 @@
##
# Options applicable to all subnets
-option domain-name "quux.dom";
+option domain-name "example.com";
authoritative;
default-lease-time 600;
max-lease-time 7200;
@@ -26,7 +26,7 @@
# Dynamic DNS (DDNS) Updating
ddns-updates off;
- ddns-domainname "quux.dom";
+ ddns-domainname "example.com";
ddns-rev-domainname "in-addr.arpa";
# Pool of known clients (i.e. MAC known but IP not specified)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.spec
============================================================================
$ cvs diff -u -r1.45 -r1.46 dhcpd.spec
--- openpkg-src/dhcpd/dhcpd.spec 22 Jul 2003 08:10:44 -0000 1.45
+++ openpkg-src/dhcpd/dhcpd.spec 24 Jul 2003 07:03:13 -0000 1.46
@@ -33,7 +33,7 @@
Group: DNS
License: ISC/BSD
Version: 3.0.1rc11
-Release: 20030722
+Release: 20030724
# list of sources
Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
@@ -117,4 +117,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} dhcpd status 2>/dev/null`
+ [ ".$dhcpd_active" = .yes ] && %{l_rc} dhcpd restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} dhcpd stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/dhcpd/dhcpd.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/rc.dhcpd
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.dhcpd
--- openpkg-src/dhcpd/rc.dhcpd 22 Jul 2003 08:10:44 -0000 1.11
+++ openpkg-src/dhcpd/rc.dhcpd 24 Jul 2003 07:03:13 -0000 1.12
@@ -5,6 +5,11 @@
%config
dhcpd_enable="$openpkg_rc_def"
+ dhcpd_log_prolog="true"
+ dhcpd_log_epilog="true"
+ dhcpd_log_numfiles="10"
+ dhcpd_log_minsize="1M"
+ dhcpd_log_complevel="9"
%common
dhcpd_pidfile="@l_prefix@/var/dhcpd/dhcpd.pid"
@@ -23,19 +28,32 @@
%start -u @l_susr@
rcService dhcpd enable yes || exit 0
+ rcService dhcpd active yes && exit 0
@l_prefix@/sbin/dhcpd >/dev/null 2>&1
%stop -u @l_susr@
rcService dhcpd enable yes || exit 0
+ rcService dhcpd active no && exit 0
dhcpd_signal TERM
+ sleep 2
%restart -u @l_susr@
rcService dhcpd enable yes || exit 0
- dhcpd_signal TERM
- sleep 2
- @l_prefix@/sbin/dhcpd >/dev/null 2>&1
+ rcService dhcpd active no && exit 0
+ rc dhcpd stop start
%reload -u @l_susr@
rcService dhcpd enable yes || exit 0
dhcpd_signal HUP
+
+%daily -u @l_susr@
+ rcService dhcpd enable yes || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n ${dhcpd_log_numfiles} -s ${dhcpd_log_minsize} -d \
+ -z ${dhcpd_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+ -P "${dhcpd_log_prolog}" \
+ -E "${dhcpd_log_epilog} && rc dhcpd restart" \
+ @l_prefix@/var/dhcpd/dhcpd.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ircd/ircd.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 ircd.spec
--- openpkg-src/ircd/ircd.spec 23 Jul 2003 13:31:57 -0000 1.46
+++ openpkg-src/ircd/ircd.spec 24 Jul 2003 07:03:13 -0000 1.47
@@ -33,7 +33,7 @@
Group: Network
License: BSD
Version: 2.10.3p3
-Release: 20030723
+Release: 20030724
# package options
%option with_fsl yes
@@ -146,4 +146,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} ircd status 2>/dev/null`
+ [ ".$ircd_active" = .yes ] && %{l_rc} ircd restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} ircd stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/ircd/ircd.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ircd/rc.ircd
============================================================================
$ cvs diff -u -r1.13 -r1.14 rc.ircd
--- openpkg-src/ircd/rc.ircd 22 Jul 2003 08:10:49 -0000 1.13
+++ openpkg-src/ircd/rc.ircd 24 Jul 2003 07:03:13 -0000 1.14
@@ -28,20 +28,23 @@
%start -u @l_susr@
rcService ircd enable yes || exit 0
+ rcService ircd active yes && exit 0
@l_prefix@/sbin/ircd
%stop -u @l_susr@
rcService ircd enable yes || exit 0
+ rcService ircd active no && exit 0
ircd_signal TERM
+ sleep 2
%restart -u @l_susr@
rcService ircd enable yes || exit 0
- ircd_signal TERM
- sleep 2
- @l_prefix@/sbin/ircd
+ rcService ircd active no && exit 0
+ rc ircd stop start
%reload -u @l_susr@
rcService ircd enable yes || exit 0
+ rcService ircd active no && exit 0
ircd_signal HUP
%daily -u @l_susr@
@@ -50,8 +53,8 @@
# rotate logfile
shtool rotate -f \
-n ${ircd_log_numfiles} -s ${ircd_log_minsize} -d \
- -z ${ircd_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${ircd_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${ircd_log_prolog}" \
- -E "${ircd_log_epilog}" \
+ -E "${ircd_log_epilog} && rc ircd restart" \
@l_prefix@/var/ircd/ircd.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.84 -r1.85 openldap.spec
--- openpkg-src/openldap/openldap.spec 22 Jul 2003 08:10:56 -0000 1.84
+++ openpkg-src/openldap/openldap.spec 24 Jul 2003 07:03:14 -0000 1.85
@@ -33,7 +33,7 @@
Group: Database
License: GPL
Version: 2.1.22
-Release: 20030722
+Release: 20030724
# package options
%option with_fsl yes
@@ -146,4 +146,25 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%pre
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} openldap status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} openldap stop 2>/dev/null
+ exit 0
+
+%post
+ [ $1 -eq 2 ] || exit 0
+ # after upgrade, restore status
+ { eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}; true; } >/dev/null 2>&1
+ [ ".$openldap_active" = .yes ] && %{l_rc} openldap start
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} openldap stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/openldap/openldap.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/rc.openldap
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.openldap
--- openpkg-src/openldap/rc.openldap 22 Jul 2003 08:10:56 -0000 1.14
+++ openpkg-src/openldap/rc.openldap 24 Jul 2003 07:03:14 -0000 1.15
@@ -28,17 +28,19 @@
%start -u @l_susr@
rcService openldap enable yes || exit 0
+ rcService openldap active yes && exit 0
@l_prefix@/libexec/openldap/slapd
%stop -u @l_susr@
rcService openldap enable yes || exit 0
+ rcService openldap active no && exit 0
openldap_signal INT
+ sleep 2
%restart -u @l_susr@
rcService openldap enable yes || exit 0
- openldap_signal INT
- sleep 2
- @l_prefix@/libexec/openldap/slapd
+ rcService openldap active no && exit 0
+ rc openldap stop start
%daily -u @l_susr@
rcService openldap enable yes || exit 0
@@ -48,6 +50,6 @@
-n ${openldap_log_numfiles} -s ${openldap_log_minsize} -d \
-z ${openldap_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
-P "${openldap_log_prolog}" \
- -E "${openldap_log_epilog}" \
+ -E "${openldap_log_epilog} && rc openldap restart" \
@l_prefix@/var/openldap/openldap.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/portsentry/portsentry.spec
============================================================================
$ cvs diff -u -r1.38 -r1.39 portsentry.spec
--- openpkg-src/portsentry/portsentry.spec 22 Jul 2003 08:11:00 -0000 1.38
+++ openpkg-src/portsentry/portsentry.spec 24 Jul 2003 07:03:15 -0000 1.39
@@ -33,7 +33,7 @@
Group: Security
License: Open Source
Version: 1.1
-Release: 20030722
+Release: 20030724
# package options
%option with_fsl yes
@@ -130,4 +130,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} portsentry status 2>/dev/null`
+ [ ".$portsentry_active" = .yes ] && %{l_rc} portsentry restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} portsentry stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/portsentry/portsentry.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/portsentry/rc.portsentry
============================================================================
$ cvs diff -u -r1.15 -r1.16 rc.portsentry
--- openpkg-src/portsentry/rc.portsentry 22 Jul 2003 08:11:00 -0000 1.15
+++ openpkg-src/portsentry/rc.portsentry 24 Jul 2003 07:03:15 -0000 1.16
@@ -35,19 +35,20 @@
%start -u @l_susr@
rcService portsentry enable yes || exit 0
+ rcService portsentry active yes && exit 0
@l_prefix@/sbin/portsentry -tcp $portsentry_tcp_pidfile
@l_prefix@/sbin/portsentry -udp $portsentry_udp_pidfile
%stop -u @l_susr@
rcService portsentry enable yes || exit 0
+ rcService portsentry active no && exit 0
portsentry_signal TERM
+ sleep 2
%restart -u @l_susr@
rcService portsentry enable yes || exit 0
- portsentry_signal TERM
- sleep 2
- @l_prefix@/sbin/portsentry -tcp $portsentry_tcp_pidfile
- @l_prefix@/sbin/portsentry -udp $portsentry_udp_pidfile
+ rcService portsentry active no && exit 0
+ rc portsentry stop start
%daily -u @l_susr@
rcService portsentry enable yes || exit 0
@@ -55,8 +56,8 @@
# rotate logfile
shtool rotate -f \
-n ${portsentry_log_numfiles} -s ${portsentry_log_minsize} -d \
- -z ${portsentry_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${portsentry_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${portsentry_log_prolog}" \
- -E "${portsentry_log_epilog}" \
+ -E "${portsentry_log_epilog} && rc portsentry restart" \
@l_prefix@/var/portsentry/portsentry.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.spec
============================================================================
$ cvs diff -u -r1.162 -r1.163 postfix.spec
--- openpkg-src/postfix/postfix.spec 23 Jul 2003 13:45:26 -0000 1.162
+++ openpkg-src/postfix/postfix.spec 24 Jul 2003 07:03:15 -0000 1.163
@@ -39,7 +39,7 @@
Group: Mail
License: IPL
Version: %{V_postfix}
-Release: 20030723
+Release: 20030724
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/rc.postfix
============================================================================
$ cvs diff -u -r1.21 -r1.22 rc.postfix
--- openpkg-src/postfix/rc.postfix 22 Jul 2003 08:11:01 -0000 1.21
+++ openpkg-src/postfix/rc.postfix 24 Jul 2003 07:03:15 -0000 1.22
@@ -33,13 +33,12 @@
rcService postfix enable yes || exit 0
rcService postfix active no && exit 0
@l_prefix@/sbin/postfix stop
+ sleep 2
%restart -u @l_susr@
rcService postfix enable yes || exit 0
rcService postfix active no && exit 0
- rc postfix stop
- sleep 2
- rc postfix start
+ rc postfix stop start
%reload -u @l_susr@
rcService postfix enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/prngd/prngd.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 prngd.spec
--- openpkg-src/prngd/prngd.spec 22 Jul 2003 08:11:04 -0000 1.37
+++ openpkg-src/prngd/prngd.spec 24 Jul 2003 07:03:16 -0000 1.38
@@ -33,7 +33,7 @@
Group: Security
License: PD
Version: 0.9.27
-Release: 20030722
+Release: 20030724
# package options
%option with_fsl yes
@@ -131,4 +131,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} prngd status 2>/dev/null`
+ [ ".$prngd_active" = .yes ] && %{l_rc} prngd restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} prngd stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/prngd/prngd.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/prngd/rc.prngd
============================================================================
$ cvs diff -u -r1.9 -r1.10 rc.prngd
--- openpkg-src/prngd/rc.prngd 22 Jul 2003 08:11:04 -0000 1.9
+++ openpkg-src/prngd/rc.prngd 24 Jul 2003 07:03:16 -0000 1.10
@@ -29,20 +29,27 @@
%start -u @l_susr@
rcService prngd enable yes || exit 0
+ rcService prngd active yes && exit 0
@l_prefix@/sbin/prngd -p $prngd_pidfile -m 660 $prngd_socket
%stop -u @l_susr@
rcService prngd enable yes || exit 0
+ rcService prngd active no && exit 0
@l_prefix@/sbin/prngd -k -p $prngd_pidfile -m 660 $prngd_socket
+%restart -u @l_susr@
+ rcService prngd enable yes || exit 0
+ rcService prngd active no && exit 0
+ rc prngd stop start
+
%daily -u @l_susr@
rcService prngd enable yes || exit 0
# rotate logfile
shtool rotate -f \
-n ${prngd_log_numfiles} -s ${prngd_log_minsize} -d \
- -z ${prngd_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${prngd_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${prngd_log_prolog}" \
- -E "${prngd_log_epilog}" \
+ -E "${prngd_log_epilog} && rc prngd restart" \
@l_prefix@/var/prngd/prngd.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pureftpd/pureftpd.spec
============================================================================
$ cvs diff -u -r1.54 -r1.55 pureftpd.spec
--- openpkg-src/pureftpd/pureftpd.spec 22 Jul 2003 08:11:05 -0000 1.54
+++ openpkg-src/pureftpd/pureftpd.spec 24 Jul 2003 07:03:17 -0000 1.55
@@ -33,7 +33,7 @@
Group: FTP
License: GPL
Version: 1.1.0
-Release: 20030722
+Release: 20030724
# package options
%option with_fsl yes
@@ -130,19 +130,35 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} pureftpd status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} pureftpd stop 2>/dev/null
+ exit 0
+
%post
%if "%{with_pam}" == "yes"
- # add PAM configuration entry
if [ $1 -eq 1 ]; then
+ # after install, add PAM configuration entry
$RPM_INSTALL_PREFIX/sbin/pamtool --add --smart --name=pureftpd
fi
%endif
+ if [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ { eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}; true; } >/dev/null 2>&1
+ [ ".$pureftpd_active" = .yes ] && %{l_rc} pureftpd start
+ fi
+ exit 0
%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} pureftpd stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/pureftpd/pureftpd.log* >/dev/null 2>&1 || true
%if "%{with_pam}" == "yes"
# remove PAM configuration entry
- if [ $1 -eq 0 ]; then
- $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=pureftpd
- fi
+ $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=pureftpd
%endif
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pureftpd/rc.pureftpd
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.pureftpd
--- openpkg-src/pureftpd/rc.pureftpd 22 Jul 2003 08:11:05 -0000 1.14
+++ openpkg-src/pureftpd/rc.pureftpd 24 Jul 2003 07:03:17 -0000 1.15
@@ -28,20 +28,21 @@
%start -u @l_susr@
rcService pureftpd enable yes || exit 0
+ rcService pureftpd active yes && exit 0
@l_prefix@/sbin/pure-ftpd </dev/null &
echo "$!" >@l_prefix@/var/pureftpd/pureftpd.pid
%stop -u @l_susr@
rcService pureftpd enable yes || exit 0
+ rcService pureftpd active no && exit 0
pureftpd_signal TERM
+ sleep 2
rm -f $pureftpd_pidfile
%restart -u @l_susr@
rcService pureftpd enable yes || exit 0
- pureftpd_signal TERM
- sleep 2
- @l_prefix@/sbin/pure-ftpd </dev/null &
- echo "$!" >$pureftpd_pidfile
+ rcService pureftpd active no && exit 0
+ rc pureftpd stop start
%daily -u @l_susr@
rcService pureftpd enable yes || exit 0
@@ -49,8 +50,8 @@
# rotate logfile
shtool rotate -f \
-n ${pureftpd_log_numfiles} -s ${pureftpd_log_minsize} -d \
- -z ${pureftpd_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${pureftpd_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${pureftpd_log_prolog}" \
- -E "${pureftpd_log_epilog}" \
+ -E "${pureftpd_log_epilog} && rc pureftpd restart" \
@l_prefix@/var/pureftpd/pureftpd.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/rc.samba
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.samba
--- openpkg-src/samba/rc.samba 22 Jul 2003 08:11:08 -0000 1.14
+++ openpkg-src/samba/rc.samba 24 Jul 2003 07:03:17 -0000 1.15
@@ -5,6 +5,11 @@
%config
samba_enable="$openpkg_rc_def"
+ samba_log_prolog="true"
+ samba_log_epilog="true"
+ samba_log_numfiles="10"
+ samba_log_minsize="1M"
+ samba_log_complevel="9"
%common
samba_smbd_pidfile="@l_prefix@/var/samba/run/smbd.pid"
@@ -30,17 +35,29 @@
%start -u @l_susr@
rcService samba enable yes || exit 0
+ rcService samba active yes && exit 0
@l_prefix@/sbin/smbd -D
@l_prefix@/sbin/nmbd -D
%stop -u @l_susr@
rcService samba enable yes || exit 0
+ rcService samba active no && exit 0
samba_signal TERM
+ sleep 2
%restart -u @l_susr@
rcService samba enable yes || exit 0
- samba_signal TERM
- sleep 2
- @l_prefix@/sbin/smbd -D
- @l_prefix@/sbin/nmbd -D
+ rcService samba active no && exit 0
+ rc samba stop start
+
+%daily -u @l_susr@
+ rcService samba enable yes || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n ${samba_log_numfiles} -s ${FOO_log_minsize} -d \
+ -z ${samba_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+ -P "${samba_log_prolog}" \
+ -E "${samba_log_epilog} && rc FOO restart" \
+ @l_prefix@/var/samba/FOO.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.spec
============================================================================
$ cvs diff -u -r1.50 -r1.51 samba.spec
--- openpkg-src/samba/samba.spec 23 Jul 2003 13:32:20 -0000 1.50
+++ openpkg-src/samba/samba.spec 24 Jul 2003 07:03:17 -0000 1.51
@@ -33,7 +33,7 @@
Group: Filesystem
License: GPL
Version: 2.2.8a
-Release: 20030723
+Release: 20030724
# package options
%option with_pam no
@@ -151,19 +151,35 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} samba status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} samba stop 2>/dev/null
+ exit 0
+
%post
%if "%{with_pam}" == "yes"
- # add PAM configuration entry
if [ $1 -eq 1 ]; then
+ # after install, add PAM configuration entry
$RPM_INSTALL_PREFIX/sbin/pamtool --add --smart --name=smbd
fi
%endif
+ if [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ { eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}; true; } >/dev/null 2>&1
+ [ ".$samba_active" = .yes ] && %{l_rc} samba start
+ fi
+ exit 0
%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} samba stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/samba/samba.log* >/dev/null 2>&1 || true
%if "%{with_pam}" == "yes"
# remove PAM configuration entry
- if [ $1 -eq 0 ]; then
- $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=smbd
- fi
+ $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=smbd
%endif
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/smtpfeed/rc.smtpfeed
============================================================================
$ cvs diff -u -r1.19 -r1.20 rc.smtpfeed
--- openpkg-src/smtpfeed/rc.smtpfeed 22 Jul 2003 08:11:11 -0000 1.19
+++ openpkg-src/smtpfeed/rc.smtpfeed 24 Jul 2003 07:03:18 -0000 1.20
@@ -56,24 +56,29 @@
%start -u @l_susr@
rcService smtpfeed enable yes || exit 0
+ rcService smtpfeed active yes && exit 0
smtpfeed_start
%stop -u @l_susr@
rcService smtpfeed enable yes || exit 0
+ rcService smtpfeed active no && exit 0
smtpfeed_stop
%restart -u @l_susr@
rcService smtpfeed enable yes || exit 0
+ rcService smtpfeed active no && exit 0
smtpfeed_stop
sleep 2
smtpfeed_start
%daily -u @l_susr@
rcService smtpfeed enable yes || exit 0
+
+ # rotate logfile
shtool rotate -f \
-n ${smtpfeed_log_numfiles} -s ${smtpfeed_log_minsize} -d \
- -z ${smtpfeed_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${smtpfeed_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${smtpfeed_log_prolog}" \
- -E "${smtpfeed_log_epilog}" \
+ -E "${smtpfeed_log_epilog} && rc smtpfeed restart" \
@l_prefix@/var/smtpfeed/smtpfeed.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/smtpfeed/smtpfeed.spec
============================================================================
$ cvs diff -u -r1.54 -r1.55 smtpfeed.spec
--- openpkg-src/smtpfeed/smtpfeed.spec 23 Jul 2003 13:32:23 -0000 1.54
+++ openpkg-src/smtpfeed/smtpfeed.spec 24 Jul 2003 07:03:18 -0000 1.55
@@ -33,7 +33,7 @@
Group: Mail
License: GPL
Version: 1.18
-Release: 20030723
+Release: 20030724
# package options
%option with_fsl yes
@@ -126,4 +126,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} smtpfeed status 2>/dev/null`
+ [ ".$smtpfeed_active" = .yes ] && %{l_rc} smtpfeed restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} smtpfeed stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/smtpfeed/smtpfeed.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/uucp/rc.uucp
============================================================================
$ cvs diff -u -r1.10 -r1.11 rc.uucp
--- openpkg-src/uucp/rc.uucp 22 Jul 2003 08:11:17 -0000 1.10
+++ openpkg-src/uucp/rc.uucp 24 Jul 2003 07:03:19 -0000 1.11
@@ -5,6 +5,11 @@
%config
uucp_enable="$openpkg_rc_def"
+ uucp_log_prolog="true"
+ uucp_log_epilog="true"
+ uucp_log_numfiles="10"
+ uucp_log_minsize="1M"
+ uucp_log_complevel="9"
%common
uucp_pidfile="@l_prefix@/var/uucp/run/uucpd.pid"
@@ -29,16 +34,29 @@
%start -u @l_susr@
rcService uucp enable yes || exit 0
+ rcService uucp active yes && exit 0
uucp_start
%stop -u @l_susr@
rcService uucp enable yes || exit 0
+ rcService uucp active no && exit 0
uucp_signal TERM
+ sleep 2
rm -f $uucp_pidfile 2>/dev/null || true
%restart -u @l_susr@
rcService uucp enable yes || exit 0
- uucp_signal TERM
- sleep 2
- uucp_start
+ rcService uucp active no && exit 0
+ rc uucp stop start
+
+%daily -u @l_susr@
+ rcService uucp enable yes || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n ${uucp_log_numfiles} -s ${uucp_log_minsize} -d \
+ -z ${uucp_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+ -P "${uucp_log_prolog}" \
+ -E "${uucp_log_epilog} && rc uucp restart" \
+ @l_prefix@/var/uucp/uucp.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/uucp/uucp.spec
============================================================================
$ cvs diff -u -r1.35 -r1.36 uucp.spec
--- openpkg-src/uucp/uucp.spec 23 Jul 2003 13:32:26 -0000 1.35
+++ openpkg-src/uucp/uucp.spec 24 Jul 2003 07:03:19 -0000 1.36
@@ -33,7 +33,7 @@
Group: Communication
License: GPL
Version: 1.07
-Release: 20030723
+Release: 20030724
# list of sources
Source0: ftp://ftp.gnu.org/gnu/uucp/uucp-%{version}.tar.gz
@@ -126,4 +126,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} uucp status 2>/dev/null`
+ [ ".$uucp_active" = .yes ] && %{l_rc} uucp restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} uucp stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/uucp/uucp.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/zebra/rc.zebra
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.zebra
--- openpkg-src/zebra/rc.zebra 22 Jul 2003 08:11:19 -0000 1.11
+++ openpkg-src/zebra/rc.zebra 24 Jul 2003 07:03:19 -0000 1.12
@@ -27,6 +27,7 @@
%start -u @l_susr@
rcService zebra enable yes || exit 0
+ rcService zebra active yes && exit 0
cd @l_prefix@/etc/zebra
@l_prefix@/sbin/zebra -d
for protocol in $zebra_protocols; do
@@ -38,6 +39,7 @@
%stop -u @l_susr@
rcService zebra enable yes || exit 0
+ rcService zebra active no && exit 0
if [ -f @l_prefix@/var/zebra/zebra.pid ]; then
kill -TERM `cat @l_prefix@/var/zebra/zebra.pid` >/dev/null 2>&1 || true
fi
@@ -46,18 +48,22 @@
kill -TERM `cat @l_prefix@/var/zebra/${protocol}d.pid` >/dev/null 2>&1
|| true
fi
done
+ sleep 1
+ rm -f @l_prefix@/var/zebra/*.pid >/dev/null 2>&1 || true
%restart -u @l_susr@
rcService zebra enable yes || exit 0
- rc zebra stop; sleep 1
- rc zebra start
+ rcService zebra active no && exit 0
+ rc zebra stop start
%daily -u @l_susr@
rcService zebra enable yes || exit 0
+
+ # rotate logfile
shtool rotate -f \
-n ${zebra_log_numfiles} -s ${zebra_log_minsize} -d \
- -z ${zebra_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${zebra_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${zebra_log_prolog}" \
- -E "${zebra_log_epilog}" \
+ -E "${zebra_log_epilog} && rc zebra restart" \
@l_prefix@/var/zebra/zebra.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/zebra/zebra.spec
============================================================================
$ cvs diff -u -r1.41 -r1.42 zebra.spec
--- openpkg-src/zebra/zebra.spec 23 Jul 2003 13:32:32 -0000 1.41
+++ openpkg-src/zebra/zebra.spec 24 Jul 2003 07:03:19 -0000 1.42
@@ -33,7 +33,7 @@
Group: Network
License: GPL
Version: 0.93b
-Release: 20030723
+Release: 20030724
# list of sources
Source0: ftp://ftp.zebra.org/pub/zebra/zebra-%{version}.tar.gz
@@ -139,10 +139,17 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} zebra status 2>/dev/null`
+ [ ".$zebra_active" = .yes ] && %{l_rc} zebra restart
+ exit 0
+
%preun
- if [ $1 -eq 0 ]; then
- $RPM_INSTALL_PREFIX/etc/rc zebra stop >/dev/null 2>&1 || true
- rm -f $RPM_INSTALL_PREFIX/var/zebra/*.log
- rm -f $RPM_INSTALL_PREFIX/var/zebra/*.pid
- fi
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} zebra stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/zebra/zebra.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5773 -r1.5774 news.txt
--- openpkg-web/news.txt 23 Jul 2003 20:41:47 -0000 1.5773
+++ openpkg-web/news.txt 24 Jul 2003 07:03:10 -0000 1.5774
@@ -1,3 +1,16 @@
+24-Jul-2003: Upgraded package: P<zebra-0.93b-20030724>
+24-Jul-2003: Upgraded package: P<uucp-1.07-20030724>
+24-Jul-2003: Upgraded package: P<smtpfeed-1.18-20030724>
+24-Jul-2003: Upgraded package: P<samba-2.2.8a-20030724>
+24-Jul-2003: Upgraded package: P<pureftpd-1.1.0-20030724>
+24-Jul-2003: Upgraded package: P<prngd-0.9.27-20030724>
+24-Jul-2003: Upgraded package: P<postfix-2.0.13-20030724>
+24-Jul-2003: Upgraded package: P<portsentry-1.1-20030724>
+24-Jul-2003: Upgraded package: P<openldap-2.1.22-20030724>
+24-Jul-2003: Upgraded package: P<ircd-2.10.3p3-20030724>
+24-Jul-2003: Upgraded package: P<dhcpd-3.0.1rc11-20030724>
+24-Jul-2003: Upgraded package: P<cvs-1.12.1-20030724>
+24-Jul-2003: Upgraded package: P<amd-6.0.9-20030724>
23-Jul-2003: Upgraded package: P<postgresql-7.3.3-20030723>
23-Jul-2003: Upgraded package: P<mysql-4.0.14-20030723>
23-Jul-2003: Upgraded package: P<qt-3.2.0-20030723>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
