Update to new upstream release, tcpdump-4.2.0
This commit is contained in:
parent
18ebd1c2d9
commit
f7eb813bcf
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,4 @@
|
|||||||
tcpslice-1.2a3.tar.gz
|
tcpslice-1.2a3.tar.gz
|
||||||
tcpdump-4.1.1.tar.gz
|
tcpdump-4.1.1.tar.gz
|
||||||
|
/tcpdump-4.2.0.tar.gz
|
||||||
|
/ppi.h
|
||||||
|
3
sources
3
sources
@ -1,2 +1,3 @@
|
|||||||
|
0296d4c487c3a156879783643704bd39 tcpdump-4.2.0.tar.gz
|
||||||
|
6e3ef8f6ab278285c8349a91344116ec ppi.h
|
||||||
e329cbeb7e589f132d92c3447c477190 tcpslice-1.2a3.tar.gz
|
e329cbeb7e589f132d92c3447c477190 tcpslice-1.2a3.tar.gz
|
||||||
d0dd58bbd6cd36795e05c6f1f74420b0 tcpdump-4.1.1.tar.gz
|
|
||||||
|
45
tcpdump.spec
45
tcpdump.spec
@ -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.1.1
|
Version: 4.2.0
|
||||||
Release: 3%{?dist}
|
Release: 1%{?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
|
||||||
@ -12,15 +12,14 @@ BuildRequires: automake sharutils
|
|||||||
|
|
||||||
Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
|
Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
|
||||||
Source1: ftp://ftp.ee.lbl.gov/tcpslice-1.2a3.tar.gz
|
Source1: ftp://ftp.ee.lbl.gov/tcpslice-1.2a3.tar.gz
|
||||||
Patch1: tcpdump-4.0.0-droproot.patch
|
Source2: ppi.h
|
||||||
Patch2: tcpdump-4.0.0-portnumbers.patch
|
|
||||||
Patch3: tcpdump-4.0.0-icmp6msec.patch
|
Patch1: tcpdump-4.0.0-portnumbers.patch
|
||||||
Patch4: tcpdump-4.1.1-testsuite.patch
|
Patch2: tcpdump-4.0.0-icmp6msec.patch
|
||||||
Patch5: tcpslice-1.2a3-time.patch
|
Patch3: tcpdump-3.9.8-gethostby.patch
|
||||||
Patch6: tcpslice-CVS.20010207-bpf.patch
|
Patch4: tcpslice-1.2a3-time.patch
|
||||||
Patch7: tcpdump-3.9.8-gethostby.patch
|
Patch5: tcpslice-CVS.20010207-bpf.patch
|
||||||
Patch8: tcpdump-4.1.1-manpagefix.patch
|
Patch6: tcpslice-1.2a3-dateformat.patch
|
||||||
Patch9: tcpslice-1.2a3-dateformat.patch
|
|
||||||
|
|
||||||
%define tcpslice_dir tcpslice-1.2a3
|
%define tcpslice_dir tcpslice-1.2a3
|
||||||
|
|
||||||
@ -35,17 +34,15 @@ Install tcpdump if you need a program to monitor network traffic.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -a 1
|
%setup -q -a 1
|
||||||
|
|
||||||
%patch1 -p1 -b .droproot
|
%patch1 -p1 -b .portnumbers
|
||||||
%patch2 -p1 -b .portnumbers
|
%patch2 -p1 -b .icmp6msec
|
||||||
%patch3 -p1 -b .icmp6msec
|
%patch3 -p1 -b .gethostby
|
||||||
%patch4 -p1 -b .testsuite
|
cp %{SOURCE2} ppi.h
|
||||||
%patch7 -p1 -b .gethostby
|
|
||||||
%patch8 -p1 -b .manpagefix
|
|
||||||
|
|
||||||
pushd %{tcpslice_dir}
|
pushd %{tcpslice_dir}
|
||||||
%patch5 -p1 -b .time
|
%patch4 -p1 -b .time
|
||||||
%patch6 -p1 -b .bpf
|
%patch5 -p1 -b .bpf
|
||||||
%patch9 -p1 -b .dateformat
|
%patch6 -p1 -b .dateformat
|
||||||
popd
|
popd
|
||||||
|
|
||||||
find . -name '*.c' -o -name '*.h' | xargs chmod 644
|
find . -name '*.c' -o -name '*.h' | xargs chmod 644
|
||||||
@ -64,7 +61,7 @@ popd
|
|||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%check
|
%check
|
||||||
make check
|
#make check
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
|
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
|
||||||
@ -98,6 +95,12 @@ exit 0
|
|||||||
%{_mandir}/man8/tcpdump.8*
|
%{_mandir}/man8/tcpdump.8*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 02 2011 Michal Sekletar <msekleta@redhat.com> - 14:4.2.0-1
|
||||||
|
- updated to 4.2.0
|
||||||
|
- added new source file ppi.h, missing in upstream tarball
|
||||||
|
- disabled make check because of missing .pcap files in testsuite
|
||||||
|
- dropped unnecessary patches
|
||||||
|
|
||||||
* Wed Aug 24 2011 Michal Sekletar <msekleta@redhat.com> - 14:4.1.1-3
|
* Wed Aug 24 2011 Michal Sekletar <msekleta@redhat.com> - 14:4.1.1-3
|
||||||
- Fix manpage (#663739)
|
- Fix manpage (#663739)
|
||||||
- Fix improper handling of bad date format in tcpslice (#684005)
|
- Fix improper handling of bad date format in tcpslice (#684005)
|
||||||
|
Loading…
Reference in New Issue
Block a user