diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2023-03-13 03:01:54 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2023-03-13 06:35:57 +0100 |
| commit | 52e0d46f007bff2e4118bf4928e7f8c05e876364 (patch) | |
| tree | 6eec74c903d854420d9ffdeb31351caf9ed99801 /source/l | |
| parent | 5a348bc72999b2b0485a6ebbd831138b94f5a351 (diff) | |
| download | current-52e0d46f007bff2e4118bf4928e7f8c05e876364.tar.gz current-52e0d46f007bff2e4118bf4928e7f8c05e876364.tar.xz | |
Mon Mar 13 03:01:54 UTC 202320230313030154
kde/digikam-7.10.0-x86_64-1.txz: Upgraded.
l/serf-1.3.9-x86_64-9.txz: Rebuilt.
Applied a patch from LFS to fix a build error in Subversion caused by serf
using internal OpenSSL API functions for its own use. Also fixes a crash bug
that happens due to a return value being invalid.
Thanks to lucabon.
x/xcb-imdkit-1.0.5-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l')
| -rw-r--r-- | source/l/serf/serf-1.3.9-openssl3_fixes-1.patch | 41 | ||||
| -rwxr-xr-x | source/l/serf/serf.SlackBuild | 7 |
2 files changed, 46 insertions, 2 deletions
diff --git a/source/l/serf/serf-1.3.9-openssl3_fixes-1.patch b/source/l/serf/serf-1.3.9-openssl3_fixes-1.patch new file mode 100644 index 000000000..0a5c8768c --- /dev/null +++ b/source/l/serf/serf-1.3.9-openssl3_fixes-1.patch @@ -0,0 +1,41 @@ +Submitted By: Douglas R. Reno <renodr at linuxfromscratch dot org> +Date: 2021-12-30 +Initial Package Version: 1.3.9 +Origin: Fedora Rawhide (https://src.fedoraproject.org/rpms/libserf/tree/rawhide) +Upstream Status: Merge Request +Description: Fixes a build error in Subversion caused by serf using + internal OpenSSL API functions for it's own use. Also + fixes a crash bug that happens due to a return value + being invalid. + +diff -Naurp serf-1.3.9.orig/buckets/ssl_buckets.c serf-1.3.9/buckets/ssl_buckets.c +--- serf-1.3.9.orig/buckets/ssl_buckets.c 2016-06-30 10:45:07.000000000 -0500 ++++ serf-1.3.9/buckets/ssl_buckets.c 2021-12-30 10:56:53.101158440 -0600 +@@ -407,7 +407,7 @@ static int bio_bucket_destroy(BIO *bio) + + static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr) + { +- long ret = 1; ++ long ret = 0; + + switch (cmd) { + default: +@@ -415,6 +415,7 @@ static long bio_bucket_ctrl(BIO *bio, in + break; + case BIO_CTRL_FLUSH: + /* At this point we can't force a flush. */ ++ ret = 1; + break; + case BIO_CTRL_PUSH: + case BIO_CTRL_POP: +@@ -1204,6 +1205,10 @@ static void init_ssl_libraries(void) + } + } + ++#ifndef ERR_GET_FUNC ++#define ERR_GET_FUNC(ec) (0) ++#endif ++ + static int ssl_need_client_cert(SSL *ssl, X509 **cert, EVP_PKEY **pkey) + { + serf_ssl_context_t *ctx = SSL_get_app_data(ssl); diff --git a/source/l/serf/serf.SlackBuild b/source/l/serf/serf.SlackBuild index 8e17a0e21..924972640 100755 --- a/source/l/serf/serf.SlackBuild +++ b/source/l/serf/serf.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for serf # Copyright 2014 Andrzej Telszewski, Sabadell -# Copyright 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2015, 2018, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=serf VERSION=${VERSION:-$(echo serf-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-8} +BUILD=${BUILD:-9} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -88,6 +88,9 @@ sed -i "/Alias/s:install_static,::" SConstruct # Fix for python3 based scons: zcat $CWD/serf.SConstruct.python3.diff.gz | patch -p1 --verbose || exit 1 +# Fix for openssl3: +zcat $CWD/serf-1.3.9-openssl3_fixes-1.patch.gz | patch -p1 --verbose || exit 1 + scons $NUMJOBS \ PREFIX=/usr \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ |