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-Nov-2003 18:36:02
Branch: HEAD Handle: 2003111317360101
Modified files:
openpkg-src/pound fsl.pound pound.spec rc.pound
openpkg-web news.txt
Log:
Implement PR #202
Summary:
Revision Changes Path
1.5 +1 -1 openpkg-src/pound/fsl.pound
1.18 +17 -3 openpkg-src/pound/pound.spec
1.14 +23 -1 openpkg-src/pound/rc.pound
1.7389 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pound/fsl.pound
============================================================================
$ cvs diff -u -r1.4 -r1.5 fsl.pound
--- openpkg-src/pound/fsl.pound 14 Jul 2003 18:32:40 -0000 1.4
+++ openpkg-src/pound/fsl.pound 13 Nov 2003 17:36:02 -0000 1.5
@@ -9,7 +9,7 @@
-> {
debug: file(
path="@l_prefix@/var/pound/pound.log",
- perm=0644
+ perm=0660, jitter=1, monitor=3600
)
}
};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pound/pound.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 pound.spec
--- openpkg-src/pound/pound.spec 14 Oct 2003 18:23:08 -0000 1.17
+++ openpkg-src/pound/pound.spec 13 Nov 2003 17:36:02 -0000 1.18
@@ -33,7 +33,7 @@
Group: Web
License: GPL
Version: 1.5
-Release: 20031014
+Release: 20031113
# package options
%option with_fsl yes
@@ -55,8 +55,8 @@
BuildPreReq: pth, pth::with_pthread = yes
PreReq: pth, pth::with_pthread = yes
%if "%{with_fsl}" == "yes"
-BuildPreReq: fsl >= 1.2.0
-PreReq: fsl >= 1.2.0
+BuildPreReq: fsl >= 1.3.0
+PreReq: fsl >= 1.3.0
%endif
AutoReq: no
AutoReqProv: no
@@ -148,4 +148,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} pound status 2>/dev/null`
+ [ ".$pound_active" = .yes ] && %{l_rc} pound restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} pound stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/pound/*.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pound/rc.pound
============================================================================
$ cvs diff -u -r1.13 -r1.14 rc.pound
--- openpkg-src/pound/rc.pound 22 Jul 2003 08:11:03 -0000 1.13
+++ openpkg-src/pound/rc.pound 13 Nov 2003 17:36:02 -0000 1.14
@@ -11,14 +11,36 @@
pound_log_minsize="1M"
pound_log_complevel="9"
+%common
+ pound_pidfile="@l_prefix@/var/pound/pound.pid"
+ pound_signal () {
+ [ -f $pound_pidfile ] && kill -$1 `cat $pound_pidfile`
+ }
+
+%status -u @l_susr@ -o
+ pound_usable="unknown"
+ pound_active="no"
+ rcService pound enable yes && \
+ pound_signal 0 && pound_active="yes"
+ echo "pound_enable=\"$pound_enable\""
+ echo "pound_usable=\"$pound_usable\""
+ echo "pound_active=\"$pound_active\""
+
%start -u @l_susr@
rcService pound enable yes || exit 0
+ rcService pound active yes && exit 0
@l_prefix@/sbin/pound
%stop -u @l_susr@
rcService pound enable yes || exit 0
- kill -TERM `cat @l_prefix@/var/pound/pound.pid`
+ rcService pound active no && exit 0
+ pound_signal TERM
sleep 1
+
+%restart -u @l_susr@
+ rcService pound enable yes || exit 0
+ rcService pound active no && exit 0
+ rc pound stop start
%daily -u @l_susr@
rcService pound enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7388 -r1.7389 news.txt
--- openpkg-web/news.txt 13 Nov 2003 17:15:07 -0000 1.7388
+++ openpkg-web/news.txt 13 Nov 2003 17:36:01 -0000 1.7389
@@ -1,3 +1,4 @@
+13-Nov-2003: Upgraded package: P<pound-1.5-20031113>
13-Nov-2003: Upgraded package: P<nessus-tool-2.0.9-20031113>
13-Nov-2003: Upgraded package: P<openvpn-1.4.3-20031113>
13-Nov-2003: Upgraded package: P<vim-6.2.154-20031113>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
