From 40616a277c27449a77a035fff86ac2704bb7698c Mon Sep 17 00:00:00 2001 From: itojun Date: Sun, 4 Feb 2001 11:15:43 +0000 Subject: use external openssl. support KAME link-local scopeid (interface name). to sync with net/bind9, patches/patch-a[bc] are renamed into patches-a[ij]. --- net/bind9-current/Makefile | 6 ++++- net/bind9-current/files/patch-sum | 8 ++++--- net/bind9-current/patches/patch-ab | 39 ++++++++++++++++++++++++------- net/bind9-current/patches/patch-ac | 47 ++++++++++++++++++++++++++++++-------- net/bind9-current/patches/patch-ai | 10 ++++++++ net/bind9-current/patches/patch-aj | 10 ++++++++ 6 files changed, 99 insertions(+), 21 deletions(-) create mode 100644 net/bind9-current/patches/patch-ai create mode 100644 net/bind9-current/patches/patch-aj diff --git a/net/bind9-current/Makefile b/net/bind9-current/Makefile index c8b45881581..c67818f994b 100644 --- a/net/bind9-current/Makefile +++ b/net/bind9-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/04 10:43:23 itojun Exp $ +# $NetBSD: Makefile,v 1.12 2001/02/04 11:15:43 itojun Exp $ # DISTNAME= bind-${BIND_VERSION} @@ -23,6 +23,10 @@ CONFIGURE_ARGS+=--with-libtool=yes \ --localstatedir=/var \ --with-randomdev=/dev/urandom LDFLAGS+= -Wl,-R${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib +# use external OpenSSL. comment the following two lines out to use +# OpenSSL shipped with BIND9. +USE_SSL= yes +CONFIGURE_ARGS+=--with-openssl=${LOCALBASE} post-build: ${SED} \ diff --git a/net/bind9-current/files/patch-sum b/net/bind9-current/files/patch-sum index 68494a90691..1e3033033ea 100644 --- a/net/bind9-current/files/patch-sum +++ b/net/bind9-current/files/patch-sum @@ -1,10 +1,12 @@ -$NetBSD: patch-sum,v 1.2 2001/02/04 10:39:12 itojun Exp $ +$NetBSD: patch-sum,v 1.3 2001/02/04 11:15:43 itojun Exp $ MD5 (patch-aa) = 3be805415711351895d5a56902402991 -MD5 (patch-ab) = 124eeb4bc27370c87c6b16c47d8fc8b3 -MD5 (patch-ac) = 2f4f965b6829686ccad44bd79013b91b +MD5 (patch-ab) = 3e621698a3fcf50cf5d14c6f3044d948 +MD5 (patch-ac) = 39674a6def784d6011004d80fb36e271 MD5 (patch-ad) = a9fab71d9a7bdb2f81a199990a4b1258 MD5 (patch-ae) = eedcdca3234f09ebbea1cfeb0edf6328 MD5 (patch-af) = be4db95257198328567b7b6adef4a0ae MD5 (patch-ag) = 0e16722dc669ce3b617f46f7b82a910c MD5 (patch-ah) = f18716a5ede7acf819062adb99587c65 +MD5 (patch-ai) = 124eeb4bc27370c87c6b16c47d8fc8b3 +MD5 (patch-aj) = 2f4f965b6829686ccad44bd79013b91b diff --git a/net/bind9-current/patches/patch-ab b/net/bind9-current/patches/patch-ab index c4a8c25a06a..5271f385ab5 100644 --- a/net/bind9-current/patches/patch-ab +++ b/net/bind9-current/patches/patch-ab @@ -1,10 +1,33 @@ -$NetBSD: patch-ab,v 1.1 2001/02/04 10:39:12 itojun Exp $ +$NetBSD: patch-ab,v 1.2 2001/02/04 11:15:43 itojun Exp $ +support for kame scopeid extension (assumes that link scope = interface) ---- lib/lwres/man/Makefile.in- Sun Feb 4 19:01:13 2001 -+++ lib/lwres/man/Makefile.in Sun Feb 4 19:01:21 2001 -@@ -54,4 +54,4 @@ - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man3 +--- lib/lwres/getnameinfo.c- Sun Jan 28 15:34:19 2001 ++++ lib/lwres/getnameinfo.c Sun Jan 28 16:13:15 2001 +@@ -63,6 +63,9 @@ + #include - install:: installdirs -- for m in ${MANPAGES}; do ${INSTALL_PROGRAM} $$m ${DESTDIR}${mandir}/man3; done -+ for m in ${MANPAGES}; do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man3; done + #include ++#ifdef __KAME__ ++#include ++#endif + + #include + #include +@@ -219,13 +222,11 @@ + ((const struct sockaddr_in6 *)sa)->sin6_scope_id) { + char *p = numaddr + strlen(numaddr); + const char *stringscope = NULL; +-#if 0 ++ ++#ifdef __KAME__ + if ((flags & NI_NUMERICSCOPE) == 0) { +- /* +- * Vendors may want to add support for +- * non-numeric scope identifier. +- */ +- stringscope = foo; ++ stringscope = if_indextoname( ++ ((const struct sockaddr_in6 *)sa)->sin6_scope_id); + } + #endif + if (stringscope == NULL) { diff --git a/net/bind9-current/patches/patch-ac b/net/bind9-current/patches/patch-ac index 6fae06362fc..44248a686c8 100644 --- a/net/bind9-current/patches/patch-ac +++ b/net/bind9-current/patches/patch-ac @@ -1,10 +1,39 @@ -$NetBSD: patch-ac,v 1.1 2001/02/04 10:39:13 itojun Exp $ +$NetBSD: patch-ac,v 1.2 2001/02/04 11:15:43 itojun Exp $ +support for kame scopeid extension (assumes that link scope = interface) ---- bin/named/Makefile.in- Sun Feb 4 19:02:24 2001 -+++ bin/named/Makefile.in Sun Feb 4 19:02:32 2001 -@@ -103,4 +103,4 @@ - install:: named lwresd installdirs - ${LIBTOOL} ${INSTALL_PROGRAM} named ${DESTDIR}${sbindir} - (cd ${DESTDIR}${sbindir}; rm -f lwresd; @LN@ named lwresd) -- for m in ${MANPAGES}; do ${INSTALL_PROGRAM} $$m ${DESTDIR}${mandir}/man8; done -+ for m in ${MANPAGES}; do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man8; done +--- lib/lwres/getaddrinfo.c- Sun Jan 28 15:34:17 2001 ++++ lib/lwres/getaddrinfo.c Sun Jan 28 15:38:37 2001 +@@ -28,6 +28,9 @@ + #include + + #include ++#ifdef __KAME__ ++#include ++#endif + + #include + #include +@@ -262,14 +265,18 @@ + p = strchr(ntmp, '%'); + ep = NULL; + +- /* +- * Vendors may want to support non-numeric +- * scopeid around here. +- */ ++#ifdef __KAME__ ++ if (p != NULL) { ++ scopeid = if_nametoindex(p + 1); ++ if (scopeid) ++ p = NULL; ++ } ++#endif + +- if (p != NULL) ++ if (p != NULL) { + scopeid = (lwres_uint32_t)strtoul(p + 1, + &ep, 10); ++ } + if (p != NULL && ep != NULL && ep[0] == '\0') + *p = '\0'; + else { diff --git a/net/bind9-current/patches/patch-ai b/net/bind9-current/patches/patch-ai new file mode 100644 index 00000000000..d1eb9e81e73 --- /dev/null +++ b/net/bind9-current/patches/patch-ai @@ -0,0 +1,10 @@ +$NetBSD: patch-ai,v 1.1 2001/02/04 11:15:43 itojun Exp $ + +--- lib/lwres/man/Makefile.in- Sun Feb 4 19:01:13 2001 ++++ lib/lwres/man/Makefile.in Sun Feb 4 19:01:21 2001 +@@ -54,4 +54,4 @@ + $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man3 + + install:: installdirs +- for m in ${MANPAGES}; do ${INSTALL_PROGRAM} $$m ${DESTDIR}${mandir}/man3; done ++ for m in ${MANPAGES}; do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man3; done diff --git a/net/bind9-current/patches/patch-aj b/net/bind9-current/patches/patch-aj new file mode 100644 index 00000000000..a3511363207 --- /dev/null +++ b/net/bind9-current/patches/patch-aj @@ -0,0 +1,10 @@ +$NetBSD: patch-aj,v 1.1 2001/02/04 11:15:43 itojun Exp $ + +--- bin/named/Makefile.in- Sun Feb 4 19:02:24 2001 ++++ bin/named/Makefile.in Sun Feb 4 19:02:32 2001 +@@ -103,4 +103,4 @@ + install:: named lwresd installdirs + ${LIBTOOL} ${INSTALL_PROGRAM} named ${DESTDIR}${sbindir} + (cd ${DESTDIR}${sbindir}; rm -f lwresd; @LN@ named lwresd) +- for m in ${MANPAGES}; do ${INSTALL_PROGRAM} $$m ${DESTDIR}${mandir}/man8; done ++ for m in ${MANPAGES}; do ${INSTALL_DATA} $$m ${DESTDIR}${mandir}/man8; done -- cgit v1.2.3