summaryrefslogtreecommitdiff
path: root/source/n/openssl
diff options
context:
space:
mode:
Diffstat (limited to 'source/n/openssl')
-rw-r--r--source/n/openssl/openssl-1.1.0h.fix_c_rehash_quoting.diff13
-rwxr-xr-xsource/n/openssl/openssl.SlackBuild5
2 files changed, 1 insertions, 17 deletions
diff --git a/source/n/openssl/openssl-1.1.0h.fix_c_rehash_quoting.diff b/source/n/openssl/openssl-1.1.0h.fix_c_rehash_quoting.diff
deleted file mode 100644
index 6a9cce8f..00000000
--- a/source/n/openssl/openssl-1.1.0h.fix_c_rehash_quoting.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./tools/c_rehash.in.orig 2018-03-27 08:50:41.000000000 -0500
-+++ ./tools/c_rehash.in 2018-05-14 13:47:20.553710437 -0500
-@@ -11,8 +11,8 @@
- # Perl c_rehash script, scan all files in a directory
- # and add symbolic links to their hash values.
-
--my $dir = {- quotify1($config{openssldir}) -};
--my $prefix = {- quotify1($config{prefix}) -};
-+my $dir = "{- quotify1($config{openssldir}) -}";
-+my $prefix = "{- quotify1($config{prefix}) -}";
-
- my $errorcount = 0;
- my $openssl = $ENV{OPENSSL} || "openssl";
diff --git a/source/n/openssl/openssl.SlackBuild b/source/n/openssl/openssl.SlackBuild
index 2ee674eb..e8aa3bfb 100755
--- a/source/n/openssl/openssl.SlackBuild
+++ b/source/n/openssl/openssl.SlackBuild
@@ -28,7 +28,7 @@ TMP=${TMP:-/tmp}
PKGNAM=openssl
VERSION=${VERSION:-$(echo openssl-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -85,9 +85,6 @@ elif [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
fi
-# Fix a lack of quotes in two c_rehash lines:
-zcat $CWD/openssl-1.1.0h.fix_c_rehash_quoting.diff.gz | patch -p1 --verbose || exit 1
-
# 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