diff --git a/.gitignore b/.gitignore index d669152..5fc4e22 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ tcpdump-4.1.1.tar.gz /tcpdump-4.2.1.tar.gz /tcpdump-4.3.0.tar.gz /tcpdump-4.4.0.tar.gz +/generate-tarball.sh +/tcpdump-4.5.0-20131108gitb07944a.tar.gz diff --git a/sources b/sources index 286ae1d..1467be8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -6f75aabcffd012f73bd7c331bb5d8232 tcpdump-4.4.0.tar.gz -e329cbeb7e589f132d92c3447c477190 tcpslice-1.2a3.tar.gz +0ea1c85e8a0abcb92aff6e5be2d68ece generate-tarball.sh +ce99ecb3cda13f5e4bb861e64f74f249 tcpdump-4.5.0-20131108gitb07944a.tar.gz diff --git a/tcpdump-3.9.8-gethostby.patch b/tcpdump-3.9.8-gethostby.patch index a671373..eb4118d 100644 --- a/tcpdump-3.9.8-gethostby.patch +++ b/tcpdump-3.9.8-gethostby.patch @@ -1,7 +1,7 @@ -diff -up tcpdump-3.9.8/addrtoname.c.gethostby tcpdump-3.9.8/addrtoname.c ---- tcpdump-3.9.8/addrtoname.c.gethostby 2007-10-24 14:50:28.000000000 +0200 -+++ tcpdump-3.9.8/addrtoname.c 2007-10-24 16:58:04.000000000 +0200 -@@ -225,7 +225,6 @@ static u_int32_t f_localnet; +diff -up tcpdump-4.5.0/addrtoname.c.gethostby tcpdump-4.5.0/addrtoname.c +--- tcpdump-4.5.0/addrtoname.c.gethostby 2013-11-08 08:53:50.311792401 +0100 ++++ tcpdump-4.5.0/addrtoname.c 2013-11-08 09:00:43.894765379 +0100 +@@ -224,7 +224,6 @@ static u_int32_t f_localnet; const char * getname(const u_char *ap) { @@ -9,7 +9,7 @@ diff -up tcpdump-3.9.8/addrtoname.c.gethostby tcpdump-3.9.8/addrtoname.c u_int32_t addr; static struct hnamemem *p; /* static for longjmp() */ -@@ -247,6 +246,28 @@ getname(const u_char *ap) +@@ -246,6 +245,28 @@ getname(const u_char *ap) */ if (!nflag && (addr & f_netmask) == f_localnet) { @@ -38,7 +38,7 @@ diff -up tcpdump-3.9.8/addrtoname.c.gethostby tcpdump-3.9.8/addrtoname.c hp = gethostbyaddr((char *)&addr, 4, AF_INET); if (hp) { char *dotp; -@@ -260,6 +281,7 @@ getname(const u_char *ap) +@@ -259,6 +280,7 @@ getname(const u_char *ap) } return (p->name); } @@ -46,15 +46,15 @@ diff -up tcpdump-3.9.8/addrtoname.c.gethostby tcpdump-3.9.8/addrtoname.c } p->name = strdup(intoa(addr)); return (p->name); -@@ -273,7 +295,6 @@ getname(const u_char *ap) +@@ -272,7 +294,6 @@ getname(const u_char *ap) const char * getname6(const u_char *ap) { - register struct hostent *hp; - struct in6_addr addr; - static struct h6namemem *p; /* static for longjmp() */ - register const char *cp; -@@ -292,6 +313,28 @@ getname6(const u_char *ap) + union { + struct in6_addr addr; + struct for_hash_addr { +@@ -297,6 +318,28 @@ getname6(const u_char *ap) * Do not print names if -n was given. */ if (!nflag) { @@ -83,7 +83,7 @@ diff -up tcpdump-3.9.8/addrtoname.c.gethostby tcpdump-3.9.8/addrtoname.c hp = gethostbyaddr((char *)&addr, sizeof(addr), AF_INET6); if (hp) { char *dotp; -@@ -305,6 +348,7 @@ getname6(const u_char *ap) +@@ -310,6 +353,7 @@ getname6(const u_char *ap) } return (p->name); } diff --git a/tcpdump.spec b/tcpdump.spec index 78f90d5..ba339e8 100644 --- a/tcpdump.spec +++ b/tcpdump.spec @@ -1,8 +1,8 @@ Summary: A network traffic monitoring tool Name: tcpdump Epoch: 14 -Version: 4.4.0 -Release: 3%{?dist} +Version: 4.5.0 +Release: 1.20131108gitb07944a%{?dist} License: BSD with advertising URL: http://www.tcpdump.org Group: Applications/Internet @@ -10,12 +10,13 @@ Requires(pre): shadow-utils BuildRequires: openssl-devel libpcap-devel BuildRequires: automake sharutils -Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz +Source0: tcpdump-4.5.0-20131108gitb07944a.tar.gz Source1: ftp://ftp.ee.lbl.gov/tcpslice-1.2a3.tar.gz +Source2: generate-tarball.sh Patch1: tcpdump-4.0.0-portnumbers.patch Patch2: tcpdump-4.0.0-icmp6msec.patch -Patch3: tcpdump-3.9.8-gethostby.patch +Patch3: tcpdump-4.5.0-gethostby.patch Patch4: tcpdump-4.4.0-eperm.patch Patch5: tcpslice-1.2a3-time.patch Patch6: tcpslice-CVS.20010207-bpf.patch @@ -88,13 +89,16 @@ exit 0 %files %defattr(-,root,root) -%doc LICENSE README CHANGES CREDITS +%doc LICENSE README.md CHANGES CREDITS %{_sbindir}/tcpdump %{_sbindir}/tcpslice %{_mandir}/man8/tcpslice.8* %{_mandir}/man8/tcpdump.8* %changelog +* Fri Nov 08 2013 Michal Sekletar - 14:4.5.0-1.20131108gitb07944a +- update to snaphot gitb07944a + * Mon Oct 7 2013 Michal Sekletar - 14:4.4.0-3 - don't try to change ownership of stdout (#1015767)