- up to 4.2.1

Changed files:
    tcpdump-ppi.patch -> 1.2
    tcpdump.spec -> 1.96

diff --git a/tcpdump-ppi.patch b/tcpdump-ppi.patch
deleted file mode 100644 (file)
index 1bc851b..0000000
--- a/tcpdump-ppi.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 2e0ba2d689cbf0abbd8df4408956bcb8a46d50a4
-Author: Romain Francoise <rfrancoise@debian.org>
-Date:   Sun Aug 14 14:43:23 2011 -0700
-
-    Make sure ppi.h is in the release tarball.
-    
-    Reviewed-By: Guy Harris <guy@alum.mit.edu>
-
-diff --git a/Makefile.in b/Makefile.in
-index 265b47e..04a58dc 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -168,6 +168,7 @@ HDR = \
-       oui.h \
-       pcap-missing.h \
-       pmap_prot.h \
-+      ppi.h \
-       ppp.h \
-       route6d.h \
-       rpc_auth.h \
-commit 5b0329a9e755e860c3ac8cd6cf383f58261e445d
-Author: Michael Richardson <mcr@sandelman.ca>
-Date:   Tue May 3 18:58:32 2011 -0400
-
-    From: Darren Reed <darren.reed@oracle.com>
-    To: tcpdump-workers@lists.tcpdump.org
-    Date: Sat, 09 Apr 2011 12:51:14 +1000
-    Subject: [tcpdump-workers] Printing PPI packets
-    
-    Printing PPI packets with tcpdump does not turn out
-    to be that hard.
-    
-    My simple tests have produced the output as below.
-    
-    It would be worthwhile having some changes made into
-    the tcpdump code base that were similar to the attached
-    that print them out.
-
-diff --git a/ppi.h b/ppi.h
-new file mode 100644
-index 0000000..733eb95
---- /dev/null
-+++ b/ppi.h
-@@ -0,0 +1,9 @@
-+typedef struct ppi_header {
-+      uint8_t         ppi_ver;
-+      uint8_t         ppi_flags;
-+      uint16_t        ppi_len;
-+      uint32_t        ppi_dlt;
-+} ppi_header_t;
-+
-+#define       PPI_HDRLEN      8
-+

diff --git a/tcpdump.spec b/tcpdump.spec
index a6e0cc77ad5a350138e678919d0df6979e3b1cb0..d52ca1685fb0993b1c86ae4ba319bba2e8707401 100644 (file)
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -13,18 +13,17 @@ Summary(ru.UTF-8):  Инструмент для мониторинга сетев
 Summary(tr.UTF-8):     Bir ağ arabirimi üzerinden gelen ya da giden paketleri listeler
 Summary(uk.UTF-8):     Інструмент для моніторингу мережевого трафіку
 Name:          tcpdump
-Version:       4.2.0
-Release:       6
+Version:       4.2.1
+Release:       1
 Epoch:         1
 License:       BSD
 Group:         Networking/Utilities
 Source0:       http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: 0296d4c487c3a156879783643704bd39
+# Source0-md5: c202878c6db054767b52651041b9e60e
 Patch0:                libpcap-m4.patch
-Patch1:                %{name}-ppi.patch
 URL:           http://www.tcpdump.org/
 BuildRequires: autoconf
-BuildRequires: libpcap-devel >= 2:1.2.0
+BuildRequires: libpcap-devel >= 2:1.2.1
 %{?with_libsmi:BuildRequires:  libsmi-devel}
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: rpmbuild(macros) >= 1.202
@@ -79,7 +78,6 @@ Tcpdump виводить хедери пакетів, що проходять ч
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__autoconf}