- up to 4.2.0

Changed files:
    libpcap-m4.patch -> 1.2
    tcpdump-ac.patch -> 1.2
    tcpdump-ppi.patch -> 1.1
    tcpdump.spec -> 1.88

diff --git a/libpcap-m4.patch b/libpcap-m4.patch
index e9159079d797d4709ef83412a32199ed00aeb7ce..e04275d6e877038c77ef7b080caeff830ebce960 100644 (file)
--- a/libpcap-m4.patch
+++ b/libpcap-m4.patch
@@ -1,11 +1,9 @@
---- tcpdump-4.1/aclocal.m4~    2010-03-12 03:56:43.000000000 +0200
-+++ tcpdump-4.1/aclocal.m4     2010-04-01 14:44:14.199261084 +0300
-@@ -284,28 +284,6 @@
-                   LIBS="$LIBS $pfopen"
-           fi
+--- tcpdump-4.2.0/aclocal.m4~  2011-07-24 22:58:55.000000000 +0200
++++ tcpdump-4.2.0/aclocal.m4   2011-11-28 18:41:29.227895655 +0100
+@@ -286,23 +286,6 @@
      fi
--    AC_MSG_CHECKING(for local pcap library)
--    libpcap=FAIL
+     AC_MSG_CHECKING(for local pcap library)
+     libpcap=FAIL
 -    lastdir=FAIL
 -    places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
 -      egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'`
@@ -23,39 +21,6 @@
 -                  dnl continue and select the last one that exists
 -          fi
 -    done
--    if test $libpcap = FAIL ; then
--          AC_MSG_RESULT(not found)
--
-           #
-           # Look for pcap-config.
-           #
-@@ -360,29 +338,6 @@
-                   AC_MSG_RESULT(found -- -I$d added)
-               fi
-           fi
--    else
--          $1=$libpcap
--          places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
--                      egrep '/libpcap-[[0-9]]*.[[0-9]]*(.[[0-9]]*)?([[ab]][[0-9]]*)?$'`
--          if test -r $d/pcap.h; then
--                  $2="-I$d $$2"
--          elif test -r $places/pcap.h; then
--                  $2="-I$places $$2"
--          else
--                    AC_MSG_ERROR(cannot find pcap.h, see INSTALL)
--          fi
--          AC_MSG_RESULT($libpcap)
--          AC_PATH_PROG(PCAP_CONFIG, pcap-config,, $d)
--          if test -n "$PCAP_CONFIG"; then
--              #
--              # The libpcap directory has a pcap-config script.
--              # Use it to get any additioal libraries needed
--              # to link with the libpcap archive library in
--              # that directory
--              #
--              libpcap="$libpcap `\"$PCAP_CONFIG\" --additional-libs --static`"
--          fi
--    fi
-     LIBS="$libpcap $LIBS"
-     if ! test -n "$PCAP_CONFIG" ; then
-       #
+     if test $libpcap = FAIL ; then
+           AC_MSG_RESULT(not found)
+ 

diff --git a/tcpdump-ac.patch b/tcpdump-ac.patch
deleted file mode 100644 (file)
index 4079b34..0000000
--- a/tcpdump-ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- tcpdump-4.1/aclocal.m4~    2010-04-01 14:45:32.000000000 +0300
-+++ tcpdump-4.1/aclocal.m4     2010-04-01 14:50:01.545334852 +0300
-@@ -293,8 +293,8 @@
-               # Found - use it to get the include flags for
-               # libpcap and the flags to link with libpcap.
-               #
--              $2="`\"$PCAP_CONFIG\" --cflags` $$2"
--              libpcap="`\"$PCAP_CONFIG\" --libs`"
-+              $2="`$PCAP_CONFIG --cflags` $$2"
-+              libpcap="`$PCAP_CONFIG --libs`"
-           else
-               #
-               # Not found; look for pcap.

diff --git a/tcpdump-ppi.patch b/tcpdump-ppi.patch
new file mode 100644 (file)
index 0000000..1bc851b
--- /dev/null
+++ b/tcpdump-ppi.patch
@@ -0,0 +1,53 @@
+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 bba91f5049448349053a3a204d011782944b8468..03390a3bfbd866e38ced7876ca4f1208a4ec2d6c 100644 (file)
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -12,21 +12,21 @@ 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.1.1
-Release:       3
+Version:       4.2.0
+Release:       1
 Epoch:         1
 License:       BSD
 Group:         Networking/Utilities
 Source0:       http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: d0dd58bbd6cd36795e05c6f1f74420b0
+# Source0-md5: 0296d4c487c3a156879783643704bd39
 Patch0:                libpcap-m4.patch
-Patch1:                %{name}-ac.patch
+Patch1:                %{name}-ppi.patch
 URL:           http://www.tcpdump.org/
 BuildRequires: autoconf
-BuildRequires: libpcap-devel >= 2:1.0.0
+BuildRequires: libpcap-devel >= 2:1.2.0
 %{?with_libsmi:BuildRequires:  libsmi-devel}
 BuildRequires: openssl-devel >= 0.9.7d
-Requires:      libpcap >= 2:1.0.0
+Requires:      libpcap >= 2:1.2.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -78,7 +78,10 @@ Tcpdump виводить хедери пакетів, що проходять ч
 %build
 %{__autoconf}
 %configure \
-       --enable-ipv6
+       CFLAGS="-I. %{rpmcflags} %{rpmcppflags}" \
+       %{?with_smi:--with-smi} \
+       --enable-ipv6 \
+       --with-chroot=/usr/share/empty
 %{__make}
 
 %install