Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
BIND
Commits
4840ef45
Commit
4840ef45
authored
Jun 24, 2016
by
Mark Andrews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
4395 [bug] Improve out-of-tree installation of python modules.
[RT #42586]
parent
c49e9443
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
55 additions
and
17 deletions
+55
-17
CHANGES
CHANGES
+3
-0
bin/python/Makefile.in
bin/python/Makefile.in
+7
-1
bin/python/isc/Makefile.in
bin/python/isc/Makefile.in
+1
-1
bin/python/isc/__init__.py.in
bin/python/isc/__init__.py.in
+0
-0
bin/python/isc/checkds.py.in
bin/python/isc/checkds.py.in
+0
-0
bin/python/isc/coverage.py.in
bin/python/isc/coverage.py.in
+0
-0
bin/python/isc/dnskey.py.in
bin/python/isc/dnskey.py.in
+0
-0
bin/python/isc/eventlist.py.in
bin/python/isc/eventlist.py.in
+0
-0
bin/python/isc/keydict.py.in
bin/python/isc/keydict.py.in
+0
-0
bin/python/isc/keyevent.py.in
bin/python/isc/keyevent.py.in
+0
-0
bin/python/isc/keymgr.py.in
bin/python/isc/keymgr.py.in
+0
-0
bin/python/isc/keyseries.py.in
bin/python/isc/keyseries.py.in
+0
-0
bin/python/isc/keyzone.py.in
bin/python/isc/keyzone.py.in
+0
-0
bin/python/isc/policy.py.in
bin/python/isc/policy.py.in
+0
-0
bin/python/isc/rndc.py.in
bin/python/isc/rndc.py.in
+0
-0
bin/python/isc/tests/dnskey_test.py.in
bin/python/isc/tests/dnskey_test.py.in
+0
-0
bin/python/isc/tests/policy_test.py.in
bin/python/isc/tests/policy_test.py.in
+0
-0
bin/python/setup.py
bin/python/setup.py
+1
-0
configure
configure
+15
-1
configure.in
configure.in
+14
-0
util/copyrights
util/copyrights
+14
-14
No files found.
CHANGES
View file @
4840ef45
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]
...
...
bin/python/Makefile.in
View file @
4840ef45
...
...
@@ -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}
...
...
bin/python/isc/Makefile.in
View file @
4840ef45
...
...
@@ -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
...
...
bin/python/isc/__init__.py
→
bin/python/isc/__init__.py
.in
View file @
4840ef45
File moved
bin/python/isc/checkds.py
→
bin/python/isc/checkds.py
.in
View file @
4840ef45
File moved
bin/python/isc/coverage.py
→
bin/python/isc/coverage.py
.in
View file @
4840ef45
File moved
bin/python/isc/dnskey.py
→
bin/python/isc/dnskey.py
.in
View file @
4840ef45
File moved
bin/python/isc/eventlist.py
→
bin/python/isc/eventlist.py
.in
View file @
4840ef45
File moved
bin/python/isc/keydict.py
→
bin/python/isc/keydict.py
.in
View file @
4840ef45
File moved
bin/python/isc/keyevent.py
→
bin/python/isc/keyevent.py
.in
View file @
4840ef45
File moved
bin/python/isc/keymgr.py
→
bin/python/isc/keymgr.py
.in
View file @
4840ef45
File moved
bin/python/isc/keyseries.py
→
bin/python/isc/keyseries.py
.in
View file @
4840ef45
File moved
bin/python/isc/keyzone.py
→
bin/python/isc/keyzone.py
.in
View file @
4840ef45
File moved
bin/python/isc/policy.py
→
bin/python/isc/policy.py
.in
View file @
4840ef45
File moved
bin/python/isc/rndc.py
→
bin/python/isc/rndc.py
.in
View file @
4840ef45
File moved
bin/python/isc/tests/dnskey_test.py
→
bin/python/isc/tests/dnskey_test.py
.in
View file @
4840ef45
File moved
bin/python/isc/tests/policy_test.py
→
bin/python/isc/tests/policy_test.py
.in
View file @
4840ef45
File moved
bin/python/setup.py
View file @
4840ef45
...
...
@@ -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'
])
configure
View file @
4840ef45
...
...
@@ -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" ;;
...
...
configure.in
View file @
4840ef45
...
...
@@ -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
...
...
util/copyrights
View file @
4840ef45
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment