summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2016-09-19 19:39:31 +0200
committerDavid Seifert <soap@gentoo.org>2016-10-08 19:59:36 +0200
commit994e779e56631ae76e1efd62f0a92b52b34dd816 (patch)
tree70d156f85f33c720b04cf40311c934cf83c01d2f /dev-python/python-iptables
parentdev-python/python-cluster: remove unused patch (diff)
downloadgentoo-994e779e56631ae76e1efd62f0a92b52b34dd816.tar.gz
gentoo-994e779e56631ae76e1efd62f0a92b52b34dd816.tar.bz2
gentoo-994e779e56631ae76e1efd62f0a92b52b34dd816.zip
dev-python/python-iptables: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/2363 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-python/python-iptables')
-rw-r--r--dev-python/python-iptables/files/python-iptables-0.2.0-tests.patch21
-rw-r--r--dev-python/python-iptables/files/python-iptables-0.3.0-conntrack-fixes.patch182
-rw-r--r--dev-python/python-iptables/files/python-iptables-fix-ctypes.patch70
3 files changed, 0 insertions, 273 deletions
diff --git a/dev-python/python-iptables/files/python-iptables-0.2.0-tests.patch b/dev-python/python-iptables/files/python-iptables-0.2.0-tests.patch
deleted file mode 100644
index fb9d601ceaa..00000000000
--- a/dev-python/python-iptables/files/python-iptables-0.2.0-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/test.py b/test.py
-index f426612..f598585 100755
---- a/test.py
-+++ b/test.py
-@@ -3,16 +3,6 @@
-
- import sys
-
--print "WARNING: this test will manipulate iptables rules."
--print "Don't do this on a production machine."
--while True:
-- print "Would you like to continue? y/n",
-- answer = raw_input()
-- if answer in "yYnN" and len(answer) == 1:
-- break
--if answer in "nN":
-- sys.exit(0)
--
- from iptc.test import test_iptc, test_matches, test_targets
-
- results = [rv for rv in [test_iptc.run_tests(), test_matches.run_tests(),
diff --git a/dev-python/python-iptables/files/python-iptables-0.3.0-conntrack-fixes.patch b/dev-python/python-iptables/files/python-iptables-0.3.0-conntrack-fixes.patch
deleted file mode 100644
index 469fe5d97a6..00000000000
--- a/dev-python/python-iptables/files/python-iptables-0.3.0-conntrack-fixes.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff --git a/iptc/ip4tc.py b/iptc/ip4tc.py
-index 1efeabe..a953f41 100644
---- a/iptc/ip4tc.py
-+++ b/iptc/ip4tc.py
-@@ -460,8 +460,6 @@ class Match(IPTCModule):
- if self._module.next is not None:
- self._store_buffer(module)
-
-- self._check_alias(module[0], match)
--
- self._match_buf = (ct.c_ubyte * self.size)()
- if match:
- ct.memmove(ct.byref(self._match_buf), ct.byref(match), self.size)
-@@ -503,7 +501,11 @@ class Match(IPTCModule):
- self._buffer.buffer = ct.cast(module, ct.POINTER(ct.c_ubyte))
-
- def _final_check(self):
-- self._xt.final_check_match(self._module)
-+ if self._alias is not None:
-+ module = self._alias
-+ else:
-+ module = self._module
-+ self._xt.final_check_match(module)
-
- def _parse(self, argv, inv, entry):
- if self._alias is not None:
-@@ -530,6 +532,7 @@ class Match(IPTCModule):
- self._ptrptr = ct.cast(ct.pointer(self._ptr),
- ct.POINTER(ct.POINTER(xt_entry_match)))
- self._module.m = self._ptr
-+ self._check_alias(self._module, self._module.m)
- if self._alias is not None:
- self._alias.m = self._ptr
- self._update_name()
-@@ -613,8 +616,6 @@ class Target(IPTCModule):
- else:
- self._revision = self._module.revision
-
-- self._check_alias(module[0], target)
--
- self._create_buffer(target)
-
- if self._is_standard_target():
-@@ -673,7 +674,11 @@ class Target(IPTCModule):
- return False
-
- def _final_check(self):
-- self._xt.final_check_target(self._module)
-+ if self._alias is not None:
-+ module = self._alias
-+ else:
-+ module = self._module
-+ self._xt.final_check_target(module)
-
- def _parse(self, argv, inv, entry):
- if self._alias is not None:
-@@ -715,6 +720,7 @@ class Target(IPTCModule):
- self._ptrptr = ct.cast(ct.pointer(self._ptr),
- ct.POINTER(ct.POINTER(xt_entry_target)))
- self._module.t = self._ptr
-+ self._check_alias(self._module, self._module.t)
- if self._alias is not None:
- self._alias.t = self._ptr
- self._update_name()
-diff --git a/iptc/test/test_matches.py b/iptc/test/test_matches.py
-index 69b0b01..67c37ff 100755
---- a/iptc/test/test_matches.py
-+++ b/iptc/test/test_matches.py
-@@ -298,6 +298,40 @@ class TestXTStateMatch(unittest.TestCase):
- self.assertEquals(m.state, "RELATED,ESTABLISHED")
-
-
-+class TestXTConntrackMatch(unittest.TestCase):
-+ def setUp(self):
-+ self.rule = iptc.Rule()
-+ self.rule.src = "127.0.0.1"
-+ self.rule.protocol = "tcp"
-+ self.rule.target = iptc.Target(self.rule, "ACCEPT")
-+
-+ self.match = iptc.Match(self.rule, "conntrack")
-+
-+ self.chain = iptc.Chain(iptc.Table(iptc.Table.FILTER),
-+ "iptc_test_conntrack")
-+ self.table = iptc.Table(iptc.Table.FILTER)
-+ try:
-+ self.chain.flush()
-+ self.chain.delete()
-+ except:
-+ pass
-+ self.table.create_chain(self.chain)
-+
-+ def tearDown(self):
-+ self.chain.flush()
-+ self.chain.delete()
-+ pass
-+
-+ def test_state(self):
-+ self.match.ctstate = "NEW,RELATED"
-+ self.rule.add_match(self.match)
-+ self.chain.insert_rule(self.rule)
-+ rule = self.chain.rules[0]
-+ m = rule.matches[0]
-+ self.assertTrue(m.name, ["conntrack"])
-+ self.assertEquals(m.ctstate, "NEW,RELATED")
-+
-+
- def suite():
- suite_match = unittest.TestLoader().loadTestsFromTestCase(TestMatch)
- suite_udp = unittest.TestLoader().loadTestsFromTestCase(TestXTUdpMatch)
-@@ -308,9 +342,11 @@ def suite():
- suite_iprange = unittest.TestLoader().loadTestsFromTestCase(
- TestIprangeMatch)
- suite_state = unittest.TestLoader().loadTestsFromTestCase(TestXTStateMatch)
-+ suite_conntrack = unittest.TestLoader().loadTestsFromTestCase(
-+ TestXTConntrackMatch)
- return unittest.TestSuite([suite_match, suite_udp, suite_mark,
- suite_limit, suite_comment, suite_iprange,
-- suite_state])
-+ suite_state, suite_conntrack])
-
-
- def run_tests():
-diff --git a/iptc/test/test_targets.py b/iptc/test/test_targets.py
-index 6d83f5f..32516bd 100755
---- a/iptc/test/test_targets.py
-+++ b/iptc/test/test_targets.py
-@@ -371,6 +371,37 @@ class TestXTNotrackTarget(unittest.TestCase):
- self.assertTrue(t.name in ["NOTRACK", "CT"])
-
-
-+class TestXTCtTarget(unittest.TestCase):
-+ def setUp(self):
-+ self.rule = iptc.Rule()
-+ self.rule.dst = "127.0.0.2"
-+ self.rule.protocol = "tcp"
-+ self.rule.out_interface = "eth0"
-+
-+ self.target = iptc.Target(self.rule, "CT")
-+ self.target.notrack = "true"
-+ self.rule.target = self.target
-+
-+ self.chain = iptc.Chain(iptc.Table(iptc.Table.RAW),
-+ "iptc_test_ct")
-+ try:
-+ self.chain.flush()
-+ self.chain.delete()
-+ except:
-+ pass
-+ iptc.Table(iptc.Table.RAW).create_chain(self.chain)
-+
-+ def tearDown(self):
-+ self.chain.flush()
-+ self.chain.delete()
-+
-+ def test_ct(self):
-+ self.chain.insert_rule(self.rule)
-+ t = self.chain.rules[0].target
-+ self.assertEquals(t.name, "CT")
-+ self.assertTrue(t.notrack is not None)
-+
-+
- def suite():
- suites = []
- suite_target = unittest.TestLoader().loadTestsFromTestCase(TestTarget)
-@@ -383,14 +414,15 @@ def suite():
- TestIPTMasqueradeTarget)
- suite_dnat = unittest.TestLoader().loadTestsFromTestCase(
- TestDnatTarget)
-- suite_conntrack = unittest.TestLoader().loadTestsFromTestCase(
-+ suite_notrack = unittest.TestLoader().loadTestsFromTestCase(
- TestXTNotrackTarget)
-+ suite_ct = unittest.TestLoader().loadTestsFromTestCase(TestXTCtTarget)
- suites.extend([suite_target, suite_cluster, suite_tos])
- if is_table_available(iptc.Table.NAT):
- suites.extend([suite_target, suite_cluster, suite_redir, suite_tos,
- suite_masq, suite_dnat])
- if is_table_available(iptc.Table.RAW):
-- suites.extend([suite_conntrack])
-+ suites.extend([suite_notrack, suite_ct])
- return unittest.TestSuite(suites)
-
-
diff --git a/dev-python/python-iptables/files/python-iptables-fix-ctypes.patch b/dev-python/python-iptables/files/python-iptables-fix-ctypes.patch
deleted file mode 100644
index 8359bf5b4c0..00000000000
--- a/dev-python/python-iptables/files/python-iptables-fix-ctypes.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://github.com/ldx/python-iptables/pull/59
-
-From 6c30ca04656062bf95a1039d6e4bc7440150b9bc Mon Sep 17 00:00:00 2001
-From: Tim Harder <radhermit@gmail.com>
-Date: Sat, 22 Feb 2014 01:11:40 -0800
-Subject: [PATCH 2/2] Fix return and argument types for various libiptc API
- calls.
-
----
- iptc/ip4tc.py | 6 +++---
- iptc/ip6tc.py | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/iptc/ip4tc.py b/iptc/ip4tc.py
-index a953f41..fd3fc78 100644
---- a/iptc/ip4tc.py
-+++ b/iptc/ip4tc.py
-@@ -103,7 +103,7 @@ _libiptc, _ = find_library("ip4tc", "iptc") # old iptables versions use iptc
- class iptc(object):
- """This class contains all libiptc API calls."""
- iptc_init = _libiptc.iptc_init
-- iptc_init.restype = ct.c_void_p
-+ iptc_init.restype = ct.POINTER(ct.c_int)
- iptc_init.argstype = [ct.c_char_p]
-
- iptc_free = _libiptc.iptc_free
-@@ -120,11 +120,11 @@ class iptc(object):
-
- iptc_first_chain = _libiptc.iptc_first_chain
- iptc_first_chain.restype = ct.c_char_p
-- iptc_first_chain.argstype = [ct.c_char_p, ct.c_void_p]
-+ iptc_first_chain.argstype = [ct.c_void_p]
-
- iptc_next_chain = _libiptc.iptc_next_chain
- iptc_next_chain.restype = ct.c_char_p
-- iptc_next_chain.argstype = [ct.c_char_p, ct.c_void_p]
-+ iptc_next_chain.argstype = [ct.c_void_p]
-
- iptc_is_chain = _libiptc.iptc_is_chain
- iptc_is_chain.restype = ct.c_int
-diff --git a/iptc/ip6tc.py b/iptc/ip6tc.py
-index dbf034d..10422d8 100644
---- a/iptc/ip6tc.py
-+++ b/iptc/ip6tc.py
-@@ -82,7 +82,7 @@ _libiptc, _ = find_library("ip6tc", "iptc") # old iptables versions use iptc
- class ip6tc(object):
- """This class contains all libip6tc API calls."""
- iptc_init = _libiptc.ip6tc_init
-- iptc_init.restype = ct.c_void_p
-+ iptc_init.restype = ct.POINTER(ct.c_int)
- iptc_init.argstype = [ct.c_char_p]
-
- iptc_free = _libiptc.ip6tc_free
-@@ -99,11 +99,11 @@ class ip6tc(object):
-
- iptc_first_chain = _libiptc.ip6tc_first_chain
- iptc_first_chain.restype = ct.c_char_p
-- iptc_first_chain.argstype = [ct.c_char_p, ct.c_void_p]
-+ iptc_first_chain.argstype = [ct.c_void_p]
-
- iptc_next_chain = _libiptc.ip6tc_next_chain
- iptc_next_chain.restype = ct.c_char_p
-- iptc_next_chain.argstype = [ct.c_char_p, ct.c_void_p]
-+ iptc_next_chain.argstype = [ct.c_void_p]
-
- iptc_is_chain = _libiptc.ip6tc_is_chain
- iptc_is_chain.restype = ct.c_int
---
-1.9.0
-