From: Mark Andrews Date: Fri, 24 Jun 2016 02:20:37 +0000 (+1000) Subject: 4395 [bug] Improve out-of-tree installation of python modules. X-Git-Tag: v9.11.0b1~19 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=4840ef4581a577a29a18d180b6bc2e7355378ed7;p=thirdparty%2Fbind9.git 4395 [bug] Improve out-of-tree installation of python modules. [RT #42586] --- diff --git a/CHANGES b/CHANGES index 2ba23ca48f0..eba827d0626 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +4395 [bug] Improve out-of-tree installation of python modules. + [RT #42586] + 4394. [func] Add rndc command "dnstap-reopen" to close and reopen dnstap output filed. [RT #41803] diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in index 085b3485cd1..bf2e81caa65 100644 --- a/bin/python/Makefile.in +++ b/bin/python/Makefile.in @@ -59,7 +59,13 @@ install:: ${TARGETS} installdirs ${INSTALL_DATA} ${srcdir}/dnssec-checkds.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA} ${srcdir}/dnssec-keymgr.8 ${DESTDIR}${mandir}/man8 - test -z "${PYTHON}" || ${PYTHON} ${srcdir}/setup.py install --prefix=${DESTDIR}${prefix} + if test -n "${PYTHON}" ; then \ + if test -n "${DESTDIR}" ; then \ + ${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} ; \ + else \ + ${PYTHON} ${srcdir}/setup.py install --prefix=${prefix} ; \ + fi \ + fi clean distclean:: rm -f ${TARGETS} diff --git a/bin/python/isc/Makefile.in b/bin/python/isc/Makefile.in index 80fa0ce5761..cc1e5bc08b9 100644 --- a/bin/python/isc/Makefile.in +++ b/bin/python/isc/Makefile.in @@ -33,7 +33,7 @@ TARGETS = parsetab.py $(PYTHON) -m compileall . parsetab.py: policy.py - $(PYTHON) ${srcdir}/policy.py parse /dev/null > /dev/null + $(PYTHON) policy.py parse /dev/null > /dev/null PYTHONPATH=${srcdir} $(PYTHON) -m parsetab check test: subdirs diff --git a/bin/python/isc/__init__.py b/bin/python/isc/__init__.py.in similarity index 100% rename from bin/python/isc/__init__.py rename to bin/python/isc/__init__.py.in diff --git a/bin/python/isc/checkds.py b/bin/python/isc/checkds.py.in similarity index 100% rename from bin/python/isc/checkds.py rename to bin/python/isc/checkds.py.in diff --git a/bin/python/isc/coverage.py b/bin/python/isc/coverage.py.in similarity index 100% rename from bin/python/isc/coverage.py rename to bin/python/isc/coverage.py.in diff --git a/bin/python/isc/dnskey.py b/bin/python/isc/dnskey.py.in similarity index 100% rename from bin/python/isc/dnskey.py rename to bin/python/isc/dnskey.py.in diff --git a/bin/python/isc/eventlist.py b/bin/python/isc/eventlist.py.in similarity index 100% rename from bin/python/isc/eventlist.py rename to bin/python/isc/eventlist.py.in diff --git a/bin/python/isc/keydict.py b/bin/python/isc/keydict.py.in similarity index 100% rename from bin/python/isc/keydict.py rename to bin/python/isc/keydict.py.in diff --git a/bin/python/isc/keyevent.py b/bin/python/isc/keyevent.py.in similarity index 100% rename from bin/python/isc/keyevent.py rename to bin/python/isc/keyevent.py.in diff --git a/bin/python/isc/keymgr.py b/bin/python/isc/keymgr.py.in similarity index 100% rename from bin/python/isc/keymgr.py rename to bin/python/isc/keymgr.py.in diff --git a/bin/python/isc/keyseries.py b/bin/python/isc/keyseries.py.in similarity index 100% rename from bin/python/isc/keyseries.py rename to bin/python/isc/keyseries.py.in diff --git a/bin/python/isc/keyzone.py b/bin/python/isc/keyzone.py.in similarity index 100% rename from bin/python/isc/keyzone.py rename to bin/python/isc/keyzone.py.in diff --git a/bin/python/isc/policy.py b/bin/python/isc/policy.py.in similarity index 100% rename from bin/python/isc/policy.py rename to bin/python/isc/policy.py.in diff --git a/bin/python/isc/rndc.py b/bin/python/isc/rndc.py.in similarity index 100% rename from bin/python/isc/rndc.py rename to bin/python/isc/rndc.py.in diff --git a/bin/python/isc/tests/dnskey_test.py b/bin/python/isc/tests/dnskey_test.py.in similarity index 100% rename from bin/python/isc/tests/dnskey_test.py rename to bin/python/isc/tests/dnskey_test.py.in diff --git a/bin/python/isc/tests/policy_test.py b/bin/python/isc/tests/policy_test.py.in similarity index 100% rename from bin/python/isc/tests/policy_test.py rename to bin/python/isc/tests/policy_test.py.in diff --git a/bin/python/setup.py b/bin/python/setup.py index f9a86317079..4af47c8bcb3 100644 --- a/bin/python/setup.py +++ b/bin/python/setup.py @@ -20,5 +20,6 @@ setup(name='isc', description='Python functions to support BIND utilities', url='https://www.isc.org/bind', author='Internet Systems Consortium, Inc', + author_email='bind9-bugs@isc.org', license='ISC', packages=['isc']) diff --git a/configure b/configure index 47f723a4c51..1119fcaba50 100755 --- a/configure +++ b/configure @@ -22752,7 +22752,7 @@ ac_config_commands="$ac_config_commands chmod" # elsewhere if there's a good reason for doing so. # -ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/builtin/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/named.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/filter-aaaa/Makefile bin/tests/system/geoip/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/resolver/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/statistics/Makefile bin/tests/system/tkey/Makefile bin/tests/system/tsiggss/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/tests/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh" +ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/builtin/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/named.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/filter-aaaa/Makefile bin/tests/system/geoip/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/resolver/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/statistics/Makefile bin/tests/system/tkey/Makefile bin/tests/system/tsiggss/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/tests/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh" # @@ -23767,6 +23767,20 @@ do "bin/python/dnssec-checkds.py") CONFIG_FILES="$CONFIG_FILES bin/python/dnssec-checkds.py" ;; "bin/python/dnssec-coverage.py") CONFIG_FILES="$CONFIG_FILES bin/python/dnssec-coverage.py" ;; "bin/python/dnssec-keymgr.py") CONFIG_FILES="$CONFIG_FILES bin/python/dnssec-keymgr.py" ;; + "bin/python/isc/__init__.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/__init__.py" ;; + "bin/python/isc/checkds.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/checkds.py" ;; + "bin/python/isc/coverage.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/coverage.py" ;; + "bin/python/isc/dnskey.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/dnskey.py" ;; + "bin/python/isc/eventlist.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/eventlist.py" ;; + "bin/python/isc/keydict.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/keydict.py" ;; + "bin/python/isc/keyevent.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/keyevent.py" ;; + "bin/python/isc/keymgr.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/keymgr.py" ;; + "bin/python/isc/keyseries.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/keyseries.py" ;; + "bin/python/isc/keyzone.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/keyzone.py" ;; + "bin/python/isc/policy.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/policy.py" ;; + "bin/python/isc/rndc.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/rndc.py" ;; + "bin/python/isc/tests/dnskey_test.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/tests/dnskey_test.py" ;; + "bin/python/isc/tests/policy_test.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/tests/policy_test.py" ;; "bin/rndc/Makefile") CONFIG_FILES="$CONFIG_FILES bin/rndc/Makefile" ;; "bin/tests/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/Makefile" ;; "bin/tests/atomic/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/atomic/Makefile" ;; diff --git a/configure.in b/configure.in index fc48e474dd8..5226f1b6ef2 100644 --- a/configure.in +++ b/configure.in @@ -4901,6 +4901,20 @@ AC_CONFIG_FILES([ bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py + bin/python/isc/__init__.py + bin/python/isc/checkds.py + bin/python/isc/coverage.py + bin/python/isc/dnskey.py + bin/python/isc/eventlist.py + bin/python/isc/keydict.py + bin/python/isc/keyevent.py + bin/python/isc/keymgr.py + bin/python/isc/keyseries.py + bin/python/isc/keyzone.py + bin/python/isc/policy.py + bin/python/isc/rndc.py + bin/python/isc/tests/dnskey_test.py + bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile diff --git a/util/copyrights b/util/copyrights index 1dd33c3207c..474239fe3ce 100644 --- a/util/copyrights +++ b/util/copyrights @@ -384,21 +384,21 @@ ./bin/python/dnssec-keymgr.py.in PYTHON-BIN 2016 ./bin/python/isc/.gitignore X 2016 ./bin/python/isc/Makefile.in MAKE 2016 -./bin/python/isc/__init__.py PYTHON 2016 -./bin/python/isc/checkds.py PYTHON 2012,2013,2014,2015,2016 -./bin/python/isc/coverage.py PYTHON 2013,2014,2015,2016 -./bin/python/isc/dnskey.py PYTHON 2013,2014,2015,2016 -./bin/python/isc/eventlist.py PYTHON 2015,2016 -./bin/python/isc/keydict.py PYTHON 2016 -./bin/python/isc/keyevent.py PYTHON 2013,2014,2015,2016 -./bin/python/isc/keymgr.py PYTHON 2016 -./bin/python/isc/keyseries.py PYTHON 2016 -./bin/python/isc/keyzone.py PYTHON 2013,2014,2015,2016 -./bin/python/isc/policy.py PYTHON 2016 -./bin/python/isc/rndc.py PYTHON 2016 +./bin/python/isc/__init__.py.in PYTHON 2016 +./bin/python/isc/checkds.py.in PYTHON 2012,2013,2014,2015,2016 +./bin/python/isc/coverage.py.in PYTHON 2013,2014,2015,2016 +./bin/python/isc/dnskey.py.in PYTHON 2013,2014,2015,2016 +./bin/python/isc/eventlist.py.in PYTHON 2015,2016 +./bin/python/isc/keydict.py.in PYTHON 2016 +./bin/python/isc/keyevent.py.in PYTHON 2013,2014,2015,2016 +./bin/python/isc/keymgr.py.in PYTHON 2016 +./bin/python/isc/keyseries.py.in PYTHON 2016 +./bin/python/isc/keyzone.py.in PYTHON 2013,2014,2015,2016 +./bin/python/isc/policy.py.in PYTHON 2016 +./bin/python/isc/rndc.py.in PYTHON 2016 ./bin/python/isc/tests/Makefile.in MAKE 2016 -./bin/python/isc/tests/dnskey_test.py PYTHON 2016 -./bin/python/isc/tests/policy_test.py PYTHON 2016 +./bin/python/isc/tests/dnskey_test.py.in PYTHON 2016 +./bin/python/isc/tests/policy_test.py.in PYTHON 2016 ./bin/python/isc/tests/test-policies/01-keysize.pol CONF-C 2016 ./bin/python/isc/tests/test-policies/02-prepublish.pol CONF-C 2016 ./bin/python/isc/tests/test-policies/03-postpublish.pol CONF-C 2016