[CVS] OpenPKG: openpkg-src/arpd/ arpd.spec rc.arpd openpkg-web/ news.t...
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: 29-Sep-2003 15:28:17 Branch: HEAD Handle: 2003092914281501 Modified files: openpkg-src/arpdarpd.spec rc.arpd openpkg-web news.txt Log: Make default network match that of honeyd Summary: RevisionChanges Path 1.24+1 -1 openpkg-src/arpd/arpd.spec 1.18+1 -1 openpkg-src/arpd/rc.arpd 1.6782 +1 -0 openpkg-web/news.txt patch -p0 '@@ .' Index: openpkg-src/arpd/arpd.spec $ cvs diff -u -r1.23 -r1.24 arpd.spec --- openpkg-src/arpd/arpd.spec25 Sep 2003 21:26:36 - 1.23 +++ openpkg-src/arpd/arpd.spec29 Sep 2003 13:28:16 - 1.24 @@ -33,7 +33,7 @@ Group:Network License: GNU Version: 0.2 -Release: 20030925 +Release: 20030929 # package options %option with_fsl yes @@ . patch -p0 '@@ .' Index: openpkg-src/arpd/rc.arpd $ cvs diff -u -r1.17 -r1.18 rc.arpd --- openpkg-src/arpd/rc.arpd 25 Sep 2003 21:26:36 - 1.17 +++ openpkg-src/arpd/rc.arpd 29 Sep 2003 13:28:16 - 1.18 @@ -10,7 +10,7 @@ arpd_log_numfiles=10 arpd_log_minsize=1M arpd_log_complevel=9 -arpd_ip_network=192.168.1.0/24 +arpd_ip_network=192.168.100.0/24 arpd_hw_iface= %common @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.6781 -r1.6782 news.txt --- openpkg-web/news.txt 29 Sep 2003 13:04:15 - 1.6781 +++ openpkg-web/news.txt 29 Sep 2003 13:28:15 - 1.6782 @@ -1,3 +1,4 @@ +29-Sep-2003: Upgraded package: Parpd-0.2-20030929 29-Sep-2003: Upgraded package: Popenpkg-20030929-20030929 29-Sep-2003: Upgraded package: Plyx-1.3.3-20030929 29-Sep-2003: Upgraded package: Pmutt-1.4.1i-20030929 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/arpd/ arpd.spec rc.arpd openpkg-web/ news.t...
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/arpdarpd.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:
RevisionChanges 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.spec24 Sep 2003 16:06:54 - 1.22
+++ openpkg-src/arpd/arpd.spec25 Sep 2003 21:26:36 - 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 21 || 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 - 1.16
+++ openpkg-src/arpd/rc.arpd 25 Sep 2003 21:26:36 - 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 21
+if [ .$arpd_hw_iface != . ]; then
+arpd_interface=-i $arpd_hw_iface
+fi
+@l_prefix@/sbin/arpd \
+$arpd_interface \
+$arpd_ip_network \
+/dev/null 21
%stop -u @l_susr@
rcService arpd enable yes || exit 0
@@ -55,7 +62,7 @@
#
[CVS] OpenPKG: openpkg-src/arpd/ arpd.spec rc.arpd openpkg-web/ news.t...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Jun-2003 15:56:53
Branch: HEAD Handle: 2003062814565101
Modified files:
openpkg-src/arpdarpd.spec rc.arpd
openpkg-web news.txt
Log:
fix introduced logfile path
Summary:
RevisionChanges Path
1.9 +1 -1 openpkg-src/arpd/arpd.spec
1.6 +1 -1 openpkg-src/arpd/rc.arpd
1.5048 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/arpd/arpd.spec
$ cvs diff -u -r1.8 -r1.9 arpd.spec
--- openpkg-src/arpd/arpd.spec24 Jun 2003 16:02:21 - 1.8
+++ openpkg-src/arpd/arpd.spec28 Jun 2003 13:56:52 - 1.9
@@ -37,7 +37,7 @@
Group:Network
License: GNU
Version: 0.2
-Release: 20030624
+Release: 20030628
# package options
%option with_fsl yes
@@ .
patch -p0 '@@ .'
Index: openpkg-src/arpd/rc.arpd
$ cvs diff -u -r1.5 -r1.6 rc.arpd
--- openpkg-src/arpd/rc.arpd 24 Jun 2003 16:02:21 - 1.5
+++ openpkg-src/arpd/rc.arpd 28 Jun 2003 13:56:52 - 1.6
@@ -44,4 +44,4 @@
-z${arpd_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
-P ${arpd_log_prolog} \
-E ${arpd_log_epilog} \
-@l_prefix@/var/arpd/log/arpd.log
+@l_prefix@/var/arpd/arpd.log
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5047 -r1.5048 news.txt
--- openpkg-web/news.txt 28 Jun 2003 13:54:37 - 1.5047
+++ openpkg-web/news.txt 28 Jun 2003 13:56:51 - 1.5048
@@ -1,3 +1,4 @@
+28-Jun-2003: Upgraded package: Parpd-0.2-20030628
28-Jun-2003: Upgraded package: Pmonit-3.2-20030628
28-Jun-2003: Upgraded package: Ppostfix-2.0.12-20030628
28-Jun-2003: Upgraded package: Paica-0.81-20030628
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/arpd/ arpd.spec rc.arpd openpkg-web/ news.t...
On Tue, Jun 24, 2003, Thomas Lotterer wrote: [...] +@l_prefix@/var/arpd/log/arpd.log [...] Same here: the path does not correspond to the one in fsl.arpd. Now fixed. Ralf S. Engelschall [EMAIL PROTECTED] www.engelschall.com __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/arpd/ arpd.spec rc.arpd openpkg-web/ news.t...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 24-Jun-2003 15:26:38
Branch: HEAD Handle: 2003062414263601
Modified files:
openpkg-src/arpdarpd.spec rc.arpd
openpkg-web news.txt
Log:
add/unify log file trimming
Summary:
RevisionChanges Path
1.7 +1 -1 openpkg-src/arpd/arpd.spec
1.4 +15 -0 openpkg-src/arpd/rc.arpd
1.4984 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/arpd/arpd.spec
$ cvs diff -u -r1.6 -r1.7 arpd.spec
--- openpkg-src/arpd/arpd.spec23 Jun 2003 20:47:37 - 1.6
+++ openpkg-src/arpd/arpd.spec24 Jun 2003 13:26:37 - 1.7
@@ -37,7 +37,7 @@
Group:Network
License: GNU
Version: 0.2
-Release: 20030623
+Release: 20030624
# package options
%option with_fsl yes
@@ .
patch -p0 '@@ .'
Index: openpkg-src/arpd/rc.arpd
$ cvs diff -u -r1.3 -r1.4 rc.arpd
--- openpkg-src/arpd/rc.arpd 24 Jun 2003 12:07:39 - 1.3
+++ openpkg-src/arpd/rc.arpd 24 Jun 2003 13:26:37 - 1.4
@@ -7,6 +7,11 @@
arpd_enable=yes
arpd_interface=
arpd_listen=
+arpd_log_prolog=true
+arpd_log_epilog=true
+arpd_log_numfiles=10
+arpd_log_minsize=1M
+arpd_log_complevel=9
%start -p 200 -u @l_susr@
opServiceEnabled arpd || exit 0
@@ -30,3 +35,13 @@
kill -HUP `cat @l_prefix@/var/arpd/arpd.pid`
fi
+%daily -u @l_susr@
+opServiceEnabled arpd || exit 0
+
+# rotate logfile
+shtool rotate -f \
+-n${arpd_log_numfiles} -s${arpd_log_minsize} -d \
+-z${arpd_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+-P ${arpd_log_prolog} \
+-E ${arpd_log_epilog} \
+@l_prefix@/var/arpd/log/arpd.log
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4983 -r1.4984 news.txt
--- openpkg-web/news.txt 24 Jun 2003 12:21:53 - 1.4983
+++ openpkg-web/news.txt 24 Jun 2003 13:26:36 - 1.4984
@@ -1,3 +1,4 @@
+24-Jun-2003: Upgraded package: Parpd-0.2-20030624
24-Jun-2003: Upgraded package: Pgettext-0.12.1-20030624
24-Jun-2003: Upgraded package: Pinn-2.4.0-20030624
24-Jun-2003: Upgraded package: Ppostfix-2.0.12-20030624
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
