* [gentoo-commits] gentoo-x86 commit in dev-lang/R/files: R-javareconf.patch
@ 2008-08-31 14:44 Markus Dittrich (markusle)
0 siblings, 0 replies; 2+ messages in thread
From: Markus Dittrich (markusle) @ 2008-08-31 14:44 UTC (permalink / raw
To: gentoo-commits
markusle 08/08/31 14:44:25
Modified: R-javareconf.patch
Log:
Added further enhancements to R-javareconf.patch (see bug #235822).
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-SENTINEL-2 i686)
Revision Changes Path
1.2 dev-lang/R/files/R-javareconf.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/R/files/R-javareconf.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/R/files/R-javareconf.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/R/files/R-javareconf.patch?r1=1.1&r2=1.2
Index: R-javareconf.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/R/files/R-javareconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R-javareconf.patch 27 Aug 2008 23:01:41 -0000 1.1
+++ R-javareconf.patch 31 Aug 2008 14:44:24 -0000 1.2
@@ -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 @@
- 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}"
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/R/files: R-javareconf.patch
@ 2008-08-31 14:54 Markus Dittrich (markusle)
0 siblings, 0 replies; 2+ messages in thread
From: Markus Dittrich (markusle) @ 2008-08-31 14:54 UTC (permalink / raw
To: gentoo-commits
markusle 08/08/31 14:54:52
Modified: R-javareconf.patch
Log:
Re-added R-javareconf.patch description.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-SENTINEL-2 i686)
Revision Changes Path
1.3 dev-lang/R/files/R-javareconf.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/R/files/R-javareconf.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/R/files/R-javareconf.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/R/files/R-javareconf.patch?r1=1.2&r2=1.3
Index: R-javareconf.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/R/files/R-javareconf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-javareconf.patch 31 Aug 2008 14:44:24 -0000 1.2
+++ R-javareconf.patch 31 Aug 2008 14:54:52 -0000 1.3
@@ -1,3 +1,6 @@
+# this patch fixes the insecure tempfile usage reported in bug #235822
+# it was adapted from the fix in 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-31 10:28:48.000000000 -0400
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-08-31 14:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-31 14:54 [gentoo-commits] gentoo-x86 commit in dev-lang/R/files: R-javareconf.patch Markus Dittrich (markusle)
-- strict thread matches above, loose matches on Subject: below --
2008-08-31 14:44 Markus Dittrich (markusle)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox