Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
+128
View File
@@ -0,0 +1,128 @@
$NetBSD: patch-bin_dig_dighost.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
* Avoid to use true as variable name.
--- bin/dig/dighost.c.orig 2011-12-07 17:23:28.000000000 +0000
+++ bin/dig/dighost.c
@@ -4369,7 +4369,7 @@ prepare_lookup(dns_name_t *name)
isc_result_t result;
isc_region_t r;
dns_rdataset_t *rdataset = NULL;
- isc_boolean_t true = ISC_TRUE;
+ isc_boolean_t isc_true = ISC_TRUE;
#endif
memset(namestr, 0, DNS_NAME_FORMATSIZE);
@@ -4383,7 +4383,7 @@ prepare_lookup(dns_name_t *name)
result = advanced_rrsearch(&rdataset, &ns.name,
dns_rdatatype_aaaa,
- dns_rdatatype_any, &true);
+ dns_rdatatype_any, &isc_true);
if (result == ISC_R_SUCCESS) {
for (result = dns_rdataset_first(rdataset);
result == ISC_R_SUCCESS;
@@ -4412,7 +4412,7 @@ prepare_lookup(dns_name_t *name)
rdataset = NULL;
result = advanced_rrsearch(&rdataset, &ns.name, dns_rdatatype_a,
- dns_rdatatype_any, &true);
+ dns_rdatatype_any, &isc_true);
if (result == ISC_R_SUCCESS) {
for (result = dns_rdataset_first(rdataset);
result == ISC_R_SUCCESS;
@@ -4531,11 +4531,11 @@ isc_result_t
initialization(dns_name_t *name)
{
isc_result_t result;
- isc_boolean_t true = ISC_TRUE;
+ isc_boolean_t isc_true = ISC_TRUE;
chase_nsrdataset = NULL;
result = advanced_rrsearch(&chase_nsrdataset, name, dns_rdatatype_ns,
- dns_rdatatype_any, &true);
+ dns_rdatatype_any, &isc_true);
if (result != ISC_R_SUCCESS) {
printf("\n;; NS RRset is missing to continue validation:"
" FAILED\n\n");
@@ -4888,7 +4888,7 @@ sigchase_td(dns_message_t *msg)
isc_result_t result;
dns_name_t *name = NULL;
isc_boolean_t have_answer = ISC_FALSE;
- isc_boolean_t true = ISC_TRUE;
+ isc_boolean_t isc_true = ISC_TRUE;
if ((result = dns_message_firstname(msg, DNS_SECTION_ANSWER))
== ISC_R_SUCCESS) {
@@ -4897,7 +4897,7 @@ sigchase_td(dns_message_t *msg)
initialization(name);
return;
}
- have_answer = true;
+ have_answer = isc_true;
} else {
if (!current_lookup->trace_root_sigchase) {
result = dns_message_firstname(msg,
@@ -5015,7 +5015,7 @@ sigchase_td(dns_message_t *msg)
dns_rdatatype_rrsig,
current_lookup
->rdtype_sigchase,
- &true);
+ &isc_true);
if (result == ISC_R_FAILURE) {
printf("\n;; RRset is missing to continue"
" validation SHOULD NOT APPEND:"
@@ -5028,7 +5028,7 @@ sigchase_td(dns_message_t *msg)
&chase_authority_name,
dns_rdatatype_rrsig,
dns_rdatatype_any,
- &true);
+ &isc_true);
if (result == ISC_R_FAILURE) {
printf("\n;; RRSIG is missing to continue"
" validation SHOULD NOT APPEND:"
@@ -5104,7 +5104,7 @@ sigchase_td(dns_message_t *msg)
&chase_authority_name,
dns_rdatatype_rrsig,
dns_rdatatype_ds,
- &true);
+ &isc_true);
if (result != ISC_R_SUCCESS) {
printf("\n;; DSset is missing to continue validation:"
" FAILED\n\n");
@@ -5192,7 +5192,7 @@ sigchase_td(dns_message_t *msg)
result = advanced_rrsearch(&chase_rdataset, &chase_name,
current_lookup->rdtype_sigchase,
dns_rdatatype_any ,
- &true);
+ &isc_true);
if (result == ISC_R_FAILURE) {
printf("\n;; RRsig of RRset is missing to continue validation"
" SHOULD NOT APPEND: FAILED\n\n");
@@ -5235,7 +5235,7 @@ getneededrr(dns_message_t *msg)
dns_name_t *name = NULL;
dns_rdata_t sigrdata = DNS_RDATA_INIT;
dns_rdata_sig_t siginfo;
- isc_boolean_t true = ISC_TRUE;
+ isc_boolean_t isc_true = ISC_TRUE;
if ((result = dns_message_firstname(msg, DNS_SECTION_ANSWER))
!= ISC_R_SUCCESS) {
@@ -5251,7 +5251,7 @@ getneededrr(dns_message_t *msg)
if (chase_rdataset == NULL) {
result = advanced_rrsearch(&chase_rdataset, name,
dns_rdatatype_any,
- dns_rdatatype_any, &true);
+ dns_rdatatype_any, &isc_true);
if (result != ISC_R_SUCCESS) {
printf("\n;; No Answers: Validation FAILED\n\n");
return (ISC_R_NOTFOUND);
@@ -5371,7 +5371,7 @@ getneededrr(dns_message_t *msg)
result = advanced_rrsearch(&chase_sigdsrdataset,
&chase_signame,
dns_rdatatype_rrsig,
- dns_rdatatype_ds, &true);
+ dns_rdatatype_ds, &isc_true);
if (result == ISC_R_FAILURE) {
printf(";; WARNING : NO RRSIG DS : RRSIG DS"
" should come with DS\n");
@@ -0,0 +1,15 @@
$NetBSD: patch-bin_tests_system_Makefile.in,v 1.3 2012/10/10 03:07:12 taca Exp $
Build fix for DragonFly while linking of driver.so.
--- bin/tests/system/Makefile.in.orig 2012-09-27 00:35:19.000000000 +0000
+++ bin/tests/system/Makefile.in
@@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@
@BIND9_MAKE_INCLUDES@
-SUBDIRS = dlzexternal filter-aaaa lwresd rpz rsabigexponent tkey tsiggss
+SUBDIRS = filter-aaaa lwresd rpz rsabigexponent tkey tsiggss
TARGETS =
@BIND9_MAKE_RULES@
@@ -0,0 +1,15 @@
$NetBSD: patch-config.threads.in,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
* Add DragonFly support.
--- config.threads.in.orig 2012-01-30 07:08:34.000000000 +0000
+++ config.threads.in
@@ -50,6 +50,8 @@ case $host in
use_threads=false ;;
*-freebsd*)
use_threads=true ;;
+*-dragonfly*)
+ use_threads=false ;;
[*-bsdi[234]*])
# Thread signals do not work reliably on some versions of BSD/OS.
use_threads=false ;;
+35
View File
@@ -0,0 +1,35 @@
$NetBSD: patch-configure,v 1.5 2013/06/06 02:55:03 taca Exp $
* Add DragonFly support.
* Link proper postgresql library.
* Avoid using "==" for argument of test(1).
--- configure.orig 2013-06-04 18:30:02.000000000 +0000
+++ configure
@@ -12177,7 +12177,7 @@ done
;;
esac
- if test "X$PYTHON" == "X"
+ if test "X$PYTHON" = "X"
then
case "$use_python" in
unspec)
@@ -14870,6 +14870,8 @@ case $host in
use_threads=false ;;
*-freebsd*)
use_threads=true ;;
+*-dragonfly*)
+ use_threads=false ;;
*-bsdi[234]*)
# Thread signals do not work reliably on some versions of BSD/OS.
use_threads=false ;;
@@ -19876,7 +19878,7 @@ $as_echo "no" >&6; }
fi
if test -n "-L$use_dlz_postgres_lib -lpq"
then
- DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_postgres_lib -lpq"
+ DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${PREFIX}/lib -lpq"
fi
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-configure.in,v 1.3 2013/06/06 02:55:03 taca Exp $
* Avoid using "==" for argument of test(1).
--- configure.in.orig 2013-06-04 18:30:02.000000000 +0000
+++ configure.in
@@ -157,7 +157,7 @@ case "$use_python" in
AC_PATH_PROGS(PYTHON, $use_python)
;;
esac
- if test "X$PYTHON" == "X"
+ if test "X$PYTHON" = "X"
then
case "$use_python" in
unspec)
@@ -0,0 +1,15 @@
$NetBSD: patch-contrib_dlz_config.dlz.in,v 1.1 2012/07/10 10:18:55 sbd Exp $
* Link proper postgresql library.
--- contrib/dlz/config.dlz.in.orig 2012-06-01 15:29:52.000000000 +0000
+++ contrib/dlz/config.dlz.in
@@ -105,7 +105,7 @@ case "$use_dlz_postgres" in
*)
DLZ_ADD_DRIVER(POSTGRES, dlz_postgres_driver,
[-I$use_dlz_postgres],
- [-L$use_dlz_postgres_lib -lpq])
+ [-L${PREFIX}/lib -lpq])
AC_MSG_RESULT(
[using PostgreSQL from $use_dlz_postgres_lib and $use_dlz_postgres])
@@ -0,0 +1,15 @@
$NetBSD: patch-lib_bind9_Makefile.in,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
* XXX: Install with proper permission.
--- lib/bind9/Makefile.in.orig 2009-12-05 23:31:40.000000000 +0000
+++ lib/bind9/Makefile.in
@@ -78,7 +78,7 @@ installdirs:
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
install:: timestamp installdirs
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libbind9.@A@ ${DESTDIR}${libdir}
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_SCRIPT} libbind9.@A@ ${DESTDIR}${libdir}
clean distclean::
rm -f libbind9.@A@ timestamp
@@ -0,0 +1,15 @@
$NetBSD: patch-lib_dns_Makefile.in,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
* XXX: Install with proper permission.
--- lib/dns/Makefile.in.orig 2011-10-11 00:09:03.000000000 +0000
+++ lib/dns/Makefile.in
@@ -135,7 +135,7 @@ installdirs:
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
install:: timestamp installdirs
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns.@A@ ${DESTDIR}${libdir}
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_SCRIPT} libdns.@A@ ${DESTDIR}${libdir}
clean distclean::
rm -f libdns.@A@ timestamp
+17
View File
@@ -0,0 +1,17 @@
$NetBSD: patch-lib_dns_rbt.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
* Disable inline on powerpc.
--- lib/dns/rbt.c.orig 2011-08-25 05:56:50.000000000 +0000
+++ lib/dns/rbt.c
@@ -177,6 +177,10 @@ Name(dns_rbtnode_t *node) {
static void dns_rbt_printnodename(dns_rbtnode_t *node);
#endif
+#if !defined(inline) && defined(__powerpc__)
+#define inline /**/
+#endif
+
static inline dns_rbtnode_t *
find_up(dns_rbtnode_t *node) {
dns_rbtnode_t *root;
@@ -0,0 +1,15 @@
$NetBSD: patch-lib_isc_Makefile.in,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
* XXX: Install with proper permission.
--- lib/isc/Makefile.in.orig 2011-07-07 23:47:49.000000000 +0000
+++ lib/isc/Makefile.in
@@ -127,7 +127,7 @@ installdirs:
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
install:: timestamp installdirs
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc.@A@ ${DESTDIR}${libdir}
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_SCRIPT} libisc.@A@ ${DESTDIR}${libdir}
clean distclean::
rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \
@@ -0,0 +1,15 @@
$NetBSD: patch-lib_isccc_Makefile.in,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
* XXX: Install with proper permission.
--- lib/isccc/Makefile.in.orig 2011-02-19 23:47:38.000000000 +0000
+++ lib/isccc/Makefile.in
@@ -80,7 +80,7 @@ installdirs:
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
install:: timestamp installdirs
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccc.@A@ ${DESTDIR}${libdir}
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_SCRIPT} libisccc.@A@ ${DESTDIR}${libdir}
clean distclean::
rm -f libisccc.@A@ timestamp
@@ -0,0 +1,15 @@
$NetBSD: patch-lib_isccfg_Makefile.in,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
* XXX: Install with proper permission.
--- lib/isccfg/Makefile.in.orig 2011-03-10 04:36:16.000000000 +0000
+++ lib/isccfg/Makefile.in
@@ -77,7 +77,7 @@ installdirs:
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
install:: timestamp installdirs
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccfg.@A@ ${DESTDIR}${libdir}
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_SCRIPT} libisccfg.@A@ ${DESTDIR}${libdir}
clean distclean::
rm -f libisccfg.@A@ timestamp
@@ -0,0 +1,15 @@
$NetBSD: patch-lib_lwres_Makefile.in,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
* XXX: Install with proper permission.
--- lib/lwres/Makefile.in.orig 2007-06-19 23:47:22.000000000 +0000
+++ lib/lwres/Makefile.in
@@ -78,7 +78,7 @@ installdirs:
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
install:: timestamp installdirs
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} liblwres.@A@ ${DESTDIR}${libdir}
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_SCRIPT} liblwres.@A@ ${DESTDIR}${libdir}
clean distclean::
rm -f liblwres.@A@ liblwres.la timestamp
@@ -0,0 +1,41 @@
$NetBSD: patch-lib_lwres_getaddrinfo.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
* Add fix for KAME based implementation.
--- lib/lwres/getaddrinfo.c.orig 2008-11-25 23:47:23.000000000 +0000
+++ lib/lwres/getaddrinfo.c
@@ -142,6 +142,10 @@
#include <lwres/netdb.h>
#include <lwres/stdlib.h>
+#ifdef __KAME__
+#include <net/if.h>
+#endif
+
#define SA(addr) ((struct sockaddr *)(addr))
#define SIN(addr) ((struct sockaddr_in *)(addr))
#define SIN6(addr) ((struct sockaddr_in6 *)(addr))
@@ -366,14 +370,22 @@ lwres_getaddrinfo(const char *hostname,
p = strchr(ntmp, '%');
ep = NULL;
+#ifdef __KAME__
+ if (p != NULL) {
+ scopeid = if_nametoindex(p + 1);
+ if (scopeid)
+ p = NULL;
+ }
+#endif
/*
* Vendors may want to support non-numeric
* scopeid around here.
*/
- 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 {
@@ -0,0 +1,34 @@
$NetBSD: patch-lib_lwres_getnameinfo.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
* Add fix for KAME based implementation.
--- lib/lwres/getnameinfo.c.orig 2011-08-30 23:46:53.000000000 +0000
+++ lib/lwres/getnameinfo.c
@@ -121,6 +121,10 @@
#include <lwres/netdb.h>
#include "print_p.h"
+#ifdef __KAME__
+#include <net/if.h>
+#endif
+
#include "assert_p.h"
#define SUCCESS 0
@@ -272,13 +276,9 @@ lwres_getnameinfo(const struct sockaddr
((const struct sockaddr_in6 *)sa)->sin6_scope_id) {
char *p = numaddr + strlen(numaddr);
const char *stringscope = NULL;
-#if 0
- if ((flags & NI_NUMERICSCOPE) == 0) {
- /*
- * Vendors may want to add support for
- * non-numeric scope identifier.
- */
- stringscope = foo;
+#ifdef __KAME__
+ stringscope = if_indextoname(
+ ((const struct sockaddr_in6 *)sa)->sin6_scope_id);
}
#endif
if (stringscope == NULL) {