From cb33144330dc2dc310a4742ed4e0b424288da87b Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mar 30 2010 13:58:31 +0000 Subject: - update ethercodes.dat (#577552) - mark ethercodes.dat as noreplace - fix init script LSB compliance - include Debian arp2ethers and massagevendor man pages (#526160) - don't include massagevendor-old script anymore --- diff --git a/.cvsignore b/.cvsignore index 1efd2db..9a993db 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ arpwatch-2.1a15.tar.gz -ethercodes-20090902.dat.bz2 +ethercodes-20100330.dat.bz2 diff --git a/arpwatch-2.1a15-extraman.patch b/arpwatch-2.1a15-extraman.patch new file mode 100644 index 0000000..502404e --- /dev/null +++ b/arpwatch-2.1a15-extraman.patch @@ -0,0 +1,173 @@ +diff -up arpwatch-2.1a15/Makefile.in.extraman arpwatch-2.1a15/Makefile.in +--- arpwatch-2.1a15/Makefile.in.extraman 2009-12-14 18:01:27.000000000 +0100 ++++ arpwatch-2.1a15/Makefile.in 2010-03-30 15:11:30.000000000 +0200 +@@ -118,6 +118,10 @@ install-man: force + $(DESTDIR)$(MANDEST)/man8 + $(INSTALL) -m 644 $(srcdir)/arpsnmp.8 \ + $(DESTDIR)$(MANDEST)/man8 ++ $(INSTALL) -m 644 $(srcdir)/arp2ethers.8 \ ++ $(DESTDIR)$(MANDEST)/man8 ++ $(INSTALL) -m 644 $(srcdir)/massagevendor.8 \ ++ $(DESTDIR)$(MANDEST)/man8 + + lint: $(GENSRC) force + lint -hbxn $(SRC) | \ +diff -up arpwatch-2.1a15/arp2ethers.8.extraman arpwatch-2.1a15/arp2ethers.8 +--- arpwatch-2.1a15/arp2ethers.8.extraman 2010-03-30 15:12:37.000000000 +0200 ++++ arpwatch-2.1a15/arp2ethers.8 2010-03-30 15:53:01.000000000 +0200 +@@ -0,0 +1,60 @@ ++.TH ARP2ETHERS 8 ++.SH NAME ++arp2ethers \- convert arpwatch address database to ethers file format ++.SH SYNOPSIS ++.na ++.B arp2ethers ++.ad ++.SH "DESCRIPTION" ++.B arp2ethers ++converts file ++.IR arp.dat ++in the current directory into ++.BR ethers(5) ++format on ++.IR stdout . ++Usually ++.IR arp.dat ++is an ethernet/ip database file generated by ++.BR arpwatch(8) . ++The arpwatch daemon in Debian will create different ++.IR arp.dat ++depending on its configuration. All of them will be available at ++.IR /var/lib/arpwatch/ . ++.SH FILES ++.na ++.nh ++.nf ++/var/lib/arpwatch - default directory for arp.dat ++arp.dat - ethernet/ip address database ++.ad ++.hy ++.fi ++.SH "SEE ALSO" ++.na ++.nh ++.BR arpwatch (8), ++.BR ethers (5), ++.BR rarp (8), ++.BR arp (8), ++.ad ++.hy ++.SH BUGS ++Please send bug reports to arpwatch@ee.lbl.gov. ++.SH AUTHORS ++.LP ++Original version by Craig Leres of the Lawrence Berkeley ++National Laboratory Network Research Group, University of ++California, Berkeley, CA. ++.LP ++Modified for the Debian Project by Peter Kelemen, with ++additions from Erik Warmelink. ++.LP ++The current version is available via anonymous ftp: ++.LP ++.RS ++.I ftp://ftp.ee.lbl.gov/arpwatch.tar.gz ++.RE ++.LP ++This manual page was contributed by Hugo Graumann. ++ +diff -up arpwatch-2.1a15/massagevendor.8.extraman arpwatch-2.1a15/massagevendor.8 +--- arpwatch-2.1a15/massagevendor.8.extraman 2010-03-30 15:15:18.000000000 +0200 ++++ arpwatch-2.1a15/massagevendor.8 2010-03-30 15:15:18.000000000 +0200 +@@ -0,0 +1,91 @@ ++.TH MASSAGEVENDOR 8 ++.SH NAME ++massagevendor \- convert the ethernet vendor codes master list to arpwatch format ++.SH SYNOPSIS ++.na ++massagevendor ++.I vendorfile ++.SH "DESCRIPTION" ++.B massagevendor ++is a program that converts a text file containing ethernet vendor codes ++into a format suitable for use by ++.B arpwatch(8) ++and ++.B arpsnmp(8). ++The input ++.I vendorfile ++is a master text file containing vendor codes. The output ++is sent to ++.I stdout. ++Each line of the ++.I vendorfile ++is expected to have a six digit hexadecimal vendor code ++followed by spaces followed by the name of the manufacturer. ++.LP ++All ethernet devices have a unique identifier which ++includes a vendor code specifying the manufacturer of the ++device. In normal operation ++.B arpwatch(8) ++and ++.B arpsnmp(8) ++use the file ++.I ethercodes.dat ++to report this vendor code. ++.B massagevendor ++is used to generate the ++.I ethercodes.dat ++file from text files containing these vendor codes. ++.LP ++Locations where an ethernet vendor codes master text file ++can be obtained are given below. ++.SH FILES ++.na ++.nh ++.nf ++/var/lib/arpwatch - default location of the ethernet vendor list ++ethercodes.dat - file containing the list of ethernet vendor codes ++.ad ++.hy ++.fi ++.SH "SEE ALSO" ++.na ++.nh ++.BR arpwatch(8), ++.BR arpsnmp(8) ++.ad ++.hy ++.SH NOTES ++Sources for ethernet vendor codes seen in the wild are ++.LP ++.na ++.nh ++.nf ++.RS ++.I http://map-ne.com/Ethernet/vendor.html ++.I ftp://ftp.cavebear.com/pub/Ethernet.txt ++.I http://www.cavebear.com/CaveBear/Ethernet/vendor.html ++.RE ++.ad ++.hy ++.LP ++Useful for comparison or completeness are the ++ethernet vendor codes as assigned ++by the IEEE which can be found at ++.LP ++.RS ++.I http://standards.ieee.org/regauth/oui/oui.txt ++.RE ++.SH BUGS ++Please send bug reports to arpwatch@ee.lbl.gov. ++.SH AUTHORS ++Craig Leres of the ++Lawrence Berkeley National Laboratory Network Research Group, ++University of California, Berkeley, CA. ++.LP ++The current version is available via anonymous ftp: ++.LP ++.RS ++.I ftp://ftp.ee.lbl.gov/arpwatch.tar.gz ++.RE ++.LP ++This manual page was contributed by Hugo Graumann. diff --git a/arpwatch.init b/arpwatch.init index 8ea76ce..93e992f 100644 --- a/arpwatch.init +++ b/arpwatch.init @@ -30,6 +30,7 @@ prog=arpwatch lockfile=/var/lock/subsys/$prog start () { + [ "$EUID" != "0" ] && exit 4 # Check that networking is up. [ "$NETWORKING" = "no" ] && exit 1 @@ -44,6 +45,7 @@ start () { } stop () { + [ "$EUID" != "0" ] && exit 4 echo -n $"Stopping $prog: " killproc $prog RETVAL=$? diff --git a/arpwatch.spec b/arpwatch.spec index 5555b66..5612142 100644 --- a/arpwatch.spec +++ b/arpwatch.spec @@ -3,7 +3,7 @@ Name: arpwatch Epoch: 14 Version: 2.1a15 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Network monitoring tools for tracking IP addresses on a network Group: Applications/System License: BSD with advertising @@ -22,7 +22,7 @@ Source2: arpwatch.sysconfig # created by: # wget -O- http://standards.ieee.org/regauth/oui/oui.txt | \ # iconv -f iso8859-1 -t utf8 | massagevendor | bzip2 -Source3: ethercodes-20090902.dat.bz2 +Source3: ethercodes-20100330.dat.bz2 Patch1: arpwatch-2.1a4-fhs.patch Patch2: arpwatch-2.1a10-man.patch Patch3: arpwatch-drop.patch @@ -32,6 +32,7 @@ Patch6: arpwatch-dir-man.patch Patch7: arpwatch-scripts.patch Patch8: arpwatch-2.1a15-nolocalpcap.patch Patch9: arpwatch-2.1a15-bogon.patch +Patch10: arpwatch-2.1a15-extraman.patch %description The arpwatch package contains arpwatch and arpsnmp. Arpwatch and @@ -55,6 +56,7 @@ network. %patch7 -p1 -b .scripts %patch8 -p1 -b .nolocalpcap %patch9 -p1 -b .bogon +%patch10 -p1 -b .extraman %build %configure @@ -93,6 +95,8 @@ install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/arpwatch install -p -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_vararpwatch}/ethercodes.dat.bz2 bzip2 -df $RPM_BUILD_ROOT%{_vararpwatch}/ethercodes.dat.bz2 +rm -f $RPM_BUILD_ROOT%{_sbindir}/massagevendor-old + %clean rm -rf $RPM_BUILD_ROOT @@ -134,17 +138,22 @@ fi %{_sbindir}/arpsnmp %{_sbindir}/arp2ethers %{_sbindir}/massagevendor -%{_sbindir}/massagevendor-old -%{_mandir}/man8/arpwatch.8* -%{_mandir}/man8/arpsnmp.8* +%{_mandir}/man8/*.8* %{_initrddir}/arpwatch %config(noreplace) %{_sysconfdir}/sysconfig/arpwatch %defattr(-,arpwatch,arpwatch) %dir %{_vararpwatch} %verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/arp.dat -%verify(not md5 size mtime) %config %{_vararpwatch}/ethercodes.dat +%verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/ethercodes.dat %changelog +* Tue Mar 30 2010 Miroslav Lichvar 14:2.1a15-13 +- update ethercodes.dat (#577552) +- mark ethercodes.dat as noreplace +- fix init script LSB compliance +- include Debian arp2ethers and massagevendor man pages (#526160) +- don't include massagevendor-old script anymore + * Wed Sep 02 2009 Miroslav Lichvar 14:2.1a15-12 - update ethercodes.dat diff --git a/sources b/sources index 8d7b84e..3944aa0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ cebfeb99c4a7c2a6cee2564770415fe7 arpwatch-2.1a15.tar.gz -481167b23dd046952d8d4d3845da6b91 ethercodes-20090902.dat.bz2 +443248a1609a2b780a64e66d67e4f3ad ethercodes-20100330.dat.bz2