Move dnspython to third_party.
authorJelmer Vernooij <jelmer@samba.org>
Fri, 7 Nov 2014 20:09:10 +0000 (20:09 +0000)
committerJeremy Allison <jra@samba.org>
Wed, 12 Nov 2014 21:40:53 +0000 (22:40 +0100)
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Nov 12 22:40:53 CET 2014 on sn-devel-104

120 files changed:
lib/wscript_build
source4/scripting/bin/samba_dnsupdate
source4/scripting/bin/samba_upgradedns
third_party/dnspython/.gitignore [moved from lib/dnspython/.gitignore with 100% similarity]
third_party/dnspython/ChangeLog [moved from lib/dnspython/ChangeLog with 100% similarity]
third_party/dnspython/LICENSE [moved from lib/dnspython/LICENSE with 100% similarity]
third_party/dnspython/MANIFEST.in [moved from lib/dnspython/MANIFEST.in with 100% similarity]
third_party/dnspython/Makefile [moved from lib/dnspython/Makefile with 100% similarity]
third_party/dnspython/README [moved from lib/dnspython/README with 100% similarity]
third_party/dnspython/TODO [moved from lib/dnspython/TODO with 100% similarity]
third_party/dnspython/dns/__init__.py [moved from lib/dnspython/dns/__init__.py with 100% similarity]
third_party/dnspython/dns/dnssec.py [moved from lib/dnspython/dns/dnssec.py with 100% similarity]
third_party/dnspython/dns/e164.py [moved from lib/dnspython/dns/e164.py with 100% similarity]
third_party/dnspython/dns/edns.py [moved from lib/dnspython/dns/edns.py with 100% similarity]
third_party/dnspython/dns/entropy.py [moved from lib/dnspython/dns/entropy.py with 100% similarity]
third_party/dnspython/dns/exception.py [moved from lib/dnspython/dns/exception.py with 100% similarity]
third_party/dnspython/dns/flags.py [moved from lib/dnspython/dns/flags.py with 100% similarity]
third_party/dnspython/dns/hash.py [moved from lib/dnspython/dns/hash.py with 100% similarity]
third_party/dnspython/dns/inet.py [moved from lib/dnspython/dns/inet.py with 100% similarity]
third_party/dnspython/dns/ipv4.py [moved from lib/dnspython/dns/ipv4.py with 100% similarity]
third_party/dnspython/dns/ipv6.py [moved from lib/dnspython/dns/ipv6.py with 100% similarity]
third_party/dnspython/dns/message.py [moved from lib/dnspython/dns/message.py with 100% similarity]
third_party/dnspython/dns/name.py [moved from lib/dnspython/dns/name.py with 100% similarity]
third_party/dnspython/dns/namedict.py [moved from lib/dnspython/dns/namedict.py with 100% similarity]
third_party/dnspython/dns/node.py [moved from lib/dnspython/dns/node.py with 100% similarity]
third_party/dnspython/dns/opcode.py [moved from lib/dnspython/dns/opcode.py with 100% similarity]
third_party/dnspython/dns/query.py [moved from lib/dnspython/dns/query.py with 100% similarity]
third_party/dnspython/dns/rcode.py [moved from lib/dnspython/dns/rcode.py with 100% similarity]
third_party/dnspython/dns/rdata.py [moved from lib/dnspython/dns/rdata.py with 100% similarity]
third_party/dnspython/dns/rdataclass.py [moved from lib/dnspython/dns/rdataclass.py with 100% similarity]
third_party/dnspython/dns/rdataset.py [moved from lib/dnspython/dns/rdataset.py with 100% similarity]
third_party/dnspython/dns/rdatatype.py [moved from lib/dnspython/dns/rdatatype.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/AFSDB.py [moved from lib/dnspython/dns/rdtypes/ANY/AFSDB.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/CERT.py [moved from lib/dnspython/dns/rdtypes/ANY/CERT.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/CNAME.py [moved from lib/dnspython/dns/rdtypes/ANY/CNAME.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/DLV.py [moved from lib/dnspython/dns/rdtypes/ANY/DLV.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/DNAME.py [moved from lib/dnspython/dns/rdtypes/ANY/DNAME.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/DNSKEY.py [moved from lib/dnspython/dns/rdtypes/ANY/DNSKEY.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/DS.py [moved from lib/dnspython/dns/rdtypes/ANY/DS.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/GPOS.py [moved from lib/dnspython/dns/rdtypes/ANY/GPOS.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/HINFO.py [moved from lib/dnspython/dns/rdtypes/ANY/HINFO.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/HIP.py [moved from lib/dnspython/dns/rdtypes/ANY/HIP.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/ISDN.py [moved from lib/dnspython/dns/rdtypes/ANY/ISDN.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/LOC.py [moved from lib/dnspython/dns/rdtypes/ANY/LOC.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/MX.py [moved from lib/dnspython/dns/rdtypes/ANY/MX.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/NS.py [moved from lib/dnspython/dns/rdtypes/ANY/NS.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/NSEC.py [moved from lib/dnspython/dns/rdtypes/ANY/NSEC.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/NSEC3.py [moved from lib/dnspython/dns/rdtypes/ANY/NSEC3.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/NSEC3PARAM.py [moved from lib/dnspython/dns/rdtypes/ANY/NSEC3PARAM.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/PTR.py [moved from lib/dnspython/dns/rdtypes/ANY/PTR.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/RP.py [moved from lib/dnspython/dns/rdtypes/ANY/RP.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/RRSIG.py [moved from lib/dnspython/dns/rdtypes/ANY/RRSIG.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/RT.py [moved from lib/dnspython/dns/rdtypes/ANY/RT.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/SOA.py [moved from lib/dnspython/dns/rdtypes/ANY/SOA.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/SPF.py [moved from lib/dnspython/dns/rdtypes/ANY/SPF.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/SSHFP.py [moved from lib/dnspython/dns/rdtypes/ANY/SSHFP.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/TXT.py [moved from lib/dnspython/dns/rdtypes/ANY/TXT.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/X25.py [moved from lib/dnspython/dns/rdtypes/ANY/X25.py with 100% similarity]
third_party/dnspython/dns/rdtypes/ANY/__init__.py [moved from lib/dnspython/dns/rdtypes/ANY/__init__.py with 100% similarity]
third_party/dnspython/dns/rdtypes/IN/A.py [moved from lib/dnspython/dns/rdtypes/IN/A.py with 100% similarity]
third_party/dnspython/dns/rdtypes/IN/AAAA.py [moved from lib/dnspython/dns/rdtypes/IN/AAAA.py with 100% similarity]
third_party/dnspython/dns/rdtypes/IN/APL.py [moved from lib/dnspython/dns/rdtypes/IN/APL.py with 100% similarity]
third_party/dnspython/dns/rdtypes/IN/DHCID.py [moved from lib/dnspython/dns/rdtypes/IN/DHCID.py with 100% similarity]
third_party/dnspython/dns/rdtypes/IN/IPSECKEY.py [moved from lib/dnspython/dns/rdtypes/IN/IPSECKEY.py with 100% similarity]
third_party/dnspython/dns/rdtypes/IN/KX.py [moved from lib/dnspython/dns/rdtypes/IN/KX.py with 100% similarity]
third_party/dnspython/dns/rdtypes/IN/NAPTR.py [moved from lib/dnspython/dns/rdtypes/IN/NAPTR.py with 100% similarity]
third_party/dnspython/dns/rdtypes/IN/NSAP.py [moved from lib/dnspython/dns/rdtypes/IN/NSAP.py with 100% similarity]
third_party/dnspython/dns/rdtypes/IN/NSAP_PTR.py [moved from lib/dnspython/dns/rdtypes/IN/NSAP_PTR.py with 100% similarity]
third_party/dnspython/dns/rdtypes/IN/PX.py [moved from lib/dnspython/dns/rdtypes/IN/PX.py with 100% similarity]
third_party/dnspython/dns/rdtypes/IN/SRV.py [moved from lib/dnspython/dns/rdtypes/IN/SRV.py with 100% similarity]
third_party/dnspython/dns/rdtypes/IN/WKS.py [moved from lib/dnspython/dns/rdtypes/IN/WKS.py with 100% similarity]
third_party/dnspython/dns/rdtypes/IN/__init__.py [moved from lib/dnspython/dns/rdtypes/IN/__init__.py with 100% similarity]
third_party/dnspython/dns/rdtypes/__init__.py [moved from lib/dnspython/dns/rdtypes/__init__.py with 100% similarity]
third_party/dnspython/dns/rdtypes/dsbase.py [moved from lib/dnspython/dns/rdtypes/dsbase.py with 100% similarity]
third_party/dnspython/dns/rdtypes/mxbase.py [moved from lib/dnspython/dns/rdtypes/mxbase.py with 100% similarity]
third_party/dnspython/dns/rdtypes/nsbase.py [moved from lib/dnspython/dns/rdtypes/nsbase.py with 100% similarity]
third_party/dnspython/dns/rdtypes/txtbase.py [moved from lib/dnspython/dns/rdtypes/txtbase.py with 100% similarity]
third_party/dnspython/dns/renderer.py [moved from lib/dnspython/dns/renderer.py with 100% similarity]
third_party/dnspython/dns/resolver.py [moved from lib/dnspython/dns/resolver.py with 100% similarity]
third_party/dnspython/dns/reversename.py [moved from lib/dnspython/dns/reversename.py with 100% similarity]
third_party/dnspython/dns/rrset.py [moved from lib/dnspython/dns/rrset.py with 100% similarity]
third_party/dnspython/dns/set.py [moved from lib/dnspython/dns/set.py with 100% similarity]
third_party/dnspython/dns/tokenizer.py [moved from lib/dnspython/dns/tokenizer.py with 100% similarity]
third_party/dnspython/dns/tsig.py [moved from lib/dnspython/dns/tsig.py with 100% similarity]
third_party/dnspython/dns/tsigkeyring.py [moved from lib/dnspython/dns/tsigkeyring.py with 100% similarity]
third_party/dnspython/dns/ttl.py [moved from lib/dnspython/dns/ttl.py with 100% similarity]
third_party/dnspython/dns/update.py [moved from lib/dnspython/dns/update.py with 100% similarity]
third_party/dnspython/dns/version.py [moved from lib/dnspython/dns/version.py with 100% similarity]
third_party/dnspython/dns/wiredata.py [moved from lib/dnspython/dns/wiredata.py with 100% similarity]
third_party/dnspython/dns/zone.py [moved from lib/dnspython/dns/zone.py with 100% similarity]
third_party/dnspython/examples/ddns.py [moved from lib/dnspython/examples/ddns.py with 100% similarity]
third_party/dnspython/examples/e164.py [moved from lib/dnspython/examples/e164.py with 100% similarity]
third_party/dnspython/examples/mx.py [moved from lib/dnspython/examples/mx.py with 100% similarity]
third_party/dnspython/examples/name.py [moved from lib/dnspython/examples/name.py with 100% similarity]
third_party/dnspython/examples/reverse.py [moved from lib/dnspython/examples/reverse.py with 100% similarity]
third_party/dnspython/examples/reverse_name.py [moved from lib/dnspython/examples/reverse_name.py with 100% similarity]
third_party/dnspython/examples/xfr.py [moved from lib/dnspython/examples/xfr.py with 100% similarity]
third_party/dnspython/examples/zonediff.py [moved from lib/dnspython/examples/zonediff.py with 100% similarity]
third_party/dnspython/setup.py [moved from lib/dnspython/setup.py with 100% similarity]
third_party/dnspython/tests/Makefile [moved from lib/dnspython/tests/Makefile with 100% similarity]
third_party/dnspython/tests/bugs.py [moved from lib/dnspython/tests/bugs.py with 100% similarity]
third_party/dnspython/tests/dnssec.py [moved from lib/dnspython/tests/dnssec.py with 100% similarity]
third_party/dnspython/tests/example [moved from lib/dnspython/tests/example with 100% similarity]
third_party/dnspython/tests/example1.good [moved from lib/dnspython/tests/example1.good with 100% similarity]
third_party/dnspython/tests/example2.good [moved from lib/dnspython/tests/example2.good with 100% similarity]
third_party/dnspython/tests/flags.py [moved from lib/dnspython/tests/flags.py with 100% similarity]
third_party/dnspython/tests/message.py [moved from lib/dnspython/tests/message.py with 100% similarity]
third_party/dnspython/tests/name.py [moved from lib/dnspython/tests/name.py with 100% similarity]
third_party/dnspython/tests/namedict.py [moved from lib/dnspython/tests/namedict.py with 100% similarity]
third_party/dnspython/tests/ntoaaton.py [moved from lib/dnspython/tests/ntoaaton.py with 100% similarity]
third_party/dnspython/tests/rdtypeandclass.py [moved from lib/dnspython/tests/rdtypeandclass.py with 100% similarity]
third_party/dnspython/tests/resolver.py [moved from lib/dnspython/tests/resolver.py with 100% similarity]
third_party/dnspython/tests/rrset.py [moved from lib/dnspython/tests/rrset.py with 100% similarity]
third_party/dnspython/tests/set.py [moved from lib/dnspython/tests/set.py with 100% similarity]
third_party/dnspython/tests/tokenizer.py [moved from lib/dnspython/tests/tokenizer.py with 100% similarity]
third_party/dnspython/tests/update.py [moved from lib/dnspython/tests/update.py with 100% similarity]
third_party/dnspython/tests/zone.py [moved from lib/dnspython/tests/zone.py with 100% similarity]
third_party/dnspython/util/COPYRIGHT [moved from lib/dnspython/util/COPYRIGHT with 100% similarity]
third_party/dnspython/util/copyrights [moved from lib/dnspython/util/copyrights with 100% similarity]
third_party/wscript_build

index 97c3cfa..c7bf621 100644 (file)
@@ -4,7 +4,6 @@ import os, Options
 
 # work out what python external libraries we need to install
 external_libs = {
-    "dns.resolver": "dnspython/dns",
     "subunit": "subunit/python/subunit",
     "testtools": "testtools/testtools"}
 
index 181e67f..c2ee3ec 100755 (executable)
@@ -47,7 +47,7 @@ from samba.auth import system_session
 from samba.samdb import SamDB
 from samba.dcerpc import netlogon, winbind
 
-samba.ensure_external_module("dns", "dnspython")
+samba.ensure_third_party_module("dns", "dnspython")
 import dns.resolver
 import dns.exception
 
index 4d49770..689c9a4 100755 (executable)
@@ -67,7 +67,7 @@ from samba.provision.sambadns import (
     create_named_txt )
 from samba.dcerpc import security
 
-samba.ensure_external_module("dns", "dnspython")
+samba.ensure_third_party_module("dns", "dnspython")
 import dns.zone, dns.rdatatype
 
 __docformat__ = 'restructuredText'
index d8b9aae..0be8474 100644 (file)
@@ -4,6 +4,7 @@ import os
 
 # work out what python external libraries we need to install
 external_libs = {
+    "dns.resolver": "dnspython/dns",
     }
 
 list = []