From: Mike Frysinger Date: Tue, 5 Oct 2004 12:37:31 +0000 (+0000) Subject: Version bump #47788 and security #66355. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7ca76f4d86d067875610ff43bedf67a335d018b6;p=gentoo.git Version bump #47788 and security #66355. --- diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog index 9766e7e1507c..9d7d0874a7de 100644 --- a/sys-devel/gettext/ChangeLog +++ b/sys-devel/gettext/ChangeLog @@ -1,6 +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.52 2004/10/03 09:34:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.53 2004/10/05 12:37:31 vapier Exp $ + +*gettext-0.14.1 (05 Oct 2004) + + 05 Oct 2004; Mike Frysinger + +files/gettext-0.14.1-without_java.patch, +gettext-0.14.1.ebuild: + Version bump #47788 and security #66355. 03 Oct 2004; Mike Frysinger gettext-0.11.5-r1.ebuild, gettext-0.11.5.ebuild, gettext-0.12.1-r1.ebuild, gettext-0.12.1.ebuild: diff --git a/sys-devel/gettext/files/digest-gettext-0.14.1 b/sys-devel/gettext/files/digest-gettext-0.14.1 new file mode 100644 index 000000000000..c7cf30aa1ae7 --- /dev/null +++ b/sys-devel/gettext/files/digest-gettext-0.14.1 @@ -0,0 +1,2 @@ +MD5 78f4b862510beb2e5d43223dd610e77d gettext-0.14.1.tar.gz 6550874 +MD5 db2ad0d52c8cbc32a91b183a23f971e2 gettext-0.14.1-bootstrap.patch.bz2 3133 diff --git a/sys-devel/gettext/files/gettext-0.14.1-without_java.patch b/sys-devel/gettext/files/gettext-0.14.1-without_java.patch new file mode 100644 index 000000000000..d60dde9dcbc6 --- /dev/null +++ b/sys-devel/gettext/files/gettext-0.14.1-without_java.patch @@ -0,0 +1,104 @@ +Submitted By: Tushar Teredesai +Date: 2003-11-15 +Initial Package Version: 0.12.1 +Origin: None +Description: Adds logic to bypass checking for java/gcj. This is useful +when building gettext in Ch 5 (If java is found on the host, gettext build +libs that link to the host and also causes failure of some tests during make check). +To bypass Java checks, pass the option --without-java to configure. +diff -ur gettext-0.12.1.orig/gettext-runtime/configure gettext-0.12.1/gettext-runtime/configure +--- gettext-0.12.1.orig/gettext-runtime/configure 2003-05-22 08:38:47.000000000 -0500 ++++ gettext-0.12.1/gettext-runtime/configure 2003-10-15 18:20:49.000000000 -0600 +@@ -3268,6 +3268,16 @@ + + + ++if test "${with_java+set}" = set; then ++ withval="$with_java" ++ test "$withval" = no || with_java=yes ++else ++ with_java=yes ++fi; ++if test "$with_java" = no ; then ++ echo "Skipping Java compiler checks..." ++else ++ + echo "$as_me:$LINENO: checking for Java compiler" >&5 + echo $ECHO_N "checking for Java compiler... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +@@ -3490,6 +3500,7 @@ + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi ++fi + + if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then + BUILDJAVA=yes +diff -ur gettext-0.12.1.orig/gettext-tools/configure gettext-0.12.1/gettext-tools/configure +--- gettext-0.12.1.orig/gettext-tools/configure 2003-05-22 08:40:24.000000000 -0500 ++++ gettext-0.12.1/gettext-tools/configure 2003-10-15 18:21:15.000000000 -0600 +@@ -3070,6 +3070,16 @@ + + + ++if test "${with_java+set}" = set; then ++ withval="$with_java" ++ test "$withval" = no || with_java=yes ++else ++ with_java=yes ++fi; ++if test "$with_java" = no ; then ++ echo "Skipping Java native compiler checks..." ++else ++ + echo "$as_me:$LINENO: checking for Java to native code compiler" >&5 + echo $ECHO_N "checking for Java to native code compiler... $ECHO_C" >&6 + # Search for the gcj command or use the one provided by the user. +@@ -3161,6 +3171,7 @@ + HAVE_GCJ= + fi + ++fi + + + +@@ -3423,6 +3434,10 @@ + + + ++if test "$with_java" = no ; then ++ echo "Skipping Java compiler checks..." ++else ++ + echo "$as_me:$LINENO: checking for Java compiler" >&5 + echo $ECHO_N "checking for Java compiler... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +@@ -3646,6 +3661,8 @@ + echo "${ECHO_T}no" >&6 + fi + ++fi ++ + if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then + BUILDJAVA=yes + else +@@ -3653,6 +3670,10 @@ + fi + + ++if test "$with_java" = no ; then ++ echo "Skipping Java VM checks..." ++else ++ + + echo "$as_me:$LINENO: checking for Java virtual machine" >&5 + echo $ECHO_N "checking for Java virtual machine... $ECHO_C" >&6 +@@ -3840,7 +3861,7 @@ + echo "${ECHO_T}$ac_result" >&6 + + +- ++fi + + + diff --git a/sys-devel/gettext/gettext-0.14.1.ebuild b/sys-devel/gettext/gettext-0.14.1.ebuild new file mode 100644 index 000000000000..a242ef0a1a85 --- /dev/null +++ b/sys-devel/gettext/gettext-0.14.1.ebuild @@ -0,0 +1,88 @@ +# 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.1 2004/10/05 12:37:31 vapier Exp $ + +inherit eutils gnuconfig gcc mono + +DESCRIPTION="GNU locale utilities" +HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz + mirror://gentoo/${P}-bootstrap.patch.bz2" + +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 ${WORKDIR}/${P}-bootstrap.patch + use sparc && epatch ${FILESDIR}/${P}-without_java.patch + gnuconfig_update +} + +src_compile() { + # 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 + use sparc && myconf="${myconf} --without-java" + use ppc-macos && myconf="${myconf} --enable-nls" + + # 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=$(gcc-getCC) \ + econf \ + --without-included-gettext \ + $(use_enable nls) \ + ${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 +}