aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-09-01 20:23:19 -0300
committerNatanael Copa <ncopa@alpinelinux.org>2019-09-03 16:04:23 +0000
commit792fb875f317d992027428297ea0103d82b98373 (patch)
treeaa904dedecdfbe9a599c7617c8f4b48c02600138
parent454fecd8c9273abc17abd120873f79bfb5c44ecf (diff)
downloadaports-792fb875f317d992027428297ea0103d82b98373.tar.gz
aports-792fb875f317d992027428297ea0103d82b98373.tar.bz2
aports-792fb875f317d992027428297ea0103d82b98373.tar.xz
main/libnl3: upgrade to 3.5.0
-rw-r--r--main/libnl3/APKBUILD13
-rw-r--r--main/libnl3/libnl3-musl.patch47
2 files changed, 6 insertions, 54 deletions
diff --git a/main/libnl3/APKBUILD b/main/libnl3/APKBUILD
index eb9db896b0..0ddd5e3b73 100644
--- a/main/libnl3/APKBUILD
+++ b/main/libnl3/APKBUILD
@@ -1,12 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libnl3
-pkgver=3.4.0
+pkgver=3.5.0
pkgrel=0
pkgdesc="Library for applications dealing with netlink sockets"
url="http://www.infradead.org/~tgr/libnl/"
arch="all"
-license="GPL"
-depends=
+license="LGPL-2.1-or-later"
makedepends="linux-headers flex bison libtool autoconf automake"
checkdepends="check-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-cli"
@@ -15,13 +14,13 @@ source="https://github.com/thom311/libnl/releases/download/libnl${pkgver//./_}/l
"
builddir="$srcdir"/libnl-$pkgver
-prepare () {
+prepare() {
default_prepare
cd "$builddir"
autoreconf -vif
}
-build () {
+build() {
cd "$builddir"
./configure \
--build=$CBUILD \
@@ -54,5 +53,5 @@ cli() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e libnl-3.4.0.tar.gz
-a31ec4b76d2fc472072f2d770cb3f5819a6477230a97603a476ce175c0c94d25e74eff8dc0ce2e6baa96f0e450b82db508a152f418bdd72919cbd5521d5f82fd libnl3-musl.patch"
+sha512sums="9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c libnl-3.5.0.tar.gz
+2b9b569c00b9e29930a83e88264e9cb63a4991bd89a04f2fc4b4c468a2a73309d9463f0b9e4a945e614c0f831a68fc99c5768a0f2214a0dde00785215e24e1dc libnl3-musl.patch"
diff --git a/main/libnl3/libnl3-musl.patch b/main/libnl3/libnl3-musl.patch
index e62653a0af..43c8f33bc2 100644
--- a/main/libnl3/libnl3-musl.patch
+++ b/main/libnl3/libnl3-musl.patch
@@ -9,44 +9,9 @@ diff -Naur libnl-3.3.0_rc1.orig/include/linux-private/linux/if_ether.h libnl-3.3
/*
* IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
-@@ -117,10 +118,12 @@
- * This is an Ethernet frame header.
- */
-
-+#if __UAPI_DEF_ETHHDR
- struct ethhdr {
- unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
- unsigned char h_source[ETH_ALEN]; /* source ether addr */
- __be16 h_proto; /* packet type ID field */
- } __attribute__((packed));
-+#endif
-
- #endif /* _LINUX_IF_ETHER_H */
diff -Naur libnl-3.3.0_rc1.orig/include/linux-private/linux/libc-compat.h libnl-3.3.0_rc1/include/linux-private/linux/libc-compat.h
--- libnl-3.3.0_rc1.orig/include/linux-private/linux/libc-compat.h 2017-03-08 19:56:31.823516923 -0800
+++ libnl-3.3.0_rc1/include/linux-private/linux/libc-compat.h 2017-03-08 20:12:30.376843489 -0800
-@@ -48,10 +48,18 @@
- #ifndef _LIBC_COMPAT_H
- #define _LIBC_COMPAT_H
-
--/* We have included glibc headers... */
--#if defined(__GLIBC__)
-+/* We're used from userspace... */
-+#if !defined(__KERNEL__)
-
--/* Coordinate with glibc netinet/in.h header. */
-+/* Coordinate with libc netinet/if_ether.h */
-+#ifdef _NETINET_IF_ETHER_H /* musl */
-+#define __UAPI_DEF_ETHHDR 0
-+#else
-+/* glibc uses __NETINET_IF_ETHER_H, and uses the uapi header. */
-+#define __UAPI_DEF_ETHHDR 1
-+#endif
-+
-+/* Coordinate with libc netinet/in.h header. */
- #if defined(_NETINET_IN_H)
-
- /* GLIBC headers included first so don't define anything
@@ -64,15 +72,7 @@
#define __UAPI_DEF_IN_CLASS 0
@@ -81,18 +46,6 @@ diff -Naur libnl-3.3.0_rc1.orig/include/linux-private/linux/libc-compat.h libnl-
* coordinate. */
#define __UAPI_DEF_IN6_ADDR_ALT 1
#define __UAPI_DEF_SOCKADDR_IN6 1
-@@ -115,7 +115,10 @@
- /* If we did not see any headers from any supported C libraries,
- * or we are being included in the kernel, then define everything
- * that we need. */
--#else /* !defined(__GLIBC__) */
-+#else /* defined(__KERNEL__) */
-+
-+/* Definitions for if/ether.h */
-+#define __UAPI_DEF_ETHHDR 1
-
- /* Definitions for in.h */
- #define __UAPI_DEF_IN_ADDR 1
@@ -138,6 +141,6 @@
/* Definitions for xattr.h */
#define __UAPI_DEF_XATTR 1