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

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 9ef4f7464068a6b5c5d346b41a4cb0b345251d4f.

Michael

[sent from post-receive hook]

On Fri, 06 Jan 2023 17:01:21 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> 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>
> Message-Id: <20230102084321.1853175-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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 dda3366aea13..c909f70b115c 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 b51c27faae25..9cb27d0af151 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 1d51449aec8f..9f07d452ae92 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)