From a83423fb4eebed9e2da941c777b24bf39f4e007e Mon Sep 17 00:00:00 2001 From: jakob Date: Tue, 21 Aug 2001 17:45:10 +0000 Subject: [PATCH] OpenBSD-current already has rdatainfo/rrsetinfo; patch by Wesley Griffin of NAI Labs. --- net/bind9/patches/patch-configure | 550 ++++++++++++++++++ net/bind9/patches/patch-configure.in | 23 + .../patch-lib_lwres_include_lwres_netdb.h.in | 23 + 3 files changed, 596 insertions(+) create mode 100644 net/bind9/patches/patch-configure create mode 100644 net/bind9/patches/patch-configure.in create mode 100644 net/bind9/patches/patch-lib_lwres_include_lwres_netdb.h.in diff --git a/net/bind9/patches/patch-configure b/net/bind9/patches/patch-configure new file mode 100644 index 00000000000..5f4a0fdb37e --- /dev/null +++ b/net/bind9/patches/patch-configure @@ -0,0 +1,550 @@ +--- configure.orig Wed Aug 8 20:06:25 2001 ++++ configure Wed Aug 8 20:06:14 2001 +@@ -15,7 +15,7 @@ + # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-# From configure.in Revision: 1.205.2.8 ++# From configure.in Revision: 1.205.2.9 + + ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*- + ## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc. +@@ -4060,10 +4060,42 @@ fi + rm -f conftest* + + ++# ++# Check for rrsetinfo ++# ++echo $ac_n "checking for struct rrsetinfo""... $ac_c" 1>&6 ++echo "configure:4068: checking for struct rrsetinfo" >&5 ++cat > conftest.$ac_ext < ++int main() { ++struct rrsetinfo r; return (0); ++; return 0; } ++EOF ++if { (eval echo configure:4078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ echo "$ac_t""yes" 1>&6 ++ ISC_LWRES_NEEDRRSETINFO="#undef ISC_LWRES_NEEDRRSETINFO" ++ cat >> confdefs.h <<\EOF ++#define HAVE_RRSETINFO 1 ++EOF ++ ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ echo "$ac_t""no" 1>&6 ++ ISC_LWRES_NEEDRRSETINFO="#define ISC_LWRES_NEEDRRSETINFO 1" ++fi ++rm -f conftest* ++ ++ + echo $ac_n "checking for int sethostent""... $ac_c" 1>&6 +-echo "configure:4065: checking for int sethostent" >&5 ++echo "configure:4097: checking for int sethostent" >&5 + cat > conftest.$ac_ext < +@@ -4071,7 +4103,7 @@ int main() { + int i = sethostent(0); return(0); + ; return 0; } + EOF +-if { (eval echo configure:4075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + ISC_LWRES_SETHOSTENTINT="#define ISC_LWRES_SETHOSTENTINT 1" +@@ -4086,9 +4118,9 @@ rm -f conftest* + + + echo $ac_n "checking for int endhostent""... $ac_c" 1>&6 +-echo "configure:4090: checking for int endhostent" >&5 ++echo "configure:4122: checking for int endhostent" >&5 + cat > conftest.$ac_ext < +@@ -4096,7 +4128,7 @@ int main() { + int i = endhostent(); return(0); + ; return 0; } + EOF +-if { (eval echo configure:4100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + ISC_LWRES_ENDHOSTENTINT="#define ISC_LWRES_ENDHOSTENTINT 1" +@@ -4111,9 +4143,9 @@ rm -f conftest* + + + echo $ac_n "checking for getnetbyaddr(in_addr_t, ...)""... $ac_c" 1>&6 +-echo "configure:4115: checking for getnetbyaddr(in_addr_t, ...)" >&5 ++echo "configure:4147: checking for getnetbyaddr(in_addr_t, ...)" >&5 + cat > conftest.$ac_ext < +@@ -4122,7 +4154,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:4126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + ISC_LWRES_GETNETBYADDRINADDR="#define ISC_LWRES_GETNETBYADDRINADDR 1" +@@ -4137,9 +4169,9 @@ rm -f conftest* + + + echo $ac_n "checking for int setnetent""... $ac_c" 1>&6 +-echo "configure:4141: checking for int setnetent" >&5 ++echo "configure:4173: checking for int setnetent" >&5 + cat > conftest.$ac_ext < +@@ -4147,7 +4179,7 @@ int main() { + int i = setnetent(0); return(0); + ; return 0; } + EOF +-if { (eval echo configure:4151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + ISC_LWRES_SETNETENTINT="#define ISC_LWRES_SETNETENTINT 1" +@@ -4162,9 +4194,9 @@ rm -f conftest* + + + echo $ac_n "checking for int endnetent""... $ac_c" 1>&6 +-echo "configure:4166: checking for int endnetent" >&5 ++echo "configure:4198: checking for int endnetent" >&5 + cat > conftest.$ac_ext < +@@ -4172,7 +4204,7 @@ int main() { + int i = endnetent(); return(0); + ; return 0; } + EOF +-if { (eval echo configure:4176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + ISC_LWRES_ENDNETENTINT="#define ISC_LWRES_ENDNETENTINT 1" +@@ -4187,9 +4219,9 @@ rm -f conftest* + + + echo $ac_n "checking for gethostbyaddr(const void *, size_t, ...)""... $ac_c" 1>&6 +-echo "configure:4191: checking for gethostbyaddr(const void *, size_t, ...)" >&5 ++echo "configure:4223: checking for gethostbyaddr(const void *, size_t, ...)" >&5 + cat > conftest.$ac_ext < +@@ -4198,7 +4230,7 @@ int main() { + return(0); + ; return 0; } + EOF +-if { (eval echo configure:4202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + ISC_LWRES_GETHOSTBYADDRVOID="#define ISC_LWRES_GETHOSTBYADDRVOID 1" +@@ -4213,9 +4245,9 @@ rm -f conftest* + + + echo $ac_n "checking for h_errno in netdb.h""... $ac_c" 1>&6 +-echo "configure:4217: checking for h_errno in netdb.h" >&5 ++echo "configure:4249: checking for h_errno in netdb.h" >&5 + cat > conftest.$ac_ext < +@@ -4223,7 +4255,7 @@ int main() { + h_errno = 1; return(0); + ; return 0; } + EOF +-if { (eval echo configure:4227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + ISC_LWRES_NEEDHERRNO="#undef ISC_LWRES_NEEDHERRNO" +@@ -4238,12 +4270,12 @@ rm -f conftest* + + + echo $ac_n "checking for getipnodebyname""... $ac_c" 1>&6 +-echo "configure:4242: checking for getipnodebyname" >&5 ++echo "configure:4274: checking for getipnodebyname" >&5 + if eval "test \"`echo '$''{'ac_cv_func_getipnodebyname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_getipnodebyname=yes" + else +@@ -4287,12 +4319,12 @@ ISC_LWRES_GETIPNODEPROTO="#define ISC_LW + fi + + echo $ac_n "checking for getnameinfo""... $ac_c" 1>&6 +-echo "configure:4291: checking for getnameinfo" >&5 ++echo "configure:4323: checking for getnameinfo" >&5 + if eval "test \"`echo '$''{'ac_cv_func_getnameinfo'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_getnameinfo=yes" + else +@@ -4336,12 +4368,12 @@ ISC_LWRES_GETNAMEINFOPROTO="#define ISC_ + fi + + echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 +-echo "configure:4340: checking for getaddrinfo" >&5 ++echo "configure:4372: checking for getaddrinfo" >&5 + if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_getaddrinfo=yes" + else +@@ -4389,12 +4421,12 @@ ISC_LWRES_GETADDRINFOPROTO="#define ISC_ + fi + + echo $ac_n "checking for gai_strerror""... $ac_c" 1>&6 +-echo "configure:4393: checking for gai_strerror" >&5 ++echo "configure:4425: checking for gai_strerror" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gai_strerror'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_gai_strerror=yes" + else +@@ -4447,9 +4479,9 @@ fi + # Look for a sysctl call to get the list of network interfaces. + # + echo $ac_n "checking for interface list sysctl""... $ac_c" 1>&6 +-echo "configure:4451: checking for interface list sysctl" >&5 ++echo "configure:4483: checking for interface list sysctl" >&5 + cat > conftest.$ac_ext < +@@ -4479,12 +4511,12 @@ rm -f conftest* + # Check for some other useful functions that are not ever-present. + # + echo $ac_n "checking for strsep""... $ac_c" 1>&6 +-echo "configure:4483: checking for strsep" >&5 ++echo "configure:4515: checking for strsep" >&5 + if eval "test \"`echo '$''{'ac_cv_func_strsep'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_strsep=yes" + else +@@ -4528,12 +4560,12 @@ ISC_PLATFORM_NEEDSTRSEP="#define ISC_PLA + fi + + echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 +-echo "configure:4532: checking for vsnprintf" >&5 ++echo "configure:4564: checking for vsnprintf" >&5 + if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_vsnprintf=yes" + else +@@ -4585,17 +4617,17 @@ fi + + + echo $ac_n "checking for sizeof(long long int) == sizeof(long int)""... $ac_c" 1>&6 +-echo "configure:4589: checking for sizeof(long long int) == sizeof(long int)" >&5 ++echo "configure:4621: checking for sizeof(long long int) == sizeof(long int)" >&5 + if test "$cross_compiling" = yes; then + echo "$ac_t""default yes" 1>&6 + ISC_PLATFORM_LONGLONGEQUALLONG="#define ISC_PLATFORM_LONGLONGEQUALLONG 1" + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + echo "$ac_t""yes" 1>&6 + ISC_PLATFORM_LONGLONGEQUALLONG="#define ISC_PLATFORM_LONGLONGEQUALLONG 1" +@@ -4615,12 +4647,12 @@ fi + # Security Stuff + # + echo $ac_n "checking for chroot""... $ac_c" 1>&6 +-echo "configure:4619: checking for chroot" >&5 ++echo "configure:4651: checking for chroot" >&5 + if eval "test \"`echo '$''{'ac_cv_func_chroot'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_chroot=yes" + else +@@ -4669,17 +4701,17 @@ for ac_hdr in linux/capability.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:4673: checking for $ac_hdr" >&5 ++echo "configure:4705: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -4709,17 +4741,17 @@ for ac_hdr in linux/prctl.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:4713: checking for $ac_hdr" >&5 ++echo "configure:4745: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -4750,9 +4782,9 @@ done + # BSD/OS, and perhaps some others, don't define rlim_t. + # + echo $ac_n "checking for type rlim_t""... $ac_c" 1>&6 +-echo "configure:4754: checking for type rlim_t" >&5 ++echo "configure:4786: checking for type rlim_t" >&5 + cat > conftest.$ac_ext < +@@ -4762,7 +4794,7 @@ int main() { + rlim_t rl = 19671212; return (0); + ; return 0; } + EOF +-if { (eval echo configure:4766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +@@ -4777,12 +4809,12 @@ else + fi + rm -f conftest* + echo $ac_n "checking sizeof rlim_cur""... $ac_c" 1>&6 +-echo "configure:4781: checking sizeof rlim_cur" >&5 ++echo "configure:4813: checking sizeof rlim_cur" >&5 + if test "$cross_compiling" = yes; then + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext < +@@ -4790,7 +4822,7 @@ else + #include + main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));} + EOF +-if { (eval echo configure:4794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + echo "$ac_t""int" 1>&6 + ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE int" +@@ -4803,7 +4835,7 @@ if test "$cross_compiling" = yes; then + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext < +@@ -4811,7 +4843,7 @@ else + #include + main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));} + EOF +-if { (eval echo configure:4815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + echo "$ac_t""long int" 1>&6 + ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long int" +@@ -4824,7 +4856,7 @@ if test "$cross_compiling" = yes; then + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext < +@@ -4832,7 +4864,7 @@ else + #include + main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));} + EOF +-if { (eval echo configure:4836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + echo "$ac_t""long long int" 1>&6 + ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int" +@@ -4935,7 +4967,7 @@ do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:4939: checking for $ac_word" >&5 ++echo "configure:4971: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_JADE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4981,7 +5013,7 @@ test -n "$JADE" || JADE="jade" + SGMLDIR="" + + echo $ac_n "checking for SGML files""... $ac_c" 1>&6 +-echo "configure:4985: checking for SGML files" >&5 ++echo "configure:5017: checking for SGML files" >&5 + for d in /usr/pkg/share/sgml /usr/local/share/sgml + do + if test -f $d/docbook/dsssl/modular/html/docbook.dsl +@@ -5007,7 +5039,7 @@ fi + XGMLDIR="" + + echo $ac_n "checking for XML files""... $ac_c" 1>&6 +-echo "configure:5011: checking for XML files" >&5 ++echo "configure:5043: checking for XML files" >&5 + for d in /usr/pkg/share/xml /usr/local/share/xml + do + if test -f $d/dtd/docbook/docbookx.dtd +@@ -5345,6 +5377,7 @@ s%@LWRES_PLATFORM_HAVESALEN@%$LWRES_PLAT + s%@ISC_PLATFORM_MSGHDRFLAVOR@%$ISC_PLATFORM_MSGHDRFLAVOR%g + s%@ISC_PLATFORM_NEEDPORTT@%$ISC_PLATFORM_NEEDPORTT%g + s%@ISC_LWRES_NEEDADDRINFO@%$ISC_LWRES_NEEDADDRINFO%g ++s%@ISC_LWRES_NEEDRRSETINFO@%$ISC_LWRES_NEEDRRSETINFO%g + s%@ISC_LWRES_SETHOSTENTINT@%$ISC_LWRES_SETHOSTENTINT%g + s%@ISC_LWRES_ENDHOSTENTINT@%$ISC_LWRES_ENDHOSTENTINT%g + s%@ISC_LWRES_GETNETBYADDRINADDR@%$ISC_LWRES_GETNETBYADDRINADDR%g diff --git a/net/bind9/patches/patch-configure.in b/net/bind9/patches/patch-configure.in new file mode 100644 index 00000000000..763cf88bea7 --- /dev/null +++ b/net/bind9/patches/patch-configure.in @@ -0,0 +1,23 @@ +--- configure.in.orig Wed Aug 8 20:06:51 2001 ++++ configure.in Wed Aug 8 20:06:08 2001 +@@ -1008,6 +1008,20 @@ AC_TRY_COMPILE([ + ISC_LWRES_NEEDADDRINFO="#define ISC_LWRES_NEEDADDRINFO 1"]) + AC_SUBST(ISC_LWRES_NEEDADDRINFO) + ++# ++# Check for rrsetinfo ++# ++AC_MSG_CHECKING(for struct rrsetinfo) ++AC_TRY_COMPILE([ ++#include ], ++[struct rrsetinfo r; return (0);], ++ [AC_MSG_RESULT(yes) ++ ISC_LWRES_NEEDRRSETINFO="#undef ISC_LWRES_NEEDRRSETINFO" ++ AC_DEFINE(HAVE_RRSETINFO)], ++ [AC_MSG_RESULT(no) ++ ISC_LWRES_NEEDRRSETINFO="#define ISC_LWRES_NEEDRRSETINFO 1"]) ++AC_SUBST(ISC_LWRES_NEEDRRSETINFO) ++ + AC_MSG_CHECKING(for int sethostent) + AC_TRY_COMPILE([ + #include ], diff --git a/net/bind9/patches/patch-lib_lwres_include_lwres_netdb.h.in b/net/bind9/patches/patch-lib_lwres_include_lwres_netdb.h.in new file mode 100644 index 00000000000..234f4380320 --- /dev/null +++ b/net/bind9/patches/patch-lib_lwres_include_lwres_netdb.h.in @@ -0,0 +1,23 @@ +--- lib/lwres/include/lwres/netdb.h.in.orig Wed Aug 8 15:32:09 2001 ++++ lib/lwres/include/lwres/netdb.h.in Wed Aug 8 15:32:46 2001 +@@ -154,6 +154,12 @@ struct addrinfo { + #define NI_NUMERICSCOPE 0x00000020 /*2553bis-00*/ + + /* ++ * Define if does not declare struct rrsetinfo. ++ */ ++@ISC_LWRES_NEEDRRSETINFO@ ++ ++#ifdef ISC_LWRES_NEEDRRSETINFO ++/* + * Structures for getrrsetbyname() + */ + struct rdatainfo { +@@ -186,6 +192,7 @@ struct rrsetinfo { + #define ERRSET_NOMEMORY 1 + #define ERRSET_FAIL 2 + #define ERRSET_INVAL 3 ++#endif + + /* + * Define to map into lwres_ namespace.