mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH v2] libpcap: Version bump. 1.10.5 -> 1.10.6
@ 2026-01-10  9:40 Christian Melki
  2026-01-23 15:01 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2026-01-10  9:40 UTC (permalink / raw)
  To: ptxdist

https://github.com/the-tcpdump-group/libpcap/blob/libpcap-1.10.6/CHANGES

Plugs CVE:
CVE-2025-11961: Fix OOBR and OOBW in pcap_ether_aton().

* Forward patchset, adjusted 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              | 2 +-
 patches/{libpcap-1.10.5 => libpcap-1.10.6}/series           | 0
 rules/libpcap.make                                          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename patches/{libpcap-1.10.5 => libpcap-1.10.6}/0100-build-and-install-share-lib-only.patch (87%)
 rename patches/{libpcap-1.10.5 => libpcap-1.10.6}/0101-pcap-config-add-SYSROOT-support.patch (93%)
 rename patches/{libpcap-1.10.5 => libpcap-1.10.6}/series (100%)

diff --git a/patches/libpcap-1.10.5/0100-build-and-install-share-lib-only.patch b/patches/libpcap-1.10.6/0100-build-and-install-share-lib-only.patch
similarity index 87%
rename from patches/libpcap-1.10.5/0100-build-and-install-share-lib-only.patch
rename to patches/libpcap-1.10.6/0100-build-and-install-share-lib-only.patch
index cae5cc2b2..759ba91f3 100644
--- a/patches/libpcap-1.10.5/0100-build-and-install-share-lib-only.patch
+++ b/patches/libpcap-1.10.6/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 54246586828d..4c6768d6d764 100644
+index fe32c40cf62f..6e56b8fe3af8 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -429,7 +429,7 @@ RELEASE_FILES = $(COMMON_C_SRC) $(HDR) $(MAN1) $(MAN3PCAP_EXPAND) \
+@@ -420,7 +420,7 @@ RELEASE_FILES = $(COMMON_C_SRC) $(HDR) $(MAN1) $(MAN3PCAP_EXPAND) \
  	$(MAN3PCAP_NOEXPAND) $(MANFILE) $(MANMISC) $(EXTRA_DIST) \
  	$(TEST_DIST)
  
@@ -24,7 +24,7 @@ index 54246586828d..4c6768d6d764 100644
  
  libpcap.a: $(OBJ)
  	@rm -f $@
-@@ -615,7 +615,7 @@ testprogs: FORCE
+@@ -606,7 +606,7 @@ testprogs: FORCE libpcap.a
  
  FORCE:
  
diff --git a/patches/libpcap-1.10.5/0101-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.10.6/0101-pcap-config-add-SYSROOT-support.patch
similarity index 93%
rename from patches/libpcap-1.10.5/0101-pcap-config-add-SYSROOT-support.patch
rename to patches/libpcap-1.10.6/0101-pcap-config-add-SYSROOT-support.patch
index da6d1d62a..6af62ad36 100644
--- a/patches/libpcap-1.10.5/0101-pcap-config-add-SYSROOT-support.patch
+++ b/patches/libpcap-1.10.6/0101-pcap-config-add-SYSROOT-support.patch
@@ -8,7 +8,7 @@ Signed-off-by: Alexander Aring <alex.aring@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/pcap-config.in b/pcap-config.in
-index 6039ef33b324..505f7515f2f7 100644
+index 28427047e27f..334092eb73bf 100644
 --- a/pcap-config.in
 +++ b/pcap-config.in
 @@ -10,8 +10,8 @@
diff --git a/patches/libpcap-1.10.5/series b/patches/libpcap-1.10.6/series
similarity index 100%
rename from patches/libpcap-1.10.5/series
rename to patches/libpcap-1.10.6/series
diff --git a/rules/libpcap.make b/rules/libpcap.make
index 8df7f3075..fca7fec74 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBPCAP) += libpcap
 #
 # Paths and names
 #
-LIBPCAP_VERSION	:= 1.10.5
-LIBPCAP_MD5	:= 0dc69ed81464e7a255715fa685daf134
+LIBPCAP_VERSION	:= 1.10.6
+LIBPCAP_MD5	:= f49b1c1877dcbb3b7f5147429aa047f9
 LIBPCAP		:= libpcap-$(LIBPCAP_VERSION)
 LIBPCAP_SUFFIX	:= tar.gz
 LIBPCAP_URL	:= https://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX)
-- 
2.43.0




^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [ptxdist] [APPLIED] libpcap: Version bump. 1.10.5 -> 1.10.6
  2026-01-10  9:40 [ptxdist] [PATCH v2] libpcap: Version bump. 1.10.5 -> 1.10.6 Christian Melki
@ 2026-01-23 15:01 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2026-01-23 15:01 UTC (permalink / raw)
  To: ptxdist; +Cc: Christian Melki

Thanks, applied as 4ece7d20c969c6d7d4027c84fa218dfa1fa9dc6e.

Michael

[sent from post-receive hook]

On Fri, 23 Jan 2026 16:01:53 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> https://github.com/the-tcpdump-group/libpcap/blob/libpcap-1.10.6/CHANGES
> 
> Plugs CVE:
> CVE-2025-11961: Fix OOBR and OOBW in pcap_ether_aton().
> 
> * Forward patchset, adjusted offsets.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20260110094002.3663436-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/libpcap-1.10.5/0100-build-and-install-share-lib-only.patch b/patches/libpcap-1.10.6/0100-build-and-install-share-lib-only.patch
> similarity index 87%
> rename from patches/libpcap-1.10.5/0100-build-and-install-share-lib-only.patch
> rename to patches/libpcap-1.10.6/0100-build-and-install-share-lib-only.patch
> index cae5cc2b2d6b..759ba91f32aa 100644
> --- a/patches/libpcap-1.10.5/0100-build-and-install-share-lib-only.patch
> +++ b/patches/libpcap-1.10.6/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 54246586828d..4c6768d6d764 100644
> +index fe32c40cf62f..6e56b8fe3af8 100644
>  --- a/Makefile.in
>  +++ b/Makefile.in
> -@@ -429,7 +429,7 @@ RELEASE_FILES = $(COMMON_C_SRC) $(HDR) $(MAN1) $(MAN3PCAP_EXPAND) \
> +@@ -420,7 +420,7 @@ RELEASE_FILES = $(COMMON_C_SRC) $(HDR) $(MAN1) $(MAN3PCAP_EXPAND) \
>   	$(MAN3PCAP_NOEXPAND) $(MANFILE) $(MANMISC) $(EXTRA_DIST) \
>   	$(TEST_DIST)
>   
> @@ -24,7 +24,7 @@ index 54246586828d..4c6768d6d764 100644
>   
>   libpcap.a: $(OBJ)
>   	@rm -f $@
> -@@ -615,7 +615,7 @@ testprogs: FORCE
> +@@ -606,7 +606,7 @@ testprogs: FORCE libpcap.a
>   
>   FORCE:
>   
> diff --git a/patches/libpcap-1.10.5/0101-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.10.6/0101-pcap-config-add-SYSROOT-support.patch
> similarity index 93%
> rename from patches/libpcap-1.10.5/0101-pcap-config-add-SYSROOT-support.patch
> rename to patches/libpcap-1.10.6/0101-pcap-config-add-SYSROOT-support.patch
> index da6d1d62a1b1..6af62ad36e6b 100644
> --- a/patches/libpcap-1.10.5/0101-pcap-config-add-SYSROOT-support.patch
> +++ b/patches/libpcap-1.10.6/0101-pcap-config-add-SYSROOT-support.patch
> @@ -8,7 +8,7 @@ Signed-off-by: Alexander Aring <alex.aring@gmail.com>
>   1 file changed, 2 insertions(+), 2 deletions(-)
>  
>  diff --git a/pcap-config.in b/pcap-config.in
> -index 6039ef33b324..505f7515f2f7 100644
> +index 28427047e27f..334092eb73bf 100644
>  --- a/pcap-config.in
>  +++ b/pcap-config.in
>  @@ -10,8 +10,8 @@
> diff --git a/patches/libpcap-1.10.5/series b/patches/libpcap-1.10.6/series
> similarity index 100%
> rename from patches/libpcap-1.10.5/series
> rename to patches/libpcap-1.10.6/series
> diff --git a/rules/libpcap.make b/rules/libpcap.make
> index 8df7f3075492..fca7fec74b3d 100644
> --- a/rules/libpcap.make
> +++ b/rules/libpcap.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBPCAP) += libpcap
>  #
>  # Paths and names
>  #
> -LIBPCAP_VERSION	:= 1.10.5
> -LIBPCAP_MD5	:= 0dc69ed81464e7a255715fa685daf134
> +LIBPCAP_VERSION	:= 1.10.6
> +LIBPCAP_MD5	:= f49b1c1877dcbb3b7f5147429aa047f9
>  LIBPCAP		:= libpcap-$(LIBPCAP_VERSION)
>  LIBPCAP_SUFFIX	:= tar.gz
>  LIBPCAP_URL	:= https://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX)



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-01-23 15:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-01-10  9:40 [ptxdist] [PATCH v2] libpcap: Version bump. 1.10.5 -> 1.10.6 Christian Melki
2026-01-23 15:01 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox