head 1.7; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.2.2.2 OPENPKG_E1_FP:1.2.2.2 OPENPKG_2_STABLE_MP:1.2 OPENPKG_2_STABLE_20061018:1.2.2.2 OPENPKG_2_STABLE:1.2.0.2; locks; strict; comment @# @; 1.7 date 2008.03.29.08.52.35; author rse; state Exp; branches; next 1.6; commitid toyykXfpyq6SZZWs; 1.6 date 2007.11.18.01.59.26; author cs; state Exp; branches; next 1.5; commitid xHAmi200KxwcXZFs; 1.5 date 2007.08.28.08.25.12; author rse; state Exp; branches; next 1.4; commitid Dq4IYSGPXytXIuvs; 1.4 date 2006.11.24.17.11.32; author rse; state Exp; branches; next 1.3; commitid MBRsF8a8iWUyxWVr; 1.3 date 2006.10.29.15.44.20; author rse; state Exp; branches; next 1.2; commitid IUIUMVXYexAsTASr; 1.2 date 2006.10.12.08.17.11; author rse; state Exp; branches 1.2.2.1; next 1.1; commitid M0gkADxSeQfWXmQr; 1.1 date 2006.05.23.13.34.01; author rse; state Exp; branches; next ; commitid ZZQxxvArDQLCh9yr; 1.2.2.1 date 2006.10.12.08.17.11; author rse; state dead; branches; next 1.2.2.2; commitid iZxwRSmmWscPXUQr; 1.2.2.2 date 2006.10.16.14.47.56; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.7 log @upgrading package: arpalert 2.0.9 -> 2.0.10 @ text @Index: Makefile.in --- Makefile.in.orig 2008-03-28 19:02:46 +0100 +++ Makefile.in 2008-03-29 09:47:16 +0100 @@@@ -17,18 +17,17 @@@@ mandir = @@mandir@@ includedir = @@includedir@@ config_dir = @@sysconfdir@@/arpalert -leases_dir = @@localstatedir@@/lib/arpalert -lock_dir = @@localstatedir@@/run -log_dir = @@localstatedir@@/log +leases_dir = @@localstatedir@@/arpalert/db +lock_dir = @@localstatedir@@/arpalert/run +log_dir = @@localstatedir@@/arpalert/log includedir = @@includedir@@ src_dir = . CC = @@CC@@ -CFLAGS += @@CFLAGS@@ \ - -Wall -O2 \ +CFLAGS += @@CFLAGS@@ @@CPPFLAGS@@ \ -DCONFIG_FILE=\"$(config_dir)/arpalert.conf\" \ -DPID_FILE=\"$(lock_dir)/arpalert.pid\" -LDFLAGS = -Wl,--export-dynamic +LDFLAGS = -Wl,--export-dynamic @@LDFLAGS@@ LIBS = @@LIBS@@ OBJECT_LIST = \ $(src_dir)/arpalert.o \ Index: doc/arpalert.8 --- doc/arpalert.8.orig 2008-03-28 19:02:46 +0100 +++ doc/arpalert.8 2008-03-29 09:25:05 +0100 @@@@ -91,10 +91,10 @@@@ \fBuse syslog\fR = true If this option is false, the syslog system is disabled .TP -\fBmaclist file\fR = /etc/arpalert/maclist.allow +\fBmaclist file\fR = /etc/arpalert/arpalert.allow White list .TP -\fBmaclist alert file\fR = /etc/arpalert/maclist.deny +\fBmaclist alert file\fR = /etc/arpalert/arpalert.deny Black list .TP \fBmaclist leases file\fR = /var/lib/arpalert/arpalert.leases @@@@ -103,7 +103,7 @@@@ \fBdump inter\fR = 5 Minimun time to wait between two leases dump .TP -\fBauth request file\fR = /etc/arpalert/authrq.conf +\fBauth request file\fR = /etc/arpalert/arpalert.authreq List of authorized request .TP \fBlock file\fR = /var/run/arpalert.lock @@@@ -258,7 +258,7 @@@@ .\" .SH DATA FILES FORMATS .TP -\fB/etc/arpalert/maclist.allow\fR and \fB/etc/arpalert/maclist.deny\fR: +\fB/etc/arpalert/arpalert.allow\fR and \fB/etc/arpalert/arpalert.deny\fR: All the line with # as a \fBfirst\fR caracter are ignored .br The data on this file take this form @@@@ -279,7 +279,7 @@@@ .br \fBmac_change:\fR Ignore mac change for this mac address .TP -\fB/etc/arpalert/authrq.conf\fR: +\fB/etc/arpalert/arpalert.authreq\fR: All the words after # character are ignored .br All the blank characters are ignored Index: install.sh.in --- install.sh.in.orig 2008-03-28 19:02:09 +0100 +++ install.sh.in 2008-03-29 09:25:05 +0100 @@@@ -47,14 +47,14 @@@@ # if doesn't exist conf if [ ! -f ${DESTDIR}${config_dir}/arpalert.conf ]; then - # create maclist.allow - if [ ! -f ${DESTDIR}${config_dir}/maclist.allow ]; then - > ${DESTDIR}${config_dir}/maclist.allow || /bin/true + # create arpalert.allow + if [ ! -f ${DESTDIR}${config_dir}/arpalert.allow ]; then + > ${DESTDIR}${config_dir}/arpalert.allow || /bin/true fi - # create maclist.deny - if [ ! -f ${DESTDIR}${config_dir}/maclist.deny ]; then - > ${DESTDIR}${config_dir}/maclist.deny || /bin/true + # create arpalert.deny + if [ ! -f ${DESTDIR}${config_dir}/arpalert.deny ]; then + > ${DESTDIR}${config_dir}/arpalert.deny || /bin/true fi # dest file @ 1.6 log @upgrading package: arpalert 2.0.8 -> 2.0.9 @ text @d2 3 a4 3 --- Makefile.in.orig 2007-11-17 15:26:14 +0100 +++ Makefile.in 2007-11-18 02:54:13 +0100 @@@@ -17,17 +17,17 @@@@ d18 5 a22 4 -CFLAGS = -Wall -O2 \ +CFLAGS = @@CFLAGS@@ @@CPPFLAGS@@ \ -DCONFIG_FILE=\"$(config_dir)/arpalert.conf\" \ -DPID_FILE=\"$(lock_dir)/arpalert.pid\" d29 3 a31 3 --- doc/arpalert.8.orig 2007-08-27 15:57:27 +0200 +++ doc/arpalert.8 2007-08-28 10:10:13 +0200 @@@@ -88,10 +88,10 @@@@ d44 1 a44 1 @@@@ -100,7 +100,7 @@@@ d53 1 a53 1 @@@@ -243,7 +243,7 @@@@ d62 1 a62 1 @@@@ -264,7 +264,7 @@@@ d72 2 a73 2 --- install.sh.in.orig 2007-08-27 15:57:15 +0200 +++ install.sh.in 2007-08-28 10:10:13 +0200 @ 1.5 log @upgrading package: arpalert 2.0.7 -> 2.0.8 @ text @d2 2 a3 2 --- Makefile.in.orig 2007-08-27 15:57:28 +0200 +++ Makefile.in 2007-08-28 10:16:54 +0200 d22 3 a24 2 -LIBS = @@LIBS@@ +LIBS = @@LDFLAGS@@ @@LIBS@@ a26 1 $(src_dir)/loadconfig.o \ @ 1.4 log @upgrading package: arpalert 2.0.2 -> 2.0.3 @ text @d2 3 a4 3 --- Makefile.in.orig 2006-11-24 11:32:34 +0100 +++ Makefile.in 2006-11-24 18:06:57 +0100 @@@@ -17,16 +17,16 @@@@ d14 1 d28 2 a29 2 --- doc/arpalert.8.orig 2006-11-24 11:32:34 +0100 +++ doc/arpalert.8 2006-11-24 18:08:24 +0100 d71 3 a73 3 --- install.sh.in.orig 2006-11-24 11:28:21 +0100 +++ install.sh.in 2006-11-24 18:06:57 +0100 @@@@ -42,14 +42,14 @@@@ @ 1.3 log @upgrading package: arpalert 1.0.3 -> 2.0.1 @ text @d2 2 a3 2 --- Makefile.in.orig 2006-10-29 10:05:12 +0100 +++ Makefile.in 2006-10-29 16:40:30 +0100 d27 3 a29 3 --- doc/arpalert.8.orig 2006-10-29 10:05:12 +0100 +++ doc/arpalert.8 2006-10-29 16:42:14 +0100 @@@@ -82,19 +82,19 @@@@ d34 2 a35 2 +\fBarpalert file\fR = /etc/arpalert/arpalert.allow white list d38 2 a39 6 +\fBarpalert alert file\fR = /etc/arpalert/arpalert.deny black list .TP -\fBmaclist leases file\fR = /var/lib/arpalert/arpalert.leases +\fBarpalert leases file\fR = /var/lib/arpalert/arpalert.leases dump fil d41 2 d44 1 a44 1 minimun time to wait between two leases dump d47 2 a48 2 +\fBauth request file\fR = /etc/arpalert/arpalert.authrq list of authorized request" d51 1 a51 1 @@@@ -237,7 +237,7 @@@@ d57 1 a57 1 all the line with # as a \fBfirst\fR caracter are ignored d60 1 a60 1 @@@@ -258,7 +258,7 @@@@ d66 1 a66 1 all the word after # caracter are ignored d68 1 a68 1 all the blank characters are ignored d70 2 a71 2 --- install.sh.in.orig 2006-10-29 10:04:03 +0100 +++ install.sh.in 2006-10-29 16:41:38 +0100 @ 1.2 log @fix building against libpcap @ text @d2 2 a3 2 --- Makefile.in.orig 2006-09-01 23:53:40 +0200 +++ Makefile.in 2006-10-12 10:15:56 +0200 a25 22 @@@@ -90,17 +90,17 @@@@ mkdir -p $(DESTDIR)$(mandir)/man8 cp -f doc/arpalert.8 $(DESTDIR)$(mandir)/man8 cp -f arpalert $(DESTDIR)$(sbindir) - test ! -f $(DESTDIR)$(config_dir)/maclist.allow && > $(DESTDIR)$(config_dir)/maclist.allow || /bin/true - test ! -f $(DESTDIR)$(config_dir)/maclist.deny && > $(DESTDIR)$(config_dir)/maclist.deny || /bin/true + test ! -f $(DESTDIR)$(config_dir)/arpalert.allow && > $(DESTDIR)$(config_dir)/arpalert.allow || /bin/true + test ! -f $(DESTDIR)$(config_dir)/arpalert.deny && > $(DESTDIR)$(config_dir)/arpalert.deny || /bin/true if test ! -f $(DESTDIR)$(config_dir)/arpalert.conf; \ then \ > $(DESTDIR)$(config_dir)/arpalert.conf; \ echo "# white list" >> $(DESTDIR)$(config_dir)/arpalert.conf; \ - echo "Maclist file = $(config_dir)/maclist.allow" >> $(DESTDIR)$(config_dir)/arpalert.conf; \ + echo "Maclist file = $(config_dir)/arpalert.allow" >> $(DESTDIR)$(config_dir)/arpalert.conf; \ echo >> $(DESTDIR)$(config_dir)/arpalert.conf; \ \ echo "# black list" >> $(DESTDIR)$(config_dir)/arpalert.conf; \ - echo "Maclist alert file = $(config_dir)/maclist.deny" >> $(DESTDIR)$(config_dir)/arpalert.conf; \ + echo "Maclist alert file = $(config_dir)/arpalert.deny" >> $(DESTDIR)$(config_dir)/arpalert.conf; \ echo >> $(DESTDIR)$(config_dir)/arpalert.conf; \ \ echo "# dump file" >> $(DESTDIR)$(config_dir)/arpalert.conf; \ d27 3 a29 3 --- doc/arpalert.8.orig 2006-09-01 23:53:40 +0200 +++ doc/arpalert.8 2006-10-12 10:15:08 +0200 @@@@ -82,16 +82,16 @@@@ d34 1 a34 1 +\fBmaclist file\fR = /etc/arpalert/arpalert.allow d38 1 a38 1 +\fBmaclist alert file\fR = /etc/arpalert/arpalert.deny d41 2 a42 1 \fBmaclist leases file\fR = /var/lib/arpalert/arpalert.leases d45 3 d49 1 a49 1 +\fBauth request file\fR = /etc/arpalert/arpalert.authreq d53 1 a53 1 @@@@ -228,7 +228,7 @@@@ d62 1 a62 1 @@@@ -249,7 +249,7 @@@@ d71 24 @ 1.2.2.1 log @file arpalert.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:47:56 +0000 @ text @d1 88 @ 1.2.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 88 Index: Makefile.in --- Makefile.in.orig 2006-09-01 23:53:40 +0200 +++ Makefile.in 2006-10-12 10:15:56 +0200 @@@@ -17,16 +17,16 @@@@ mandir = @@mandir@@ includedir = @@includedir@@ config_dir = @@sysconfdir@@/arpalert -leases_dir = @@localstatedir@@/lib/arpalert -lock_dir = @@localstatedir@@/run -log_dir = @@localstatedir@@/log +leases_dir = @@localstatedir@@/arpalert/db +lock_dir = @@localstatedir@@/arpalert/run +log_dir = @@localstatedir@@/arpalert/log src_dir = . CC = @@CC@@ -CFLAGS = -Wall -O2 \ +CFLAGS = @@CFLAGS@@ @@CPPFLAGS@@ \ -DCONFIG_FILE=\"$(config_dir)/arpalert.conf\" \ -DPID_FILE=\"$(lock_dir)/arpalert.pid\" -LIBS = @@LIBS@@ +LIBS = @@LDFLAGS@@ @@LIBS@@ OBJECT_LIST = \ $(src_dir)/arpalert.o \ $(src_dir)/loadconfig.o \ @@@@ -90,17 +90,17 @@@@ mkdir -p $(DESTDIR)$(mandir)/man8 cp -f doc/arpalert.8 $(DESTDIR)$(mandir)/man8 cp -f arpalert $(DESTDIR)$(sbindir) - test ! -f $(DESTDIR)$(config_dir)/maclist.allow && > $(DESTDIR)$(config_dir)/maclist.allow || /bin/true - test ! -f $(DESTDIR)$(config_dir)/maclist.deny && > $(DESTDIR)$(config_dir)/maclist.deny || /bin/true + test ! -f $(DESTDIR)$(config_dir)/arpalert.allow && > $(DESTDIR)$(config_dir)/arpalert.allow || /bin/true + test ! -f $(DESTDIR)$(config_dir)/arpalert.deny && > $(DESTDIR)$(config_dir)/arpalert.deny || /bin/true if test ! -f $(DESTDIR)$(config_dir)/arpalert.conf; \ then \ > $(DESTDIR)$(config_dir)/arpalert.conf; \ echo "# white list" >> $(DESTDIR)$(config_dir)/arpalert.conf; \ - echo "Maclist file = $(config_dir)/maclist.allow" >> $(DESTDIR)$(config_dir)/arpalert.conf; \ + echo "Maclist file = $(config_dir)/arpalert.allow" >> $(DESTDIR)$(config_dir)/arpalert.conf; \ echo >> $(DESTDIR)$(config_dir)/arpalert.conf; \ \ echo "# black list" >> $(DESTDIR)$(config_dir)/arpalert.conf; \ - echo "Maclist alert file = $(config_dir)/maclist.deny" >> $(DESTDIR)$(config_dir)/arpalert.conf; \ + echo "Maclist alert file = $(config_dir)/arpalert.deny" >> $(DESTDIR)$(config_dir)/arpalert.conf; \ echo >> $(DESTDIR)$(config_dir)/arpalert.conf; \ \ echo "# dump file" >> $(DESTDIR)$(config_dir)/arpalert.conf; \ Index: doc/arpalert.8 --- doc/arpalert.8.orig 2006-09-01 23:53:40 +0200 +++ doc/arpalert.8 2006-10-12 10:15:08 +0200 @@@@ -82,16 +82,16 @@@@ \fBuse syslog\fR = true If this option is false, the syslog system is disabled .TP -\fBmaclist file\fR = /etc/arpalert/maclist.allow +\fBmaclist file\fR = /etc/arpalert/arpalert.allow white list .TP -\fBmaclist alert file\fR = /etc/arpalert/maclist.deny +\fBmaclist alert file\fR = /etc/arpalert/arpalert.deny black list .TP \fBmaclist leases file\fR = /var/lib/arpalert/arpalert.leases dump fil .TP -\fBauth request file\fR = /etc/arpalert/authrq.conf +\fBauth request file\fR = /etc/arpalert/arpalert.authreq list of authorized request" .TP \fBlock file\fR = /var/run/arpalert.lock @@@@ -228,7 +228,7 @@@@ .\" .SH DATA FILES FORMATS .TP -\fB/etc/arpalert/maclist.allow\fR and \fB/etc/arpalert/maclist.deny\fR: +\fB/etc/arpalert/arpalert.allow\fR and \fB/etc/arpalert/arpalert.deny\fR: all the line with # as a \fBfirst\fR caracter are ignored .br The data on this file take this form @@@@ -249,7 +249,7 @@@@ .br \fBmac_change:\fR Ignore mac change for this mac address .TP -\fB/etc/arpalert/authrq.conf\fR: +\fB/etc/arpalert/arpalert.authreq\fR: all the word after # caracter are ignored .br all the blank characters are ignored @ 1.1 log @new package: arpalert 1.0.2 (ARP Network Monitoring & Alerting) @ text @d2 3 a4 3 --- Makefile.in.orig 2006-05-10 23:46:41 +0200 +++ Makefile.in 2006-05-23 15:19:34 +0200 @@@@ -17,9 +17,9 @@@@ d17 9 d49 2 a50 2 --- doc/arpalert.8.orig 2006-05-10 23:46:42 +0200 +++ doc/arpalert.8 2006-05-23 15:21:39 +0200 d70 1 a70 1 \fBLock file\fR = /var/run/arpalert.lock @