gentoo auto-resync : 16:08:2022 - 02:29:20

3 files changed, 32 insertions, 2 deletions

diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 2a28735f6a44..372e09da0568 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,4 +1,5 @@
 AUX audit-3.0.8-linux-headers-5.17.patch 1832 BLAKE2B 15d82a6c7c964f14414ca34ed09d4251c331497e9aae1f0cbb54398bef02a5be0eadbdee90b3bb26ac90e8b9825bdb09c01bfcea61cd99b905f508c08578a9ba SHA512 76a7f958c1523f3441ad9206f1bc58e71d81f992f64c06c69f705c8bdc535dff5078fcf89b93b195fb8a437079f27f0b75b7b1a2f12c16be309daec108b6c72b
+AUX audit-3.0.8-musl-malloc.patch 1359 BLAKE2B 4a3b4a330ddf68226d5c5139f27444df7a155dce689de98e699a48fec86a0269775ee52d683c9bc88a84883e5d602138d6d928c0188e3e7b53c4c9f9cc2a1cc4 SHA512 22fe3410e9f34f7513618abe2904ab73977a947fd831569cd340fe2427d39cbef6b632aba7bf73d01ac82dc7f98c7dd576025ca29aec72782b60e3a2258913d5
 AUX audit.rules-2.1.3 1009 BLAKE2B df40176208bd68cb9021d15ea5803bb0d1c768c9d6400036a69409e1aae3ad55b89983ed94f22a6399a9cec8fc3dc7b20a7b27e75cdea24edda92b95ee19af87 SHA512 bce3ee9aaa0ab48395e6e10ee9b3627d6b7a8083abefdc4009de26649c65a39e000078f799e8c3c9e3341dfa030c6dfbbcad2fb7756fbb3d01b27be078adecec
 AUX audit.rules.stop.post 452 BLAKE2B b10d6d6c0fa475998856e674bd5c8dc0d7ca8f1d676a684223f48d1b22ce90441b2970c02b0eab882b3d3059f2b350d8a34109b03f5457f709624dccb3722e82 SHA512 a7bc52cbbea278a38e2837149524bb21b2c5367c96ed07fe576e08322595c5bee57ff07f8ebecd17391d9c3abe1ba187ac6e39400a153bf0ace4257303d036d3
 AUX audit.rules.stop.pre 427 BLAKE2B ddf4ac16c3e1fd401c266287e792865adf8f4dd0b4bbaea6f991bf8dcee69c8ecd69c93d0cbd8352e280c3c61d24de23ca89f700e383c79036526e59c311c004 SHA512 def5ef378ad554f38754839d1c00c598686645a59896e37a3c7ff07b00aaa05a2b92305e49a750358eaba63a7d48fb647472529b155301069771678eed272463
@@ -11,5 +12,5 @@ DIST audit-3.0.tar.gz 1109442 BLAKE2B f9c94f7163522068f5f37163a242cb913acc87b546
 EBUILD audit-3.0-r1.ebuild 4193 BLAKE2B b80c5342026738e6ca0c6cd3fc15970a636d78b5d8d5fb41e2d85e40aae61a830d60335aa04953790ffbb32fd7ecea26668f12e90d00e9e54fc55651ea2506e3 SHA512 756b57242b3538abed90030601f617083583a9099fb147b033307077201731d9a88c592df44c43d9555226c43358eceaa7e37fb7623b20117972c3e9d07171ee
 EBUILD audit-3.0.6-r1.ebuild 4134 BLAKE2B c66951f7b6352064199e019ddd3c3a1c4579866105839478ad361b3aa4109b1449aa7e3c38fbdaf14806c16a359154d6e8df1662558623c82e38c1bfd1ced8aa SHA512 17953316937cd12d5d37cfc37d5e58159f183ab422489c48859f586e675df806b9508eaa5a4166629d0a303fdf163b2a84f071c795501a9d9839b2ba02abc9ea
 EBUILD audit-3.0.7-r1.ebuild 4162 BLAKE2B 5bed15175ff989f34cc1a65981dda6e8550f1e395ddedf07d90b4f74e1ad2264c6f4d42b7881d295327152f59ee77422f036d9cd442e643fce8a94f10774564c SHA512 51fa4a90fbdd49c7c1d102a57caa8925551efc3ea87ae9f50326ee4f8ff71be500889f9657444ffe82eaefde6da4a9511d993090253b0aa77e8e30b2f1da55a1
-EBUILD audit-3.0.8.ebuild 4552 BLAKE2B ce00afb66b1850635f0670a3fa40c4125c0dfa8e1cd508fa2c81d228998b48fc82f68b5c3e0314c51b6568d48b8001419503a44ff486e83e08b636c80566b85c SHA512 ed67e2bc68f5b51153eb12a9014ab4046f121ca8224bf3a55b56581ec32ba0d5b95245194b9393d285d99e5c7eb625b5e479a779ed457201e4971a1fa0811188
+EBUILD audit-3.0.8.ebuild 4599 BLAKE2B efff1705308c4becea3333796ef1c9b3f95bcc10df383085b7faf4867f43e4d5ac75f324109a475893eedcf24cd0691e5154ff06dc9f828b7ed6b00d93b03206 SHA512 9de53cd51187216f01efedb8f0701630fe8bb292359a5aa649745bcbb5c71fe23a032c1b54d9804c3ac0c9fc36b724c37b71d638600f7355d0ab7b12df891905
 MISC metadata.xml 457 BLAKE2B 2d18aba4c1e67e285691ed949808ebe7de2fddecb008eb16c1f8615d16e044fcfe3e81cceb30d325c4338462872fd2c436625a0d4eeefffd51cd074b1b5b4514 SHA512 809ea56f90880760e4b7ed180930af44f68b1ce5457fce2063969feebb22f02c8156bcc248cb885878e4d98848a2a5e91c194ac6f9fd54d8a88501e0c2d25ea9
diff --git a/sys-process/audit/audit-3.0.8.ebuild b/sys-process/audit/audit-3.0.8.ebuild
index 4c4bfe08a040..44a6d4ffd6c5 100644
--- a/sys-process/audit/audit-3.0.8.ebuild
+++ b/sys-process/audit/audit-3.0.8.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 	# See bug #836702 before removing / verify builds fine w/ USE=python
 	# with latest kernel headers.
 	"${FILESDIR}"/${PN}-3.0.8-linux-headers-5.17.patch
+	"${FILESDIR}"/${PN}-3.0.8-musl-malloc.patch
 )
 
 src_prepare() {
@@ -72,7 +73,7 @@ multilib_src_configure() {
 			mkdir -p "${BUILD_DIR}" || die
 			pushd "${BUILD_DIR}" &>/dev/null || die
 
-			ECONF_SOURCE=${S} econf "${myeconfargs[@]}" --with-python3
+			ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" --with-python3
 
 			popd &>/dev/null || die
 		}
diff --git a/sys-process/audit/files/audit-3.0.8-musl-malloc.patch b/sys-process/audit/files/audit-3.0.8-musl-malloc.patch
new file mode 100644
index 000000000000..17814dbe29fc
--- /dev/null
+++ b/sys-process/audit/files/audit-3.0.8-musl-malloc.patch
@@ -0,0 +1,28 @@
+https://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch?id=ad978133a1a10d609bb2545882a2f720a2572f3d
+https://bugs.gentoo.org/837275
+
+From 79c8d6a2755c9dfa00a5e86378e89a94eef0504d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 9 Aug 2022 23:57:03 -0700
+Subject: [PATCH] Replace __attribute_malloc__ with 
+ __attribute__((__malloc__))
+
+__attribute_malloc__ is not available on musl
+
+Fixes
+| ../../git/auparse/auparse.h:54:2: error: expected function body after function declarator
+|         __attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
+|         ^
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/auparse/auparse.h
++++ b/auparse/auparse.h
+@@ -51,7 +51,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au,
+ void auparse_destroy(auparse_state_t *au);
+ void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what);
+ auparse_state_t *auparse_init(ausource_t source, const void *b)
+-	__attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
++	__attribute__((__malloc__)) __attr_dealloc (auparse_destroy, 1);
+ int auparse_new_buffer(auparse_state_t *au, const char *data, size_t data_len)
+ 	__attr_access ((__read_only__, 2, 3));
+ int auparse_feed(auparse_state_t *au, const char *data, size_t data_len)