gentoo auto-resync : 17:04:2023 - 05:52:08

4 files changed, 43 insertions, 1 deletions

diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 529be4bb84a6..8d24cdaae887 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,8 +1,10 @@
+AUX xmlsec-1.3.0-clang.patch 614 BLAKE2B 4f08a58e1e7f56d7ae0ec117d836251342ce95b2b8f7290ace8d617f49dbd3130dda8c16417f850268295bbfd24051680dc89ec4d110ed0d66dfcfdf3890ccef SHA512 fdf44de3dd7c1c72d0fceea7ae204a749339b5f022e3354dedcb08564c638567552ea83c434f7d4b82165c77de7a816cbf92dc2cc141c0958aa78420030a8a54
+AUX xmlsec-1.3.0-optimisation.patch 583 BLAKE2B 9035391762150ffa82eef10bc1ba1bde08b04e9e968bf850673dae3e27650e85516e1da4dc3385cd7aafde4cab6270a84e5205a149bcb19dbbdca5ffae678ac8 SHA512 fac70c0e0761d1d8016fb597ed4c139628bfab9d3600eeff17c16b9414732076bea65bee5c778481ecf944053319e030dfb4a455c6d51ba3e758007c36f72323
 AUX xmlsec-1.3.0-strict-prototypes.patch 637 BLAKE2B b6adffe488b5e69e0338e040b8be5c611b927935c2a0f19ee58a9b19731c53b0c8f97d1d42d4b6d5b96400b91d5d31628bfa98e91e3ab4ba68b945d06508eff9 SHA512 03d7ca70aac92b01c78a87f8731d0302b441547c36a274f577f2c31e313b37aa9292b803affb7bf052426e80250480c6bb598be0f9e35d08293025a2f673caad
 DIST xmlsec1-1.2.36.tar.gz 2005656 BLAKE2B 617f7532f3e0401357261d1294f7f497e81f79538b223616433b007a5d3132e9e4ec7a40f36e909759f996754b95c060386ec9740165fb1b045809142e9fae35 SHA512 7545935d33236bc8ec79b9173c8c0967df5c96bb9e2d5c8edacfb5ffb366ff8d087eada0cebb1de81a477f93d40544bf0a12abcdbc60874ecaecb9c8dd33dfe3
 DIST xmlsec1-1.2.37.tar.gz 2009175 BLAKE2B 19f43ba6bf6eb49428b9c5563baecbab21476f326cceee13785ae16769afa258f100732831c0f3f7d160543bd075cdcfdc5cbf11b7406637ee6c2f0e27c07f30 SHA512 99220cb28a346ffac0023f9f177d6a7be3ddcea04bea434b7dc926c1f0aaa5564d75f74f92896ac100179c04d77e001f688ddf46fed4e0a0b4f20b7b87c24900
 DIST xmlsec1-1.3.0.tar.gz 2425729 BLAKE2B a83d0117aaf1824a8a8f597f73ab1b76bcd1a9f0bb5d160df6c775f70cd2485f8e09c250f4ddbb4d42ba35549f9617d06f5470a91306757b4d5d54fdc0684f3c SHA512 ac1b1b88336959f54ef7fcfd6b9ff0feb2ba00a966a8e5b4efb97e802a1f9bb7adf5f4524c7f169344a1b7258377b5a7e879a0ab5ce25cfae3b05eac9b54729d
 EBUILD xmlsec-1.2.36.ebuild 1463 BLAKE2B 76030375b9003a64d46c86869609a5a233e044a6765f2bfd7211dd4a51c3584442107ea68929de36117d2271a1f9d4a16239ff6c31b84b3d06373134c4b9cdd0 SHA512 5cb824cdc34c4e9768245d6c138c57d803316d0d87a45772825fd285912433136daa4f9e52023348cac26a511457a677b4502e12880a205192684938d1357904
 EBUILD xmlsec-1.2.37.ebuild 1463 BLAKE2B d7cd33b3533395b59f4971deae688336fc4b8f52b5e948d7064cb19d7bbd043c7c8d3b48f5b499e51ebc529982b34b1d12a148fd35cfa700270334d7fa555124 SHA512 e92545fd5b5bb5977757cf18c8726a9335403cdc83d2367337e95ed305871cc6279568c1abce800738eefb60a7b84e4f508536c44a5a6426d6268950db223437
-EBUILD xmlsec-1.3.0.ebuild 1784 BLAKE2B aca93b044e1d13dbe14dd6ec9e5089fd42ce819ba624769f4864dc0f08a65de2f98ed40a707cfaca8bc551fc1bbe89c75d7e69320af3986d52dfc2e830542bc0 SHA512 f3c66d03e3bf558620cd4925298011bd77cfba540c529330acb8ccab1d31f42b80fc2649b11e407f11bcce14d87b4e4358134cf2e8f8446cb21fcf8aa9aba0ea
+EBUILD xmlsec-1.3.0-r1.ebuild 1916 BLAKE2B 352c1d873204a34cbce3ad7b57033460ef579835f69e0058b6d9c41c25adbdddf995f679b38738e23b769b4c943d97cc0dbe5cc4b216a5d862b6cf1afdb4fe54 SHA512 ff41e7d69b143e71287e77af595a895151a4221c23b9bb5387b19ffe0f5a92ee97920b02f8787d699c875db4620f5f29fe6da1cd3450ad7a69ec7c2f14a1d844
 MISC metadata.xml 558 BLAKE2B e4517ffa3f034420139ee0fbb8ed51a3cb319b1400e52d6a1d2d3b5363aa64831fd9cc93f49ab25d36a5fcae63115d0ffd152540f176c25dc49f77fbf4dd6c9d SHA512 6aab5452478ba1f71018274b75761c3467868f271b3cf256d05645407fa9c3cc64823384094c8e9024f936dfdaea5be2b8e91573e9addb07c5dab5f142c6a70d
diff --git a/dev-libs/xmlsec/files/xmlsec-1.3.0-clang.patch b/dev-libs/xmlsec/files/xmlsec-1.3.0-clang.patch
new file mode 100644
index 000000000000..a8e8a9b50a46
--- /dev/null
+++ b/dev-libs/xmlsec/files/xmlsec-1.3.0-clang.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/904418
+https://github.com/lsh123/xmlsec/commit/0682c1d4be1e1d5d0f3cf5c4d2301dc3da09d677
+
+From 0682c1d4be1e1d5d0f3cf5c4d2301dc3da09d677 Mon Sep 17 00:00:00 2001
+From: lsh123 <aleksey@aleksey.com>
+Date: Thu, 13 Apr 2023 09:49:25 -0400
+Subject: [PATCH] Add newline (#628)
+
+Issue #626
+--- a/src/openssl/symkeys.c
++++ b/src/openssl/symkeys.c
+@@ -618,4 +618,4 @@ xmlSecOpenSSLKeyDataPbkdf2Set(xmlSecKeyDataPtr data, const xmlSecByte* buf, xmlS
+ 
+     return(xmlSecBufferSetData(buffer, buf, bufSize));
+ }
+-#endif /* XMLSEC_NO_PBKDF2 */
+\ No newline at end of file
++#endif /* XMLSEC_NO_PBKDF2 */
+
diff --git a/dev-libs/xmlsec/files/xmlsec-1.3.0-optimisation.patch b/dev-libs/xmlsec/files/xmlsec-1.3.0-optimisation.patch
new file mode 100644
index 000000000000..2cd0401e019d
--- /dev/null
+++ b/dev-libs/xmlsec/files/xmlsec-1.3.0-optimisation.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2482,7 +2482,7 @@ AC_ARG_ENABLE([pedantic], [AS_HELP_STRING([--enable-pedantic],[enable pedantic c
+ if test "z$enable_pedantic" = "zno" ; then
+     AC_MSG_RESULT([disabled])
+ else
+-    CFLAGS="$CFLAGS -O -std=c99 -pedantic -pedantic-errors -W -Wall -Wextra"
++    CFLAGS="$CFLAGS -std=c99 -pedantic -W -Wall -Wextra"
+     CFLAGS="$CFLAGS -fno-inline -Wnull-dereference -Wdouble-promotion"
+     CFLAGS="$CFLAGS -Wformat=2 -Wformat-security -Wformat-nonliteral"
+     CFLAGS="$CFLAGS -Wconversion -Wunused -Wshadow -Wpointer-arith -Wcast-align"
diff --git a/dev-libs/xmlsec/xmlsec-1.3.0.ebuild b/dev-libs/xmlsec/xmlsec-1.3.0-r1.ebuild
index ca8bb9084b40..e90f0e76d9e9 100644
--- a/dev-libs/xmlsec/xmlsec-1.3.0.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.3.0-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit autotools
+
 DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
 HOMEPAGE="https://www.aleksey.com/xmlsec"
 SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
@@ -42,8 +44,16 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-strict-prototypes.patch
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-optimisation.patch
 )
 
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable doc docs)