From c83fbfbb711bd262ccef1ee6c7377726e13bdbb8 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sun, 5 Apr 2020 21:02:32 +0000 Subject: Sun Apr 5 21:02:32 UTC 2020 d/bison-3.5.4-x86_64-1.txz: Upgraded. kde/k3b-2.0.3-x86_64-7.txz: Rebuilt. Recompiled against libdvdread-6.1.1. l/gobject-introspection-1.64.1-x86_64-1.txz: Upgraded. l/imagemagick-7.0.10_4-x86_64-1.txz: Upgraded. l/libdvdnav-6.1.0-x86_64-2.txz: Rebuilt. Recompiled against libdvdread-6.1.1. Who bumps an .soname and only boosts the version number by 0.0.1? Anyway, sorry to drop the ball a second time. I'll try to avoid this. Thanks to gmgf for the bug report. n/fetchmail-6.4.3-x86_64-1.txz: Upgraded. tcl/tclx-8.4.4-x86_64-1.txz: Upgraded. xap/MPlayer-20200103-x86_64-2.txz: Rebuilt. Recompiled against libdvdread-6.1.1. xap/windowmaker-0.95.9-x86_64-1.txz: Upgraded. xap/xine-lib-1.2.10-x86_64-2.txz: Rebuilt. Recompiled against libdvdread-6.1.1. extra/pure-alsa-system/MPlayer-20200103-x86_64-2_alsa.txz: Rebuilt. Recompiled against libdvdread-6.1.1. extra/pure-alsa-system/xine-lib-1.2.10-x86_64-2_alsa.txz: Rebuilt. Recompiled against libdvdread-6.1.1. --- source/kde/build/k3b | 2 +- source/l/libdvdnav/libdvdnav.SlackBuild | 2 +- source/n/fetchmail/fetchmail.SlackBuild | 3 --- source/n/fetchmail/fetchmail.openssl111.diff | 11 ----------- source/xap/MPlayer/MPlayer.SlackBuild | 2 +- source/xap/windowmaker/windowmaker.SlackBuild | 2 +- source/xap/xine-lib/xine-lib.SlackBuild | 2 +- 7 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 source/n/fetchmail/fetchmail.openssl111.diff (limited to 'source') diff --git a/source/kde/build/k3b b/source/kde/build/k3b index 1e8b31496..7f8f011eb 100644 --- a/source/kde/build/k3b +++ b/source/kde/build/k3b @@ -1 +1 @@ -6 +7 diff --git a/source/l/libdvdnav/libdvdnav.SlackBuild b/source/l/libdvdnav/libdvdnav.SlackBuild index 0c06e997c..0e69e33ab 100755 --- a/source/l/libdvdnav/libdvdnav.SlackBuild +++ b/source/l/libdvdnav/libdvdnav.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libdvdnav VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | 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 diff --git a/source/n/fetchmail/fetchmail.SlackBuild b/source/n/fetchmail/fetchmail.SlackBuild index 81a0fb70d..2e74e15db 100755 --- a/source/n/fetchmail/fetchmail.SlackBuild +++ b/source/n/fetchmail/fetchmail.SlackBuild @@ -67,9 +67,6 @@ rm -rf fetchmail-$VERSION tar xvf $CWD/fetchmail-$VERSION.tar.?z || exit 1 cd fetchmail-$VERSION || exit 1 -# Patch for OpenSSL 1.1.1 compatibility: -zcat $CWD/fetchmail.openssl111.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/n/fetchmail/fetchmail.openssl111.diff b/source/n/fetchmail/fetchmail.openssl111.diff deleted file mode 100644 index 45516b6b4..000000000 --- a/source/n/fetchmail/fetchmail.openssl111.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./socket.c.orig 2013-04-23 15:00:45.000000000 -0500 -+++ ./socket.c 2018-09-26 11:56:14.957489314 -0500 -@@ -1007,6 +1007,8 @@ - SSL_use_RSAPrivateKey_file(_ssl_context[sock], mykey, SSL_FILETYPE_PEM); - } - -+ SSL_set_tlsext_host_name(_ssl_context[sock],servercname); -+ - if (SSL_set_fd(_ssl_context[sock], sock) == 0 - || SSL_connect(_ssl_context[sock]) < 1) { - ERR_print_errors_fp(stderr); diff --git a/source/xap/MPlayer/MPlayer.SlackBuild b/source/xap/MPlayer/MPlayer.SlackBuild index c2a38a183..5d0f922b2 100755 --- a/source/xap/MPlayer/MPlayer.SlackBuild +++ b/source/xap/MPlayer/MPlayer.SlackBuild @@ -29,7 +29,7 @@ VERSION=${VERSION:-20200103} # Need to build trunk until there's a stable branch compatible with the # latest ffmpeg stable release: #BRANCH=${BRANCH:-1.3} # leave empty if you want to build MPlayer trunk -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/xap/windowmaker/windowmaker.SlackBuild b/source/xap/windowmaker/windowmaker.SlackBuild index 344d0a019..b5f655baa 100755 --- a/source/xap/windowmaker/windowmaker.SlackBuild +++ b/source/xap/windowmaker/windowmaker.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=windowmaker VERSION=${VERSION:-$(echo WindowMaker-0*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/xap/xine-lib/xine-lib.SlackBuild b/source/xap/xine-lib/xine-lib.SlackBuild index 3dfa946f2..886b83738 100755 --- a/source/xap/xine-lib/xine-lib.SlackBuild +++ b/source/xap/xine-lib/xine-lib.SlackBuild @@ -32,7 +32,7 @@ DIRVER=1.2.10 # Version used for the Slackware package PKGVER=1.2.10 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then -- cgit v1.2.3