*** empty log message ***

9 files changed, 28 insertions, 22 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index f80b0128b196..3e59ae989ef4 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,19 +1,32 @@
 # ChangeLog for net-firewall/iptables
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.30 2004/06/24 22:41:08 agriffis Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.31 2004/06/28 19:00:50 aliz Exp $
 
-*iptables-1.2.9-r2 (24 Jun 2004)
+*iptables-1.2.9-r2 (28 Jun 2004)
 
-  24 Jun 2004; Aron Griffis <agriffis@gentoo.org> iptables-1.2.9-r2.ebuild:
-  QA - fix use invocation
+  28 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.9-r2.ebuild:
+  New revision with a new local use flag that toggles the applying of
+  3rd party patches and building against linux sources. Without the new
+  use flag no 3rd party extensions patches will be applied and iptables
+  will be built against linux-headers.
+
+  Be aware that iptables doesn't always build against the newest kernels
+  and manual patching may be required.
+
+  Closing #54440
+
+  28 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.7a-r3.ebuild,
+  iptables-1.2.9-r1.ebuild, iptables-1.2.9.ebuild:
+  Step back to an earlier date to clean up the mess, 
+  change "Gentoo Technologies Inc" to "Gentoo Foundation".
 
   09 Jun 2004; Aron Griffis <agriffis@gentoo.org> iptables-1.2.7a-r3.ebuild,
   iptables-1.2.9-r1.ebuild, iptables-1.2.9.ebuild:
   Fix use invocation and replace unnecessary subshell with if..then..fi
 
   07 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.9-r1.ebuild:
-  + Only run check_KV if /usr/src/liunx is a symlink or a directory, possible fix
-    for #46817.
+  + Only run check_KV if /usr/src/liunx is a symlink or a directory, possible 
+    fix for #46817.
   + Handle extensionpatches that was added for 1.2.9-r1. Closing #51418.
 
   10 May 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.9-r1.ebuild:
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index fde8df6469de..e3b3cceac83f 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,10 +1,9 @@
-MD5 f7d605543fedd1b311bc64f9c787ac00 iptables-1.2.7a-r3.ebuild 1963
-MD5 8e1a3feb5dd3edfce12db26ab92d29a2 iptables-1.2.9-r2.ebuild 4476
-MD5 038ff057207b74f90988e9b4b371bbac iptables-1.2.9.ebuild 2781
-MD5 176c86fe429eb4ce4d259c787d764a06 iptables-1.2.9-r1.ebuild 3500
-MD5 3bc3b876dc4b51661b3ab19575fd41a6 ChangeLog 10721
+MD5 47479919df5da51b37fb64f34b736b97 iptables-1.2.7a-r3.ebuild 1963
+MD5 eae13a95423b7dec06c510577342f1b5 iptables-1.2.9-r2.ebuild 4748
+MD5 b8ec9f560d65adcd0c7ddb07ad94fad2 iptables-1.2.9.ebuild 2781
+MD5 f279735af01c845eeb0eaf21d927a7d5 iptables-1.2.9-r1.ebuild 3500
+MD5 e41982b0cc7e30850a95dc806e0533c1 ChangeLog 10833
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 ef9d30876710402f2053a3e797a909dd iptables-1.2.11.ebuild 3517
 MD5 f876be872ec78bc824f2503059338d8d files/iptables.confd 382
 MD5 11b6d4adeda9db7a96bc9c1238320fb5 files/ip6tables.init 2107
 MD5 1d34d1326df13874bd2f1997f3ee4d59 files/sparc64_limit_fix.patch.bz2 1227
@@ -15,10 +14,8 @@ MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r1 67
 MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r2 67
 MD5 e16ca98d9b770d5e61b3eb760b13b7c7 files/ip6tables.confd 384
 MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68
-MD5 23c4c7ee1b86cd191e7b17b046289c91 files/iptables-1.2.9-hppa.patch.bz2 278
 MD5 9a6203c5e509f5c1fdcb62d9f2da7bb7 files/ip6tables-1.2.9-r1.confd 213
 MD5 b4abd6e2518af2b4a14ba14c0392fe02 files/iptables-1.2.7a-hppa.diff 345
-MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11 68
 MD5 20f328b3b857860fe333c14a71eb5e20 files/iptables-1.2.9-r1.confd 211
 MD5 7e146122ae2bb424410cb64f54ad0a9b files/ip6tables-1.2.9-r1.init 1795
 MD5 ea3ad4b64a781b66b711cb587d4a718b files/1.2.7a-files/01_all_grsecurity.patch.bz2 1163
@@ -31,7 +28,3 @@ MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.9-files/03_hppa_gentoo.patch.bz2
 MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.9-files/02_all_imq.patch.bz2 2936
 MD5 88d477ca9a41c15b1cc2d5253e371ada files/1.2.9-files/06_all_l7.patch.bz2 4455
 MD5 2599393f05041feef25abb4f204e72cb files/1.2.9-files/05_all_install_all_dev_files.patch.bz2 1056
-MD5 88d477ca9a41c15b1cc2d5253e371ada files/extensions/iptables-1.2.9-l7-patch.bz2 4455
-MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/extensions/iptables-1.2.9-imq.patch.bz2 2936
-MD5 d5afce91314f40a8448cd20a8b585ee5 files/extensions/iptables-1.2.9-grsecurity.patch.bz2 1224
-MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.11-files/03_all_gentoo.patch.bz2 278
diff --git a/net-firewall/iptables/files/1.2.9-files/sparc64_limit_fix.patch.bz2 b/net-firewall/iptables/files/1.2.9-files/sparc64_limit_fix.patch.bz2
new file mode 100644
index 000000000000..63df77c7ae67
--- /dev/null
+++ b/net-firewall/iptables/files/1.2.9-files/sparc64_limit_fix.patch.bz2
diff --git a/net-firewall/iptables/files/extensions/iptables-1.2.9-grsecurity.patch.bz2 b/net-firewall/iptables/files/extensions/iptables-1.2.9-grsecurity.patch.bz2
deleted file mode 100644
index c5558ee2930e..000000000000
--- a/net-firewall/iptables/files/extensions/iptables-1.2.9-grsecurity.patch.bz2
+++ /dev/null
diff --git a/net-firewall/iptables/files/extensions/iptables-1.2.9-imq.patch.bz2 b/net-firewall/iptables/files/extensions/iptables-1.2.9-imq.patch.bz2
deleted file mode 100644
index 85a7f00124f2..000000000000
--- a/net-firewall/iptables/files/extensions/iptables-1.2.9-imq.patch.bz2
+++ /dev/null
diff --git a/net-firewall/iptables/files/extensions/iptables-1.2.9-l7-patch.bz2 b/net-firewall/iptables/files/extensions/iptables-1.2.9-l7-patch.bz2
deleted file mode 100644
index 7b682cbfaaff..000000000000
--- a/net-firewall/iptables/files/extensions/iptables-1.2.9-l7-patch.bz2
+++ /dev/null
diff --git a/net-firewall/iptables/iptables-1.2.7a-r3.ebuild b/net-firewall/iptables/iptables-1.2.7a-r3.ebuild
index 0c02b8fa0515..ec77c69bd6b3 100644
--- a/net-firewall/iptables/iptables-1.2.7a-r3.ebuild
+++ b/net-firewall/iptables/iptables-1.2.7a-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.7a-r3.ebuild,v 1.7 2004/06/24 22:41:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.7a-r3.ebuild,v 1.8 2004/06/28 19:00:50 aliz Exp $
 
 inherit eutils
 
diff --git a/net-firewall/iptables/iptables-1.2.9-r1.ebuild b/net-firewall/iptables/iptables-1.2.9-r1.ebuild
index 6962c44bb97f..a4ee2ede9a82 100644
--- a/net-firewall/iptables/iptables-1.2.9-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9-r1.ebuild,v 1.6 2004/06/24 22:41:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9-r1.ebuild,v 1.7 2004/06/28 19:00:50 aliz Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/net-firewall/iptables/iptables-1.2.9.ebuild b/net-firewall/iptables/iptables-1.2.9.ebuild
index 0880727724aa..c90538953e24 100644
--- a/net-firewall/iptables/iptables-1.2.9.ebuild
+++ b/net-firewall/iptables/iptables-1.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9.ebuild,v 1.13 2004/06/24 22:41:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9.ebuild,v 1.14 2004/06/28 19:00:50 aliz Exp $
 
 inherit eutils flag-o-matic