From 4b41c34ac09c3d18f546803bb0048f76511f7755 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 13:23:49 +0000 Subject: auto-import tcpdump-3.8.2-3 from tcpdump-3.8.2-3.src.rpm --- diff --git a/.cvsignore b/.cvsignore index ca7caee..33a21a0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ -arpwatch-2.1a11.tar.gz -libpcap-0.8.1.tar.gz -tcpdump-3.8.1.tar.gz +arpwatch-2.1a13.tar.gz +libpcap-0.8.3.tar.gz +tcpdump-3.8.2.tar.gz tcpslice-CVS.20010207.tar.gz diff --git a/sources b/sources index 707f190..b8fc76c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -9ecd00db892737431b0e524f3e52e19e arpwatch-2.1a11.tar.gz -f03f588e1f0ba783004d76f60507cebd libpcap-0.8.1.tar.gz -9edcf0d7f526f0f03138286959ccc802 tcpdump-3.8.1.tar.gz +b9ff9739cdd2c0e9807b2d05860e4811 arpwatch-2.1a13.tar.gz +56a9d4615d8354fcfe8cff8c8443c77b libpcap-0.8.3.tar.gz +1e2b2c862564c1b43101a75519525215 tcpdump-3.8.2.tar.gz 97cc59ddb3202f74d22261e49aa07115 tcpslice-CVS.20010207.tar.gz diff --git a/tcpdump.spec b/tcpdump.spec index 5dcacc4..364fe8f 100644 --- a/tcpdump.spec +++ b/tcpdump.spec @@ -2,15 +2,22 @@ %define PCAP_UID 77 %define PCAP_GID 77 -%define releaseno 5.1 -%define arpwatch_release 17 +%define releaseno 3 +%define arpwatch_release 1 %define pcap_release %{releaseno} %define tcpdump_release %{releaseno} +%define pcap_major 0 +%define pcap_minor 8 +%define pcap_subminor 3 +%define pcap_version %{pcap_major}.%{pcap_minor}.%{pcap_subminor} + +%define tcpdump_version 3.8.2 + Summary: A network traffic monitoring tool. Name: tcpdump -Version: 3.8.1 -%define tcpdump_dir tcpdump-3.8.1 +Version: %{tcpdump_version} +%define tcpdump_dir tcpdump-%{tcpdump_version} %define tcpslice_dir tcpslice Release: %{tcpdump_release} @@ -20,41 +27,32 @@ Epoch: 14 License: BSD URL: http://www.tcpdump.org Group: Applications/Internet -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 +Source0: http://www.tcpdump.org/release/tcpdump-%{tcpdump_version}.tar.gz +Source1: http://www.tcpdump.org/release/libpcap-%{pcap_version}.tar.gz +Source2: ftp://ftp.ee.lbl.gov/arpwatch-2.1a13.tar.gz Source3: arpwatch.init Source4: tcpslice-CVS.20010207.tar.gz Source5: arpwatch.sysconfig -#Source6: arpwatch-ethercodes.dat Patch5: tcpdump-3.6.2-tcpslice-time.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 -#Patch13: tcpdump-3.8.1-dropdefault.patch Patch15: tcpdump-3.6.2-ip6opts.patch Patch16: tcpdump-3.8.1-sctp.patch Patch17: tcpdump-3.7.2-sctpdef.patch -Patch18: tcpdump-3.8.1-sec.patch -Patch19: tcpdump-3.8.1-auto.patch - +Patch18: tcpdump-3.8.2-gcc34.patch Patch34: arpwatch-2.1a4-fhs.patch Patch35: arpwatch-2.1a10-man.patch Patch38: arpwatch-drop.patch Patch39: arpwatch-drop-man.patch -Patch40: arp2ethers.patch Patch41: arpwatch-addr.patch Patch50: libpcap-shared.patch -#Patch51: tcpdump-3.6.2-purge.patch Patch52: tcpdump-3.7.2-s390.patch Patch70: tcpslice-CVS.20010207-bpf.patch -Patch100: tcpdump-3.8.1-config.patch Prefix: %{_prefix} BuildRequires: kernel-headers >= 2.2.0 openssl-devel @@ -72,9 +70,9 @@ Install tcpdump if you need a program to monitor network traffic. %package -n libpcap # if you change the Version, don't forget to edit libpcap-shared.patch # could be sed'd automatically -Version: 0.8.1 +Version: %{pcap_version} Release: %{pcap_release} -%define libpcap_dir libpcap-0.8.1 +%define libpcap_dir libpcap-%{pcap_version} Summary: A system-independent interface for user-level packet capture. Group: Development/Libraries License: BSD @@ -94,9 +92,9 @@ Install libpcap if you need to do low-level network traffic monitoring on your network. %package -n arpwatch -Version: 2.1a11 +Version: 2.1a13 Release: %{arpwatch_release} -%define arpwatch_dir arpwatch-2.1a11 +%define arpwatch_dir arpwatch-2.1a13 Summary: Network monitoring tools for tracking IP addresses on a network. Group: Applications/System License: BSD @@ -117,7 +115,7 @@ network. %setup -q -c -a 1 -a 2 -a 4 %patch5 -p1 -b .tcpslicetime -%patch7 -p0 -b .rh +%patch7 -p1 -b .rh pushd %libpcap_dir %patch50 -p1 -b .shared @@ -125,13 +123,11 @@ pushd %libpcap_dir popd pushd %tcpdump_dir -%patch8 -p2 -b .droproot %patch10 -p1 -b .portnumbers %patch15 -p1 -b .ip6opts %patch16 -p1 -b .sctp %patch17 -p1 -b .sctpdef -%patch18 -p0 -b .sec -%patch19 -p2 -b .autofoo +%patch18 -p1 -b .gcc34 popd pushd %arpwatch_dir @@ -139,17 +135,13 @@ pushd %arpwatch_dir %patch35 -p1 -b .arpsnmpman %patch38 -p1 -b .droproot %patch39 -p0 -b .droprootman -%patch40 -p1 -b .cshpatch %patch41 -p1 -b .mailuser -#chmod u+w ethercodes.dat -#cp %SOURCE6 ethercodes.dat popd pushd tcpslice %patch70 -p1 -b .bpf popd -%patch100 -p0 -b .config %build pushd %libpcap_dir @@ -160,21 +152,20 @@ DEFS="-g -D_U_=\"\" -fPIC -DHAVE_CONFIG_H" %ifarch alpha sparc sparc64 DEFS="$DEFS -DHAVE_ETHER_HOSTTON=1 -DLBL_ALIGN=1" %endif -make DEFS="$DEFS" +make DEFS="$DEFS" \ + LIBMAJOR="%{pcap_major}" \ + LIBMINOR="%{pcap_minor}" \ + LIBSUBMINOR="%{pcap_subminor}" popd pushd %tcpslice_dir -#aclocal -#autoconf %configure make popd pushd %tcpdump_dir %define optflags $RPM_OPT_FLAGS -DIP_MAX_MEMBERSHIPS=20 -autoheader || : -autoconf || : %configure --enable-ipv6 --with-user=pcap %undefine optflags @@ -190,8 +181,6 @@ make DEFS="$DEFS" popd pushd %arpwatch_dir -#aclocal -#autoconf %configure make ARPDIR=%{_vararpwatch} popd @@ -204,7 +193,11 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} pushd %libpcap_dir mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/net -make DESTDIR=${RPM_BUILD_ROOT} includedir=%{_includedir} install +make DESTDIR=${RPM_BUILD_ROOT} includedir=%{_includedir} \ + LIBMAJOR="%{pcap_major}" \ + LIBMINOR="%{pcap_minor}" \ + LIBSUBMINOR="%{pcap_subminor}" \ + install chmod +x ${RPM_BUILD_ROOT}%{_libdir}/libpcap.so.* popd @@ -272,7 +265,7 @@ fi %files %defattr(-,root,root) -%doc %tcpdump_dir/README %tcpdump_dir/CHANGES +%doc %tcpdump_dir/LICENSE %tcpdump_dir/README %tcpdump_dir/CHANGES %{_sbindir}/tcpdump %{_sbindir}/tcpslice %{_mandir}/man8/tcpslice.8* @@ -280,7 +273,7 @@ fi %files -n libpcap %defattr(-,root,root) -%doc %libpcap_dir/README %libpcap_dir/CHANGES +%doc %libpcap_dir/LICENSE %libpcap_dir/README %libpcap_dir/CHANGES %{_includedir}/* %{_libdir}/libpcap.* %{_mandir}/man3/pcap.3* @@ -306,6 +299,17 @@ fi %{_vararpwatch}/massagevendor-old %changelog +* Tue Apr 6 2004 Harald Hoyer - 14:3.8.2-3 +- added LICENSE files + +* Wed Mar 31 2004 Harald Hoyer - 14:3.8.2-2 +- update to libpcap-0.8.3 (tcpdump-3.8.3 seems to be older that 3.8.2!!) + +* Tue Mar 30 2004 Harald Hoyer - 14:3.8.2-1 +- update to tcpdump-3.8.2, libpcap-0.8.2, arpwatch-2.1a13 +- patched tcpdump configure for gcc34 optimizations +- removed obsolete patches + * Tue Mar 02 2004 Elliot Lee - rebuilt