gentoo auto-resync : 10:08:2023 - 03:31:29

3 files changed, 33 insertions, 1 deletions

diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
index 77fd1355383f..1d324fd2081b 100644
--- a/dev-util/crash/Manifest
+++ b/dev-util/crash/Manifest
@@ -1,9 +1,10 @@
+AUX crash-8.0.3-strlcpy.patch 843 BLAKE2B 6e1fad896042099a63e9f5047cfdafa680cfb2ee08ba0bc5960cf0a836e98a2dd059851cd4dd88688df62c814f6f1c2cd1598a08f8cef37cf40fc7987d4ee1fb SHA512 af927a1fcd39d730bb976fcfc5fb8c8b15962f69d3ef3023900a6876cfd8bbc571be4d56e86a59f992f2eb1945588dc77e9110bedfe60f88de5b372a76b03e2f
 DIST crash-8.0.2-extra-0.tar.xz 19716 BLAKE2B a87e499314f80babb249c45e613f890b7d157e40ffb42a728cc96913b46c81deee91b79b296b1153ce6c69bb96d22123ad5c54481153ed5bc6be74965a76b298 SHA512 00eeab3fa73e2cc4283d6263fd3d743832dc66a705207a3cb347d1c4735d9f2ba8bcbd3e9739a20878d3b8438cec9d12742049186a9f1d4ac0bfb7a27b4c31bd
 DIST crash-8.0.2.tar.gz 1298881 BLAKE2B 120b68cfd0ae07b9f1e302a549f2095c2d9cd83cd5281b55b7d3e96242c6ce85db94afb6980f89ee14dc395d5d48dec0514349142e7dd33665ef331ed2bd987b SHA512 9ff24d1206e9376e83690f76c817a48a68ff6adce677fad70335a73550a59c9af6e4753c1199f22eafa60c137156313244bbf98ed01bc2b066f41d324738ef6b
 DIST crash-8.0.3-extra-0.tar.xz 696 BLAKE2B 1a90e1b7ba87188cd438e8f9ca17276986b6fdeee00804a3dadf2979bfab0769bcf7df3bedaba75bdf9297eeb013929ba6ea0b98b228fa51d9a7fa09a77c01cf SHA512 c0f29c3b13ccbbc8a0c3366ec75797501c141e3c9c1085dbea1bec89e1b35b837528fabf0fe031e0cb2d725780bffb71e1f27657e75dd9aa2f0c4bc625d251b2
 DIST crash-8.0.3.tar.gz 1330456 BLAKE2B 0e277033ff16f2080af630fded3a2d458d580c9aafe1303e5cc291d39ca33a10fe942eb8f33308b2734494ad83913df45e8c192a2aab47f4473dffad777b57a2 SHA512 1ce7fda89274051cea02a049a674f2ca43fc02e00121f951af0d4c23c7b74cc79949ec376bb6737f82b95fec0cbe495b53a09df7e5f1f31ee5a829c1d53d0ba0
 DIST gdb-10.2.tar.gz 40267550 BLAKE2B cee3ab45a52ed378fc718e49c4d153393200fd1b85306888e4085919ab27277bb85d66f9297e6d0aaa1fb47d65fc31d4b97a2fc476e2ccedd4dba0fbec778ab4 SHA512 aa89caf47c1c84366020377d47e7c51ddbc48e5b7686f244e38797c8eb88411cf57fcdc37eb669961efb41ceeac4181747f429625fd1acce7712cb9a1fea9c41
 EBUILD crash-8.0.2.ebuild 1675 BLAKE2B cafb83bb7a1fffa4bcac72bac03f6f521bc87c4753ee1b1a971d95b0cc1b8c119337968ce766afed42fccc2ffcf87df8802b72f6584890ced95488c524befc08 SHA512 805a982d7872efe4343f1571170712a69a9f5e409fbc15ca398d5eec862fdf809141276795442a3d655eee77012190c842dcb21faa864f503c8138f7bd820388
-EBUILD crash-8.0.3.ebuild 1675 BLAKE2B 77f16b4107fb89f6a21e3ffb79044b4b864bb07ce260de73c1bc95032783c2aed0b71648507a31170489b85125006d3fe0671a64757ebb8360bc16c80c76d664 SHA512 24a4628e8306161c546128163d325d77619d0e230ad302e95f28c1282c2934fb78e4f3790fb248755478c19f644badd63ccfbf316f5c6de51b252d28f9d4b89a
+EBUILD crash-8.0.3-r1.ebuild 1790 BLAKE2B 570bdee8d39eb6472894a2ddcbf88c2e1817c1f594781e467773b77c4f3f17bf32936a2175e3c31bd0c91b1711472d1fbdf923988489d75e6892c5febe662dc9 SHA512 3f23b2e85b0954c6bce344459581936149610463263083a63242cdd85711bbe69233798b1f337833249ad47bc6bb8f4415ffa25bc3c56906ee6d7b6e3ebf515b
 EBUILD crash-9999.ebuild 1051 BLAKE2B dc00010d83da71a08cc149a223e512689db4904a68e7dcfe0316becbb1ba4cee349f013805559a1d2326d7be77005f0dc8b953d497e5f0b8f90669992cedf07b SHA512 865d0b6d2ce1ccb6924326772607ca5f60635a31e53730a69a8f5394902a1738b29bda934e22dbdf0ab02dc17c64e91d9f24ab780e73f3fd24dff98673c1ac0f
 MISC metadata.xml 725 BLAKE2B aa1069adb8920a1a083071898391a4544489b3ba5d177160e2e0bf53c1bf88da930fe6da700dfca263f4bb381d01194da156b28b6e05d251bd3e9d3b45f6aa21 SHA512 6d5757aae00249a9f62c67c15ac032c9b3275068b14c02f4edeb425910ce1cfaf8a135ef49356e78ba2c836c627b576f4b45bdc8b8f8131d38175d9e22660912
diff --git a/dev-util/crash/crash-8.0.3.ebuild b/dev-util/crash/crash-8.0.3-r1.ebuild
index 8255200bc2b3..e2c69feeeb4e 100644
--- a/dev-util/crash/crash-8.0.3.ebuild
+++ b/dev-util/crash/crash-8.0.3-r1.ebuild
@@ -37,6 +37,11 @@ IUSE=""
 # make rules catch it and tests fail
 RESTRICT="test"
 
+PATCHES=(
+	# bug 911929, patch already in upstream, drop in next version bump
+	"${FILESDIR}/${P}-strlcpy.patch"
+)
+
 src_prepare() {
 	default
 
diff --git a/dev-util/crash/files/crash-8.0.3-strlcpy.patch b/dev-util/crash/files/crash-8.0.3-strlcpy.patch
new file mode 100644
index 000000000000..0701f99470a8
--- /dev/null
+++ b/dev-util/crash/files/crash-8.0.3-strlcpy.patch
@@ -0,0 +1,26 @@
+diff --git a/defs.h b/defs.h
+index 8f7d1fa..26afe23 100644
+--- a/defs.h
++++ b/defs.h
+@@ -5553,7 +5553,7 @@ uint32_t swap32(uint32_t, int);
+ uint64_t swap64(uint64_t, int);
+ ulong *get_cpumask_buf(void);
+ int make_cpumask(char *, ulong *, int, int *);
+-size_t strlcpy(char *, char *, size_t);
++size_t strlcpy(char *, const char *, size_t) __attribute__ ((__weak__));
+ struct rb_node *rb_first(struct rb_root *);
+ struct rb_node *rb_parent(struct rb_node *, struct rb_node *);
+ struct rb_node *rb_right(struct rb_node *, struct rb_node *);
+diff --git a/tools.c b/tools.c
+index 392a797..0f2db10 100644
+--- a/tools.c
++++ b/tools.c
+@@ -6795,7 +6795,7 @@ make_cpumask_error:
+  * always be NULL-terminated.
+  */
+ size_t 
+-strlcpy(char *dest, char *src, size_t size)
++strlcpy(char *dest, const char *src, size_t size)
+ {
+ 	size_t ret = strlen(src);
+