gentoo resync : 27.10.2021

6 files changed, 186 insertions, 10 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 72ebb0726004..b6289917aca2 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest
index 88ed0b50a220..289965261275 100644
--- a/mail-filter/libspf2/Manifest
+++ b/mail-filter/libspf2/Manifest
@@ -1,7 +1,9 @@
 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
+AUX libspf2-1.2.11-musl.patch 816 BLAKE2B 4dde68a54b54f55ad184cdb3d735020f446fcaca5f6751d892eb299962df92fdef144a7ef17ef9775655c088ec73f81eea69bec4aabb65a97ddd809673114a99 SHA512 30d2e27e185d2656d0a2d2fe14f4e735bc533db66f52c1554df19cc635bd1024c7877bb48e7ec20432f23c4e9cc66bdbd7c2b0c8816cf692e627112792ed1fd4
+AUX libspf2-1.2.11-undefined-dn_.patch 5230 BLAKE2B dca3a1c95ad6748936cd444bf7d48265454c748697616790f7f92ddf7339fcce06873e67d31857649b3b9d9ae6dac8131815dc3e8ce7af3697a669931d6068cb SHA512 8159ad3aae731971d6553858ca8c5297eae437f18397605df8bfa285d901e99bb70d18cb09c56cea0d203b1b18103d2dbd41a1fc085ed89f241377d8d1e2da82
 DIST libspf2-1.2.10.tar.gz 508842 BLAKE2B d15a44f64c5e3da20aa349e61a6cc02a15f83ed3acff93fe4c23970e30533d6424b1db35d7d60ff488c9a239d343f8544426fbf8fcb66271237155e0b57df1b5 SHA512 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130
 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
+EBUILD libspf2-1.2.11.ebuild 1228 BLAKE2B fd41b09e47dec0ad9bf25013a31f143ac0830c59f71ff4f64a9e6bfd75c2b0eb15dd350e4e964cc6bbd2dbc66fb67e42a5952bb752a3c5c7b8e9e827031469ca SHA512 94a8fdd828c6b8da3e46b6832cee8bd6ba98064ecb72a57772cf66a32b6471b5a677bd0025d7d4b325570e545ef3ccf83df44f398366ce8f211f570c56266018
+MISC metadata.xml 661 BLAKE2B abbc96b07e546e6ca06763b871e1b21b1e83220c37f38fff3045485a26394784ad5391d0c5682d0716fb8d68693465b65d3642afdfec9ff33ce2e08bf8a8e776 SHA512 bb8fbd3142a69092b10c0ce665d74db7bb5a11f287a027ab499e89433fa7e4bc35a397d738d7ca7105f723bb941b94e01b2ad6bff515d94d42445fd6d5bc6e59
diff --git a/mail-filter/libspf2/files/libspf2-1.2.11-musl.patch b/mail-filter/libspf2/files/libspf2-1.2.11-musl.patch
new file mode 100644
index 000000000000..9867dc0d1b4f
--- /dev/null
+++ b/mail-filter/libspf2/files/libspf2-1.2.11-musl.patch
@@ -0,0 +1,30 @@
+assorted fixes for musl
+
+--- a/src/include/spf_dns.h
++++ a/src/include/spf_dns.h
+@@ -99,11 +99,13 @@
+  */
+ 
+ #if !defined(HAVE_NETDB_H) && !defined(_WIN32)
+-#define NETDB_SUCCESS	0
+ #define	HOST_NOT_FOUND 	1		/**< NXDOMAIN (authoritative answer)*/
+ #define	TRY_AGAIN		2		/**< SERVFAIL (no authoritative answer)*/
+ #define	NO_RECOVERY		3		/**< invalid/unimplmeneted query	*/
+ #define	NO_DATA			4		/**< host found, but no RR of req type*/
++#endif
++#ifndef NETDB_SUCCESS
++#define NETDB_SUCCESS	0
+ #endif
+ typedef int SPF_dns_stat_t;
+ 
+--- a/src/libspf2/spf_dns_resolv.c
++++ b/src/libspf2/spf_dns_resolv.c
+@@ -606,7 +606,7 @@ SPF_dns_resolv_free(SPF_dns_server_t *spf_dns_server)
+ {
+ 	SPF_ASSERT_NOTNULL(spf_dns_server);
+ 
+-#if ! HAVE_DECL_RES_NINIT
++#if ! HAVE_DECL_RES_NINIT && HAVE_RES_CLOSE
+ 	res_close();
+ #endif
+ 
diff --git a/mail-filter/libspf2/files/libspf2-1.2.11-undefined-dn_.patch b/mail-filter/libspf2/files/libspf2-1.2.11-undefined-dn_.patch
new file mode 100644
index 000000000000..279089b6cb97
--- /dev/null
+++ b/mail-filter/libspf2/files/libspf2-1.2.11-undefined-dn_.patch
@@ -0,0 +1,142 @@
+From 808b584d22106828aaaa3f2a52b1d076b6e66040 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 11 Sep 2014 08:09:34 +0000
+Subject: [PATCH] provide dn_skipname
+
+Modified for Gentoo to include dn_expand fix
+keep dn_expand available, for musl and glibc-2.34
+
+---
+ configure.ac                   |  2 +-
+ src/libreplace/__dn_skipname.c | 87 ++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 88 insertions(+), 1 deletion(-)
+ create mode 100644 src/libreplace/__dn_skipname.c
+
+diff --git a/configure.ac b/configure.ac
+index 63e398c..739da3b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -269,6 +269,7 @@
+ 	#endif
+ 	]])
+ 
++AC_CHECK_FUNCS([dn_expand])
+ AC_CHECK_FUNCS([ftruncate gethostname memmove memset socket])
+ AC_CHECK_FUNCS([strchr strcspn strdup strerror])
+ AC_CHECK_FUNCS([strcasecmp strncasecmp strspn strtoul])
+@@ -274,7 +274,7 @@
+ AC_CHECK_FUNCS([gethostbyname inet_ntoa select strrchr strstr strtol])
+ 
+ AC_REPLACE_FUNCS([getopt_long_only strncasecmp])
+-AC_REPLACE_FUNCS([__ns_initparse __ns_name_uncompress __ns_msg_getflag])
++AC_REPLACE_FUNCS([__ns_initparse __ns_name_uncompress __ns_msg_getflag __dn_skipname])
+ dnl Magnus Holmgren says this avoids linking a private function
+ AC_LIBOBJ([__ns_get16])
+ 
+diff --git a/src/libreplace/__dn_skipname.c b/src/libreplace/__dn_skipname.c
+new file mode 100644
+index 0000000..88d48b5
+--- /dev/null
++++ b/src/libreplace/__dn_skipname.c
+@@ -0,0 +1,87 @@
++/* taken from OpenBSD source */
++/*
++ * ++Copyright++ 1985, 1993
++ * -
++ * Copyright (c) 1985, 1993
++ *    The Regents of the University of California.  All rights reserved.
++ * 
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. Neither the name of the University nor the names of its contributors
++ *    may be used to endorse or promote products derived from this software
++ *    without specific prior written permission.
++ * 
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ * -
++ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
++ * 
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies, and that
++ * the name of Digital Equipment Corporation not be used in advertising or
++ * publicity pertaining to distribution of the document or software without
++ * specific, written prior permission.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
++ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
++ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ * -
++ * --Copyright--
++ */
++
++/*
++ * Skip over a compressed domain name. Return the size or -1.
++ */
++#include <sys/types.h>
++#include <resolv.h>
++
++int
++__dn_skipname(const u_char *comp_dn, const u_char *eom)
++{
++	const u_char *cp;
++	int n;
++
++	cp = comp_dn;
++	while (cp < eom && (n = *cp++)) {
++		/*
++		 * check for indirection
++		 */
++		switch (n & INDIR_MASK) {
++		case 0:			/* normal case, n == len */
++			cp += n;
++			continue;
++		case INDIR_MASK:	/* indirection */
++			cp++;
++			break;
++		default:		/* illegal type */
++			return (-1);
++		}
++		break;
++	}
++	if (cp > eom)
++		return (-1);
++	return (cp - comp_dn);
++}
++
++
+-- 
+2.1.0
+
+--- a/src/libreplace/arpa_nameser.h
++++ b/src/libreplace/arpa_nameser.h
+@@ -59,7 +59,7 @@
+ #  define __P(x) x
+ #endif
+ 
+-#if defined( HAVE_ARPA_NAMESER_H ) && defined( HAVE_NS_TYPE )
++#if !defined(HAVE_DN_EXPAND) && defined( HAVE_ARPA_NAMESER_H ) && defined( HAVE_NS_TYPE )
+ #define dn_expand		__dn_expand
+ int		dn_expand __P((const u_char *, const u_char *, const u_char *,
+ 			       char *, int));
diff --git a/mail-filter/libspf2/libspf2-1.2.11.ebuild b/mail-filter/libspf2/libspf2-1.2.11.ebuild
index 297928cb2fe3..e80f41ff3ea1 100644
--- a/mail-filter/libspf2/libspf2-1.2.11.ebuild
+++ b/mail-filter/libspf2/libspf2-1.2.11.ebuild
@@ -16,6 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.11-memset-include-string-h.patch
+	"${FILESDIR}"/${PN}-1.2.11-undefined-dn_.patch
+	"${FILESDIR}"/${PN}-1.2.11-musl.patch
 )
 
 S=${WORKDIR}/${PN}-${GHASH}
diff --git a/mail-filter/libspf2/metadata.xml b/mail-filter/libspf2/metadata.xml
index 24df63b2e21c..9b90a0b200cb 100644
--- a/mail-filter/libspf2/metadata.xml
+++ b/mail-filter/libspf2/metadata.xml
@@ -5,13 +5,13 @@
 		<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>