From 48d8b00a3c032d7bb1237c65bce1da97ccbc49d5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Jun 2022 19:11:05 +0200 Subject: [PATCH] package/libnl: bump to version 3.6.0 - Drop first patch (already in version) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...orkaround-to-the-libc-compat.h-copy.patch} | 0 ...rivate-field-in-libnl-pkg-config-fil.patch | 30 ------------------- package/libnl/libnl.hash | 8 ++--- package/libnl/libnl.mk | 2 +- 4 files changed, 4 insertions(+), 36 deletions(-) rename package/libnl/{0002-Add-musl-workaround-to-the-libc-compat.h-copy.patch => 0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch} (100%) delete mode 100644 package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch diff --git a/package/libnl/0002-Add-musl-workaround-to-the-libc-compat.h-copy.patch b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch similarity index 100% rename from package/libnl/0002-Add-musl-workaround-to-the-libc-compat.h-copy.patch rename to package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch diff --git a/package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch b/package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch deleted file mode 100644 index 2419ae282c..0000000000 --- a/package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch +++ /dev/null @@ -1,30 +0,0 @@ -From db0d59cd06f3ffd350379847c0885e1bfb85af0f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 7 Mar 2015 11:34:42 +0100 -Subject: [PATCH] build: add Libs.private field in libnl pkg-config file - -In order to support static linking, the libnl pkg-config file should -indicate in its Libs.private field the libraries that libnl-3.0.a -requires. The LIBS variable contains the appropriate list of -libraries: -lm in all cases, and -lpthread when pthread support is -enabled. This allows to statically link applications against libnl -properly. - -Signed-off-by: Thomas Petazzoni ---- - libnl-3.0.pc.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libnl-3.0.pc.in b/libnl-3.0.pc.in -index b87e3dc..ddbc999 100644 ---- a/libnl-3.0.pc.in -+++ b/libnl-3.0.pc.in -@@ -7,4 +7,5 @@ Name: libnl - Description: Convenience library for netlink sockets - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lnl-@MAJ_VERSION@ -+Libs.private: @LIBS@ - Cflags: -I${includedir}/libnl@MAJ_VERSION@ --- -2.1.0 - diff --git a/package/libnl/libnl.hash b/package/libnl/libnl.hash index d7cd5c9532..a0f1388528 100644 --- a/package/libnl/libnl.hash +++ b/package/libnl/libnl.hash @@ -1,6 +1,4 @@ -# From https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz.md5sum -md5 74ba57b1b1d6f9f92268aa8141d8e8e4 libnl-3.5.0.tar.gz -# From https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz.sha256sum -sha256 352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa libnl-3.5.0.tar.gz +# From https://github.com/thom311/libnl/releases/download/libnl3_6_0/libnl-3.6.0.tar.gz.sha256sum +sha256 532155fd011e5a805bd67121b87a01c757e2bb24112ac17e69cb86013b970009 libnl-3.6.0.tar.gz # Locally calculated -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk index fc9398b29a..d3bd185093 100644 --- a/package/libnl/libnl.mk +++ b/package/libnl/libnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNL_VERSION = 3.5.0 +LIBNL_VERSION = 3.6.0 LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION)) LIBNL_LICENSE = LGPL-2.1+ LIBNL_LICENSE_FILES = COPYING