Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
# $NetBSD: Makefile,v 1.26.2.3 2013/07/27 11:35:40 tron Exp $
|
||||
# $NetBSD: Makefile,v 1.34 2014/03/11 14:34:38 jperkin Exp $
|
||||
|
||||
DISTNAME= bind-${BIND_VERSION}
|
||||
PKGNAME= ${DISTNAME:S/-P/pl/}
|
||||
PKGREVISION= 1
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
|
||||
http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
|
||||
@@ -14,7 +15,7 @@ CONFLICTS+= host-[0-9]*
|
||||
|
||||
MAKE_JOBS_SAFE= no
|
||||
|
||||
BIND_VERSION= 9.9.3-P2
|
||||
BIND_VERSION= 9.9.5
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
@@ -66,6 +67,7 @@ PLIST.inet6= yes
|
||||
.endif
|
||||
|
||||
RCD_SCRIPTS= lwresd named9
|
||||
SMF_METHODS= named
|
||||
|
||||
INSTALLATION_DIRS= ${DOCDIR} share/doc/bind9/arm
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
@comment $NetBSD: PLIST,v 1.4 2013/06/06 02:55:03 taca Exp $
|
||||
@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:05:07 jperkin Exp $
|
||||
bin/bind9-config
|
||||
bin/dig
|
||||
bin/host
|
||||
bin/isc-config.sh
|
||||
@@ -14,6 +15,7 @@ include/dns/byaddr.h
|
||||
include/dns/cache.h
|
||||
include/dns/callbacks.h
|
||||
include/dns/cert.h
|
||||
include/dns/client.h
|
||||
include/dns/clientinfo.h
|
||||
include/dns/compress.h
|
||||
include/dns/db.h
|
||||
@@ -68,6 +70,7 @@ include/dns/ssu.h
|
||||
include/dns/tcpmsg.h
|
||||
include/dns/time.h
|
||||
include/dns/tkey.h
|
||||
include/dns/tsec.h
|
||||
include/dns/tsig.h
|
||||
include/dns/ttl.h
|
||||
include/dns/types.h
|
||||
@@ -145,11 +148,13 @@ include/isc/resource.h
|
||||
include/isc/result.h
|
||||
include/isc/resultclass.h
|
||||
include/isc/rwlock.h
|
||||
include/isc/safe.h
|
||||
include/isc/serial.h
|
||||
include/isc/sha1.h
|
||||
include/isc/sha2.h
|
||||
include/isc/sockaddr.h
|
||||
include/isc/socket.h
|
||||
include/isc/stat.h
|
||||
include/isc/stdio.h
|
||||
include/isc/stdlib.h
|
||||
include/isc/stdtime.h
|
||||
@@ -161,6 +166,7 @@ include/isc/taskpool.h
|
||||
include/isc/thread.h
|
||||
include/isc/time.h
|
||||
include/isc/timer.h
|
||||
include/isc/tm.h
|
||||
include/isc/types.h
|
||||
include/isc/util.h
|
||||
include/isc/version.h
|
||||
@@ -204,6 +210,7 @@ lib/libisccc.la
|
||||
lib/libisccfg.la
|
||||
lib/liblwres.la
|
||||
man/man1/arpaname.1
|
||||
man/man1/bind9-config.1
|
||||
man/man1/dig.1
|
||||
man/man1/host.1
|
||||
man/man1/isc-config.sh.1
|
||||
@@ -318,6 +325,7 @@ man/man8/rndc.8
|
||||
sbin/arpaname
|
||||
sbin/ddns-confgen
|
||||
sbin/dnssec-dsfromkey
|
||||
sbin/dnssec-importkey
|
||||
sbin/dnssec-keyfromlabel
|
||||
sbin/dnssec-keygen
|
||||
sbin/dnssec-revoke
|
||||
@@ -352,6 +360,8 @@ share/doc/bind9/arm/Bv9ARM.html
|
||||
share/doc/bind9/arm/man.arpaname.html
|
||||
share/doc/bind9/arm/man.ddns-confgen.html
|
||||
share/doc/bind9/arm/man.dig.html
|
||||
share/doc/bind9/arm/man.dnssec-checkds.html
|
||||
share/doc/bind9/arm/man.dnssec-coverage.html
|
||||
share/doc/bind9/arm/man.dnssec-dsfromkey.html
|
||||
share/doc/bind9/arm/man.dnssec-keyfromlabel.html
|
||||
share/doc/bind9/arm/man.dnssec-keygen.html
|
||||
@@ -371,5 +381,3 @@ share/doc/bind9/arm/man.nsupdate.html
|
||||
share/doc/bind9/arm/man.rndc-confgen.html
|
||||
share/doc/bind9/arm/man.rndc.conf.html
|
||||
share/doc/bind9/arm/man.rndc.html
|
||||
share/examples/rc.d/lwresd
|
||||
share/examples/rc.d/named9
|
||||
|
||||
@@ -1,23 +1,19 @@
|
||||
$NetBSD: distinfo,v 1.16.2.3 2013/07/27 11:35:40 tron Exp $
|
||||
$NetBSD: distinfo,v 1.23 2014/02/02 07:58:20 taca Exp $
|
||||
|
||||
SHA1 (bind-9.9.3-P2.tar.gz) = a0235692c488b3fadf54a15858b1f13ae2ab6979
|
||||
RMD160 (bind-9.9.3-P2.tar.gz) = 4d760937864bb7edb3d9862cbe446235a8a5ddee
|
||||
Size (bind-9.9.3-P2.tar.gz) = 7459422 bytes
|
||||
SHA1 (rl-9.9.3-P1.patch) = f4538d33c6d958e579752f90c9cee7db5dd1a6fa
|
||||
RMD160 (rl-9.9.3-P1.patch) = df1b825f2faa314680246be58cc74cb93a730105
|
||||
Size (rl-9.9.3-P1.patch) = 103910 bytes
|
||||
SHA1 (patch-bin_dig_dighost.c) = 186cdc70605242afb0211dc8802ec75677a65614
|
||||
SHA1 (patch-bin_tests_system_Makefile.in) = 1f268808c55223ac11d1794039503424a51ee71b
|
||||
SHA1 (bind-9.9.5.tar.gz) = f3fe8000628ec57f332aec1ad9587b767208a38f
|
||||
RMD160 (bind-9.9.5.tar.gz) = cc2351d9af779ed1a1dd5909a10cce28ddb41747
|
||||
Size (bind-9.9.5.tar.gz) = 7729695 bytes
|
||||
SHA1 (patch-bin_dig_dighost.c) = 72cb7676cdf9cd4b44bc62c72bcf29127d9fbffe
|
||||
SHA1 (patch-bin_tests_system_Makefile.in) = 5701c49d7177fccae6c08a2176988e30a3cf58a0
|
||||
SHA1 (patch-config.threads.in) = 227b83efe9cb3e301aaac9b97cf42f1fb8ad06b2
|
||||
SHA1 (patch-configure) = cd7f1b06f3849016c971b5947578128594a04b9a
|
||||
SHA1 (patch-configure.in) = cc6fcdd0ad9fdc9546dc15d51c267bd4ac1453a6
|
||||
SHA1 (patch-configure) = c94a5c1c9dd55ff245c1adbb7c4ddb4a8e16a171
|
||||
SHA1 (patch-contrib_dlz_config.dlz.in) = f18bec63fbfce7cb2cd72929058ce3770fce458f
|
||||
SHA1 (patch-lib_bind9_Makefile.in) = 89e21d21fa512f11a2fdb8d7455abd5d95f20ba5
|
||||
SHA1 (patch-lib_dns_Makefile.in) = 1770a8bd86901c618b11d255f3af54748d04b759
|
||||
SHA1 (patch-lib_bind9_Makefile.in) = 4d6c592646015c37a8c47dda8056fa01c9636dcd
|
||||
SHA1 (patch-lib_dns_Makefile.in) = eab413fb2708b275ea944c6309bd3448e9ddec26
|
||||
SHA1 (patch-lib_dns_rbt.c) = df4b029369d9fa3b250d8505b5f7590e2cd86654
|
||||
SHA1 (patch-lib_isc_Makefile.in) = 5e0739d19957b1f26bcc24a6c76bcab6248cbff5
|
||||
SHA1 (patch-lib_isc_Makefile.in) = bd1d80457fb97d496306b84d4205296fd2577824
|
||||
SHA1 (patch-lib_isccc_Makefile.in) = a31831872b7724cb84f663ed70a82335d812f95f
|
||||
SHA1 (patch-lib_isccfg_Makefile.in) = 5ce4a85c1a13eca255804850b18b421418a2a01b
|
||||
SHA1 (patch-lib_isccfg_Makefile.in) = 0de690dd4f46c42e4152f1d64d8edaecb69c6844
|
||||
SHA1 (patch-lib_lwres_Makefile.in) = 40fd0ed1d699cb2f6258f33888a9495899373767
|
||||
SHA1 (patch-lib_lwres_getaddrinfo.c) = ccc00e446867785e401eb92e63e05505dfd01087
|
||||
SHA1 (patch-lib_lwres_getnameinfo.c) = 418ad349cf52925c9e8051b5c71d9d51ea8d2fb1
|
||||
|
||||
141
net/bind99/files/smf/manifest.xml
Normal file
141
net/bind99/files/smf/manifest.xml
Normal file
@@ -0,0 +1,141 @@
|
||||
<?xml version="1.0"?>
|
||||
<!--
|
||||
CDDL HEADER START
|
||||
|
||||
The contents of this file are subject to the terms of the
|
||||
Common Development and Distribution License (the "License").
|
||||
You may not use this file except in compliance with the License.
|
||||
|
||||
You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
||||
or http://www.opensolaris.org/os/licensing.
|
||||
See the License for the specific language governing permissions
|
||||
and limitations under the License.
|
||||
|
||||
When distributing Covered Code, include this CDDL HEADER in each
|
||||
file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
||||
If applicable, add the following below this CDDL HEADER, with the
|
||||
fields enclosed by brackets "[]" replaced with your own identifying
|
||||
information: Portions Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
CDDL HEADER END
|
||||
-->
|
||||
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
|
||||
<!--
|
||||
Copyright 2007 Sun Microsystems, Inc. All rights reserved.
|
||||
Use is subject to license terms.
|
||||
|
||||
ident "@(#)server.xml 1.8 07/06/19 SMI"
|
||||
-->
|
||||
<!-- Portions Copyright 2007 Vedran Bender -->
|
||||
<service_bundle type='manifest' name='@SMF_NAME@'>
|
||||
<service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
|
||||
<dependency name='filesystem_minimal' grouping='require_all' restart_on='none' type='service'>
|
||||
<service_fmri value='svc:/system/filesystem/local' />
|
||||
</dependency>
|
||||
<dependency name='loopback' grouping='require_any' restart_on='error' type='service'>
|
||||
<service_fmri value='svc:/network/loopback' />
|
||||
</dependency>
|
||||
<dependency name='network' grouping='optional_all' restart_on='error' type='service'>
|
||||
<service_fmri value='svc:/milestone/network' />
|
||||
</dependency>
|
||||
<dependency name='config-files' grouping='require_any' restart_on='refresh' type='path'>
|
||||
<service_fmri value='file://localhost@PKG_SYSCONFDIR@/named.conf' />
|
||||
</dependency>
|
||||
<exec_method type='method' name='stop' exec=':kill' timeout_seconds='60' />
|
||||
<!--
|
||||
In order to run multiple named(1M) processes with their own
|
||||
configuration file or properties each must have a unique
|
||||
instance.
|
||||
-->
|
||||
<instance name='default' enabled='false'>
|
||||
<exec_method type='method' name='start' exec='@PREFIX@/@SMF_METHOD_FILE.named@ %m %i' timeout_seconds='60'>
|
||||
<method_context>
|
||||
<!--
|
||||
privileges: (see privileges(5) and /etc/security/priv_names)
|
||||
file_dac_read, file_dac_search:
|
||||
Necessary for reading the configuration file
|
||||
even it is restricted by the file permission.
|
||||
net_privaddr:
|
||||
Bind to a privileged port number.
|
||||
sys_resource:
|
||||
Permit the setting of resource limits (eg. stack
|
||||
size).
|
||||
proc_chroot:
|
||||
Permit use of chroot(2).
|
||||
-->
|
||||
<method_credential user='root' group='root' privileges='basic,!proc_session,!proc_info,!file_link_any,net_privaddr,file_dac_read,file_dac_search,sys_resource,proc_chroot' />
|
||||
</method_context>
|
||||
</exec_method>
|
||||
<!--
|
||||
SIGHUP causes named to reread its configuration file, but not any
|
||||
of the properties below.
|
||||
-->
|
||||
<exec_method type='method' name='refresh' exec=':kill -HUP' timeout_seconds='60'>
|
||||
<method_context />
|
||||
</exec_method>
|
||||
<property_group name='general' type='framework'>
|
||||
<!-- manage DNS server state -->
|
||||
<propval name='action_authorization' type='astring' value='solaris.smf.manage.bind' />
|
||||
<propval name='value_authorization' type='astring' value='solaris.smf.manage.bind' />
|
||||
</property_group>
|
||||
<!-- Default property settings for named(1M) instance. -->
|
||||
<property_group name='options' type='application'>
|
||||
<!--
|
||||
server: specifies an alternative server command. If
|
||||
not specified the default /usr/sbin/named is used.
|
||||
-->
|
||||
<propval name='server' type='astring' value='' />
|
||||
<!--
|
||||
configuration_file: specifies an alternative
|
||||
configuration file to be used. The property is similar
|
||||
to named(1M) command line option '-c'
|
||||
-->
|
||||
<propval name='configuration_file' type='astring' value='' />
|
||||
<!--
|
||||
ip_interfaces: specifies which IP transport BIND will
|
||||
transmit on. Possible values are 'IPv4' or 'IPv6'. Any
|
||||
other setting assumes 'all', the default.
|
||||
Equivalent command line option '-4' or '-6'.
|
||||
-->
|
||||
<propval name='ip_interfaces' type='astring' value='all' />
|
||||
<!--
|
||||
listen_on_port: Specifies the default UDP and TCP port
|
||||
which will be used to listen for DNS requests.
|
||||
Equivalent command line option '-p <integer>'.
|
||||
-->
|
||||
<propval name='listen_on_port' type='integer' value='0' />
|
||||
<!--
|
||||
debug_level: Specifies the default debug level. The
|
||||
default is 0; no debugging. The Higher the number the
|
||||
more verbose debug information becomes.
|
||||
Equivalent command line option '-d <integer>'.
|
||||
-->
|
||||
<propval name='debug_level' type='integer' value='0' />
|
||||
<!--
|
||||
threads: Specifies the number of cpu worker threads to
|
||||
create. The default of 0 causes named to try and
|
||||
determine the number of CPUs present and create one
|
||||
thread per CPU.
|
||||
Equivalent command line option '-n <integer>'.
|
||||
-->
|
||||
<propval name='threads' type='integer' value='0' />
|
||||
<!--
|
||||
chroot_dir: Change the root directory using chroot(2)
|
||||
to directory after processing the command line
|
||||
arguments, but before reading the configuration file.
|
||||
Equivalent command line option '-t <pathname>'.
|
||||
-->
|
||||
<propval name='chroot_dir' type='astring' value='' />
|
||||
</property_group>
|
||||
</instance>
|
||||
<stability value='Unstable' />
|
||||
<template>
|
||||
<common_name>
|
||||
<loctext xml:lang='C'>BIND DNS server</loctext>
|
||||
</common_name>
|
||||
<documentation>
|
||||
<manpage title='named' section='1M' manpath='@PREFIX@/@PKGMANDIR@' />
|
||||
</documentation>
|
||||
</template>
|
||||
</service>
|
||||
</service_bundle>
|
||||
117
net/bind99/files/smf/named.sh
Normal file
117
net/bind99/files/smf/named.sh
Normal file
@@ -0,0 +1,117 @@
|
||||
#!@SMF_METHOD_SHELL@
|
||||
#
|
||||
# CDDL HEADER START
|
||||
#
|
||||
# The contents of this file are subject to the terms of the
|
||||
# Common Development and Distribution License (the "License").
|
||||
# You may not use this file except in compliance with the License.
|
||||
#
|
||||
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
||||
# or http://www.opensolaris.org/os/licensing.
|
||||
# See the License for the specific language governing permissions
|
||||
# and limitations under the License.
|
||||
#
|
||||
# When distributing Covered Code, include this CDDL HEADER in each
|
||||
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
||||
# If applicable, add the following below this CDDL HEADER, with the
|
||||
# fields enclosed by brackets "[]" replaced with your own identifying
|
||||
# information: Portions Copyright [yyyy] [name of copyright owner]
|
||||
#
|
||||
# CDDL HEADER END
|
||||
#
|
||||
# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
|
||||
# Use is subject to license terms.
|
||||
#
|
||||
#pragma ident "@(#)dns-server.sh 1.1 07/03/26 SMI"
|
||||
|
||||
# smf_method(5) start/stop script required for server DNS
|
||||
|
||||
. /lib/svc/share/smf_include.sh
|
||||
|
||||
result=${SMF_EXIT_OK}
|
||||
|
||||
# Read command line arguments
|
||||
method="$1" # %m
|
||||
instance="$2" # %i
|
||||
|
||||
# Set defaults; SMF_FMRI should have been set, but just in case.
|
||||
if [ -z "$SMF_FMRI" ]; then
|
||||
SMF_FMRI="svc:/@SMF_PREFIX@/@SMF_NAME@:${instance}"
|
||||
fi
|
||||
server="@PREFIX@/sbin/named"
|
||||
I=`/usr/bin/basename $0`
|
||||
|
||||
case "$method" in
|
||||
'start')
|
||||
cmdopts=""
|
||||
properties="debug_level ip_interfaces listen_on_port
|
||||
threads chroot_dir configuration_file server"
|
||||
|
||||
for prop in $properties
|
||||
do
|
||||
value=`/usr/bin/svcprop -p options/${prop} ${SMF_FMRI}`
|
||||
if [ -z "${value}" -o "${value}" = '""' ]; then
|
||||
continue;
|
||||
fi
|
||||
|
||||
case $prop in
|
||||
'debug_level')
|
||||
if [ ${value} -gt 0 ]; then
|
||||
cmdopts="${cmdopts} -d ${value}"
|
||||
fi
|
||||
;;
|
||||
'ip_interfaces')
|
||||
case ${value} in
|
||||
'IPv4')
|
||||
cmdopts="${cmdopts} -4";;
|
||||
'IPv6')
|
||||
cmdopts="${cmdopts} -6";;
|
||||
'all')
|
||||
: # Default is all, therefore ignore.
|
||||
;;
|
||||
*)
|
||||
echo "$I: Unrecognised value in service instance property" >&2
|
||||
echo "$I: options/${prop} : ${value}" >&2
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
'listen_on_port')
|
||||
if [ ${value} -gt 0 ]; then
|
||||
cmdopts="${cmdopts} -p ${value}"
|
||||
fi
|
||||
;;
|
||||
'threads')
|
||||
if [ ${value} -gt 0 ]; then
|
||||
cmdopts="${cmdopts} -n ${value}"
|
||||
fi
|
||||
;;
|
||||
'chroot_dir')
|
||||
cmdopts="${cmdopts} -t ${value}"
|
||||
;;
|
||||
'configuration_file')
|
||||
cmdopts="${cmdopts} -c ${value}"
|
||||
;;
|
||||
'server')
|
||||
set -- `echo ${value} | /usr/bin/sed -e 's/\\\\//g'`
|
||||
server=$@
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ ${result} = ${SMF_EXIT_OK} ]; then
|
||||
echo "$I: Executing: ${server} ${cmdopts}"
|
||||
# Execute named(1M) with relevant command line options.
|
||||
${server} ${cmdopts}
|
||||
result=$?
|
||||
fi
|
||||
;;
|
||||
'stop')
|
||||
smf_kill_contract ${contract} TERM 1
|
||||
[ $? -ne 0 ] && exit 1
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $I [stop|start] <instance>" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
exit ${result}
|
||||
@@ -1,4 +1,4 @@
|
||||
# $NetBSD: options.mk,v 1.7 2013/06/06 02:55:03 taca Exp $
|
||||
# $NetBSD: options.mk,v 1.10 2013/09/21 16:00:34 taca Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.bind99
|
||||
PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server
|
||||
@@ -55,8 +55,7 @@ CONFIGURE_ARGS+= --with-dlz-filesystem
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mrrl)
|
||||
PATCHFILES=rl-9.9.3-P1.patch
|
||||
PATCH_SITES=http://ss.vix.su/~vjs/
|
||||
CONFIGURE_ARGS+= --enable-rrl
|
||||
.endif
|
||||
|
||||
###
|
||||
@@ -92,7 +91,7 @@ CONFIGURE_ARGS+= --disable-threads
|
||||
### readline support in dig(1) and nsupdate(1).
|
||||
###
|
||||
.if !empty(PKG_OPTIONS:Mreadline)
|
||||
.include "../../devel/readline/buildlink3.mk"
|
||||
.include "../../mk/readline.buildlink3.mk"
|
||||
CONFIGURE_ARGS+= --with-readline
|
||||
.else
|
||||
CONFIGURE_ARGS+= --without-readline
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
$NetBSD: patch-bin_dig_dighost.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
$NetBSD: patch-bin_dig_dighost.c,v 1.3 2014/02/02 07:58:20 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.orig 2014-01-27 18:58:24.000000000 +0000
|
||||
+++ bin/dig/dighost.c
|
||||
@@ -4369,7 +4369,7 @@ prepare_lookup(dns_name_t *name)
|
||||
@@ -4397,7 +4397,7 @@ prepare_lookup(dns_name_t *name)
|
||||
isc_result_t result;
|
||||
isc_region_t r;
|
||||
dns_rdataset_t *rdataset = NULL;
|
||||
@@ -13,7 +13,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
#endif
|
||||
|
||||
memset(namestr, 0, DNS_NAME_FORMATSIZE);
|
||||
@@ -4383,7 +4383,7 @@ prepare_lookup(dns_name_t *name)
|
||||
@@ -4411,7 +4411,7 @@ prepare_lookup(dns_name_t *name)
|
||||
|
||||
result = advanced_rrsearch(&rdataset, &ns.name,
|
||||
dns_rdatatype_aaaa,
|
||||
@@ -22,7 +22,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
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)
|
||||
@@ -4440,7 +4440,7 @@ prepare_lookup(dns_name_t *name)
|
||||
|
||||
rdataset = NULL;
|
||||
result = advanced_rrsearch(&rdataset, &ns.name, dns_rdatatype_a,
|
||||
@@ -31,7 +31,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
if (result == ISC_R_SUCCESS) {
|
||||
for (result = dns_rdataset_first(rdataset);
|
||||
result == ISC_R_SUCCESS;
|
||||
@@ -4531,11 +4531,11 @@ isc_result_t
|
||||
@@ -4559,11 +4559,11 @@ isc_result_t
|
||||
initialization(dns_name_t *name)
|
||||
{
|
||||
isc_result_t result;
|
||||
@@ -45,7 +45,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
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)
|
||||
@@ -4911,7 +4911,7 @@ sigchase_td(dns_message_t *msg)
|
||||
isc_result_t result;
|
||||
dns_name_t *name = NULL;
|
||||
isc_boolean_t have_answer = ISC_FALSE;
|
||||
@@ -54,7 +54,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
|
||||
if ((result = dns_message_firstname(msg, DNS_SECTION_ANSWER))
|
||||
== ISC_R_SUCCESS) {
|
||||
@@ -4897,7 +4897,7 @@ sigchase_td(dns_message_t *msg)
|
||||
@@ -4920,7 +4920,7 @@ sigchase_td(dns_message_t *msg)
|
||||
initialization(name);
|
||||
return;
|
||||
}
|
||||
@@ -63,7 +63,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
} else {
|
||||
if (!current_lookup->trace_root_sigchase) {
|
||||
result = dns_message_firstname(msg,
|
||||
@@ -5015,7 +5015,7 @@ sigchase_td(dns_message_t *msg)
|
||||
@@ -5038,7 +5038,7 @@ sigchase_td(dns_message_t *msg)
|
||||
dns_rdatatype_rrsig,
|
||||
current_lookup
|
||||
->rdtype_sigchase,
|
||||
@@ -72,7 +72,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
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)
|
||||
@@ -5051,7 +5051,7 @@ sigchase_td(dns_message_t *msg)
|
||||
&chase_authority_name,
|
||||
dns_rdatatype_rrsig,
|
||||
dns_rdatatype_any,
|
||||
@@ -81,7 +81,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
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)
|
||||
@@ -5127,7 +5127,7 @@ sigchase_td(dns_message_t *msg)
|
||||
&chase_authority_name,
|
||||
dns_rdatatype_rrsig,
|
||||
dns_rdatatype_ds,
|
||||
@@ -90,7 +90,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
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)
|
||||
@@ -5215,7 +5215,7 @@ sigchase_td(dns_message_t *msg)
|
||||
result = advanced_rrsearch(&chase_rdataset, &chase_name,
|
||||
current_lookup->rdtype_sigchase,
|
||||
dns_rdatatype_any ,
|
||||
@@ -99,7 +99,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
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)
|
||||
@@ -5258,7 +5258,7 @@ getneededrr(dns_message_t *msg)
|
||||
dns_name_t *name = NULL;
|
||||
dns_rdata_t sigrdata = DNS_RDATA_INIT;
|
||||
dns_rdata_sig_t siginfo;
|
||||
@@ -108,7 +108,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
|
||||
if ((result = dns_message_firstname(msg, DNS_SECTION_ANSWER))
|
||||
!= ISC_R_SUCCESS) {
|
||||
@@ -5251,7 +5251,7 @@ getneededrr(dns_message_t *msg)
|
||||
@@ -5274,7 +5274,7 @@ getneededrr(dns_message_t *msg)
|
||||
if (chase_rdataset == NULL) {
|
||||
result = advanced_rrsearch(&chase_rdataset, name,
|
||||
dns_rdatatype_any,
|
||||
@@ -117,7 +117,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
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)
|
||||
@@ -5394,7 +5394,7 @@ getneededrr(dns_message_t *msg)
|
||||
result = advanced_rrsearch(&chase_sigdsrdataset,
|
||||
&chase_signame,
|
||||
dns_rdatatype_rrsig,
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
$NetBSD: patch-bin_tests_system_Makefile.in,v 1.3 2012/10/10 03:07:12 taca Exp $
|
||||
$NetBSD: patch-bin_tests_system_Makefile.in,v 1.4 2013/09/21 16:00:34 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.orig 2013-09-05 05:09:08.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
|
||||
-SUBDIRS = dlzexternal filter-aaaa lwresd rpz rrl \
|
||||
+SUBDIRS = filter-aaaa lwresd rpz rrl \
|
||||
rsabigexponent tkey tsiggss
|
||||
TARGETS =
|
||||
|
||||
@BIND9_MAKE_RULES@
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
$NetBSD: patch-configure,v 1.5 2013/06/06 02:55:03 taca Exp $
|
||||
$NetBSD: patch-configure,v 1.8 2014/02/02 07:58:20 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.orig 2014-01-27 18:58:24.000000000 +0000
|
||||
+++ configure
|
||||
@@ -12177,7 +12177,7 @@ done
|
||||
@@ -11685,7 +11685,7 @@ done
|
||||
|
||||
;;
|
||||
esac
|
||||
@@ -15,7 +15,7 @@ $NetBSD: patch-configure,v 1.5 2013/06/06 02:55:03 taca Exp $
|
||||
then
|
||||
case "$use_python" in
|
||||
unspec)
|
||||
@@ -14870,6 +14870,8 @@ case $host in
|
||||
@@ -14410,6 +14410,8 @@ case $host in
|
||||
use_threads=false ;;
|
||||
*-freebsd*)
|
||||
use_threads=true ;;
|
||||
@@ -24,7 +24,7 @@ $NetBSD: patch-configure,v 1.5 2013/06/06 02:55:03 taca Exp $
|
||||
*-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; }
|
||||
@@ -19538,7 +19540,7 @@ $as_echo "no" >&6; }
|
||||
fi
|
||||
if test -n "-L$use_dlz_postgres_lib -lpq"
|
||||
then
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
$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)
|
||||
@@ -1,10 +1,10 @@
|
||||
$NetBSD: patch-lib_bind9_Makefile.in,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
$NetBSD: patch-lib_bind9_Makefile.in,v 1.2 2013/09/21 16:00:34 taca Exp $
|
||||
|
||||
* XXX: Install with proper permission.
|
||||
|
||||
--- lib/bind9/Makefile.in.orig 2009-12-05 23:31:40.000000000 +0000
|
||||
--- lib/bind9/Makefile.in.orig 2013-09-05 05:09:08.000000000 +0000
|
||||
+++ lib/bind9/Makefile.in
|
||||
@@ -78,7 +78,7 @@ installdirs:
|
||||
@@ -79,7 +79,7 @@ installdirs:
|
||||
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
|
||||
|
||||
install:: timestamp installdirs
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
$NetBSD: patch-lib_dns_Makefile.in,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
$NetBSD: patch-lib_dns_Makefile.in,v 1.2 2013/09/21 16:00:34 taca Exp $
|
||||
|
||||
* XXX: Install with proper permission.
|
||||
|
||||
--- lib/dns/Makefile.in.orig 2011-10-11 00:09:03.000000000 +0000
|
||||
--- lib/dns/Makefile.in.orig 2013-09-05 05:09:08.000000000 +0000
|
||||
+++ lib/dns/Makefile.in
|
||||
@@ -135,7 +135,7 @@ installdirs:
|
||||
@@ -142,7 +142,7 @@ installdirs:
|
||||
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
|
||||
|
||||
install:: timestamp installdirs
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
$NetBSD: patch-lib_isc_Makefile.in,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
$NetBSD: patch-lib_isc_Makefile.in,v 1.3 2014/02/02 07:58:20 taca Exp $
|
||||
|
||||
* XXX: Install with proper permission.
|
||||
|
||||
--- lib/isc/Makefile.in.orig 2011-07-07 23:47:49.000000000 +0000
|
||||
--- lib/isc/Makefile.in.orig 2014-01-27 18:58:24.000000000 +0000
|
||||
+++ lib/isc/Makefile.in
|
||||
@@ -127,7 +127,7 @@ installdirs:
|
||||
@@ -134,7 +134,7 @@ installdirs:
|
||||
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
|
||||
|
||||
install:: timestamp installdirs
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
$NetBSD: patch-lib_isccfg_Makefile.in,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
|
||||
$NetBSD: patch-lib_isccfg_Makefile.in,v 1.2 2013/09/21 16:00:34 taca Exp $
|
||||
|
||||
* XXX: Install with proper permission.
|
||||
|
||||
--- lib/isccfg/Makefile.in.orig 2011-03-10 04:36:16.000000000 +0000
|
||||
--- lib/isccfg/Makefile.in.orig 2013-09-05 05:09:08.000000000 +0000
|
||||
+++ lib/isccfg/Makefile.in
|
||||
@@ -77,7 +77,7 @@ installdirs:
|
||||
@@ -78,7 +78,7 @@ installdirs:
|
||||
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
|
||||
|
||||
install:: timestamp installdirs
|
||||
|
||||
Reference in New Issue
Block a user