diff options
| author | knarf <knarf@091d3ff0-52bc-4db5-b7a6-18201e4c0cca> | 2014-01-15 16:17:11 +0000 |
|---|---|---|
| committer | knarf <knarf@091d3ff0-52bc-4db5-b7a6-18201e4c0cca> | 2014-01-15 16:17:11 +0000 |
| commit | a9a539e3a7b1ebff5e37a3072a5529e7655f485b (patch) | |
| tree | 6c87db335f5c815491e0f2f336c846be03b790bc /configure.sh | |
| parent | caea1a7763917ce130415afe9eff29f4ece28fa9 (diff) | |
OpenSSL 1.0.1e -> 1.0.1f
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/OpenSSL/trunk@57 091d3ff0-52bc-4db5-b7a6-18201e4c0cca
Diffstat (limited to 'configure.sh')
| -rw-r--r-- | configure.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/configure.sh b/configure.sh index c7f643d..c1e6ec1 100644 --- a/configure.sh +++ b/configure.sh @@ -79,7 +79,7 @@ then # Set locations THORN=OpenSSL - NAME=openssl-1.0.1e + NAME=openssl-1.0.1f SRCDIR=$(dirname $0) BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} if [ -z "${OPENSSL_INSTALL_DIR}" ]; then @@ -137,12 +137,14 @@ then echo "OpenSSL: Unpacking archive..." pushd ${BUILD_DIR} ${TAR?} xzf ${SRCDIR}/dist/${NAME}.tar.gz - ${PATCH?} -p0 < ${SRCDIR}/dist/openssl-1.0.1e-fix_pod_syntax-1.patch + + 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?} -p0 < ${SRCDIR}/dist/patchtest.patch - if [ ! -e openssl-1.0.1e/.patch_tmp ]; then + ${PATCH?} -p1 < ${SRCDIR}/dist/patchtest.patch + if [ ! -e .patch_tmp ]; then echo 'BEGIN ERROR' echo 'The version of patch is too old to understand this patch format.' echo 'Please set the PATCH environment variable to a more recent ' @@ -150,10 +152,9 @@ then echo 'END ERROR' exit 1 fi - rm -f openssl-1.0.1e/.patch_tmp + rm -f .patch_tmp echo "OpenSSL: Configuring..." - cd ${NAME} ./config --prefix=${OPENSSL_DIR} no-shared echo "OpenSSL: Building..." |