gentoo auto-resync : 15:02:2023 - 14:01:08

3 files changed, 66 insertions, 1 deletions

diff --git a/dev-util/scanmem/Manifest b/dev-util/scanmem/Manifest
index e5ef9e4c6a9b..6bb1c015d331 100644
--- a/dev-util/scanmem/Manifest
+++ b/dev-util/scanmem/Manifest
@@ -1,4 +1,5 @@
 AUX scanmem-0.17-musl-tests.patch 1321 BLAKE2B 2ab513443d9cbe62f82c021d7235f8f64912a49e3d24be1a8cb99297a04fffb146b9e71d84f390688b2a76cf9903e65f1c60c47267149e2434da3e0fe41fcdb5 SHA512 78a8571012e95c99326cde10085076afd591bfac1ea2f7a7d2f59f480d5add5e6f992a63aa261dc602efacdc6dd44a0bab05c000d827f72952a3d09e029d36ac
+AUX scanmem-0.17-musl.patch 2674 BLAKE2B a7d78a52d5201b1a59e4572b59285530d35b43630b4721f9d4c0d9bc1003363b62c26ba95b95da224c29d7a3caedf1982dc85afdf52d86188a1bf5d48d2a8a14 SHA512 3cc85e681037e38dcbf8d613ef22b1e8765df912a8c590af7249c484d932a6a280a4290951a3c27e40b2002b2c21f0662d99e665a463f3f785bf2a3192b3d696
 DIST scanmem-0.17.tar.gz 220489 BLAKE2B b1ae07f96fd736e9ca6a5d55ad2d6b06b7d0dc4828915e0f2adaa2d58b053d9734ccd7425fb5391289249f838773cf3f9a81dbe76bacd42f41203d27dcffed05 SHA512 6d74f3d1d3492d41cabc342cfd1189815536dcbd57857d8a92e05c5dcaebcb9b1df886aee706c56eaf3344737070ea0fe852eef164ef3fe7907f66c626d8523e
-EBUILD scanmem-0.17.ebuild 1130 BLAKE2B 659ff18a40d92486b8e2f9d6a5df331fac40fb07811f6980bed606903d58e31357e49eb903ebe70e8d0f4b6aa657dd559a776c9db0d2e41a0e17701e4596bf5d SHA512 3efd337eeb02aee519578e9bf7e719bb689b2a5dd39ed9c9662c837237d58c949c70e58ce2e761a233f5dc9b18c8766ec00051394d77b5a5275d55e97050c173
+EBUILD scanmem-0.17.ebuild 1167 BLAKE2B 4150352de1c7af06025d4b0c9ad8af4d3b28b77a2582029142230fcb06907ed0da814787946e56292bca0b537fb2c1c36264fddeb03670a37c0aded81e60da78 SHA512 88ea1fb00d725c304c08ff0fad1339aaf046f66a215708f6560c7806ccf7f78a80fe2cf8afb1c45906ef8ded2c6505ec7bf70d25a79e9d7daf0bae201f12d93e
 MISC metadata.xml 318 BLAKE2B 081a868e03192346a1d251caa782751d0cdc831607a57bc08b67df34737496152df6477d769da51fcfac1a2d81aa419c2e8588b27cd3f89c5dd91eb84b0f88cc SHA512 eafbe8d2c6d06413368968db5aacd89981ad7963a04b5870601c7defb9ffb515a8398ca9a8182ad10cf23d05f8fd2d7c0f681811391cd2446bd1ccc1bc9fe34d
diff --git a/dev-util/scanmem/files/scanmem-0.17-musl.patch b/dev-util/scanmem/files/scanmem-0.17-musl.patch
new file mode 100644
index 000000000000..d439b1d4abdc
--- /dev/null
+++ b/dev-util/scanmem/files/scanmem-0.17-musl.patch
@@ -0,0 +1,63 @@
+https://github.com/scanmem/scanmem/pull/425
+
+From bda8b19d3020450518ea87f89477a947c47a85ce Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 15 Feb 2023 09:43:56 +0000
+Subject: [PATCH] Use 'unsigned int' instead of unofficial alias 'uint'
+
+glibc headers have 'uint' typedef'd to 'unsigned int', but this isn't
+guaranteed to be avaialble. Change to 'unsigned int' which is equivalent
+to fix building on musl.
+
+Bug: https://bugs.gentoo.org/854840
+--- a/ptrace.c
++++ b/ptrace.c
+@@ -317,7 +317,7 @@ bool sm_checkmatches(globals_t *vars,
+         match_flags checkflags;
+ 
+         match_flags old_flags = reading_swath_index->data[reading_iterator].match_info;
+-        uint old_length = flags_to_memlength(vars->options.scan_data_type, old_flags);
++        unsigned int old_length = flags_to_memlength(vars->options.scan_data_type, old_flags);
+         void *address = reading_swath.first_byte_in_child + reading_iterator;
+ 
+         /* read value from this address */
+@@ -639,7 +639,7 @@ bool sm_setaddr(pid_t target, void *addr, const value_t *to)
+ 
+     /* Assume `sizeof(uint64_t)` is a multiple of `sizeof(long)` */
+     long memarray[sizeof(uint64_t)/sizeof(long)] = {0};
+-    uint val_length = flags_to_memlength(ANYNUMBER, to->flags);
++    unsigned int val_length = flags_to_memlength(ANYNUMBER, to->flags);
+     if (val_length > 0) {
+         /* Basically, overwrite as much of the data as makes sense, and no more. */
+         memcpy(memarray, memory_ptr, memlength);
+--- a/scanroutines.c
++++ b/scanroutines.c
+@@ -369,7 +369,7 @@ extern inline unsigned int scan_routine_BYTEARRAY_EQUALTO SCAN_ROUTINE_ARGUMENTS
+ {
+     const uint8_t *bytes_array = user_value->bytearray_value;
+     const wildcard_t *wildcards_array = user_value->wildcard_value;
+-    uint length = user_value->flags;
++    unsigned int length = user_value->flags;
+     if (memlength < length ||
+         *((uint64_t*)bytes_array) != (memory_ptr->uint64_value & *((uint64_t*)wildcards_array)))
+     {
+@@ -470,7 +470,7 @@ DEFINE_BYTEARRAY_SMALLOOP_EQUALTO_ROUTINE(56)
+ extern inline unsigned int scan_routine_STRING_EQUALTO SCAN_ROUTINE_ARGUMENTS
+ {
+     const char *scan_string = user_value->string_value;
+-    uint length = user_value->flags;
++    unsigned int length = user_value->flags;
+     if(memlength < length ||
+        memory_ptr->int64_value != *((int64_t*)scan_string))
+     {
+--- a/targetmem.h
++++ b/targetmem.h
+@@ -257,7 +257,7 @@ static inline value_t
+ data_to_val_aux (const matches_and_old_values_swath *swath,
+                  size_t index, size_t swath_length)
+ {
+-    uint i;
++    unsigned int i;
+     value_t val;
+     size_t max_bytes = swath_length - index;
+ 
diff --git a/dev-util/scanmem/scanmem-0.17.ebuild b/dev-util/scanmem/scanmem-0.17.ebuild
index 040ca95abdfa..40caaa6b24f9 100644
--- a/dev-util/scanmem/scanmem-0.17.ebuild
+++ b/dev-util/scanmem/scanmem-0.17.ebuild
@@ -27,6 +27,7 @@ REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-musl-tests.patch
+	"${FILESDIR}"/${PN}-0.17-musl.patch
 )
 
 pkg_setup() {