Add sedfu to fix insecure runpath issues, bug 103776; tidy old ebuilds.

Package-Manager: portage-2.0.51.22-r2

9 files changed, 36 insertions, 313 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 94775decdeab..6b04f461f325 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.122 2005/08/05 17:59:29 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.123 2005/09/02 12:34:09 ka0ttic Exp $
+
+  02 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> -net-snmp-5.1.1-r1.ebuild,
+  net-snmp-5.1.3.1.ebuild, -net-snmp-5.2.1-r1.ebuild,
+  net-snmp-5.2.1.2.ebuild, net-snmp-5.3.20050624.ebuild:
+  Add sedfu to fix insecure runpath issues, bug 103776; tidy old ebuilds.
 
 *net-snmp-5.1.3.1 (05 Aug 2005)
 
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 80028a4f2d51..d1df29a8c669 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,28 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 b60f198a7739db89cfc5db54fda22d03 net-snmp-5.3.20050624.ebuild 5086
+MD5 f9c21a4768653f0035408ae5136fdafe net-snmp-5.1.3.1.ebuild 4933
+MD5 e5b36d093c56e8b589b20ef713ee74d7 net-snmp-5.2.1.2.ebuild 5053
+MD5 3af2598db83aa3463221635736e76757 ChangeLog 18894
 MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
-MD5 7f7e48543a02433b465b31961ac95fc3 net-snmp-5.3.20050624.ebuild 4929
-MD5 2cd948cef6401a46192d1b5eaab196bd net-snmp-5.1.3.1.ebuild 4776
-MD5 b2259070b8a46420311e3ae6d33057ad net-snmp-5.1.1-r1.ebuild 3622
-MD5 c8a2626c32745f6ac38463b0a5edaf98 net-snmp-5.2.1-r1.ebuild 5026
-MD5 7b2ed98cff7bd1de35aad7fe73fd4930 ChangeLog 18632
-MD5 485f347ed5dd2a71b0a51c8535337a62 net-snmp-5.2.1.2.ebuild 4895
+MD5 a63107c1d81a8aeb10e84be0658e2794 files/net-snmp-5.2.1-fix-insecure-fixproc.diff 1639
+MD5 791cd8d81154f2c1d01e3f87b86faa44 files/snmptrapd.conf 635
+MD5 82d14deda5805e21a60de03e0a69659c files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch 4734
 MD5 9791bf52496848c5613de87a95a3b761 files/digest-net-snmp-5.1.3.1 69
-MD5 b492aa2a6ad459eb41a26932d4c0740b files/digest-net-snmp-5.1.1-r1 67
+MD5 cfce6770c86e3e3bc76800c6bd6ee8c6 files/digest-net-snmp-5.2.1.2 69
 MD5 ed2e953a9a923caec45eeca95bec2efc files/snmpd-5.1.conf 606
-MD5 82d14deda5805e21a60de03e0a69659c files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch 4734
-MD5 f4562e4c61904b17dab28aae2836ff6e files/digest-net-snmp-5.2.1-r1 67
+MD5 25d92c9a7adcbb80240a914a8f6bbfe5 files/net-snmp-lm_sensors.patch 13686
 MD5 0dbde7b1bdd9c9dc988039e676800337 files/snmpd-5.1.rc6 714
-MD5 791cd8d81154f2c1d01e3f87b86faa44 files/snmptrapd.conf 635
-MD5 cfce6770c86e3e3bc76800c6bd6ee8c6 files/digest-net-snmp-5.2.1.2 69
-MD5 a63107c1d81a8aeb10e84be0658e2794 files/net-snmp-5.2.1-fix-insecure-fixproc.diff 1639
 MD5 cf7d3f5d505c262b2477f1759b908bad files/digest-net-snmp-5.3.20050624 74
-MD5 25d92c9a7adcbb80240a914a8f6bbfe5 files/net-snmp-lm_sensors.patch 13686
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC9dCmgIKl8Uu19MoRAug7AJ4l0XO3Wc2+O81hjRGu1JdIQIVjQgCeM00c
-a9Tvngn+eG5GUPRfGS77nqk=
-=s4Yj
+iD8DBQFDGEbbEZCkKN40op4RAm48AKCHO1TTfOhHk0PcxlSFTgPBNXqYmgCdES3T
+GhQ407DHOfVGutZZWTCQtw0=
+=CqmX
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.1.1-r1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.1.1-r1
deleted file mode 100644
index b8c9c3775eda..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 68f6c946387718e4f300cbb8b6c4bd43 net-snmp-5.1.1.tar.gz 2977122
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.2.1-r1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.2.1-r1
deleted file mode 100644
index ea1106d64bfd..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4c38451b1f5914789da370b79dc06124 net-snmp-5.2.1.tar.gz 3971320
diff --git a/net-analyzer/net-snmp/net-snmp-5.1.1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.1.1-r1.ebuild
deleted file mode 100644
index c33d8c5785ff..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.1.1-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2005 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.1.1-r1.ebuild,v 1.21 2005/07/04 11:59:12 ka0ttic Exp $
-
-inherit eutils
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="as-is BSD"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ~arm hppa amd64 ~ia64 ~s390 ~ppc64 ~mips"
-IUSE="perl ipv6 ssl tcpd X lm_sensors minimal selinux"
-
-DEPEND="virtual/libc
-	!minimal? ( <sys-libs/db-2 )
-	>=sys-libs/zlib-1.1.4
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	perl? (
-		>=sys-devel/libperl-5.8.0
-		>=perl-core/ExtUtils-MakeMaker-6.11-r1
-	)
-	lm_sensors? (
-		x86?   ( sys-apps/lm_sensors )
-		amd64? ( sys-apps/lm_sensors )
-	)"
-RDEPEND="${DEPEND}
-	dev-perl/TermReadKey
-	perl? ( X? ( dev-perl/perl-tk ) )
-	selinux? ( sec-policy/selinux-snmpd )"
-
-DEPEND="${DEPEND} >=sys-apps/sed-4"
-
-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
-
-	#wrt to bugs 68467, 68254
-	sed -i -e 's/^NSC_AGENTLIBS="@AGENTLIBS@"/NSC_AGENTLIBS="@AGENTLIBS@ @WRAPLIBS@"/' net-snmp-config.in
-
-	sed -i -e '551s;embed_perl="yes",;embed_perl=$enableval,;' configure.in
-	autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_enable perl embedded-perl`"
-	myconf="${myconf} `use_with ssl openssl` `use_enable !ssl internal-md5`"
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_enable ipv6`"
-
-	econf \
-		--with-sys-location="Unknown" \
-		--with-sys-contact="root@Unknown" \
-		--with-default-snmp-version="3" \
-		--with-mib-modules="host smux ucd-snmp/dlmod" \
-		--with-logfile=/var/log/net-snmpd.log \
-		--with-persistent-directory=/var/lib/net-snmp \
-		--enable-ucd-snmp-compatibility \
-		--enable-shared \
-		--with-zlib \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "compile problem"
-
-	if use perl ; then
-		emake perlmodules || die "compile perl modules problem"
-	fi
-}
-
-src_install () {
-	einstall exec_prefix="${D}/usr" persistentdir="${D}/var/lib/net-snmp"
-
-	if use perl ; then
-		make DESTDIR="${D}" perlinstall || die "make perlinstall failed"
-		if ! use X ; then
-			rm -f "${D}/usr/bin/tkmib"
-		fi
-	else
-		rm -f "${D}/usr/bin/mib2c" "${D}/usr/bin/tkmib"
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/snmpd-5.1.rc6" snmpd
-	insinto /etc/conf.d
-	newins "${FILESDIR}/snmpd-5.1.conf" snmpd
-
-	keepdir /etc/snmp /var/lib/net-snmp
-
-	# Remove everything, keeping only the snmpd, snmptrapd, MIBs, libs, and includes.
-	if use minimal; then
-		einfo "USE=minimal is set. Cleaning up excess cruft for a embedded/minimal/server only install."
-		rm -rf ${D}/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform}}
-		rm -rf ${D}/usr/share/snmp/snmpconf-data ${D}/usr/share/snmp/*.conf
-		rm -rf ${D}/usr/bin/{net-snmp-config,fixproc,traptoemail} ${D}/usr/bin/snmpc{heck,onf}
-		find ${D} -name '*.pl' -exec rm -f '{}' \;
-		use ipv6 || rm -rf ${D}/usr/share/snmp/mibs/IPV6*
-	fi
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.1.3.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.1.3.1.ebuild
index 83027de24ffb..a40025c026b6 100644
--- a/net-analyzer/net-snmp/net-snmp-5.1.3.1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.1.3.1.ebuild,v 1.1 2005/08/05 17:59:29 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.1.3.1.ebuild,v 1.2 2005/09/02 12:34:09 ka0ttic Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -54,11 +54,14 @@ src_unpack() {
 		net-snmp-config.in || die "sed net-snmp-config.in"
 	sed -i -e 's;embed_perl="yes",;embed_perl=$enableval,;' configure.in \
 		|| die "sed configure.in failed"
+	# Insecure run-path - bug 103776
+	sed -i -e 's/\(@(cd perl ; $(MAKE)\)\() ; \\\)/\1 LD_RUN_PATH=\2/g' \
+		Makefile.in || die "sed Makefile.in failed"
 	# fix access violation in make check
-	sed -i 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
+	sed -i -e 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
 		die "sed eval_tools.sh failed"
 	# fix path in fixproc
-	sed -i 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
+	sed -i -e 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
 		die "sed fixproc failed"
 
 	ht_fix_all
diff --git a/net-analyzer/net-snmp/net-snmp-5.2.1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.2.1-r1.ebuild
deleted file mode 100644
index b8dc5c167952..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.2.1-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.10 2005/07/04 11:59:12 ka0ttic Exp $
-
-inherit eutils fixheadtails perl-module
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="as-is BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="perl ipv6 ssl tcpd X lm_sensors minimal smux selinux doc rpm elf"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	!minimal? ( <sys-libs/db-2 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	lm_sensors? (
-		x86?   ( sys-apps/lm_sensors )
-		amd64? ( sys-apps/lm_sensors )
-	)
-	rpm? ( app-arch/rpm
-		dev-libs/popt
-		app-arch/bzip2
-	)
-	elf? ( dev-libs/elfutils )"
-
-RDEPEND="${DEPEND}
-	perl? (
-		X? ( dev-perl/perl-tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmpd )"
-
-DEPEND="${DEPEND}
-	>=sys-apps/sed-4
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-fix-insecure-fixproc.diff
-	epatch ${FILESDIR}/${P}-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
-
-	# bugs 68467 and 68254
-	sed -i -e \
-		's/^NSC_AGENTLIBS="@AGENTLIBS@"/NSC_AGENTLIBS="@AGENTLIBS@ @WRAPLIBS@"/' \
-		net-snmp-config.in || die "sed net-snmp-config.in"
-	sed -i -e 's;embed_perl="yes",;embed_perl=$enableval,;' configure.in \
-		|| die "sed configure.in failed"
-	# fix access violation in make check
-	sed -i 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
-		die "sed eval_tools.sh failed"
-	# fix path in fixproc
-	sed -i 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
-		die "sed fixproc failed"
-
-	ht_fix_all
-}
-
-src_compile() {
-	local mibs
-
-	autoconf || die "autoconf failed"
-
-	mibs="host ucd-snmp/dlmod"
-	use smux && mibs="${mibs} smux"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
-
-	econf \
-		--with-install-prefix="${D}" \
-		--with-sys-location="Unknown" \
-		--with-sys-contact="root@Unknown" \
-		--with-default-snmp-version="3" \
-		--with-mib-modules="${mibs}" \
-		--with-logfile="${ROOT}/var/log/net-snmpd.log" \
-		--with-persistent-directory="${ROOT}/var/lib/net-snmp" \
-		--enable-ucd-snmp-compatibility \
-		--enable-shared \
-		--with-zlib \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ipv6) \
-		$(use_enable !ssl internal-md5) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with rpm) \
-		$(use_with rpm bzip2) \
-		$(use_with elf) \
-		|| die "econf failed"
-
-	emake -j1 || die "emake failed"
-
-	if use perl ; then
-		emake perlmodules || die "compile perl modules problem"
-	fi
-
-	if use doc ; then
-		einfo "Building HTML Documentation"
-		make docsdox || die "failed to build docs"
-	fi
-}
-
-src_test() {
-	cd testing
-	if ! make test ; then
-		echo
-		einfo "Don't be alarmed if a few tests FAIL."
-		einfo "This could happen for several reasons:"
-		einfo "    - You don't already have a working configuration."
-		einfo "    - Your ethernet interface isn't properly configured."
-		echo
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if use perl ; then
-		make DESTDIR="${D}" perlinstall || die "make perlinstall failed"
-		fixlocalpod
-
-		use X || rm -f "${D}/usr/bin/tkmib"
-	else
-		rm -f "${D}/usr/bin/mib2c" "${D}/usr/bin/tkmib"
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	use doc && dohtml docs/html/*
-
-	keepdir /etc/snmp /var/lib/net-snmp
-
-	newinitd ${FILESDIR}/snmpd-5.1.rc6 snmpd || die
-	newconfd ${FILESDIR}/snmpd-5.1.conf snmpd || die
-
-	# snmptrapd can use the same rc script just slightly modified
-	sed -e 's/net-snmpd/snmptrapd/g' \
-		-e 's/snmpd/snmptrapd/g' \
-		-e 's/SNMPD/SNMPTRAPD/g' \
-		${D}/etc/init.d/snmpd > ${D}/etc/init.d/snmptrapd || \
-			die "failed to create snmptrapd init script"
-	chmod 0755 ${D}/etc/init.d/snmptrapd
-
-	newconfd ${FILESDIR}/snmptrapd.conf snmptrapd || die
-
-	# Remove everything, keeping only the snmpd, snmptrapd, MIBs, libs, and includes.
-	if use minimal; then
-		einfo "USE=minimal is set. Cleaning up excess cruft for a embedded/minimal/server only install."
-		rm -rf ${D}/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform}}
-		rm -rf ${D}/usr/share/snmp/snmpconf-data ${D}/usr/share/snmp/*.conf
-		rm -rf ${D}/usr/bin/{net-snmp-config,fixproc,traptoemail} ${D}/usr/bin/snmpc{heck,onf}
-		find ${D} -name '*.pl' -exec rm -f '{}' \;
-		use ipv6 || rm -rf ${D}/usr/share/snmp/mibs/IPV6*
-	fi
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.2.1.2.ebuild b/net-analyzer/net-snmp/net-snmp-5.2.1.2.ebuild
index 57180087ce8a..4310d0fedda0 100644
--- a/net-analyzer/net-snmp/net-snmp-5.2.1.2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.ebuild,v 1.10 2005/08/07 09:12:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.1.2.ebuild,v 1.11 2005/09/02 12:34:09 ka0ttic Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -59,11 +59,14 @@ src_unpack() {
 	# bugs 68467 and 68254
 	sed -i -e 's;embed_perl="yes",;embed_perl=$enableval,;' configure.in \
 		|| die "sed configure.in failed"
+	# Insecure run-path - bug 103776
+	sed -i -e 's/\(@(cd perl ; $(MAKE)\)\() ; \\\)/\1 LD_RUN_PATH=\2/g' \
+		Makefile.in || die "sed Makefile.in failed"
 	# fix access violation in make check
-	sed -i 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
+	sed -i -e 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
 		die "sed eval_tools.sh failed"
 	# fix path in fixproc
-	sed -i 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
+	sed -i -e 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
 		die "sed fixproc failed"
 
 	ht_fix_all
diff --git a/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild b/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild
index 0e07bd5dfe9e..8973557cb9f0 100644
--- a/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.20050624.ebuild,v 1.2 2005/07/04 11:59:12 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild,v 1.3 2005/09/02 12:34:09 ka0ttic Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -59,11 +59,14 @@ src_unpack() {
 		net-snmp-config.in || die "sed net-snmp-config.in"
 	sed -i -e 's;embed_perl="yes",;embed_perl=$enableval,;' configure.in \
 		|| die "sed configure.in failed"
+	# Insecure run-path - bug 103776
+	sed -i -e 's/\(@(cd perl ; $(MAKE)\)\() ; \\\)/\1 LD_RUN_PATH=\2/g' \
+		Makefile.in || die "sed Makefile.in failed"
 	# fix access violation in make check
-	sed -i 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
+	sed -i -e 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
 		die "sed eval_tools.sh failed"
 	# fix path in fixproc
-	sed -i 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
+	sed -i -e 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
 		die "sed fixproc failed"
 
 	ht_fix_all