From 0672b69fcb4fe38040fa6048334379ff8d0ea5be Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Fri, 29 Aug 2008 15:53:54 +0000
Subject: [PATCH] update everyone to 2.7.2, fix security bug 460658

---
 .cvsignore                      |  2 +-
 R-2.7.1-javareconf-tmpfix.patch | 27 +++++++++++++++++++++++++++
 R.spec                          | 13 +++++++++++--
 sources                         |  2 +-
 4 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 R-2.7.1-javareconf-tmpfix.patch

diff --git a/.cvsignore b/.cvsignore
index e7f3621..59aef1f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-R-2.7.1.tar.gz
+R-2.7.2.tar.gz
diff --git a/R-2.7.1-javareconf-tmpfix.patch b/R-2.7.1-javareconf-tmpfix.patch
new file mode 100644
index 0000000..a5fcea9
--- /dev/null
+++ b/R-2.7.1-javareconf-tmpfix.patch
@@ -0,0 +1,27 @@
+diff -up R-2.7.1/src/scripts/javareconf.BAD R-2.7.1/src/scripts/javareconf
+--- R-2.7.1/src/scripts/javareconf.BAD	2008-08-29 11:04:21.000000000 -0400
++++ R-2.7.1/src/scripts/javareconf	2008-08-29 11:05:34.000000000 -0400
+@@ -125,16 +125,17 @@ 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`
++    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}"
diff --git a/R.spec b/R.spec
index 7728888..182388e 100644
--- a/R.spec
+++ b/R.spec
@@ -1,11 +1,14 @@
 Name: R
-Version: 2.7.1
+Version: 2.7.2
 Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
 Source1: macros.R
 Source2: R-make-search-index.sh
+# Sent upstream:
+# http://bugs.r-project.org/cgi-bin/R/incoming?id=12636
+Patch0: R-2.7.1-javareconf-tmpfix.patch
 License: GPLv2+
 Group: Applications/Engineering
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -99,6 +102,7 @@ and header files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .javareconf-tmpfix
 
 # Filter false positive provides.
 cat <<EOF > %{name}-prov
@@ -133,7 +137,7 @@ case "%{_target_cpu}" in
           export F77="gfortran -m64"
           export FC="gfortran -m64"
       ;;
-      ia64)
+      ia64|alpha)
           export CC="gcc"
           export CXX="g++"
           export F77="gfortran"
@@ -283,6 +287,11 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Fri Aug 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.7.2-1
+- update to 2.7.2
+- fix spec for alpha compile (bz 458931)
+- fix security issue in javareconf script (bz 460658)
+
 * Mon Jul  7 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.7.1-1
 - update to 2.7.1
 
diff --git a/sources b/sources
index 67119f3..48ccee7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-565b06a1f3f11020399934cc7b47a59d  R-2.7.1.tar.gz
+6122945e9301825b97a506151b3cefde  R-2.7.2.tar.gz