Real fix for bug 340109: use libiptc only if needed and fully disable bundled copy

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

4 files changed, 62 insertions, 8 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index b7361b44e3bd..b39a105a8bca 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/collectd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.5 2010/10/10 19:13:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.6 2010/10/12 17:59:52 dilfridge Exp $
+
+  12 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  collectd-4.10.1-r2.ebuild, +files/collectd-4.10.1-noowniptc.patch:
+  Real fix for bug 340109: use libiptc only if needed for iptables plugin,
+  and completely disable bundled version
 
   10 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
   files/collectd.initd:
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 40e0baf498a7..37b85857361f 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,8 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX collectd-4.10.1-libiptc.patch 534 RMD160 dd6c016797ec4e6e5c7c67bbbeddd50d1c59badc SHA1 253efd36642f7ab1253bcc307e0f4d0e1a4d8e21 SHA256 f6c63e0cb686e4d7a655b9ff0b69e8ba75a9cf40c2ae79c6ec97c1e7377d2f4e
 AUX collectd-4.10.1-libperl.patch 917 RMD160 2feb20abbf7fd036e34957c190689f1e668ff321 SHA1 1c8312b576faa6a855f4f615995b007b108325ba SHA256 26e3c74392166a2438d7106e94953f871aedfe3b643c866afc8865c1ef7534c7
+AUX collectd-4.10.1-noowniptc.patch 837 RMD160 433d936a3c8d22af289ab9ecc00a9843ab4634e3 SHA1 c08eb253a5297c9ec69b1923dc2ed173343e0ce8 SHA256 fac80da197b0df38b2544edf7008eed544eac06817d5ead86dea2baf46ee009d
 AUX collectd.confd 633 RMD160 46f81e3f73d577c3f59df404012e33c419188acc SHA1 85f569035bbb6ff7d3e03a4b85c35ccb126c29a4 SHA256 30e41d63f3af1d736d86903046e5aac8f8a548714bab0acbbca0ffd6c16ed430
 AUX collectd.initd 749 RMD160 ca0ea7029c5646299733b1e75e6cbfc2307f175f SHA1 52dbfc6a26998afc2059180114b872f439ba4ca1 SHA256 31566ee872442d64e20f0431d7e0687725eb4fe1c03b84fe5b9c5cec79d3c570
 DIST collectd-4.10.1.tar.bz2 1415626 RMD160 f609f70bd7bb789ab54ca72edd34c3753692ff00 SHA1 bda5c918761b98e82fa18da056f60916703b5805 SHA256 607ea5d22164eaf434223dd39a1df453103e2f3c2f2b8c1dbfc1531eefb6df56
-EBUILD collectd-4.10.1-r2.ebuild 9966 RMD160 ae659a7555073d0c26b873b83657437b18d97a98 SHA1 5ec2378a48c51c66b842d6b11dab071ff4806dba SHA256 99f2413a367f587da58d021e4d790e4ed286c9ff0228663126416dc4f8034b58
-MISC ChangeLog 1313 RMD160 3271af62bb82938d6b8bcc649ed5fa1229c4db92 SHA1 aab95b445d0316eb738591063794cbb30695b2de SHA256 ec40fa03ace80a86e97610f8f6eed3dffd7210c13c13fdaebe80fb04b49b3c88
+EBUILD collectd-4.10.1-r2.ebuild 9956 RMD160 5e745db3aef65ee506c9a7895a2c66f8904e2675 SHA1 928cb45b5e537a77b7b690a29ff30f6ff7a1375d SHA256 794a63a905398059e5c29c545200f887a22a2b2f692c15722f6d3939c5857830
+MISC ChangeLog 1556 RMD160 280df57be773d5aac0a8692b14509594742e7e6c SHA1 bae62adf9e629ae7b84143bffa28705173de62bf SHA256 4ff1b0e49560e34ea146df47b80549a8ee92c1d67ec8fd321ef4303308b4589d
 MISC metadata.xml 10712 RMD160 2c1e1064f30421d73297d30f61c63430947d8f5b SHA1 d5c71108a4fe21188e400602f8ed99a541743b37 SHA256 518746b2dd219fd53ec6c63596a0e842f6988182bfa6e1ef52eb607961bc354a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJMtKHfAAoJENwGBM22xffe7wkQAIYZjniOEVejKC9GOrfqAmhD
+FyIfPY679KuONapBP37sC6MKtFCASA3xhD7nau+ORNZlE8w2YBwdU5RoELw7Xuxe
+zgJoIXRbT1iVRTNg4Dv56rGWpHYMrHW8cScTtlWmRuY1ylxd9jO8DeoltMOuPrWm
+viAgDXFdZq/ARyEHqpGKUeae/shI/L1keU0gfecuz4ekVvrq/+uEaPSngtU0t/6T
+cceid56XdAxdS2WEDdf/uYEfMW8ZQBTGErZ7z3PNOJpsp9di4SQF40Hy4sM7Pel8
+qhb7xAfHyOfelN4tjZFAmUmdR2P8fsH/bjhQF4IW0Wzvz1zfuH2iHx38+tfiReQQ
+4aoze+NYZU+SUiSUMh2o8VcEN91kqRCim7jfKH1Z2ZFbRPktWG6MI/HN6LYBeZWc
+ACXIq6kvpA3n9JDx0CH4NucnXWvm8ycbMAsHcXKgJPIeWSfLqJfADG4VfOKk9KZp
+RnbgcEspcqT2T2BSyluZ3am7qhSESOrXpg84Kn9cuwPFJ0FMbJDw5Ef5zlhW3PuL
+3CLp8v4svCZdW7p/tEey+yt8ZRPDZhL+PkWAvc8fankXXGMIYqDbaMHeRGpbmpea
+iHwKgiXgJv5ZQsv9g1SVyu0nvWXVyUxYQpxClTwcbFqkC76njUr6+cBK5P0Vzofu
+UGi86gPw7eWJU6pdJDSE
+=JNtq
+-----END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-4.10.1-r2.ebuild b/app-admin/collectd/collectd-4.10.1-r2.ebuild
index 4e785ee005e9..2927ca6e840d 100644
--- a/app-admin/collectd/collectd-4.10.1-r2.ebuild
+++ b/app-admin/collectd/collectd-4.10.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v 1.5 2010/10/10 18:15:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v 1.6 2010/10/12 17:59:52 dilfridge Exp $
 
 EAPI="2"
 
@@ -46,10 +46,7 @@ unset plugin
 
 # Now come the dependencies.
 
-# this cannot be in the dependencies if the USE flag is not listed
-# 	collectd_plugins_oracle?		( >=dev-db/oracle-instantclient-basic-11.1.0.7.0 )
 COMMON_DEPEND="
-	>=net-firewall/iptables-1.4.9.1-r2
 	collectd_plugins_apache?		( net-misc/curl )
 	collectd_plugins_ascent?		( net-misc/curl dev-libs/libxml2 )
 	collectd_plugins_bind?			( dev-libs/libxml2 )
@@ -97,7 +94,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	collectd_plugins_syslog?		( virtual/logger )"
 
-PATCHES=( "${FILESDIR}/${P}"-{libperl,libiptc}.patch )
+PATCHES=( "${FILESDIR}/${P}"-{libperl,libiptc,noowniptc}.patch )
 
 # @FUNCTION: collectd_plugin_kernel_linux
 # @DESCRIPTION:
@@ -251,6 +248,11 @@ src_configure() {
 		myconf+=" --with-java=$(java-config -g JAVA_HOME)"
 	fi
 
+	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+	if ! use collectd_plugins_iptables; then
+		myconf+=" --with-libiptc=no"
+	fi
+
 	# Finally, run econf.
 	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl --localstatedir=/var ${myconf}
 }
diff --git a/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch b/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch
new file mode 100644
index 000000000000..6496890a7cae
--- /dev/null
+++ b/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch
@@ -0,0 +1,26 @@
+diff -r -u collectd-4.10.1.orig/src/Makefile.am collectd-4.10.1/src/Makefile.am
+--- collectd-4.10.1.orig/src/Makefile.am	2010-07-09 12:01:59.000000000 +0200
++++ collectd-4.10.1/src/Makefile.am	2010-10-11 00:10:59.000000000 +0200
+@@ -1,7 +1,4 @@
+ SUBDIRS = libcollectdclient
+-if BUILD_WITH_OWN_LIBIPTC
+-SUBDIRS += owniptc
+-endif
+ if BUILD_WITH_OWN_LIBOCONFIG
+ SUBDIRS += liboconfig
+ endif
+@@ -415,12 +412,9 @@
+ iptables_la_SOURCES = iptables.c
+ iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS)
+ iptables_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBIPTC_LDFLAGS)
+-if BUILD_WITH_OWN_LIBIPTC
+-iptables_la_LIBADD  = owniptc/libiptc.la
+-iptables_la_DEPENDENCIES = owniptc/libiptc.la
+-else
++
+ iptables_la_LIBADD = -liptc
+-endif
++
+ collectd_LDADD += "-dlopen" iptables.la
+ collectd_DEPENDENCIES += iptables.la
+ endif