diff options
| author | tron <tron@pkgsrc.org> | 2008-09-02 19:39:45 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2008-09-02 19:39:45 +0000 |
| commit | 45a9e5ac99367e1a54169334f733f8e6d067d13d (patch) | |
| tree | 29bc6d74f1a38232bd99b412d9add78be93d768b | |
| parent | 351ffe63f65df3eaa06098efe513f43ae623f0f7 (diff) | |
| download | pkgsrc-45a9e5ac99367e1a54169334f733f8e6d067d13d.tar.gz | |
Pullup ticket #2513 - requested by markd
R: security patch
Revisions pulled up:
- math/R/Makefile 1.99
- math/R/distinfo 1.39
- math/R/patches/patch-ae 1.15
---
Module Name: pkgsrc
Committed By: markd
Date: Sun Aug 31 12:33:53 UTC 2008
Modified Files:
pkgsrc/math/R: Makefile distinfo
Added Files:
pkgsrc/math/R/patches: patch-ae
Log Message:
Fix for http://secunia.com/advisories/31647/ from R svn.
| -rw-r--r-- | math/R/Makefile | 3 | ||||
| -rw-r--r-- | math/R/distinfo | 3 | ||||
| -rw-r--r-- | math/R/patches/patch-ae | 41 |
3 files changed, 45 insertions, 2 deletions
diff --git a/math/R/Makefile b/math/R/Makefile index 6beeac1d25e..3a839ba2f22 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.97 2008/04/26 02:39:27 markd Exp $ +# $NetBSD: Makefile,v 1.97.4.1 2008/09/02 19:39:45 tron Exp $ DISTNAME= R-2.7.0 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/R-2/} diff --git a/math/R/distinfo b/math/R/distinfo index bc17836138d..1c3711a2b00 100644 --- a/math/R/distinfo +++ b/math/R/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.38 2008/04/26 02:39:27 markd Exp $ +$NetBSD: distinfo,v 1.38.4.1 2008/09/02 19:39:45 tron Exp $ SHA1 (R-2.7.0.tar.gz) = d0a3193e474696ad767845ef6b8ee1555a26b898 RMD160 (R-2.7.0.tar.gz) = c3c9cf0c0a1eb6191492f1be19e277e8223a42c9 @@ -6,3 +6,4 @@ Size (R-2.7.0.tar.gz) = 16396250 bytes SHA1 (patch-ab) = b724b549cd9920865c4d4ae60c71dff48c4c0c06 SHA1 (patch-ac) = 64c47fc44c437ad79de53fc313f280700590704f SHA1 (patch-ad) = e8f6b6989957a6872806716263eabb9feb636638 +SHA1 (patch-ae) = ce2a7e26cd7c44776075affd4c999bc1b74fe9cf diff --git a/math/R/patches/patch-ae b/math/R/patches/patch-ae new file mode 100644 index 00000000000..4b6abe7731c --- /dev/null +++ b/math/R/patches/patch-ae @@ -0,0 +1,41 @@ +$NetBSD: patch-ae,v 1.14.18.1 2008/09/02 19:39:45 tron Exp $ + +From SVN revision r46461 + +--- src/scripts/javareconf.orig 2008-03-26 01:26:44.000000000 +1300 ++++ src/scripts/javareconf +@@ -125,16 +125,28 @@ fi + javac_works='not present' + if test -n "$JAVAC"; then + javac_works='not functional' +- rm -rf /tmp/A.java /tmp/A.class +- echo "public class A { }" > /tmp/A.java +- if test -e /tmp/A.java; then +- if "${JAVAC}" /tmp/A.java >/dev/null; then +- if test -e /tmp/A.class; then ++# tempdir=`mktemp -d` ++ ++ : ${TMPDIR=/tmp} ++ { tempdir=`(mktemp -d -q "${TMPDIR}/RJRECONF.XXXXXX") 2>/dev/null` \ ++ && test -n "${tempdir}" && test -d "${tempdir}" ; } || ++ { test -n "${RANDOM}" && tempdir=${TMPDIR}/RJRECONF$$-${RANDOM} \ ++ && (mkdir "${tempdir}") ; } || ++ { tempdir=${TMPDIR}/RJRECONF.$$-`date +%m%d%H%M%S` \ ++ && (mkdir "${tempdir}"); } || ++ { tempdir=${TMPDIR}/RJRECONF.$$ && (mkdir "${tempdir}") ; } || ++ (error "cannot create temporary directory" && exit 1) ++ ++ echo "public class A { }" > ${tempdir}/A.java ++ if test -e ${tempdir}/A.java; then ++ if "${JAVAC}" ${tempdir}/A.java >/dev/null; then ++ if test -e ${tempdir}/A.class; then + javac_works=yes + fi + fi + fi +- rm -rf /tmp/A.java /tmp/A.class ++ rm -rf ${tempdir} ++ + fi + if test "${javac_works}" = yes; then + echo "Java compiler : ${JAVAC}" |