diff --git a/.cvsignore b/.cvsignore index b3e4f4e..ec309ec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ arpwatch-2.1a11.tar.gz -libpcap-0.6.2.tar.gz -tcpdump-3.6.2.tar.gz +libpcap-0.7.2.tar.gz +tcpdump-3.7.2.tar.gz tcpslice-CVS.20010207.tar.gz diff --git a/sources b/sources index 87ea248..7fd9baa 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 9ecd00db892737431b0e524f3e52e19e arpwatch-2.1a11.tar.gz -a6325b5fe429eba06294ce2db9263a66 libpcap-0.6.2.tar.gz -6bc8da35f9eed4e675bfdf04ce312248 tcpdump-3.6.2.tar.gz +e3993a5409b98989c7a73e27c5df4d27 libpcap-0.7.2.tar.gz +1e44b59abba39a48e3680bc2cffb8a6a tcpdump-3.7.2.tar.gz 97cc59ddb3202f74d22261e49aa07115 tcpslice-CVS.20010207.tar.gz diff --git a/tcpdump.spec b/tcpdump.spec index 86b72bd..7a35906 100644 --- a/tcpdump.spec +++ b/tcpdump.spec @@ -2,7 +2,7 @@ %define PCAP_UID 77 %define PCAP_GID 77 -%define releaseno 17.8.0.3 +%define releaseno 1 %define arpwatch_release %{releaseno} %define pcap_release %{releaseno} @@ -10,8 +10,8 @@ Summary: A network traffic monitoring tool. Name: tcpdump -Version: 3.6.3 -%define tcpdump_dir tcpdump-3.6.2 +Version: 3.7.2 +%define tcpdump_dir tcpdump-3.7.2 %define tcpslice_dir tcpslice Release: %{tcpdump_release} @@ -21,8 +21,8 @@ Epoch: 14 License: BSD URL: http://www.tcpdump.org Group: Applications/Internet -Source0: http://www.tcpdump.org/release/tcpdump-3.6.2.tar.gz -Source1: http://www.tcpdump.org/release/libpcap-0.6.2.tar.gz +Source0: http://www.tcpdump.org/release/tcpdump-3.7.2.tar.gz +Source1: http://www.tcpdump.org/release/libpcap-0.7.2.tar.gz Source2: ftp://ftp.ee.lbl.gov/arpwatch-2.1a11.tar.gz Source3: arpwatch.init Source4: tcpslice-CVS.20010207.tar.gz @@ -30,19 +30,17 @@ Source5: arpwatch.sysconfig Source6: arpwatch-ethercodes.dat Patch5: tcpdump-3.6.2-tcpslice-time.patch -Patch6: tcpdump-3.6.2-usageman.patch -Patch7: tcpdump-3.6.2-redhat.patch -Patch8: tcpdump-3.6.1-droproot2.patch -Patch9: tcpdump-3.6.1-smb-quiet.patch +#Patch6: tcpdump-3.6.2-usageman.patch +Patch7: tcpdump-3.7.2-redhat.patch +Patch8: tcpdump-3.7.2-droproot2.patch +#Patch9: tcpdump-3.6.1-smb-quiet.patch Patch10: tcpdump-3.6.1-portnumbers.patch Patch11: tcpdump-3.6.1-non-promisc-default.patch -Patch12: tcpdump-3.6.2-3.6.3.patch -Patch13: tcpdump-3.6.2-dropdefault.patch -Patch14: tcpdump-3.6.2-snaplen.patch -Patch16: tcpdump-3.6.2-bgp.patch -Patch17: tcpdump-3.6.2-radlen.patch -Patch18: tcpdump-3.6.2-isa.patch -Patch19: tcpdump-3.6.2-2.4.patch +#Patch12: tcpdump-3.6.2-3.6.3.patch +Patch13: tcpdump-3.7.2-dropdefault.patch +#Patch14: tcpdump-3.6.2-snaplen.patch +Patch15: tcpdump-3.6.2-ip6opts.patch +#Patch16: tcpdump-3.6.2-bgp.patch Patch34: arpwatch-2.1a4-fhs.patch Patch35: arpwatch-2.1a10-man.patch @@ -52,10 +50,10 @@ Patch40: arp2ethers.patch Patch41: arpwatch-addr.patch Patch50: libpcap-shared.patch -Patch51: tcpdump-3.6.2-purge.patch -Patch52: tcpdump-3.6.2-s390.patch +#Patch51: tcpdump-3.6.2-purge.patch +Patch52: tcpdump-3.7.2-s390.patch -Patch100: tcpdump-3.6.2-config.patch +Patch100: tcpdump-3.7.2-config.patch Prefix: %{_prefix} BuildRequires: kernel-headers >= 2.2.0 openssl-devel @@ -71,9 +69,9 @@ the packet headers, or just the ones that match particular criteria. Install tcpdump if you need a program to monitor network traffic. %package -n libpcap -Version: 0.6.2 +Version: 0.7.2 Release: %{pcap_release} -%define libpcap_dir libpcap-0.6.2 +%define libpcap_dir libpcap-0.7.2 Summary: A system-independent interface for user-level packet capture. Group: Development/Libraries License: BSD @@ -120,23 +118,25 @@ network. pushd %libpcap_dir %patch50 -p1 -b .shared -%patch51 -p1 -b .purge +#%patch51 -p1 -b .purge %patch52 -p1 -b .s390 popd pushd %tcpdump_dir -%patch6 -p1 -b .usageman +#%patch6 -p1 -b .usageman %patch8 -p1 -b .droproot -%patch9 -p1 -b .smb +# Fixed in 3.7.2 +#%patch9 -p1 -b .smb %patch10 -p1 -b .portnumbers #%patch11 -p1 -b .nonpromisc # Not by default -%patch12 -p1 -b .afsprinting +# Fixed in 3.7.2 +#%patch12 -p1 -b .afsprinting %patch13 -p1 -b .dropdefault -%patch14 -p1 -b .snaplen +# Fixed in 3.7.2 +#%patch14 -p1 -b .snaplen +%patch15 -p1 -b .ip6opts +# Fixed in 3.7.2 #%patch16 -p2 -b .bgp -%patch17 -p1 -b .radlen -#%patch18 -p1 -b .isa -%patch19 -p1 -b .deb popd pushd %arpwatch_dir @@ -175,7 +175,7 @@ popd pushd %tcpdump_dir %define optflags $RPM_OPT_FLAGS -DIP_MAX_MEMBERSHIPS=20 -#autoheader +#autoconf %configure --enable-ipv6 --with-user=pcap %undefine optflags @@ -206,6 +206,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} pushd %libpcap_dir mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/net make DESTDIR=${RPM_BUILD_ROOT} includedir=%{_includedir} install +chmod +x ${RPM_BUILD_ROOT}%{_libdir}/libpcap.so.* popd pushd %tcpslice_dir @@ -243,24 +244,26 @@ popd rm -rf ${RPM_BUILD_ROOT} %pre -/usr/sbin/groupadd -g %{PCAP_GID} pcap 2> /dev/null || : +/usr/sbin/groupadd -g %{PCAP_GID} pcap 2> /dev/null /usr/sbin/useradd -u %{PCAP_UID} -g %{PCAP_GID} \ - -s /sbin/nologin -M -r -d %{_vararpwatch} pcap 2> /dev/null || ( /usr/bin/chsh pcap /sbin/nologin 2> /dev/null || : ) + -s /sbin/nologin -M -r -d %{_vararpwatch} pcap 2> /dev/null || /usr/bin/chsh pcap /sbin/nologin 2> /dev/null +exit 0 %post -n arpwatch /sbin/chkconfig --add arpwatch %pre -n arpwatch -/usr/sbin/groupadd -g %{PCAP_GID} pcap 2> /dev/null || : +/usr/sbin/groupadd -g %{PCAP_GID} pcap 2> /dev/null /usr/sbin/useradd -u %{PCAP_UID} -g %{PCAP_GID} \ - -s /sbin/nologin -M -r -d %{_vararpwatch} pcap 2> /dev/null || ( /usr/bin/chsh pcap /sbin/nologin 2> /dev/null || : ) + -s /sbin/nologin -M -r -d %{_vararpwatch} pcap 2> /dev/null || /usr/bin/chsh pcap /sbin/nologin 2> /dev/null +exit 0 %postun -n arpwatch /sbin/service arpwatch condrestart >/dev/null 2>&1 || : %preun -n arpwatch if [ "$1" = "0" ]; then - /sbin/service arpwatch stop > /dev/null 2>&1 || : + /sbin/service arpwatch stop > /dev/null 2>&1 /sbin/chkconfig --del arpwatch fi @@ -294,7 +297,7 @@ fi %config(noreplace) /etc/sysconfig/arpwatch %defattr(-,pcap,pcap) %dir %{_vararpwatch} -%config(noreplace) %verify(not md5 size mtime) %{_vararpwatch}/arp.dat +%config %{_vararpwatch}/arp.dat %config %{_vararpwatch}/ethercodes.dat %config %{_vararpwatch}/missingcodes.txt %{_vararpwatch}/*.awk @@ -304,14 +307,29 @@ fi %{_vararpwatch}/massagevendor-old %changelog -* Tue May 13 2003 Harald Hoyer -17.x.x.3 -- compile tcpdump with autoheader #90208 +* Thu Feb 27 2003 Phil Knirsch 12:3.7.2-1 +- Update to upstream version 3.7.2 + +* Sat Feb 01 2003 Florian La Roche +- sanitized rpm scripts + +* Wed Jan 22 2003 Tim Powers 12:3.6.3-20 +- rebuilt + +* Tue Jan 7 2003 Nalin Dahyabhai 12:3.6.3-19/0.6.2-19/2.1a11-19 +- rebuild + +* Sat Jan 4 2003 Jeff Johnson 12:3.6.3-18/0.6.2-18/2.1a11-18 +- set execute bits on library so that requires are generated. + +* Wed Dec 11 2002 Harald Hoyer 12:3.6.3-17/0.6.2-17/2.1a11-17 +- common release no. across all subpackages -* Mon Apr 14 2003 Harald Hoyer -17.x.x.2 -- CAN-2003-0145 fixed +* Wed Dec 11 2002 Harald Hoyer 12:3.6.3-5/0.6.2-16/2.1a11-16 +- print_bgp security fix -* Thu Mar 06 2003 Harald Hoyer -17.x.x.1 -- CAN-2003-0108 fixed +* Mon Nov 18 2002 Tim Powers +- rebuild on all arches * Fri Aug 2 2002 Harald Hoyer 12:3.6.3-3/0.6.2-16/2.1a11-16 - added man page descriptions for the new parameters