From 19c3952da70e76fd0c4ffb6f0c93af5110a6d2af Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 13:22:10 +0000 Subject: auto-import tcpdump-3.8.1-4 from tcpdump-3.8.1-4.src.rpm --- diff --git a/.cvsignore b/.cvsignore index ec309ec..ca7caee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ arpwatch-2.1a11.tar.gz -libpcap-0.7.2.tar.gz -tcpdump-3.7.2.tar.gz +libpcap-0.8.1.tar.gz +tcpdump-3.8.1.tar.gz tcpslice-CVS.20010207.tar.gz diff --git a/sources b/sources index 7fd9baa..707f190 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 9ecd00db892737431b0e524f3e52e19e arpwatch-2.1a11.tar.gz -e3993a5409b98989c7a73e27c5df4d27 libpcap-0.7.2.tar.gz -1e44b59abba39a48e3680bc2cffb8a6a tcpdump-3.7.2.tar.gz +f03f588e1f0ba783004d76f60507cebd libpcap-0.8.1.tar.gz +9edcf0d7f526f0f03138286959ccc802 tcpdump-3.8.1.tar.gz 97cc59ddb3202f74d22261e49aa07115 tcpslice-CVS.20010207.tar.gz diff --git a/tcpdump.spec b/tcpdump.spec index 8e4e95c..c89cfaa 100644 --- a/tcpdump.spec +++ b/tcpdump.spec @@ -2,17 +2,15 @@ %define PCAP_UID 77 %define PCAP_GID 77 -#%define releaseno 7.E3.1 -%define releaseno 8.fc1.2 - -%define arpwatch_release %{releaseno} +%define releaseno 4 +%define arpwatch_release 17 %define pcap_release %{releaseno} %define tcpdump_release %{releaseno} Summary: A network traffic monitoring tool. Name: tcpdump -Version: 3.7.2 -%define tcpdump_dir tcpdump-3.7.2 +Version: 3.8.1 +%define tcpdump_dir tcpdump-3.8.1 %define tcpslice_dir tcpslice Release: %{tcpdump_release} @@ -22,8 +20,8 @@ Epoch: 14 License: BSD URL: http://www.tcpdump.org Group: Applications/Internet -Source0: http://www.tcpdump.org/release/tcpdump-3.7.2.tar.gz -Source1: http://www.tcpdump.org/release/libpcap-0.7.2.tar.gz +Source0: http://www.tcpdump.org/release/tcpdump-3.8.1.tar.gz +Source1: http://www.tcpdump.org/release/libpcap-0.8.1.tar.gz Source2: ftp://ftp.ee.lbl.gov/arpwatch-2.1a11.tar.gz Source3: arpwatch.init Source4: tcpslice-CVS.20010207.tar.gz @@ -31,22 +29,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.7.2-redhat.patch -Patch8: tcpdump-3.7.2-droproot2.patch -#Patch9: tcpdump-3.6.1-smb-quiet.patch +Patch7: tcpdump-3.8.1-redhat.patch +Patch8: tcpdump-3.8.1-droproot.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.7.2-dropdefault.patch -#Patch14: tcpdump-3.6.2-snaplen.patch +#Patch13: tcpdump-3.8.1-dropdefault.patch Patch15: tcpdump-3.6.2-ip6opts.patch -Patch16: tcpdump-3.7.2-sctp.patch -#Patch16: tcpdump-3.6.2-bgp.patch +Patch16: tcpdump-3.8.1-sctp.patch Patch17: tcpdump-3.7.2-sctpdef.patch -Patch18: tcpdump-3.7.2-CAN-2003-0989.patch -Patch19: tcpdump-3.6.2-CAN-2003-0989-2.patch -Patch20: tcpdump-3.6.2-CAN-2004-0183-0184.patch +Patch18: tcpdump-3.8.1-sec.patch +Patch19: tcpdump-3.8.1-auto.patch + Patch34: arpwatch-2.1a4-fhs.patch Patch35: arpwatch-2.1a10-man.patch @@ -59,7 +52,9 @@ Patch50: libpcap-shared.patch #Patch51: tcpdump-3.6.2-purge.patch Patch52: tcpdump-3.7.2-s390.patch -Patch100: tcpdump-3.7.2-config.patch +Patch70: tcpslice-CVS.20010207-bpf.patch + +Patch100: tcpdump-3.8.1-config.patch Prefix: %{_prefix} BuildRequires: kernel-headers >= 2.2.0 openssl-devel @@ -75,9 +70,11 @@ 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.7.2 +# if you change the Version, don't forget to edit libpcap-shared.patch +# could be sed'd automatically +Version: 0.8.1 Release: %{pcap_release} -%define libpcap_dir libpcap-0.7.2 +%define libpcap_dir libpcap-0.8.1 Summary: A system-independent interface for user-level packet capture. Group: Development/Libraries License: BSD @@ -124,30 +121,17 @@ network. pushd %libpcap_dir %patch50 -p1 -b .shared -#%patch51 -p1 -b .purge %patch52 -p1 -b .s390 popd pushd %tcpdump_dir -#%patch6 -p1 -b .usageman -%patch8 -p1 -b .droproot -# Fixed in 3.7.2 -#%patch9 -p1 -b .smb +%patch8 -p2 -b .droproot %patch10 -p1 -b .portnumbers -#%patch11 -p1 -b .nonpromisc # Not by default -# Fixed in 3.7.2 -#%patch12 -p1 -b .afsprinting -%patch13 -p1 -b .dropdefault -# Fixed in 3.7.2 -#%patch14 -p1 -b .snaplen %patch15 -p1 -b .ip6opts %patch16 -p1 -b .sctp -# Fixed in 3.7.2 -#%patch16 -p2 -b .bgp %patch17 -p1 -b .sctpdef -%patch18 -p1 -b .CAN-2003-0989 -%patch19 -p0 -b .CAN-2003-0989-2 -%patch20 -p1 -b .CAN-2004-0183-0184 +%patch18 -p0 -b .sec +%patch19 -p2 -b .autofoo popd pushd %arpwatch_dir @@ -161,15 +145,18 @@ pushd %arpwatch_dir #cp %SOURCE6 ethercodes.dat popd +pushd tcpslice +%patch70 -p1 -b .bpf +popd -%patch100 -p0 +%patch100 -p0 -b .config %build pushd %libpcap_dir %configure --enable-ipv6 -DEFS="-g -fPIC -DHAVE_CONFIG_H" +DEFS="-g -D_U_=\"\" -fPIC -DHAVE_CONFIG_H" %ifarch alpha sparc sparc64 DEFS="$DEFS -DHAVE_ETHER_HOSTTON=1 -DLBL_ALIGN=1" %endif @@ -186,11 +173,12 @@ popd pushd %tcpdump_dir %define optflags $RPM_OPT_FLAGS -DIP_MAX_MEMBERSHIPS=20 -autoheader +autoheader || : +autoconf || : %configure --enable-ipv6 --with-user=pcap %undefine optflags -DEFS="-D_U_=\"\" -g -DHAVE_CONFIG_H" +DEFS="-g -D_U_=\"\" -DHAVE_CONFIG_H" %ifarch alpha sparc sparc64 DEFS="$DEFS -DHAVE_ETHER_HOSTTON=1 -DLBL_ALIGN=1 -DHAVE_ETHER_NTOA=1" %endif @@ -255,18 +243,18 @@ 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 @@ -274,8 +262,8 @@ exit 0 %preun -n arpwatch if [ "$1" = "0" ]; then - /sbin/service arpwatch stop > /dev/null 2>&1 - /sbin/chkconfig --del arpwatch + /sbin/service arpwatch stop > /dev/null 2>&1 || : + /sbin/chkconfig --del arpwatch || : fi %post -n libpcap -p /sbin/ldconfig @@ -284,7 +272,7 @@ fi %files %defattr(-,root,root) -%doc %tcpdump_dir/README %tcpdump_dir/CHANGES %tcpdump_dir/LICENSE +%doc %tcpdump_dir/README %tcpdump_dir/CHANGES %{_sbindir}/tcpdump %{_sbindir}/tcpslice %{_mandir}/man8/tcpslice.8* @@ -292,7 +280,7 @@ fi %files -n libpcap %defattr(-,root,root) -%doc %libpcap_dir/README %libpcap_dir/CHANGES %libpcap_dir/LICENSE +%doc %libpcap_dir/README %libpcap_dir/CHANGES %{_includedir}/* %{_libdir}/libpcap.* %{_mandir}/man3/pcap.3* @@ -318,15 +306,19 @@ fi %{_vararpwatch}/massagevendor-old %changelog -* Wed May 12 2004 Harald Hoyer - 14:3.7.2-8.fc1.2 -- CAN-2004-0183/0184 fixed +* Tue Jan 23 2004 Harald Hoyer 14:3.8.1-4/17 +- fixed arpwatch version +- fixed libpcap library version +- fixed tcpdump droproot + +* Tue Jan 20 2004 Harald Hoyer 14:3.8.1-3 +- corrected tcpslice (bpf.h issue) -* Wed Mar 3 2004 Harald Hoyer - 14:3.7.2-8.fc1.1 -- bumped releaseno, cause s.o. built 7.1 without cvs checkin for FC1. +* Tue Jan 13 2004 Harald Hoyer 14:3.8.1-2 +- more security issues (patch 18) -* Wed Jan 14 2004 Harald Hoyer 14:3.7.2-7.9.1 -- CAN-2003-0989 fixed -- additional fixes +* Fri Jan 09 2004 Phil Knirsch 14:3.8.1-1 +- Updated to latest version because of security issue * Fri Aug 29 2003 Harald Hoyer 14:3.7.2-7 - build libpcap shared library with gcc and not ld diff --git a/tcpslice-CVS.20010207-bpf.patch b/tcpslice-CVS.20010207-bpf.patch new file mode 100644 index 0000000..8aaad3b --- /dev/null +++ b/tcpslice-CVS.20010207-bpf.patch @@ -0,0 +1,12 @@ +diff -ur tcpdump-3.8.1/tcpslice/tcpslice.c tcpdump-3.8.1.new/tcpslice/tcpslice.c +--- tcpslice/tcpslice.c 2004-01-15 17:35:53.000000000 +0100 ++++ tcpslice/tcpslice.c 2004-01-15 16:12:57.000000000 +0100 +@@ -35,7 +35,7 @@ + #include + #include + +-#include ++/* #include */ + + #include + #ifdef HAVE_FCNTL_H