Merge branch 'bump-iproute2' into 'master'

Bump iproute2 to latest

See merge request adelie/packages!630

5 files changed, 63 insertions, 12 deletions

diff --git a/system/expat/APKBUILD b/system/expat/APKBUILD
index 4ec70f244..788bf71f3 100644
--- a/system/expat/APKBUILD
+++ b/system/expat/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=expat
-pkgver=2.2.9
+pkgver=2.4.1
 pkgrel=0
 pkgdesc="XML parser library written in C"
 url="https://libexpat.github.io/"
@@ -13,6 +13,8 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://downloads.sourceforge.net/project/expat/expat/$pkgver/expat-$pkgver.tar.bz2"
 
 # secfixes:
+#   2.4.1-r0:
+#     - CVE-2013-0340
 #   2.2.1-r0:
 #     - CVE-2016-9063
 #   2.2.0-r1:
@@ -37,4 +39,4 @@ package() {
 	make DESTDIR="$pkgdir/" install
 }
 
-sha512sums="8ea4b89a171dfda8267c8b7a0295516d169bf7f46587ebe460fe0ae7a31478a119ae2a7eaa09b3ce46b107ec7cd2274ea66d91c08b8a4ad6b98ba984cdd4e15b  expat-2.2.9.tar.bz2"
+sha512sums="b24e19c3f91e0f3d1ad3b08a810b8874e272ddfc6d4fd8f79c14c13eddf410648343b9f69fba2ce165be46c143cecf8d66cf446b4930da42f92def555ecd3408  expat-2.4.1.tar.bz2"
diff --git a/system/iproute2/APKBUILD b/system/iproute2/APKBUILD
index ee22a4922..529af2696 100644
--- a/system/iproute2/APKBUILD
+++ b/system/iproute2/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=iproute2
-pkgver=5.5.0
+pkgver=5.14.0
 pkgrel=0
 pkgdesc="Advanced IP routing and network device configuration tools"
 url="https://wiki.linuxfoundation.org/networking/iproute2"
@@ -10,7 +10,8 @@ arch="all"
 options="!check"
 license="GPL-2.0-only"
 depends=""
-makedepends="bison flex bash libelf-dev libmnl-dev libcap-dev bsd-compat-headers"
+makedepends="bison flex bash db-dev libelf-dev libmnl-dev libcap-dev bsd-compat-headers
+	libbpf-dev"
 subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
 source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz"
 
@@ -24,13 +25,7 @@ prepare() {
 }
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
+	./configure
 	make CCOPTS="-D_GNU_SOURCE $CFLAGS" LIBDIR=/lib
 }
 
@@ -55,4 +50,4 @@ bashcomp() {
 	rmdir -p "$pkgdir"/usr/share 2>/dev/null || true
 }
 
-sha512sums="a59fb6d620206aa17a4ff7d4510b99322e39b6cf34a00953a7d4cd4d62ca85de16d2e28e33cafa7b026edd4f63c81f3f337954aafe963b964ca0cd2d5c54ac78  iproute2-5.5.0.tar.xz"
+sha512sums="e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c  iproute2-5.14.0.tar.xz"
diff --git a/system/libbpf/10-include-stddef.patch b/system/libbpf/10-include-stddef.patch
new file mode 100644
index 000000000..e3fe4d1a9
--- /dev/null
+++ b/system/libbpf/10-include-stddef.patch
@@ -0,0 +1,12 @@
+diff --git a/src/libbpf.c b/src/libbpf.c
+index b38dcbe..bc3ac5d 100644
+--- a/src/libbpf.c
++++ b/src/libbpf.c
+@@ -29,6 +29,7 @@
+ #include <linux/filter.h>
+ #include <linux/list.h>
+ #include <linux/limits.h>
++#include <linux/stddef.h>
+ #include <linux/perf_event.h>
+ #include <linux/ring_buffer.h>
+ #include <sys/stat.h>
diff --git a/system/libbpf/20-consolidate-lib-dirs.patch b/system/libbpf/20-consolidate-lib-dirs.patch
new file mode 100644
index 000000000..0455ae8de
--- /dev/null
+++ b/system/libbpf/20-consolidate-lib-dirs.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile	2021-10-06 21:38:50.758641729 +0000
++++ b/src/Makefile	2021-10-06 21:39:12.096413542 +0000
+@@ -62,7 +62,7 @@
+ DESTDIR ?=
+ 
+ ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(shell uname -m)),)
+-	LIBSUBDIR := lib64
++	LIBSUBDIR := lib
+ else
+ 	LIBSUBDIR := lib
+ endif
diff --git a/system/libbpf/APKBUILD b/system/libbpf/APKBUILD
new file mode 100644
index 000000000..296878162
--- /dev/null
+++ b/system/libbpf/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: Dan Theisen <djt@hxx.in>
+# Maintainer: Dan Theisen <djt@hxx.in>
+pkgname=libbpf
+pkgver=0.5.0
+pkgrel=0
+pkgdesc="A library for interacting with the Linux kernel's Berkeley Packet Filter (BPF) facility from user space"
+url="https://github.com/libbpf/libbpf"
+arch="all"
+options="!check" # no tests
+license="LGPL-2.1 OR BSD-2-Clause"
+depends=""
+makedepends="zlib-dev libelf-dev linux-headers"
+subpackages="$pkgname-dev"
+source="libbpf-$pkgver.tar.gz::https://github.com/libbpf/libbpf/archive/refs/tags/v$pkgver.tar.gz
+	10-include-stddef.patch
+	20-consolidate-lib-dirs.patch
+	"
+
+build() {
+	cd src
+	make
+}
+
+package() {
+	cd src
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="3c578d3e6e93a306a1f182978e54f35fec8acfa51fad5d7de72c5003f10c266d7474e82d6dd045311fcaf8c18aa8cebe64a3336a458a9ea477e5a58e5111dd85  libbpf-0.5.0.tar.gz
+946e445ffa4c5df42ebac77b7a1c6478b37dc7b55e0883aee195c6a8c4f8718b4dbf98b7c6d3016e1619e59440d8e4a76dad1e843114dfe2f9a2610e5cbb7943  10-include-stddef.patch
+9398dd33df9e93f7bd4f68d6bb1da3731075e2f95fdcc3b9cc471e823c2f6700351d458976b804d3f56be50b824a8ce7cda482945a1e78522a3973b22bdbf4d5  20-consolidate-lib-dirs.patch"