Do not run ldconfig when installing.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.2 x86_64

4 files changed, 28 insertions, 7 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 2f2ed1c1ed20..2775e8fbd613 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.180 2008/10/26 21:39:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.181 2008/10/26 21:48:25 vapier Exp $
+
+  26 Oct 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/iptables-1.4.2-no-ldconfig.patch, iptables-1.4.2-r1.ebuild:
+  Do not run ldconfig when installing.
 
 *iptables-1.4.2-r1 (26 Oct 2008)
 
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 0e653ce41a36..2a65f5bc1c5c 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -13,6 +13,7 @@ AUX iptables-1.4.0-dev-files.patch 1523 RMD160 ad3dd979f20f87d78bc19f6cf906bc2fc
 AUX iptables-1.4.0-in6-glibc-2.8.patch 707 RMD160 fe02ae798356522734237fee1bd4b6c9efa47437 SHA1 5c929e66e1176dd3aba6bb4bae8964d2c0bc9891 SHA256 d6bd6fb4fc9002a9aad2bd41830d50610486c200ea5ff104bb691f5da8ff62a8
 AUX iptables-1.4.2-as-needed.patch 2364 RMD160 26ab1dd036518775baceac095d9ee2f7fbb807bd SHA1 d36002df9665449acce6d5211de90b8c0bf3be64 SHA256 8a913a2215880c02d47d4e45e1fba9ea51b94d67b9fdadbf330587a3f3aab934
 AUX iptables-1.4.2-glibc.patch 296 RMD160 96de1cf6c04bfbad7ff0db0079fc95ae0488cd6e SHA1 2ed61ae536cd448d8502dbc74e825096d6c4d7e6 SHA256 6c86b113b67c81d9a8686a363d426d847a8f48909b5a68b7b7c2f10b2ad487b1
+AUX iptables-1.4.2-no-ldconfig.patch 525 RMD160 87ee4b6829d525e00fc81934cb50d8cc2fa160a2 SHA1 3de7f0c559a70e9d5383a3e54b0cd247f4e38717 SHA256 afe2b3bd055fac66c9552346ef097e8e2e9afb3e24dbc4ad2657742e6ff44a97
 DIST iptables-1.3.6-imq.diff 5723 RMD160 7158923558f9ad82973cda9dbec2c10b86e13e9c SHA1 1a2d7d9bcb10e7d4e69f445d4882ab598b57855e SHA256 f507319d01dd1810b497e0700a67d8f9668dd1363b1f8e1b09097cf2bbc26ab7
 DIST iptables-1.3.8.tar.bz2 172584 RMD160 851b223eef0ca008ad1f375aa0ebdab46ff6f886 SHA1 948f361b194e989b39de4cfa3e95dbe634269ed0 SHA256 c5c8a091ed9a1fa2dab86b4d87719064b50c202e8503046f50f299a361e6211c
 DIST iptables-1.4.0-imq.diff 5345 RMD160 71e012358cb0ed274feb46f862d300cf0d877818 SHA1 8e243b15c20400402d60f627a40b08957ac96c10 SHA256 e23d5bce7845cbe6fecf9e93e4e8e329948adb8282efec932d629b3bb4cb9c82
@@ -23,14 +24,14 @@ DIST netfilter-layer7-v2.17.tar.gz 160408 RMD160 9823d7b411e18160dc8501a6a5d2129
 EBUILD iptables-1.3.8-r3.ebuild 7128 RMD160 64d5bb2f5e8eb5421c930b6d8df0e19dfb83a67a SHA1 c1166af8498cba39492296559245a7bf57bc80d3 SHA256 8085bd074ab9b190e0274d73df311335300644b6a731718667efdba0454a66bc
 EBUILD iptables-1.4.0-r1.ebuild 6235 RMD160 9ca2520dc41d9d2b71aa6d9262ba5f3b00537042 SHA1 f4ab4ca463933e0a4370a5d553eea7ed8be5e00c SHA256 f73139637c70ab27f06a53496335915acf39f4fc564a3ec7d98e4134cb076557
 EBUILD iptables-1.4.1.1.ebuild 1646 RMD160 3e0c302b1e766445b91c8bf9798089e4efa91381 SHA1 a0d2be782633920f1816a96685e43f13863ae03c SHA256 044362f3b320f1bcea7bc0ed2932bef9b47a294eb784c3f21852b895a9c57614
-EBUILD iptables-1.4.2-r1.ebuild 1955 RMD160 f9e0e2747a1dc92019179b007cc13ef15c4edd7b SHA1 e2b20f2a149c41b66bb356b6159abcacce52e714 SHA256 ab9218ffd8528f3f53dbeea39f1717b55ca31c86cbf109b3d4ae3cec4fa98629
+EBUILD iptables-1.4.2-r1.ebuild 2000 RMD160 a64005aea3e89e6f053629f650c33f96f4997e98 SHA1 784e81edaa168eb3f18146c226daba4cf85d93d3 SHA256 5286b4a76557004bf975d4b27e31dccde86d91454adefaca31d2506e6282a9fa
 EBUILD iptables-1.4.2.ebuild 1826 RMD160 0929b6dc312ad004e87d0403aa57a41aa5995d76 SHA1 2905f88badc9bf96dc52ad7f9b1e88fc0fb3eab2 SHA256 88497a971a618a2c8ae743397e78a9c927ffdc6e4b2dfed61f05608d7338ae88
-MISC ChangeLog 33998 RMD160 2c12e00393b972caed01ccd9a0832c53ee9661b2 SHA1 076c351817502455a7daefc84a4acb49a20ce32c SHA256 69195d441aea957c7941286116f87bddca62210bfab4a4f396149a5422377a9c
+MISC ChangeLog 34157 RMD160 60f68dbaee96aa72edb3b83e883bd58e00dede70 SHA1 7655b5815bbabc67a2e3686f2c78429546de4df9 SHA256 894a7d54cbe4a132687992fd828dc57bfcb7d5080c53971cd9d1be7406f3404d
 MISC metadata.xml 1322 RMD160 a960bf567867311d3513c9171b148a9639578f9e SHA1 bdb94c29e97f5b105efcbcd2547809b47425dc97 SHA256 39df18ef3c5485b92e03c93d673bfd959c34f9ab2b4dd97bc7efc53a5e8b15d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkE458ACgkQ67wieSYcaxeijwCfVHKTBvPcSbejIlFfzQVCwMSr
-jM8AnjG9caCVNwN7ED9eWLeV+yPOvk1q
-=WkYX
+iEYEARECAAYFAkkE5a8ACgkQ67wieSYcaxfMnQCfcU/zsKMqXlSuvmNS2sjPiV4c
+n8IAn0dCRFpvzo2kk9oXqnMsiwO6galQ
+=o5X2
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/iptables-1.4.2-no-ldconfig.patch b/net-firewall/iptables/files/iptables-1.4.2-no-ldconfig.patch
new file mode 100644
index 000000000000..06a3be51b90d
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.4.2-no-ldconfig.patch
@@ -0,0 +1,15 @@
+avoid pointless overhead for DESTDIR builds
+
+http://bugzilla.netfilter.org/show_bug.cgi?id=560
+
+--- Makefile.in
++++ Makefile.in
+@@ -1530,7 +1530,7 @@
+ # ldconfig may fail when we are not root (as is the case in build systems)
+ # so add appropriate protection that it does not let `make` fail.
+ install-exec-hook:
+-	-/sbin/ldconfig || :;
++	-[ -z "$(DESTDIR)" ] && /sbin/ldconfig
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/net-firewall/iptables/iptables-1.4.2-r1.ebuild b/net-firewall/iptables/iptables-1.4.2-r1.ebuild
index c769e08268d5..545d7b26dc8d 100644
--- a/net-firewall/iptables/iptables-1.4.2-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.2-r1.ebuild,v 1.1 2008/10/26 21:39:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.2-r1.ebuild,v 1.2 2008/10/26 21:48:25 vapier Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -20,6 +20,7 @@ src_unpack() {
 	unpack ${P}.tar.bz2
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-glibc.patch
+	epatch "${FILESDIR}"/${P}-no-ldconfig.patch
 	epatch "${FILESDIR}"/${P}-as-needed.patch #244431
 
 	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches