OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 29-Jan-2003 14:40:52
Branch: HEAD Handle: 2003012913405001
Added files:
openpkg-src/djbdns djbdnsrunsvc
Modified files:
openpkg-src/djbdns djbdns.spec djbdnssetup rc.djbdns
openpkg-web news.txt
Log:
polishing, provide simple setup and start/stop scripts
Summary:
Revision Changes Path
1.2 +19 -2 openpkg-src/djbdns/djbdns.spec
1.1 +32 -0 openpkg-src/djbdns/djbdnsrunsvc
1.2 +1 -1 openpkg-src/djbdns/djbdnssetup
1.2 +21 -11 openpkg-src/djbdns/rc.djbdns
1.3094 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/djbdns/djbdns.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 djbdns.spec
--- openpkg-src/djbdns/djbdns.spec 29 Jan 2003 12:09:02 -0000 1.1
+++ openpkg-src/djbdns/djbdns.spec 29 Jan 2003 13:40:51 -0000 1.2
@@ -43,6 +43,7 @@
Source1:
http://smarden.org/pape/djb/manpages/djbdns-%{V_djbdns}-man-%{V_manual}.tar.gz
Source2: rc.djbdns
Source3: djbdnssetup
+Source4: djbdnsrunsvc
Patch0: djbdns.patch
# build information
@@ -81,13 +82,19 @@
$RPM_BUILD_ROOT%{l_prefix}/man/man8
for f in \
axfr-get cachetest dnsfilter dnsip dnsipq dnsmx dnsname \
- dnsq dnsqr dnstrace dnstxt pickdns-data random-ip rbldns-data \
- tinydns-data tinydns-edit tinydns-get ; do
+ dnsq dnsqr dnstrace dnstxt pickdns-data random-ip \
+ rbldns-data tinydns-data tinydns-edit tinydns-get ; do
%{l_shtool} install -c -s -m 755 \
$f \
$RPM_BUILD_ROOT%{l_prefix}/bin
done
for f in \
+ dnstracesort ; do
+ %{l_shtool} install -c -m 755 \
+ $f \
+ $RPM_BUILD_ROOT%{l_prefix}/bin
+ done
+ for f in \
axfrdns-conf dnscache-conf pickdns-conf rbldns-conf \
tinydns-conf walldns-conf ; do
%{l_shtool} install -c -s -m 755 \
@@ -120,6 +127,12 @@
-e 's;@l_rgrp@;%{l_rgrp};g' \
%{SOURCE djbdnssetup} \
$RPM_BUILD_ROOT%{l_prefix}/sbin
+ %{l_shtool} install -c -m 755 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ -e 's;@l_rusr@;%{l_rusr};g' \
+ -e 's;@l_rgrp@;%{l_rgrp};g' \
+ %{SOURCE djbdnsrunsvc} \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/djbdns/bin
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%attr(0700,%{l_susr},%{l_sgrp}) %{l_prefix}/sbin/djbdnssetup'
@@ -129,3 +142,7 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%preun
+ if [ $1 -eq 0 ]; then
+ $RPM_INSTALL_PREFIX/etc/rc djbdns stop
+ fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/djbdns/djbdnsrunsvc
============================================================================
$ cvs diff -u -r0 -r1.1 djbdnsrunsvc
--- /dev/null 2003-01-29 14:40:51.000000000 +0100
+++ djbdnsrunsvc 2003-01-29 14:40:52.000000000 +0100
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+if [ $# != 2 ]; then
+ echo "usage: $0 svc dir"
+ exit 1
+fi
+
+svc=$1
+dir=$2
+
+chdir $dir || exit 1
+
+for i in env/*; do
+ v=`basename $i`
+ c=`cat $i`
+ eval "$v=$c; export $v"
+done
+
+UID=cw-r
+GID=cw-r
+export UID GID
+
+in=/dev/null
+out=/dev/null
+
+if [ -f seed ]; then
+ in='seed';
+fi
+
+$svc <$in >$out 2>&1 &
+
+echo $!
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/djbdns/djbdnssetup
============================================================================
$ cvs diff -u -r1.1 -r1.2 djbdnssetup
--- openpkg-src/djbdns/djbdnssetup 29 Jan 2003 12:09:02 -0000 1.1
+++ openpkg-src/djbdns/djbdnssetup 29 Jan 2003 13:40:51 -0000 1.2
@@ -10,7 +10,7 @@
resolve_ip=$1
serve_ip=$2
-rm -r @l_prefix@/var/djbdns/dnscache
+rm -rf @l_prefix@/var/djbdns/dnscache
@l_prefix@/sbin/dnscache-conf @l_rusr@ @l_rusr@ \
@l_prefix@/var/djbdns/dnscache \
$resolve_ip
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/djbdns/rc.djbdns
============================================================================
$ cvs diff -u -r1.1 -r1.2 rc.djbdns
--- openpkg-src/djbdns/rc.djbdns 29 Jan 2003 12:09:02 -0000 1.1
+++ openpkg-src/djbdns/rc.djbdns 29 Jan 2003 13:40:51 -0000 1.2
@@ -5,21 +5,31 @@
%config
djbdns_enable="yes"
+ djbdns_runsvc="@l_prefix@/libexec/djbdns/bin/djbdnsrunsvc"
+ djbdns_bin="@l_prefix@/libexec/djbdns/bin"
+ djbdns_var="@l_prefix@/var/djbdns"
%start -p 200 -u root
opServiceEnabled djbdns || exit 0
- echo "Don't know how to start djbdns"
- exit 1
+ for s in dnscache tinydns axfrdns ; do
+ if [ -d $djbdns_var/$s ]; then
+ $djbdns_runsvc \
+ $djbdns_bin/$s \
+ $djbdns_var/$s \
+ > $djbdns_var/$s.pid
+ fi
+ done
%stop -p 200 -u root
opServiceEnabled djbdns || exit 0
- echo "Don't know how to stop djbdns"
- exit 1
+ for s in dnscache tinydns axfrdns ; do
+ if [ -f $djbdns_var/$s.pid ]; then
+ pid=`cat $djbdns_var/$s.pid`
+ if [ x"$pid" != x ]; then
+ kill -TERM "$pid"
+ else
+ echo "ERROR: Invalid pid-file '$djbdns_var/$s.pid'"
+ fi
+ fi
+ done
-%restart -u root
- opServiceEnabled djbdns || exit 0
- echo "Don't know how to restart djbdns"
- exit 1
-
-%daily -u root
- opServiceEnabled djbdns || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3093 -r1.3094 news.txt
--- openpkg-web/news.txt 29 Jan 2003 12:09:01 -0000 1.3093
+++ openpkg-web/news.txt 29 Jan 2003 13:40:50 -0000 1.3094
@@ -1,3 +1,4 @@
+29-Jan-2003: Upgraded package: P<djbdns-1.05-20030129>
29-Jan-2003: New package: P<djbdns-1.05-20030129>
29-Jan-2003: Upgraded package: P<vim-6.1.309-20030129>
29-Jan-2003: Upgraded package: P<perl-util-20030129-20030129>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
