[ptxdist] [PATCH] libpcap: Version bump. 1.10.7 -> 1.11.0

[ptxdist] [PATCH] libpcap: Version bump. 1.10.7 -> 1.11.0

[Christian Melki]

Hot on the heels of the last release with a bunch of changes.
https://github.com/the-tcpdump-group/libpcap/blob/libpcap-1.11.0/CHANGES

* Fix options. Some gone. IPV6 is no longer a selectable option.

* Forward patchset, adjusted for offsets.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 .../0100-build-and-install-share-lib-only.patch        |  6 +++---
 .../0101-pcap-config-add-SYSROOT-support.patch         |  0
 patches/{libpcap-1.10.7 => libpcap-1.11.0}/series      |  0
 rules/libpcap.make                                     | 10 ++++------
 4 files changed, 7 insertions(+), 9 deletions(-)
 rename patches/{libpcap-1.10.7 => libpcap-1.11.0}/0100-build-and-install-share-lib-only.patch (87%)
 rename patches/{libpcap-1.10.7 => libpcap-1.11.0}/0101-pcap-config-add-SYSROOT-support.patch (100%)
 rename patches/{libpcap-1.10.7 => libpcap-1.11.0}/series (100%)

diff --git a/patches/libpcap-1.10.7/0100-build-and-install-share-lib-only.patch b/patches/libpcap-1.11.0/0100-build-and-install-share-lib-only.patch
similarity index 87%
rename from patches/libpcap-1.10.7/0100-build-and-install-share-lib-only.patch
rename to patches/libpcap-1.11.0/0100-build-and-install-share-lib-only.patch
index b2bd2a9ed..fb75f1d95 100644
--- a/patches/libpcap-1.10.7/0100-build-and-install-share-lib-only.patch
+++ b/patches/libpcap-1.11.0/0100-build-and-install-share-lib-only.patch
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Aring <alex.aring@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 310b9b5ea4a7..05e9b39de282 100644
+index 5c5e4083e1ab..3f2d65db812b 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -421,7 +421,7 @@ RELEASE_FILES = $(COMMON_C_SRC) $(HDR) $(MAN1) $(MAN3PCAP_EXPAND) \
+@@ -380,7 +380,7 @@ RELEASE_FILES = $(COMMON_C_SRC) $(HDR) $(MAN1) $(MAN3PCAP_EXPAND) \
  	$(MAN3PCAP_NOEXPAND) $(MANFILE) $(MANMISC) $(EXTRA_DIST) \
  	$(TEST_DIST)
  
@@ -24,7 +24,7 @@ index 310b9b5ea4a7..05e9b39de282 100644
  
  libpcap.a: $(OBJ)
  	@rm -f $@
-@@ -607,7 +607,7 @@ testprogs: FORCE libpcap.a
+@@ -563,7 +563,7 @@ testprogs: FORCE libpcap.a
  
  FORCE:
  
diff --git a/patches/libpcap-1.10.7/0101-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.11.0/0101-pcap-config-add-SYSROOT-support.patch
similarity index 100%
rename from patches/libpcap-1.10.7/0101-pcap-config-add-SYSROOT-support.patch
rename to patches/libpcap-1.11.0/0101-pcap-config-add-SYSROOT-support.patch
diff --git a/patches/libpcap-1.10.7/series b/patches/libpcap-1.11.0/series
similarity index 100%
rename from patches/libpcap-1.10.7/series
rename to patches/libpcap-1.11.0/series
diff --git a/rules/libpcap.make b/rules/libpcap.make
index 42102cc5f..280bb575c 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBPCAP) += libpcap
 #
 # Paths and names
 #
-LIBPCAP_VERSION	:= 1.10.7
-LIBPCAP_SHA256	:= 0b394ac90dbc0a9838ff97468e05c9c9a3e873dec2514cd58db65d859d296e31
+LIBPCAP_VERSION	:= 1.11.0
+LIBPCAP_SHA256	:= 596389bc8560ea027dff9db8aaf6c173d992366d9aef4baf5d7c6d180b4d49ad
 LIBPCAP		:= libpcap-$(LIBPCAP_VERSION)
 LIBPCAP_SUFFIX	:= tar.gz
 LIBPCAP_URL	:= https://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX)
@@ -46,7 +46,7 @@ LIBPCAP_CONF_OPT	:= \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-instrument-functions \
 	--enable-protochain \
-	$(GLOBAL_IPV6_OPTION) \
+	--disable-dag-tx \
 	--disable-remote \
 	--disable-optimizer-dbg \
 	--disable-yydebug \
@@ -61,9 +61,7 @@ LIBPCAP_CONF_OPT	:= \
 	--with-pcap=linux \
 	--with-libnl \
 	--without-dag \
-	--without-septel \
-	--without-snf \
-	--without-turbocap
+	--without-snf
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.43.0