- security fix for expects RPATH. do not remove the expect-5.39.0-libdir.patch without talking to solar or tavis

(Portage version: 2.0.51-r15)

5 files changed, 133 insertions, 8 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index f9836e5c7b5d..03e4eb528d01 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tcltk/expect
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.32 2005/02/07 00:46:56 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.33 2005/02/19 18:26:09 solar Exp $
+
+*expect-5.42.1-r1 (19 Feb 2005)
+
+  19 Feb 2005; <solar@gentoo.org> +files/expect-5.39.0-libdir.patch,
+  +expect-5.42.1-r1.ebuild:
+  - security fix for expects RPATH. do not remove the expect-5.39.0-libdir.patch
+  without talking to solar or tavis
 
   07 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> expect-5.42.1.ebuild:
   Stable on alpha.
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 4bf77e909d34..c5c5cf0b201a 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -1,13 +1,16 @@
-MD5 b52f79ccfecae27334e156f17f89e0d1 ChangeLog 4724
-MD5 c2d3ac5a228cb182b3df1a1992e35368 expect-5.37.1-r1.ebuild 1823
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 d72515e421619404da8e13d785d018da expect-5.40.0.ebuild 1778
 MD5 9df41e392d2d7f86495ad08b8096041d expect-5.37.1-r2.ebuild 3051
-MD5 4c73ddde0d04ccf48e7c4109b995e14f expect-5.40.0-r1.ebuild 2515
 MD5 6df5dccb90b220ebfa94de0e773cf0f9 expect-5.42.1.ebuild 2998
-MD5 d72515e421619404da8e13d785d018da expect-5.40.0.ebuild 1778
+MD5 c2d3ac5a228cb182b3df1a1992e35368 expect-5.37.1-r1.ebuild 1823
+MD5 4c73ddde0d04ccf48e7c4109b995e14f expect-5.40.0-r1.ebuild 2515
+MD5 59f44d7c5ae9aee2f085a037a76889eb ChangeLog 4972
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 0a840df5e1d26749df45b00df799b009 expect-5.42.1-r1.ebuild 3108
+MD5 2103ff302f6e8a0dd748772f6512b3a5 files/expect-5.42.1-multilib.patch 507
 MD5 56f93170a590d0db63d826802dcc9847 files/digest-expect-5.40.0 65
+MD5 980077a691e90dc8affe4829e3169d66 files/digest-expect-5.42.1 65
+MD5 c458386d5502fab2b49da03d16fb108c files/expect-5.39.0-libdir.patch 480
 MD5 f4bfc81e857154719e1924f00b505ea3 files/digest-expect-5.37.1-r1 65
 MD5 f4bfc81e857154719e1924f00b505ea3 files/digest-expect-5.37.1-r2 65
 MD5 56f93170a590d0db63d826802dcc9847 files/digest-expect-5.40.0-r1 65
-MD5 980077a691e90dc8affe4829e3169d66 files/digest-expect-5.42.1 65
-MD5 2103ff302f6e8a0dd748772f6512b3a5 files/expect-5.42.1-multilib.patch 507
+MD5 980077a691e90dc8affe4829e3169d66 files/digest-expect-5.42.1-r1 65
diff --git a/dev-tcltk/expect/expect-5.42.1-r1.ebuild b/dev-tcltk/expect/expect-5.42.1-r1.ebuild
new file mode 100644
index 000000000000..3f127836fa30
--- /dev/null
+++ b/dev-tcltk/expect/expect-5.42.1-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.42.1-r1.ebuild,v 1.1 2005/02/19 18:26:09 solar Exp $
+
+inherit eutils gnuconfig
+
+DESCRIPTION="tool for automating interactive applications"
+HOMEPAGE="http://expect.nist.gov/"
+SRC_URI="http://expect.nist.gov/src/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="X doc"
+
+# We need dejagnu for src_test, but dejagnu needs expect
+# to compile/run, so we cant add dejagnu to DEPEND :/
+RDEPEND=">=dev-lang/tcl-8.2
+	X? ( >=dev-lang/tk-8.2 )"
+DEPEND="${RDEPEND}
+	=sys-devel/autoconf-2.1*"
+
+NON_MICRO_V=${P%.[0-9]}
+S=${WORKDIR}/${NON_MICRO_V}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-multilib.patch
+
+	# fix the rpath being set to /var/tmp/portage/...
+	epatch ${FILESDIR}/expect-5.39.0-libdir.patch
+
+	sed -i 's#/usr/local/bin#/usr/bin#' expect.man
+	sed -i 's#/usr/local/bin#/usr/bin#' expectk.man
+	#stops any example scripts being installed by default
+	sed -i \
+		-e '/^install:/s/install-libraries //' \
+		-e 's/^SCRIPTS_MANPAGES = /_&/' \
+		Makefile.in
+	gnuconfig_update
+	WANT_AUTOCONF=2.1 autoconf
+}
+
+src_compile() {
+	local myconf
+	local tclv
+	local tkv
+	# Find the version of tcl/tk that has headers installed.
+	# This will be the most recently merged, not necessarily the highest
+	# version number.
+	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
+	#tkv isn't really needed, included for symmetry and the future
+	#tkv=$(grep  TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
+
+	#configure needs to find the files tclConfig.sh and tclInt.h
+	myconf="--with-tcl=/usr/$(get_libdir) --with-tclinclude=/usr/$(get_libdir)/tcl${tclv}/include/generic"
+
+	if use X ; then
+		#--with-x is enabled by default
+		#configure needs to find the file tkConfig.sh and tk.h
+		#tk.h is in /usr/lib so don't need to explicitly set --with-tkinclude
+		myconf="$myconf --with-tk=/usr/$(get_libdir)"
+	else
+		#configure knows that tk depends on X so just disable X
+		myconf="$myconf --without-x"
+	fi
+
+	econf $myconf --enable-shared || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_test() {
+	# we need dejagnu to do tests ... but dejagnu needs 
+	# expect ... so don't do tests unless we have dejagnu
+	type -p runtest || return 0
+	make check || die "make check failed"
+}
+
+src_install() {
+	dodir /usr/$(get_libdir)
+	make install INSTALL_ROOT=${D} || die "make install failed"
+
+	dodoc ChangeLog FAQ HISTORY NEWS README
+
+	local static_lib="lib${NON_MICRO_V/-/}.a"
+	rm ${D}/usr/$(get_libdir)/${NON_MICRO_V/-/}/${static_lib}
+
+	#install examples if 'doc' is set
+	if use doc ; then
+		docinto examples
+		local scripts=$(make -qp | \
+		                sed -e 's/^SCRIPTS = //' -et -ed | head -n1)
+		exeinto /usr/share/doc/${PF}/examples
+		doexe ${scripts}
+		local scripts_manpages=$(make -qp | \
+		       sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1)
+		for m in ${scripts_manpages}; do
+			dodoc example/${m}.man
+		done
+		dodoc example/README
+	fi
+}
diff --git a/dev-tcltk/expect/files/digest-expect-5.42.1-r1 b/dev-tcltk/expect/files/digest-expect-5.42.1-r1
new file mode 100644
index 000000000000..283afd216fdd
--- /dev/null
+++ b/dev-tcltk/expect/files/digest-expect-5.42.1-r1
@@ -0,0 +1 @@
+MD5 fea346fac6aaf74b0851f2441f478571 expect-5.42.1.tar.gz 524882
diff --git a/dev-tcltk/expect/files/expect-5.39.0-libdir.patch b/dev-tcltk/expect/files/expect-5.39.0-libdir.patch
new file mode 100644
index 000000000000..061db835fb8b
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.39.0-libdir.patch
@@ -0,0 +1,11 @@
+--- expect-5.39/Makefile.in.libdir	2003-07-30 00:46:51.000000000 +0200
++++ expect-5.39/Makefile.in	2003-11-17 17:54:52.000000000 +0100
+@@ -316,7 +316,7 @@
+ CFLAGS_INT = $(MH_CFLAGS) $(CPPFLAGS) $(XCFLAGS)
+ 
+ LIB_INSTALL_DIR = $(tcl_libdir)
+-LIB_RUNTIME_DIR = $(tcl_libdir)
++LIB_RUNTIME_DIR = $(subst $(INSTALL_ROOT),,$(tcl_libdir))
+ # I don't understand why Tcl splits these up, but it does.  LIB_RUNTIME_DIR
+ # can appear as part of the LD_SEARCH_FLAGS inherited by configure.
+