gentoo auto-resync : 22:05:2024 - 00:06:25

6 files changed, 84 insertions, 4 deletions

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 1d9e2b8f4c5c..5d056f86faf3 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,6 +4,7 @@ AUX iproute2-6.5.0-configure-nomagic-nolibbsd.patch 6966 BLAKE2B bc2da6f561ebd10
 AUX iproute2-6.5.0-mtu.patch 1719 BLAKE2B ef2dc2f3ce23432464b778584c53b3a204a05e7dac1d87969563d89b94bbcd04ff080f21d9809e43f75751b63b49ea506e0ae8191a6170b9c76dae043f861621 SHA512 4057309aaa53e97fa8ed0a410e42e4cf1f70e20a278a299b49261ef00ad8050bfad903e1a91b123a7c99e041732e23088274a8b79c0b2290482acf9735fd8cc1
 AUX iproute2-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch 754 BLAKE2B a7035177a9e8440b42543786e11b7f470469d63adb0454d683ea9563ab9b4e704c8e9c524d08369b9c87f63855ed5bcb983322ee9de1508752553166945c38e5 SHA512 4f3bc78450615ae8f9180caca2ba6c86d7954868273762aa488d347852d7d6807e5aee52cad5e4709a64aa257df448b9471e2c729dcd746a24ae8209bd2d9796
 AUX iproute2-6.6.0-makefile-use-usr-share-config.patch 1896 BLAKE2B a4fdb2cc8ca3cba86e00d57138f306bcb7465ac04fb7ba3750f0f3ac20c3774e247e743d706cefeb418591163eb4fa7a38c1548605e9699c34df129bcba5069c SHA512 d769ff1f01e6015b27cf151868180a9b3058b53cbc920bb580284d6edbc95821a5493020b667927da51b28cd178eeb35216f00451012a49e7508f406792b680a
+AUX iproute2-6.6.0-musl-c99.patch 2988 BLAKE2B c8b3f929a6d5423c95546fb93c5a6754856b75778ec053afffabc398affd72cb73429f4b889478e25c7d0b19bd59dcc5bc0e6a6323f6e3588efd9342181f4bd7 SHA512 7d0ff890371bc4115cd6cfd253fb70eeaedc048d83a030511cb97d5f03cede2fd20950adb3a8d4b704aea81ed6471ca72341c31f46571d1c9930cfe269c5868b
 AUX iproute2-6.6.0-revert-CONF_USR_DIR.patch 1325 BLAKE2B 4301d995f758167719699cfd04692debff6b2b46dda442ff53cb9b913406c95e2df31e3f763dc22d5923e0eb387439feeac8d55751419c9f4553a89a476f9a80 SHA512 23f20035b0a0fe42695b560785820f31d005963ff4cad18f47b7a412836cd4327962244055b89b53794e41a92754fd3464a9ca1fd2cd767aad094a0c125a7d13
 AUX iproute2-6.8.0-configure-nomagic-nolibbsd.patch 7010 BLAKE2B 4aab31c6da283789a6d7aca1b2dddeb828983d8bd4d929a05f5678dc1e4ca67e6e60be173c0968b5aeb3c8b40a4a1d4b307df02171e7adb296d508bb758f8e3f SHA512 0aa9cd6963cbd400f8284299cbeba7d36fe9f4cc775ebc114caf3f7e9479296776bf62415e49cbf821dc3a1c6f6d161fa23e973c44620c3f2a7077de750e9cda
 AUX iproute2-6.8.0-disable-libbsd-fallback.patch 777 BLAKE2B 099a8a59ff6fe385e0bc3e33b94e20ea3319af70b54e45eaad870d8bc84a9cc59057a3d9e51fb566891128a051244e54365c5fb0287d6db859bfd4596dd0ce86 SHA512 c577f536781e1b37f40ddc691697d4875614d392b28f3cd5c53bd27b3a66cfeab39b9e69140274d8713d948cbaccf62fad1845c97500931ec67de51154e59640
@@ -11,10 +12,10 @@ AUX iproute2-6.9.0-mtu.patch 1135 BLAKE2B 503eb3ece9ef5b5a7918a0e26f7b1d57ed6889
 DIST iproute2-6.6.0.tar.xz 917964 BLAKE2B 9d20f19c04c2bbde7a3ae53e61e4623b119570c8446f34b93ddadd64677caa432e00ee085498bc277e0842cc2124340c7100925106d0ef2c11dd8002aacac08f SHA512 21c99a3ba8e1d0047933e99b48fb00901eef18899cd5854000ae910d9d84d13aeafa48b32184775531285782909f4d283d0784491691a1f10462dab147de359d
 DIST iproute2-6.8.0.tar.xz 913512 BLAKE2B d30cdff8522627c27c9165f068f42adbec38f15548a8f2cd31276f283880dc402e10c5989e7227e80cdc891bcc4a574b330d634ae550e689758b849c0506c31f SHA512 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0
 DIST iproute2-6.9.0.tar.xz 918144 BLAKE2B a7434a2537a55b4875db0e3cc35383dfe4d0c8a118a8a1102c4076bfb154c9c2ab0781dcff324fa18ce7cfde798bf332a9e0ff08003ff39acbb8129b597a93a6 SHA512 1cbb234cb8f94213c3529f0b74fed5a575ff1fb838e783b8d2b440643c2e91246eda42e9b26e9775897aadb8b8133d199b2851b8ea0df06a899dc02acf403325
-EBUILD iproute2-6.6.0-r1.ebuild 5949 BLAKE2B f3709d671f62cfa6b79b307515c000833dc05cf9edd5cd6bf571e5a6daed199fa60fdfd627424402634a5faf98f29ad1da00d666a5cbbbb46fc345eab84745a4 SHA512 7a782790289d13760258a77e2c96fc6d934a0e2e3541232e734abf09ba79411416f6344595954316c229fe9b7728740ccc7d2fc1b090ca56a0ec6b4727f0173d
-EBUILD iproute2-6.6.0-r3.ebuild 5914 BLAKE2B b5b650ee92e921cdc0a9e15597fcaac1274dc15a01f6be7f661ff6f1ec485cba6c4fa57d37590ab0446a2af672b49872e472e2f702d107c9e6420fffb500e770 SHA512 fadd252646efd8831640b9b55cfcc8dc95db1687d244f2e2f677889503176a7f507e046cd097bb41d7a33bb2cd63f449a67af3ffa138535da6954c2b122b03c4
-EBUILD iproute2-6.6.0.ebuild 5856 BLAKE2B 730d2141e0a966ea7fa8c5b290bd673a8c03bdbc6fafdfed7a0c0427d97ffc454801aa8d50f8606c882f40f90ef160174fc57efe5e7a542b3c1d9a62eaf8ad31 SHA512 3b9574a49d3b267c0cd0efdcf50b2fed33beae6728f9372b6f8920f2a048a2062d85e14a0633c6532d23cfbd363638e5c1159a194734a5e0dac557494ecfaf27
-EBUILD iproute2-6.8.0-r2.ebuild 5962 BLAKE2B 1e1420baeaaaaa86a1fb59fd79d8fd08ff28687d4e72610555497888c333ad1bee0984ef0106ca4ebec69441e4a50e80c22676728b371fd5780a80a7254260a6 SHA512 318cf2dfca0f910f8e0f8c7efed9f389ad22ae5f3b5577abc68dd263348403efa3cb3ec801fa57793e51cc67956511a3ec040286ad65c6b6aed498799e69165c
+EBUILD iproute2-6.6.0-r1.ebuild 6005 BLAKE2B 9fc5b0e58119278043b53d8a200170f2613065d838922119a03b47df5bdbf98bd167c68a1ee220a5b6ef18ab8a6595470dc515c1f5265d931a6a0f1aab928e9c SHA512 860fd63ceac311bc945fd0729f4b373a824eb7130893c1eb871d1d4138539896385e3380ffa600486d58844aeb08a17a57f2a8daf2672fe7cc0bbf20a1b40dca
+EBUILD iproute2-6.6.0-r3.ebuild 5970 BLAKE2B cd6a2a71c8991b42a23ee59ce356aceb6e2a6801ff48866558f973229cfe525d03ba3eb3f30e679d29dbfa0145b555b5b9ef525eae3b1469c0904fea78359d5d SHA512 2002fd7eca14a2b7dc80bbc7004e5f349229f26bfb097d94d82d9ae5c6f29637ce34e38491401f995a8ccdc0c37eda8f1a5fda91fb16dacef34e4d4da17a5d55
+EBUILD iproute2-6.6.0.ebuild 5912 BLAKE2B 8a2fbae9e828f4ba106489cba07a94f5ce7e287a4e2d8e38901c334e1daaa162d3d94a6ba14116049b9c245b0e76904cf5401c799c32202c7af33df25177d021 SHA512 95d267179aacb4666b0d14dce83ebd790f099d31546c30ec7e61b9dcfa1c7b946e24839d30f4a3a42a6191427b2e3963b5569cffd4256bc09353680a17d9f68d
+EBUILD iproute2-6.8.0-r2.ebuild 6018 BLAKE2B 40e04288d7acfff500cfea28556eba9f8590b67d3d34cf4627ae5c3fbe9bf74b8b5bf1467bd50a90c41018404a0569917a1355ca5c25ddc9d4146c84140d49f9 SHA512 95db346c6fcc43361579cc97a326e46f4a50bf59b4e2b721802cf7e4243df3a032bc9b2ffe7b4497ed47999d09d4a58f73f21e3e6b08c126ff30d424b487eb5c
 EBUILD iproute2-6.9.0.ebuild 5908 BLAKE2B 6c8b25e7d0ab83b5d3f4f734d244101727f85601f803edd8e6f0fe6287ce7afff851ff50304e6e47e9e8a2c4f0f302b2a5de8144dbc3cf890aec5cbb869333f0 SHA512 1335da63ac9341db20a010e4a84bb33ecce9ab4d6e3840d16985f707b79fb39763bec29be157d75069e2c2dc8cb73335dbb86c94ad868d5de3bee2a591b8c127
 EBUILD iproute2-9999.ebuild 6105 BLAKE2B d2b239882f105b285305b77bff60e12759226b4ea629f2a84caaa9fc51a35c3be42a9ad46e0c4a7ee3c0a34cd824071c9587d06dccd02a0a5fa61802d24135be SHA512 e6a24e56f94d8d56526a89771f1763849d0eed86dc06aa3d484d78bcb7e3fd63e26a83f4c5c7854af49072df042656b94ed1c752a5cff294ea486034e4a9db72
 MISC metadata.xml 887 BLAKE2B 28f816c12d798665f2e32e22ffd69dfda03e251bc6447a34e3ddbf0d5d00046c561b7f8282f73ed8609b3d9397da9bc2b1bf54d23bc82d5395af141e2448a3e3 SHA512 e5cafc242c2e4fe64df7456b3e001285933a680b674400ef53b2fc5f966f0c8551fc2ad7d07798d56eed365331ae01536d7b6d41fa5a710c1c2257900ce45d3e
diff --git a/sys-apps/iproute2/files/iproute2-6.6.0-musl-c99.patch b/sys-apps/iproute2/files/iproute2-6.6.0-musl-c99.patch
new file mode 100644
index 000000000000..c277bd6d1128
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.6.0-musl-c99.patch
@@ -0,0 +1,75 @@
+From 12416003e4c691afc732d26f0a07c3890c24b396 Mon Sep 17 00:00:00 2001
+From: Gabi Falk <gabifalk@gmx.com>
+Date: Fri, 10 May 2024 14:36:12 +0000
+Subject: [PATCH] bridge/vlan.c: bridge/vlan.c: fix build with gcc 14 on musl
+ systems
+
+On glibc based systems the definition of 'struct timeval' is pulled in
+with inclusion of <stdlib.h> header, but on musl based systems it
+doesn't work this way.  Missing definition triggers an
+incompatible-pointer-types error with gcc 14 (warning on previous
+versions of gcc):
+
+../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration
+   80 | _PRINT_FUNC(tv, const struct timeval *)
+      |                              ^~~~~~~
+../include/json_print.h:50:37: note: in definition of macro '_PRINT_FUNC'
+   50 |                                     type value);                        \
+      |                                     ^~~~
+../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration
+   80 | _PRINT_FUNC(tv, const struct timeval *)
+      |                              ^~~~~~~
+../include/json_print.h:55:45: note: in definition of macro '_PRINT_FUNC'
+   55 |                                             type value)                 \
+      |                                             ^~~~
+../include/json_print.h: In function 'print_tv':
+../include/json_print.h:58:48: error: passing argument 5 of 'print_color_tv' from incompatible pointer type [-Wincompatible-pointer-types]
+   58 |                                                value);                  \
+      |                                                ^~~~~
+      |                                                |
+      |                                                const struct timeval *
+
+Link: https://lore.kernel.org/netdev/20240510143613.1531283-1-gabifalk@gmx.com/T/#u
+Signed-off-by: Gabi Falk <gabifalk@gmx.com>
+---
+ bridge/vlan.c | 1 +
+ bridge/vni.c  | 1 +
+ vdpa/vdpa.c   | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/bridge/vlan.c b/bridge/vlan.c
+index 5352eb24..0a7e6c45 100644
+--- a/bridge/vlan.c
++++ b/bridge/vlan.c
+@@ -4,6 +4,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/socket.h>
++#include <sys/time.h>
+ #include <net/if.h>
+ #include <netinet/in.h>
+ #include <linux/if_bridge.h>
+diff --git a/bridge/vni.c b/bridge/vni.c
+index a7abe6de..e1f981fc 100644
+--- a/bridge/vni.c
++++ b/bridge/vni.c
+@@ -10,6 +10,7 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <sys/socket.h>
++#include <sys/time.h>
+ #include <net/if.h>
+ #include <netinet/in.h>
+ #include <linux/if_link.h>
+diff --git a/vdpa/vdpa.c b/vdpa/vdpa.c
+index 6e4a9c11..43f87824 100644
+--- a/vdpa/vdpa.c
++++ b/vdpa/vdpa.c
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <getopt.h>
+ #include <errno.h>
++#include <sys/time.h>
+ #include <linux/genetlink.h>
+ #include <linux/if_ether.h>
+ #include <linux/vdpa.h>
diff --git a/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild b/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild
index f56e79070a8f..816d583a2935 100644
--- a/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild
@@ -53,6 +53,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
 	"${FILESDIR}"/${PN}-6.4.0-disable-libbsd-fallback.patch # bug #911727
 	"${FILESDIR}"/${PN}-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch
+	"${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622
 )
 
 src_prepare() {
diff --git a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
index fc029883a9e9..9a1ab6a3936e 100644
--- a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
@@ -55,6 +55,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch
 	"${FILESDIR}"/${PN}-6.6.0-revert-CONF_USR_DIR.patch
 	"${FILESDIR}"/${PN}-6.6.0-makefile-use-usr-share-config.patch
+	"${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622
 )
 
 src_prepare() {
diff --git a/sys-apps/iproute2/iproute2-6.6.0.ebuild b/sys-apps/iproute2/iproute2-6.6.0.ebuild
index 97cae73173e9..45e7ac2e7a0b 100644
--- a/sys-apps/iproute2/iproute2-6.6.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
 	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
 	"${FILESDIR}"/${PN}-6.4.0-disable-libbsd-fallback.patch # bug #911727
+	"${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622
 )
 
 src_prepare() {
diff --git a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
index c5ab1aee142e..d74ccd7658b0 100644
--- a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
 	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
 	"${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
+	"${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622
 )
 
 src_prepare() {