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: 11-Nov-2003 17:53:44
Branch: HEAD Handle: 2003111116534202
Modified files:
openpkg-src/nsd fsl.nsd nsd.spec rc.nsd
openpkg-web news.txt
Log:
Implement PR #202
Summary:
Revision Changes Path
1.5 +1 -1 openpkg-src/nsd/fsl.nsd
1.24 +17 -4 openpkg-src/nsd/nsd.spec
1.14 +5 -0 openpkg-src/nsd/rc.nsd
1.7362 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nsd/fsl.nsd
============================================================================
$ cvs diff -u -r1.4 -r1.5 fsl.nsd
--- openpkg-src/nsd/fsl.nsd 14 Jul 2003 18:32:33 -0000 1.4
+++ openpkg-src/nsd/fsl.nsd 11 Nov 2003 16:53:44 -0000 1.5
@@ -9,7 +9,7 @@
-> {
debug: file(
path="@l_prefix@/var/nsd/nsd.log",
- perm=0644
+ perm=0644, jitter=1, monitor=3600
)
}
};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nsd/nsd.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 nsd.spec
--- openpkg-src/nsd/nsd.spec 28 Jul 2003 18:58:44 -0000 1.23
+++ openpkg-src/nsd/nsd.spec 11 Nov 2003 16:53:44 -0000 1.24
@@ -37,7 +37,7 @@
Group: DNS
License: GPL
Version: 1.2.2
-Release: 20030728
+Release: 20031111
# package option
%option with_fsl yes
@@ -56,8 +56,8 @@
BuildPreReq: OpenPKG, openpkg >= 20030718, make
PreReq: OpenPKG, openpkg >= 20030718
%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
@@ -159,6 +159,19 @@
rm -rf $RPM_BUILD_ROOT
%post
- # update database
+ # update database in every case
$RPM_INSTALL_PREFIX/sbin/nsdc rebuild
+
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} nsd status 2>/dev/null`
+ [ ".$nsd_active" = .yes ] && %{l_rc} nsd restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} nsd stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/nsd/*.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nsd/rc.nsd
============================================================================
$ cvs diff -u -r1.13 -r1.14 rc.nsd
--- openpkg-src/nsd/rc.nsd 21 Jul 2003 08:12:40 -0000 1.13
+++ openpkg-src/nsd/rc.nsd 11 Nov 2003 16:53:44 -0000 1.14
@@ -21,18 +21,23 @@
%start -p 100 -u @l_susr@
rcService nsd enable yes || exit 0
+ rcService nsd active yes && exit 0
@l_prefix@/sbin/nsdc start
%stop -p 100 -u @l_susr@
rcService nsd enable yes || exit 0
+ rcService nsd active no && exit 0
@l_prefix@/sbin/nsdc stop
%reload -p 100 -u @l_susr@
rcService nsd enable yes || exit 0
+ rcService nsd active no && exit 0
@l_prefix@/sbin/nsdc reload
%daily -u @l_rusr@
rcService nsd enable yes || exit 0
+
+ # rotate logfile
shtool rotate -f \
-n ${nsd_log_numfiles} -s ${nsd_log_minsize} -d \
-z ${nsd_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7361 -r1.7362 news.txt
--- openpkg-web/news.txt 11 Nov 2003 15:16:09 -0000 1.7361
+++ openpkg-web/news.txt 11 Nov 2003 16:53:42 -0000 1.7362
@@ -1,3 +1,4 @@
+11-Nov-2003: Upgraded package: P<nsd-1.2.2-20031111>
11-Nov-2003: Upgraded package: P<nessus-tool-2.0.9-20031111>
11-Nov-2003: Upgraded package: P<mutt15-1.5.5.1i-20031111>
10-Nov-2003: Upgraded package: P<mng-1.0.6-20031110>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
