| 1 |
commit: dbb8a5c9f749cc11e61cfe558f164b165cbc30cb |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 26 16:55:36 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 26 16:55:44 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb8a5c9 |
| 7 |
|
| 8 |
mail-filter/libspf2-1.2.11: unbreak dn patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/820347 |
| 11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/libspf2-1.2.11-undefined-dn_.patch | 30 ++++++++++++---------- |
| 15 |
1 file changed, 17 insertions(+), 13 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index cc2638cf766..279089b6cb9 100644 |
| 19 |
--- a/mail-filter/libspf2/files/libspf2-1.2.11-undefined-dn_.patch |
| 20 |
+++ b/mail-filter/libspf2/files/libspf2-1.2.11-undefined-dn_.patch |
| 21 |
@@ -3,6 +3,9 @@ From: Natanael Copa <ncopa@×××××××××××.org> |
| 22 |
Date: Thu, 11 Sep 2014 08:09:34 +0000 |
| 23 |
Subject: [PATCH] provide dn_skipname |
| 24 |
|
| 25 |
+Modified for Gentoo to include dn_expand fix |
| 26 |
+keep dn_expand available, for musl and glibc-2.34 |
| 27 |
+ |
| 28 |
--- |
| 29 |
configure.ac | 2 +- |
| 30 |
src/libreplace/__dn_skipname.c | 87 ++++++++++++++++++++++++++++++++++++++++++ |
| 31 |
@@ -13,7 +16,15 @@ diff --git a/configure.ac b/configure.ac |
| 32 |
index 63e398c..739da3b 100644 |
| 33 |
--- a/configure.ac |
| 34 |
+++ b/configure.ac |
| 35 |
-@@ -274,7 +274,7 @@ AC_CHECK_FUNCS([strcasecmp strncasecmp strspn strtoul]) |
| 36 |
+@@ -269,6 +269,7 @@ |
| 37 |
+ #endif |
| 38 |
+ ]]) |
| 39 |
+ |
| 40 |
++AC_CHECK_FUNCS([dn_expand]) |
| 41 |
+ AC_CHECK_FUNCS([ftruncate gethostname memmove memset socket]) |
| 42 |
+ AC_CHECK_FUNCS([strchr strcspn strdup strerror]) |
| 43 |
+ AC_CHECK_FUNCS([strcasecmp strncasecmp strspn strtoul]) |
| 44 |
+@@ -274,7 +274,7 @@ |
| 45 |
AC_CHECK_FUNCS([gethostbyname inet_ntoa select strrchr strstr strtol]) |
| 46 |
|
| 47 |
AC_REPLACE_FUNCS([getopt_long_only strncasecmp]) |
| 48 |
@@ -118,21 +129,14 @@ index 0000000..88d48b5 |
| 49 |
-- |
| 50 |
2.1.0 |
| 51 |
|
| 52 |
-keep dn_expand available, for musl and glibc-2.34 |
| 53 |
- |
| 54 |
-diff --git a/src/libreplace/arpa_nameser.h b/src/libreplace/arpa_nameser.h |
| 55 |
-index e59ca3d..35e32b3 100644 |
| 56 |
--- a/src/libreplace/arpa_nameser.h |
| 57 |
+++ b/src/libreplace/arpa_nameser.h |
| 58 |
-@@ -59,11 +59,6 @@ |
| 59 |
+@@ -59,7 +59,7 @@ |
| 60 |
# define __P(x) x |
| 61 |
#endif |
| 62 |
|
| 63 |
-#if defined( HAVE_ARPA_NAMESER_H ) && defined( HAVE_NS_TYPE ) |
| 64 |
--#define dn_expand __dn_expand |
| 65 |
--int dn_expand __P((const u_char *, const u_char *, const u_char *, |
| 66 |
-- char *, int)); |
| 67 |
--#endif |
| 68 |
- #define dn_skipname __dn_skipname |
| 69 |
- int dn_skipname __P((const u_char *, const u_char *)); |
| 70 |
- |
| 71 |
++#if !defined(HAVE_DN_EXPAND) && defined( HAVE_ARPA_NAMESER_H ) && defined( HAVE_NS_TYPE ) |
| 72 |
+ #define dn_expand __dn_expand |
| 73 |
+ int dn_expand __P((const u_char *, const u_char *, const u_char *, |
| 74 |
+ char *, int)); |
Archives