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

- update to post 4.0.0 git snapshot 20090818git832d2c

Browse Source 
- print retrans and reachable times in ICMPv6 as milliseconds (#474264)
This commit is contained in:
Miroslav Lichvar 2009-08-20 15:11:12 +00:00
parent e1f673f907
commit 2f0df680df
9 changed files with 33 additions and 3592 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1,2 +1,2 @@
tcpslice-1.2a3.tar.gz
tcpdump-3.9.8.tar.gz
tcpdump-4.0.0-20090818git832d2c.tar.gz

2
sources
View File

@ -1,2 +1,2 @@
e329cbeb7e589f132d92c3447c477190 tcpslice-1.2a3.tar.gz
c491a78c52fe73f1f7271aa5d8c6ab2e tcpdump-3.9.8.tar.gz
4875284ec22ec84e42fba34d4ce6f20c tcpdump-4.0.0-20090818git832d2c.tar.gz

12
tcpdump-3.9.7-crypto.patch
View File

@ -1,12 +0,0 @@
--- tcpdump-3.9.7/configure.crypto 2006-09-19 21:07:56.000000000 +0200
+++ tcpdump-3.9.7/configure 2007-08-01 14:43:55.000000000 +0200
@@ -12814,7 +12814,8 @@ for dir in $Xprefix /usr/${host_alias} /
#
# Or should we just look for "libcrypto.*"?
#
- if test -d $dir/lib -a \( -f $dir/lib/libcrypto.a -o \
+ if test \( -f $dir/lib/libcrypto.a -o \
+ -f $dir/lib64/libcrypto.so -o \
-f $dir/lib/libcrypto.so -o \
-f $dir/lib/libcrypto.sl -o \
-f $dir/lib/libcrypto.dylib \); then

3535
tcpdump-3.9.8-ikev2.patch
View File

File diff suppressed because it is too large Load Diff

21
tcpdump-3.9.8-nosmi.patch
View File

@ -1,21 +0,0 @@
diff -up tcpdump-3.9.8/configure.nosmi tcpdump-3.9.8/configure
--- tcpdump-3.9.8/configure.nosmi 2008-06-02 14:07:38.000000000 +0200
+++ tcpdump-3.9.8/configure 2008-06-02 14:19:10.000000000 +0200
@@ -4422,7 +4422,7 @@ if test "${ac_cv_lib_smi_smiInit+set}" =
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsmi $LIBS"
+LIBS=" $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4482,7 +4482,7 @@ if test $ac_cv_lib_smi_smiInit = yes; th
#define HAVE_LIBSMI 1
_ACEOF
- LIBS="-lsmi $LIBS"
+ LIBS=" $LIBS"
fi

4
tcpdump-3.9.7-droproot.patch → tcpdump-4.0.0-droproot.patch
View File

@ -21,8 +21,8 @@
if (username || chroot_dir)
droproot(username, chroot_dir);
}
--- tcpdump-3.9.7/tcpdump.1.droproot 2007-07-24 16:15:54.000000000 +0200
+++ tcpdump-3.9.7/tcpdump.1 2007-07-24 16:15:54.000000000 +0200
--- tcpdump-3.9.7/tcpdump.1.in.droproot 2007-07-24 16:15:54.000000000 +0200
+++ tcpdump-3.9.7/tcpdump.1.in 2007-07-24 16:15:54.000000000 +0200
@@ -264,6 +264,9 @@ have the name specified with the
flag, with a number after it, starting at 1 and continuing upward.
The units of \fIfile_size\fP are millions of bytes (1,000,000 bytes,

12
tcpdump-4.0.0-icmp6msec.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up tcpdump/print-icmp6.c.icmp6msec tcpdump/print-icmp6.c
--- tcpdump/print-icmp6.c.icmp6msec 2009-08-19 00:02:37.000000000 +0200
+++ tcpdump/print-icmp6.c 2009-08-20 16:33:59.000000000 +0200
@@ -397,7 +397,7 @@ icmp6_print(const u_char *bp, u_int leng
p = (struct nd_router_advert *)dp;
TCHECK(p->nd_ra_retransmit);
printf("\n\thop limit %u, Flags [%s]" \
- ", pref %s, router lifetime %us, reachable time %us, retrans time %us",
+ ", pref %s, router lifetime %us, reachable time %ums, retrans time %ums",
(u_int)p->nd_ra_curhoplimit,
bittok2str(icmp6_opt_ra_flag_values,"none",(p->nd_ra_flags_reserved)),
get_rtpref(p->nd_ra_flags_reserved),

4
tcpdump-3.9.8-portnumbers.patch → tcpdump-4.0.0-portnumbers.patch
View File

@ -20,8 +20,8 @@ diff -up tcpdump-3.9.8/addrtoname.c.portnumbers tcpdump-3.9.8/addrtoname.c
* Simplest way to suppress names.
*/
diff -up tcpdump-3.9.8/tcpdump.1.portnumbers tcpdump-3.9.8/tcpdump.1
--- tcpdump-3.9.8/tcpdump.1.portnumbers 2008-08-29 13:53:12.000000000 +0200
+++ tcpdump-3.9.8/tcpdump.1 2008-08-29 13:53:12.000000000 +0200
--- tcpdump-3.9.8/tcpdump.1.in.portnumbers 2008-08-29 13:53:12.000000000 +0200
+++ tcpdump-3.9.8/tcpdump.1.in 2008-08-29 13:53:12.000000000 +0200
@@ -403,7 +403,11 @@ Use \fIsecret\fP as a shared secret for
TCP segments with the TCP-MD5 option (RFC 2385), if present.
.TP

33
tcpdump.spec
View File

@ -1,8 +1,8 @@
Summary: A network traffic monitoring tool
Name: tcpdump
Epoch: 14
Version: 3.9.8
Release: 9%{?dist}
Version: 4.0.0
Release: 1.20090818git832d2c%{?dist}
License: BSD with advertising
URL: http://www.tcpdump.org
Group: Applications/Internet
@ -11,16 +11,16 @@ BuildRequires: openssl-devel libpcap-devel
BuildRequires: automake
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
#Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
# git snapshot from git://bpf.tcpdump.org/tcpdump
Source0: tcpdump-4.0.0-20090818git832d2c.tar.gz
Source1: ftp://ftp.ee.lbl.gov/tcpslice-1.2a3.tar.gz
Patch1: tcpdump-3.9.7-droproot.patch
Patch2: tcpdump-3.9.8-portnumbers.patch
Patch3: tcpdump-3.9.7-crypto.patch
Patch4: tcpdump-3.9.8-ikev2.patch
Patch1: tcpdump-4.0.0-droproot.patch
Patch2: tcpdump-4.0.0-portnumbers.patch
Patch3: tcpdump-4.0.0-icmp6msec.patch
Patch5: tcpslice-1.2a3-time.patch
Patch6: tcpslice-CVS.20010207-bpf.patch
Patch7: tcpdump-3.9.8-gethostby.patch
Patch8: tcpdump-3.9.8-nosmi.patch
%define tcpslice_dir tcpslice-1.2a3
@ -33,14 +33,12 @@ the packet headers, or just the ones that match particular criteria.
Install tcpdump if you need a program to monitor network traffic.
%prep
%setup -q -a 1
%setup -q -a 1 -n tcpdump
%patch1 -p1 -b .droproot
%patch2 -p1 -b .portnumbers
%patch3 -p1 -b .crypto
%patch4 -p1 -b .ikev2
%patch3 -p1 -b .icmp6msec
%patch7 -p1 -b .gethostby
%patch8 -p1 -b .nosmi
pushd %{tcpslice_dir}
%patch5 -p1 -b .time
@ -49,11 +47,6 @@ popd
find . -name '*.c' -o -name '*.h' | xargs chmod 644
for f in CREDITS; do
iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
touch -r ${f}{,_} && mv -f ${f}{_,}
done
%build
export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS) -fno-strict-aliasing"
@ -64,7 +57,7 @@ automake -a -f 2> /dev/null || :
make %{?_smp_mflags}
popd
%configure --with-user=tcpdump
%configure --with-crypto --with-user=tcpdump --without-smi
make %{?_smp_mflags}
%install
@ -103,6 +96,10 @@ exit 0
%{_mandir}/man8/tcpdump.8*
%changelog
* Thu Aug 20 2009 Miroslav Lichvar <mlichvar@redhat.com> - 14:4.0.0-1.20090818git832d2c
- update to post 4.0.0 git snapshot 20090818git832d2c
- print retrans and reachable times in ICMPv6 as milliseconds (#474264)
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 14:3.9.8-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild