gentoo auto-resync : 29:03:2024 - 19:13:18

9 files changed, 42 insertions, 8 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 691288a6b11d..6d08af1b7705 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index a470fabab964..b7dcf3323e88 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -13,6 +13,6 @@ DIST curl-8.7.1.tar.xz.asc 488 BLAKE2B 1c91d116aecc8e98d8ec3aad68b7c96f11151e6c2
 EBUILD curl-8.5.0-r3.ebuild 11025 BLAKE2B b10bc84ca0ac1ade0685a56f73558492d1fd6eb5e47280dd073ce2be1dc6542a9c5666a55fe2c26c0508c3f221409ce7f80f5846d7ccce0aaeb9ad8254a8f0ff SHA512 5e9d1aa24df4d424a5a5fc64e28e41a3aa86a2008d7d59db6ee1327efd7c17ae0d9cc4be881d0af4bb31847046cc059ed9355f2c46930a227073595b63ca57ca
 EBUILD curl-8.5.0.ebuild 10777 BLAKE2B 14fea8da51ac209f0fd9ef2665066a44504f0ceeaed838dfb41bc64c52951392e67f6adc23d01ca09c34610658171b9b83dda7c310ed3a62f558825718a97bba SHA512 0c7d812544f26a7f424efffbd5231f6ce958479933716f8638f99b83d097ac0cc5e09dbe7f32e75e0b6b4705d6705870cba2b64f24e982f6edc7d5ccb90844fc
 EBUILD curl-8.6.0-r1.ebuild 10835 BLAKE2B 34f910a7310c832f7864d7679eaa741088212f392b4c63bff67921790d3c2ce4de5a663672464e1626194929199da007214848120ecb70c2718c5da13e1d8950 SHA512 910f3005507c99a5118bbb2d43b841918ba2fcc23d7e8921c4a7bec18d786b3be3b04c5657c392213d3791c26dfa3139e1a333f08cd92fb01ca5f0312d4740fb
-EBUILD curl-8.7.1.ebuild 10828 BLAKE2B 9b3c7c524aec154b3029c2c1e95160c062d976063702a6597522baf697ca12fce9b44db57b64fde9d6cfde9fdb637f607848d8ae8d32b5ed6488444bb45e9063 SHA512 1148e8b5f17c7040e55d6fc8590f3d34de27e4d3faf6a52a3094d0e7623272498ecd2ea7fc5b7ee8597fc48998f5e474a8b704cece90be0d17381bdf906445a7
+EBUILD curl-8.7.1.ebuild 10827 BLAKE2B a68c2e982cd3cc68bdd51a25f71f30439b02e0b05983cacbdd43ca42088a88e04150453d82bdff66516979134072d2f929c50e750a8d2bad8af7b3a6ac5744ce SHA512 9ec1ba093544ee26b41c8735c4f57fa5c492c3bb58cdb22b7a24231f2ba10d21a16665e5f489390c281640e0b8a30f3d6982ab9ada92a67b634f8164b4021a28
 EBUILD curl-9999.ebuild 10771 BLAKE2B 48c610c3ea379320360d48a6473b9db17f7d8ffb895fde8e602e14822f5d8d56d2a9fc499f1302a4bb941581a9b8e082b1aa799222c8aa9c9faf546776ba671a SHA512 9afd073cdbb994726349e8ffd33ab994e64b0fc1f19574343bb0f22953dbb16471b332271478bf0d016c709f82acdf633075c9b55daf286dea9ffa5a927bb6de
 MISC metadata.xml 2090 BLAKE2B 54d366aadfc25650c40081ff10eb150bcb9811a29f802c418afce166c384e2bafc999ff7e69ceeb25a96e952d4875d808e8e89240b437741cd363fab46267a25 SHA512 2103a849b67f9a14a85eb769b870e7272bf8f9c78ca579b4271150be01f26787a884614bff874d50f90be99af4a6ecb136510fca2837463e0bc91611ddbeae40
diff --git a/net-misc/curl/curl-8.7.1.ebuild b/net-misc/curl/curl-8.7.1.ebuild
index e6b8c7c3b407..cdb30b15df5c 100644
--- a/net-misc/curl/curl-8.7.1.ebuild
+++ b/net-misc/curl/curl-8.7.1.ebuild
@@ -17,7 +17,7 @@ else
 		https://curl.se/download/${P}.tar.xz
 		verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="BSD curl ISC test? ( BSD-4 )"
diff --git a/net-misc/r8152/Manifest b/net-misc/r8152/Manifest
index 293e1b877eb3..df4c9a4481fd 100644
--- a/net-misc/r8152/Manifest
+++ b/net-misc/r8152/Manifest
@@ -2,8 +2,9 @@ AUX r8152-2.16.3-asus-c5000-support.patch 581 BLAKE2B a502be8abc3e714fd6c1d90447
 AUX r8152-2.16.3-kernel-5.19-fix.patch 1599 BLAKE2B e1300601e2dcd98729481a6d146ffcc0b55e6163c405608ed783bc56acca65654317804c1da780203d96945b49d815b6efd740a752335d4c0aa562f2ba84bbf3 SHA512 6cdb4ee02c6727d87d94fbd4058b7bbd18e3bb4542c2489d4080217ef323faddbf5b998a83dd42b8e1a1e4c1eb6f65762616382fc5fd8519db07d6dd01f83b4a
 AUX r8152-2.16.3-kernel-6.1-fix.patch 1473 BLAKE2B bebafaeaed61bff9ee058ddc64fef6299703bdf9b0c2cd086c86643b362122a8d691577963b9b64f45729bfa4e72f09fe33d6c61fc195d0675bdcd7affd63d7a SHA512 4c5115946a1086d88bc19aa556782aec45fc05f3e38fab8255bb13a863bd2744c08bca0fd6ed72da8c5171fe801436665f4b10bfc22203c500460942a0a6db2d
 AUX r8152-2.16.3-kernel-6.4.10-fix.patch 731 BLAKE2B 2d7820d7dc749bdd4dbbb165116135af2d6831f17b4721afc9c37bbd078f6915cc6c44ce9cb77941ffc52a399a6065269a578128b2c1bb0823658972f8f81dc2 SHA512 a274fc2d5f998ba0c6bfad74c0a56d50c9b146abe012fdd5eebe9719615876e63f55203f3dcf17397e4e28040cd0b253ef861e2cb9636da9c1d050fa844c226c
+AUX r8152-2.17.1-kernel-6.8-strscpy.patch 1298 BLAKE2B 057d7c31115e5903b040f53c964e62d79a3e05308d5b8b072ca6fbf4a3c08e13dc9975e0ca0b6f6342f9e70fc0c957e642ac6d9fdd9f7d915eb7ca7fb24e405a SHA512 4f19815e4f3f9bb3f7934fc13b7c912ab044270512c887b6c89f1409131b73d248d1462c7b1a464eb7e16c590e99bfe46032b36ca5b676896e995964d66d1028
 DIST r8152-2.16.3.tar.bz2 73331 BLAKE2B 9e22ee6d9d0197def782f77bfd0c88a2d8827d4f8cc0bbb1a6583ab67533cd07ba79a16cd9350272ed18c733fe809ea1ff70596627abdc65d452bdf817628bc8 SHA512 c37bf5199d3a857c9a7a12f3aa4ecfe9c04b49413aea862a053ebee24c137cd35769e5d5cc7e2bb7dd3bf9057f51ffada0b4e0c53cb3d417e05c8e3fc830705c
 DIST r8152-2.17.1.tar.bz2 75156 BLAKE2B 05b55ea17a579add9a9abee89db490685086bfe29aeea6cbfbdbb63a81dbee4d1cac151822c178e52febe4bee14a3b5deb20737f671fcdbc6dd6d01938b1d18c SHA512 e465b524ee8aaed12da8258195fb8a4c9fea0862812c1ab268e31ad6ec61444c4f4332d643124063b389fd1df7a271c6c057537d4cbe67188a1a2262b4793f42
 EBUILD r8152-2.16.3-r1.ebuild 1290 BLAKE2B 82d4ebe9fc9bca31b9a1307eae719745e7916c5d694a052e2e41c0178f2d18947d270ea19564347f8847f33dad132b9b4af1fb102e3a0b8e10ed87cfcdb0e4be SHA512 460cef4288683e56e13885a1a3bbc588b4816a9770bbffb22b81e980c50f9848b7cb15b5808ba88a204d0e5ad8372a8e741fc8617efac2e1b3cffc6309a802c3
-EBUILD r8152-2.17.1.ebuild 1192 BLAKE2B cf28c8f07c91c9df444ef70d93827511a43cd0eb8e7e1dce18cbaad31c217cc260eaf9e92c52a481d6e38bc7c06a3db21af9f099f977fa6405bcea92c0e8d70f SHA512 249e189f06f3669d0c2d97431d1a8f9f1263a749fb966f8cb7699774bb8c9d11855a5c811159c60cde751b06cc0d8bfb5c49a0aed0bb3f051b4414aff0170a00
+EBUILD r8152-2.17.1.ebuild 1245 BLAKE2B bb767448e83df2c8640591fbb0c9d9c250ffdd89f691b167105529e5cc42c3f845b148f7eabeb1d419f96f4b5943e92adb5cca9f9d2acc1100f0f1245d0ee065 SHA512 2cda05f85a4031618d0ab942d6c67a91790cfca6b4e4fc2488ce534993543ee1bb7a20e6d6c24513e314fe5fe580c892d83cfc34807b083c418392b30e07ead6
 MISC metadata.xml 660 BLAKE2B 1f7bd7d75e5fc3b88b140f88b82390b09cbffed8770b73b4584f7d9114fd1b97a84f745881d424f30c1a738c332bb04bab3d651bd9734f0170164eb8158ef098 SHA512 c0258ae24671a18801a9a499869267b2c3d2d0350e1fbbf91db6fe2358326bb27551623ef93c9c9a9bebde3c08520463eae00a05802053a0f5b7ade1b0f5ea4d
diff --git a/net-misc/r8152/files/r8152-2.17.1-kernel-6.8-strscpy.patch b/net-misc/r8152/files/r8152-2.17.1-kernel-6.8-strscpy.patch
new file mode 100644
index 000000000000..2449d2883346
--- /dev/null
+++ b/net-misc/r8152/files/r8152-2.17.1-kernel-6.8-strscpy.patch
@@ -0,0 +1,32 @@
+Bug: https://bugs.gentoo.org/926829
+Patch from Christian Bricart to remove strlcpy and replace with strscpy
+so this builds with linux kernels =>6.8.
+
+Signed-Off-By: Jay Faulkner <jay@jvf.cc>
+
+diff -Naur r8152-2.17.1/compatibility.h r8152-2.17.1.patched/compatibility.h
+--- r8152-2.17.1/compatibility.h	2024-03-12 09:43:05.150688533 +0100
++++ r8152-2.17.1.patched/compatibility.h	2024-03-12 09:46:20.913759268 +0100
+@@ -18,6 +18,10 @@
+ #include <net/gso.h>
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
++#define strscpy strlcpy
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
+ 	#include <linux/mdio.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
+diff -Naur r8152-2.17.1/r8152.c r8152-2.17.1.patched/r8152.c
+--- r8152-2.17.1/r8152.c	2024-03-12 09:43:05.130688336 +0100
++++ r8152-2.17.1.patched/r8152.c	2024-03-12 09:45:13.264694513 +0100
+@@ -19691,7 +19691,7 @@
+ 		uinfo->idVendor = __le16_to_cpu(udev->descriptor.idVendor);
+ 		uinfo->idProduct = __le16_to_cpu(udev->descriptor.idProduct);
+ 		uinfo->bcdDevice = __le16_to_cpu(udev->descriptor.bcdDevice);
+-		strlcpy(uinfo->devpath, udev->devpath, sizeof(udev->devpath));
++		strscpy(uinfo->devpath, udev->devpath, sizeof(udev->devpath));
+ 		pla_ocp_read(tp, PLA_IDR, sizeof(uinfo->dev_addr),
+ 			     uinfo->dev_addr);
+
diff --git a/net-misc/r8152/r8152-2.17.1.ebuild b/net-misc/r8152/r8152-2.17.1.ebuild
index 7d3f7b0a6e6e..992571ed39c9 100644
--- a/net-misc/r8152/r8152-2.17.1.ebuild
+++ b/net-misc/r8152/r8152-2.17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,7 @@ IUSE="+center-tap-short"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.16.3-kernel-6.4.10-fix.patch
 	"${FILESDIR}"/${PN}-2.16.3-asus-c5000-support.patch
+	"${FILESDIR}"/${PN}-2.17.1-kernel-6.8-strscpy.patch
 )
 
 src_compile() {
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index e980b3856f5d..1067cff84d29 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,5 +1,5 @@
 DIST Remmina-v1.4.31.tar.bz2 2078380 BLAKE2B daee0b68305e3ec0eedcc8cb3622ed5649303562fccd766bf5cc6ed1e96f27c1608286afa1b9bbaf44480bdc210f71a863bf442974ebbc1c50ebfbcf2dfeea35 SHA512 288e7fb5b5251d251e9502ec310f2bfe526f1a28a91c9dd9e79c712191c5d2b287844bd994596dc5097ec50ed8282d0af11144f6c5f0a74cb444aa4c6a8f6838
 DIST Remmina-v1.4.35.tar.bz2 2150047 BLAKE2B 3ba730cd4009a797ee7d66bbe4390e9db221ee5cf0b008e0eb3df4a992d7260ddc65983c8c34d1aa1bb2190ed1104653e269369565d7e4eecaf3078ffc84330c SHA512 36dc419b4473c71f6b3e53338f4a3cf7a1fe60534ea0dce375b4c9fd00cd9d8a618c4376be4d031bdee1eed8b4aade4538a6cc414629ef6dde41cdcd513a6d36
-EBUILD remmina-1.4.31-r2.ebuild 2544 BLAKE2B 66a3858c02564b0c416770004510df6cfe9c20ea3fe167c556fe7ab2849fa953b4e1d8060a6898e86f5e86c163aa9f39af5ce3ffbe39b8c836299b014c9fdf7b SHA512 bc2768dfae0fe07d93e14d07aa14f46f54d481ee56fe306e3d6b6d0f05b38a4817f5f8d20ed65746ab78c0f5eb800d4c9c0131edd245633c8af406c6ff074f6a
-EBUILD remmina-1.4.35-r1.ebuild 2526 BLAKE2B f207747d1a6805bf5ec65d38c71d547d2d45be28baa87f5193141c7905741ce84c1b994133101d60cd97688bdecfa52a053ccce037b0f4ef4625a5204b362680 SHA512 34ab5514ff116fba63af293273a742a26b314fd104285eadc7eb33287853e1b3a27b946dd22c16ddaff1f6b90c98214eb46f6e412754f9d59f1025566fac3b16
+EBUILD remmina-1.4.31-r2.ebuild 2533 BLAKE2B 201fd4b935a44a984d6172f7736b8482df8024e99f360c006d6276ab61f48af7ddfca4714f89175f2b959547de58f55f2cb04791462d4993df688b44dd87ec17 SHA512 77124daa925d55d6e590987bf4b7179228cf7fc23de84e91685aa6a51240885bc5ab409f8a7aaf5d8bb66b94e2e156a167602f73dc610b22c8b3675f5020a773
+EBUILD remmina-1.4.35-r1.ebuild 2515 BLAKE2B aab99547da3a46f2e0696530c3bae767c84e468379393d22d11d56c08756e1023e4a500bd841de59d54c864c669f4f9715bf663d47bfd3d49af1a90e8bdae5ba SHA512 3448d529ae13761efff3191ae6d329fdfa60ba93bcec04efc6b148e0b69382eea9be5dd50083959582b64ea4ce4f4e5b1891fac5cb925679d83125d4af4b0158
 MISC metadata.xml 1123 BLAKE2B 658714c247c6fbec6118a88bc5493a67aca30e949249407d421592b956c15b439b6d96c682d2d6d7cc9f1eb2dfdcc902c4c463c6a208af4bb9196656723f220a SHA512 cbf00348e2da27acbe9890ac2d6b19d5731496cf1aab303d64f036700fb779587cb7fe81a95d3a25f9ec5dcb79e2e7e880e345fc1ac267acd25da89844ab6f21
diff --git a/net-misc/remmina/remmina-1.4.31-r2.ebuild b/net-misc/remmina/remmina-1.4.31-r2.ebuild
index e9fb311faaf7..d1554f95410e 100644
--- a/net-misc/remmina/remmina-1.4.31-r2.ebuild
+++ b/net-misc/remmina/remmina-1.4.31-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit cmake optfeature python-single-r1 xdg
+inherit cmake python-single-r1 xdg
 
 MY_P="${PN^}-v${PV}"
 
diff --git a/net-misc/remmina/remmina-1.4.35-r1.ebuild b/net-misc/remmina/remmina-1.4.35-r1.ebuild
index 1951abdc4d5d..5ff20d98dc90 100644
--- a/net-misc/remmina/remmina-1.4.35-r1.ebuild
+++ b/net-misc/remmina/remmina-1.4.35-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake optfeature python-single-r1 xdg
+inherit cmake python-single-r1 xdg
 
 MY_P="${PN^}-v${PV}"