Unbundle libtool and bump EAPI. Thanks to ssuominen for tracking down the patch.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-shells/pdsh/ChangeLog b/app-shells/pdsh/ChangeLog
index f459ca53cd6015b9af129de616ee6d39a75ce521..1d226759742329b8497ccfd835421a38583fe266 100644 (file)
--- a/app-shells/pdsh/ChangeLog
+++ b/app-shells/pdsh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/pdsh
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/pdsh/ChangeLog,v 1.14 2009/04/16 20:50:43 jsbronder Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/pdsh/ChangeLog,v 1.15 2010/04/06 16:30:56 jsbronder Exp $
+
+*pdsh-2.18-r1 (06 Apr 2010)
+
+  06 Apr 2010; Justin Bronder <jsbronder@gentoo.org> +pdsh-2.18-r1.ebuild,
+  +files/pdsh-2.18-unbundle-libtool.patch:
+  Unbundle libtool and bump EAPI. Thanks to ssuominen for tracking down the
+  patch.
 
 *pdsh-2.18 (16 Apr 2009)
 

diff --git a/app-shells/pdsh/Manifest b/app-shells/pdsh/Manifest
index abb9464690bcac9396f8c008472c8b3408c98496..05ae750daae37b8d036216a61c92dea3f1d74f67 100644 (file)
--- a/app-shells/pdsh/Manifest
+++ b/app-shells/pdsh/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pdsh-2.14-gcc-4.3-unistd.h.patch 315 RMD160 c64f1dc67a92849303cab83edc9d4453c7a2e698 SHA1 c8259923b7376855406d22277b17c5f22b93fa96 SHA256 791a91fda382aa41ecbdccc8528f283ae457740120e123b233cc393c57241164
 AUX pdsh-2.14-glibc-2.8-ARG_MAX.patch 998 RMD160 ccf884b7735bb9f78104b64946c69ced0a875158 SHA1 6dd73dd296d3ad5b67a523104a9278f0b02be500 SHA256 92b97b3e4b60d6f492d76568baf14713995eded46868aa8d46e891c82d1ab8d5
+AUX pdsh-2.18-unbundle-libtool.patch 1738 RMD160 d39cc9886a64743ba390d0f5861cf263cb7ee588 SHA1 146b45eb53a4f1674e18c122a72f457ab9b6188b SHA256 72253852315ea3c19dffa9d62b5e280efffc32d64473c82b66d913db7216f349
 DIST pdsh-2.14.tar.bz2 445693 RMD160 732fb8f0923ce5222dd88332766832621ad8a32c SHA1 f6e1f21c86f375408492b9eaadf7089c37531317 SHA256 7f08f4c78d5370683b27ae0db42817f72a21c3a2bb0db0c3ac8175f2f407a563
 DIST pdsh-2.16.tar.bz2 446899 RMD160 90b18a46b6548e28298f84983b47b2da4851f090 SHA1 4c0fa9eda83001c6fe695c6ddc36f845148b3cec SHA256 8891cd3b175d3075f7c71fa4ee2b077306117ada5dd8c0966caaa3b74eca3a3e
 DIST pdsh-2.17.tar.bz2 447788 RMD160 4e75ccaa68fe7dcbba65eabfe2bf755bfbd38b7d SHA1 c7370a3522e87e1b7c5bb77b71910482d3fca414 SHA256 d44a3e0ec902a33873aafced2abbedf0909346fec4bdca981816736ffee320c7
@@ -7,6 +11,14 @@ DIST pdsh-2.18.tar.bz2 453729 RMD160 41c1309bf4090a8dc936435499a352d585900fd7 SH
 EBUILD pdsh-2.14.ebuild 994 RMD160 b287f05fb79831066b3b963c6e0870e1fc42d045 SHA1 7df4fc4acdfd60524b24f651144f95f5641752b5 SHA256 b9ff7de7cfe9223924608070aa46f634c64d213aa67e27c9b057097e5a697eef
 EBUILD pdsh-2.16.ebuild 1008 RMD160 ef38132290ce3bba2b7eac1debda3540db9cdc79 SHA1 a4676ff6d17e0630d7d334eac2d4968768e1027b SHA256 3132caf747248cd034beb696e28820949d42e351804af9194862a0f7f8cb370a
 EBUILD pdsh-2.17.ebuild 1063 RMD160 72c0bf68e931166b085275d8ef7334bcbf555976 SHA1 a70dada85510463eaa3c33cc47360dc421664775 SHA256 a41d19498d94bb60c2d22781974095004cc397016fbbe3cf6160d6c332d469cf
+EBUILD pdsh-2.18-r1.ebuild 1731 RMD160 da3977eaadf43e6c2e416f4cda48188b02c05552 SHA1 ab4a7c305e5816da22a9d18922d1b701f48fd689 SHA256 8418cf2e3e3951656f5481782bf949ec82c64d295157903cdf96d66a7cfe20d7
 EBUILD pdsh-2.18.ebuild 1634 RMD160 521c76a063db1c9c824cd435e201b398c4843e0f SHA1 a0d0064154ed191b45c59837519c235ba8b72b44 SHA256 5dc68d6150fae05acf50802eb3d7203fd276599837496efaa2a73b063b439326
-MISC ChangeLog 2357 RMD160 950635d349369e198597dc77310c504757bea747 SHA1 3b010af549a104c0cd0e25793aa9aaf2df179468 SHA256 0103f17d4dc16264b398dbab0a3fbc5d0e98ef26124b50722e9b8afbbb39994a
+MISC ChangeLog 2590 RMD160 8f96ec41b7135b1de76ded81c624f4a5fccdcd19 SHA1 5d3700ad8460f05516e3d3d199ccdd80addf2f7f SHA256 8f0f123d162b2a2be336316643b0cb0cd59ed09d7da94146268fb2fa1f29db05
 MISC metadata.xml 1009 RMD160 21fbc79ba84e4aa662fe77b99651f1d674232b88 SHA1 c9eb9d272834102cbd884ae9e234be731e1c06ca SHA256 718701c3accac68f7cd93abf908b9e164360c23b533461a1e05b3fca190d5910
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAku7YckACgkQ4MrvBE1wQ8llmQCdGoiduH0OZ3ztT5YHGIhAX6RS
+pCwAniUTYlgp85dtsH5Nql40pJqr8xeh
+=zXlh
+-----END PGP SIGNATURE-----

diff --git a/app-shells/pdsh/files/pdsh-2.18-unbundle-libtool.patch b/app-shells/pdsh/files/pdsh-2.18-unbundle-libtool.patch
new file mode 100644 (file)
index 0000000..e73fb12
--- /dev/null
+++ b/app-shells/pdsh/files/pdsh-2.18-unbundle-libtool.patch
@@ -0,0 +1,56 @@
+From d055c4e9e2d414c9d51f7a6f2cf51cedfc79260f Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Tue, 6 Apr 2010 11:48:28 -0400
+Subject: [PATCH] unbundle libtool
+
+Bundled libltdl is vulnerable, CVE-2009-3736.
+Patch grabbed from Debian:
+http://ftp.de.debian.org/debian/pool/main/p/pdsh/pdsh_2.18-6.debian.tar.gz
+---
+ configure.ac         |    6 ++++--
+ src/pdsh/Makefile.am |    5 ++---
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2680344..196356b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,8 +38,10 @@ AC_DEBUG
+ # Libtool and ltld.[ch] support
+ #
+ AC_LIBTOOL_DLOPEN
+-AC_PROG_LIBTOOL
+-AC_LIB_LTDL
++LT_INIT
++AC_SUBST(LT_CURRENT)
++AC_SUBST(LT_REVISION)
++AC_SUBST(LT_AGE)
+ 
+ AM_CONDITIONAL(WITH_GNU_LD, test "$with_gnu_ld" = "yes")
+ 
+diff --git a/src/pdsh/Makefile.am b/src/pdsh/Makefile.am
+index dfc48a3..beac854 100644
+--- a/src/pdsh/Makefile.am
++++ b/src/pdsh/Makefile.am
+@@ -14,8 +14,7 @@ if WITH_STATIC_MODULES
+ MODULE_LIBS =              $(top_builddir)/src/modules/libmods.la 
+ else
+ MODULE_FLAGS =             -export-dynamic $(AIX_PDSH_LDFLAGS)
+-LTDL_FILES =               ltdl.h ltdl.c
+-LTDL_LDADD =               $(LIBADD_DL)
++LTDL_LDADD =               $(LIBADD_DL) -lltdl
+ endif
+ 
+ pdsh_LDADD =               $(READLINE_LIBS) $(LTDL_LDADD)
+@@ -25,7 +24,7 @@ pdsh_LDFLAGS =             $(MODULE_LIBS) $(MODULE_FLAGS) \
+ pdsh_inst_LDADD =          $(pdsh_LDADD)
+ pdsh_inst_LDFLAGS =        $(pdsh_LDFLAGS)
+ 
+-pdsh_SOURCES =             $(PDSH_SOURCES) $(LTDL_FILES)
++pdsh_SOURCES =             $(PDSH_SOURCES)
+ pdsh_inst_SOURCES =        $(pdsh_SOURCES)
+ nodist_pdsh_SOURCES =      testconfig.c
+ nodist_pdsh_inst_SOURCES = config.c
+-- 
+1.6.6.2
+

diff --git a/app-shells/pdsh/pdsh-2.18-r1.ebuild b/app-shells/pdsh/pdsh-2.18-r1.ebuild
new file mode 100644 (file)
index 0000000..b2d04c1
--- /dev/null
+++ b/app-shells/pdsh/pdsh-2.18-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/pdsh/pdsh-2.18-r1.ebuild,v 1.1 2010/04/06 16:30:56 jsbronder Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="A high-performance, parallel remote shell utility."
+HOMEPAGE="https://computing.llnl.gov/linux/pdsh.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt readline rsh"
+RDEPEND="crypt? ( net-misc/openssh )
+       rsh? ( net-misc/netkit-rsh )
+       readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}"
+
+# Feel free to debug the test suite.  Running the tests
+# by hand instead of using pdsh.exp seems to print out
+# what is expected, so the error is most likely in the
+# testsuite itself.
+# You'll also need dev-util/dejagnu
+RESTRICT="test"
+
+pkg_setup() {
+       local m
+       local valid_modules=":xcpu:ssh:exec:qshell:genders:nodeupdown:mrsh:mqshell:dshgroups:netgroup:"
+
+       PDSH_MODULE_LIST="${PDSH_MODULE_LIST:-netgroup}"
+       MODULE_CONFIG=""
+       for m in ${PDSH_MODULE_LIST}; do
+               if [[ "${valid_modules}" == *:${m}:* ]]; then
+                       MODULE_CONFIG="${MODULE_CONFIG} --with-${m}"
+               fi
+       done
+
+       elog "Building ${PF} with the following modules:"
+       elog "  ${PDSH_MODULE_LIST}"
+       elog "This list can be changed in /etc/make.conf by setting"
+       elog "PDSH_MODULE_LIST=\"module1 module2...\""
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/pdsh-2.18-unbundle-libtool.patch || die
+       eautoreconf || die
+}
+
+src_configure() {
+       econf ${MODULE_CONFIG} \
+               --with-machines \
+               $(use_with crypt ssh) \
+               $(use_with rsh) \
+               $(use_with readline) \
+               || die "configure failed"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "emake install failed"
+}