Trim core kernel headers from source to fix building with newer kernel headers (3...

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 742b0e94075907e8087108cdaed396ffb7133e11..d1d9533fb4a79329af48b9a9dab1ae06d5bd2ada 100644 (file)
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.258 2012/01/02 00:08:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.259 2012/01/06 23:16:38 vapier Exp $
+
+  06 Jan 2012; Mike Frysinger <vapier@gentoo.org> iptables-1.4.12.1-r1.ebuild:
+  Trim core kernel headers from source to fix building with newer kernel
+  headers (3.2+).
 
   02 Jan 2012; Agostino Sarubbo <ago@gentoo.org> iptables-1.4.12.1-r1.ebuild:
   Fix typo in src_configure by Franz Siegfried Metz in bug #396737

diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index a2be948881ceb2fabd7f8b22c8c6b873a7f5bf81..8b8508c8cbc4d0386f755c68e9fa6c892e2b9903 100644 (file)
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX ip6tables-1.3.2.confd 293 RMD160 2e5399355a930ab3c804c9cc46fe37763555a97e SHA1 0e82dbe8538f9168bb97939a03b73dd291e82760 SHA256 c93827ac2b8fdd83e2c36788053ee7567ceb13b3cbc5fcf40d186500e05c8104
 AUX iptables-1.3.2.confd 290 RMD160 cb180068f86a608b16d850635ae909ea7b9cc059 SHA1 cb56dba4799eb3998b28e492c61265574c37d522 SHA256 351e123ba9e0ec7db2bcff42849aa627d29a3b2e77a47b82386f5e3a7e21bd30
@@ -16,20 +16,26 @@ DIST iptables-1.4.6.tar.bz2 463758 RMD160 05e2e46f71f04e7675ed6f1d9f43b1142bcb14
 EBUILD iptables-1.4.10-r1.ebuild 2211 RMD160 08b184f51e106040be081664af0d0571a664229b SHA1 9cd5c0bb8414baae57fa954f60833df8f1c41152 SHA256 9e252a50a818104753102a48216ed3f67c524ab2866ffb752e0fd985ca61434c
 EBUILD iptables-1.4.10.ebuild 1847 RMD160 e6679bf4f78d1fd02e2f804d4c9fb708068927d1 SHA1 b5d309d92fd2ab38755e749994805f599cd7edc9 SHA256 59b3e9be75d0d4c13694692d36fc8e96a2a775e5a4809c300864c63a0b184376
 EBUILD iptables-1.4.11.1-r2.ebuild 2226 RMD160 1164d66cde2b975c35e5f84532a41947bf618d98 SHA1 fc798d54e6ada0e2bc1cec4926329e1faeaa6417 SHA256 7cca07bca62a6bc5f5fd0c78abc237594d6fd1e69d03664deaddad16276e12b2
-EBUILD iptables-1.4.12.1-r1.ebuild 2277 RMD160 93f88b8919271144f20263daac527e26172f9139 SHA1 b24554127ddeaf143d633889b2381a0629dcc37f SHA256 1e0a20921e7608e29a50d57f27381a1fd2b2917ddd6aef8a9b95601c3f3c8fa0
+EBUILD iptables-1.4.12.1-r1.ebuild 2345 RMD160 97cc2bc48760c334b7dc510a795083d017324c19 SHA1 9a993385f528d019ace2eb1599a9f792e012789f SHA256 a08b5e4e9721771bc6e0b4bd6351d54b0f9a444dece3a07caec91c4768cbbd8a
 EBUILD iptables-1.4.12.1.ebuild 2236 RMD160 6071e077a7c9191de8f24cc7f38cb25c42218717 SHA1 6c01e4fc3913b9016b2171def62b16f23fcc4cc9 SHA256 361587d09c71eb469f7011f8ba96a1c64ad70aef3a3a949287268c9745cd747b
 EBUILD iptables-1.4.12.ebuild 2181 RMD160 ac5dca50c3fc903d0a9466503f0dea3f65af7635 SHA1 8e7aa3bc786b5c805ac32015d2cd59ecb59feaf1 SHA256 28ddb17b1b0cfaddd290ee8f850075368082df0029f3a6949b5b87505779316b
 EBUILD iptables-1.4.6.ebuild 1433 RMD160 9dbfa44e5cd29a505a7095f122154061cef1d969 SHA1 788fc9f2ad8aa814821b43aa89933a8e281401c3 SHA256 c3808c683e4f286e40989133c80ad898aaa8e00eac635ec115652acb974e302f
-MISC ChangeLog 45363 RMD160 9437f60bc1b457b70fef151017f54ebc29fbcf97 SHA1 58c6a692285239d0283ee79e66f1328a75c32b97 SHA256 e98a6a2889c852d3e18f7a1585af80ea361029ce9bd7fae65c6bba5365211a24
+MISC ChangeLog 45537 RMD160 4d82946cc568d2e94af460cfcb05e1e3ba5ad42d SHA1 68539795639b165917ba9eb1dc1ed84557ef4a14 SHA256 3e5b888f51c200c6c14fb90441148e0812419c6fe0b053d89d34ff91169b764e
 MISC metadata.xml 1033 RMD160 e99b7b4ea8b981347a7fcadb549d122e23af4fd7 SHA1 4feab39d5a63d9ead6d389eae639bcbfd7fff197 SHA256 6972ae7bad5c0025564a15429579f046ab4c365929aa175b1e84c1586872bdc9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPAPWIAAoJEOTDgjZ80txdQ9wIAK5yx9thI1qmjWb8Ht/8bTGu
-eJL3Fh8Ex8v8zMYNynAy0tywrTH7LPz7uFC9B62RqaD+jiMCRkD2M///suc4LNC6
-cssaETVR0JLF6fz8g124z2Nz6xPhx8oPzv+L4fTZ6DaPYYYNHdNVJ8896KkC/UFq
-1lTsTsYvAYDmyYnAdwBXSW1ccXN7U/LpxOCGzALYF46+J5bXy+andC8QB/dtPe7D
-KQ90GpOtucD9Xj3h3NBDMBKS4h+Qe7cOzC6hWIoWT/hyDF/gFV7rOGiRyOSROdL8
-erKjvh30i3bwDgt3BvgV3kTCCDKz6Uh1IK27WRImb7bALfX7oYPjQyjPqWXtqxE=
-=SRjS
+iQIcBAEBAgAGBQJPB4EBAAoJELEHsLL7fEFW3cQQAKxIkBy6LkUl44nFakQU/4l4
+iBzxg6V+bfUqH2nQSSpdHKoorIXhHh+XZGDdzM+HA/IfLuBytqmLiyLedIoq4Vk3
+bFCbdL4lL7IjYybEi4CvUlcxSwsiky45/vXtvh+CQC+STq7iQHJseB66eNJhX2/T
+EH6MASpSE/+DmqgHIrfx2onSOxpIgyHX2/XWfdESmxx6TcSxVMhHDg8KHU+icmb4
+zr1CorMCZAxn3ijMvc9pC3LsHY1ZvyEZ0YRETmx+g9Tl+oLyj+6ghvVILWuvc6ey
+pKTpEk53nA0qmK9F1oZ/Sypae+q+ypGwlph8gEA0MxjATadUe8hUn6mHwXIIwX1B
+KcU+76UexbMYMkZofDbM/ApycS/GDdXgPKR6rEt10carGvzJbAkTuIml1ftH2xIg
+rY4OnfBSYSfivHVxWpO55dPHbJ+0z7W1ap3A0kOQyBBIoXi4PTX8OEvgy6lQGFXo
+qwBIdJyEGqb9dsLbE/CYAhZ7MsfSq7n71V8rPuacOC7oiBQ+FCuZzKR8zIzGSwCH
+6denqOqibFp4PdJlPUiq7c1PbtByNZxoFsd3JCJuWjqbnYmD6n6D14LMu15gSwuH
+Z1GTF/IPQ7WK2mG9eJzD3HMz/84JoDdKfomjM10YAtSxQ6raxfJBmkY7UNfDhhb4
+TaY16NTFkK8aCMKeu7F1
+=xpH0
 -----END PGP SIGNATURE-----

diff --git a/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild b/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild
index 5eab25c7d5f13cb60b3bc92ec66640a401ac1f50..328643cb7ae3413d1a0079eb3abfaf7d2c710a57 100644 (file)
--- a/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v 1.3 2012/01/02 00:08:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v 1.4 2012/01/06 23:16:38 vapier Exp $
 
 EAPI="4"
 
@@ -32,13 +32,16 @@ src_prepare() {
                "${FILESDIR}/iptables-1.4.12.1-conntrack-v2-ranges.patch"
        eautomake
 
+       # use the saner headers from the kernel
+       rm -f include/linux/{kernel,types}.h
+
        # Only run autotools if user patched something
        epatch_user && eautoreconf || elibtoolize
 }
 
 src_configure() {
        sed -i \
-               -e "/nfnetlink=[01]/s:=[01]:=$(use netlink && echo 1 || echo 0):" \
+               -e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
                configure || die
        econf \
                --sbindir=/sbin \