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: 24-Sep-2003 18:06:54
Branch: HEAD Handle: 2003092417065202
Modified files:
openpkg-src/arpd arpd.spec rc.arpd
openpkg-web news.txt
Log:
Previous runtime and logging problems are unreproducible so promote to
EVAL, and implement features in ticket #202
Summary:
Revision Changes Path
1.22 +23 -7 openpkg-src/arpd/arpd.spec
1.15 +5 -1 openpkg-src/arpd/rc.arpd
1.6712 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/arpd/arpd.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 arpd.spec
--- openpkg-src/arpd/arpd.spec 22 Jul 2003 08:10:39 -0000 1.21
+++ openpkg-src/arpd/arpd.spec 24 Sep 2003 16:06:54 -0000 1.22
@@ -23,22 +23,17 @@
## SUCH DAMAGE.
##
-# FIXME: On FreeBSD arpd is not starting (broken kevent used by libevent)
-# FIXME: Log is not written
-# FIXME: MSvB: Logging problem is possibly fixed by recent fsl additions
-# FIXME: mlelstv: junk because of too many problems
-
# package information
Name: arpd
Summary: Address Resolution Protocol (ARP) Reply Daemon
URL: http://www.citi.umich.edu/u/provos/honeyd/
Vendor: Niels Provos, Dug Song
Packager: The OpenPKG Project
-Distribution: OpenPKG [JUNK]
+Distribution: OpenPKG [EVAL]
Group: Network
License: GNU
Version: 0.2
-Release: 20030722
+Release: 20030924
# package options
%option with_fsl yes
@@ -127,4 +122,25 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%pre
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} arpd status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} arpd stop 2>/dev/null
+ exit 0
+
+%post
+ if [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
+ [ ".$arpd_active" = .yes ] && %{l_rc} arpd start
+ fi
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} arpd stop 2>/dev/null
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/arpd/rc.arpd
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.arpd
--- openpkg-src/arpd/rc.arpd 22 Jul 2003 08:10:39 -0000 1.14
+++ openpkg-src/arpd/rc.arpd 24 Sep 2003 16:06:54 -0000 1.15
@@ -30,6 +30,7 @@
%start -u @l_susr@
rcService arpd enable yes || exit 0
+ rcService arpd active yes && exit 0
opts=""
if [ ".$arpd_interface" != . ]; then
opts="$opts -i $arpd_interface"
@@ -41,16 +42,19 @@
%stop -u @l_susr@
rcService arpd enable yes || exit 0
+ rcService arpd active no && exit 0
arpd_signal TERM
%restart -u @l_susr@
rcService arpd enable yes || exit 0
+ rcService arpd active no && exit 0
rc arpd start
sleep 2
rc arpd stop
%reload -u @l_susr@
rcService arpd enable yes || exit 0
+ rcService arpd active no && exit 0
arpd_signal HUP
%daily -u @l_susr@
@@ -61,6 +65,6 @@
-n ${arpd_log_numfiles} -s ${arpd_log_minsize} -d \
-z ${arpd_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
-P "${arpd_log_prolog}" \
- -E "${arpd_log_epilog}" \
+ -E "${arpd_log_epilog} && rc arpd restart" \
@l_prefix@/var/arpd/arpd.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6711 -r1.6712 news.txt
--- openpkg-web/news.txt 24 Sep 2003 11:37:26 -0000 1.6711
+++ openpkg-web/news.txt 24 Sep 2003 16:06:52 -0000 1.6712
@@ -1,3 +1,4 @@
+24-Sep-2003: Upgraded package: P<arpd-0.2-20030924>
24-Sep-2003: Upgraded package: P<libart-2.3.16-20030924>
24-Sep-2003: Upgraded package: P<python-2.3.1-20030924>
24-Sep-2003: Upgraded package: P<tomcat4-4.1.27-20030924>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
