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

spec: update to git snapshot b07944a

Browse Source
This commit is contained in:
Michal Sekletar 2013-11-08 10:39:06 +01:00
parent d115fc0d58
commit c504094790
4 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -5,3 +5,5 @@ tcpdump-4.1.1.tar.gz
/tcpdump-4.2.1.tar.gz /tcpdump-4.2.1.tar.gz
/tcpdump-4.3.0.tar.gz /tcpdump-4.3.0.tar.gz
/tcpdump-4.4.0.tar.gz /tcpdump-4.4.0.tar.gz
/generate-tarball.sh
/tcpdump-4.5.0-20131108gitb07944a.tar.gz

4
sources
View File

@ -1,2 +1,2 @@
6f75aabcffd012f73bd7c331bb5d8232 tcpdump-4.4.0.tar.gz 0ea1c85e8a0abcb92aff6e5be2d68ece generate-tarball.sh
e329cbeb7e589f132d92c3447c477190 tcpslice-1.2a3.tar.gz ce99ecb3cda13f5e4bb861e64f74f249 tcpdump-4.5.0-20131108gitb07944a.tar.gz

24
tcpdump-3.9.8-gethostby.patch
View File

@ -1,7 +1,7 @@
diff -up tcpdump-3.9.8/addrtoname.c.gethostby tcpdump-3.9.8/addrtoname.c diff -up tcpdump-4.5.0/addrtoname.c.gethostby tcpdump-4.5.0/addrtoname.c
--- tcpdump-3.9.8/addrtoname.c.gethostby 2007-10-24 14:50:28.000000000 +0200 --- tcpdump-4.5.0/addrtoname.c.gethostby 2013-11-08 08:53:50.311792401 +0100
+++ tcpdump-3.9.8/addrtoname.c 2007-10-24 16:58:04.000000000 +0200 +++ tcpdump-4.5.0/addrtoname.c 2013-11-08 09:00:43.894765379 +0100
@@ -225,7 +225,6 @@ static u_int32_t f_localnet; @@ -224,7 +224,6 @@ static u_int32_t f_localnet;
const char * const char *
getname(const u_char *ap) 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; u_int32_t addr;
static struct hnamemem *p; /* static for longjmp() */ 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 && if (!nflag &&
(addr & f_netmask) == f_localnet) { (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); hp = gethostbyaddr((char *)&addr, 4, AF_INET);
if (hp) { if (hp) {
char *dotp; char *dotp;
@@ -260,6 +281,7 @@ getname(const u_char *ap) @@ -259,6 +280,7 @@ getname(const u_char *ap)
} }
return (p->name); 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)); p->name = strdup(intoa(addr));
return (p->name); return (p->name);
@@ -273,7 +295,6 @@ getname(const u_char *ap) @@ -272,7 +294,6 @@ getname(const u_char *ap)
const char * const char *
getname6(const u_char *ap) getname6(const u_char *ap)
{ {
- register struct hostent *hp; - register struct hostent *hp;
struct in6_addr addr; union {
static struct h6namemem *p; /* static for longjmp() */ struct in6_addr addr;
register const char *cp; struct for_hash_addr {
@@ -292,6 +313,28 @@ getname6(const u_char *ap) @@ -297,6 +318,28 @@ getname6(const u_char *ap)
* Do not print names if -n was given. * Do not print names if -n was given.
*/ */
if (!nflag) { 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); hp = gethostbyaddr((char *)&addr, sizeof(addr), AF_INET6);
if (hp) { if (hp) {
char *dotp; char *dotp;
@@ -305,6 +348,7 @@ getname6(const u_char *ap) @@ -310,6 +353,7 @@ getname6(const u_char *ap)
} }
return (p->name); return (p->name);
} }

14
tcpdump.spec
View File

@ -1,8 +1,8 @@
Summary: A network traffic monitoring tool Summary: A network traffic monitoring tool
Name: tcpdump Name: tcpdump
Epoch: 14 Epoch: 14
Version: 4.4.0 Version: 4.5.0
Release: 3%{?dist} Release: 1.20131108gitb07944a%{?dist}
License: BSD with advertising License: BSD with advertising
URL: http://www.tcpdump.org URL: http://www.tcpdump.org
Group: Applications/Internet Group: Applications/Internet
@ -10,12 +10,13 @@ Requires(pre): shadow-utils
BuildRequires: openssl-devel libpcap-devel BuildRequires: openssl-devel libpcap-devel
BuildRequires: automake sharutils 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 Source1: ftp://ftp.ee.lbl.gov/tcpslice-1.2a3.tar.gz
Source2: generate-tarball.sh
Patch1: tcpdump-4.0.0-portnumbers.patch Patch1: tcpdump-4.0.0-portnumbers.patch
Patch2: tcpdump-4.0.0-icmp6msec.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 Patch4: tcpdump-4.4.0-eperm.patch
Patch5: tcpslice-1.2a3-time.patch Patch5: tcpslice-1.2a3-time.patch
Patch6: tcpslice-CVS.20010207-bpf.patch Patch6: tcpslice-CVS.20010207-bpf.patch
@ -88,13 +89,16 @@ exit 0
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE README CHANGES CREDITS %doc LICENSE README.md CHANGES CREDITS
%{_sbindir}/tcpdump %{_sbindir}/tcpdump
%{_sbindir}/tcpslice %{_sbindir}/tcpslice
%{_mandir}/man8/tcpslice.8* %{_mandir}/man8/tcpslice.8*
%{_mandir}/man8/tcpdump.8* %{_mandir}/man8/tcpdump.8*
%changelog %changelog
* Fri Nov 08 2013 Michal Sekletar <msekleta@redhat.com> - 14:4.5.0-1.20131108gitb07944a
- update to snaphot gitb07944a
* Mon Oct 7 2013 Michal Sekletar <msekleta@redhat.com> - 14:4.4.0-3 * Mon Oct 7 2013 Michal Sekletar <msekleta@redhat.com> - 14:4.4.0-3
- don't try to change ownership of stdout (#1015767) - don't try to change ownership of stdout (#1015767)