Hi, I have just prepared an NMU of python-dpkt/1.8.r98-0.1 to DELAYED/7. The patches containing the changes made by me after 1.6+svn54-3 are attached to this mail.
Please reschedule or cancel my upload as you see fit. Cheers, -Hilko
>From 982ea4b26a2ab8890c8570eccff86924fb683f6c Mon Sep 17 00:00:00 2001 From: Hilko Bengen <ben...@debian.org> Date: Tue, 24 Nov 2015 21:06:45 +0100 Subject: [PATCH 1/3] Update watch file --- debian/watch | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 debian/watch diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..5ddff04 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://github.com/kbandla/dpkt/releases .*/archive/(\d.*)\.tar\.gz -- 2.6.2
>From 4bad416176559aa4247bf0226eedb6b4a6c2cb25 Mon Sep 17 00:00:00 2001 From: Hilko Bengen <ben...@debian.org> Date: Wed, 25 Nov 2015 00:30:56 +0100 Subject: [PATCH 2/3] Modernize package - Debhelper 9 - Standards-Version - Source-Format 3.0 (quilt) instead of dpatch - Drop patch --- debian/compat | 2 +- debian/control | 4 +- debian/docs | 3 + debian/examples | 1 + debian/patches/00list | 1 - debian/patches/01_dnet2dumbnet.dpatch | 184 ---------------------------------- debian/rules | 71 +------------ debian/source/format | 2 +- 8 files changed, 11 insertions(+), 257 deletions(-) create mode 100644 debian/docs create mode 100644 debian/examples delete mode 100644 debian/patches/00list delete mode 100644 debian/patches/01_dnet2dumbnet.dpatch diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index ce5fa14..054df09 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: python Priority: optional Maintainer: Debian Python Modules Team <python-modules-t...@lists.alioth.debian.org> Uploaders: Luciano Bello <luci...@debian.org>, Nico Golde <n...@debian.org> -Build-Depends: debhelper (>= 7), python-all, dh-python, dpatch -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 9~), python-all, dh-python, +Standards-Version: 3.9.6 Homepage: https://github.com/kbandla/dpkt XS-Python-Version: all Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-dpkt/trunk/ diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..3553244 --- /dev/null +++ b/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +HACKING +README.md diff --git a/debian/examples b/debian/examples new file mode 100644 index 0000000..e39721e --- /dev/null +++ b/debian/examples @@ -0,0 +1 @@ +examples/* diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 58b8d35..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1 +0,0 @@ -01_dnet2dumbnet.dpatch diff --git a/debian/patches/01_dnet2dumbnet.dpatch b/debian/patches/01_dnet2dumbnet.dpatch deleted file mode 100644 index e8cda55..0000000 --- a/debian/patches/01_dnet2dumbnet.dpatch +++ /dev/null @@ -1,184 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_dnet2dumbnet.dpatch by Luciano Bello <luci...@debian.org> -## -## DP: In Debian, the dnet module is called dumbnet - -@DPATCH@ -diff -urNad python-dpkt-1.6+svn54.orig~/dpkt/dpkt.py python-dpkt-1.6+svn54.orig/dpkt/dpkt.py ---- python-dpkt-1.6+svn54.orig~/dpkt/dpkt.py 2007-08-02 19:42:59.000000000 -0300 -+++ python-dpkt-1.6+svn54.orig/dpkt/dpkt.py 2009-07-30 10:52:38.000000000 -0300 -@@ -144,11 +144,11 @@ - return '\n'.join(res) - - try: -- import dnet -+ import dumbnet - def in_cksum_add(s, buf): -- return dnet.ip_cksum_add(buf, s) -+ return dumbnet.ip_cksum_add(buf, s) - def in_cksum_done(s): -- return socket.ntohs(dnet.ip_cksum_carry(s)) -+ return socket.ntohs(dumbnet.ip_cksum_carry(s)) - except ImportError: - import array - def in_cksum_add(s, buf): -diff -urNad python-dpkt-1.6+svn54.orig~/examples/dhcprequest.py python-dpkt-1.6+svn54.orig/examples/dhcprequest.py ---- python-dpkt-1.6+svn54.orig~/examples/dhcprequest.py 2008-08-14 12:48:46.000000000 -0300 -+++ python-dpkt-1.6+svn54.orig/examples/dhcprequest.py 2009-07-30 10:52:38.000000000 -0300 -@@ -1,14 +1,14 @@ - #!/usr/bin/env python - --import dnet -+import dumbnet - from dpkt import dhcp - from dpkt import udp - from dpkt import ip - from dpkt import ethernet - - sysintf = 'eth0' --hw = dnet.eth(sysintf) --intf = dnet.intf() -+hw = dumbnet.eth(sysintf) -+intf = dumbnet.intf() - - # build a dhcp discover packet to request an ip - d = dhcp.DHCP( -@@ -34,7 +34,7 @@ - - # build ip packet - i = ip.IP( -- dst = dnet.ip_aton('255.255.255.255'), -+ dst = dumbnet.ip_aton('255.255.255.255'), - src = intf.get(sysintf)['addr'].ip, - data = u, - p = ip.IP_PROTO_UDP -@@ -43,7 +43,7 @@ - - # build ethernet frame - e = ethernet.Ethernet( -- dst = dnet.ETH_ADDR_BROADCAST, -+ dst = dumbnet.ETH_ADDR_BROADCAST, - src = hw.get(), - data = i - ) -diff -urNad python-dpkt-1.6+svn54.orig~/tests/test-perf.py python-dpkt-1.6+svn54.orig/tests/test-perf.py ---- python-dpkt-1.6+svn54.orig~/tests/test-perf.py 2006-08-13 02:28:20.000000000 -0300 -+++ python-dpkt-1.6+svn54.orig/tests/test-perf.py 2009-07-30 10:52:38.000000000 -0300 -@@ -2,7 +2,7 @@ - - import time, sys - --import dnet -+import dumbnet - sys.path.insert(0, '.') - import dpkt - from impacket import ImpactDecoder, ImpactPacket -@@ -11,22 +11,22 @@ - import xstruct - - xip = xstruct.structdef('>', [ -- ('v_hl', ('B', 1), (4 << 4) | (dnet.IP_HDR_LEN >> 2)), -- ('tos', ('B', 1), dnet.IP_TOS_DEFAULT), -- ('len', ('H', 1), dnet.IP_HDR_LEN), -+ ('v_hl', ('B', 1), (4 << 4) | (dumbnet.IP_HDR_LEN >> 2)), -+ ('tos', ('B', 1), dumbnet.IP_TOS_DEFAULT), -+ ('len', ('H', 1), dumbnet.IP_HDR_LEN), - ('id', ('H', 1), 0), - ('off', ('H', 1), 0), -- ('ttl', ('B', 1), dnet.IP_TTL_DEFAULT), -+ ('ttl', ('B', 1), dumbnet.IP_TTL_DEFAULT), - ('p', ('B', 1), 0), - ('sum', ('H', 1), 0), -- ('src', ('s', dnet.IP_ADDR_LEN), dnet.IP_ADDR_ANY), -- ('dst', ('s', dnet.IP_ADDR_LEN), dnet.IP_ADDR_ANY) -+ ('src', ('s', dumbnet.IP_ADDR_LEN), dumbnet.IP_ADDR_ANY), -+ ('dst', ('s', dumbnet.IP_ADDR_LEN), dumbnet.IP_ADDR_ANY) - ]) - - xudp = xstruct.structdef('>', [ - ('sport', ('B', 1), 0), - ('dport', ('B', 1), 0), -- ('ulen', ('H', 1), dnet.UDP_HDR_LEN), -+ ('ulen', ('H', 1), dumbnet.UDP_HDR_LEN), - ('sum', ('H', 1), 0) - ]) - -@@ -39,27 +39,27 @@ - scapy: 348.449269721 pps - xstruct: 88314.8953732 pps - """ -- src = dnet.addr('1.2.3.4').ip -- dst = dnet.addr('5.6.7.8').ip -+ src = dumbnet.addr('1.2.3.4').ip -+ dst = dumbnet.addr('5.6.7.8').ip - data = 'hello world' - - start = time.time() - for i in xrange(cnt): -- dnet.ip_checksum( -- str(dpkt.ip.IP(src=src, dst=dst, p=dnet.IP_PROTO_UDP, -- len = dnet.IP_HDR_LEN + dnet.UDP_HDR_LEN + len(data), -+ dumbnet.ip_checksum( -+ str(dpkt.ip.IP(src=src, dst=dst, p=dumbnet.IP_PROTO_UDP, -+ len = dumbnet.IP_HDR_LEN + dumbnet.UDP_HDR_LEN + len(data), - data=dpkt.udp.UDP(sport=111, dport=222, -- ulen=dnet.UDP_HDR_LEN + len(data), -+ ulen=dumbnet.UDP_HDR_LEN + len(data), - data=data)))) - print 'dpkt:', cnt / (time.time() - start), 'pps' - - start = time.time() - for i in xrange(cnt): -- dnet.ip_checksum(str(dpkt.ip.IP(src=src, dst=dst, p=dnet.IP_PROTO_UDP, -- len=dnet.IP_HDR_LEN + dnet.UDP_HDR_LEN + -+ dumbnet.ip_checksum(str(dpkt.ip.IP(src=src, dst=dst, p=dumbnet.IP_PROTO_UDP, -+ len=dumbnet.IP_HDR_LEN + dumbnet.UDP_HDR_LEN + - len(data))) + - str(dpkt.udp.UDP(sport=111, dport=222, -- ulen=dnet.UDP_HDR_LEN + len(data))) + -+ ulen=dumbnet.UDP_HDR_LEN + len(data))) + - data) - print 'dpkt (manual):', cnt / (time.time() - start), 'pps' - -@@ -100,13 +100,13 @@ - udp = xudp() - udp.sport = 111 - udp.dport = 222 -- udp.ulen = dnet.UDP_HDR_LEN + len(data) -+ udp.ulen = dumbnet.UDP_HDR_LEN + len(data) - ip = xip() - ip.src = src - ip.dst = dst -- ip.p = dnet.IP_PROTO_UDP -- ip.len = dnet.IP_HDR_LEN + udp.ulen -- dnet.ip_checksum(str(ip) + str(udp) + data) -+ ip.p = dumbnet.IP_PROTO_UDP -+ ip.len = dumbnet.IP_HDR_LEN + udp.ulen -+ dumbnet.ip_checksum(str(ip) + str(udp) + data) - print 'xstruct:', cnt / (time.time() - start), 'pps' - - def compare_parse(cnt): -@@ -142,9 +142,9 @@ - - start = time.time() - for i in xrange(cnt): -- ip = xip(s[:dnet.IP_HDR_LEN]) -- udp = xudp(s[dnet.IP_HDR_LEN:dnet.IP_HDR_LEN + dnet.UDP_HDR_LEN]) -- data = s[dnet.IP_HDR_LEN + dnet.UDP_HDR_LEN:] -+ ip = xip(s[:dumbnet.IP_HDR_LEN]) -+ udp = xudp(s[dumbnet.IP_HDR_LEN:dumbnet.IP_HDR_LEN + dumbnet.UDP_HDR_LEN]) -+ data = s[dumbnet.IP_HDR_LEN + dumbnet.UDP_HDR_LEN:] - print 'xstruct:', cnt / (time.time() - start), 'pps' - - def compare_checksum(cnt): -@@ -156,8 +156,8 @@ - - start = time.time() - for i in range(cnt): -- dnet.ip_cksum_carry(dnet.ip_cksum_add(s, 0)) -- print 'dnet.ip_cksum_add/carry:', cnt / (time.time() - start), 'pps' -+ dumbnet.ip_cksum_carry(dumbnet.ip_cksum_add(s, 0)) -+ print 'dumbnet.ip_cksum_add/carry:', cnt / (time.time() - start), 'pps' - - def main(): - import psyco diff --git a/debian/rules b/debian/rules index 33de221..920410a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,71 +1,6 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make - -PYVERS=$(shell pyversions -r) - -PACKAGE = python-dpkt -URL:=http://dpkt.googlecode.com/svn/trunk/ -SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p') -SVN_REVISION := $(shell echo $(SRC_VERSION) | awk -F"+" '{ print $$2 }' | sed 's/svn//' ) -TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz - -PREFIX := debian/$(PACKAGE)/usr - -build: patch-stamp -clean: unpatch - dh_testdir - - # Add here commands to clean up after the build process. - for python in $(PYVERS); do \ - $$python setup.py clean; \ - done - - rm -f build-stamp - rm -f dpkt/*.pyc dpkt/*.pyo - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_installdirs - - for python in $(PYVERS); do \ - $$python setup.py install --no-compile --install-lib=$(PREFIX)/lib/python2.7/dist-packages; \ - done - -# Build architecture-dependent files here. -binary-arch: -# We have nothing to do by default. - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs CHANGES - dh_installdocs AUTHORS HACKING - dh_installexamples examples/* - dh_python2 - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -get-orig-source: - @@dh_testdir - @@rm -rf $(TARBALL) - @@mkdir get-orig-source - @@svn export -r $(SVN_REVISION) $(URL) \ - get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig - @@echo Cleaning up ... - @@GZIP=--best tar czf $(TARBALL) -C get-orig-source $(PACKAGE)-$(SRC_VERSION).orig - @@rm -rf get-orig-source - @@echo " "$(TARBALL)" created; move it to the right destination to build the package" +#export DH_VERBOSE=1 -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $@ --with=python2 --buildsystem=pybuild diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) -- 2.6.2
>From 97b23ae13e5f99e8b7d08fe3d4391b46143c11f5 Mon Sep 17 00:00:00 2001 From: Hilko Bengen <ben...@debian.org> Date: Wed, 25 Nov 2015 00:32:17 +0100 Subject: [PATCH 3/3] 1.8.r98-0.1 --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 312f1af..9ed2863 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +python-dpkt (1.8.r98-0.1) unstable; urgency=medium + + * Non-maintainer upload + * New upstream version (Closes: #781796) + * Update watch file + * Modernize package + - Debhelper 9 + - Standards-Version + - Source-Format 3.0 (quilt) instead of dpatch + - Drop patch + + -- Hilko Bengen <ben...@debian.org> Wed, 25 Nov 2015 00:31:11 +0100 + python-dpkt (1.6+svn54-3) unstable; urgency=medium [ Jakub Wilk ] -- 2.6.2
