- lots of Debian patches, release 2, STBR

Changed files:
    arpwatch.spec -> 1.56

diff --git a/arpwatch.spec b/arpwatch.spec
index 4ce0e1ff905f4c82d65450e25a3065e8e48aa083..d7c5b6d212a50b770f4fa96f77d13cca70509e4e 100644 (file)
--- a/arpwatch.spec
+++ b/arpwatch.spec
@@ -5,7 +5,7 @@ Summary(ru):    
 Summary(uk):   ¶ÎÓÔÒÕÍÅÎÔ ÄÌÑ ×¦ÄÓ̦ÄËÏ×Õ×ÁÎÎÑ IP ÁÄÒÅÓ × ÌÏËÁÌØÎ¦Ê ÍÅÒÅÖ¦
 Name:          arpwatch
 Version:       2.1a13
-Release:       1
+Release:       2
 Epoch:         2
 License:       GPL
 Group:         Applications/Networking
@@ -13,22 +13,37 @@ Source0:    ftp://ftp.ee.lbl.gov/%{name}-%{version}.tar.gz
 # Source0-md5: b9ff9739cdd2c0e9807b2d05860e4811
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
+Source3:       dmassagevendor
+Source4:       dmassagevendor.8
 Patch0:                %{name}-makefile.patch
 Patch1:                %{name}-opt.patch
-Patch2:                %{name}-drop.patch
-Patch3:                %{name}-drop-man.patch
+Patch10:       %{name}-debian_05debian_fhs.patch
+Patch11:       %{name}-debian_06debian_manpages.patch
+Patch12:       %{name}-debian_10getopt_patchable.patch
+Patch13:       %{name}-debian_11opt_sendmail_path.patch
+Patch14:       %{name}-debian_12opt_nopromisc.patch
+Patch15:       %{name}-debian_13opt_allsubnets.patch
+Patch16:       %{name}-debian_14opt_mailto.patch
+Patch17:       %{name}-debian_15opt_username.patch
+Patch18:       %{name}-debian_16opt_quiet.patch
+Patch19:       %{name}-debian_17opt_ignorenet.patch
+Patch20:       %{name}-debian_21arp2ethers.patch
+Patch21:       %{name}-debian_22secure_tempfile.patch
+Patch22:       %{name}-debian_24from_field.patch
+Patch23:       %{name}-debian_25ignore_zero_ip.patch
+Patch24:       %{name}-debian_26unconf_iface.patch
 BuildRequires: libpcap-devel
 PreReq:                rc-scripts >= 0.2.0
 Requires(post,preun):  /sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Arpwatch and arpsnmp are tools that monitors ethernet or fddi activity
-and maintain a database of ethernet/ip address pairings.
+Arpwatch and arpsnmp are tools that monitors ethernet or FDDI activity
+and maintain a database of ethernet/IP address pairings.
 
 %description -l pl
-Arpwatch i arpsnmp to narzêdzia do monitorowania ethernetu i fddi.
-Dodatkowo tworzona jest baza par adresów ethernet/ip.
+Arpwatch i arpsnmp to narzêdzia do monitorowania ethernetu i FDDI.
+Dodatkowo tworzona jest baza par adresów ethernet/IP.
 
 %description -l ru
 ðÁËÅÔ arpwatch ÓÏÄÅÒÖÉÔ ÕÔÉÌÉÔÙ arpwatch É arpsnmp. ïÎÉ ÐÒÏÉÚ×ÏÄÑÔ
@@ -46,12 +61,25 @@ Dodatkowo tworzona jest baza par adres
 %setup  -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p0
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
-%configure2_13
+%configure
 
 %{__make} \
        ARPDIR=/var/lib/arpwatch
@@ -59,13 +87,15 @@ cp -f /usr/share/automake/config.sub .
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/var/lib/arpwatch,/etc/{rc.d/init.d,sysconfig}} \
-       $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8}
+       $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,%{_datadir}/%{name}}
 
 %{__make} install install-man \
        DESTDIR=$RPM_BUILD_ROOT
 
-install arp2ethers massagevendor $RPM_BUILD_ROOT/var/lib/arpwatch
-install *.{awk,dat} $RPM_BUILD_ROOT/var/lib/arpwatch
+install arp2ethers arpfetch bihourly $RPM_BUILD_ROOT%{_sbindir}
+install *.{awk,dat} massagevendor{,-old} %{SOURCE3} $RPM_BUILD_ROOT/var/lib/arpwatch
+install *.8 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man8
+install ethercodes.dat missingcodes.txt $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/arpwatch
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/arpwatch
@@ -92,18 +122,12 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES
-
 %attr(754,root,root) /etc/rc.d/init.d/arpwatch
 %attr(755,root,root) %{_sbindir}/*
-
 %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/arpwatch
-
+%{_datadir}/%{name}
 %{_mandir}/man8/*
-
 %attr(750,daemon,root) %dir /var/lib/arpwatch
 %attr(644,daemon,root) %config(noreplace) %verify(not size mtime md5) /var/lib/arpwatch/arp.dat
-%attr(644,daemon,root) %config %verify(not size mtime md5) /var/lib/arpwatch/ethercodes.dat
 %attr(755,daemon,root) /var/lib/arpwatch/*.awk
-
-%attr(755,daemon,root) /var/lib/arpwatch/arp2ethers
-%attr(755,daemon,root) /var/lib/arpwatch/massagevendor
+%attr(755,daemon,root) /var/lib/arpwatch/*massagevendor*