aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreschnett <eschnett@091d3ff0-52bc-4db5-b7a6-18201e4c0cca>2014-10-20 16:13:50 +0000
committereschnett <eschnett@091d3ff0-52bc-4db5-b7a6-18201e4c0cca>2014-10-20 16:13:50 +0000
commit923bc547d968479b542e3fdac61e03811229319b (patch)
tree88ebc3d29dff16fda34036843059ba011ee07933
parent747e14e8002d8166e98469f02865941c86a50c8d (diff)
Update to OpenSSL 1.0.1j
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/OpenSSL/trunk@62 091d3ff0-52bc-4db5-b7a6-18201e4c0cca
-rw-r--r--configure.sh10
-rw-r--r--dist/openssl-1.0.1f.tar.gzbin4509212 -> 0 bytes
-rw-r--r--dist/openssl-1.0.1j.tar.gzbin0 -> 4432964 bytes
3 files changed, 5 insertions, 5 deletions
diff --git a/configure.sh b/configure.sh
index 46f3c11..872b91f 100644
--- a/configure.sh
+++ b/configure.sh
@@ -96,7 +96,7 @@ then
# Set locations
THORN=OpenSSL
- NAME=openssl-1.0.1f
+ NAME=openssl-1.0.1j
SRCDIR=$(dirname $0)
BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
if [ -z "${OPENSSL_INSTALL_DIR}" ]; then
@@ -156,10 +156,6 @@ then
${TAR?} xzf ${SRCDIR}/dist/${NAME}.tar.gz
cd ${NAME}
- ${PATCH?} -p1 < ${SRCDIR}/dist/openssl-1.0.1f-fix_pod_syntax-1.patch
- # Some (ancient but still used) versions of patch don't support the
- # patch format used here but also don't report an error using the
- # exit code. So we use this patch to test for this
${PATCH?} -p1 < ${SRCDIR}/dist/patchtest.patch
if [ ! -e .patch_tmp ]; then
echo 'BEGIN ERROR'
@@ -170,6 +166,10 @@ then
exit 1
fi
rm -f .patch_tmp
+ # ${PATCH?} -p1 < ${SRCDIR}/dist/openssl-1.0.1f-fix_pod_syntax-1.patch
+ # # Some (ancient but still used) versions of patch don't support the
+ # # patch format used here but also don't report an error using the
+ # # exit code. So we use this patch to test for this
echo "OpenSSL: Configuring..."
./config --prefix=${OPENSSL_DIR} no-shared
diff --git a/dist/openssl-1.0.1f.tar.gz b/dist/openssl-1.0.1f.tar.gz
deleted file mode 100644
index 4270be9..0000000
--- a/dist/openssl-1.0.1f.tar.gz
+++ /dev/null
Binary files differ
diff --git a/dist/openssl-1.0.1j.tar.gz b/dist/openssl-1.0.1j.tar.gz
new file mode 100644
index 0000000..bae4e59
--- /dev/null
+++ b/dist/openssl-1.0.1j.tar.gz
Binary files differ