gentoo auto-resync : 06:12:2023 - 17:00:43

4 files changed, 72 insertions, 1 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index b2f8560e03b3..90eb779cef6f 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 161b5e51437a..0f049ea14189 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,5 +1,6 @@
 AUX opendkim-2.10.3-c-std.patch 3767 BLAKE2B e9999b0fad6a7cd72c471c7c87e5b191b76e6c5cbb20d5e15a887714897caeaea770f37d7016f30095990ff8c2baf6450d01083eb2004e318a454d3f09086cc4 SHA512 e0bb4afd7f060e6c69328459675616d4fbabbe56bf4e0c1bf16f132c1390992e8f1f0dd2ba06b02acf44e2b0a218946ff8f9f68f5332ed140f3f57da7f8231b6
 AUX opendkim-2.10.3-define-P-macro-in-libvbr.patch 1111 BLAKE2B ef21e6609a80eadfc3c493b088df6afe368d0ed833d04e7cde922e643b434a7033c888e1b7158d1085152b128a60d95fae722885f15be08c63bed898e4924127 SHA512 6cf0cb4e54814f661f9869bfdfda0ab44c67f237475ebc69b18c670de9f356bb5375740dc8e0a922f25a3215ad5a884725629c92eac1dbf8251364725d77c105
+AUX opendkim-2.10.3-fix-ldap-sasl-pc.patch 2483 BLAKE2B f2db327252044c1a04d0bea0b31b6917b4a8d7af66c6c36ec9952f710db6512236db80daf9816ebc0cb552ff27dd6ea5d9e03be6ff759417c0e3cdf36a4b2954 SHA512 818b00a7ec40ab9b63839be5555a2fe6c2dcfe1095867237d327188f143af0a03e95908122285bdc0d1323b32637f90d68679bfc7b03cd556423196d24489cdf
 AUX opendkim-2.10.3-fix-libmilter-search.patch 7465 BLAKE2B 9b6de6dd084437dd9fb2d905ba3addd3d39150b0cc36d7d62f8f10390acb3adb584dd23f8ee5b87c2b322cee34580e16725ce86b5967f14067d7ccae070ce7d4 SHA512 f8c675abed82f2058403b80162f83e6f44f7cc7502e32228f3127d332d17fd664dbb91a27a93717bd45cac875f356d9c6af1807ceec46ffe1d73e1a603615219
 AUX opendkim-2.10.3-lua-pkgconfig-pt2.patch 1728 BLAKE2B b80f8a21dc19a0e8b37a02c3262698dd08da79d067fbff4ac04b1dfa39d133ee0a113984d4e35e7fc835c0d801d0485b3eccad76f93e9274106e166850a91cb5 SHA512 47fc79f46ae7e4178fc1062f342182b7b783274ac84d99dcb5155a12adb85b42ae597defb3a0da888a70d01e86b068647eb48d881aa107318a355cedd3a6cc4a
 AUX opendkim-2.10.3-lua-pkgconfig.patch 5688 BLAKE2B 57fd8b57d12af4d1351e8bfa2ad01a39e85a6f1e440e3754e497082f5f1098dfc8c31771b1f83ae59f1e53ef242af78093601b1348b62945deacf8afdc42fca0 SHA512 b9ee7e625d1a3f00dcda7e441a81749d773daa9cfad7f046dd03d775564f1c111648c883ef1dcc16a6b518239b6a66bee4ba59f59227d182fcf61b887594d1d7
@@ -7,5 +8,5 @@ AUX opendkim-2.10.3-openrc.patch 10203 BLAKE2B e825ae1258c82607eb6d10d5acc324690
 AUX opendkim-2.10.3-openssl-1.1.1.patch.r2 5966 BLAKE2B c0dcb757f1195e8a3fc055f5162b805bf5bb2fe7a6a7c24317cfc1f0ed05491803f2fefbc22e96409a339f9741cac5344044a1efadec1f3e3c87084b2c221ed6 SHA512 e532d0411bc6cf1f55bf2de1bad54dc29d19558b2c4ea27aa72f17738688d48f111c3662e88064169a78347144eae289b362bfa4849ab4d3b06ff97d439cce47
 AUX opendkim-2.10.3-snprintf-include.patch 691 BLAKE2B eb2f0700f767e7b80ff7938634823e192299ec5941ad4e24003a62245fec7eff973b247fc99b0100d2f5a7454a36a096803bd1d82ba64c9bdb28ef56307b797f SHA512 24f67b9240bd360205f9af0510c8ddc62a3d34af7cb17ec98361c738b0a0e61829615eaeade7848b8042cf91ef2a2452d2d4610b9fd5c7ceb355a485470d666e
 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
-EBUILD opendkim-2.10.3-r30.ebuild 8108 BLAKE2B 8f2a42a825b35b870217b6edea237ade099b9d1179285e34601ab24168cb709e54905636dfe4a387346ab695fedb3f269e7fb3e53b2111718d60f726a5a1744e SHA512 4d0036e76539f2d08f805643a5a85d245dfcd26309be2f4e892f6259900d722322906ac57f0f4c114b7869576dfdec140df0ba2f40f86b4829856577dfad142f
+EBUILD opendkim-2.10.3-r30.ebuild 8151 BLAKE2B 2b5eb7b5cdf5d14e77068c525921a5b3b26916623b5debacd1f8b745407a06eb3fc6dabcfed03fde03b3286aa577eb64ef16fb81cc830f19bf0d39a0f1605272 SHA512 4458f69024e9cae2bcedda38706100a12ba94fb9b15cf818d08ea3afaa2091cb7d08e0a079ff92b330a2fef764a0c503c0780afc1800becc8feb33cfd0c30e7d
 MISC metadata.xml 2028 BLAKE2B b24a278ffff977aadfbf901d6433c48871b920ddae40d3b70b2c98e3a3563fea6e418895d6f30411eb84de3dba2e5fffc44799b35a3f3b9bef83eb9e6779e9b4 SHA512 6bac9661fe5508566a7cd769d5ad57c70c9717aea902010bf8d7a723b694a14485ad4c43475d2c5afdf2d7b29b3da4ce3a618784a4d8fc9886c95b478ab4cf09
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-fix-ldap-sasl-pc.patch b/mail-filter/opendkim/files/opendkim-2.10.3-fix-ldap-sasl-pc.patch
new file mode 100644
index 000000000000..9375d3c8bab9
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.10.3-fix-ldap-sasl-pc.patch
@@ -0,0 +1,69 @@
+From f203e0a001468cd30a0a3b780c90f0f90cdc35b8 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 2 Dec 2023 18:44:20 -0500
+Subject: [PATCH 1/2] configure.ac: update OpenLDAP's pkgconfig name
+
+OpenLDAP provides the file ldap.pc for its libldap library. This can
+be verified via libraries/libldap/ldap.pc.in in the repository,
+
+  https://git.openldap.org/openldap/openldap/-/blob/master/
+
+Our ./configure script checks instead for the name "openldap", which
+at some point may have been correct, but no longer works. We switch to
+"ldap" so that we can locate the upstream file.
+
+On some platforms (https://bugs.gentoo.org/918512) this will fix a
+linking error. Thanks to Chris Pritchard for the report and the
+diagnosis.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1eaa95d8..b8353077 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1800,7 +1800,7 @@ OPENLDAP_LIBS=""
+ if test \( x"$ldappath" = x"auto" -o x"$ldappath" = x"yes" \) -a \
+ 	x"$PKG_CONFIG" != x""
+ then
+-        PKG_CHECK_MODULES([OPENLDAP], [openldap >= 2.0.0],
++        PKG_CHECK_MODULES([OPENLDAP], [ldap >= 2.0.0],
+ 	[
+ 		ldap_found="yes"
+ 		OPENLDAP_CPPFLAGS="$OPENLDAP_CFLAGS"
+
+From 12b1403eea40f3df59ef130a28164f16d08053fc Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 2 Dec 2023 18:52:09 -0500
+Subject: [PATCH 2/2] configure.ac: update Cyrus SASL's pkgconfig name
+
+Cyrus SASL provides the file libsasl2.pc for its libsasl2
+library. This can be verified in its git repository:
+
+  https://github.com/cyrusimap/cyrus-sasl/blob/master/libsasl2.pc.in
+
+Our ./configure script checks instead for the name "cyrussasl", which
+at some point may have been correct, but no longer works. We switch to
+"libsasl2" so that we can locate the upstream file.
+
+On some platforms (https://bugs.gentoo.org/918512) this will fix a
+linking error. Thanks to Chris Pritchard for the report and the
+diagnosis.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b8353077..071e8511 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1890,7 +1890,7 @@ sasl_found="no"
+ if test \( x"$saslpath" = x"auto" -o x"$saslpath" = x"yes" \) -a \
+ 	x"$PKG_CONFIG" != x""
+ then
+-        PKG_CHECK_MODULES([SASL], [cyrussasl >= 2.1.0],
++        PKG_CHECK_MODULES([SASL], [libsasl2 >= 2.1.0],
+ 	[
+ 		sasl_found="yes"
+ 		SASL_CPPFLAGS="$SASL_CFLAGS"
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild
index 996ffbef1220..b689770a7ba0 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-libmilter-search.patch"
 	"${FILESDIR}/${P}-snprintf-include.patch"
 	"${FILESDIR}/${P}-c-std.patch"
+	"${FILESDIR}/${P}-fix-ldap-sasl-pc.patch"
 )
 
 pkg_setup() {