Accepting request 94135 from network:utilities

- update to 4.2.0
  * patch that adds missing ppi.h
  * Summary for 4.2.0
    - merged 802.15.4 decoder from Dmitry Eremin-Solenikov <dbaryshkov
      at gmail dot com>
    - updates to forces for new port numbers
    - Use "-H", not "-h", for the 802.11s option. (-h always help)
    - Better ICMPv6 checksum handling.
    - add support for the RPKI/Router Protocol, per -ietf-sidr-rpki-rtr-12
    - get rid of uuencoded pcap test files, git can do binary.
    - sFlow changes for 64-bit counters.
    - fixes for PPI packet header handling and printing.
    - Add DCB Exchange protocol (DCBX) version 1.01.
    - Babel dissector, from Juliusz Chroboczek and Grégoire Henry.
    - improvements to radiotap for rate values > 127.
    - Many improvements to ForCES decode, including fix SCTP TML port
    - updated RPL type code to RPL-17 draft
    - Improve printout of DHCPv6 options.
    - added support and test case for QinQ (802.1q VLAN) packets
    - Handle DLT_IEEE802_15_4_NOFCS like DLT_IEEE802_15_4.
    - Build fixes for Sparc and other machines with alignment restrictions.
    - Merged changes from Debian package.
    - PGM: Add ACK decoding and add PGMCC DATA and FEEDBACK options.
    - Build fixes for OSX (Snow Leopard and others)
    - Add support for IEEE 802.15.4 packets
  * Summary for 4.1.2 tcpdump release
    - If -U is specified, flush the file after creating it, so it's
      not zero-length
    - Fix TCP flags output description, and some typoes, in the man
      page (forwarded request 94001 from vitezslav_cizek)

OBS-URL: https://build.opensuse.org/request/show/94135
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tcpdump?expand=0&rev=15

tcpdump-4.1.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27b235df81d00809f5d87bf58d323be3cf3672e3ffa4ac6b39bebef2ee7ccc4a
-size 1464158

tcpdump-4.2.0-ppi.patch

@@ -0,0 +1,13 @@
+Index: tcpdump-4.2.0/ppi.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ tcpdump-4.2.0/ppi.h	2011-11-28 13:27:18.566308164 +0100
+@@ -0,0 +1,8 @@
++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

tcpdump-4.2.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8979aba28fa3e67ca7f97de8482b38482eef1d70c739dc1f9c33eba60c027639
+size 833172

tcpdump.changes

@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Mon Nov 28 12:32:25 UTC 2011 - vcizek@suse.com
+
+- update to 4.2.0
+  * patch that adds missing ppi.h
+  * Summary for 4.2.0
+    - merged 802.15.4 decoder from Dmitry Eremin-Solenikov <dbaryshkov
+      at gmail dot com>
+    - updates to forces for new port numbers
+    - Use "-H", not "-h", for the 802.11s option. (-h always help)
+    - Better ICMPv6 checksum handling.
+    - add support for the RPKI/Router Protocol, per -ietf-sidr-rpki-rtr-12
+    - get rid of uuencoded pcap test files, git can do binary.
+    - sFlow changes for 64-bit counters.
+    - fixes for PPI packet header handling and printing.
+    - Add DCB Exchange protocol (DCBX) version 1.01.
+    - Babel dissector, from Juliusz Chroboczek and Grégoire Henry.
+    - improvements to radiotap for rate values > 127.
+    - Many improvements to ForCES decode, including fix SCTP TML port
+    - updated RPL type code to RPL-17 draft
+    - Improve printout of DHCPv6 options.
+    - added support and test case for QinQ (802.1q VLAN) packets
+    - Handle DLT_IEEE802_15_4_NOFCS like DLT_IEEE802_15_4.
+    - Build fixes for Sparc and other machines with alignment restrictions.
+    - Merged changes from Debian package.
+    - PGM: Add ACK decoding and add PGMCC DATA and FEEDBACK options.
+    - Build fixes for OSX (Snow Leopard and others)
+    - Add support for IEEE 802.15.4 packets
+  * Summary for 4.1.2 tcpdump release
+    - If -U is specified, flush the file after creating it, so it's
+      not zero-length
+    - Fix TCP flags output description, and some typoes, in the man
+      page
+    - Add a -h flag, and only attempt to recognize 802.11s mesh
+      headers if it's set
+    - When printing the link-layer type list, send *all* output to
+      stderr
+    - Include the CFLAGS setting when configure was run in the
+      compiler flags
+
 -------------------------------------------------------------------
 Tue Apr  6 09:13:45 UTC 2010 - puzel@novell.com
 

tcpdump.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package tcpdump (Version 4.1.1)
+# spec file for package tcpdump
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,18 +19,20 @@
 
 
 Name:           tcpdump
-Version:        4.1.1
+Version:        4.2.0
 Release:        1
 AutoReqProv:    on
 License:        BSD3c
 Group:          Productivity/Networking/Diagnostic
 Url:            http://www.tcpdump.org/
 Summary:        A Packet Sniffer
-Source:         tcpdump-%{version}.tar.bz2
+Source:         tcpdump-%{version}.tar.gz
 Source1:        tcpdump-qeth
 Patch0:         tcpdump-4.0.0-prototypes.patch
 Patch2:         tcpdump-4.0.0-aliasing.patch
 Patch3:         tcpdump-4.0.0-uninitialized.patch
+# PATCH-FIX-SUSE add missing ppi.h
+Patch4:         tcpdump-4.2.0-ppi.patch
 BuildRequires:  libpcap-devel
 BuildRequires:  libsmi-devel
 BuildRequires:  openssl-devel
@@ -46,6 +48,7 @@ ethernet. It can be used to debug specific network problems.
 %patch0
 %patch2
 %patch3
+%patch4 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -Wall -DGUESS_TSO -fstack-protector -fno-strict-aliasing"