OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 13-Aug-2003 10:26:40
Branch: HEAD Handle: 2003081309263801
Modified files:
openpkg-src/cvsd cvsd.conf cvsd.spec rc.cvsd
openpkg-web news.txt
Log:
Complete changes to comply with #202 features
Summary:
Revision Changes Path
1.4 +1 -1 openpkg-src/cvsd/cvsd.conf
1.38 +23 -1 openpkg-src/cvsd/cvsd.spec
1.13 +6 -2 openpkg-src/cvsd/rc.cvsd
1.6137 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvsd/cvsd.conf
============================================================================
$ cvs diff -u -r1.3 -r1.4 cvsd.conf
--- openpkg-src/cvsd/cvsd.conf 3 Jul 2003 11:10:17 -0000 1.3
+++ openpkg-src/cvsd/cvsd.conf 13 Aug 2003 08:26:39 -0000 1.4
@@ -4,7 +4,7 @@
PidFile @l_prefix@/var/cvsd/cvsd.pid
Limit coredumpsize 0
-Listen * 2401
+Listen 127.0.0.1 2401
MaxConnections 10
RootJail /cvs-chroot
Uid @l_nusr@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvsd/cvsd.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 cvsd.spec
--- openpkg-src/cvsd/cvsd.spec 22 Jul 2003 08:10:43 -0000 1.37
+++ openpkg-src/cvsd/cvsd.spec 13 Aug 2003 08:26:39 -0000 1.38
@@ -33,7 +33,7 @@
Group: SCM
License: GPL
Version: 0.9.19
-Release: 20030722
+Release: 20030813
# package options
%option with_fsl yes
@@ -129,4 +129,26 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%pre
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} cvsd status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} cvsd stop 2>/dev/null
+ exit 0
+
+%post
+ if [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
+ [ ".$cvsd_active" = .yes ] && %{l_rc} cvsd start
+ fi
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} cvsd stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/cvsd/*.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvsd/rc.cvsd
============================================================================
$ cvs diff -u -r1.12 -r1.13 rc.cvsd
--- openpkg-src/cvsd/rc.cvsd 22 Jul 2003 08:10:43 -0000 1.12
+++ openpkg-src/cvsd/rc.cvsd 13 Aug 2003 08:26:39 -0000 1.13
@@ -43,15 +43,19 @@
%start -u @l_susr@
rcService cvsd enable yes || exit 0
+ rcService cvsd active yes && exit 0
cvsd_chroot || exit 0;
@l_prefix@/sbin/cvsd
%stop -u @l_susr@
rcService cvsd enable yes || exit 0
+ rcService cvsd active no && exit 0
cvsd_signal TERM
+ rm -f $cvsd_pidfile
%restart -u @l_susr@
rcService cvsd enable yes || exit 0
+ rcService cvsd active no && exit 0
rc cvsd stop
sleep 2
rc cvsd start
@@ -62,8 +66,8 @@
# rotate logfile
shtool rotate -f \
-n ${cvsd_log_numfiles} -s ${cvsd_log_minsize} -d \
- -z ${cvsd_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${cvsd_log_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
-P "${cvsd_log_prolog}" \
- -E "${cvsd_log_epilog}" \
+ -E "${cvsd_log_epilog} && rc cvsd restart" \
@l_prefix@/var/cvsd/cvsd.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6136 -r1.6137 news.txt
--- openpkg-web/news.txt 13 Aug 2003 06:46:21 -0000 1.6136
+++ openpkg-web/news.txt 13 Aug 2003 08:26:38 -0000 1.6137
@@ -1,3 +1,4 @@
+13-Aug-2003: Upgraded package: P<cvsd-0.9.19-20030813>
13-Aug-2003: Upgraded package: P<amavisd-20030616p4-20030813>
12-Aug-2003: Upgraded package: P<php-4.3.2-20030812>
12-Aug-2003: Upgraded package: P<python-2.3-20030812>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
