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: 21-Oct-2003 16:16:10
Branch: HEAD Handle: 2003102115160802
Modified files:
openpkg-src/djbdns djbdns.spec rc.djbdns
openpkg-web news.txt
Log:
Correct cut and paste errors in run commands and implement #202
without logging features (this package has some logging but is way too
inconsistent to try to enforce OpenPKG standards)
Summary:
Revision Changes Path
1.17 +14 -4 openpkg-src/djbdns/djbdns.spec
1.13 +26 -30 openpkg-src/djbdns/rc.djbdns
1.7096 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/djbdns/djbdns.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 djbdns.spec
--- openpkg-src/djbdns/djbdns.spec 12 Sep 2003 11:10:11 -0000 1.16
+++ openpkg-src/djbdns/djbdns.spec 21 Oct 2003 14:16:10 -0000 1.17
@@ -37,7 +37,7 @@
Group: Misc
License: GPL
Version: %{V_djbdns}
-Release: 20030912
+Release: 20031021
# list of sources
Source0: http://cr.yp.to/djbdns/djbdns-%{V_djbdns}.tar.gz
@@ -135,8 +135,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} djbdns status 2>/dev/null`
+ [ ".$djbdns_active" = .yes ] && %{l_rc} djbdns restart
+ exit 0
+
%preun
- if [ $1 -eq 0 ]; then
- $RPM_INSTALL_PREFIX/etc/rc djbdns stop
- fi
+ [ $1 -eq 0 ] && $RPM_INSTALL_PREFIX/etc/rc djbdns stop
+
+ # before erase, stop service
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} djbdns stop 2>/dev/null
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/djbdns/rc.djbdns
============================================================================
$ cvs diff -u -r1.12 -r1.13 rc.djbdns
--- openpkg-src/djbdns/rc.djbdns 22 Jul 2003 08:10:45 -0000 1.12
+++ openpkg-src/djbdns/rc.djbdns 21 Oct 2003 14:16:10 -0000 1.13
@@ -8,53 +8,49 @@
djbdns_runsvc="@l_prefix@/libexec/djbdns/bin/djbdnsrunsvc"
djbdns_bin="@l_prefix@/libexec/djbdns/bin"
djbdns_var="@l_prefix@/var/djbdns"
- djbdns_progs="dnscache tinydns"
%common
djbdns_signal () {
local s
local rc=0
- for s in $djbdns_progs ; do
+ for s in dnscache tinydns; do
if [ -f $djbdns_var/$s.pid ]; then
kill -$1 `cat $djbdns_var/$s.pid` || rc=1
fi
done
[ $rc -eq 0 ]
}
- djbdns_start () {
- local s
- for s in $djbdns_progs ; do
- if [ -d $djbdns_var/$s ]; then
- $djbdns_runsvc \
- $djbdns_bin/$s \
- $djbdns_var/$s \
- >$djbdns_var/$s.pid
- fi
- done
- }
- djbdns_stop () {
- local s
- djbdns_signal TERM
- for s in $djbdns_progs ; do
- rm -f $djbdns_var/$s.pid 2>/dev/null || true
- done
- }
%status -u @l_susr@ -o
- ntp_usable="unknown"
- ntp_active="no"
- rcService ntp enable yes && \
- rcVarIsYes ntp_daemon && \
- ntp_signal 0 && ntp_active="yes"
- echo "ntp_enable=\"$ntp_enable\""
- echo "ntp_usable=\"$ntp_usable\""
- echo "ntp_active=\"$ntp_active\""
+ djbdns_usable="unknown"
+ djbdns_active="no"
+ rcService djbdns enable yes && \
+ rcVarIsYes djbdns_daemon && \
+ [ -d $djbdns_var/dnscache ] || \
+ [ -d $djbdns_var/tinydns ] && \
+ djbdns_usable="yes"
+ rcService djbdns enable yes && \
+ rcVarIsYes djbdns_daemon && \
+ djbdns_signal 0 && djbdns_active="yes"
+ echo "djbdns_enable=\"$djbdns_enable\""
+ echo "djbdns_usable=\"$djbdns_usable\""
+ echo "djbdns_active=\"$djbdns_active\""
%start -u @l_susr@
rcService djbdns enable yes || exit 0
- djbdns_start
+ rcService djbdns usable yes || exit 0
+ rcService djbdns active yes && exit 0
+ [ -d $djbdns_var/dnscache ] && $djbdns_runsvc \
+ $djbdns_bin/dnscache $djbdns_var/dnscache \
+ >$djbdns_var/dnscache.pid
+ [ -d $djbdns_var/tinydns ] && $djbdns_runsvc \
+ $djbdns_bin/tinydns $djbdns_var/tinydns \
+ >$djbdns_var/tinydns.pid
%stop -u @l_susr@
rcService djbdns enable yes || exit 0
- djbdns_stop
+ rcService djbdns active no && exit 0
+ djbdns_signal TERM
+ rm -f $djbdns_var/dnscache.pid 2>/dev/null || true
+ rm -f $djbdns_var/tinydns.pid 2>/dev/null || true
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7095 -r1.7096 news.txt
--- openpkg-web/news.txt 21 Oct 2003 10:59:06 -0000 1.7095
+++ openpkg-web/news.txt 21 Oct 2003 14:16:08 -0000 1.7096
@@ -1,3 +1,4 @@
+21-Oct-2003: Upgraded package: P<djbdns-1.05-20031021>
21-Oct-2003: Upgraded package: P<dhcp-agent-0.41-20031021>
21-Oct-2003: New package: P<tcpwrappers-7.6k-20031021>
21-Oct-2003: Upgraded package: P<perl-www-1.2.2-1.2.2>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
