Mon Dec 17 19:24:44 2018 UTC ()
Add proper autoconfery for res_close(), from maya@ (thanks!).


(schmonz)
diff -r1.10 -r1.11 pkgsrc/mail/libspf2/distinfo
diff -r1.3 -r1.4 pkgsrc/mail/libspf2/patches/patch-configure
diff -r0 -r1.1 pkgsrc/mail/libspf2/patches/patch-configure.ac
diff -r1.1 -r1.2 pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__dns__resolv.c
cvs diff -r1.10 -r1.11 pkgsrc/mail/libspf2/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/libspf2/distinfo 2018/12/17 18:32:42 1.10
+++ pkgsrc/mail/libspf2/distinfo 2018/12/17 19:24:44 1.11
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.10 2018/12/17 18:32:42 schmonz Exp $ 1$NetBSD: distinfo,v 1.11 2018/12/17 19:24:44 schmonz Exp $
2 2
3SHA1 (libspf2-1.2.10.tar.gz) = 3c31b20c737d9a8044440e5bf25697016b9cb582 3SHA1 (libspf2-1.2.10.tar.gz) = 3c31b20c737d9a8044440e5bf25697016b9cb582
4RMD160 (libspf2-1.2.10.tar.gz) = 5557435802896bec31362c1fa028e9e295656455 4RMD160 (libspf2-1.2.10.tar.gz) = 5557435802896bec31362c1fa028e9e295656455
5SHA512 (libspf2-1.2.10.tar.gz) = 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130 5SHA512 (libspf2-1.2.10.tar.gz) = 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130
6Size (libspf2-1.2.10.tar.gz) = 508842 bytes 6Size (libspf2-1.2.10.tar.gz) = 508842 bytes
7SHA1 (patch-configure) = 4457ad150c192031f5db020cfd10110f7e4f28b1 7SHA1 (patch-configure) = 0005180f6b9aedc45663dee6764c438d33078359
 8SHA1 (patch-configure.ac) = eb0fae2a2bbe86f0e54b56c3ab2ec696f9a6788c
8SHA1 (patch-src_include_spf__log.h) = 87b534d338b7fa36168cf8b745a285e38598cfed 9SHA1 (patch-src_include_spf__log.h) = 87b534d338b7fa36168cf8b745a285e38598cfed
9SHA1 (patch-src_libreplace_Makefile.in) = 12fab6f97efff6cc1944ebb5a5cf26fdb79971c2 10SHA1 (patch-src_libreplace_Makefile.in) = 12fab6f97efff6cc1944ebb5a5cf26fdb79971c2
10SHA1 (patch-src_libreplace_ensure__libreplace__symbol.c) = 1b2ccf11fe7cade3c7769e7388cdd79ee250b26e 11SHA1 (patch-src_libreplace_ensure__libreplace__symbol.c) = 1b2ccf11fe7cade3c7769e7388cdd79ee250b26e
11SHA1 (patch-src_libspf2_spf__dns__resolv.c) = 493449b294afa3154b8656d2155d3b144393d02c 12SHA1 (patch-src_libspf2_spf__dns__resolv.c) = b704c82f6627154470b07763d2233923bf0f6b10
cvs diff -r1.3 -r1.4 pkgsrc/mail/libspf2/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/mail/libspf2/patches/patch-configure 2013/07/06 11:09:26 1.3
+++ pkgsrc/mail/libspf2/patches/patch-configure 2018/12/17 19:24:44 1.4
@@ -1,15 +1,50 @@ @@ -1,15 +1,50 @@
1$NetBSD: patch-configure,v 1.3 2013/07/06 11:09:26 tron Exp $ 1$NetBSD: patch-configure,v 1.4 2018/12/17 19:24:44 schmonz Exp $
2 2
3Ensure that libreplace contains at least one symbol. 3Ensure that libreplace contains at least one symbol.
 4test for res_close, not available in OpenBSD
4 5
5--- configure.orig 2012-02-20 07:31:46.000000000 +0000 6--- configure.orig 2012-02-20 07:31:46.000000000 +0000
6+++ configure 2013-07-06 11:54:48.000000000 +0100 7+++ configure
7@@ -13577,7 +13577,7 @@ 8@@ -13494,6 +13494,33 @@ cat >>confdefs.h <<_ACEOF
 9 #define HAVE_DECL_RES_NDESTROY $ac_have_decl
 10 _ACEOF
 11
 12+ac_fn_c_check_decl "$LINENO" "res_close" "ac_cv_have_decl_res_close" "
 13+ #ifdef HAVE_SYS_TYPES_H
 14+ # include <sys/types.h>
 15+ #endif
 16+ #ifdef HAVE_SYS_SOCKET_H
 17+ # include <sys/socket.h> /* inet_ functions / structs */
 18+ #endif
 19+ #ifdef HAVE_NETINET_IN_H
 20+ # include <netinet/in.h> /* inet_ functions / structs */
 21+ #endif
 22+ #ifdef HAVE_ARPA_NAMESER_H
 23+ # include <arpa/nameser.h> /* DNS HEADER struct */
 24+ #endif
 25+ #ifdef HAVE_RESOLV_H
 26+ # include <resolv.h>
 27+ #endif
 28+
 29+"
 30+if test "x$ac_cv_have_decl_res_close" = xyes; then :
 31+ ac_have_decl=1
 32+else
 33+ ac_have_decl=0
 34+fi
 35+
 36+cat >>confdefs.h <<_ACEOF
 37+#define HAVE_DECL_RES_CLOSE $ac_have_decl
 38+_ACEOF
 39
 40 ac_fn_c_check_decl "$LINENO" "ns_t_spf" "ac_cv_have_decl_ns_t_spf" "
 41 #ifdef HAVE_SYS_TYPES_H
 42@@ -13577,7 +13604,7 @@ _ACEOF
8 fi 43 fi
9 done 44 done
10  45
11-for ac_func in strcasecmp strncasecmp strspn strtoul 46-for ac_func in strcasecmp strncasecmp strspn strtoul
12+for ac_func in ensure_libreplace_symbol strcasecmp strncasecmp strspn strtoul 47+for ac_func in ensure_libreplace_symbol strcasecmp strncasecmp strspn strtoul
13 do : 48 do :
14 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 49 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
15 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 50 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
File Added: pkgsrc/mail/libspf2/patches/patch-configure.ac
$NetBSD: patch-configure.ac,v 1.1 2018/12/17 19:24:44 schmonz Exp $

Test for res_close, not available in OpenBSD.

--- configure.ac.orig	2012-02-20 07:30:42.000000000 +0000
+++ configure.ac
@@ -231,6 +231,23 @@ AC_CHECK_DECLS([res_ndestroy], [], [], [
 	# include <resolv.h>
 	#endif
 	]])
+AC_CHECK_DECLS([res_close], [], [], [[
+	#ifdef HAVE_SYS_TYPES_H
+	# include <sys/types.h>
+	#endif
+	#ifdef HAVE_SYS_SOCKET_H
+	# include <sys/socket.h>		/* inet_ functions / structs */
+	#endif
+	#ifdef HAVE_NETINET_IN_H
+	# include <netinet/in.h>		/* inet_ functions / structs */
+	#endif
+	#ifdef HAVE_ARPA_NAMESER_H
+	#  include <arpa/nameser.h> /* DNS HEADER struct */
+	#endif
+	#ifdef HAVE_RESOLV_H
+	# include <resolv.h>
+	#endif
+	]])
 
 AC_CHECK_DECLS([ns_t_spf], [], [], [[
 	#ifdef HAVE_SYS_TYPES_H
cvs diff -r1.1 -r1.2 pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__dns__resolv.c (expand / switch to unified diff)

--- pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__dns__resolv.c 2018/12/17 18:32:42 1.1
+++ pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__dns__resolv.c 2018/12/17 19:24:44 1.2
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1$NetBSD: patch-src_libspf2_spf__dns__resolv.c,v 1.1 2018/12/17 18:32:42 schmonz Exp $ 1$NetBSD: patch-src_libspf2_spf__dns__resolv.c,v 1.2 2018/12/17 19:24:44 schmonz Exp $
2 2
3OpenBSD's libc resolver provides res_init() but not res_close(). 3OpenBSD's libc resolver provides res_init() but not res_close().
4 4
5--- src/libspf2/spf_dns_resolv.c.orig Sat Jan 28 08:24:47 2012 5--- src/libspf2/spf_dns_resolv.c.orig 2012-01-28 08:24:47.000000000 +0000
6+++ src/libspf2/spf_dns_resolv.c 6+++ src/libspf2/spf_dns_resolv.c
7@@ -607,7 +607,9 @@ SPF_dns_resolv_free(SPF_dns_server_t *spf_dns_server) 7@@ -606,7 +606,7 @@ SPF_dns_resolv_free(SPF_dns_server_t *sp
 8 {
8 SPF_ASSERT_NOTNULL(spf_dns_server); 9 SPF_ASSERT_NOTNULL(spf_dns_server);
9  10
10 #if ! HAVE_DECL_RES_NINIT 11-#if ! HAVE_DECL_RES_NINIT
11+# ifndef __OpenBSD__ 12+#if HAVE_DECL_RES_CLOSE
12 res_close(); 13 res_close();
13+# endif 
14 #endif 14 #endif
15  15
16 free(spf_dns_server);