1 |
markusle 08/08/31 14:44:25 |
2 |
|
3 |
Modified: R-javareconf.patch |
4 |
Log: |
5 |
Added further enhancements to R-javareconf.patch (see bug #235822). |
6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-SENTINEL-2 i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 dev-lang/R/files/R-javareconf.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/R/files/R-javareconf.patch?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/R/files/R-javareconf.patch?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/R/files/R-javareconf.patch?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: R-javareconf.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/R/files/R-javareconf.patch,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- R-javareconf.patch 27 Aug 2008 23:01:41 -0000 1.1 |
22 |
+++ R-javareconf.patch 31 Aug 2008 14:44:24 -0000 1.2 |
23 |
@@ -1,9 +1,6 @@ |
24 |
-# this patch fixes the insecure tempfile usage reported in bug #235822 |
25 |
-# it was extracted from Debian's r-base_2.7.2-1.diff patch |
26 |
- |
27 |
diff -Naur R-2.7.2/src/scripts/javareconf R-2.7.2.new/src/scripts/javareconf |
28 |
--- R-2.7.2/src/scripts/javareconf 2008-03-25 08:26:44.000000000 -0400 |
29 |
-+++ R-2.7.2.new/src/scripts/javareconf 2008-08-27 16:49:04.000000000 -0400 |
30 |
++++ R-2.7.2.new/src/scripts/javareconf 2008-08-31 10:28:48.000000000 -0400 |
31 |
@@ -125,16 +125,19 @@ |
32 |
javac_works='not present' |
33 |
if test -n "$JAVAC"; then |
34 |
@@ -13,20 +10,23 @@ |
35 |
- if test -e /tmp/A.java; then |
36 |
- if "${JAVAC}" /tmp/A.java >/dev/null; then |
37 |
- if test -e /tmp/A.class; then |
38 |
+- javac_works=yes |
39 |
+- fi |
40 |
+- fi |
41 |
+ # edd 25 Aug 2008 use mktemp -t -d |
42 |
+ #rm -rf /tmp/A.java /tmp/A.class |
43 |
-+ jctmpdir=`mktemp -t -d` |
44 |
-+ echo "public class A { }" > ${jctmpdir}/A.java |
45 |
-+ if test -e ${jctmpdir}/A.java; then |
46 |
-+ if "${JAVAC}" ${jctmpdir}/A.java >/dev/null; then |
47 |
-+ if test -e ${jctmpdir}/A.class; then |
48 |
- javac_works=yes |
49 |
- fi |
50 |
- fi |
51 |
++ if jctmpdir=`mktemp -t -d`; then |
52 |
++ echo "public class A { }" > ${jctmpdir}/A.java |
53 |
++ if test -e ${jctmpdir}/A.java; then |
54 |
++ if "${JAVAC}" ${jctmpdir}/A.java >/dev/null; then |
55 |
++ if test -e ${jctmpdir}/A.class; then |
56 |
++ javac_works=yes |
57 |
++ fi |
58 |
++ fi |
59 |
++ fi |
60 |
++ rm -rf ${jctmpdir} |
61 |
fi |
62 |
- rm -rf /tmp/A.java /tmp/A.class |
63 |
-+ # rm -rf /tmp/A.java /tmp/A.class |
64 |
-+ rm -rf ${jctmpdir} |
65 |
fi |
66 |
if test "${javac_works}" = yes; then |
67 |
echo "Java compiler : ${JAVAC}" |