diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-06-02 20:56:35 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-06-02 23:45:41 +0200 |
commit | 8b137cd8352b84bf56b01414f58a6d55a99d22a6 (patch) | |
tree | f73aeff466f3d465f4e24864a08658966c0f8d80 /source | |
parent | a9c0ca9f8fa5a0a244f0f0f7b0c2623df807b494 (diff) | |
download | current-8b137cd8352b84bf56b01414f58a6d55a99d22a6.tar.gz current-8b137cd8352b84bf56b01414f58a6d55a99d22a6.tar.xz |
Fri Jun 2 20:56:35 UTC 202320230602205635
a/hwdata-0.371-noarch-1.txz: Upgraded.
ap/cups-2.4.3-x86_64-1.txz: Upgraded.
Fixed a heap buffer overflow in _cups_strlcpy(), when the configuration file
cupsd.conf sets the value of loglevel to DEBUG, that could allow a remote
attacker to launch a denial of service (DoS) attack, or possibly execute
arbirary code.
For more information, see:
https://www.cve.org/CVERecord?id=CVE-2023-32324
(* Security fix *)
d/git-2.41.0-x86_64-1.txz: Upgraded.
d/llvm-16.0.5-x86_64-1.txz: Upgraded.
kde/calligra-3.2.1-x86_64-29.txz: Rebuilt.
Recompiled against Imath-3.1.9.
kde/kimageformats-5.106.0-x86_64-3.txz: Rebuilt.
Recompiled against Imath-3.1.9.
kde/kio-extras-23.04.1-x86_64-3.txz: Rebuilt.
Recompiled against Imath-3.1.9.
kde/krita-5.1.5-x86_64-9.txz: Rebuilt.
Recompiled against Imath-3.1.9.
l/Imath-3.1.9-x86_64-1.txz: Upgraded.
Evidently the shared library .so-version bump in Imath-3.1.8 should not have
happened, so this update reverts it to the previous value.
l/gst-plugins-bad-free-1.22.3-x86_64-3.txz: Rebuilt.
Recompiled against Imath-3.1.9.
l/imagemagick-7.1.1_11-x86_64-2.txz: Rebuilt.
Recompiled against Imath-3.1.9.
l/mozjs102-102.12.0esr-x86_64-1.txz: Upgraded.
l/openexr-3.1.7-x86_64-3.txz: Rebuilt.
Recompiled against Imath-3.1.9.
l/serf-1.3.10-x86_64-1.txz: Upgraded.
l/vte-0.72.2-x86_64-1.txz: Upgraded.
n/nettle-3.9.1-x86_64-1.txz: Upgraded.
n/ntp-4.2.8p16-x86_64-1.txz: Upgraded.
This update fixes bugs and security issues.
For more information, see:
https://www.cve.org/CVERecord?id=CVE-2023-26551
https://www.cve.org/CVERecord?id=CVE-2023-26552
https://www.cve.org/CVERecord?id=CVE-2023-26553
https://www.cve.org/CVERecord?id=CVE-2023-26554
https://www.cve.org/CVERecord?id=CVE-2023-26555
(* Security fix *)
n/samba-4.18.3-x86_64-1.txz: Upgraded.
tcl/tclx-8.6.2-x86_64-1.txz: Upgraded.
x/ibus-libpinyin-1.15.3-x86_64-1.txz: Upgraded.
x/libX11-1.8.5-x86_64-1.txz: Upgraded.
xap/gimp-2.10.34-x86_64-4.txz: Rebuilt.
Recompiled against Imath-3.1.9.
xfce/xfce4-pulseaudio-plugin-0.4.7-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rw-r--r-- | source/ap/cups/c0c403744b1bf4a9790a8fcaabcd60970cbefe06.patch | 36 | ||||
-rw-r--r-- | source/ap/cups/cd84d7fde692237af4996d4a0e985a3eb4a293f0.patch | 36 | ||||
-rwxr-xr-x | source/ap/cups/cups.SlackBuild | 8 | ||||
-rw-r--r-- | source/d/llvm/llvm.url | 56 | ||||
-rw-r--r-- | source/kde/kde/build/calligra | 2 | ||||
-rw-r--r-- | source/kde/kde/build/kimageformats | 2 | ||||
-rw-r--r-- | source/kde/kde/build/kio-extras | 2 | ||||
-rw-r--r-- | source/kde/kde/build/krita | 2 | ||||
-rwxr-xr-x | source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/imagemagick/imagemagick.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/openexr/openexr.SlackBuild | 2 | ||||
-rw-r--r-- | source/l/serf/serf-1.3.9-openssl3_fixes-1.patch | 41 | ||||
-rw-r--r-- | source/l/serf/serf.SConstruct.python3.diff | 24 | ||||
-rwxr-xr-x | source/l/serf/serf.SlackBuild | 8 | ||||
-rw-r--r-- | source/l/serf/slack-desc | 2 | ||||
-rwxr-xr-x | source/n/ntp/ntp.SlackBuild | 5 | ||||
-rw-r--r-- | source/n/ntp/ntp.glibc-2.34.diff | 11 | ||||
-rw-r--r-- | source/n/ntp/ntp.url | 1 | ||||
-rw-r--r-- | source/n/ntp/slack-desc | 2 | ||||
-rw-r--r-- | source/n/samba/samba.url | 4 | ||||
-rwxr-xr-x | source/xap/gimp/gimp.SlackBuild | 2 |
21 files changed, 44 insertions, 206 deletions
diff --git a/source/ap/cups/c0c403744b1bf4a9790a8fcaabcd60970cbefe06.patch b/source/ap/cups/c0c403744b1bf4a9790a8fcaabcd60970cbefe06.patch deleted file mode 100644 index f38baf8a7..000000000 --- a/source/ap/cups/c0c403744b1bf4a9790a8fcaabcd60970cbefe06.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c0c403744b1bf4a9790a8fcaabcd60970cbefe06 Mon Sep 17 00:00:00 2001 -From: Michael R Sweet <michael.r.sweet@gmail.com> -Date: Tue, 7 Jun 2022 13:45:29 -0400 -Subject: [PATCH] Fix OpenSSL crash bug - "tls" pointer wasn't cleared after - freeing it (Issue #409) - ---- - CHANGES.md | 1 + - cups/tls-openssl.c | 2 ++ - 2 files changed, 3 insertions(+) - -#diff --git a/CHANGES.md b/CHANGES.md -#index 8b78b003fa..befbf3ab44 100644 -#--- a/CHANGES.md -#+++ b/CHANGES.md -#@@ -6,6 +6,7 @@ Changes in CUPS v2.4.3 (TBA) -# -# - Added a title with device uri for found network printers (Issues #402, #393) -# - Fixed configuration on RISC-V machines (Issue #404) -#+- Fixed an OpenSSL crash bug (Issue #409) -# -# -# Changes in CUPS v2.4.2 (26th May 2022) -diff --git a/cups/tls-openssl.c b/cups/tls-openssl.c -index c3e57742e8..6db9f8a9c2 100644 ---- a/cups/tls-openssl.c -+++ b/cups/tls-openssl.c -@@ -1152,6 +1152,8 @@ _httpTLSStop(http_t *http) // I - Connection to server - SSL_shutdown(http->tls); - SSL_CTX_free(context); - SSL_free(http->tls); -+ -+ http->tls = NULL; - } - - diff --git a/source/ap/cups/cd84d7fde692237af4996d4a0e985a3eb4a293f0.patch b/source/ap/cups/cd84d7fde692237af4996d4a0e985a3eb4a293f0.patch deleted file mode 100644 index 572ca0717..000000000 --- a/source/ap/cups/cd84d7fde692237af4996d4a0e985a3eb4a293f0.patch +++ /dev/null @@ -1,36 +0,0 @@ -From cd84d7fde692237af4996d4a0e985a3eb4a293f0 Mon Sep 17 00:00:00 2001 -From: Michael R Sweet <michael.r.sweet@gmail.com> -Date: Mon, 5 Sep 2022 09:20:03 -0400 -Subject: [PATCH] The OpenSSL code path wasn't loading the full certificate - chain (Issue #465) - ---- - CHANGES.md | 1 + - cups/tls-openssl.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -#diff --git a/CHANGES.md b/CHANGES.md -#index f96677675a..81aef4e680 100644 -#--- a/CHANGES.md -#+++ b/CHANGES.md -#@@ -12,6 +12,7 @@ Changes in CUPS v2.4.3 (TBA) -# hostname (Issue #419) -# - Fixed an OpenSSL crash bug (Issue #409) -# - Fixed a potential SNMP OID value overflow issue (Issue #431) -#+- Fixed an OpenSSL certificate loading issue (Issue #465) -# - Look for default printer on network if needed (Issue ##452) -# - Now localize HTTP responses using the Content-Language value (Issue #426) -# - Raised file size limit for importing PPD via Web UI (Issue #433) -diff --git a/cups/tls-openssl.c b/cups/tls-openssl.c -index ceb3abaedc..acc10fc420 100644 ---- a/cups/tls-openssl.c -+++ b/cups/tls-openssl.c -@@ -1055,7 +1055,7 @@ _httpTLSStart(http_t *http) // I - Connection to server - } - - SSL_CTX_use_PrivateKey_file(context, keyfile, SSL_FILETYPE_PEM); -- SSL_CTX_use_certificate_file(context, crtfile, SSL_FILETYPE_PEM); -+ SSL_CTX_use_certificate_chain_file(context, crtfile); - } - - // Set TLS options... diff --git a/source/ap/cups/cups.SlackBuild b/source/ap/cups/cups.SlackBuild index ffc2e99f9..560fafbbf 100755 --- a/source/ap/cups/cups.SlackBuild +++ b/source/ap/cups/cups.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cups VERSION=${VERSION:-$(echo $PKGNAM-2*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -81,12 +81,6 @@ cd cups-$VERSION || exit 1 sed -i.orig -e 's#$exec_prefix/lib/cups#$libdir/cups#g' configure -# Fix OpenSSL crash: -zcat $CWD/c0c403744b1bf4a9790a8fcaabcd60970cbefe06.patch.gz | patch -p1 --verbose || exit 1 - -# Fix OpenSSL certificate loading issue: -zcat $CWD/cd84d7fde692237af4996d4a0e985a3eb4a293f0.patch.gz | patch -p1 --verbose || exit 1 - # Choose correct options depending on whether PAM is installed: if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then PAM_OPTIONS="--enable-pam" diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url index 6054ae096..dca5f78a3 100644 --- a/source/d/llvm/llvm.url +++ b/source/d/llvm/llvm.url @@ -1,29 +1,29 @@ -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-16.0.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/clang-16.0.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/clang-tools-extra-16.0.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/compiler-rt-16.0.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/flang-16.0.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/lldb-16.0.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/openmp-16.0.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/polly-16.0.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/libcxx-16.0.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/libcxxabi-16.0.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/lld-16.0.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/libunwind-16.0.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/cmake-16.0.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/third-party-16.0.4.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.5/llvm-16.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.5/clang-16.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.5/clang-tools-extra-16.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.5/compiler-rt-16.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.5/flang-16.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.5/lldb-16.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.5/openmp-16.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.5/polly-16.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.5/libcxx-16.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.5/libcxxabi-16.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.5/lld-16.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.5/libunwind-16.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.5/cmake-16.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.5/third-party-16.0.5.src.tar.xz -#http://llvm.org/releases/16.0.4/llvm-16.0.4.src.tar.xz -#http://llvm.org/releases/16.0.4/clang-16.0.4.src.tar.xz -#http://llvm.org/releases/16.0.4/clang-tools-extra-16.0.4.src.tar.xz -#http://llvm.org/releases/16.0.4/compiler-rt-16.0.4.src.tar.xz -#http://llvm.org/releases/16.0.4/flang-16.0.4.src.tar.xz -#http://llvm.org/releases/16.0.4/lldb-16.0.4.src.tar.xz -#http://llvm.org/releases/16.0.4/openmp-16.0.4.src.tar.xz -#http://llvm.org/releases/16.0.4/polly-16.0.4.src.tar.xz -#http://llvm.org/releases/16.0.4/libcxx-16.0.4.src.tar.xz -#http://llvm.org/releases/16.0.4/libcxxabi-16.0.4.src.tar.xz -#http://llvm.org/releases/16.0.4/lld-16.0.4.src.tar.xz -#http://llvm.org/releases/16.0.4/libunwind-16.0.4.src.tar.xz -#http://llvm.org/releases/16.0.4/cmake-16.0.4.src.tar.xz -#http://llvm.org/releases/16.0.4/third-party-16.0.4.src.tar.xz +#http://llvm.org/releases/16.0.5/llvm-16.0.5.src.tar.xz +#http://llvm.org/releases/16.0.5/clang-16.0.5.src.tar.xz +#http://llvm.org/releases/16.0.5/clang-tools-extra-16.0.5.src.tar.xz +#http://llvm.org/releases/16.0.5/compiler-rt-16.0.5.src.tar.xz +#http://llvm.org/releases/16.0.5/flang-16.0.5.src.tar.xz +#http://llvm.org/releases/16.0.5/lldb-16.0.5.src.tar.xz +#http://llvm.org/releases/16.0.5/openmp-16.0.5.src.tar.xz +#http://llvm.org/releases/16.0.5/polly-16.0.5.src.tar.xz +#http://llvm.org/releases/16.0.5/libcxx-16.0.5.src.tar.xz +#http://llvm.org/releases/16.0.5/libcxxabi-16.0.5.src.tar.xz +#http://llvm.org/releases/16.0.5/lld-16.0.5.src.tar.xz +#http://llvm.org/releases/16.0.5/libunwind-16.0.5.src.tar.xz +#http://llvm.org/releases/16.0.5/cmake-16.0.5.src.tar.xz +#http://llvm.org/releases/16.0.5/third-party-16.0.5.src.tar.xz diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra index 9902f1784..f04c001f3 100644 --- a/source/kde/kde/build/calligra +++ b/source/kde/kde/build/calligra @@ -1 +1 @@ -28 +29 diff --git a/source/kde/kde/build/kimageformats b/source/kde/kde/build/kimageformats index 0cfbf0888..00750edc0 100644 --- a/source/kde/kde/build/kimageformats +++ b/source/kde/kde/build/kimageformats @@ -1 +1 @@ -2 +3 diff --git a/source/kde/kde/build/kio-extras b/source/kde/kde/build/kio-extras index 0cfbf0888..00750edc0 100644 --- a/source/kde/kde/build/kio-extras +++ b/source/kde/kde/build/kio-extras @@ -1 +1 @@ -2 +3 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index 45a4fb75d..ec635144f 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -8 +9 diff --git a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild index f6e40311b..7aae2ddc2 100755 --- a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild +++ b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gst-plugins-bad-free VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild index 21e77f538..254d9c7ea 100755 --- a/source/l/imagemagick/imagemagick.SlackBuild +++ b/source/l/imagemagick/imagemagick.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=imagemagick -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # NOTE: This is to cope with ImageMagick version numbers such as 5.4.7-4, # which occur fairly often (but not always). If these numbers are all the same, diff --git a/source/l/openexr/openexr.SlackBuild b/source/l/openexr/openexr.SlackBuild index 8dc0457ff..f443a1d91 100755 --- a/source/l/openexr/openexr.SlackBuild +++ b/source/l/openexr/openexr.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=openexr VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then 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 deleted file mode 100644 index 0a5c8768c..000000000 --- a/source/l/serf/serf-1.3.9-openssl3_fixes-1.patch +++ /dev/null @@ -1,41 +0,0 @@ -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.SConstruct.python3.diff b/source/l/serf/serf.SConstruct.python3.diff deleted file mode 100644 index 144f5e39e..000000000 --- a/source/l/serf/serf.SConstruct.python3.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- serf-1.3.9/SConstruct.orig 2019-07-26 17:49:30.910189251 +0000 -+++ serf-1.3.9/SConstruct 2019-07-26 17:49:54.073821735 +0000 -@@ -163,9 +163,9 @@ - suffix='.def', src_suffix='.h') - }) - --match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' -- 'SERF_MINOR_VERSION ([0-9]+).*' -- 'SERF_PATCH_VERSION ([0-9]+)', -+match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*' -+ b'SERF_MINOR_VERSION ([0-9]+).*' -+ b'SERF_PATCH_VERSION ([0-9]+)', - env.File('serf.h').get_contents(), - re.DOTALL) - MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] -@@ -183,7 +183,7 @@ - - unknown = opts.UnknownVariables() - if unknown: -- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) -+ print ('Warning: Used unknown variables:', ', '.join(unknown.keys())) - - apr = str(env['APR']) - apu = str(env['APU']) diff --git a/source/l/serf/serf.SlackBuild b/source/l/serf/serf.SlackBuild index 924972640..e890ea4e4 100755 --- a/source/l/serf/serf.SlackBuild +++ b/source/l/serf/serf.SlackBuild @@ -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:-9} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -85,12 +85,6 @@ find . \ sed -i "/Default/s:lib_static,::" SConstruct 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} \ diff --git a/source/l/serf/slack-desc b/source/l/serf/slack-desc index 4e31ed2ec..a2f3198e5 100644 --- a/source/l/serf/slack-desc +++ b/source/l/serf/slack-desc @@ -15,5 +15,5 @@ serf: * SSL/TLS support, full HTTP pipelining, serf: * multiple authentication modes (Basic, Digest, Kerberos/NTLM), serf: * zero-copy support for increased throughput. serf: -serf: Homepage: http://serf.apache.org/ +serf: Homepage: https://serf.apache.org/ serf: diff --git a/source/n/ntp/ntp.SlackBuild b/source/n/ntp/ntp.SlackBuild index fdcb534f0..44da1d009 100755 --- a/source/n/ntp/ntp.SlackBuild +++ b/source/n/ntp/ntp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ntp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-13} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -68,9 +68,6 @@ cd ntp-${VERSION}* || exit 1 zcat $CWD/ntp.nano.diff.gz | patch -p1 --verbose || exit 1 -# glibc-2.34+ fix from from https://www.linuxfromscratch.org/blfs/view/svn/basicnet/ntp.html -zcat $CWD/ntp.glibc-2.34.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 2777 -o -perm 2755 -o -perm 2775 \) \ diff --git a/source/n/ntp/ntp.glibc-2.34.diff b/source/n/ntp/ntp.glibc-2.34.diff deleted file mode 100644 index 2f0dd2914..000000000 --- a/source/n/ntp/ntp.glibc-2.34.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./libntp/work_thread.c.orig 2018-08-14 06:51:06.000000000 -0500 -+++ ./libntp/work_thread.c 2022-02-12 21:55:02.381012379 -0600 -@@ -41,7 +41,7 @@ - #ifndef THREAD_MINSTACKSIZE - # define THREAD_MINSTACKSIZE (64U * 1024) - #endif --#ifndef __sun -+#if !defined(__sun) && !defined(__GLIBC__) - #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN - # undef THREAD_MINSTACKSIZE - # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN diff --git a/source/n/ntp/ntp.url b/source/n/ntp/ntp.url new file mode 100644 index 000000000..2fd3e6af6 --- /dev/null +++ b/source/n/ntp/ntp.url @@ -0,0 +1 @@ +https://www.ntp.org/downloads/ diff --git a/source/n/ntp/slack-desc b/source/n/ntp/slack-desc index a0a931739..a1706bf57 100644 --- a/source/n/ntp/slack-desc +++ b/source/n/ntp/slack-desc @@ -16,4 +16,4 @@ ntp: of milliseconds on WANs relative to a primary server synchronized to ntp: Coordinated Universal Time (UTC) via a Global Positioning Service ntp: (GPS) receiver, for example. ntp: -ntp: Homepage: http://www.ntp.org +ntp: Homepage: https://www.ntp.org diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url index 0824d5ea5..2d846e875 100644 --- a/source/n/samba/samba.url +++ b/source/n/samba/samba.url @@ -1,2 +1,2 @@ -https://download.samba.org/pub/samba/stable/samba-4.18.2.tar.gz -https://download.samba.org/pub/samba/stable/samba-4.18.2.tar.asc +https://download.samba.org/pub/samba/stable/samba-4.18.3.tar.gz +https://download.samba.org/pub/samba/stable/samba-4.18.3.tar.asc diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild index ca6135862..b16b62a0c 100755 --- a/source/xap/gimp/gimp.SlackBuild +++ b/source/xap/gimp/gimp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gimp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |