From e5f837b3341529adfc5750dc3df4c2be3e8776ef Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@091d3ff0-52bc-4db5-b7a6-18201e4c0cca>
Date: Tue, 26 Feb 2013 17:02:11 +0000
Subject: Update to OpenSSL 1.0.1e (security update)

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/OpenSSL/trunk@40 091d3ff0-52bc-4db5-b7a6-18201e4c0cca
---
 configure.sh               |   9 +++------
 dist/openssl-1.0.0j.tar.gz | Bin 4047852 -> 0 bytes
 dist/openssl-1.0.1e.tar.gz | Bin 0 -> 4459777 bytes
 3 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 dist/openssl-1.0.0j.tar.gz
 create mode 100644 dist/openssl-1.0.1e.tar.gz

diff --git a/configure.sh b/configure.sh
index 7aa3170..c79bb28 100644
--- a/configure.sh
+++ b/configure.sh
@@ -78,7 +78,7 @@ then
     
     # Set locations
     THORN=OpenSSL
-    NAME=openssl-1.0.0j
+    NAME=openssl-1.0.1e
     SRCDIR=$(dirname $0)
     BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
     if [ -z "${OPENSSL_INSTALL_DIR}" ]; then
@@ -115,7 +115,8 @@ then
         # Set up environment
         unset EXE
         unset LIBS
-        unset MAKEFLAGS # For some reason, openssl does not compile with this
+        unset MAKEFLAGS # For some reason, OpenSSL does not compile with this
+        unset options # OpenSSL's 'config' script uses $options itself
         
         echo "OpenSSL: Preparing directory structure..."
         mkdir build external done 2> /dev/null || true
@@ -125,12 +126,9 @@ then
         echo "OpenSSL: Unpacking archive..."
         pushd ${BUILD_DIR}
         ${TAR?} xzf ${SRCDIR}/dist/${NAME}.tar.gz
-        ${PATCH?} -p0 < ${SRCDIR}/dist/darwin.patch
         
         echo "OpenSSL: Configuring..."
         cd ${NAME}
-        # OpenSSL's 'config' script uses $options itself, so we unset it
-        unset options
         ./config --prefix=${OPENSSL_DIR}
         
         echo "OpenSSL: Building..."
@@ -145,7 +143,6 @@ then
         
         date > ${DONE_FILE}
         echo "OpenSSL: Done."
-        
         )
         
         if (( $? )); then
diff --git a/dist/openssl-1.0.0j.tar.gz b/dist/openssl-1.0.0j.tar.gz
deleted file mode 100644
index 767e5dc..0000000
Binary files a/dist/openssl-1.0.0j.tar.gz and /dev/null differ
diff --git a/dist/openssl-1.0.1e.tar.gz b/dist/openssl-1.0.1e.tar.gz
new file mode 100644
index 0000000..17dcf4b
Binary files /dev/null and b/dist/openssl-1.0.1e.tar.gz differ
-- 
cgit v1.2.3