summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2021-10-26 18:55:36 +0200
committerFabian Groffen <grobian@gentoo.org>2021-10-26 18:55:44 +0200
commitdbb8a5c9f749cc11e61cfe558f164b165cbc30cb (patch)
tree95774160b2213213d21787b90c0f7c3483b49675
parentdev-lang/perl: Re-keyword -r5 (diff)
downloadgentoo-dbb8a5c9f749cc11e61cfe558f164b165cbc30cb.tar.gz
gentoo-dbb8a5c9f749cc11e61cfe558f164b165cbc30cb.tar.bz2
gentoo-dbb8a5c9f749cc11e61cfe558f164b165cbc30cb.zip
mail-filter/libspf2-1.2.11: unbreak dn patch
Closes: https://bugs.gentoo.org/820347 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Fabian Groffen <grobian@gentoo.org>
-rw-r--r--mail-filter/libspf2/files/libspf2-1.2.11-undefined-dn_.patch30
1 files changed, 17 insertions, 13 deletions
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
index cc2638cf7669..279089b6cb97 100644
--- a/mail-filter/libspf2/files/libspf2-1.2.11-undefined-dn_.patch
+++ b/mail-filter/libspf2/files/libspf2-1.2.11-undefined-dn_.patch
@@ -3,6 +3,9 @@ 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 ++++++++++++++++++++++++++++++++++++++++++
@@ -13,7 +16,15 @@ diff --git a/configure.ac b/configure.ac
index 63e398c..739da3b 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -274,7 +274,7 @@ AC_CHECK_FUNCS([strcasecmp strncasecmp strspn strtoul])
+@@ -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])
@@ -118,21 +129,14 @@ index 0000000..88d48b5
--
2.1.0
-keep dn_expand available, for musl and glibc-2.34
-
-diff --git a/src/libreplace/arpa_nameser.h b/src/libreplace/arpa_nameser.h
-index e59ca3d..35e32b3 100644
--- a/src/libreplace/arpa_nameser.h
+++ b/src/libreplace/arpa_nameser.h
-@@ -59,11 +59,6 @@
+@@ -59,7 +59,7 @@
# define __P(x) x
#endif
-#if 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));
--#endif
- #define dn_skipname __dn_skipname
- int dn_skipname __P((const u_char *, const u_char *));
-
++#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));