From d05e4f08236c5b5e91d0ebc39eae64bd81939ca6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 27 Jul 2016 23:13:49 +0000
Subject: [PATCH] tcpdump: bump version.

---
 ...p-4.7.4.patchset => tcpdump-4.8.0.patchset} | 18 +++++++++---------
 ...pdump-4.7.4.recipe => tcpdump-4.8.0.recipe} | 11 ++++++-----
 2 files changed, 15 insertions(+), 14 deletions(-)
 rename net-analyzer/tcpdump/patches/{tcpdump-4.7.4.patchset => tcpdump-4.8.0.patchset} (73%)
 rename net-analyzer/tcpdump/{tcpdump-4.7.4.recipe => tcpdump-4.8.0.recipe} (87%)

diff --git a/net-analyzer/tcpdump/patches/tcpdump-4.7.4.patchset b/net-analyzer/tcpdump/patches/tcpdump-4.8.0.patchset
similarity index 73%
rename from net-analyzer/tcpdump/patches/tcpdump-4.7.4.patchset
rename to net-analyzer/tcpdump/patches/tcpdump-4.8.0.patchset
index 7a56f1b79..70eedba4a 100644
--- a/net-analyzer/tcpdump/patches/tcpdump-4.7.4.patchset
+++ b/net-analyzer/tcpdump/patches/tcpdump-4.8.0.patchset
@@ -1,14 +1,14 @@
-From ff2aed3d2fdd3b1fe4791357f8ea06a0729566cf Mon Sep 17 00:00:00 2001
+From a76a010bfed94b17f03385312e1821d4323866e7 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 28 Apr 2015 20:22:20 +0000
 Subject: Haiku patch
 
 
 diff --git a/aclocal.m4 b/aclocal.m4
-index 285000d..2cd6e72 100644
+index ca78a02..5dbb773 100644
 --- a/aclocal.m4
 +++ b/aclocal.m4
-@@ -1081,7 +1081,7 @@ AC_DEFUN(AC_LBL_LIBRARY_NET, [
+@@ -1128,7 +1128,7 @@ AC_DEFUN(AC_LBL_LIBRARY_NET, [
  	AC_CHECK_LIB(socket, gethostbyname,
                       LIBS="-lsocket -lnsl $LIBS", , -lnsl)
      fi
@@ -18,12 +18,12 @@ index 285000d..2cd6e72 100644
      # DLPI needs putmsg under HPUX so test for -lstr while we're at it
      AC_SEARCH_LIBS(putmsg, str)
 diff --git a/tcpdump.c b/tcpdump.c
-index 2fd1617..f8e4024 100644
+index 5598ec2..388697c 100644
 --- a/tcpdump.c
 +++ b/tcpdump.c
-@@ -2190,11 +2190,13 @@ compress_savefile(const char *filename)
- 	/*
- 	 * Set to lowest priority so that this doesn't disturb the capture
+@@ -2007,11 +2007,13 @@ compress_savefile(const char *filename)
+ 	 * Child process.
+ 	 * Set to lowest priority so that this doesn't disturb the capture.
  	 */
 +#ifndef __HAIKU__
  #ifdef NZERO
@@ -34,7 +34,7 @@ index 2fd1617..f8e4024 100644
 +#endif
  	if (execlp(zflag, zflag, filename, (char *)NULL) == -1)
  		fprintf(stderr,
- 			"compress_savefile:execlp(%s, %s): %s\n",
+ 			"compress_savefile: execlp(%s, %s) failed: %s\n",
 -- 
-1.8.3.4
+2.7.0
 
diff --git a/net-analyzer/tcpdump/tcpdump-4.7.4.recipe b/net-analyzer/tcpdump/tcpdump-4.8.0.recipe
similarity index 87%
rename from net-analyzer/tcpdump/tcpdump-4.7.4.recipe
rename to net-analyzer/tcpdump/tcpdump-4.8.0.recipe
index 8bb8ba6b9..e8378e974 100644
--- a/net-analyzer/tcpdump/tcpdump-4.7.4.recipe
+++ b/net-analyzer/tcpdump/tcpdump-4.8.0.recipe
@@ -3,8 +3,8 @@ DESCRIPTION="
 Tcpdump prints out a description of the contents of packets on a \
 network interface that match a boolean expression."
 HOMEPAGE="http://www.tcpdump.org"
-SOURCE_URI="http://www.tcpdump.org/release/${portName}-${portVersion}.tar.gz"
-CHECKSUM_SHA256="6be520269a89036f99c0b2126713a60965953eab921002b07608ccfc0c47d9af"
+SOURCE_URI="https://github.com/the-tcpdump-group/tcpdump/archive/${portName}-${portVersion}.tar.gz"
+CHECKSUM_SHA256="6d80fe345d0f5ee42fd273bfafe076231ad700c2daaf56805d17dc8159a6d1a7"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="
 	1998-2015 The TCPDUMP Project
@@ -34,7 +34,10 @@ COPYRIGHT="
 	2012 Christoph Paasch
 	1995-1998, 2001-2002 WIDE Project
 "
-REVISION="2"
+REVISION="1"
+SOURCE_DIR="tcpdump-tcpdump-$portVersion"
+PATCHES="tcpdump-$portVersion.patchset"
+
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
@@ -59,8 +62,6 @@ BUILD_PREREQUIRES="
 	cmd:strip
 	"
 
-PATCHES="tcpdump-$portVersion.patchset"
-
 BUILD()
 {
 	autoreconf -fi