gentoo resync : 25.10.2021

6 files changed, 74 insertions, 9 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index b7d1dc7095c7..72ebb0726004 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest
index ee1d51e4ad2c..88ed0b50a220 100644
--- a/mail-filter/libspf2/Manifest
+++ b/mail-filter/libspf2/Manifest
@@ -1,4 +1,7 @@
 AUX libspf2-1.2.10-gcc5.patch 903 BLAKE2B f4ddba2890e1899be3ef054eb8fd3548736b97205738f2e28e660d6ab4e89e3dfe5f0a51448083651b76972fb3b7a991c7e40a09618adcecaa4bb2293683c9ef SHA512 9abe90c668fe49d06d8a6aea096adc35641c1f10f375416223c99a1f624ad562e4c8edad3220c38ea350158c263e20d7bf86cb993b83eabd7bccfe5be18bb0f9
+AUX libspf2-1.2.11-memset-include-string-h.patch 317 BLAKE2B 4bafbb6274a433d6fbbba149fc81ddc30734baa6509493820a9ca3a1c50d90c33db9846d8a63536e05e7960f4ff45c605a66b461bd93b6fab36533b9745512fc SHA512 0c1bf85d52e8c5a8ec0b32485e210139c7c09e17dbca2dbc810eedd7fd9b096fa26d66194b02067186d572a54c049a276dc8f7f1358ca6a9d6883a760b4735a9
 DIST libspf2-1.2.10.tar.gz 508842 BLAKE2B d15a44f64c5e3da20aa349e61a6cc02a15f83ed3acff93fe4c23970e30533d6424b1db35d7d60ff488c9a239d343f8544426fbf8fcb66271237155e0b57df1b5 SHA512 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130
-EBUILD libspf2-1.2.10.ebuild 1076 BLAKE2B e3c206004b0e561699cf0b98d710d299250ae201303fecb4adde799d4f0a267c785c316188eb8d07b9b0f87a8694afc6c25f5e2e027d237e3b415d940b38e12f SHA512 0dd00a1431ffddb33679e90b68c6bfe0506ffc85ee711437617c3a24d7df4a8f8ba4e0ebecf1b09efcde354111b1de711f40a765bf64733287150ff3a49e4a22
-MISC metadata.xml 598 BLAKE2B ce699f53ba303b1dc50454bea6dd0ac5c0fe6c1dd4a355fe9b4f4e663ac0c972ad77afc4ae4716c9d329afa222937b37168046627a22f257453c53b96e23ef0b SHA512 2014289f2c64502a39817ca98fd8fc4759dd89aa3a0ac9c139a6b7c40d0d11775f8827a3c62971e30aca8865d8635718324e3de5bb2b1a37c63ebd377455edab
+DIST libspf2-1.2.11.tar.gz 565497 BLAKE2B 4000e15204c962ef438cc8bcf6411f4f965e1451e356923e2764d5a1209cbc9153a38e1d83d25c8b4b26646bfb306ec49b71d273fdbabe200b78ac2694c05a4f SHA512 ad7bea800ad6ec8d00a7f8f381b59d9ba074fb6c5932d8babcb05ab5ca59defb78445dd7bd89767e5c272b6c6638c8000c8c525c560d1803c35712f0ff86fa9b
+EBUILD libspf2-1.2.10.ebuild 1040 BLAKE2B bd3e3d3b08c271fc560a5fbe84705d343c2c717f9c256ea38d045254cffe6560ffd9699be648a46eab06051f9d6ce1c7e2a5153630479d0888c83041d1ee6f89 SHA512 06f54696b73abbf0ccc0d747d4391076eca1ecb04b69832029bb32ce616c62481afd5f87650872f19214fcbc38cf6761813912fd7e470c9666c4c4bae099b751
+EBUILD libspf2-1.2.11.ebuild 1141 BLAKE2B 31ceb0dfa691236c0e13f00af4540978e64636289da23731079c90e2b339e6e8ff6e3effc64e42749df9213eee5e0e5a88bffdf2820daaa2cdf51c2e3f38b231 SHA512 c6db44594cb91c1d03d6e7c73a4b15ae58dbf156e1a6082d042035320e7b300d4eae4c08703ab94d552bdf1044824b10bada20b382b8b6f3264db06948b88d24
+MISC metadata.xml 709 BLAKE2B f720c41a2b810076b3bc6ea67f5595fb15671e68dee15210ca0050e2e6947e628a3353ae70de989b69ac95d1b3d968d4e5bd2e18dae64493be3b958e24b3d149 SHA512 1067bde4b0ffdf0bbe8fd145791fa407f8ecc457687ea1587fa4cd987374b7067c68c8c0b84eb1ced4179be009e55cff1ef1918ebecce5ad0bf968d6cc41c358
diff --git a/mail-filter/libspf2/files/libspf2-1.2.11-memset-include-string-h.patch b/mail-filter/libspf2/files/libspf2-1.2.11-memset-include-string-h.patch
new file mode 100644
index 000000000000..5b5a77298305
--- /dev/null
+++ b/mail-filter/libspf2/files/libspf2-1.2.11-memset-include-string-h.patch
@@ -0,0 +1,12 @@
+grobian@gentoo.org: include string.h so memset is declared
+
+--- a/src/libspf2/spf_utils.c
++++ b/src/libspf2/spf_utils.c
+@@ -19,6 +19,7 @@
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>	   /* malloc / free */
+ # include <ctype.h>		/* isupper / tolower */
++# include <string.h>	/* memset */
+ #endif
+ 
+ #ifdef HAVE_MEMORY_H
diff --git a/mail-filter/libspf2/libspf2-1.2.10.ebuild b/mail-filter/libspf2/libspf2-1.2.10.ebuild
index d31bd24a4514..c48e29203125 100644
--- a/mail-filter/libspf2/libspf2-1.2.10.ebuild
+++ b/mail-filter/libspf2/libspf2-1.2.10.ebuild
@@ -13,8 +13,6 @@ LICENSE="|| ( LGPL-2.1 BSD-2 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
-RDEPEND="!dev-perl/Mail-SPF-Query"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc5.patch #570486
 )
diff --git a/mail-filter/libspf2/libspf2-1.2.11.ebuild b/mail-filter/libspf2/libspf2-1.2.11.ebuild
new file mode 100644
index 000000000000..297928cb2fe3
--- /dev/null
+++ b/mail-filter/libspf2/libspf2-1.2.11.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+GHASH=4915c308d57ff3abac9fb241f09c4bed2ab54815  # 1.2.11
+DESCRIPTION="implementation of Sender Policy Framework (SPF)"
+HOMEPAGE="https://www.libspf2.org"
+SRC_URI="https://github.com/shevek/${PN}/archive/${GHASH}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 BSD-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.11-memset-include-string-h.patch
+)
+
+S=${WORKDIR}/${PN}-${GHASH}
+
+src_prepare() {
+	default
+
+	sed -i -e '/bin_PROGRAMS/s/spfquery_static//' src/spfquery/Makefile.am \
+		-e '/bin_PROGRAMS/s/spftest_static//' src/spftest/Makefile.am \
+		-e '/bin_PROGRAMS/s/spfd_static//' src/spfd/Makefile.am \
+		-e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am \
+		|| die
+
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README TODO INSTALL
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/mail-filter/libspf2/metadata.xml b/mail-filter/libspf2/metadata.xml
index e2f3f0f910ef..24df63b2e21c 100644
--- a/mail-filter/libspf2/metadata.xml
+++ b/mail-filter/libspf2/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+	</maintainer>
 	<longdescription>
-	libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair.
-	libspf2 is a library which allows email systems such as Sendmail, Postfix, Exim, Zmailer and MS Exchange to
-	check SPF records and make sure that the email is authorized by the domain name that it is coming from. This prevents email forgery,
-	commonly used by spammers, scammers and email viruses/worms.
+        libspf2 implements the Sender Policy Framework, a part of the
+        SPF/SRS protocol pair.
+        libspf2 is a library which allows email systems such as
+        Sendmail, Postfix, Exim, Zmailer and MS Exchange to
+        check SPF records and make sure that the email is authorized by
+        the domain name that it is coming from. This prevents email
+        forgery, commonly used by spammers, scammers and email
+        viruses/worms.
 	</longdescription>
 </pkgmetadata>