From aea2ef36ce7429426cea468334d292fe11ce1dd9 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 27 Feb 2019 03:09:41 +0000 Subject: Wed Feb 27 03:09:41 UTC 2019 a/btrfs-progs-4.20.2-x86_64-1.txz: Upgraded. a/openssl-solibs-1.1.1b-x86_64-1.txz: Upgraded. ap/ddrescue-1.24-x86_64-1.txz: Upgraded. ap/sqlite-3.27.2-x86_64-1.txz: Upgraded. l/libssh-0.8.7-x86_64-1.txz: Upgraded. l/talloc-2.1.16-x86_64-1.txz: Upgraded. l/tdb-1.3.18-x86_64-1.txz: Upgraded. l/tevent-0.9.39-x86_64-1.txz: Upgraded. n/ca-certificates-20181210-noarch-2.txz: Rebuilt. Use "c_rehash" rather than "openssl rehash" for compatibility with all versions of OpenSSL. n/epic5-2.1.1-x86_64-1.txz: Upgraded. n/openssl-1.1.1b-x86_64-1.txz: Upgraded. x/xorg-server-1.20.4-x86_64-1.txz: Upgraded. x/xorg-server-xephyr-1.20.4-x86_64-1.txz: Upgraded. x/xorg-server-xnest-1.20.4-x86_64-1.txz: Upgraded. x/xorg-server-xvfb-1.20.4-x86_64-1.txz: Upgraded. xap/mozilla-thunderbird-60.5.2-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/thunderbird/60.5.2/releasenotes/ --- source/ap/ddrescue/ddrescue.SlackBuild | 2 +- source/l/talloc/talloc.SlackBuild | 2 +- source/l/tdb/tdb.SlackBuild | 2 +- source/l/tevent/tevent.SlackBuild | 2 +- .../n/ca-certificates/ca-certificates.SlackBuild | 7 +- source/n/ca-certificates/slack-desc | 2 +- .../update-ca-certificates.c_rehash.diff | 14 ++++ source/n/epic5/epic5.SlackBuild | 5 +- source/n/epic5/openssl-1.1.patch | 77 ---------------------- ...-modesetting-driver-by-default-on-GeForce.patch | 15 ++--- 10 files changed, 31 insertions(+), 97 deletions(-) create mode 100644 source/n/ca-certificates/update-ca-certificates.c_rehash.diff delete mode 100644 source/n/epic5/openssl-1.1.patch (limited to 'source') diff --git a/source/ap/ddrescue/ddrescue.SlackBuild b/source/ap/ddrescue/ddrescue.SlackBuild index 7bd93b681..c8f363197 100755 --- a/source/ap/ddrescue/ddrescue.SlackBuild +++ b/source/ap/ddrescue/ddrescue.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ddrescue VERSION=${VERSION:-$(echo $PKGNAM-*.tar.lz | rev | cut -f 3- -d . | rev | cut -f 2- -d -)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/talloc/talloc.SlackBuild b/source/l/talloc/talloc.SlackBuild index 27d03a440..52ea31fd8 100755 --- a/source/l/talloc/talloc.SlackBuild +++ b/source/l/talloc/talloc.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=talloc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/tdb/tdb.SlackBuild b/source/l/tdb/tdb.SlackBuild index 55a34bafb..024db469f 100755 --- a/source/l/tdb/tdb.SlackBuild +++ b/source/l/tdb/tdb.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tdb VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/tevent/tevent.SlackBuild b/source/l/tevent/tevent.SlackBuild index 2b3280bf4..8a6860ca2 100755 --- a/source/l/tevent/tevent.SlackBuild +++ b/source/l/tevent/tevent.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tevent VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then 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(); diff --git a/source/x/x11/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch b/source/x/x11/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch index 1b1306e28..87b287796 100644 --- a/source/x/x11/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch +++ b/source/x/x11/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch @@ -9,10 +9,8 @@ Signed-off-by: Ben Skeggs hw/xfree86/common/xf86pciBus.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) -diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c -index 8158c2b62..78d1c947d 100644 ---- a/hw/xfree86/common/xf86pciBus.c -+++ b/hw/xfree86/common/xf86pciBus.c +--- ./hw/xfree86/common/xf86pciBus.c.orig 2019-02-26 13:28:50.000000000 -0600 ++++ ./hw/xfree86/common/xf86pciBus.c 2019-02-26 17:16:04.131096857 -0600 @@ -37,6 +37,7 @@ #include #include @@ -21,17 +19,17 @@ index 8158c2b62..78d1c947d 100644 #include "os.h" #include "Pci.h" #include "xf86.h" -@@ -1190,6 +1191,25 @@ xf86VideoPtrToDriverList(struct pci_device *dev, +@@ -1191,6 +1192,25 @@ int idx = 0; - #ifdef __linux__ + #if defined(__linux__) || defined(__NetBSD__) + char busid[32]; + int fd; + + snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d", + dev->domain, dev->bus, dev->dev, dev->func); + -+ /* 'modesetting' is preferred for GeForce 8 and newer GPUs */ ++ /* 'modesetting' is preferred for GeForce 8 and newer GPUs */ + fd = drmOpenWithType("nouveau", busid, DRM_NODE_RENDER); + if (fd >= 0) { + uint64_t args[] = { 11 /* NOUVEAU_GETPARAM_CHIPSET_ID */, 0 }; @@ -47,6 +45,3 @@ index 8158c2b62..78d1c947d 100644 driverList[idx++] = "nouveau"; #endif driverList[idx++] = "nv"; --- -2.12.2 - -- cgit v1.2.3