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: 25-Sep-2003 23:26:37
Branch: HEAD Handle: 2003092522263501
Modified files:
openpkg-src/arpd arpd.spec rc.arpd
openpkg-web news.txt
Log:
Minimize installation logic, remove log files, use 192.168.1.0/24 as
the default network, improve run command start logic, correct log file
rotation, and reorder dependencies.
Summary:
Revision Changes Path
1.23 +14 -15 openpkg-src/arpd/arpd.spec
1.17 +10 -3 openpkg-src/arpd/rc.arpd
1.6736 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/arpd/arpd.spec
============================================================================
$ cvs diff -u -r1.22 -r1.23 arpd.spec
--- openpkg-src/arpd/arpd.spec 24 Sep 2003 16:06:54 -0000 1.22
+++ openpkg-src/arpd/arpd.spec 25 Sep 2003 21:26:36 -0000 1.23
@@ -33,7 +33,7 @@
Group: Network
License: GNU
Version: 0.2
-Release: 20030924
+Release: 20030925
# package options
%option with_fsl yes
@@ -47,10 +47,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030718, gcc
-PreReq: OpenPKG, openpkg >= 20030718
-BuildPreReq: libdnet, libpcap, libevent
-PreReq: libdnet, libpcap, libevent
+BuildPreReq: OpenPKG, openpkg >= 20030718, gcc, libdnet, libpcap, libevent
+PreReq: OpenPKG, openpkg >= 20030718, libdnet, libpcap, libevent
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ -75,11 +73,11 @@
-e 's;LIBS=$DNETLIB;LIBS="$LIBS $DNETLIB";' \
-e 's;CFLAGS=$DNETINC;CFLAGS="$CFLAGS $DNETINC";' \
configure
-
-%build
%{l_shtool} subst \
-e 's;/var/run/arpd.pid;%{l_prefix}/var/arpd/arpd.pid;' \
arpd.c arpd.8
+
+%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
@@ -94,15 +92,14 @@
%install
rm -rf $RPM_BUILD_ROOT
+
+ # create directories
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
- $RPM_BUILD_ROOT%{l_prefix}/sbin \
- $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
$RPM_BUILD_ROOT%{l_prefix}/var/arpd
- %{l_shtool} install -c -s -m 755 \
- arpd $RPM_BUILD_ROOT%{l_prefix}/sbin/
- %{l_shtool} install -c -m 644 \
- arpd.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
+
+ # install files
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.arpd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
@@ -112,11 +109,12 @@
%{SOURCE fsl.arpd} \
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+ # determine file list
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%not %dir %{l_prefix}/etc/fsl' \
- '%attr(775,%{l_musr},%{l_rgrp}) %{l_prefix}/var/arpd' \
- '%config %{l_prefix}/etc/fsl/fsl.arpd'
+ '%config %{l_prefix}/etc/fsl/fsl.arpd' \
+ '%attr(775,%{l_musr},%{l_rgrp}) %{l_prefix}/var/arpd'
%files -f files
@@ -142,5 +140,6 @@
# before erase, stop service and remove log files
[ $1 -eq 0 ] || exit 0
%{l_rc} arpd stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/arpd/*.log* >/dev/null 2>&1 || true
exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/arpd/rc.arpd
============================================================================
$ cvs diff -u -r1.16 -r1.17 rc.arpd
--- openpkg-src/arpd/rc.arpd 24 Sep 2003 20:55:53 -0000 1.16
+++ openpkg-src/arpd/rc.arpd 25 Sep 2003 21:26:36 -0000 1.17
@@ -10,7 +10,8 @@
arpd_log_numfiles="10"
arpd_log_minsize="1M"
arpd_log_complevel="9"
- arpd_ip_network="127.0.0.0/24"
+ arpd_ip_network="192.168.1.0/24"
+ arpd_hw_iface=""
%common
arpd_pidfile="@l_prefix@/var/arpd/arpd.pid"
@@ -30,7 +31,13 @@
%start -u @l_susr@
rcService arpd enable yes || exit 0
rcService arpd active yes && exit 0
- @l_prefix@/sbin/arpd $arpd_ip_network >/dev/null 2>&1
+ if [ ".$arpd_hw_iface" != . ]; then
+ arpd_interface="-i $arpd_hw_iface"
+ fi
+ @l_prefix@/sbin/arpd \
+ $arpd_interface \
+ $arpd_ip_network \
+ >/dev/null 2>&1
%stop -u @l_susr@
rcService arpd enable yes || exit 0
@@ -55,7 +62,7 @@
# rotate logfile
shtool rotate -f \
-n ${arpd_log_numfiles} -s ${arpd_log_minsize} -d \
- -z ${arpd_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${arpd_log_complevel} -o @l_susr@ -g @l_rgrp@ -m 644 \
-P "${arpd_log_prolog}" \
-E "${arpd_log_epilog} && rc arpd restart" \
@l_prefix@/var/arpd/arpd.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6735 -r1.6736 news.txt
--- openpkg-web/news.txt 25 Sep 2003 18:26:25 -0000 1.6735
+++ openpkg-web/news.txt 25 Sep 2003 21:26:35 -0000 1.6736
@@ -1,3 +1,4 @@
+25-Sep-2003: Upgraded package: P<arpd-0.2-20030925>
25-Sep-2003: Upgraded package: P<j2se14-1.4.2-20030925>
25-Sep-2003: Upgraded package: P<j2se-1.3.1-20030925>
25-Sep-2003: Upgraded package: P<fsl-1.3b1-20030925>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
