From 10ceab005cc1550132292c302cf67e314fbb73b02c2897186aaf15204263aecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 26 Jul 2017 13:42:33 +0000
Subject: [PATCH] Accepting request 512662 from
 home:pmonrealgonzalez:branches:network:utilities

- Disable ikev2pI2 test that fails on ppc, ppc64 and ppc64le
  * Added patch tcpdump-ikev2pI2-test-fails-ppc.patch

- Update to version 4.9.1 [bsc#1047873]
  * CVE-2017-11108/Fix bounds checking for STP.
  * Make assorted documentation updates and fix a few typos in output.
  * Fixup -C for file size >2GB
  * Show AddressSanitizer presence in version output.
  * Fix a bug in test scripts.
  * Fix a use-after-free when the requested interface does not exist.

OBS-URL: https://build.opensuse.org/request/show/512662
OBS-URL: https://build.opensuse.org/package/show/network:utilities/tcpdump?expand=0&rev=37
---
 tcpdump-4.9.0.tar.gz                  |   3 ---
 tcpdump-4.9.0.tar.gz.sig              | Bin 442 -> 0 bytes
 tcpdump-4.9.1.tar.gz                  |   3 +++
 tcpdump-4.9.1.tar.gz.sig              | Bin 0 -> 442 bytes
 tcpdump-ikev2pI2-test-fails-ppc.patch |  20 ++++++++++++++++++++
 tcpdump.changes                       |  17 +++++++++++++++++
 tcpdump.spec                          |   5 ++++-
 7 files changed, 44 insertions(+), 4 deletions(-)
 delete mode 100644 tcpdump-4.9.0.tar.gz
 delete mode 100644 tcpdump-4.9.0.tar.gz.sig
 create mode 100644 tcpdump-4.9.1.tar.gz
 create mode 100644 tcpdump-4.9.1.tar.gz.sig
 create mode 100644 tcpdump-ikev2pI2-test-fails-ppc.patch

diff --git a/tcpdump-4.9.0.tar.gz b/tcpdump-4.9.0.tar.gz
deleted file mode 100644
index 67662c5..0000000
--- a/tcpdump-4.9.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eae98121cbb1c9adbedd9a777bf2eae9fa1c1c676424a54740311c8abcee5a5e
-size 1260309
diff --git a/tcpdump-4.9.0.tar.gz.sig b/tcpdump-4.9.0.tar.gz.sig
deleted file mode 100644
index ba789850d817e21469975fb2759b412695bea4b7b029f44a23d2108d462cad33..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmV;r0Y(0a0k;GI0SEvc79j*57HU^QtGVDLnvF2viQe(q!Cegn0$7Km@&F165a5a4
z@!7#$4WMoe9TbHvy}k|W_&=dlhDi3)S8L=Q&5e72{Ju9Fk&0!(!|&t|Y@xvGLxAts
zFxBdz=C6K=*mmUl%%Jde&vkB(Qhd^*4n&YIeyoeX7kM&*Hw!E(Wm8h657yy#R+G24
zYCJ!rYMq%;fwp39Ajl1A&1|ai*!;_jjtUTr(BviNgDU>=0zG+Dd16xDcPWRG_cov*
znvCQ|io&j$z-}f{_qNO9v|u$CFi$)#0n15NApZBtU7#RFTTErAmB)T6Q4}>(Q|q#r
zIU_EjaXU{oIlpw7#?5U|Cdi~*?y@O>rSDDrA3Yi#C6u$+>snzL0N)sxM;W+Ck8)wh
z1to^>M(f2cV1?iL#xqqX?3e`az88RHu+o-RZZ&;<(pXA*M?c4%%Dr=S*KaUwf0wu9
z;V1Ahw5|DI;+Ixk#f!D>M_AqC-^3=-Ih>22EUKMSSA|y1)&>4rjLWrFMZaIaPJh`0
kU>hs(Wrwk#*P|<@kAz$+P!7HT%HF^s)Oi1}M<QD(JMAFa)c^nh

diff --git a/tcpdump-4.9.1.tar.gz b/tcpdump-4.9.1.tar.gz
new file mode 100644
index 0000000..a96604a
--- /dev/null
+++ b/tcpdump-4.9.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9448cf4deb2049acf713655c736342662e652ef40dbe0a8f6f8d5b9ce5bd8f3
+size 1258108
diff --git a/tcpdump-4.9.1.tar.gz.sig b/tcpdump-4.9.1.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..c4436ce238f07b6a8e2f5e3d109030d6eaeef989058d34c003a1b608f66153aa
GIT binary patch
literal 442
zcmV;r0Y(0a0k;GI0SEvc79j*57HU^QtGVDLnvF2viQe(q!Cegn0$F!}y8sFa5a5a4
z@!7#$4VA$RA7tD62&EF~!Jc})-nzeVcHrrpue=ZpWS+-A?DPNw`7i(A#ZM8Up2nxB
zP+eplfu9&nZLFk~I#W>GCfu_XvOv^qNxSAc*S0Owx|HpsM>zY-HJVN#maFd|8HX0J
zQdPTED9B$iX`h0>Oc!jukVQC>Yv;8T_!64)%L<YzPY)XFeHA!B3E<otyoQWd@JkV^
z5um=YZ*2?lPasBkwr(2-H)%dBx#Wg^gyq0ioAvk>=P05-+<gP;LzT0q%Gsivnw{h(
z-MGV7amHpwKiB!8Q(8iRBFpX;x<Y%lf6MsBK##U26Eup19iHu9c?wEpKZy*1hg?Ub
znl0!OR=p$rL9O+~&I4`UB{tQqyOy2Sy-!9V_p17B@{UWWD=4awOAAE<o;dFQ^7n8U
z2VFj<TB8nc+8E%)wBS`(slDr7QQk%5vgV3YY7KwzTvC4%t(AY#n)z!P*Ke^XIDw9p
kApa);<0t1ZLgblMj(~OCi$B#ibWze7vf!2dtnSW1n23nl?f?J)

literal 0
HcmV?d00001

diff --git a/tcpdump-ikev2pI2-test-fails-ppc.patch b/tcpdump-ikev2pI2-test-fails-ppc.patch
new file mode 100644
index 0000000..146fe99
--- /dev/null
+++ b/tcpdump-ikev2pI2-test-fails-ppc.patch
@@ -0,0 +1,20 @@
+Index: tcpdump-4.9.1/tests/crypto.sh
+===================================================================
+--- tcpdump-4.9.1.orig/tests/crypto.sh
++++ tcpdump-4.9.1/tests/crypto.sh
+@@ -28,8 +28,13 @@ then
+ 		[ $? -eq 0 ] || exitcode=1
+ 		./TESTonce espudp1 espudp1.pcap espudp1.out '-nnnn -E "file esp-secrets.txt"'
+ 		[ $? -eq 0 ] || exitcode=1
+-		./TESTonce ikev2pI2 ikev2pI2.pcap ikev2pI2.out '-E "file ikev2pI2-secrets.txt" -v -v -v -v'
+-		[ $? -eq 0 ] || exitcode=1
++		case $(uname -m) in 
++		    "ppc" | "ppc64" | "ppc64le" ) echo "skipping test ikev2pI2"
++			;; 
++		    * ) ./TESTonce ikev2pI2 ikev2pI2.pcap ikev2pI2.out '-E "file ikev2pI2-secrets.txt" -v -v -v -v' 
++			[ $? -eq 0 ] || exitcode=1 
++			;;
++		esac
+ 		./TESTonce isakmp4 isakmp4500.pcap isakmp4.out '-E "file esp-secrets.txt"'
+ 		[ $? -eq 0 ] || exitcode=1
+ 	fi
diff --git a/tcpdump.changes b/tcpdump.changes
index fd0402e..47b0f71 100644
--- a/tcpdump.changes
+++ b/tcpdump.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Jul 26 12:33:53 UTC 2017 - pmonrealgonzalez@suse.com
+
+- Disable ikev2pI2 test that fails on ppc, ppc64 and ppc64le
+  * Added patch tcpdump-ikev2pI2-test-fails-ppc.patch 
+
+-------------------------------------------------------------------
+Wed Jul 26 09:16:56 UTC 2017 - pmonrealgonzalez@suse.com
+
+- Update to version 4.9.1 [bsc#1047873]
+  * CVE-2017-11108/Fix bounds checking for STP.
+  * Make assorted documentation updates and fix a few typos in output.
+  * Fixup -C for file size >2GB
+  * Show AddressSanitizer presence in version output.
+  * Fix a bug in test scripts.
+  * Fix a use-after-free when the requested interface does not exist.
+
 -------------------------------------------------------------------
 Thu Feb  2 14:47:56 UTC 2017 - pmonrealgonzalez@suse.com
 
diff --git a/tcpdump.spec b/tcpdump.spec
index a654f18..c451ccc 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -18,7 +18,7 @@
 
 %define min_libpcap_version 1.8.1
 Name:           tcpdump
-Version:        4.9.0
+Version:        4.9.1
 Release:        0
 Summary:        A Packet Sniffer
 License:        BSD-3-Clause
@@ -28,6 +28,8 @@ Source:         http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
 Source1:        tcpdump-qeth
 Source2:        http://www.tcpdump.org/release/%{name}-%{version}.tar.gz.sig
 Source3:        http://www.tcpdump.org/tcpdump-workers.asc#/%{name}.keyring
+# PATCH-FIX-OPENSUSE tcpdump-ikev2pI2-test-fails-ppc.patch -- Disable ikev2pI2 test on ppc, ppc64 and ppc64le
+Patch0:         tcpdump-ikev2pI2-test-fails-ppc.patch
 BuildRequires:  libpcap-devel >= %{min_libpcap_version}
 BuildRequires:  libsmi-devel
 BuildRequires:  openssl-devel
@@ -40,6 +42,7 @@ ethernet. It can be used to debug specific network problems.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export CFLAGS="%{optflags} -Wall -DGUESS_TSO -fstack-protector -fno-strict-aliasing"