Commented lm_sensors patch because it has a memory leak. Please see bug 109785.

(Portage version: 2.0.54)

5 files changed, 79 insertions, 53 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index c2f5a68210e3..fa4dd84fab97 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.130 2006/01/16 22:47:35 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.131 2006/01/23 01:24:35 vanquirius Exp $
+
+  23 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
+  net-snmp-5.2.1.2-r1.ebuild, net-snmp-5.2.2-r1.ebuild,
+  net-snmp-5.3_rc2.ebuild:
+  Commented lm_sensors patch because it has a memory leak. Please see bug
+  109785. If you can fix this problem, please attach a patch.
 
 *net-snmp-5.2.2-r1 (16 Jan 2006)
 
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 87cbf4ae317c..b9f220b44280 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4921d4d1c7a8e27e16ff854c65d7a502 ChangeLog 20714
 MD5 cfce6770c86e3e3bc76800c6bd6ee8c6 files/digest-net-snmp-5.2.1.2-r1 69
 MD5 92b7d3fe0c5dad9c215a170199e3c66c files/digest-net-snmp-5.2.2-r1 67
@@ -14,13 +11,6 @@ MD5 ed2e953a9a923caec45eeca95bec2efc files/snmpd-5.1.conf 606
 MD5 0dbde7b1bdd9c9dc988039e676800337 files/snmpd-5.1.rc6 714
 MD5 791cd8d81154f2c1d01e3f87b86faa44 files/snmptrapd.conf 635
 MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
-MD5 c80411f366b0543efc1512966ba754c6 net-snmp-5.2.1.2-r1.ebuild 4980
-MD5 c176416ab74d0e271496936dd6225101 net-snmp-5.2.2-r1.ebuild 5012
-MD5 265247aa7566a34595027e1833ff86db net-snmp-5.3_rc2.ebuild 5148
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDzs/K2+ySkm8kpY0RAiAwAJ9GODIcgXZR9Dwk7x+51bP5fj4zRACfa8Cv
-kq+TNgOYxGpx92WtVyUcXBs=
-=3MEK
------END PGP SIGNATURE-----
+MD5 d90d3f895518f513c9fbc7baa67de7dc net-snmp-5.2.1.2-r1.ebuild 5234
+MD5 15c8228c32316fbbb3cf1484d94dd382 net-snmp-5.2.2-r1.ebuild 5266
+MD5 8e320a8b666468a421ef56550dce6052 net-snmp-5.3_rc2.ebuild 5402
diff --git a/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild
index abee50ca525f..72946d44c9a1 100644
--- a/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild,v 1.3 2006/01/18 23:29:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild,v 1.4 2006/01/23 01:24:35 vanquirius Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -16,12 +16,12 @@ IUSE="perl ipv6 ssl tcpd X lm_sensors minimal smux selinux doc rpm elf"
 DEPEND=">=sys-libs/zlib-1.1.4
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	lm_sensors? ( sys-apps/lm_sensors )
 	rpm? ( app-arch/rpm
 		dev-libs/popt
 		app-arch/bzip2
 	)
 	elf? ( dev-libs/elfutils )"
+#	lm_sensors? ( sys-apps/lm_sensors )
 
 RDEPEND="${DEPEND}
 	perl? (
@@ -41,16 +41,19 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-5.2.1-fix-insecure-fixproc.diff
 	epatch ${FILESDIR}/${PN}-5.2.1-conf-elf-rpm-bz2.patch
 
-	if use lm_sensors; then
-		if use x86 || use amd64; then
-			epatch ${FILESDIR}/${PN}-lm_sensors.patch
-		else
-			eerror "Unfortunatly you are trying to enable lm_sensors support for an unsupported arch."
-			eerror "please check the availability of sys-apps/lm_sensors - if it is available on"
-			eerror "your arch, please file a bug about this."
-			die "lm_sensors patch error: unsupported arch."
-		fi
-	fi
+#	The lm_sensors patch has a memory leak
+#	If you can help, please attach a patch to bug 109785
+
+#	if use lm_sensors; then
+#		if use x86 || use amd64; then
+#			epatch ${FILESDIR}/${PN}-lm_sensors.patch
+#		else
+#			eerror "Unfortunatly you are trying to enable lm_sensors support for an unsupported arch."
+#			eerror "please check the availability of sys-apps/lm_sensors - if it is available on"
+#			eerror "your arch, please file a bug about this."
+#			die "lm_sensors patch error: unsupported arch."
+#		fi
+#	fi
 
 	# bugs 68467 and 68254
 	sed -i -e 's;embed_perl="yes",;embed_perl=$enableval,;' configure.in \
@@ -75,7 +78,7 @@ src_compile() {
 
 	mibs="host ucd-snmp/dlmod"
 	use smux && mibs="${mibs} smux"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
+#	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
 
 	econf \
 		--with-install-prefix="${D}" \
@@ -164,3 +167,10 @@ src_install () {
 		use ipv6 || rm -rf ${D}/usr/share/snmp/mibs/IPV6*
 	fi
 }
+
+pkg_postinst() {
+	if use lm_sensors ; then
+		ewarn "lm_sensors support is no longer available because it"
+		ewarn "causes a memory leak."
+	fi
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.2.2-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.2.2-r1.ebuild
index b20d620cbd73..589b35d3a494 100644
--- a/net-analyzer/net-snmp/net-snmp-5.2.2-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.2-r1.ebuild,v 1.2 2006/01/18 23:29:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.2-r1.ebuild,v 1.3 2006/01/23 01:24:35 vanquirius Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -16,12 +16,12 @@ IUSE="perl ipv6 ssl tcpd X lm_sensors minimal smux selinux doc rpm elf"
 DEPEND=">=sys-libs/zlib-1.1.4
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	lm_sensors? ( sys-apps/lm_sensors )
 	rpm? ( app-arch/rpm
 		dev-libs/popt
 		app-arch/bzip2
 	)
 	elf? ( dev-libs/elfutils )"
+#	lm_sensors? ( sys-apps/lm_sensors )
 
 RDEPEND="${DEPEND}
 	perl? (
@@ -40,16 +40,19 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PN}-5.2.2-conf-elf-rpm-bz2.patch
 
-	if use lm_sensors; then
-		if use x86 || use amd64; then
-			epatch "${FILESDIR}"/${PN}-lm_sensors.patch
-		else
-			eerror "Unfortunatly you are trying to enable lm_sensors support for an unsupported arch."
-			eerror "please check the availability of sys-apps/lm_sensors - if it is available on"
-			eerror "your arch, please file a bug about this."
-			die "lm_sensors patch error: unsupported arch."
-		fi
-	fi
+#	The lm_sensors patch has a memory leak
+#	If you can help, please attach a patch to bug 109785
+
+#	if use lm_sensors; then
+#		if use x86 || use amd64; then
+#			epatch "${FILESDIR}"/${PN}-lm_sensors.patch
+#		else
+#			eerror "Unfortunatly you are trying to enable lm_sensors support for an unsupported arch."
+#			eerror "please check the availability of sys-apps/lm_sensors - if it is available on"
+#			eerror "your arch, please file a bug about this."
+#			die "lm_sensors patch error: unsupported arch."
+#		fi
+#	fi
 
 	# bug 118016
 	epatch "${FILESDIR}"/${PN}-5.2.2-asneeded.patch
@@ -77,7 +80,7 @@ src_compile() {
 
 	mibs="host ucd-snmp/dlmod"
 	use smux && mibs="${mibs} smux"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
+#	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
 
 	econf \
 		--with-install-prefix="${D}" \
@@ -166,3 +169,10 @@ src_install () {
 		use ipv6 || rm -rf "${D}"/usr/share/snmp/mibs/IPV6*
 	fi
 }
+
+pkg_postinst() {
+	if use lm_sensors ; then
+		ewarn "lm_sensors support is no longer available because it"
+		ewarn "causes a memory leak."
+	fi
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.3_rc2.ebuild b/net-analyzer/net-snmp/net-snmp-5.3_rc2.ebuild
index 013fe3146e01..0833d88c624d 100644
--- a/net-analyzer/net-snmp/net-snmp-5.3_rc2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.3_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.3_rc2.ebuild,v 1.4 2006/01/18 23:29:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.3_rc2.ebuild,v 1.5 2006/01/23 01:24:35 vanquirius Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -18,12 +18,12 @@ IUSE="perl ipv6 ssl tcpd X lm_sensors minimal smux selinux doc rpm elf diskio"
 DEPEND=">=sys-libs/zlib-1.1.4
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	lm_sensors? ( sys-apps/lm_sensors )
 	rpm? ( app-arch/rpm
 		dev-libs/popt
 		app-arch/bzip2
 	)
 	elf? ( dev-libs/elfutils )"
+#	lm_sensors? ( sys-apps/lm_sensors )
 
 RDEPEND="${DEPEND}
 	perl? (
@@ -42,16 +42,19 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	if use lm_sensors; then
-		if use x86 || use amd64; then
-			epatch "${FILESDIR}"/${PN}-lm_sensors.patch
-		else
-			eerror "Unfortunatly you are trying to enable lm_sensors support for an unsupported arch."
-			eerror "please check the availability of sys-apps/lm_sensors - if it is available on"
-			eerror "your arch, please file a bug about this."
-			die "lm_sensors patch error: unsupported arch."
-		fi
-	fi
+#	The lm_sensors patch has a memory leak
+#	If you can help, please attach a patch to bug 109785
+
+#	if use lm_sensors; then
+#		if use x86 || use amd64; then
+#			epatch "${FILESDIR}"/${PN}-lm_sensors.patch
+#		else
+#			eerror "Unfortunatly you are trying to enable lm_sensors support for an unsupported arch."
+#			eerror "please check the availability of sys-apps/lm_sensors - if it is available on"
+#			eerror "your arch, please file a bug about this."
+#			die "lm_sensors patch error: unsupported arch."
+#		fi
+#	fi
 
 	# bugs 68467 and 68254
 	sed -i -e \
@@ -79,7 +82,7 @@ src_compile() {
 
 	mibs="host ucd-snmp/dlmod"
 	use smux && mibs="${mibs} smux"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
+#	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
 	use diskio && mibs="${mibs} ucd-snmp/diskio"
 
 	econf \
@@ -169,3 +172,10 @@ src_install () {
 		use ipv6 || rm -rf ${D}/usr/share/snmp/mibs/IPV6*
 	fi
 }
+
+pkg_postinst() {
+	if use lm_sensors ; then
+		ewarn "lm_sensors support is no longer available because it"
+		ewarn "causes a memory leak."
+	fi
+}