[Python-modules-commits] [impacket] 04/10: merge patched into master

Arnaud Fontaine arnau at moszumanska.debian.org
Thu Dec 1 06:44:58 UTC 2016


This is an automated email from the git hooks/post-receive script.

arnau pushed a commit to branch master
in repository impacket.

commit 72556e6493b98d0b63ed9e67e2b02f23a0f91e42
Merge: e0ad00b bb21863
Author: Arnaud Fontaine <arnau at debian.org>
Date:   Thu Dec 1 14:50:51 2016 +0900

    merge patched into master

 ChangeLog                                          |  154 +-
 PKG-INFO                                           |    5 +-
 README                                             |   88 -
 README.md                                          |   82 +
 debian/.git-dpm                                    |    6 +-
 debian/patches/00_setup.patch                      |   10 +-
 examples/GetUserSPNs.py                            |  409 ++++
 examples/atexec.py                                 |  244 ++-
 examples/esentutl.py                               |   18 +-
 examples/goldenPac.py                              | 1341 ++++++++++++
 examples/ifmap.py                                  |   42 +-
 examples/karmaSMB.py                               |  625 ++++++
 examples/lookupsid.py                              |   61 +-
 examples/loopchain.py                              |   15 +-
 examples/mssqlclient.py                            |   72 +-
 examples/mssqlinstance.py                          |   21 +-
 examples/netview.py                                |  497 +++++
 examples/nmapAnswerMachine.py                      |    3 +
 examples/ntfs-read.py                              |   76 +-
 examples/ntlmrelayx.py                             |  314 +++
 examples/opdump.py                                 |   11 +-
 examples/os_ident.py                               |    4 +-
 examples/ping.py                                   |    2 -
 examples/ping6.py                                  |    6 +-
 examples/psexec.py                                 |  173 +-
 examples/raiseChild.py                             | 1500 +++++++++++++
 examples/rdp_check.py                              |   40 +-
 examples/registry-read.py                          |   28 +-
 examples/rpcdump.py                                |   52 +-
 examples/samrdump.py                               |   88 +-
 examples/secretsdump.py                            | 1540 ++++++++++---
 examples/services.py                               |   99 +-
 examples/smbclient.py                              |  217 +-
 examples/smbexec.py                                |  150 +-
 examples/smbrelayx.py                              |  710 ++++--
 examples/smbserver.py                              |   29 +-
 examples/smbtorture.py                             |    4 +-
 examples/sniff.py                                  |    7 +-
 examples/sniffer.py                                |    3 -
 examples/split.py                                  |    8 +-
 examples/tracer.py                                 |    9 +-
 examples/uncrc32.py                                |    0
 examples/wmiexec.py                                |  154 +-
 examples/wmipersist.py                             |  227 ++
 examples/wmiquery.py                               |  104 +-
 impacket/Dot11Crypto.py                            |    4 +-
 impacket/Dot11KeyManager.py                        |    4 +-
 impacket/ICMP6.py                                  |   11 +-
 impacket/IP6.py                                    |    9 +-
 impacket/IP6_Address.py                            |  562 +++--
 impacket/IP6_Extension_Headers.py                  |   11 +-
 impacket/ImpactDecoder.py                          |   14 +-
 impacket/ImpactPacket.py                           |    4 +-
 impacket/NDP.py                                    |  333 ++-
 impacket/__init__.py                               |   26 +-
 impacket/cdp.py                                    |  998 ++++-----
 impacket/crypto.py                                 |   10 +-
 impacket/dcerpc/atsvc.py                           |  212 --
 impacket/dcerpc/conv.py                            |   70 -
 impacket/dcerpc/dcerpc.py                          |  830 -------
 impacket/dcerpc/dcerpc_v4.py                       |  282 ---
 impacket/dcerpc/dcom.py                            |  174 --
 impacket/dcerpc/epm.py                             |  991 ---------
 impacket/dcerpc/lsarpc.py                          |  767 -------
 impacket/dcerpc/mgmt.py                            |   62 -
 impacket/dcerpc/ndrutils.py                        |  696 ------
 impacket/dcerpc/printer.py                         |  471 ----
 impacket/dcerpc/samr.py                            |  936 --------
 impacket/dcerpc/srvsvc.py                          |  821 -------
 impacket/dcerpc/srvsvcserver.py                    |  436 ----
 impacket/dcerpc/svcctl.py                          | 1226 -----------
 impacket/dcerpc/transport.py                       |  515 -----
 impacket/dcerpc/v5/atsvc.py                        |  211 ++
 impacket/dcerpc/v5/dcom/comev.py                   |   70 +-
 impacket/dcerpc/v5/dcom/oaut.py                    |   42 +-
 impacket/dcerpc/v5/dcom/scmp.py                    |   48 +-
 impacket/dcerpc/v5/dcom/vds.py                     |   36 +-
 impacket/dcerpc/v5/dcom/wmi.py                     |  256 +--
 impacket/dcerpc/v5/dcomrt.py                       |  444 ++--
 impacket/dcerpc/v5/drsuapi.py                      | 1501 +++++++++++++
 impacket/dcerpc/v5/dtypes.py                       |  117 +-
 impacket/dcerpc/v5/epm.py                          |  353 ++-
 impacket/dcerpc/v5/lsad.py                         |   46 +-
 impacket/dcerpc/v5/lsat.py                         |   41 +-
 impacket/dcerpc/v5/mgmt.py                         |  168 ++
 impacket/dcerpc/v5/ndr.py                          | 1545 ++++++-------
 impacket/dcerpc/v5/nrpc.py                         |   58 +-
 impacket/dcerpc/v5/rpcrt.py                        |  426 ++--
 impacket/dcerpc/v5/rrp.py                          |  130 +-
 impacket/dcerpc/v5/samr.py                         |  208 +-
 impacket/dcerpc/v5/sasec.py                        |  175 ++
 impacket/dcerpc/v5/scmr.py                         |   56 +-
 impacket/dcerpc/v5/srvs.py                         |   51 +-
 impacket/dcerpc/v5/transport.py                    |  131 +-
 impacket/dcerpc/v5/tsch.py                         |  758 +++++++
 impacket/dcerpc/v5/wkst.py                         |   37 +-
 impacket/dcerpc/winreg.py                          |  834 -------
 impacket/dcerpc/wkssvc.py                          |   97 -
 impacket/dhcp.py                                   |  506 ++---
 impacket/dns.py                                    | 1232 +++++------
 impacket/dot11.py                                  |   62 +-
 impacket/eap.py                                    |    5 +-
 impacket/ese.py                                    |   67 +-
 impacket/examples/logger.py                        |   47 +
 impacket/{ => examples/ntlmrelayx}/__init__.py     |    0
 impacket/examples/ntlmrelayx/clients/__init__.py   |    4 +
 .../examples/ntlmrelayx/clients/httprelayclient.py |   72 +
 .../examples/ntlmrelayx/clients/ldaprelayclient.py |   81 +
 .../ntlmrelayx/clients/mssqlrelayclient.py         |  108 +
 .../examples/ntlmrelayx/clients/smbrelayclient.py  |  266 +++
 impacket/examples/ntlmrelayx/servers/__init__.py   |    2 +
 .../examples/ntlmrelayx/servers/httprelayserver.py |  286 +++
 .../examples/ntlmrelayx/servers/smbrelayserver.py  |  490 +++++
 .../{ => examples/ntlmrelayx/utils}/__init__.py    |    0
 impacket/examples/ntlmrelayx/utils/config.py       |   58 +
 impacket/examples/ntlmrelayx/utils/targetsutils.py |  154 ++
 impacket/examples/remcomsvc.py                     |    6 +-
 impacket/examples/serviceinstall.py                |  138 +-
 impacket/helper.py                                 |    8 +-
 impacket/hresult_errors.py                         |    4 +-
 impacket/{ => krb5}/__init__.py                    |    0
 impacket/krb5/asn1.py                              |  504 +++++
 impacket/krb5/ccache.py                            |  504 +++++
 impacket/krb5/constants.py                         |  429 ++++
 impacket/krb5/crypto.py                            |  715 ++++++
 impacket/krb5/gssapi.py                            |  282 +++
 impacket/krb5/kerberosv5.py                        |  624 ++++++
 impacket/krb5/types.py                             |  266 +++
 impacket/{ => ldap}/__init__.py                    |    0
 impacket/ldap/ldap.py                              |  410 ++++
 impacket/ldap/ldapasn1.py                          |  728 +++++++
 impacket/logger.py                                 |   17 -
 impacket/nmb.py                                    |   85 +-
 impacket/nt_errors.py                              |    6 +-
 impacket/ntlm.py                                   |  334 ++-
 impacket/pcap_linktypes.py                         |  172 ++
 impacket/pcapfile.py                               |    8 +-
 impacket/smb.py                                    | 1195 +++++-----
 impacket/smb3.py                                   |  396 +++-
 impacket/smb3structs.py                            |   64 +-
 impacket/smbconnection.py                          |  380 +++-
 impacket/smbserver.py                              | 2273 ++++++++++++++++----
 impacket/spnego.py                                 |   37 +-
 impacket/structure.py                              |    7 +-
 impacket/system_errors.py                          |    6 +-
 impacket/tds.py                                    |  330 ++-
 impacket/testcases/ImpactPacket/runalltestcases.sh |    3 -
 impacket/testcases/SMB_RPC/dcetests.cfg            |    4 +
 impacket/testcases/SMB_RPC/rundce.sh               |    5 +
 impacket/testcases/SMB_RPC/test_dcerpc.py          |  234 --
 impacket/testcases/SMB_RPC/test_dcomrt.py          |   17 +-
 impacket/testcases/SMB_RPC/test_drsuapi.py         |  522 +++++
 impacket/testcases/SMB_RPC/test_epm.py             |    5 +-
 impacket/testcases/SMB_RPC/test_ldap.py            |  121 ++
 impacket/testcases/SMB_RPC/test_lsad.py            |  148 +-
 impacket/testcases/SMB_RPC/test_lsat.py            |   12 +-
 impacket/testcases/SMB_RPC/test_mgmt.py            |  183 ++
 impacket/testcases/SMB_RPC/test_ndr.py             |  391 ++++
 impacket/testcases/SMB_RPC/test_nrpc.py            |   39 +-
 impacket/testcases/SMB_RPC/test_ntlm.py            |   15 +-
 impacket/testcases/SMB_RPC/test_rpcrt.py           |  486 +++--
 impacket/testcases/SMB_RPC/test_rrp.py             |   11 +-
 impacket/testcases/SMB_RPC/test_samr.py            |  105 +-
 impacket/testcases/SMB_RPC/test_scmr.py            |    9 +-
 impacket/testcases/SMB_RPC/test_smb.py             |  195 +-
 impacket/testcases/SMB_RPC/test_srvs.py            |   57 +-
 impacket/testcases/SMB_RPC/test_tsch.py            |  942 ++++++++
 impacket/testcases/SMB_RPC/test_wkst.py            |   26 +-
 impacket/testcases/SMB_RPC/test_wmi.py             |    7 +-
 impacket/testcases/dot11/test_Dot11Base.py         |    1 -
 impacket/testcases/dot11/test_Dot11Decoder.py      |    2 +-
 impacket/testcases/dot11/test_RadioTap.py          |  866 ++++----
 impacket/testcases/dot11/test_RadioTapDecoder.py   |   20 +-
 impacket/testcases/dot11/test_WEPDecoder.py        |    6 +-
 impacket/uuid.py                                   |    4 +-
 impacket/version.py                                |   44 +-
 impacket/winregistry.py                            |   46 +-
 impacket/wps.py                                    |    8 +-
 setup.py                                           |   14 +-
 179 files changed, 28640 insertions(+), 16838 deletions(-)

diff --cc debian/.git-dpm
index 0be38d0,0000000..42cd4db
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 54d2eec4801aba6d684b4d5cdef2ba4cc627d7e0
- 54d2eec4801aba6d684b4d5cdef2ba4cc627d7e0
- 9ff015b1156b5f1b17a9dd27017d13df6db9055e
++bb2186364d859a8ebf32df31fbeec285293f1d9f
++bb2186364d859a8ebf32df31fbeec285293f1d9f
++81faa85384ccbceb219d1a6808ac8fa04cc134e7
 +81faa85384ccbceb219d1a6808ac8fa04cc134e7
 +impacket_0.9.15.orig.tar.gz
 +007378029e5027bc21c007071fbcad9d2da47550
 +1071958
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/00_setup.patch
index dd08a12,0000000..278a7f5
mode 100644,000000..100644
--- a/debian/patches/00_setup.patch
+++ b/debian/patches/00_setup.patch
@@@ -1,25 -1,0 +1,25 @@@
- From 54d2eec4801aba6d684b4d5cdef2ba4cc627d7e0 Mon Sep 17 00:00:00 2001
++From bb2186364d859a8ebf32df31fbeec285293f1d9f Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 09:18:31 -0700
 +Subject: 00_setup
 +
 +Patch-Name: 00_setup.patch
 +---
 + setup.py | 5 -----
 + 1 file changed, 5 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index 6c85a2d..43e9014 100644
++index e100e31..fc29ca0 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -20,10 +20,5 @@ setup(name = PACKAGE_NAME,
 +       long_description = 'Impacket is a collection of Python classes focused on providing access to network packets. Impacket allows Python developers to craft and decode network packets in simple and consistent manner.',
 +       platforms = ["Unix","Windows"],
-        packages = ['impacket', 'impacket.dcerpc', 'impacket.examples', 'impacket.dcerpc.v5', 'impacket.dcerpc.v5.dcom'],
++       packages = ['impacket', 'impacket.dcerpc', 'impacket.examples', 'impacket.dcerpc.v5', 'impacket.dcerpc.v5.dcom', 'impacket.krb5', 'impacket.ldap', 'impacket.examples.ntlmrelayx', 'impacket.examples.ntlmrelayx.clients', 'impacket.examples.ntlmrelayx.servers', 'impacket.examples.ntlmrelayx.utils'],
 +-      scripts = glob.glob(os.path.join('examples', '*.py')),
- -      data_files = [(os.path.join('share', 'doc', PACKAGE_NAME), ['README', 'LICENSE']+glob.glob('doc/*')),
++-      data_files = [(os.path.join('share', 'doc', PACKAGE_NAME), ['README.md', 'LICENSE']+glob.glob('doc/*')),
 +-                    (os.path.join('share', 'doc', PACKAGE_NAME, 'testcases', 'dot11'),glob.glob('impacket/testcases/dot11/*')),
 +-                    (os.path.join('share', 'doc', PACKAGE_NAME, 'testcases', 'ImpactPacket'),glob.glob('impacket/testcases/ImpactPacket/*')),
 +-                    (os.path.join('share', 'doc', PACKAGE_NAME, 'testcases', 'SMB_RPC'),glob.glob('impacket/testcases/SMB_RPC/*'))],
-        requires=['pycrypto (>=2.6)'],
++       requires=['pycrypto (>=2.6)', 'pyasn1 (>=0.1.7)'],
 +       )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/impacket.git



More information about the Python-modules-commits mailing list