aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknarf <knarf@091d3ff0-52bc-4db5-b7a6-18201e4c0cca>2012-05-21 21:04:57 +0000
committerknarf <knarf@091d3ff0-52bc-4db5-b7a6-18201e4c0cca>2012-05-21 21:04:57 +0000
commit59f91ea0d6d1481da5bdf236a55c88eb25b01fae (patch)
treecdb027b447acd8eb4a0543cfa0c788c0bcd96d03
parent0d393df27154436460b6b3fed0b32bb992933a2a (diff)
update openssl library because of security fix within; also remove an early exit from the configurations script which was commited accidentally
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/OpenSSL/trunk@31 091d3ff0-52bc-4db5-b7a6-18201e4c0cca
-rw-r--r--OpenSSL.sh4
-rw-r--r--dist/darwin.patch6
-rw-r--r--dist/openssl-1.0.0i.tar.gzbin4047721 -> 0 bytes
-rw-r--r--dist/openssl-1.0.0j.tar.gzbin0 -> 4047852 bytes
4 files changed, 4 insertions, 6 deletions
diff --git a/OpenSSL.sh b/OpenSSL.sh
index 225fe97..7b8506e 100644
--- a/OpenSSL.sh
+++ b/OpenSSL.sh
@@ -15,7 +15,6 @@ set -e # Abort on errors
################################################################################
# Search
################################################################################
-
if [ -z "${OPENSSL_DIR}" ]; then
echo "BEGIN MESSAGE"
echo "OpenSSL selected, but OPENSSL_DIR not set. Checking some places..."
@@ -65,7 +64,6 @@ if [ -z "${OPENSSL_DIR}" ]; then
fi
fi
-exit
################################################################################
# Build
@@ -80,7 +78,7 @@ then
# Set locations
THORN=OpenSSL
- NAME=openssl-1.0.0i
+ NAME=openssl-1.0.0j
SRCDIR=$(dirname $0)
BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
if [ -z "${OPENSSL_INSTALL_DIR}" ]; then
diff --git a/dist/darwin.patch b/dist/darwin.patch
index ecea605..631b102 100644
--- a/dist/darwin.patch
+++ b/dist/darwin.patch
@@ -1,6 +1,6 @@
-diff -ru openssl-1.0.0i.orig/Configure openssl-1.0.0i/Configure
---- openssl-1.0.0i.orig/Configure 2012-03-03 07:48:21.000000000 -0600
-+++ openssl-1.0.0i/Configure 2012-03-30 12:50:43.000000000 -0500
+diff -ru openssl-1.0.0j.orig/Configure openssl-1.0.0j/Configure
+--- openssl-1.0.0j.orig/Configure 2012-03-03 07:48:21.000000000 -0600
++++ openssl-1.0.0j/Configure 2012-03-30 12:50:43.000000000 -0500
@@ -549,11 +549,11 @@
##### MacOS X (a.k.a. Rhapsody or Darwin) setup
diff --git a/dist/openssl-1.0.0i.tar.gz b/dist/openssl-1.0.0i.tar.gz
deleted file mode 100644
index 6985276..0000000
--- a/dist/openssl-1.0.0i.tar.gz
+++ /dev/null
Binary files differ
diff --git a/dist/openssl-1.0.0j.tar.gz b/dist/openssl-1.0.0j.tar.gz
new file mode 100644
index 0000000..767e5dc
--- /dev/null
+++ b/dist/openssl-1.0.0j.tar.gz
Binary files differ