diff options
Diffstat (limited to 'source/n/openssl')
| -rw-r--r-- | source/n/openssl/certwatch | 2 | ||||
| -rw-r--r-- | source/n/openssl/doinst.sh-openssl | 10 | ||||
| -rwxr-xr-x | source/n/openssl/openssl.SlackBuild | 13 |
3 files changed, 20 insertions, 5 deletions
diff --git a/source/n/openssl/certwatch b/source/n/openssl/certwatch index ac8d83403..8fef1509f 100644 --- a/source/n/openssl/certwatch +++ b/source/n/openssl/certwatch @@ -93,7 +93,7 @@ find $CERTDIR -type f -maxdepth 1 | while read certfile ; do continue fi echo "$certfile" | grep -q -i '\.der$' - if [ $? -eq 0 -o "$(file "$certfile" | grep ASCII)" == "" ]; then + if [ $? -eq 0 -o "$(file "$certfile" | egrep '(ASCII|PEM)')" == "" ]; then inform=DER fi # We wont use '-checkend' since it is not properly documented (as of diff --git a/source/n/openssl/doinst.sh-openssl b/source/n/openssl/doinst.sh-openssl index f73c5a514..c92e60763 100644 --- a/source/n/openssl/doinst.sh-openssl +++ b/source/n/openssl/doinst.sh-openssl @@ -9,7 +9,13 @@ config() { fi # Otherwise, we leave the .new copy for the admin to consider... } + +# If there is a known buggy certwatch script with no local +# modifications, just replace it: +if [ "$(md5sum etc/cron.daily/certwatch 2> /dev/null)" = "32556321806f1850d56cb2ef8384b7a1 etc/cron.daily/certwatch" ]; then + cat etc/cron.daily/certwatch.new > etc/cron.daily/certwatch + touch -r etc/cron.daily/certwatch.new etc/cron.daily/certwatch +fi + config etc/ssl/openssl.cnf.new config etc/cron.daily/certwatch.new -# If the admin has modified this in any way, no need to keep the sample. -rm -f etc/cron.daily/certwatch.new diff --git a/source/n/openssl/openssl.SlackBuild b/source/n/openssl/openssl.SlackBuild index 82aa87f3c..f0e55b52c 100755 --- a/source/n/openssl/openssl.SlackBuild +++ b/source/n/openssl/openssl.SlackBuild @@ -2,7 +2,7 @@ # Copyright 2000 BSDi, Inc. Concord, CA, USA # Copyright 2001, 2002 Slackware Linux, Inc. Concord, CA, USA -# Copyright 2005, 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ CWD=$(pwd) TMP=${TMP:-/tmp} VERSION=${VERSION:-$(echo openssl-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -65,6 +65,15 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi +# OpenSSL has a (nasty?) habit of bumping the internal version number with +# every release. This wouldn't be so bad, but some applications are so +# paranoid that they won't run against a different OpenSSL version than +# what they were compiled against, whether or not the ABI has changed. +# +# So, we will use the OPENSSL_VERSION_NUMBER from openssl-0.9.8o unless ABI +# breakage forces it to change. Yes, we're finally using this old trick. :) +sed -i "s/#define OPENSSL_VERSION_NUMBER.*/\/* Use 0x009080efL (0.9.8o) below to avoid pointlessly breaking the ABI *\/\n#define OPENSSL_VERSION_NUMBER 0x009080efL/g" crypto/opensslv.h || exit 1 + chown -R root:root . mkdir -p $PKG1/usr/doc/openssl-$VERSION cp -a CHANGES CHANGES.SSLeay FAQ INSTALL INSTALL.MacOS INSTALL.VMS INSTALL.W32 \ |