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

auto-import changelog data from tcpdump-3.6.2-6.src.rpm

Browse Source 
Wed Jun 20 2001 Harald Hoyer <harald@redhat.de>
- use initgroups, instead of setgroups
Mon Jun 18 2001 Harald Hoyer <harald@redhat.de>
- added dropgroup patches (#44563)
Mon May 07 2001 Harald Hoyer <harald@redhat.de>
- switched to Pekka's tcpdump-3.6.2 package
- incremented epoch
This commit is contained in:
cvsdist 2004-09-09 13:08:01 +00:00
parent d2e099cccf
commit d42d137a2e
5 changed files with 192 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.cvsignore
View File

@ -1,5 +1,4 @@
arpwatch-2.1a10.tar.gz arpwatch-2.1a11.tar.gz
libpcap-0.4-ss991029.dif.gz libpcap-0.6.2.tar.gz
libpcap-0.4.tar.gz tcpdump-3.6.2.tar.gz
tcpdump-3.4-ss991030.dif.gz tcpslice-CVS.20010207.tar.gz
tcpdump-3.4.tar.gz

9
sources
View File

@ -1,5 +1,4 @@
c3f82f51f0c0bfcaf72b5fb216ab6a7b arpwatch-2.1a10.tar.gz 9ecd00db892737431b0e524f3e52e19e arpwatch-2.1a11.tar.gz
fbe47a4360a50310a5d38d24368fdbc6 libpcap-0.4-ss991029.dif.gz a6325b5fe429eba06294ce2db9263a66 libpcap-0.6.2.tar.gz
f85e53e60dea5c89b9c67b7b42c08736 libpcap-0.4.tar.gz 6bc8da35f9eed4e675bfdf04ce312248 tcpdump-3.6.2.tar.gz
433da48a4bb3d95bd747c2496c04b6ae tcpdump-3.4-ss991030.dif.gz 97cc59ddb3202f74d22261e49aa07115 tcpslice-CVS.20010207.tar.gz
847f20a0823a5611a25139c391f1de51 tcpdump-3.4.tar.gz

37
tcpdump-3.6.1-portnumbers.patch Normal file
View File

@ -0,0 +1,37 @@
diff -uNr tcpdump-3.6.1.orig/addrtoname.c tcpdump-3.6.1/addrtoname.c
--- tcpdump-3.6.1.orig/addrtoname.c Sat Jan 13 20:01:00 2001
+++ tcpdump-3.6.1/addrtoname.c Sat Jan 13 19:59:23 2001
@@ -581,7 +581,7 @@
while (table->name)
table = table->nxt;
- if (nflag) {
+ if (nflag > 1) {
(void)snprintf(buf, sizeof(buf), "%d", port);
table->name = strdup(buf);
} else
@@ -745,7 +745,7 @@
f_localnet = localnet;
f_netmask = mask;
}
- if (nflag)
+ if (nflag > 1)
/*
* Simplest way to suppress names.
*/
diff -uNr tcpdump-3.6.1.orig/tcpdump.1 tcpdump-3.6.1/tcpdump.1
--- tcpdump-3.6.1.orig/tcpdump.1 Sat Jan 13 19:51:47 2001
+++ tcpdump-3.6.1/tcpdump.1 Sat Jan 13 19:50:19 2001
@@ -175,7 +175,11 @@
``tcpdump\ \ \-l \ \ > dat\ \ &\ \ tail\ \ \-f\ \ dat''.
.TP
.B \-n
-Don't convert addresses (i.e., host addresses, port numbers, etc.) to names.
+Don't convert host addresses to names. This can be used to avoid
+DNS lookups.
+.TP
+.B \-nn
+Don't convert protocol and port numbers etc. to names either.
.TP
.B \-N
Don't print domain name qualification of host names. E.g.,

10
tcpdump-3.6.2-tcpslice-time.patch Normal file
View File

@ -0,0 +1,10 @@
--- tcpdump-3.6.2/tcpslice/tcpslice.c Tue Nov 14 21:10:22 2000
+++ tcpdump-3.6.2.new/tcpslice/tcpslice.c Sat Apr 14 19:14:13 2001
@@ -47,6 +47,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <time.h>
#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H

244
tcpdump.spec
View File

@ -1,46 +1,37 @@
%define _vararpwatch %{_localstatedir}/arpwatch %define _vararpwatch %{_localstatedir}/arpwatch
%define optflags -ggdb -Wall
Summary: A network traffic monitoring tool. Summary: A network traffic monitoring tool.
Name: tcpdump Name: tcpdump
Version: 3.4 Version: 3.6.2
%define tcpdump_dir tcpdump-3.4 %define tcpdump_dir tcpdump-3.6.2
Release: 40 %define tcpslice_dir tcpslice
Release: 6
# XXX epoch is necessary to obsolete tcpdump-3.4a5 # XXX epoch is necessary to obsolete tcpdump-3.4a5
Epoch: 5 Epoch: 9
Copyright: BSD Copyright: BSD
Group: Applications/Internet Group: Applications/Internet
Source0: ftp://ftp.ee.lbl.gov/tcpdump-3.4.tar.gz Source0: http://www.tcpdump.org/release/tcpdump-3.6.2.tar.gz
Source1: ftp://ftp.ee.lbl.gov/libpcap-0.4.tar.gz Source1: http://www.tcpdump.org/release/libpcap-0.6.2.tar.gz
Source2: ftp://ftp.ee.lbl.gov/arpwatch-2.1a10.tar.gz Source2: ftp://ftp.ee.lbl.gov/arpwatch-2.1a11.tar.gz
Source3: arpwatch.init Source3: arpwatch.init
Source4: arpwatch-ethercodes.dat Source4: tcpslice-CVS.20010207.tar.gz
Patch0: tcpdump-3.4a5-man.patch
# XXX patch1 not applied, already in the Kuznetsov patch. Reapply if not.
Patch1: tcpdump-3.4a5-sack.patch Patch5: tcpdump-3.6.2-tcpslice-time.patch
Patch10: ftp://ftp.inr.ac.ru/ip-routing/lbl-tools/libpcap-0.4-ss991029.dif.gz Patch6: tcpdump-3.6.2-usageman.patch
Patch20: ftp://ftp.inr.ac.ru/ip-routing/lbl-tools/tcpdump-3.4-ss991030.dif.gz Patch7: tcpdump-3.6.2-redhat.patch
Patch21: tcpdump-3.4-glibc21.patch Patch8: tcpdump-3.6.1-droproot2.patch
Patch22: tcpdump-3.4-sparc64.patch Patch9: tcpdump-3.6.1-smb-quiet.patch
Patch23: tcpdump-3.4-iphl.patch Patch10: tcpdump-3.6.1-portnumbers.patch
Patch24: tcpdump-3.4-getproto.patch Patch11: tcpdump-3.6.1-non-promisc-default.patch
Patch25: tcpdump-3.4-manpage.patch
Patch26: ftp://openrock.net/bridge/patches/tcpdump-3.1-802.1d.diff
Patch27: tcpdump-3.4-bufovfl.patch
Patch29: tcpdump-3.4-ethertype.patch
Patch32: libpcap-sparc.patch
Patch33: libpcap-0.4-fhs.patch
Patch34: arpwatch-2.1a4-fhs.patch Patch34: arpwatch-2.1a4-fhs.patch
Patch36: libpcap-0.4-kern24.patch Patch35: arpwatch-2.1a10-man.patch
Patch38: arpwatch-2.1a10-bug19696.patch Patch38: arpwatch-drop.patch
Patch39: libpcap-intf.patch Patch39: arpwatch-drop-man.patch
Patch40: libpcap-intf2.patch
Patch41: libpcap-0.4-eintr.patch
Patch42: tcpdump-3.4-interfaces.patch
Patch43: tcpdump-rootdrop.patch
Patch44: tcpdump-3.4-glibc.patch
Patch45: tcpdump-3.4-ia64.patch
Prefix: %{_prefix} Prefix: %{_prefix}
BuildRequires: kernel-headers >= 2.2.0 BuildRequires: kernel-headers >= 2.2.0 openssl-devel
Requires: kernel >= 2.2.0 Requires: kernel >= 2.2.0
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
@ -53,11 +44,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.4 Version: 0.6.2
%define libpcap_dir libpcap-0.4 %define libpcap_dir libpcap-0.6.2
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
Requires: kernel >= 2.2.0 Requires: kernel >= 2.2.0 openssl
%description -n libpcap %description -n libpcap
Libpcap provides a portable framework for low-level network Libpcap provides a portable framework for low-level network
@ -72,11 +63,11 @@ Install libpcap if you need to do low-level network traffic monitoring
on your network. on your network.
%package -n arpwatch %package -n arpwatch
Version: 2.1a10 Version: 2.1a11
%define arpwatch_dir arpwatch-2.1a10 %define arpwatch_dir arpwatch-2.1a11
Summary: Network monitoring tools for tracking IP addresses on a network. Summary: Network monitoring tools for tracking IP addresses on a network.
Group: Applications/System Group: Applications/System
Prereq: /sbin/chkconfig /etc/init.d /sbin/service Prereq: /sbin/chkconfig /sbin/service
%description -n arpwatch %description -n arpwatch
The arpwatch package contains arpwatch and arpsnmp. Arpwatch and The arpwatch package contains arpwatch and arpsnmp. Arpwatch and
@ -89,70 +80,58 @@ which will automatically keep track of the IP addresses on your
network. network.
%prep %prep
%setup -q -c -a 1 -a 2 %setup -q -c -a 1 -a 2 -a 4
cd %libpcap_dir %patch5 -p1 -b .tcpslicetime
%patch10 -p1 %patch7 -p0 -b .rh
%ifarch sparc sparc64
%patch32 -p1
%endif
%patch33 -p1 -b .fhs
%patch36 -p1 -b .kern24
%patch39 -p1 -b .intf
%patch40 -p1 -b .intf2
%patch41 -p1 -b .eintr
cd ..
cd %tcpdump_dir pushd %libpcap_dir
%patch0 -p2 popd
# XXX patch1 not applied, already in the Kuznetsov patch. Reapply if not.
#%patch1 -p2
%patch20 -p1 -b .tcpdump-ANK
%patch21 -p1 -b .glibc21
# XXX this patch needed on sparc64 if SIOCGIFNAME is broke (kernel ~= 2.2.10)
#%patch22 -p1 -b .sparc64
%patch23 -p1 -b .iphl
%patch24 -p1 -b .getproto
%patch25 -p1 -b .manpage
%patch26 -p1 -b .stp
%patch27 -p1 -b .bufovfl
%patch29 -p1 -b .ethertype
%patch42 -p1 -b .interfaces
%patch43 -p1 -b .rootdrop
cd ..
cd %arpwatch_dir pushd %tcpdump_dir
%patch6 -p1 -b .usageman
%patch8 -p1 -b .droproot
%patch9 -p1 -b .smb
%patch10 -p1 -b .portnumbers
#%patch11 -p1 -b .nonpromisc # Not by default
popd
pushd %arpwatch_dir
%patch34 -p1 -b .fhs %patch34 -p1 -b .fhs
%patch38 -p1 -b .bug19696 %patch35 -p1 -b .arpsnmpman
%patch38 -p1 -b .droproot
%patch39 -p0 -b .droprootman
chmod u+w ethercodes.dat chmod u+w ethercodes.dat
cp %SOURCE4 ethercodes.dat cp %SOURCE4 ethercodes.dat
cd .. popd
%patch44 -p1 -b .glibc
%patch45 -p1 -b .ia64
%build %build
cd %libpcap_dir pushd %libpcap_dir
%configure %configure --enable-ipv6
DEFS="-fPIC -DHAVE_MALLOC_H=1 -DHAVE_STRERROR=1 -DHAVE_NET_IF_ARP_H=1" DEFS="-g -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
make DEFS="$DEFS" make DEFS="$DEFS"
cd .. popd
cd %tcpdump_dir pushd %tcpslice_dir
aclocal
%define optflags $RPM_OPT_FLAGS -DIP_MAX_MEMBERSHIPS=20
autoconf autoconf
%configure %configure
make
popd
pushd %tcpdump_dir
%define optflags $RPM_OPT_FLAGS -DIP_MAX_MEMBERSHIPS=20
autoconf
%configure --enable-ipv6
%undefine optflags %undefine optflags
DEFS="-DHAVE_FCNTL_H=1 -DHAVE_MALLOC_H=1 -DHAVE_MEMORY_H=1 -DHAVE_RPC_RPCENT_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_NET_SLIP_H=1 -DHAVE_VFPRINTF=1 -DHAVE_STRCASECMP=1 -DHAVE_SETLINEBUF=1 -DHAVE_LIBRPC=1 -DRETSIGTYPE=void -DRETSIGVAL= -DHAVE_SIGACTION=1 -DHAVE_FDDI" DEFS="-g -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
@ -161,13 +140,14 @@ DEFS="$DEFS -DWORDS_BIGENDIAN"
%endif %endif
make DEFS="$DEFS" make DEFS="$DEFS"
cd .. popd
cd %arpwatch_dir
pushd %arpwatch_dir
aclocal
autoconf
%configure %configure
make ARPDIR=%{_vararpwatch} make ARPDIR=%{_vararpwatch}
cd .. popd
%install %install
rm -rf ${RPM_BUILD_ROOT} rm -rf ${RPM_BUILD_ROOT}
@ -175,36 +155,35 @@ mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{3,8} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{3,8}
mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
cd %libpcap_dir pushd %libpcap_dir
mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/pcap/net mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/pcap/net
make DESTDIR=${RPM_BUILD_ROOT} INCLDEST=%{_includedir}/pcap install install-incl install-man make DESTDIR=${RPM_BUILD_ROOT} includedir=%{_includedir}/pcap install
cd .. popd
cd %tcpdump_dir pushd %tcpslice_dir
install -m755 -s tcpslice ${RPM_BUILD_ROOT}%{_sbindir}
install -m644 tcpslice.1 ${RPM_BUILD_ROOT}%{_mandir}/man8/tcpslice.8
popd
pushd %tcpdump_dir
install -m755 -s tcpdump ${RPM_BUILD_ROOT}%{_sbindir} install -m755 -s tcpdump ${RPM_BUILD_ROOT}%{_sbindir}
install -m644 tcpdump.1 ${RPM_BUILD_ROOT}%{_mandir}/man8/tcpdump.8 install -m644 tcpdump.1 ${RPM_BUILD_ROOT}%{_mandir}/man8/tcpdump.8
cd .. popd
cd %arpwatch_dir pushd %arpwatch_dir
make DESTDIR=${RPM_BUILD_ROOT} install install-man make DESTDIR=${RPM_BUILD_ROOT} install install-man
mkdir -p ${RPM_BUILD_ROOT}%{_vararpwatch} mkdir -p ${RPM_BUILD_ROOT}%{_vararpwatch}
for n in arp2ethers massagevendor; do for n in arp2ethers arpfetch massagevendor massagevendor-old; do
install -m755 $n ${RPM_BUILD_ROOT}%{_vararpwatch} install -m755 $n ${RPM_BUILD_ROOT}%{_vararpwatch}
done done
for n in *.awk *.dat; do for n in *.awk *.dat missingcodes.txt; do
install -m644 $n ${RPM_BUILD_ROOT}%{_vararpwatch} install -m644 $n ${RPM_BUILD_ROOT}%{_vararpwatch}
done done
( cd ${RPM_BUILD_ROOT} ( cd ${RPM_BUILD_ROOT}
mkdir -p ./etc/rc.d/init.d mkdir -p ./etc/rc.d/init.d
install -c -m755 $RPM_SOURCE_DIR/arpwatch.init ./etc/rc.d/init.d/arpwatch install -c -m755 $RPM_SOURCE_DIR/arpwatch.init ./etc/rc.d/init.d/arpwatch
mkdir -p ./etc/sysconfig
cat >./etc/sysconfig/arpwatch <<EOF
# Define here the options for arpwatch, e.g. -u nobody
OPTIONS=""
EOF
) )
cd .. popd
( cd ${RPM_BUILD_ROOT} ( cd ${RPM_BUILD_ROOT}
strip .%{_sbindir}/* || : strip .%{_sbindir}/* || :
@ -218,7 +197,7 @@ rm -rf ${RPM_BUILD_ROOT}
%postun -n arpwatch %postun -n arpwatch
if [ "$1" -ge "1" ]; then if [ "$1" -ge "1" ]; then
/etc/init.d/arpwatch condrestart >/dev/null 2>&1 /sbin/service arpwatch condrestart >/dev/null 2>&1
fi fi
%preun -n arpwatch %preun -n arpwatch
@ -231,6 +210,8 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%doc %tcpdump_dir/README %tcpdump_dir/CHANGES %doc %tcpdump_dir/README %tcpdump_dir/CHANGES
%{_sbindir}/tcpdump %{_sbindir}/tcpdump
%{_sbindir}/tcpslice
%{_mandir}/man8/tcpslice.8*
%{_mandir}/man8/tcpdump.8* %{_mandir}/man8/tcpdump.8*
%files -n libpcap %files -n libpcap
@ -248,17 +229,30 @@ fi
%{_mandir}/man8/arpwatch.8* %{_mandir}/man8/arpwatch.8*
%{_mandir}/man8/arpsnmp.8* %{_mandir}/man8/arpsnmp.8*
%config /etc/rc.d/init.d/arpwatch %config /etc/rc.d/init.d/arpwatch
%config /etc/sysconfig/arpwatch
%dir %{_vararpwatch} %dir %{_vararpwatch}
%config %{_vararpwatch}/arp.dat %config %{_vararpwatch}/arp.dat
%config %{_vararpwatch}/ethercodes.dat %config %{_vararpwatch}/ethercodes.dat
%config %{_vararpwatch}/missingcodes.txt
%{_vararpwatch}/*.awk %{_vararpwatch}/*.awk
%{_vararpwatch}/arp2ethers %{_vararpwatch}/arp2ethers
%{_vararpwatch}/arpfetch
%{_vararpwatch}/massagevendor %{_vararpwatch}/massagevendor
%{_vararpwatch}/massagevendor-old
%changelog %changelog
* Fri Apr 21 2001 Bill Nottingham <notting@redhat.com> * Wed Jun 20 2001 Harald Hoyer <harald@redhat.de>
- make ia64 work - use initgroups, instead of setgroups
* Mon Jun 18 2001 Harald Hoyer <harald@redhat.de>
- added dropgroup patches (#44563)
* Mon May 07 2001 Harald Hoyer <harald@redhat.de>
- switched to Pekka's tcpdump-3.6.2 package
- incremented epoch
* Sat Apr 14 2001 Pekka Savola <pekkas@netcore.fi>
- fix building of tcpslice on glibc 2.2.2 (time.h)
- disable /etc/init.d requirement and fix %post scripts in arpwatch
* Wed Feb 14 2001 Harald Hoyer <harald@redhat.de> * Wed Feb 14 2001 Harald Hoyer <harald@redhat.de>
- glibc sys/time -> time include patch - glibc sys/time -> time include patch
@ -269,6 +263,10 @@ fi
* Wed Feb 07 2001 Harald Hoyer <harald@redhat.com> * Wed Feb 07 2001 Harald Hoyer <harald@redhat.com>
- added check for presence of /etc/sysconfig/arpwatch (#23172) - added check for presence of /etc/sysconfig/arpwatch (#23172)
* Wed Feb 7 2001 Pekka Savola <pekkas@netcore.fi>
- update to 3.6.2, 0.6.2 and new CVS of tcpslice.
- i18n'ize arpwatch init script
* Fri Feb 2 2001 Trond Eivind Glomsrød <teg@redhat.com> * Fri Feb 2 2001 Trond Eivind Glomsrød <teg@redhat.com>
- i18nize initscript - i18nize initscript
@ -283,6 +281,38 @@ fi
- more (potential) overflows in libpcap. #21373 - more (potential) overflows in libpcap. #21373
- documentation fix for #20906 - documentation fix for #20906
* Sun Jan 14 2001 Pekka Savola <pekkas@netcore.fi>
- use --enable-ipv6
- Add two patches from CVS to enhance 802.2 printing, and more importantly,
to be able to specify 'no stp'
* Sat Jan 13 2001 Pekka Savola <pekkas@netcore.fi>
- Make SMB printing output a lot more quiet unless in verbose mode.
- Make -n resolve port/protocol numbers but not hostnames, -nn for no
resolving at all
- Separate droproot patch from a more generic man/usage fix one
- Add non-promiscuous mode -by default patch, but don't apply it by default
* Thu Jan 11 2001 Pekka Savola <pekkas@netcore.fi>
- Update to tcpdump 3.6.1 and libpcap 0.6.1 releases.
* Mon Jan 8 2001 Pekka Savola <pekkas@netcore.fi>
- Update to 20010108 CVS, disable some upstreamed patches.
- Change some additional .1 pages to .8.
- Add droproot patch, some --usage and man page fixes.
* Mon Jan 1 2001 Pekka Savola <pekkas@netcore.fi>
- Initial packaging with latest tcpdump.org CVS tcpdump-3.6 and libpcap-0.6.
- add earlier print-domain.c, the latest is segfaulting
- don't unnecesessarily include snprintf.o, it didn't compile with gcc 2.96 anyway
- don't use savestr, require openssl, tweak tweak tweak
- add tcpslice, patch it a bit for egcs detection
* Sun Dec 31 2000 Pekka Savola <pekkas@netcore.fi>
- tcpdump: spice up the manpage about interfaces
- tcpdump: add 'all' and 'any' keywords to -i, saner default behaviour.
- upgrade arpwatch to 2.1a10
* Sun Nov 26 2000 Jeff Johnson <jbj@redhat.com> * Sun Nov 26 2000 Jeff Johnson <jbj@redhat.com>
- more (potential) overflows in libpcap. - more (potential) overflows in libpcap.