[ptxdist] [PATCH] libpcap: Version bump. 1.10.1 -> 1.10.2

[Christian Melki <christian.melki@t2data.com>]

A bunch of fixes.
https://github.com/the-tcpdump-group/libpcap/blob/0ec30c896aceed38db0dfc0144ffc09669769855/CHANGES#L42

* Reworked patch for just installing the shared library file.
* Reworked $SYSROOT for pcap-config patch.
I don't think pcap-config is needed though. libpcap got .pc back in 2018 something.
So this is mostly for builds that don't use that (or before 2018).
I'll leave this up to the maintainer to remove.

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

diff --git a/patches/libpcap-1.10.1/0100-build-and-install-share-lib-only.patch b/patches/libpcap-1.10.2/0100-build-and-install-share-lib-only.patch
similarity index 79%
rename from patches/libpcap-1.10.1/0100-build-and-install-share-lib-only.patch
rename to patches/libpcap-1.10.2/0100-build-and-install-share-lib-only.patch
index dda3366ae..c909f70b1 100644
--- a/patches/libpcap-1.10.1/0100-build-and-install-share-lib-only.patch
+++ b/patches/libpcap-1.10.2/0100-build-and-install-share-lib-only.patch
@@ -12,19 +12,19 @@ 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 5d88ea713174..2cbcab1a0907 100644
+index 787b18a06a93..dd7870c0475b 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -415,7 +415,7 @@ EXTRA_DIST = \
- 	Win32/Prj/wpcap.vcxproj \
- 	Win32/Prj/wpcap.vcxproj.filters
+@@ -429,7 +429,7 @@ RELEASE_FILES = $(COMMON_C_SRC) $(HDR) $(MAN1) $(MAN3PCAP_EXPAND) \
+ 	$(MAN3PCAP_NOEXPAND) $(MANFILE) $(MANMISC) $(EXTRA_DIST) \
+ 	$(TEST_DIST)
  
 -all: libpcap.a shared $(BUILD_RPCAPD) libpcap.pc pcap-config
 +all: shared $(BUILD_RPCAPD) libpcap.pc pcap-config
  
  libpcap.a: $(OBJ)
  	@rm -f $@
-@@ -601,7 +601,7 @@ testprogs: FORCE
+@@ -615,7 +615,7 @@ testprogs: FORCE
  
  FORCE:
  
diff --git a/patches/libpcap-1.10.1/0101-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.10.2/0101-pcap-config-add-SYSROOT-support.patch
similarity index 54%
rename from patches/libpcap-1.10.1/0101-pcap-config-add-SYSROOT-support.patch
rename to patches/libpcap-1.10.2/0101-pcap-config-add-SYSROOT-support.patch
index b51c27faa..9cb27d0af 100644
--- a/patches/libpcap-1.10.1/0101-pcap-config-add-SYSROOT-support.patch
+++ b/patches/libpcap-1.10.2/0101-pcap-config-add-SYSROOT-support.patch
@@ -4,11 +4,11 @@ Subject: [PATCH] pcap-config: add SYSROOT support
 
 Signed-off-by: Alexander Aring <alex.aring@gmail.com>
 ---
- pcap-config.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ pcap-config.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/pcap-config.in b/pcap-config.in
-index 54ca42f07bc5..23b06c300577 100644
+index afa8919d8a50..f9b8b1512892 100644
 --- a/pcap-config.in
 +++ b/pcap-config.in
 @@ -10,8 +10,8 @@
@@ -19,15 +19,6 @@ index 54ca42f07bc5..23b06c300577 100644
 -libdir="@libdir@"
 +includedir="${SYSROOT}@includedir@"
 +libdir="${SYSROOT}@libdir@"
- V_RPATH_OPT="@V_RPATH_OPT@"
  LIBS="@LIBS@"
- PACKAGE_NAME="@PACKAGE_NAME@"
-@@ -46,7 +46,7 @@ then
- 	#
- 	# If libdir isn't /usr/lib, add it to the run-time linker path.
- 	#
--	if [ "$libdir" != "/usr/lib" ]
-+	if [ "$libdir" != "${SYSROOT}/usr/lib" ]
- 	then
- 		RPATH=$V_RPATH_OPT$libdir
- 	fi
+ LIBS_STATIC="@LIBS_STATIC@"
+ 
diff --git a/patches/libpcap-1.10.1/series b/patches/libpcap-1.10.2/series
similarity index 100%
rename from patches/libpcap-1.10.1/series
rename to patches/libpcap-1.10.2/series
diff --git a/rules/libpcap.make b/rules/libpcap.make
index 1d51449ae..9f07d452a 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBPCAP) += libpcap
 #
 # Paths and names
 #
-LIBPCAP_VERSION	:= 1.10.1
-LIBPCAP_MD5	:= 28e17495004036567c2cc884b51eba45
+LIBPCAP_VERSION	:= 1.10.2
+LIBPCAP_MD5	:= 9f27d8e5595fb14e6bc8151ef6f5610b
 LIBPCAP		:= libpcap-$(LIBPCAP_VERSION)
 LIBPCAP_SUFFIX	:= tar.gz
 LIBPCAP_URL	:= http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX)
-- 
2.34.1