security fun #66355, take 2

5 files changed, 162 insertions, 19 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index fb3b87f3dea4..afb771763202 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,24 +1,12 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.59 2004/10/06 23:52:05 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.60 2004/10/07 23:51:46 vapier Exp $
 
-  06 Oct 2004; Travis Tilley <lv@gentoo.org> gettext-0.14.1.ebuild:
-  also back to unstable for amd64 until the linking bugs are fixed
+*gettext-0.12.1-r2 (07 Oct 2004)
 
-  06 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> gettext-0.14.1.ebuild:
-  Stable on sparc wrt #66355
-
-  06 Oct 2004; <SeJo@gentoo.org> gettext-0.14.1.ebuild:
-  back to unstable untill the linking error is fixed
-
-  06 Oct 2004; <SeJo@gentoo.org> gettext-0.14.1.ebuild:
-  stable masked ppc gsla: 66355
-
-  05 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> gettext-0.14.1.ebuild:
-  Stable on alpha, bug 66355.
-
-  05 Oct 2004; Travis Tilley <lv@gentoo.org> gettext-0.14.1.ebuild:
-  stable on amd64 for security fix
+  07 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/gettext-0.12.1-tempfile.patch, +gettext-0.12.1-r2.ebuild:
+  Version bump for security #66355.
 
 *gettext-0.14.1 (05 Oct 2004)
 
diff --git a/sys-devel/gettext/files/digest-gettext-0.12.1-r2 b/sys-devel/gettext/files/digest-gettext-0.12.1-r2
new file mode 100644
index 000000000000..3eb790531a17
--- /dev/null
+++ b/sys-devel/gettext/files/digest-gettext-0.12.1-r2
@@ -0,0 +1 @@
+MD5 5d4bddd300072315e668247e5b7d5bdb gettext-0.12.1.tar.gz 5727037
diff --git a/sys-devel/gettext/files/gettext-0.12.1-tempfile.patch b/sys-devel/gettext/files/gettext-0.12.1-tempfile.patch
new file mode 100644
index 000000000000..bfa89fc4772f
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.12.1-tempfile.patch
@@ -0,0 +1,65 @@
+diff -ur gettext-0.14.1.orig/gettext-tools/misc/autopoint.in gettext-0.14.1/gettext-tools/misc/autopoint.in
+--- gettext-0.14.1.orig/gettext-tools/misc/autopoint.in	2004-01-29 20:17:27.000000000 +0100
++++ gettext-0.14.1/gettext-tools/misc/autopoint.in	2004-09-20 10:26:14.000000000 +0200
+@@ -39,14 +39,7 @@
+     */* | *\\*) ;;
+     *) # Need to look in the PATH.
+       if test "${PATH_SEPARATOR+set}" != set; then
+-        { echo "#! /bin/sh"; echo "exit 0"; } > /tmp/conf$$.sh
+-        chmod +x /tmp/conf$$.sh
+-        if (PATH="/nonexistent;/tmp"; conf$$.sh) >/dev/null 2>&1; then
+-          PATH_SEPARATOR=';'
+-        else
+-          PATH_SEPARATOR=:
+-        fi
+-        rm -f /tmp/conf$$.sh
++        PATH_SEPARATOR=:
+       fi
+       save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
+       for dir in $PATH; do
+@@ -318,7 +311,15 @@
+ cvs_dir=tmpcvs$$
+ work_dir=tmpwrk$$
+ mkdir "$cvs_dir"
++if [ $? -ne 0 ]; then
++  echo "ERROR making $cvs_dir"
++  exit 1
++fi
+ mkdir "$work_dir"
++if [ $? -ne 0 ]; then
++  echo "ERROR making $work_dir"
++  exit 1
++fi
+ CVSROOT="$srcdir/$cvs_dir"
+ export CVSROOT
+ unset CVS_CLIENT_LOG
+@@ -417,6 +417,10 @@
+     # Recompute base. It was clobbered by the recursive call.
+     base=`echo "$1" | sed -e 's,/[^/]*$,,'`
+     test -d "$base" || { echo "Creating directory $base"; mkdir "$base"; }
++    if [ $? -ne 0 ]; then
++      echo "ERROR making directory $base"
++      exit 1
++    fi
+   fi
+ }
+ 
+diff -ur gettext-0.14.1.orig/gettext-tools/misc/gettextize.in gettext-0.14.1/gettext-tools/misc/gettextize.in
+--- gettext-0.14.1.orig/gettext-tools/misc/gettextize.in	2004-01-20 12:30:06.000000000 +0100
++++ gettext-0.14.1/gettext-tools/misc/gettextize.in	2004-09-20 10:22:39.000000000 +0200
+@@ -39,14 +39,7 @@
+     */* | *\\*) ;;
+     *) # Need to look in the PATH.
+       if test "${PATH_SEPARATOR+set}" != set; then
+-        { echo "#! /bin/sh"; echo "exit 0"; } > /tmp/conf$$.sh
+-        chmod +x /tmp/conf$$.sh
+-        if (PATH="/nonexistent;/tmp"; conf$$.sh) >/dev/null 2>&1; then
+-          PATH_SEPARATOR=';'
+-        else
+-          PATH_SEPARATOR=:
+-        fi
+-        rm -f /tmp/conf$$.sh
++        PATH_SEPARATOR=:
+       fi
+       save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
+       for dir in $PATH; do
diff --git a/sys-devel/gettext/gettext-0.12.1-r2.ebuild b/sys-devel/gettext/gettext-0.12.1-r2.ebuild
new file mode 100644
index 000000000000..fdf563271106
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.12.1-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1-r2.ebuild,v 1.1 2004/10/07 23:51:46 vapier Exp $
+
+inherit eutils gnuconfig
+
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
+IUSE="bootstrap emacs nls"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use bootstrap && epatch ${FILESDIR}/${P}-bootstrap.patch
+	epatch ${FILESDIR}/${P}-tempfile.patch #66355
+	gnuconfig_update
+}
+
+src_compile() {
+	local myconf=""
+	( use macos || use ppc-macos ) && myconf="--enable-nls" || myconf="`use_enable nls`"
+
+	# Compaq Java segfaults trying to build gettext stuff, and there's
+	# no good way to tell gettext to refrain from building the java
+	# stuff, so... remove compaq-jdk/jre from the PATH
+	if use alpha && [[ $JAVAC == *compaq* ]]; then
+		PATH=$(echo ":${PATH}" | sed 's|:/opt/compaq-j[^:]*||g; s/^://')
+		unset JAVA_HOME CLASSPATH JDK_HOME JAVAC
+	fi
+
+	# When updating in sparc with java the jvm segfaults
+	if use sparc; then
+		epatch ${FILESDIR}/${P}-without_java.patch
+		myconf="--without-java"
+	fi
+
+	# Build with --without-included-gettext (will use that of glibc), as we
+	# need preloadable_libintl.so for new help2man, bug #40162.
+	# Also note that it only gets build with USE=nls ...
+	# Lastly, we need to build without --disable-shared ...
+	CXX=${CC} econf \
+		--without-included-gettext \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	einstall \
+		lispdir=${D}/usr/share/emacs/site-lisp \
+		docdir=${D}/usr/share/doc/${PF}/html \
+		|| die
+	dosym msgfmt /usr/bin/gmsgfmt #43435
+
+	exeopts -m0755
+	exeinto /usr/bin
+	doexe gettext-tools/misc/gettextize || die "doexe"
+
+	# Glibc includes gettext; this isn't needed anymore
+#	rm -rf ${D}/usr/include
+#	rm -rf ${D}/usr/lib/lib*.{a,so}
+
+	# Again, installed by glibc
+	rm -rf ${D}/usr/share/locale/locale.alias
+
+	# /usr/lib/charset.alias is provided by Mac OS X
+	( use macos || use ppc-macos ) && rm -f ${D}/usr/lib/charset.alias
+
+	if [ -d ${D}/usr/doc/gettext ]
+	then
+		mv ${D}/usr/doc/gettext ${D}/usr/share/doc/${PF}/html
+		rm -rf ${D}/usr/doc
+	fi
+
+	# Remove emacs site-lisp stuff if 'emacs' is not in USE
+	if ! use emacs
+	then
+		rm -rf ${D}/usr/share/emacs
+	fi
+
+	dodoc AUTHORS BUGS ChangeLog DISCLAIM NEWS README* THANKS TODO
+}
diff --git a/sys-devel/gettext/gettext-0.14.1.ebuild b/sys-devel/gettext/gettext-0.14.1.ebuild
index 193d9795b81c..8c8dbdee5b5c 100644
--- a/sys-devel/gettext/gettext-0.14.1.ebuild
+++ b/sys-devel/gettext/gettext-0.14.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.1.ebuild,v 1.9 2004/10/06 23:52:05 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.1.ebuild,v 1.10 2004/10/07 23:51:46 vapier Exp $
 
 inherit eutils gnuconfig gcc mono
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~ppc-macos s390 sparc ~x86"
+KEYWORDS="-*"
 IUSE="bootstrap emacs nls"
 
 DEPEND="virtual/libc"