diff --git a/debian/changelog b/debian/changelog index a78339a..3e80059 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -python-ldapdomaindump (0.8.7-0kali1) kali-dev; urgency=medium +python-ldapdomaindump (0.9.1-0kali1) kali-dev; urgency=medium * Initial release * Package Python 2 version for new impacket release (not ready for Python 3 now) - -- Sophie Brun Thu, 14 Mar 2019 14:51:09 +0100 + -- Sophie Brun Thu, 14 Mar 2019 14:53:20 +0100 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b4de394..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git a/debian/control b/debian/control index c476f61..bbb5a52 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,19 @@ Priority: optional Maintainer: Kali Developers Uploaders: Sophie Brun -Build-Depends: debhelper (>= 11), dh-python, python-all, python-setuptools, python3-all, python3-setuptools, python-ldap3, python3-ldap3, python-dnspython, python3-dnspython -Standards-Version: 4.2.1 +Build-Depends: debhelper-compat (= 12), + dh-python, + python-all, + python-dnspython, + python-future, + python-ldap3, + python-setuptools, + python3-all, + python3-dnspython, + python3-future, + python3-ldap3, + python3-setuptools +Standards-Version: 4.3.0 Homepage: https://github.com/dirkjanm/ldapdomaindump Vcs-Browser: http://git.kali.org/gitweb/?p=packages/python-ldapdomaindump;a=summary Vcs-Git: git://git.kali.org/packages/python-ldapdomaindump.git @@ -12,7 +23,7 @@ Package: python-ldapdomaindump Architecture: all -Depends: ${python:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${python:Depends} Description: Active Directory information dumper via LDAP (Python 2) This package contains an Active Directory information dumper via LDAP. In an Active Directory domain, a lot of interesting information can be retrieved via @@ -29,7 +40,7 @@ Package: python3-ldapdomaindump Architecture: all -Depends: ${python3:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${python3:Depends} Description: Active Directory information dumper via LDAP (Python 3) This package contains an Active Directory information dumper via LDAP. In an Active Directory domain, a lot of interesting information can be retrieved via diff --git a/debian/copyright b/debian/copyright index 83e48e1..c7a792b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ License: MIT Files: debian/* -Copyright: 2018 Sophie Brun +Copyright: 2018-2019 Sophie Brun License: MIT License: MIT diff --git a/debian/patches/prepare-for-python3.patch b/debian/patches/prepare-for-python3.patch deleted file mode 100644 index f934b07..0000000 --- a/debian/patches/prepare-for-python3.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/ldapdomaindump/__init__.py -+++ b/ldapdomaindump/__init__.py -@@ -25,7 +25,11 @@ - import sys, os, re, codecs, json, argparse, getpass, base64 - # import class and constants - from datetime import datetime --from urllib import quote_plus -+# Handle python3: urllib has been split into parts -+try: -+ from urllib import quote_plus -+except: -+ from urllib.parse import quote_plus - - import ldap3 - from ldap3 import Server, Connection, SIMPLE, SYNC, ALL, SASL, NTLM -@@ -799,11 +803,11 @@ class reportWriter(object): - - #Some quick logging helpers - def log_warn(text): -- print '[!] %s' % text -+ print ('[!] %s' % text) - def log_info(text): -- print '[*] %s' % text -+ print ('[*] %s' % text) - def log_success(text): -- print '[+] %s' % text -+ print ('[+] %s' % text) - - def main(): - parser = argparse.ArgumentParser(description='Domain information dumper via LDAP. Dumps users/computers/groups and OS/membership information to HTML/JSON/greppable output.') diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 57f6007..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -prepare-for-python3.patch diff --git a/debian/rules b/debian/rules index 6587fea..0487e5f 100755 --- a/debian/rules +++ b/debian/rules @@ -10,5 +10,5 @@ dh_install # don't install the python2 binaries to avoid conflicts between # Python2 and Python3 packages. - rm debian/python2-ldapdomaindump/usr/bin/ldapdomaindump - rm debian/python2-ldapdomaindump/usr/bin/ldd2bloodhound + rm debian/python-ldapdomaindump/usr/bin/ldapdomaindump + rm debian/python-ldapdomaindump/usr/bin/ldd2bloodhound