gentoo auto-resync : 25:06:2024 - 00:12:20

3 files changed, 31 insertions, 2 deletions

diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index c81d89c54756..d11ca9c656ba 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,5 +1,6 @@
 AUX audit-3.0.8-linux-headers-5.17.patch 1832 BLAKE2B 15d82a6c7c964f14414ca34ed09d4251c331497e9aae1f0cbb54398bef02a5be0eadbdee90b3bb26ac90e8b9825bdb09c01bfcea61cd99b905f508c08578a9ba SHA512 76a7f958c1523f3441ad9206f1bc58e71d81f992f64c06c69f705c8bdc535dff5078fcf89b93b195fb8a437079f27f0b75b7b1a2f12c16be309daec108b6c72b
 AUX audit-3.0.8-musl-malloc.patch 1415 BLAKE2B 0b3a9ec80ed8b445e4d5eea0b9f49f4e5a165ac538b7769305b9107be0874ee9b50f30ea13f77d1b9d54a35ada15a0dfd07e5b905f03b4df3834a4904dec4b94 SHA512 152674f0000a14d7e13b31c1b6cfc0bf48f94f56eb2a1d52e5aa2e306264c507dd1410b7a1457195578bce734ae9ac7f9ad3e10006a8451450b6d8bf6592a8d6
+AUX audit-3.1.3-musl-malloc.patch 890 BLAKE2B bfe6bc484ed86af5c9bb03d53d5ba05c47a7e342665be02cb1ec23c00e7c1bdf1876021f3f787584c0685cd6b8a2f733ab9cbf65840fd161898d4a2b74d28412 SHA512 03c84792fa4dd3e4b9310b7e95247d1a8772e202c265b7f3272e57016b2b796b2bf71536a7e31143ad972b203d4470804288b9b973e3239670329ee5ac11cbca
 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
@@ -10,5 +11,5 @@ DIST audit-3.1.2.tar.gz 1219860 BLAKE2B dfdec470bf12cce6c570b3d260e65e2b49e8ac07
 DIST audit-3.1.3.tar.gz 1225761 BLAKE2B 97ee35fc722083d541e164b27fd318ec7be2a4e4e8774767d14c6a2e800092a37b7042a272db5d208c913fb36d295c5343bd6082237caf0fb561ec3c7a2883db SHA512 7d6399ca97b171d5ea3cf7f7566bdabe9d5677a3a54c75411146dc2971106809a90d1a9cd0b1ba9b8af4cc409e6bee5876c7f2a0c54c42400fdcf9cfade58a8c
 EBUILD audit-3.1.1.ebuild 4961 BLAKE2B d13005c937536751f9649990378ceeae318cc284c55903c1f5ce6217ab57ab18354f8c4b1963e3ee1e6cc418d0232423117810d40f137d69d07f9603d19c5b4a SHA512 47a0d8b0beef8629a1b7619730a89adf12c74d52f5c8e9ccb2a00c05ba05cede72d065d8a4e9cffe64c644ded4d8bd579b382e649a5f3b92eb2141e06b48adf8
 EBUILD audit-3.1.2.ebuild 4809 BLAKE2B 03e390484b8fa277ab04171886e440a8f3588a2ed76d5aba17413c1fbb499a07d5ca472caee76e8da7a6e441ce9e93996f9654b26527ac00c93298b84b6ba143 SHA512 815793d750cbc6957a6c91b9e19f6b3c23eca86738e37a5834fa210f805b5a812d92d6076bfe11b5bbf53ef9816ef750bf2293024990cf7e887e4e9fd3cef3af
-EBUILD audit-3.1.3.ebuild 4813 BLAKE2B 435b349106dcd0da4c7b87f45987650f8f40fcc3e651619a4983a21a00211c6b206cecf3b64f0be3c2b4ba93d05e6decf995a42e769d3dd9ae3d4fee4f5c1d78 SHA512 a1122d7c000260a6f11f969f18f6dadcd24db09d52ead6c75d0683d36b0aacce0e0ecc24794109f5a0bb39ba312d9330a1fc61a950a4c1061068411676a972bf
+EBUILD audit-3.1.3.ebuild 4813 BLAKE2B d97ddf923fbcd980d62b7650f5cf86e3cc90ec5657daeab6f80aa7b622e209a34068abd9602c66ff378bae482f4c9a76f9daeb1431873257f30f3ae2442c5de3 SHA512 3eb96b05b59d5048c799d928a25ddd021f4f0197699086636b3bfe4b85d517c49dd3ef3a2021f587e51f484c6a6fed9d576590fb3eeb695fadb9aee8ba4b50c1
 MISC metadata.xml 628 BLAKE2B 1e927808210f4acff077f0c9e1a2d358c823fd5ce405b2ef5f0ed760cfa2ac059665f5a11cf1d87314012025844f21b3b9cb25f38a892f715ab2e7de47bbb86a SHA512 2bcb29cb5748ac22d0902dc616cf236eca7f5440c48a6f4bd2b7f2c65ec35cf63bda79252ea21d3553749146b9c84a6db7af256e01a84d347bfd4d8d60a204f6
diff --git a/sys-process/audit/audit-3.1.3.ebuild b/sys-process/audit/audit-3.1.3.ebuild
index a7941a5d6676..e185e4615aae 100644
--- a/sys-process/audit/audit-3.1.3.ebuild
+++ b/sys-process/audit/audit-3.1.3.ebuild
@@ -46,7 +46,7 @@ BDEPEND="
 CONFIG_CHECK="~AUDIT"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.8-musl-malloc.patch
+	"${FILESDIR}"/${PN}-3.1.3-musl-malloc.patch
 )
 
 QA_CONFIG_IMPL_DECL_SKIP=(
diff --git a/sys-process/audit/files/audit-3.1.3-musl-malloc.patch b/sys-process/audit/files/audit-3.1.3-musl-malloc.patch
new file mode 100644
index 000000000000..01c440f3eb83
--- /dev/null
+++ b/sys-process/audit/files/audit-3.1.3-musl-malloc.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/934006
+https://github.com/linux-audit/audit-userspace/commit/1dd6123e810ce255692a693a5d52a0c34cf432d0
+
+From 1dd6123e810ce255692a693a5d52a0c34cf432d0 Mon Sep 17 00:00:00 2001
+From: Steve Grubb <ausearch.1@gmail.com>
+Date: Mon, 1 Apr 2024 12:10:33 -0400
+Subject: [PATCH] Add empty macro to fix muscl c builds
+
+--- a/common/common.h
++++ b/common/common.h
+@@ -1,5 +1,5 @@
+-/* audit-fgets.h -- a replacement for glibc's fgets
+- * Copyright 2018,2022 Red Hat Inc.
++/* common.h -- common utility functions used throughout
++ * Copyright 2018-24 Red Hat Inc.
+  * All Rights Reserved.
+  *
+  * This library is free software; you can redistribute it and/or
+@@ -29,6 +29,9 @@
+ #ifndef __attr_access
+ #  define __attr_access(x)
+ #endif
++#ifndef __attribute_malloc__
++#  define __attribute_malloc__
++#endif
+ #ifndef __attr_dealloc
+ #  define __attr_dealloc(dealloc, argno)
+ #endif