Update patch to fix ctypes.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 28 insertions, 49 deletions

diff --git a/dev-python/python-iptables/ChangeLog b/dev-python/python-iptables/ChangeLog
index 83d057b274c2..56ed6279def6 100644
--- a/dev-python/python-iptables/ChangeLog
+++ b/dev-python/python-iptables/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/python-iptables
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-iptables/ChangeLog,v 1.5 2014/02/21 03:56:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-iptables/ChangeLog,v 1.6 2014/02/24 19:50:02 radhermit Exp $
+
+*python-iptables-0.3.0-r3 (24 Feb 2014)
+
+  24 Feb 2014; Tim Harder <radhermit@gentoo.org>
+  -python-iptables-0.3.0-r2.ebuild, +python-iptables-0.3.0-r3.ebuild,
+  files/python-iptables-fix-ctypes.patch:
+  Update patch to fix ctypes.
 
   21 Feb 2014; Tim Harder <radhermit@gentoo.org> -python-iptables-0.2.0.ebuild,
   -python-iptables-0.3.0.ebuild, -python-iptables-0.3.0-r1.ebuild:
diff --git a/dev-python/python-iptables/Manifest b/dev-python/python-iptables/Manifest
index 66acf472bb36..96a743aad2bb 100644
--- a/dev-python/python-iptables/Manifest
+++ b/dev-python/python-iptables/Manifest
@@ -3,19 +3,19 @@ Hash: SHA256
 
 AUX python-iptables-0.2.0-tests.patch 554 SHA256 cbeb876d17cce55d792d4e36a8072d7e48e78e762454e2fe835b6ab08b76fc01 SHA512 14b7b70af8832a040b34536538ba6c59e297af8044fc57f2a08984b2faf2e5204de881dfc4fda63c1b0f376f1b1bcaf9dda41fd3d1ff9fc88048109714babfd4 WHIRLPOOL 7bc72953776030ec49a18aa2691aaa96adda9c0334b8820b58d23575288e586219469887ea4641568aa09d988045a67ce1f5d04cfe32e14a74f4621ce8f45ff6
 AUX python-iptables-0.3.0-conntrack-fixes.patch 6471 SHA256 fd6cd7e18576940cfbcfdeff3b1cfd3b1fd4c8177e6378f80ea5a474f22bb305 SHA512 730a7865fcc80c1d2e459215cf03123f8893372123cee63aeb0a587e174571ef8e8dee18d829b98265b0fb8fc05425109517c568ebf3d8f2924c9786306419f3 WHIRLPOOL 59997e3f8c56fdda9bf14aa55ca3555ec900cd2a29bad20dfa8280ed67847f3004615fd589b061b1db7e03b04ead4f71c2985833b2d8d2adbdc729e76e511355
-AUX python-iptables-fix-ctypes.patch 3973 SHA256 43f523c84b7823187ac95f4891cda0ca04e1982ffaf3461a5ee214e03d55bbf4 SHA512 da6d63763af0c2b28d7110322f96bd1aba73a29aa95af6ae8521872cf07f2703b757babe8b8e8fa56759d4d36db81630f815c4e5e26c7333e85f9651c22e960c WHIRLPOOL a849d5f50fcb28f4736a53ec03a4596b718ab0ed6bcae83f235786a1d2a2e88b65ff80395793430b2a3a987eb35ba1dbd565809b55cd7ba144e87f6dddc3d17b
+AUX python-iptables-fix-ctypes.patch 2422 SHA256 5b14d4de65aa815604129119c32d4d24f31baf1f0cb0601553afd2e47e2b9803 SHA512 ea4d3d0435154f566857fda5bd9ceed888b3fdcfc63f3d41ef6dcd810348f788945fdba63e4193a71291266f42783f39ead4682a4e3cbb75077ded4ed665b555 WHIRLPOOL abe2c58d23d51c0f6d6ff329bb30bb4416b157b5138324e1284960d605408b01d72ac21b62d0fc3e386104b60d1d59028b8f1825f8e8da9dd7d09583bf7b9717
 DIST python-iptables-0.3.0.tar.gz 46921 SHA256 e609e150754c70220ece63c43dd763afe383a33d0d7dce35d63612c252c8f701 SHA512 423d1c2b33561410e514633fd18f0b8e6ed4f21f869072cbde58b011c46c825fcc005e8da21bb3a8c3c9ec812a5f37bd246dc1fc0d86884df43264122f7efc63 WHIRLPOOL 6fec86c7bc87334b4fa14672b0d64323bbc3a81448771fa6277ec6578671eae095ef3b2960def40f39c43a0e74e26895042ac806415d32592564a44115e2ef04
-EBUILD python-iptables-0.3.0-r2.ebuild 866 SHA256 c43a9bdb0afa3e93eecf92ad7e9d75aadddc3079f552f4f34a16d26cc702b23d SHA512 3ad12940aa226a42f17b71e631ac1ebf9dffae9093a409e31554f93d15afe763a9a33290e51f887aa0720190c4d3f5d01c1fcace84b7fd547b6e6e8ebb9b1180 WHIRLPOOL d994b1925494f2a7756346b8cc5e9498b7a6566aab7f38fd7713915a8ebf8103556dbf950104847734b72b71af931538a1a50f177f34ac4928170859724ba97e
-MISC ChangeLog 1241 SHA256 48ce0088813ef28c6b24342265fc4ca358ef1cfe132d1324080acf3aae7aace5 SHA512 142d0f8a67f02c607190781c4301cb2ccd0e133e5d22073fc9cc22d0c05f871edbaa7a3a4e49015dc3cc79fa36242453f921a8aeceecafc10c50de407eb6ff21 WHIRLPOOL dde951030b958b6ccadf6e46470dd46afc55a4a81ab14eca07c112ceb99166418d5f6d5d573329428fac944db44685f2107bcd5d77ca36f993f0b0a63fc1fd01
+EBUILD python-iptables-0.3.0-r3.ebuild 866 SHA256 81f27d3bf8e1979d7437f6fa45ef798bc2aef843416b602341b8407fe628f3e8 SHA512 b9497a0baed77aab40e5ab309041b748a10a92447b3c320d82e9e409a398d405c1715b8d86f3306ef85b24504e0e2999c98bc12738f9b5b8afec93be4e5607a4 WHIRLPOOL b62e70e6c819ec2ef39de527c889314af10e8776fb54389c317c03d56fe2edc133733da7f09356048993ebc406e097fd9eb5912841bc21f3ddd72932790b04b6
+MISC ChangeLog 1474 SHA256 93d0012b683fcc2e002d7927c8ee6e09055af5dc62efa62c45f8d5460b51e480 SHA512 229ac77782bcb5905a872ebc392b150bac9ba44f0500b3d8c94049d779d8d9d8c77ddb1680d3b4c5dc1b669a67560f710b2e12eed8cde258672a864048be6ef7 WHIRLPOOL 507ec894bc9347216a3bfa69d07f010474a4c614e7457b7f7786fc376f3c5afc9137136a6870387f687ccbd010e4ad9f378e23d180efc7bc57fc905ea22b6148
 MISC metadata.xml 1123 SHA256 c2d1079ccb342bf16517e24efd2f8a4dd32434d63c538ddb9c516631720e5fb0 SHA512 8313aba8a2095a301238d9be0095a193910262d32168ccdf89e115d9a6691d234a0ed0a7115f4c7aa68a30dde3500052ca9cd4d05fd749a37491fde6732aabea WHIRLPOOL b5daada03b37ece818e561d8502d1989920259208e05612fe4bbbabbf86ab1a3d9d298ab425cf8482c5096f367c54487078a341f4506a5dc652c63d91217d4f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTBs5YAAoJEEqz6FtPBkyjyK0H/jVZ7Va7FhmYsi4eBcmOrQdm
-YiZm1hwASRO6QPC46GFxPY8xkZHoZz9GEhN8raLDYzNrwguKxV3zY43G9dBhihwe
-Vuc0hIMK6vdZPL3gE86sLds+XSs6YyVSMJnMzdXJkI2ZA5zrfqDWmaSQpTaPrxiC
-RSOVYShJlTkZkn2DFukAiHEBPqHV4csJaA8FhIIxrlEt/Oubm2/K1qwMn5S8g/wX
-TnXlI5prmKM6Ms+FnD6Vd0Naaow21N62UTcOYRUz3Affi2JzjKb9RaKeyb0KfysR
-lkn47Xm7ja3mCVip1/M34RQEYA4xYb4eLqZn/uix8XJVTEpAM1OjFN/wrDgE3bw=
-=3jBp
+iQEcBAEBCAAGBQJTC6JuAAoJEEqz6FtPBkyj+YQH/0n9sK0UHyAQBKRPfPtO884B
+gqAd3X5zEAWT+x5lfsdQYgkUcwKPx5pu0GTsqavpZ478bxmrDT3zPlzPp61U1ZFK
+ZGitUYyKpq4xIOg/R/XfxVmsK54Csuvvd7CaHSQlWt55IIUly6hkuqpesMeM3K5t
+5tFT55JSRSTHoMpXiONO+88zz+88fi/zq1oJuOIDZjDChoI6SKQfheudH+Nn/5TY
++mf49JLg0UctzFfeBr6xnkUPuL9nrLReOtojcaLtZL2xXRDETM+fXugvWhTd+Wh1
+B3swfPu50uD5MmqJhpH81/jVEyQoh2Y4P4AXvOpW8CyYlQ74U6HpS1PQUwkzZZY=
+=2pzQ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-iptables/files/python-iptables-fix-ctypes.patch b/dev-python/python-iptables/files/python-iptables-fix-ctypes.patch
index 3e7293375a3f..8359bf5b4c03 100644
--- a/dev-python/python-iptables/files/python-iptables-fix-ctypes.patch
+++ b/dev-python/python-iptables/files/python-iptables-fix-ctypes.patch
@@ -1,17 +1,18 @@
 https://github.com/ldx/python-iptables/pull/59
 
-From d2532b133d56300f5f83f2a174fe24c7c2dcda0c Mon Sep 17 00:00:00 2001
+From 6c30ca04656062bf95a1039d6e4bc7440150b9bc Mon Sep 17 00:00:00 2001
 From: Tim Harder <radhermit@gmail.com>
-Date: Thu, 20 Feb 2014 19:34:19 -0800
-Subject: [PATCH] Fix return and argument types for various libiptc API calls.
+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 | 11 ++++++-----
- iptc/ip6tc.py |  9 +++++----
- 2 files changed, 11 insertions(+), 9 deletions(-)
+ 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..9f5d8c1 100644
+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
@@ -37,27 +38,8 @@ index a953f41..9f5d8c1 100644
  
      iptc_is_chain = _libiptc.iptc_is_chain
      iptc_is_chain.restype = ct.c_int
-@@ -205,7 +205,8 @@ class iptc(object):
-     iptc_delete_entry = _libiptc.iptc_delete_entry
-     iptc_delete_entry.restype = ct.c_int
-     iptc_delete_entry.argstype = [ct.c_char_p, ct.POINTER(ipt_entry),
--                                  ct.POINTER(ct.c_ubyte), ct.c_void_p]
-+                                  ct.POINTER(ct.c_ubyte), ct.c_void_p,
-+                                  ct.c_bool]
- 
-     # Delete the rule in position `rulenum' in `chain'.
-     iptc_delete_num_entry = _libiptc.iptc_delete_num_entry
-@@ -1588,7 +1589,7 @@ class Table(object):
-     def delete_entry(self, chain, entry, mask):
-         """Removes rule *entry* with *mask* from *chain*."""
-         rv = self._iptc.iptc_delete_entry(chain, ct.cast(entry, ct.c_void_p),
--                                          mask, self._handle)
-+                                          mask, self._handle, False)
-         if rv != 1:
-             raise IPTCError("can't delete entry from chain %s: %s)" %
-                             (chain, self.strerror()))
 diff --git a/iptc/ip6tc.py b/iptc/ip6tc.py
-index dbf034d..3b415a2 100644
+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
@@ -83,16 +65,6 @@ index dbf034d..3b415a2 100644
  
      iptc_is_chain = _libiptc.ip6tc_is_chain
      iptc_is_chain.restype = ct.c_int
-@@ -184,7 +184,8 @@ class ip6tc(object):
-     iptc_delete_entry = _libiptc.ip6tc_delete_entry
-     iptc_delete_entry.restype = ct.c_int
-     iptc_delete_entry.argstype = [ct.c_char_p, ct.POINTER(ip6t_entry),
--                                  ct.POINTER(ct.c_ubyte), ct.c_void_p]
-+                                  ct.POINTER(ct.c_ubyte), ct.c_void_p,
-+                                  ct.c_bool]
- 
-     # Delete the rule in position `rulenum' in `chain'.
-     iptc_delete_num_entry = _libiptc.ip6tc_delete_num_entry
 -- 
 1.9.0
 
diff --git a/dev-python/python-iptables/python-iptables-0.3.0-r2.ebuild b/dev-python/python-iptables/python-iptables-0.3.0-r3.ebuild
index 90510495eadd..9c3e31606357 100644
--- a/dev-python/python-iptables/python-iptables-0.3.0-r2.ebuild
+++ b/dev-python/python-iptables/python-iptables-0.3.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-iptables/python-iptables-0.3.0-r2.ebuild,v 1.1 2014/02/21 03:54:39 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-iptables/python-iptables-0.3.0-r3.ebuild,v 1.1 2014/02/24 19:50:02 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_7)