From 057d4f96aa3ba63cc456b06a70a6b3a008cf803f Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Thu, 19 Jan 2023 19:29:02 +0530 Subject: [PATCH] chore: bump deps Bump deps Signed-off-by: Noel Georgi --- Makefile | 2 +- Pkgfile | 28 ++--- iptables/patches/fix-u_int16_t.patch | 163 --------------------------- iptables/patches/fix-xtables.patch | 11 -- iptables/pkg.yaml | 11 +- kernel/build/config-amd64 | 3 +- kernel/build/config-arm64 | 3 +- 7 files changed, 22 insertions(+), 199 deletions(-) delete mode 100644 iptables/patches/fix-u_int16_t.patch delete mode 100644 iptables/patches/fix-xtables.patch diff --git a/Makefile b/Makefile index 912b68df..4d1248c9 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ SOURCE_DATE_EPOCH ?= "1559424892" # Sync bldr image with Pkgfile BLDR ?= docker run --rm --volume $(PWD):/tools --entrypoint=/bldr \ - ghcr.io/siderolabs/bldr:v0.2.0-alpha.11 graph --root=/tools + ghcr.io/siderolabs/bldr:v0.2.0-alpha.12 graph --root=/tools BUILD := docker buildx build PLATFORM ?= linux/amd64,linux/arm64 diff --git a/Pkgfile b/Pkgfile index a98b8685..0075bb61 100644 --- a/Pkgfile +++ b/Pkgfile @@ -1,14 +1,14 @@ -# syntax = ghcr.io/siderolabs/bldr:v0.2.0-alpha.11 +# syntax = ghcr.io/siderolabs/bldr:v0.2.0-alpha.12 format: v1alpha2 vars: - TOOLS_IMAGE: ghcr.io/siderolabs/tools:v1.4.0-alpha.0-7-gd0e6bd0 + TOOLS_IMAGE: ghcr.io/siderolabs/tools:v1.4.0-alpha.0-10-ge130fd5 # renovate: datasource=github-releases depName=containernetworking/plugins - cni_version: v1.1.1 - cni_sha256: c86c44877c47f69cd23611e22029ab26b613f620195b76b3ec20f589367a7962 - cni_sha512: 03da31caee5f9595abf65d4a551984b995bc18c5e97409549f08997c5a6a2b41a8950144f8a5b4f810cb401ddbe312232d2be76ec977acf8108eb490786b1817 + cni_version: v1.2.0 + cni_sha256: f3496ddda9c7770a0b695b67ae7ee80a4ee331ac2745af4830054b81627f79b7 + cni_sha512: fb6fb4f46ac1610b3721f5f3a6ddfb096cbf2e5d5b792306edca5351a3944d2f802170d83e5adec01420395bf64fc8a174ede61ac9b93b5ac6b938a4b48651e6 # renovate: datasource=github-tags depName=containerd/containerd containerd_version: v1.6.15 @@ -58,19 +58,19 @@ vars: ipmitool_sha512: 2d91706e9feba4b2ce4808eca087b81b842c4292a5840830001919c06ec8babd8f8761b74bb9dcf8fbc7765f028a5b1a192a3c1b643f2adaa157fed6fb0d1ee3 # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.netfilter.org/iptables - iptables_version: 1.8.8 - iptables_sha256: 71c75889dc710676631553eb1511da0177bbaaf1b551265b912d236c3f51859f - iptables_sha512: f21df23279a77531a23f3fcb1b8f0f8ec0c726bda236dd0e33af74b06753baff6ce3f26fb9fcceb6fada560656ba901e68fc6452eb840ac1b206bc4654950f59 + iptables_version: 1.8.9 + iptables_sha256: ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f + iptables_sha512: e367bf286135e39b7401e852de25c1ed06d44befdffd92ed1566eb2ae9704b48ac9196cb971f43c6c83c6ad4d910443d32064bcdf618cfcef6bcab113e31ff70 # renovate: datasource=git-refs versioning=git depName=https://github.com/ipxe/ipxe.git - ipxe_ref: ab19546386b13d6c54aea1647fac06960c544efc - ipxe_sha256: b61964de4f771884c823b16fe9b8b42403edc7d09a51e1b18a3f6e53f8266bfa - ipxe_sha512: d9123ec10746c6e0a94ec6c68002a7c73e0cac5ab513cf956288dd84853b9e4aa8262fb7fd28fd30383b06bb0c8a6b49abea653d779fa92eba193eca73abcf6c + ipxe_ref: 08740220baba87cbc6acb1c00cd5b492ac0c5a08 + ipxe_sha256: 805a9ff31c1ae1144ff7607e0f1a4ac1ecad41b50e8f9fb079caad52cfbdb46a + ipxe_sha512: 4fd9ff063b143bf96b41749bc3c01d5ed7ad162325639bc5df974f0bbd2cd3eb2ac67eee60a02b9bd13ab58589c6a5a4b15500abfe86f1dcad1339737bd657e5 # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git - linux_version: 6.1.5 - linux_sha256: bc7f6d9a8a8bbe9a723e82346bba94b58d926f78bfba106b21e041e0290076fc - linux_sha512: f359a8ff3d2d4f1e95bd90431209fa17b7b37029a246b4fbadd618afb734f2e0385a21ebdc21c9fe6b5cc84876b34a59d7ae582c97c34cf29238231db4161275 + linux_version: 6.1.7 + linux_sha256: 4ab048bad2e7380d3b827f1fad5ad2d2fc4f2e80e1c604d85d1f8781debe600f + linux_sha512: 8b9bb3fbbea2d61314145cf6e4e1140372821a1e9ff79c4da363039c54fe73481106a5a85df0141dd449f4a21e946093a7430b14896b601c5a8b1f776107b35c # renovate: datasource=git-tags extractVersion=^v(?.*)$ versioning=loose depName=git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git kmod_version: 30 diff --git a/iptables/patches/fix-u_int16_t.patch b/iptables/patches/fix-u_int16_t.patch deleted file mode 100644 index 30f896ec..00000000 --- a/iptables/patches/fix-u_int16_t.patch +++ /dev/null @@ -1,163 +0,0 @@ -From f319389525b066b7dc6d389c88f16a0df3b8f189 Mon Sep 17 00:00:00 2001 -From: Nick Hainke -Date: Mon, 16 May 2022 18:16:41 +0200 -Subject: treewide: use uint* instead of u_int* - -Gcc complains about missing types. Some commits introduced u_int* instead -of uint*. Use uint treewide. - -Fixes errors in the form of: -In file included from xtables-legacy-multi.c:5: -xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'? - 83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, - | ^~~~~~~~~ - | uint16_t -make[6]: *** [Makefile:712: xtables_legacy_multi-xtables-legacy-multi.o] Error 1 - -Avoid libipq API breakage by adjusting libipq.h include accordingly. For -arpt_mangle.h kernel uAPI header, apply same change as in kernel commit -e91ded8db5747 ("uapi: netfilter_arp: use __u8 instead of u_int8_t"). - -Signed-off-by: Nick Hainke -Signed-off-by: Phil Sutter ---- - extensions/libxt_conntrack.c | 2 +- - include/libipq/libipq.h | 8 ++++---- - include/libiptc/libxtc.h | 2 +- - include/linux/netfilter_arp/arpt_mangle.h | 2 +- - iptables/xshared.c | 2 +- - iptables/xshared.h | 2 +- - libipq/ipq_create_handle.3 | 2 +- - libipq/ipq_set_mode.3 | 2 +- - 8 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c -index 64018ce1..234085c5 100644 ---- a/extensions/libxt_conntrack.c -+++ b/extensions/libxt_conntrack.c -@@ -778,7 +778,7 @@ matchinfo_print(const void *ip, const struct xt_entry_match *match, int numeric, - - static void - conntrack_dump_ports(const char *prefix, const char *opt, -- u_int16_t port_low, u_int16_t port_high) -+ uint16_t port_low, uint16_t port_high) - { - if (port_high == 0 || port_low == port_high) - printf(" %s%s %u", prefix, opt, port_low); -diff --git a/include/libipq/libipq.h b/include/libipq/libipq.h -index 3cd13292..dd0cb205 100644 ---- a/include/libipq/libipq.h -+++ b/include/libipq/libipq.h -@@ -24,7 +24,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -48,19 +48,19 @@ typedef unsigned long ipq_id_t; - struct ipq_handle - { - int fd; -- u_int8_t blocking; -+ uint8_t blocking; - struct sockaddr_nl local; - struct sockaddr_nl peer; - }; - --struct ipq_handle *ipq_create_handle(u_int32_t flags, u_int32_t protocol); -+struct ipq_handle *ipq_create_handle(uint32_t flags, uint32_t protocol); - - int ipq_destroy_handle(struct ipq_handle *h); - - ssize_t ipq_read(const struct ipq_handle *h, - unsigned char *buf, size_t len, int timeout); - --int ipq_set_mode(const struct ipq_handle *h, u_int8_t mode, size_t len); -+int ipq_set_mode(const struct ipq_handle *h, uint8_t mode, size_t len); - - ipq_packet_msg_t *ipq_get_packet(const unsigned char *buf); - -diff --git a/include/libiptc/libxtc.h b/include/libiptc/libxtc.h -index 37010188..a1d16ef9 100644 ---- a/include/libiptc/libxtc.h -+++ b/include/libiptc/libxtc.h -@@ -10,7 +10,7 @@ extern "C" { - #endif - - #ifndef XT_MIN_ALIGN --/* xt_entry has pointers and u_int64_t's in it, so if you align to -+/* xt_entry has pointers and uint64_t's in it, so if you align to - it, you'll also align to any crazy matches and targets someone - might write */ - #define XT_MIN_ALIGN (__alignof__(struct xt_entry)) -diff --git a/include/linux/netfilter_arp/arpt_mangle.h b/include/linux/netfilter_arp/arpt_mangle.h -index 250f5029..8c2b16a1 100644 ---- a/include/linux/netfilter_arp/arpt_mangle.h -+++ b/include/linux/netfilter_arp/arpt_mangle.h -@@ -13,7 +13,7 @@ struct arpt_mangle - union { - struct in_addr tgt_ip; - } u_t; -- u_int8_t flags; -+ __u8 flags; - int target; - }; - -diff --git a/iptables/xshared.c b/iptables/xshared.c -index a8512d38..9b5e5b5b 100644 ---- a/iptables/xshared.c -+++ b/iptables/xshared.c -@@ -1025,7 +1025,7 @@ static const int inverse_for_options[NUMBER_OF_OPT] = - }; - - void --set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, -+set_option(unsigned int *options, unsigned int option, uint16_t *invflg, - bool invert) - { - if (*options & option) -diff --git a/iptables/xshared.h b/iptables/xshared.h -index 14568bb0..f8212988 100644 -# https://git.alpinelinux.org/aports/plain/main/iptables/fix-u_int16_t.patch ---- a/iptables/xshared.h -+++ b/iptables/xshared.h -@@ -80,7 +80,7 @@ struct xtables_target; - #define IPT_INV_ARPHRD 0x0800 - - void --set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, -+set_option(unsigned int *options, unsigned int option, uint16_t *invflg, - bool invert); - - /** -diff --git a/libipq/ipq_create_handle.3 b/libipq/ipq_create_handle.3 -index 11ef95c4..ebe46daa 100644 ---- a/libipq/ipq_create_handle.3 -+++ b/libipq/ipq_create_handle.3 -@@ -24,7 +24,7 @@ ipq_create_handle, ipq_destroy_handle \(em create and destroy libipq handles. - .br - .B #include - .sp --.BI "struct ipq_handle *ipq_create_handle(u_int32_t " flags ", u_int32_t " protocol ");" -+.BI "struct ipq_handle *ipq_create_handle(uint32_t " flags ", uint32_t " protocol ");" - .br - .BI "int ipq_destroy_handle(struct ipq_handle *" h ); - .SH DESCRIPTION -diff --git a/libipq/ipq_set_mode.3 b/libipq/ipq_set_mode.3 -index 0edd3c00..e206886c 100644 ---- a/libipq/ipq_set_mode.3 -+++ b/libipq/ipq_set_mode.3 -@@ -24,7 +24,7 @@ ipq_set_mode \(em set the ip_queue queuing mode - .br - .B #include - .sp --.BI "int ipq_set_mode(const struct ipq_handle *" h ", u_int8_t " mode ", size_t " range ); -+.BI "int ipq_set_mode(const struct ipq_handle *" h ", uint8_t " mode ", size_t " range ); - .SH DESCRIPTION - The - .B ipq_set_mode --- -cgit v1.2.3 diff --git a/iptables/patches/fix-xtables.patch b/iptables/patches/fix-xtables.patch deleted file mode 100644 index 4476b537..00000000 --- a/iptables/patches/fix-xtables.patch +++ /dev/null @@ -1,11 +0,0 @@ -# https://git.alpinelinux.org/aports/plain/main/iptables/fix-xtables.patch ---- a/libxtables/xtables.c 2022-05-13 13:26:26.000000000 +0000 -+++ b/libxtables/xtables.c 2022-05-17 08:56:52.670556393 +0000 -@@ -45,7 +45,6 @@ - - #include - #include /* INT_MAX in ip_tables.h/ip6_tables.h */ --#include /* ETH_ALEN */ - #include - #include - #include diff --git a/iptables/pkg.yaml b/iptables/pkg.yaml index 81a18aae..45b6fad5 100644 --- a/iptables/pkg.yaml +++ b/iptables/pkg.yaml @@ -5,18 +5,13 @@ dependencies: - stage: base steps: - sources: - - url: https://deb.debian.org/debian/pool/main/i/iptables/iptables_{{ .iptables_version }}.orig.tar.bz2 - destination: iptables.tar.bz2 + - url: https://ftp.debian.org/debian/pool/main/i/iptables/iptables_{{ .iptables_version }}.orig.tar.xz + destination: iptables.tar.xz sha256: "{{ .iptables_sha256 }}" sha512: "{{ .iptables_sha512 }}" prepare: - | - tar -xjf iptables.tar.bz2 --strip-components=1 - - # iptables out of tree built needs more patches and running ./autogen.sh - # https://www.spinics.net/lists/netfilter-devel/msg76456.html - patch -p1 < /pkg/patches/fix-xtables.patch - patch -p1 < /pkg/patches/fix-u_int16_t.patch + tar -xf iptables.tar.xz --strip-components=1 ./configure \ --prefix=/usr \ diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64 index 1c060c8e..b8b0b623 100644 --- a/kernel/build/config-amd64 +++ b/kernel/build/config-amd64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.5 Kernel Configuration +# Linux/x86 6.1.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -183,6 +183,7 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_GCC11_NO_ARRAY_BOUNDS=y CONFIG_GCC12_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64 index 6814ead0..f23f9abd 100644 --- a/kernel/build/config-arm64 +++ b/kernel/build/config-arm64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.5 Kernel Configuration +# Linux/arm64 6.1.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -161,6 +161,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_GCC11_NO_ARRAY_BOUNDS=y CONFIG_GCC12_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y