Improve iptables-1.4.3 patch (#265460).

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

3 files changed, 28 insertions, 14 deletions

diff --git a/net-firewall/ipp2p/ChangeLog b/net-firewall/ipp2p/ChangeLog
index 9f5e9a8d3b12..d822b765810c 100644
--- a/net-firewall/ipp2p/ChangeLog
+++ b/net-firewall/ipp2p/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/ipp2p
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.40 2009/04/10 22:25:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.41 2009/04/25 11:09:42 mrness Exp $
+
+  25 Apr 2009; Alin Năstac <mrness@gentoo.org>
+  files/ipp2p-0.8.2-iptables-1.4.3.patch:
+  Improve iptables-1.4.3 patch (#265460).
 
   10 Apr 2009; Alin Năstac <mrness@gentoo.org>
   +files/ipp2p-0.8.2-iptables-1.4.3.patch, ipp2p-0.8.2-r4.ebuild:
diff --git a/net-firewall/ipp2p/Manifest b/net-firewall/ipp2p/Manifest
index 72d1418e7ae1..1163dcd47565 100644
--- a/net-firewall/ipp2p/Manifest
+++ b/net-firewall/ipp2p/Manifest
@@ -3,16 +3,16 @@ Hash: SHA1
 
 AUX ipp2p-0.8.2-iptables-1.4.0.patch 1202 RMD160 5b90d6217dd7acbe73f1fc91d8a530067cb5e4fc SHA1 0d474d3fef15013a7d5bcae7cdd058d2a942bdd0 SHA256 729c218d40bc4b6e68a954e4af7919c4235fe531aa9cc4ed93f851f851588671
 AUX ipp2p-0.8.2-iptables-1.4.1.patch 1040 RMD160 ab9294b373432c75c667d05f4a3fdf0b136c0ff3 SHA1 e042f529a245faa0df7209178debfd29ece91b32 SHA256 4378a1d96296135e856b59b68142fd50127eb8619e490b5bd6a5baed44efff6d
-AUX ipp2p-0.8.2-iptables-1.4.3.patch 12040 RMD160 1404c68225d7108910028d7424c40170a18995ec SHA1 6c106c28f4f59ddc52d4f453846c540074e21db3 SHA256 8508cc351f396e1b649333cc97ca9283d15563aaafbd70b2f9206106f2c7c1c2
+AUX ipp2p-0.8.2-iptables-1.4.3.patch 12482 RMD160 efe7b2ffe4a81b1f69ecd6726ed22deda71039f9 SHA1 64d0e0bb7f97f305b76f7590c2fa416d91b981aa SHA256 996b32c02f8ee0029f0482b473a90899491778012f8836096ba90214bf54c73c
 AUX ipp2p-0.8.2-kernel-2.6.22.patch 3106 RMD160 8a088c8a72695aa59626d59253a80c78deaf72ea SHA1 8449486f8341900d0e0af783008455fc84741ba1 SHA256 90272cfa66b333d31271bd918b3879e63e3dd5681e6fd9436ba5276329618719
 DIST ipp2p-0.8.2.tar.gz 18976 RMD160 097cd4175af3f97f3687f343087b8fe0af20ba38 SHA1 98dbcf84b23e7afde3286fd0f1c1816b437d082e SHA256 b265f5a1ce62de5a6cc60b9af22134a8d19b23e14b47a897057bca91188e0ee7
 EBUILD ipp2p-0.8.2-r4.ebuild 2079 RMD160 011e0c5f9be18f0ffaf403a550e54652ab29f9e6 SHA1 065ecf77031ed8aeabc4b5279eb2269a074328d7 SHA256 24bb18187ddbe448254472982f0170e0cf0c0714db8c6ed83b11e01bd75808ea
-MISC ChangeLog 6440 RMD160 3fdd820a313932dbef62d4834ca9350f7c448f2b SHA1 731ce13521334d366000b032726089f82f46f7b2 SHA256 873292fa4c5841b51e5ba50993b8eed0bf82b39e60709f649ca216d61dc866c4
+MISC ChangeLog 6573 RMD160 e1846e34b7006fb10625e447696fb8b03d01e895 SHA1 b0ef355996d567030ea7ff4350250b6600ec8948 SHA256 975d35591b88a3a2015924598063bacaaceae5b5f61d0aa0add7baf5e9edb1b7
 MISC metadata.xml 773 RMD160 4e189213cb94afb5fbdcc54ddf6a8242b3721af8 SHA1 45701acbb199b7315d28fe82c8010b95f9d0f5ec SHA256 9a475f0965f36601f0a283a9d4b15f16ac28f7cc6a227ca28a980ffad548a776
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAknfx2sACgkQts85UDFmaOUZwwCfQO+XgekTYFIfam0w05SOAl+8
-g8UAniJe6ThnIQNgC838TEBEaLWX36ET
-=d5+R
+iEYEARECAAYFAkny738ACgkQts85UDFmaOXNXACeMhFFThipW4RmePWgBTGy83bf
+orYAnR5buYnPsnleJKcpH/1JhbTPNKl3
+=m8bK
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch b/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch
index dd704127cc1b..fbead164ded0 100644
--- a/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch
+++ b/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch
@@ -1,6 +1,7 @@
---- libipt_ipp2p.c.old	2009-04-08 18:03:26.574089860 +0200
-+++ libipt_ipp2p.c	2009-04-08 18:03:42.871884390 +0200
-@@ -88,39 +88,39 @@
+diff -Nru ipp2p-0.8.2.orig/libipt_ipp2p.c ipp2p-0.8.2/libipt_ipp2p.c
+--- ipp2p-0.8.2.orig/libipt_ipp2p.c	2009-04-25 11:05:43.000000000 +0000
++++ ipp2p-0.8.2/libipt_ipp2p.c	2009-04-25 11:06:54.000000000 +0000
+@@ -85,39 +85,39 @@
      switch (c) {
  	case '1':		/*cmd: ipp2p*/
  	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
@@ -49,7 +50,7 @@
  	    *flags += IPP2P_EDK;
  	    info->cmd = *flags;	    
  	    break;
-@@ -128,21 +128,21 @@
+@@ -125,21 +125,21 @@
  
  	case '7':		/*cmd: dc*/
              if ((*flags & IPP2P_DC) == IPP2P_DC)
@@ -76,7 +77,7 @@
              *flags += IPP2P_DC;
  	    info->cmd = *flags;
  	    break;
-@@ -150,70 +150,70 @@
+@@ -147,70 +147,70 @@
  
  	case '9':		/*cmd: gnu*/
              if ((*flags & IPP2P_GNU) == IPP2P_GNU)
@@ -163,7 +164,7 @@
              *flags += IPP2P_APPLE;
  	    info->cmd = *flags;
  	    break;																											
-@@ -221,14 +221,14 @@
+@@ -218,14 +218,14 @@
  
  	case 'd':		/*cmd: soul*/
              if ((*flags & IPP2P_SOUL) == IPP2P_SOUL)
@@ -181,7 +182,7 @@
              *flags += IPP2P_SOUL;
  	    info->cmd = *flags;
  	    break;																											
-@@ -236,67 +236,67 @@
+@@ -233,67 +233,67 @@
  
  	case 'e':		/*cmd: winmx*/
              if ((*flags & IPP2P_WINMX) == IPP2P_WINMX)
@@ -263,7 +264,7 @@
  //	    "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
  	    return 0;
      }
-@@ -308,7 +308,7 @@
+@@ -305,7 +305,7 @@
  final_check(unsigned int flags)
  {
      if (!flags)
@@ -272,3 +273,12 @@
  	    "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
  }
  
+@@ -378,7 +378,7 @@
+     .next           = NULL,
+     .name           = "ipp2p",
+     .family         = PF_INET,
+-    .version        = IPTABLES_VERSION,
++    .version        = XTABLES_VERSION,
+     .size           = XT_ALIGN(sizeof(struct ipt_p2p_info)),
+     .userspacesize  = XT_ALIGN(sizeof(struct ipt_p2p_info)),
+     .help           = &help,