bootstrap-initrd

commit: 3cfcae8287eb4b6d47fce9d642164011e2c37e17
parent b5e1c01d0907e99a839843374cf525df57d5c543
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Tue, 23 Dec 2025 01:38:08 +0100

bump iproute2 to 6.18.0

Diffstat:
M
distfiles.SHA512SUM
2
+-
M
extras/iproute2.sh
9
+++++++++
M
extras/iproute2/meson.build
5
+++--
M
fetch.sh
2
+-
M
make-root.sh
2
+-

5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/distfiles.SHA512SUM b/distfiles.SHA512SUM
@@ -5,7 +5,7 @@
 df14758f735525d996e8591bd81f4a59d47f41db93a088bc2afb591c82727746570c272e737fb600ea8b7f6ddee7170a4d29b8ee6bcd268c016ecd433d1cb9d9  distfiles/git-2.52.0.tar.gz
 0b30b0f4c4c92a10ee2da263ea44666f445d96bac86ca4afb7bbb50d8278986e4145a7bcdf3ed9f75611bb956e93e16fc0e19874498ce3ae1a00e6fbb4f910c9  distfiles/heirloom-070715.tar.bz2
 1f1f10a7b49402053172cc028bbd939a46fcf933994cb867fa40e8c5bbd7b1291575b3bac254cd79dc4fce3e3a2c88fe0f890449888fda16169c8e6a2540f055  distfiles/heirloom-devtools-070527.tar.bz2
-97dcc33723e621cbba7c76948ce7440588bac30aefb5452c60de63df1d078f1d621903305fb348438e374d335eeaac6c3df3d0decb1cafc28874dff697286c69  distfiles/iproute2-6.14.0.tar.gz
+50d8ccbddaf439ac8272d1863d141cb86c51becbe5d903cc80edb9954dd541568e5865d88046d11543f13ace3ae0c0e2513c4b15288629deb4b65b02e9454e29  distfiles/iproute2-6.18.0.tar.gz
 30a523abf063ffaa43926be82ab4f282bf0e2b0bedd109511c84a36ca3144b157a3420730b4f61e6dfad57ab79e4e94be73d65f510af1488e08d4bcf3f887ca1  distfiles/lanodan-2025.pub
 ac18578c205ebadbf57f7c1d52c4df042e30108a6dd25bb3c54921500472e96f6ad0ba78efe426cca1988ff5b0502d68a1eb6789e02716b25795edfe5f234ce5  distfiles/linux-headers-6.16.12-r0.apk.aarch64
 6780856b15df1db9879154078189520659f07728cddd0d35650e5b86ad5e43fc91f8b31995639605fcc7bc6a537efc331c4c3aebfeb891beb30885daa7e8bbba  distfiles/linux-headers-6.16.12-r0.apk.armhf
diff --git a/extras/iproute2.sh b/extras/iproute2.sh
@@ -16,6 +16,15 @@ cd /extras/iproute2-*/
 	printf ']\n'
 } > man/man8/meson.build
 
+ed lib/utils_math.c <<EOF
+/math\.h
+a
+#include <limits.h>
+.
+w
+q
+EOF
+
 export CC_LD=$CC
 
 muon setup \
diff --git a/extras/iproute2/meson.build b/extras/iproute2/meson.build
@@ -1,6 +1,6 @@
 # version needs to be in sync with include/version.h
 # C11 for static_assert
-project('iproute2', 'c', version: '6.16.0', default_options: 'c_std=c11')
+project('iproute2', 'c', version: '6.17.0', default_options: 'c_std=c11')
 
 subdir('man/man8')
 
@@ -14,7 +14,7 @@ ip_src = ['ip/ip.c', 'ip/ip6tunnel.c', 'ip/ipaddress.c', 'ip/ipaddrlabel.c', 'ip
 # Loosely based on lib/Makefile
 libnetlink_src = ['lib/libgenl.c', 'lib/libnetlink.c']
 
-libutil_src = ['lib/utils.c', 'lib/utils_math.c', 'lib/rt_names.c', 'lib/ll_map.c', 'lib/ll_types.c', 'lib/ll_proto.c', 'lib/ll_addr.c', 'lib/inet_proto.c', 'lib/namespace.c', 'lib/json_writer.c', 'lib/json_print.c', 'lib/json_print_math.c', 'lib/names.c', 'lib/color.c', 'lib/bpf_legacy.c', 'lib/bpf_glue.c', 'lib/exec.c', 'lib/fs.c', 'lib/cg_map.c', 'lib/ppp_proto.c']
+libutil_src = ['lib/utils.c', 'lib/utils_math.c', 'lib/rt_names.c', 'lib/ll_map.c', 'lib/ll_types.c', 'lib/ll_proto.c', 'lib/ll_addr.c', 'lib/inet_proto.c', 'lib/namespace.c', 'lib/json_writer.c', 'lib/json_print.c', 'lib/json_print_math.c', 'lib/names.c', 'lib/color.c', 'lib/bpf_legacy.c', 'lib/bpf_glue.c', 'lib/exec.c', 'lib/fs.c', 'lib/cg_map.c', 'lib/ppp_proto.c', 'lib/bridge.c']
 libutil_src += [ 'lib/selinux.c' ]
 
 libaddlib_src = [ 'lib/ax25_ntop.c', 'lib/rose_ntop.c', 'lib/mpls_ntop.c', 'lib/mpls_pton.c', 'lib/netrom_ntop.c' ]
@@ -33,3 +33,4 @@ executable('rtmon', 'ip/rtmon.c', link_with: [libnetlink], install: true, includ
 executable('bridge', bridge_src, link_with: [libnetlink], install: true, include_directories: inc)
 # TODO: ss (requires yacc)
 install_man(man_man8)
+# TODO: netshaper
diff --git a/fetch.sh b/fetch.sh
@@ -10,7 +10,7 @@ URLS="
 	https://downloads.sourceforge.net/heirloom/heirloom/070715/heirloom-070715.tar.bz2
 	https://downloads.sourceforge.net/project/heirloom/heirloom-devtools/070527/heirloom-devtools-070527.tar.bz2
 	https://www.lua.org/ftp/lua-5.5.0.tar.gz
-	https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-6.14.0.tar.gz
+	https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-6.18.0.tar.gz
 	https://curl.se/tiny/tiny-curl-8.4.0.tar.gz
 	https://curl.haxx.se/ca/cacert-2024-11-26.pem
 	https://git.kernel.org/pub/scm/git/git.git/snapshot/git-2.52.0.tar.gz
diff --git a/make-root.sh b/make-root.sh
@@ -29,7 +29,7 @@ extra_tarballs="
 	make-4.4.1.tar.gz
 	lua-5.5.0.tar.gz
 	pkgconf-pkgconf-2.5.1.tar.gz
-	iproute2-6.14.0.tar.gz
+	iproute2-6.18.0.tar.gz
 	BearSSL-3c040368f6791553610e362401db1efff4b4c5b8.tar.gz
 	tiny-curl-8.4.0.tar.gz
 	git-2.52.0.tar.gz