[Python-modules-commits] [impacket] 08/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 e192c441b7afe9628179abf0fb15e848a99bccfb
Merge: dc2ea41 b60ad01
Author: Arnaud Fontaine <arnau at debian.org>
Date: Thu Dec 1 15:13:45 2016 +0900
merge patched into master
debian/.git-dpm | 4 +--
debian/patches/00_setup.patch | 31 +++++++++++-----
debian/patches/01_add-missing-shebang.patch | 55 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
examples/loopchain.py | 2 ++
examples/nmapAnswerMachine.py | 2 ++
examples/os_ident.py | 2 ++
examples/uncrc32.py | 2 ++
setup.py | 10 +++++-
9 files changed, 97 insertions(+), 12 deletions(-)
diff --cc debian/.git-dpm
index 42cd4db,0000000..592902a
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
- bb2186364d859a8ebf32df31fbeec285293f1d9f
- bb2186364d859a8ebf32df31fbeec285293f1d9f
++b60ad014607c1ea17d8212fe16a143c487d57d99
++b60ad014607c1ea17d8212fe16a143c487d57d99
+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 278a7f5,0000000..f85d892
mode 100644,000000..100644
--- a/debian/patches/00_setup.patch
+++ b/debian/patches/00_setup.patch
@@@ -1,25 -1,0 +1,38 @@@
- 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
++From 78ad2bc2dac3fa6bb2409502800de5ea247d3353 Mon Sep 17 00:00:00 2001
++From: Arnaud Fontaine <arnau at debian.org>
++Date: Thu, 1 Dec 2016 15:12:28 +0900
++Subject: Don't install samples in /usr/bin and don't install useless stuff in
++ /usr/share/doc/.
++
++The Debian packaging takes care of installing what we want where we
++want.
+
+Patch-Name: 00_setup.patch
+---
- setup.py | 5 -----
- 1 file changed, 5 deletions(-)
++ setup.py | 15 +++++++++------
++ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index e100e31..fc29ca0 100644
++index e100e31..d631bf8 100644
+--- a/setup.py
++++ b/setup.py
- @@ -20,10 +20,5 @@ setup(name = PACKAGE_NAME,
++@@ -20,10 +20,13 @@ 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', '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.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)', 'pyasn1 (>=0.1.7)'],
++- requires=['pycrypto (>=2.6)', 'pyasn1 (>=0.1.7)'],
+++ # Disabled by the Debian packaging, we don't want to pollute
+++ # /usr/bin with
+++ # samples and documentation with extra LICENSE file or testcases.
+++# scripts = glob.glob(os.path.join('examples', '*.py')),
+++# 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)', 'pyasn1 (>=0.1.7)', 'pcapy']
+ )
diff --cc debian/patches/01_add-missing-shebang.patch
index 0000000,0000000..a186890
new file mode 100644
--- /dev/null
+++ b/debian/patches/01_add-missing-shebang.patch
@@@ -1,0 -1,0 +1,55 @@@
++From b60ad014607c1ea17d8212fe16a143c487d57d99 Mon Sep 17 00:00:00 2001
++From: Sophie Brun <sophie at freexian.com>
++Date: Thu, 1 Dec 2016 15:12:56 +0900
++Subject: Add missing shebang.
++
++This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
++
++Patch-Name: 01_add-missing-shebang.patch
++---
++ examples/loopchain.py | 2 ++
++ examples/nmapAnswerMachine.py | 2 ++
++ examples/os_ident.py | 2 ++
++ examples/uncrc32.py | 2 ++
++ 4 files changed, 8 insertions(+)
++
++diff --git a/examples/loopchain.py b/examples/loopchain.py
++index 6098746..9ed91cd 100755
++--- a/examples/loopchain.py
+++++ b/examples/loopchain.py
++@@ -1,3 +1,5 @@
+++#!/usr/bin/python
+++
++ import time
++
++ from impacket.examples import logger
++diff --git a/examples/nmapAnswerMachine.py b/examples/nmapAnswerMachine.py
++index 5f9e154..75f3a9e 100755
++--- a/examples/nmapAnswerMachine.py
+++++ b/examples/nmapAnswerMachine.py
++@@ -1,3 +1,5 @@
+++#!/usr/bin/python
+++
++ import random
++
++ import os_ident
++diff --git a/examples/os_ident.py b/examples/os_ident.py
++index 50767f8..695a037 100755
++--- a/examples/os_ident.py
+++++ b/examples/os_ident.py
++@@ -1,3 +1,5 @@
+++#!/usr/bin/python
+++
++ #--
++ # Copyright (c) 2001-2016 CORE Security Technologies, CORE SDI Inc.
++ # All rights reserved.
++diff --git a/examples/uncrc32.py b/examples/uncrc32.py
++index f72b3ab..885d5b8 100755
++--- a/examples/uncrc32.py
+++++ b/examples/uncrc32.py
++@@ -1,3 +1,5 @@
+++#!/usr/bin/python
+++
++ # based on:
++ #
++ # Reversing CRC - Theory and Practice.
diff --cc debian/patches/series
index c1f2aff,0000000..464e036
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
+00_setup.patch
++01_add-missing-shebang.patch
--
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