Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package python-iptables
fixes a "grave" bug.
the original fix for #860986 (backported from upstream) to support xtables-v12
was incomplete.
therefore, this upload includes another fix backported from upstream, that
should make xtables-v12 support complete.
unblock python-iptables/0.11.0-4
-- System Information:
Debian Release: 9.0
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64
(x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-iptables-0.11.0/debian/changelog
python-iptables-0.11.0/debian/changelog
--- python-iptables-0.11.0/debian/changelog 2017-04-28 22:41:39.000000000
+0200
+++ python-iptables-0.11.0/debian/changelog 2017-05-18 00:24:18.000000000
+0200
@@ -1,3 +1,9 @@
+python-iptables (0.11.0-4) unstable; urgency=medium
+
+ * Backported xtables_match_v12 (Closes: #862741)
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlae...@debian.org> Thu, 18 May 2017
00:24:18 +0200
+
python-iptables (0.11.0-3) unstable; urgency=medium
* Backported IPv6 mask fix from upstream
diff -Nru python-iptables-0.11.0/debian/.git-dpm
python-iptables-0.11.0/debian/.git-dpm
--- python-iptables-0.11.0/debian/.git-dpm 2017-04-28 22:41:39.000000000
+0200
+++ python-iptables-0.11.0/debian/.git-dpm 2017-05-18 00:24:18.000000000
+0200
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-cf0621ca9b7eda22832f0a0a9990e34daa3056d3
-cf0621ca9b7eda22832f0a0a9990e34daa3056d3
+532972c390ceeb2ecaa67a91850348a28e16155a
+532972c390ceeb2ecaa67a91850348a28e16155a
d1928747ee94401684d6e26211e733b585418e64
d1928747ee94401684d6e26211e733b585418e64
python-iptables_0.11.0.orig.tar.gz
diff -Nru
python-iptables-0.11.0/debian/patches/0005-Backported-xtables_match_v12.patch
python-iptables-0.11.0/debian/patches/0005-Backported-xtables_match_v12.patch
---
python-iptables-0.11.0/debian/patches/0005-Backported-xtables_match_v12.patch
1970-01-01 01:00:00.000000000 +0100
+++
python-iptables-0.11.0/debian/patches/0005-Backported-xtables_match_v12.patch
2017-05-18 00:24:18.000000000 +0200
@@ -0,0 +1,76 @@
+From 532972c390ceeb2ecaa67a91850348a28e16155a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?=
+ <umlae...@debian.org>
+Date: Thu, 18 May 2017 00:23:15 +0200
+Subject: Backported xtables_match_v12
+
+Closes: #862741
+---
+ iptc/xtables.py | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 53 insertions(+), 1 deletion(-)
+
+diff --git a/iptc/xtables.py b/iptc/xtables.py
+index 54ba0e4..4546bc1 100644
+--- a/iptc/xtables.py
++++ b/iptc/xtables.py
+@@ -411,7 +411,59 @@ class _xtables_match_v10(ct.Structure):
+
+
+ _xtables_match_v11 = _xtables_match_v10
+-_xtables_match_v12 = _xtables_match_v10
++
++
++class _xtables_match_v12(ct.Structure):
++ _fields_ = [("version", ct.c_char_p),
++ ("next", ct.c_void_p),
++ ("name", ct.c_char_p),
++ ("real_name", ct.c_char_p),
++ ("revision", ct.c_uint8),
++ ("ext_flags", ct.c_uint8),
++ ("family", ct.c_uint16),
++ ("size", ct.c_size_t),
++ ("userspacesize", ct.c_size_t),
++ ("help", ct.CFUNCTYPE(None)),
++ ("init", ct.CFUNCTYPE(None, ct.POINTER(xt_entry_match))),
++ # fourth parameter entry is struct ipt_entry for example
++ # int (*parse)(int c, char **argv, int invert, unsigned int
++ # *flags, const void *entry, struct xt_entry_match **match)
++ ("parse", ct.CFUNCTYPE(ct.c_int, ct.c_int,
++ ct.POINTER(ct.c_char_p), ct.c_int,
++ ct.POINTER(ct.c_uint), ct.c_void_p,
++ ct.POINTER(ct.POINTER(
++ xt_entry_match)))),
++ ("final_check", ct.CFUNCTYPE(None, ct.c_uint)),
++ # prints out the match iff non-NULL: put space at end
++ # first parameter ip is struct ipt_ip * for example
++ ("print", ct.CFUNCTYPE(None, ct.c_void_p,
++ ct.POINTER(xt_entry_match), ct.c_int)),
++ # saves the match info in parsable form to stdout.
++ # first parameter ip is struct ipt_ip * for example
++ ("save", ct.CFUNCTYPE(None, ct.c_void_p,
++ ct.POINTER(xt_entry_match))),
++ # Print match name or alias
++ ("alias", ct.CFUNCTYPE(ct.c_char_p,
++ ct.POINTER(xt_entry_match))),
++ # pointer to list of extra command-line options
++ ("extra_opts", ct.POINTER(option)),
++
++ # introduced with the new iptables API
++ ("x6_parse", ct.CFUNCTYPE(None, ct.POINTER(xt_option_call))),
++ ("x6_fcheck", ct.CFUNCTYPE(None, ct.POINTER(xt_fcheck_call))),
++ ("x6_options", ct.POINTER(xt_option_entry)),
++
++ ('xt_xlate', ct.c_int),
++
++ # size of per-extension instance extra "global" scratch space
++ ("udata_size", ct.c_size_t),
++
++ # ignore these men behind the curtain:
++ ("udata", ct.c_void_p),
++ ("option_offset", ct.c_uint),
++ ("m", ct.POINTER(xt_entry_match)),
++ ("mflags", ct.c_uint),
++ ("loaded", ct.c_uint)]
+
+
+ class xtables_match(ct.Union):
diff -Nru python-iptables-0.11.0/debian/patches/series
python-iptables-0.11.0/debian/patches/series
--- python-iptables-0.11.0/debian/patches/series 2017-04-28
22:41:39.000000000 +0200
+++ python-iptables-0.11.0/debian/patches/series 2017-05-18
00:24:18.000000000 +0200
@@ -2,3 +2,4 @@
0002-Take-Multiarch-into-account-when-looking-for-xtables.patch
0003-Backported-IPv6-mask-fix.patch
0004-Backported-support-for-v12-xtables.patch
+0005-Backported-xtables_match_v12.patch
