rpms/tcpdump
7
0
Fork 0
Code Issues Pull Requests Releases Activity

auto-import tcpdump-3.8.1-4 from tcpdump-3.8.1-4.src.rpm

Browse Source
This commit is contained in:
cvsdist 2004-09-09 13:22:10 +00:00
parent 723267267f
commit 19c3952da7
4 changed files with 66 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -1,4 +1,4 @@
arpwatch-2.1a11.tar.gz arpwatch-2.1a11.tar.gz
libpcap-0.7.2.tar.gz libpcap-0.8.1.tar.gz
tcpdump-3.7.2.tar.gz tcpdump-3.8.1.tar.gz
tcpslice-CVS.20010207.tar.gz tcpslice-CVS.20010207.tar.gz

4
sources
View File

@ -1,4 +1,4 @@
9ecd00db892737431b0e524f3e52e19e arpwatch-2.1a11.tar.gz 9ecd00db892737431b0e524f3e52e19e arpwatch-2.1a11.tar.gz
e3993a5409b98989c7a73e27c5df4d27 libpcap-0.7.2.tar.gz f03f588e1f0ba783004d76f60507cebd libpcap-0.8.1.tar.gz
1e44b59abba39a48e3680bc2cffb8a6a tcpdump-3.7.2.tar.gz 9edcf0d7f526f0f03138286959ccc802 tcpdump-3.8.1.tar.gz
97cc59ddb3202f74d22261e49aa07115 tcpslice-CVS.20010207.tar.gz 97cc59ddb3202f74d22261e49aa07115 tcpslice-CVS.20010207.tar.gz

108
tcpdump.spec
View File

@ -2,17 +2,15 @@
%define PCAP_UID 77 %define PCAP_UID 77
%define PCAP_GID 77 %define PCAP_GID 77
#%define releaseno 7.E3.1 %define releaseno 4
%define releaseno 8.fc1.2 %define arpwatch_release 17
%define arpwatch_release %{releaseno}
%define pcap_release %{releaseno} %define pcap_release %{releaseno}
%define tcpdump_release %{releaseno} %define tcpdump_release %{releaseno}
Summary: A network traffic monitoring tool. Summary: A network traffic monitoring tool.
Name: tcpdump Name: tcpdump
Version: 3.7.2 Version: 3.8.1
%define tcpdump_dir tcpdump-3.7.2 %define tcpdump_dir tcpdump-3.8.1
%define tcpslice_dir tcpslice %define tcpslice_dir tcpslice
Release: %{tcpdump_release} Release: %{tcpdump_release}
@ -22,8 +20,8 @@ Epoch: 14
License: BSD License: BSD
URL: http://www.tcpdump.org URL: http://www.tcpdump.org
Group: Applications/Internet Group: Applications/Internet
Source0: http://www.tcpdump.org/release/tcpdump-3.7.2.tar.gz Source0: http://www.tcpdump.org/release/tcpdump-3.8.1.tar.gz
Source1: http://www.tcpdump.org/release/libpcap-0.7.2.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 Source2: ftp://ftp.ee.lbl.gov/arpwatch-2.1a11.tar.gz
Source3: arpwatch.init Source3: arpwatch.init
Source4: tcpslice-CVS.20010207.tar.gz Source4: tcpslice-CVS.20010207.tar.gz
@ -31,22 +29,17 @@ Source5: arpwatch.sysconfig
#Source6: arpwatch-ethercodes.dat #Source6: arpwatch-ethercodes.dat
Patch5: tcpdump-3.6.2-tcpslice-time.patch Patch5: tcpdump-3.6.2-tcpslice-time.patch
#Patch6: tcpdump-3.6.2-usageman.patch Patch7: tcpdump-3.8.1-redhat.patch
Patch7: tcpdump-3.7.2-redhat.patch Patch8: tcpdump-3.8.1-droproot.patch
Patch8: tcpdump-3.7.2-droproot2.patch
#Patch9: tcpdump-3.6.1-smb-quiet.patch
Patch10: tcpdump-3.6.1-portnumbers.patch Patch10: tcpdump-3.6.1-portnumbers.patch
Patch11: tcpdump-3.6.1-non-promisc-default.patch Patch11: tcpdump-3.6.1-non-promisc-default.patch
#Patch12: tcpdump-3.6.2-3.6.3.patch #Patch13: tcpdump-3.8.1-dropdefault.patch
Patch13: tcpdump-3.7.2-dropdefault.patch
#Patch14: tcpdump-3.6.2-snaplen.patch
Patch15: tcpdump-3.6.2-ip6opts.patch Patch15: tcpdump-3.6.2-ip6opts.patch
Patch16: tcpdump-3.7.2-sctp.patch Patch16: tcpdump-3.8.1-sctp.patch
#Patch16: tcpdump-3.6.2-bgp.patch
Patch17: tcpdump-3.7.2-sctpdef.patch Patch17: tcpdump-3.7.2-sctpdef.patch
Patch18: tcpdump-3.7.2-CAN-2003-0989.patch Patch18: tcpdump-3.8.1-sec.patch
Patch19: tcpdump-3.6.2-CAN-2003-0989-2.patch Patch19: tcpdump-3.8.1-auto.patch
Patch20: tcpdump-3.6.2-CAN-2004-0183-0184.patch
Patch34: arpwatch-2.1a4-fhs.patch Patch34: arpwatch-2.1a4-fhs.patch
Patch35: arpwatch-2.1a10-man.patch Patch35: arpwatch-2.1a10-man.patch
@ -59,7 +52,9 @@ Patch50: libpcap-shared.patch
#Patch51: tcpdump-3.6.2-purge.patch #Patch51: tcpdump-3.6.2-purge.patch
Patch52: tcpdump-3.7.2-s390.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} Prefix: %{_prefix}
BuildRequires: kernel-headers >= 2.2.0 openssl-devel 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. Install tcpdump if you need a program to monitor network traffic.
%package -n libpcap %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} 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. Summary: A system-independent interface for user-level packet capture.
Group: Development/Libraries Group: Development/Libraries
License: BSD License: BSD
@ -124,30 +121,17 @@ network.
pushd %libpcap_dir pushd %libpcap_dir
%patch50 -p1 -b .shared %patch50 -p1 -b .shared
#%patch51 -p1 -b .purge
%patch52 -p1 -b .s390 %patch52 -p1 -b .s390
popd popd
pushd %tcpdump_dir pushd %tcpdump_dir
#%patch6 -p1 -b .usageman %patch8 -p2 -b .droproot
%patch8 -p1 -b .droproot
# Fixed in 3.7.2
#%patch9 -p1 -b .smb
%patch10 -p1 -b .portnumbers %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 %patch15 -p1 -b .ip6opts
%patch16 -p1 -b .sctp %patch16 -p1 -b .sctp
# Fixed in 3.7.2
#%patch16 -p2 -b .bgp
%patch17 -p1 -b .sctpdef %patch17 -p1 -b .sctpdef
%patch18 -p1 -b .CAN-2003-0989 %patch18 -p0 -b .sec
%patch19 -p0 -b .CAN-2003-0989-2 %patch19 -p2 -b .autofoo
%patch20 -p1 -b .CAN-2004-0183-0184
popd popd
pushd %arpwatch_dir pushd %arpwatch_dir
@ -161,15 +145,18 @@ pushd %arpwatch_dir
#cp %SOURCE6 ethercodes.dat #cp %SOURCE6 ethercodes.dat
popd popd
pushd tcpslice
%patch70 -p1 -b .bpf
popd
%patch100 -p0 %patch100 -p0 -b .config
%build %build
pushd %libpcap_dir pushd %libpcap_dir
%configure --enable-ipv6 %configure --enable-ipv6
DEFS="-g -fPIC -DHAVE_CONFIG_H" DEFS="-g -D_U_=\"\" -fPIC -DHAVE_CONFIG_H"
%ifarch alpha sparc sparc64 %ifarch alpha sparc sparc64
DEFS="$DEFS -DHAVE_ETHER_HOSTTON=1 -DLBL_ALIGN=1" DEFS="$DEFS -DHAVE_ETHER_HOSTTON=1 -DLBL_ALIGN=1"
%endif %endif
@ -186,11 +173,12 @@ popd
pushd %tcpdump_dir pushd %tcpdump_dir
%define optflags $RPM_OPT_FLAGS -DIP_MAX_MEMBERSHIPS=20 %define optflags $RPM_OPT_FLAGS -DIP_MAX_MEMBERSHIPS=20
autoheader autoheader || :
autoconf || :
%configure --enable-ipv6 --with-user=pcap %configure --enable-ipv6 --with-user=pcap
%undefine optflags %undefine optflags
DEFS="-D_U_=\"\" -g -DHAVE_CONFIG_H" DEFS="-g -D_U_=\"\" -DHAVE_CONFIG_H"
%ifarch alpha sparc sparc64 %ifarch alpha sparc sparc64
DEFS="$DEFS -DHAVE_ETHER_HOSTTON=1 -DLBL_ALIGN=1 -DHAVE_ETHER_NTOA=1" DEFS="$DEFS -DHAVE_ETHER_HOSTTON=1 -DLBL_ALIGN=1 -DHAVE_ETHER_NTOA=1"
%endif %endif
@ -255,18 +243,18 @@ popd
rm -rf ${RPM_BUILD_ROOT} rm -rf ${RPM_BUILD_ROOT}
%pre %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} \ /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 exit 0
%post -n arpwatch %post -n arpwatch
/sbin/chkconfig --add arpwatch /sbin/chkconfig --add arpwatch
%pre -n 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} \ /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 exit 0
%postun -n arpwatch %postun -n arpwatch
@ -274,8 +262,8 @@ exit 0
%preun -n arpwatch %preun -n arpwatch
if [ "$1" = "0" ]; then if [ "$1" = "0" ]; then
/sbin/service arpwatch stop > /dev/null 2>&1 /sbin/service arpwatch stop > /dev/null 2>&1 || :
/sbin/chkconfig --del arpwatch /sbin/chkconfig --del arpwatch || :
fi fi
%post -n libpcap -p /sbin/ldconfig %post -n libpcap -p /sbin/ldconfig
@ -284,7 +272,7 @@ fi
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc %tcpdump_dir/README %tcpdump_dir/CHANGES %tcpdump_dir/LICENSE %doc %tcpdump_dir/README %tcpdump_dir/CHANGES
%{_sbindir}/tcpdump %{_sbindir}/tcpdump
%{_sbindir}/tcpslice %{_sbindir}/tcpslice
%{_mandir}/man8/tcpslice.8* %{_mandir}/man8/tcpslice.8*
@ -292,7 +280,7 @@ fi
%files -n libpcap %files -n libpcap
%defattr(-,root,root) %defattr(-,root,root)
%doc %libpcap_dir/README %libpcap_dir/CHANGES %libpcap_dir/LICENSE %doc %libpcap_dir/README %libpcap_dir/CHANGES
%{_includedir}/* %{_includedir}/*
%{_libdir}/libpcap.* %{_libdir}/libpcap.*
%{_mandir}/man3/pcap.3* %{_mandir}/man3/pcap.3*
@ -318,15 +306,19 @@ fi
%{_vararpwatch}/massagevendor-old %{_vararpwatch}/massagevendor-old
%changelog %changelog
* Wed May 12 2004 Harald Hoyer <harald@redhat.com> - 14:3.7.2-8.fc1.2 * Tue Jan 23 2004 Harald Hoyer <harald@redhat.de> 14:3.8.1-4/17
- CAN-2004-0183/0184 fixed - fixed arpwatch version
- fixed libpcap library version
- fixed tcpdump droproot
* Wed Mar 3 2004 Harald Hoyer <harald@redhat.com> - 14:3.7.2-8.fc1.1 * Tue Jan 20 2004 Harald Hoyer <harald@redhat.de> 14:3.8.1-3
- bumped releaseno, cause s.o. built 7.1 without cvs checkin for FC1. - corrected tcpslice (bpf.h issue)
* Wed Jan 14 2004 Harald Hoyer <harald@redhat.com> 14:3.7.2-7.9.1 * Tue Jan 13 2004 Harald Hoyer <harald@redhat.de> 14:3.8.1-2
- CAN-2003-0989 fixed - more security issues (patch 18)
- additional fixes
* Fri Jan 09 2004 Phil Knirsch <pknirsch@redhat.com> 14:3.8.1-1
- Updated to latest version because of security issue
* Fri Aug 29 2003 Harald Hoyer <harald@redhat.de> 14:3.7.2-7 * Fri Aug 29 2003 Harald Hoyer <harald@redhat.de> 14:3.7.2-7
- build libpcap shared library with gcc and not ld - build libpcap shared library with gcc and not ld

12
tcpslice-CVS.20010207-bpf.patch Normal file
View File

@ -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 <sys/file.h>
#include <sys/stat.h>
-#include <net/bpf.h>
+/* #include <net/bpf.h> */
#include <ctype.h>
#ifdef HAVE_FCNTL_H