diff options
Diffstat (limited to 'source/n')
| -rwxr-xr-x | source/n/ca-certificates/ca-certificates.SlackBuild | 7 | ||||
| -rw-r--r-- | source/n/ca-certificates/slack-desc | 2 | ||||
| -rw-r--r-- | source/n/ca-certificates/update-ca-certificates.c_rehash.diff | 14 | ||||
| -rwxr-xr-x | source/n/epic5/epic5.SlackBuild | 5 | ||||
| -rw-r--r-- | source/n/epic5/openssl-1.1.patch | 77 |
5 files changed, 22 insertions, 83 deletions
diff --git a/source/n/ca-certificates/ca-certificates.SlackBuild b/source/n/ca-certificates/ca-certificates.SlackBuild index 847769370..08c7bd3e5 100755 --- a/source/n/ca-certificates/ca-certificates.SlackBuild +++ b/source/n/ca-certificates/ca-certificates.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ca-certificates VERSION=${VERSION:-$(echo certdata-*.txt.xz | cut -f 2 -d - | cut -f 1 -d .)} ARCH=noarch -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information @@ -64,6 +64,11 @@ find . \ # Remove incompatible command operators used to call 'run-parts': zcat $CWD/fixup_update-ca-certificates.diff.gz | patch -p1 || exit 1 +# Use "c_rehash" rather than "openssl rehash". They act mostly the same, but +# the openssl builtin is not available on older versions of Slackware, while +# c_rehash will always be there. +zcat $CWD/update-ca-certificates.c_rehash.diff.gz | patch -p1 || exit 1 + # Update to certdata.txt from $CWD: xzcat $CWD/certdata-${VERSION}.txt.xz > mozilla/certdata.txt diff --git a/source/n/ca-certificates/slack-desc b/source/n/ca-certificates/slack-desc index 0ccfdb193..d33aa3756 100644 --- a/source/n/ca-certificates/slack-desc +++ b/source/n/ca-certificates/slack-desc @@ -11,7 +11,7 @@ ca-certificates: ca-certificates: This package includes PEM files of CA certificates to allow SSL-based ca-certificates: applications to check for the authenticity of SSL connections. ca-certificates: -ca-certificates: Homepage: http://packages.qa.debian.org/c/ca-certificates.html +ca-certificates: ca-certificates: ca-certificates: ca-certificates: diff --git a/source/n/ca-certificates/update-ca-certificates.c_rehash.diff b/source/n/ca-certificates/update-ca-certificates.c_rehash.diff new file mode 100644 index 000000000..c32849bee --- /dev/null +++ b/source/n/ca-certificates/update-ca-certificates.c_rehash.diff @@ -0,0 +1,14 @@ +--- ./sbin/update-ca-certificates.orig 2019-02-26 14:32:54.468993281 -0600 ++++ ./sbin/update-ca-certificates 2019-02-26 14:33:18.352991305 -0600 +@@ -174,9 +174,9 @@ + # only run if set of files has changed + if [ "$verbose" = 0 ] + then +- openssl rehash . > /dev/null ++ c_rehash . > /dev/null + else +- openssl rehash . ++ c_rehash . + fi + fi + diff --git a/source/n/epic5/epic5.SlackBuild b/source/n/epic5/epic5.SlackBuild index 64c392f74..9685ac747 100755 --- a/source/n/epic5/epic5.SlackBuild +++ b/source/n/epic5/epic5.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=epic5 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} EPICVER=5 HELPFILE=current -BUILD=${BUILD:-8} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -78,9 +78,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Support OpenSSL 1.1.x: -zcat $CWD/openssl-1.1.patch.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/n/epic5/openssl-1.1.patch b/source/n/epic5/openssl-1.1.patch deleted file mode 100644 index 254035e6d..000000000 --- a/source/n/epic5/openssl-1.1.patch +++ /dev/null @@ -1,77 +0,0 @@ -Index: epic5-2.0/source/crypto.c -=================================================================== ---- epic5-2.0.orig/source/crypto.c -+++ epic5-2.0/source/crypto.c -@@ -282,9 +282,9 @@ static char * decipher_evp (const unsign - unsigned char *iv = NULL; - unsigned long errcode; - int outlen2; -- EVP_CIPHER_CTX a; -- EVP_CIPHER_CTX_init(&a); -- EVP_CIPHER_CTX_set_padding(&a, 0); -+ EVP_CIPHER_CTX *a = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(a); -+ EVP_CIPHER_CTX_set_padding(a, 0); - - if (ivsize > 0) - iv = new_malloc(ivsize); -@@ -292,18 +292,19 @@ static char * decipher_evp (const unsign - if (ivsize > 0) - memcpy(iv, ciphertext, ivsize); - -- EVP_DecryptInit_ex(&a, type, NULL, NULL, iv); -- EVP_CIPHER_CTX_set_key_length(&a, passwdlen); -- EVP_CIPHER_CTX_set_padding(&a, 0); -- EVP_DecryptInit_ex(&a, NULL, NULL, passwd, NULL); -+ EVP_DecryptInit_ex(a, type, NULL, NULL, iv); -+ EVP_CIPHER_CTX_set_key_length(a, passwdlen); -+ EVP_CIPHER_CTX_set_padding(a, 0); -+ EVP_DecryptInit_ex(a, NULL, NULL, passwd, NULL); - -- if (EVP_DecryptUpdate(&a, outbuf, outlen, ciphertext, cipherlen) != 1) -+ if (EVP_DecryptUpdate(a, outbuf, outlen, ciphertext, cipherlen) != 1) - yell("EVP_DecryptUpdate died."); -- if (EVP_DecryptFinal_ex(&a, outbuf + (*outlen), &outlen2) != 1) -+ if (EVP_DecryptFinal_ex(a, outbuf + (*outlen), &outlen2) != 1) - yell("EVP_DecryptFinal_Ex died."); - *outlen += outlen2; - -- EVP_CIPHER_CTX_cleanup(&a); -+ EVP_CIPHER_CTX_cleanup(a); -+ EVP_CIPHER_CTX_free(a); - - ERR_load_crypto_strings(); - while ((errcode = ERR_get_error())) -@@ -454,9 +455,9 @@ static char * cipher_evp (const unsigned - unsigned long errcode; - u_32int_t randomval; - int iv_count; -- EVP_CIPHER_CTX a; -- EVP_CIPHER_CTX_init(&a); -- EVP_CIPHER_CTX_set_padding(&a, 0); -+ EVP_CIPHER_CTX *a = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(a); -+ EVP_CIPHER_CTX_set_padding(a, 0); - - if (ivsize < 0) - ivsize = 0; /* Shenanigans! */ -@@ -480,12 +481,13 @@ static char * cipher_evp (const unsigned - if (iv) - memcpy(outbuf, iv, ivsize); - -- EVP_EncryptInit_ex(&a, type, NULL, NULL, iv); -- EVP_CIPHER_CTX_set_key_length(&a, passwdlen); -- EVP_EncryptInit_ex(&a, NULL, NULL, passwd, NULL); -- EVP_EncryptUpdate(&a, outbuf + ivsize, &outlen, plaintext, plaintextlen); -- EVP_EncryptFinal_ex(&a, outbuf + ivsize + outlen, &extralen); -- EVP_CIPHER_CTX_cleanup(&a); -+ EVP_EncryptInit_ex(a, type, NULL, NULL, iv); -+ EVP_CIPHER_CTX_set_key_length(a, passwdlen); -+ EVP_EncryptInit_ex(a, NULL, NULL, passwd, NULL); -+ EVP_EncryptUpdate(a, outbuf + ivsize, &outlen, plaintext, plaintextlen); -+ EVP_EncryptFinal_ex(a, outbuf + ivsize + outlen, &extralen); -+ EVP_CIPHER_CTX_cleanup(a); -+ EVP_CIPHER_CTX_free(a); - outlen += extralen; - - ERR_load_crypto_strings(); |