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 | 7160d874910e6b8a09516c956c11c4cf28b52a49 (patch) | |
tree | 22a5d562939c943c3d7f1d0d2fa0b7dd9ac12958 /dev-lang | |
parent | amd64 stable, bug #221795 (diff) | |
download | historical-7160d874910e6b8a09516c956c11c4cf28b52a49.tar.gz historical-7160d874910e6b8a09516c956c11c4cf28b52a49.tar.bz2 historical-7160d874910e6b8a09516c956c11c4cf28b52a49.zip |
Added further enhancements to R-javareconf.patch (see bug #235822).
Package-Manager: portage-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/Manifest | 4 | ||||
-rw-r--r-- | dev-lang/R/files/R-javareconf.patch | 28 |
3 files changed, 21 insertions, 17 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/Manifest b/dev-lang/R/Manifest index 7d2ab9355d8b..0787f8ec59c3 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -1,5 +1,5 @@ AUX R-2.7.1-test-fix.patch 4049 RMD160 ea331226db3feda862009724a74cb98b08a6be91 SHA1 0b386fb4f173770820903ac4dd72a7f3d54556b5 SHA256 a641846b359f54fc254293f1ec74c0505297c5b1c7227de6c2bcba267592fa91 -AUX R-javareconf.patch 1180 RMD160 03a013dcaadc145771bd4e094215adcf936b1513 SHA1 05ad264be84fbc20228b0b17b72e3fe1b9f68212 SHA256 8459571c3979967b5a97aafb3934516a5725f67161851d6f5800354af609afa6 +AUX R-javareconf.patch 1102 RMD160 27f69ce909b3564ebd70f16007d37a79986cca72 SHA1 3a3ee2326d81eb3ca1665e0484a482b30d39fe2e SHA256 a8d74eace9ff7c97b15a6b3ef6a0f3e4401df19fb39830e2a3b32dd07bf225a2 DIST R-2.2.1.tar.gz 13665367 RMD160 b63b6c5ef1db27a879783460b0ecb6de0d4bba18 SHA1 537e0b89b8de55c1156474c76c19c1fcc210f756 SHA256 db442c769e5e8ecbdb33c771e41bdac4330b565652c5ca730f26f975df30c624 DIST R-2.6.1.tar.gz 15519691 RMD160 0e50237916e03c9b88ab558c39a9a587aabf4991 SHA1 6f2c8694f1935fda382796d225e45bd6f8f7755b SHA256 8fe505cbd9562cc84422475bc5c0b8e1b88b14d0c9e11d0de4f9e83ae8ce2563 DIST R-2.7.1.tar.gz 16413667 RMD160 ac98e39d46ebc7581dd53da7f69a1e7abad269a4 SHA1 cdf5f6f85463c7be007306add2f4ca7cf7babfb7 SHA256 f0449d23257f98d71ed7749a2ed30f69023a05259f392e4c5fd8fac9db485de7 @@ -9,5 +9,5 @@ EBUILD R-2.2.1-r1.ebuild 3273 RMD160 d0611bf5cb4561a1f663c78dc6e19ef445425db7 SH EBUILD R-2.6.1-r1.ebuild 3490 RMD160 91a9700c35d6701947e6ac67f8439182fa6fa83a SHA1 ecd4a67e619a647228e0024dfbdcf285839e2e5a SHA256 b6f74d1c37d81f0212ab215a02e0ee73063ada5e6ae9258c495e3b215388ba00 EBUILD R-2.7.1.ebuild 4173 RMD160 eee60a09d308a29d0e6692c1b377dbb5b9b29faa SHA1 0aa0d937cae7a3b13711723ef857e76cfcc2904e SHA256 b88e6375402e1906b5ece36c4aa48481f8e633569eeb8f11c2de7cbadccf3e53 EBUILD R-2.7.2.ebuild 4179 RMD160 86b91c3277cba96300c6b0edd9b142d11bd063b0 SHA1 9de0add24b2340574fcf74db0cefe0295f585588 SHA256 3930c967568b3eee56ad8e0ecc91d4d8737d576efdf68482bc0d5842c43f4659 -MISC ChangeLog 19112 RMD160 1ccd1dbaa1023453c0bb27fa87645a4aa73cd5fb SHA1 e29f1de2d239eb91e4cb87ae593672b99b3da151 SHA256 be6428691637394ff498a1f00634868ceae8ac2ea231a6603bbfdb0e5f16734f +MISC ChangeLog 19264 RMD160 7fe19c6d7ee72d7b8e70974d78ca56f57a865694 SHA1 24ed23e351b0c801ab5a88474c6778d449928146 SHA256 dca2572ed1986beb845af50bdda93e9b1eb952456d423e72113dbea15591383b MISC metadata.xml 1019 RMD160 7bafb2129d1666600d4324d7979f98d4afe896e8 SHA1 7f8e029d6edce5402c81eb9b6fb088e545dc91b4 SHA256 8dbe1befd1f6009b4c346f090c07edb79ca14b04ca5cd02dbd5ba0a4c0106ace 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}" |