aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2022-07-07 13:34:13 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2022-07-07 13:34:56 +0200
commit7348baee04822502bdf7b2916c04bc331645fc90 (patch)
treece9c68f23e9db52738a4a34ca81cd7e5b5a9d79f
parent0011e78d37cfa2d1d31bf1e96b3a3d905a3c56b6 (diff)
downloadaports-7348baee04822502bdf7b2916c04bc331645fc90.tar.gz
aports-7348baee04822502bdf7b2916c04bc331645fc90.tar.bz2
aports-7348baee04822502bdf7b2916c04bc331645fc90.tar.xz
main/libnl3: upgrade to 3.7.0
-rw-r--r--main/libnl3/APKBUILD8
-rw-r--r--main/libnl3/fix-tests.patch46
2 files changed, 3 insertions, 51 deletions
diff --git a/main/libnl3/APKBUILD b/main/libnl3/APKBUILD
index 337b89b1ea..167cb4b81b 100644
--- a/main/libnl3/APKBUILD
+++ b/main/libnl3/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libnl3
-pkgver=3.6.0
+pkgver=3.7.0
pkgrel=0
pkgdesc="Library for applications dealing with netlink sockets"
url="http://www.infradead.org/~tgr/libnl/"
@@ -14,10 +14,9 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-cli"
# The tests should pass locally.
#
# See: https://github.com/thom311/libnl/commit/9102872ac24c71f5ac48b6a1f09115c872b5793b
-options="!check"
+options="!check"
source="https://github.com/thom311/libnl/releases/download/libnl${pkgver//./_}/libnl-$pkgver.tar.gz
libnl3-musl.patch
- fix-tests.patch
"
builddir="$srcdir"/libnl-$pkgver
@@ -61,7 +60,6 @@ cli() {
}
sha512sums="
-7d1190ce94f43f5b18b1f7909221ca034d4ea5c8ed5735dbd27224d03e7f95d3c4e8ccdb611e33b58007729a21bfc0e23adc8758b112c712355664d87a81ce1b libnl-3.6.0.tar.gz
+80fbbc079299c90afd2a5eda62e4d4f98bf4ef23958c3ce5101f4ed4d81d783af733213bb3bab15f218555d8460bc2394898f909f4ac024fc27281faec86a041 libnl-3.7.0.tar.gz
2b9b569c00b9e29930a83e88264e9cb63a4991bd89a04f2fc4b4c468a2a73309d9463f0b9e4a945e614c0f831a68fc99c5768a0f2214a0dde00785215e24e1dc libnl3-musl.patch
-2789f2ef3a6f803b8abed473f69a26950973d48c72b6589a3c9dde82352ba959965e17524e1bb31254df28e77eb41108bffe6f880c5ade2830780a7dfbeb38ab fix-tests.patch
"
diff --git a/main/libnl3/fix-tests.patch b/main/libnl3/fix-tests.patch
deleted file mode 100644
index ecc03dc377..0000000000
--- a/main/libnl3/fix-tests.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From fa7f97f8982544c4fcb403893bae6701230d5165 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Fri, 15 Apr 2022 13:29:49 +0200
-Subject: [PATCH] build: avoid building check-direct with --disable-static
-
-"check-direct" needs to statically link with the libraries, because
-it wants to test internal ABI, which is hidden in the share libraries.
-When configuring with "--disable-static", static libs are not build
-and the test tool cannot be build.
-
-Just skip the test in that case.
-
-https://github.com/thom311/libnl/issues/306
----
- Makefile.am | 2 ++
- configure.ac | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index a6bcf553..2f5e0dfc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -984,8 +984,10 @@ tests_check_all_LDADD = \
- $(NULL)
-
- if WITH_CHECK
-+if ENABLE_STATIC
- check_programs += tests/check-direct
- endif
-+endif
-
- tests_check_direct_SOURCES = \
- tests/check-direct.c \
-diff --git a/configure.ac b/configure.ac
-index 1f9ad0eb..0fd1cc0f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -107,6 +107,8 @@ else
- AC_CHECK_LIB([pthread], [pthread_mutex_lock], [], AC_MSG_ERROR([libpthread is required]))
- fi
-
-+AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" != "no"])
-+
- AC_ARG_ENABLE([debug],
- AS_HELP_STRING([--disable-debug], [Do not include debugging statements]),
- [enable_debug="$enableval"], [enable_debug="yes"])