Very minor changes. * Forward port patches to fix minor fuzz.
Signed-off-by: Christian Melki <christian.me...@t2data.com> --- .../0100-build-and-install-share-lib-only.patch | 2 +- .../0101-pcap-config-add-SYSROOT-support.patch | 4 ++-- patches/{libpcap-1.10.2 => libpcap-1.10.3}/series | 0 rules/libpcap.make | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename patches/{libpcap-1.10.2 => libpcap-1.10.3}/0100-build-and-install-share-lib-only.patch (96%) rename patches/{libpcap-1.10.2 => libpcap-1.10.3}/0101-pcap-config-add-SYSROOT-support.patch (89%) rename patches/{libpcap-1.10.2 => libpcap-1.10.3}/series (100%) diff --git a/patches/libpcap-1.10.2/0100-build-and-install-share-lib-only.patch b/patches/libpcap-1.10.3/0100-build-and-install-share-lib-only.patch similarity index 96% rename from patches/libpcap-1.10.2/0100-build-and-install-share-lib-only.patch rename to patches/libpcap-1.10.3/0100-build-and-install-share-lib-only.patch index c909f70b1..cae5cc2b2 100644 --- a/patches/libpcap-1.10.2/0100-build-and-install-share-lib-only.patch +++ b/patches/libpcap-1.10.3/0100-build-and-install-share-lib-only.patch @@ -12,7 +12,7 @@ Signed-off-by: Alexander Aring <alex.ar...@gmail.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 787b18a06a93..dd7870c0475b 100644 +index 54246586828d..4c6768d6d764 100644 --- a/Makefile.in +++ b/Makefile.in @@ -429,7 +429,7 @@ RELEASE_FILES = $(COMMON_C_SRC) $(HDR) $(MAN1) $(MAN3PCAP_EXPAND) \ diff --git a/patches/libpcap-1.10.2/0101-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.10.3/0101-pcap-config-add-SYSROOT-support.patch similarity index 89% rename from patches/libpcap-1.10.2/0101-pcap-config-add-SYSROOT-support.patch rename to patches/libpcap-1.10.3/0101-pcap-config-add-SYSROOT-support.patch index 9cb27d0af..da6d1d62a 100644 --- a/patches/libpcap-1.10.2/0101-pcap-config-add-SYSROOT-support.patch +++ b/patches/libpcap-1.10.3/0101-pcap-config-add-SYSROOT-support.patch @@ -8,7 +8,7 @@ Signed-off-by: Alexander Aring <alex.ar...@gmail.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcap-config.in b/pcap-config.in -index afa8919d8a50..f9b8b1512892 100644 +index 6039ef33b324..505f7515f2f7 100644 --- a/pcap-config.in +++ b/pcap-config.in @@ -10,8 +10,8 @@ @@ -21,4 +21,4 @@ index afa8919d8a50..f9b8b1512892 100644 +libdir="${SYSROOT}@libdir@" LIBS="@LIBS@" LIBS_STATIC="@LIBS_STATIC@" - + VERSION="@PACKAGE_VERSION@" diff --git a/patches/libpcap-1.10.2/series b/patches/libpcap-1.10.3/series similarity index 100% rename from patches/libpcap-1.10.2/series rename to patches/libpcap-1.10.3/series diff --git a/rules/libpcap.make b/rules/libpcap.make index 9f07d452a..81d8649e5 100644 --- a/rules/libpcap.make +++ b/rules/libpcap.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBPCAP) += libpcap # # Paths and names # -LIBPCAP_VERSION := 1.10.2 -LIBPCAP_MD5 := 9f27d8e5595fb14e6bc8151ef6f5610b +LIBPCAP_VERSION := 1.10.3 +LIBPCAP_MD5 := c42fde2eb75a5075f19116f8c9768573 LIBPCAP := libpcap-$(LIBPCAP_VERSION) LIBPCAP_SUFFIX := tar.gz LIBPCAP_URL := http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX) -- 2.34.1