diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2008-08-31 14:44:24 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2008-08-31 14:44:24 +0000 |
| commit | 0d9ec8763c735c35f1392a4194eae83a1bed12a4 (patch) | |
| tree | c0370cb9a55eb58ee0fe8ffab2bf265b07a7d6b1 /dev-lang | |
| parent | amd64 stable, bug #221795 (diff) | |
| download | gentoo-2-0d9ec8763c735c35f1392a4194eae83a1bed12a4.tar.gz gentoo-2-0d9ec8763c735c35f1392a4194eae83a1bed12a4.tar.bz2 gentoo-2-0d9ec8763c735c35f1392a4194eae83a1bed12a4.zip | |
Added further enhancements to R-javareconf.patch (see bug #235822).
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-SENTINEL-2 i686)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/R/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/R/files/R-javareconf.patch | 28 |
2 files changed, 19 insertions, 15 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index 66d3204181be..47ae68432598 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/R # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.126 2008/08/27 23:01:40 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.127 2008/08/31 14:44:23 markusle Exp $ + + 31 Aug 2008; Markus Dittrich <markusle@gentoo.org> + files/R-javareconf.patch: + Added further enhancements to R-javareconf.patch (see bug #235822). *R-2.7.2 (27 Aug 2008) diff --git a/dev-lang/R/files/R-javareconf.patch b/dev-lang/R/files/R-javareconf.patch index 229dbb293ecb..fb9ea6b52c7b 100644 --- a/dev-lang/R/files/R-javareconf.patch +++ b/dev-lang/R/files/R-javareconf.patch @@ -1,9 +1,6 @@ -# this patch fixes the insecure tempfile usage reported in bug #235822 -# it was extracted from Debian's r-base_2.7.2-1.diff patch - diff -Naur R-2.7.2/src/scripts/javareconf R-2.7.2.new/src/scripts/javareconf --- R-2.7.2/src/scripts/javareconf 2008-03-25 08:26:44.000000000 -0400 -+++ R-2.7.2.new/src/scripts/javareconf 2008-08-27 16:49:04.000000000 -0400 ++++ R-2.7.2.new/src/scripts/javareconf 2008-08-31 10:28:48.000000000 -0400 @@ -125,16 +125,19 @@ javac_works='not present' if test -n "$JAVAC"; then @@ -13,20 +10,23 @@ diff -Naur R-2.7.2/src/scripts/javareconf R-2.7.2.new/src/scripts/javareconf - if test -e /tmp/A.java; then - if "${JAVAC}" /tmp/A.java >/dev/null; then - if test -e /tmp/A.class; then +- javac_works=yes +- fi +- fi + # edd 25 Aug 2008 use mktemp -t -d + #rm -rf /tmp/A.java /tmp/A.class -+ jctmpdir=`mktemp -t -d` -+ echo "public class A { }" > ${jctmpdir}/A.java -+ if test -e ${jctmpdir}/A.java; then -+ if "${JAVAC}" ${jctmpdir}/A.java >/dev/null; then -+ if test -e ${jctmpdir}/A.class; then - javac_works=yes - fi - fi ++ if jctmpdir=`mktemp -t -d`; then ++ echo "public class A { }" > ${jctmpdir}/A.java ++ if test -e ${jctmpdir}/A.java; then ++ if "${JAVAC}" ${jctmpdir}/A.java >/dev/null; then ++ if test -e ${jctmpdir}/A.class; then ++ javac_works=yes ++ fi ++ fi ++ fi ++ rm -rf ${jctmpdir} fi - rm -rf /tmp/A.java /tmp/A.class -+ # rm -rf /tmp/A.java /tmp/A.class -+ rm -rf ${jctmpdir} fi if test "${javac_works}" = yes; then echo "Java compiler : ${JAVAC}" |