MIME-Version: 1.0 X-RT-Original-Encoding: utf-8 X-Cam-Scannerinfo: http://help.uis.cam.ac.uk/email-scanner-virus From dot@dotat.at Mon Sep 25 11:14:29 2017 User-Agent: Alpine 2.11 (DEB 23 2013-08-11) To: "BIND9 Bugs via RT" Received: from mx.pao1.isc.org (mx.pao1.isc.org [149.20.64.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx.pao1.isc.org", Issuer "COMODO RSA Organization Validation Secure Server CA" (not verified)) by bugs.isc.org (Postfix) with ESMTPS id 488C5D78B08 for ; Mon, 25 Sep 2017 11:14:29 +0000 (UTC) Received: from ppsw-32.csi.cam.ac.uk (ppsw-32.csi.cam.ac.uk [131.111.8.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx.pao1.isc.org (Postfix) with ESMTPS id DB31D3494F1 for ; Mon, 25 Sep 2017 11:14:00 +0000 (UTC) Received: from grey.csi.cam.ac.uk ([131.111.57.57]:45735) by ppsw-32.csi.cam.ac.uk (ppsw.cam.ac.uk [131.111.8.136]:25) with esmtps (TLSv1:ECDHE-RSA-AES256-SHA:256) id 1dwRKp-000MnO-1B (Exim 4.89) for bind9-confidential@isc.org (return-path ); Mon, 25 Sep 2017 12:13:59 +0100 content-type: TEXT/PLAIN; charset="utf-8" Delivered-To: bind9-confidential@bugs.isc.org Return-Path: Subject: Re: [ISC-Bugs #46090] [PATCH] alphabetize From: "Tony Finch" X-RT-Interface: Email X-RT-Incoming-Encryption: Not encrypted X-Cam-Antivirus: no malware found In-Reply-To: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mx.pao1.isc.org References: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED autolearn=unavailable autolearn_force=no version=3.4.0 Date: Mon, 25 Sep 2017 12:13:59 +0100 X-Original-To: bind9-confidential@bugs.isc.org Message-ID: RT-Message-ID: Content-Length: 3128 sed -n '19,57p' conf.sh.in | sort --- bin/tests/system/conf.sh.in | 56 ++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index 0d63f12..94d5a44 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -17,42 +17,42 @@ TOP=${SYSTEMTESTTOP:=.}/../../.. # Make it absolute so that it continues to work after we cd. TOP=`cd $TOP && pwd` -NAMED=$TOP/bin/named/named -DIG=$TOP/bin/dig/dig -DELV=$TOP/bin/delv/delv -RNDC=$TOP/bin/rndc/rndc -NSUPDATE=$TOP/bin/nsupdate/nsupdate +ARPANAME=$TOP/bin/tools/arpaname +CHECKCONF=$TOP/bin/check/named-checkconf +CHECKDS=$TOP/bin/python/dnssec-checkds +CHECKZONE=$TOP/bin/check/named-checkzone +COVERAGE=$TOP/bin/python/dnssec-coverage DDNSCONFGEN=$TOP/bin/confgen/ddns-confgen -TSIGKEYGEN=$TOP/bin/confgen/tsig-keygen -RNDCCONFGEN=$TOP/bin/confgen/rndc-confgen -KEYGEN=$TOP/bin/dnssec/dnssec-keygen -KEYFRLAB=$TOP/bin/dnssec/dnssec-keyfromlabel -SIGNER=$TOP/bin/dnssec/dnssec-signzone -REVOKE=$TOP/bin/dnssec/dnssec-revoke -SETTIME=$TOP/bin/dnssec/dnssec-settime +DELV=$TOP/bin/delv/delv +DIG=$TOP/bin/dig/dig +DNSTAPREAD=$TOP/bin/tools/dnstap-read DSFROMKEY=$TOP/bin/dnssec/dnssec-dsfromkey +FEATURETEST=$TOP/bin/tests/system/feature-test +FSTRM_CAPTURE=@FSTRM_CAPTURE@ +GENRANDOM=$TOP/bin/tools/genrandom IMPORTKEY=$TOP/bin/dnssec/dnssec-importkey -CHECKDS=$TOP/bin/python/dnssec-checkds -COVERAGE=$TOP/bin/python/dnssec-coverage +JOURNALPRINT=$TOP/bin/tools/named-journalprint +KEYFRLAB=$TOP/bin/dnssec/dnssec-keyfromlabel +KEYGEN=$TOP/bin/dnssec/dnssec-keygen KEYMGR=$TOP/bin/python/dnssec-keymgr -CHECKZONE=$TOP/bin/check/named-checkzone -CHECKCONF=$TOP/bin/check/named-checkconf +MDIG=$TOP/bin/tools/mdig +NAMED=$TOP/bin/named/named +NSEC3HASH=$TOP/bin/tools/nsec3hash +NSLOOKUP=$TOP/bin/dig/nslookup +NSUPDATE=$TOP/bin/nsupdate/nsupdate +NZD2NZF=$TOP/bin/tools/named-nzd2nzf +PK11DEL="$TOP/bin/pkcs11/pkcs11-destroy -s ${SLOT:-0} -p ${HSMPIN:-1234} -w 0" PK11GEN="$TOP/bin/pkcs11/pkcs11-keygen -q -s ${SLOT:-0} -p ${HSMPIN:-1234}" PK11LIST="$TOP/bin/pkcs11/pkcs11-list -s ${SLOT:-0} -p ${HSMPIN:-1234}" -PK11DEL="$TOP/bin/pkcs11/pkcs11-destroy -s ${SLOT:-0} -p ${HSMPIN:-1234} -w 0" -JOURNALPRINT=$TOP/bin/tools/named-journalprint -VERIFY=$TOP/bin/dnssec/dnssec-verify -ARPANAME=$TOP/bin/tools/arpaname RESOLVE=$TOP/lib/samples/resolve +REVOKE=$TOP/bin/dnssec/dnssec-revoke +RNDC=$TOP/bin/rndc/rndc +RNDCCONFGEN=$TOP/bin/confgen/rndc-confgen RRCHECKER=$TOP/bin/tools/named-rrchecker -GENRANDOM=$TOP/bin/tools/genrandom -NSEC3HASH=$TOP/bin/tools/nsec3hash -NSLOOKUP=$TOP/bin/dig/nslookup -DNSTAPREAD=$TOP/bin/tools/dnstap-read -MDIG=$TOP/bin/tools/mdig -NZD2NZF=$TOP/bin/tools/named-nzd2nzf -FSTRM_CAPTURE=@FSTRM_CAPTURE@ -FEATURETEST=$TOP/bin/tests/system/feature-test +SETTIME=$TOP/bin/dnssec/dnssec-settime +SIGNER=$TOP/bin/dnssec/dnssec-signzone +TSIGKEYGEN=$TOP/bin/confgen/tsig-keygen +VERIFY=$TOP/bin/dnssec/dnssec-verify WIRETEST=$TOP/bin/tests/wire_test RANDFILE=$TOP/bin/tests/system/random.data -- 2.10.1.445.g3cdd5d1