From 77c3a1e8e799dd2f41b0a7f5831db6c7c7fe7174 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 23 May 2017 00:41:56 +0200 Subject: [PATCH] libnl: Update from 3.2.29 to 3.3.0 --- packages/libnl/build.sh | 4 ++-- packages/libnl/lib-utils.c.patch | 26 -------------------------- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 packages/libnl/lib-utils.c.patch diff --git a/packages/libnl/build.sh b/packages/libnl/build.sh index 8f5f9596..75063fde 100644 --- a/packages/libnl/build.sh +++ b/packages/libnl/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/thom311/libnl TERMUX_PKG_DESCRIPTION="Collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" -TERMUX_PKG_VERSION=3.2.29 +TERMUX_PKG_VERSION=3.3.0 TERMUX_PKG_VERSION_DASH=`echo $TERMUX_PKG_VERSION | sed -e 's/\./_/g'` TERMUX_PKG_SRCURL=https://github.com/thom311/libnl/releases/download/libnl$TERMUX_PKG_VERSION_DASH/libnl-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922 +TERMUX_PKG_SHA256=705468b5ae4cd1eb099d2d1c476d6a3abe519bc2810becf12fb1e32de1e074e4 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pthreads --disable-cli" diff --git a/packages/libnl/lib-utils.c.patch b/packages/libnl/lib-utils.c.patch deleted file mode 100644 index bd2e4136..00000000 --- a/packages/libnl/lib-utils.c.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -u -r ../libnl-3.2.29/lib/utils.c ./lib/utils.c ---- ../libnl-3.2.29/lib/utils.c 2016-12-30 15:56:43.000000000 +0100 -+++ ./lib/utils.c 2017-02-09 09:31:16.474515519 +0100 -@@ -124,21 +124,7 @@ - const char *nl_strerror_l(int err) - { - int errno_save = errno; -- locale_t loc = newlocale(LC_MESSAGES_MASK, "", (locale_t)0); -- const char *buf; -- -- if (loc == (locale_t)0) { -- if (errno == ENOENT) -- loc = newlocale(LC_MESSAGES_MASK, -- "POSIX", (locale_t)0); -- } -- if (loc != (locale_t)0) { -- buf = strerror_l(err, loc); -- freelocale(loc); -- } else { -- buf = "newlocale() failed"; -- } -- -+ const char *buf = strerror(err); - errno = errno_save; - return buf; - } -- 2.11.0