gentoo auto-resync : 24:02:2024 - 17:40:43

3 files changed, 51 insertions, 1 deletions

diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 6cb7139c80d9..28755c0bd736 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,6 +1,7 @@
 AUX xmlsec-1.2.37-libressl.patch 1614 BLAKE2B 5b9c2731018d3b371867d30318d55e5f48e4e91359e80abffac212abb35fa274ec35ed9510eb3c01422d8142698669a115f85e9776af8424458de41c66c93b13 SHA512 423997e32223fc45467f9857e709b5707c64aba01ac892253e0be588d767fbfd7c2205a312600910d9cb734b4945e36048292ad59d40de4d43d98af9abe8b1b9
 AUX xmlsec-1.3.0-optimisation.patch 583 BLAKE2B 9035391762150ffa82eef10bc1ba1bde08b04e9e968bf850673dae3e27650e85516e1da4dc3385cd7aafde4cab6270a84e5205a149bcb19dbbdca5ffae678ac8 SHA512 fac70c0e0761d1d8016fb597ed4c139628bfab9d3600eeff17c16b9414732076bea65bee5c778481ecf944053319e030dfb4a455c6d51ba3e758007c36f72323
 AUX xmlsec-1.3.2-libxml2-2.12.0-includes.patch 3947 BLAKE2B c4b0bad5b6831ce9861fb7adfdcd97a451c03c514d9bf0cf564bce67a51ea027b0ddf3f9ed9155134585ce2ff5b2784e642b35f6d0dad54b6892450c4acc1241 SHA512 fac1cc24f1c2a1f0dd4cb256c78f1b5726f6eac39d9fe04d95d6eabb5195d05d86dd224d9cb12f679812a39350118eb02ce3bc8f728d2259df6db1a6c8386df5
+AUX xmlsec-1.3.3-slibtool.patch 1701 BLAKE2B 5743f768e6863b39019de22d4463a77617623b233b7e8604b71962c8d72153b8dd4014756375730a049f49751b4fa75cae78a81c04d8cdb5ce77ce08d49c0617 SHA512 da6cdabc6615bad7a49bf9f5ed9a281059ba02c6ea1bdc572cf6fbcb936f0dbca3438e955dcbba75b28c305d0fd110e1ccce3b271693b4063673b7a24c76222e
 AUX xmlsec-1.3.3-typo-fix.patch 927 BLAKE2B c2977900f849b96fe517d73c18f9cc4f5cb99fd2e4d5a8a985622602eaa0bf9f3dca11c7909324499b3ef5a77967ededb9e20ada84fb0d7cad25384a9da51828 SHA512 b2db0e08ffd3aebefd260d60559932eda3d9d14b9498bdb8aca7a2f14c0c2b1fa29124818e2a24b35095daa63b1422db59dcf31ed599fc57e5569926aac1bfc4
 DIST xmlsec1-1.2.37.tar.gz 2009175 BLAKE2B 19f43ba6bf6eb49428b9c5563baecbab21476f326cceee13785ae16769afa258f100732831c0f3f7d160543bd075cdcfdc5cbf11b7406637ee6c2f0e27c07f30 SHA512 99220cb28a346ffac0023f9f177d6a7be3ddcea04bea434b7dc926c1f0aaa5564d75f74f92896ac100179c04d77e001f688ddf46fed4e0a0b4f20b7b87c24900
 DIST xmlsec1-1.2.38.tar.gz 2036578 BLAKE2B 03f7e1b5e659793bf1984c5a59582d9459089ce913620d5cc1e5a5d0eb65557580cd23fa190db277298fd7cc55bd41563b93cf61a37c8b7521a4690cd2ca3489 SHA512 724089777caae95db27e67f24381c066eaae23a9d64819a18bb04837c1ab1b380d19be2c7ee25659ca481d9eab96fcbe8027a430a0ac1630ad3b073cddd20fac
@@ -11,6 +12,6 @@ EBUILD xmlsec-1.2.37.ebuild 1463 BLAKE2B d7cd33b3533395b59f4971deae688336fc4b8f5
 EBUILD xmlsec-1.2.38.ebuild 1548 BLAKE2B ced553e3a63148facdefbccd9a244fbc5c3342081648557a874a8c7760d330bf7a8e984a47a3b1667c017da18df20e1742abddeb2f9c4466b2873516ad6de401 SHA512 1698b2e89e4b7dc7b10395f011dc00a0b28397338b2fe058e48fba799f145a472a15050321507ae698931fd7674d8379a63d7e50fd8903a48a9e1fef69e266bb
 EBUILD xmlsec-1.3.1.ebuild 1841 BLAKE2B a17f66590d0baeb5aef4720bfe471dcd75029dfad7351c8da72189ead891d935d483c9afaff56aa8033d564153607a83c5021345c35626d6531cf52d71614e13 SHA512 94aa75a798e39439cf1ec8855b558fb401177334722f1d1be6f9d5697cf0ee022406b766b2ce4cf3ca1d15137567b42fb066001e8903afbf13fcd20af63960f2
 EBUILD xmlsec-1.3.2.ebuild 1893 BLAKE2B 4019fc33a7723d0a2f613987d0e7791cee4583af315a6cbcf29c443e2f36f948db21d71b8abe26d2446c40ede58469b08899cb40bd525a229a3a28c3459e3b7b SHA512 182096086837b06fc573a04400084002ce22ae7acf5293b2c4e7b25b5c9195e4bf420aa45c163f9bcba90cee32b1642fa8f226c263eebf14f8d9d8da7fcf0b6a
-EBUILD xmlsec-1.3.3-r1.ebuild 1885 BLAKE2B db13715ff812fdcce460315d8d458c134459476e1e93804a5a36d9170938749d55915d37b691a4e36d497e5e74a91a96b207d3768ba256611204b4c66000b509 SHA512 c1ce28aa0a4e84ccafc07c1a81b0554556e4aca589f04e92a77cea077260ecd98a12e54474daccf4be5cdd2f308aad1530478d7cc5576a3b46a5a1540c833179
+EBUILD xmlsec-1.3.3-r1.ebuild 1927 BLAKE2B e129e6dc436a88e1e834b5df5287c92c76a6484befd803835bfa6ccd51a1a35d4b12b31e864452881335c9060be18bc5187bc1b1b1d024bb599e76e95b8f9541 SHA512 06747ca8c74531aadf39edca8b82c9d1d59237da36a20740099c5260c78bfdc4fe60080b9f0aa9427d1695967b5dc49f17fb74c828d279cacaa8605dbd0d4782
 EBUILD xmlsec-1.3.3.ebuild 1847 BLAKE2B 68b191e403e720c06201e9ca5b16f77cf370a2682ee6dbc6c46d8b639850a5ba8f9dea4c73f70fdb0d4f89b6baef7572d9c418a37c007fe07252267595d6cd58 SHA512 41584b573692b82bff86b64e44bd3d3b6bd72f12739d8711660f790641f9860acf52323fddc50a1fcf823b2ad1bc2c8f3e75c39d9176049a799862e5b4a81a5e
 MISC metadata.xml 558 BLAKE2B e4517ffa3f034420139ee0fbb8ed51a3cb319b1400e52d6a1d2d3b5363aa64831fd9cc93f49ab25d36a5fcae63115d0ffd152540f176c25dc49f77fbf4dd6c9d SHA512 6aab5452478ba1f71018274b75761c3467868f271b3cf256d05645407fa9c3cc64823384094c8e9024f936dfdaea5be2b8e91573e9addb07c5dab5f142c6a70d
diff --git a/dev-libs/xmlsec/files/xmlsec-1.3.3-slibtool.patch b/dev-libs/xmlsec/files/xmlsec-1.3.3-slibtool.patch
new file mode 100644
index 000000000000..ed4c9e0397b7
--- /dev/null
+++ b/dev-libs/xmlsec/files/xmlsec-1.3.3-slibtool.patch
@@ -0,0 +1,48 @@
+https://github.com/lsh123/xmlsec/pull/756
+https://github.com/lsh123/xmlsec/commit/de5251a8064231fbe6b9bccc669228cab4ab4ec7
+
+From de5251a8064231fbe6b9bccc669228cab4ab4ec7 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 30 Jan 2024 18:57:19 -0800
+Subject: [PATCH] configure.ac: fix the build with slibtool (#756)
+
+When building with LibreSSL or BoringSSL the build will try to link the
+$OPENSSL_LIBS with -Wl,-Bstatic, but this will fail when using slibtool
+if only dynamic libssl and libcrypto libraries are installed.
+
+  ld: cannot find -lssl: No such file or directory
+  ld: cannot find -lcrypto: No such file or directory
+
+With GNU libtool it will "helpfully" rearrange the linker output to
+obscure the issue.
+
+  -lssl -lcrypto -lxslt -lxml2 ../.libs/libxmlsec1.so -g -O2 -O -Wl,-Bstatic -Wl,-Bdynamic
+
+While with slibtool it will do as instructed and produce a build
+failure.
+
+  -Wl,-Bstatic -lssl -lcrypto -Wl,-Bdynamic -lxslt
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ce8a278c..25e70b24 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -806,7 +806,6 @@ if test "z$OPENSSL_FOUND" = "zyes" ; then
+             #endif
+         ],[
+             OPENSSL_VERSION="LibreSSL >= 3.5"
+-            OPENSSL_LIBS="-Wl,-Bstatic $OPENSSL_LIBS -Wl,-Bdynamic"
+             enable_dh=no
+         ],[
+             OPENSSL_VERSION=""
+@@ -824,7 +823,6 @@ if test "z$OPENSSL_FOUND" = "zyes" ; then
+             #endif
+         ],[
+             OPENSSL_VERSION="BoringSSL >= 1.1.1"
+-            OPENSSL_LIBS="-Wl,-Bstatic $OPENSSL_LIBS -Wl,-Bdynamic"
+             enable_ripemd160=no
+             enable_dsa=no
+             enable_dh=no
diff --git a/dev-libs/xmlsec/xmlsec-1.3.3-r1.ebuild b/dev-libs/xmlsec/xmlsec-1.3.3-r1.ebuild
index 49cd41086465..079d34a4be68 100644
--- a/dev-libs/xmlsec/xmlsec-1.3.3-r1.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.3.3-r1.ebuild
@@ -45,6 +45,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.0-optimisation.patch
 	"${FILESDIR}"/${PN}-1.3.3-typo-fix.patch
+	"${FILESDIR}"/${PN}-1.3.3-slibtool.patch
 )
 
 src_prepare() {