diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-10-09 18:10:01 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-10-09 20:34:39 +0200 |
commit | b29a454a1a5a87d5016b7d2332fdc30c67b2a5c0 (patch) | |
tree | a385d2645521381c592f464d4376bbf6a82d7449 /source/l | |
parent | 291a25cd423c9b040a72063e51134d95cdf4184e (diff) | |
download | current-b29a454a1a5a87d5016b7d2332fdc30c67b2a5c0.tar.gz current-b29a454a1a5a87d5016b7d2332fdc30c67b2a5c0.tar.xz |
Mon Oct 9 18:10:01 UTC 202320231009181001
a/aaa_glibc-solibs-2.38-x86_64-2.txz: Rebuilt.
ap/qpdf-11.6.2-x86_64-1.txz: Upgraded.
ap/vim-9.0.2009-x86_64-1.txz: Upgraded.
l/desktop-file-utils-0.27-x86_64-1.txz: Upgraded.
l/glibc-2.38-x86_64-2.txz: Rebuilt.
These glibc packages are the exact ones that were previously in /testing.
A test mass rebuild was done here finding no new FTBFS, so I think these
are good to go. :)
l/glibc-i18n-2.38-x86_64-2.txz: Rebuilt.
l/glibc-profile-2.38-x86_64-2.txz: Rebuilt.
l/imagemagick-7.1.1_20-x86_64-1.txz: Upgraded.
l/libxkbcommon-1.6.0-x86_64-1.txz: Upgraded.
l/shared-mime-info-2.3-x86_64-1.txz: Upgraded.
n/c-ares-1.20.0-x86_64-1.txz: Upgraded.
n/libtirpc-1.3.4-x86_64-1.txz: Upgraded.
n/proftpd-1.3.8a-x86_64-1.txz: Upgraded.
n/whois-5.5.19-x86_64-1.txz: Upgraded.
Fixed english support for Japanese queries to not add again the /e argument
if it had already been provided by the user. (Closes: #1050171)
Added the .ye and .*************** (.xn--54b7fta0cc, Bangladesh) TLD servers.
Updated the .ba, .bb, .dk, .es, .gt, .jo, .ml, .mo, .pa, .pn, .sv, .uy,
.a+-la-r+-d+.n+, (.xn--mgbayh7gpa, Jordan) and .****** (.xn--mix891f, Macao)
TLD servers.
Upgraded the TLD URLs to HTTPS whenever possible.
Updated the charset for whois.jprs.jp.
Removed 3 new gTLDs which are no longer active.
Removed support for the obsolete as32 dot notation.
x/xterm-386-x86_64-1.txz: Upgraded.
xap/vim-gvim-9.0.2009-x86_64-1.txz: Upgraded.
Diffstat (limited to '')
-rwxr-xr-x | source/l/desktop-file-utils/desktop-file-utils.SlackBuild | 37 | ||||
-rw-r--r-- | source/l/glibc/doinst.sh-aaa_glibc-solibs | 7 | ||||
-rw-r--r-- | source/l/glibc/doinst.sh-glibc | 6 | ||||
-rwxr-xr-x | source/l/glibc/glibc.SlackBuild | 45 | ||||
-rwxr-xr-x | source/l/glibc/libxcrypt.build (renamed from testing/source/glibc/libxcrypt.build) | 0 | ||||
-rw-r--r-- | source/l/glibc/libxcrypt.url (renamed from testing/source/glibc/libxcrypt.url) | 0 | ||||
-rw-r--r-- | source/l/glibc/patches/CVE-2023-25139.patch | 81 | ||||
-rw-r--r-- | source/l/glibc/patches/glibc-2.37.CVE-2023-4911.patch | 70 | ||||
-rw-r--r-- | source/l/glibc/patches/glibc-2.38-upstream_fixes-1.patch (renamed from testing/source/glibc/patches/glibc-2.38-upstream_fixes-1.patch) | 0 | ||||
-rw-r--r-- | source/l/glibc/patches/glibc.CVE-2023-4911.patch (renamed from testing/source/glibc/patches/glibc.CVE-2023-4911.patch) | 0 | ||||
-rw-r--r-- | source/l/glibc/patches/reenable_DT_HASH.patch | 104 | ||||
-rwxr-xr-x | source/l/shared-mime-info/shared-mime-info.SlackBuild | 5 | ||||
-rw-r--r-- | source/l/shared-mime-info/shared-mime-info.skip_tests.diff | 11 |
13 files changed, 96 insertions, 270 deletions
diff --git a/source/l/desktop-file-utils/desktop-file-utils.SlackBuild b/source/l/desktop-file-utils/desktop-file-utils.SlackBuild index db23c76e8..f1e3775b2 100755 --- a/source/l/desktop-file-utils/desktop-file-utils.SlackBuild +++ b/source/l/desktop-file-utils/desktop-file-utils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2006, 2008, 2009, 2010, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2018, 2020, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=desktop-file-utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -76,22 +76,27 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -if [ ! -r configure ]; then - NOCONFIGURE=1 ./autogen.sh -fi - -# Configure: -CFLAGS="$SLKCFLAGS" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --build=$ARCH-slackware-linux \ - --host=$ARCH-slackware-linux - -# Build and install: -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. mkdir -p $PKG/var/log/setup cat << EOF > $PKG/var/log/setup/setup.07.update-desktop-database diff --git a/source/l/glibc/doinst.sh-aaa_glibc-solibs b/source/l/glibc/doinst.sh-aaa_glibc-solibs index d5fea2e5f..fe8fc1f37 100644 --- a/source/l/glibc/doinst.sh-aaa_glibc-solibs +++ b/source/l/glibc/doinst.sh-aaa_glibc-solibs @@ -72,6 +72,8 @@ if [ -x /sbin/ldconfig -a -d lib/incoming ]; then # swap on the fly rm -f $LIBRARY done done + # Remove stale versions of libcrypt from Slackware 14.2 or newer: + rm -f libcrypt-{2.23,2.24,2.25,2.26,2.27,2.28,2.29,2.30,2.31,2.32,2.33,2.34,2.35,2.36,2.37}.so ) fi # Finally, rename them and clean up: @@ -136,7 +138,9 @@ if [ ! -x /sbin/ldconfig ]; then ( cd lib ; rm -rf libanl.so.1 ) ( cd lib ; ln -sf libanl-@@VERSION@@.so libanl.so.1 ) ( cd lib ; rm -rf libcrypt.so.1 ) -( cd lib ; ln -sf libcrypt-@@VERSION@@.so libcrypt.so.1 ) +( cd lib ; ln -sf libcrypt1-@@VERSION@@.so libcrypt.so.1 ) +( cd lib ; rm -rf libcrypt.so.2 ) +( cd lib ; ln -sf libcrypt2-@@VERSION@@.so libcrypt.so.2 ) ( cd lib ; rm -rf libBrokenLocale.so.1 ) ( cd lib ; ln -sf libBrokenLocale-@@VERSION@@.so libBrokenLocale.so.1 ) ( cd lib ; rm -rf ld-linux.so.2 ) @@ -152,4 +156,3 @@ if [ ! -x /sbin/ldconfig ]; then ( cd lib ; rm -rf librt.so.1 ) ( cd lib ; ln -sf librt-@@VERSION@@.so librt.so.1 ) fi - diff --git a/source/l/glibc/doinst.sh-glibc b/source/l/glibc/doinst.sh-glibc index 2ed07ad03..5fa7d2f86 100644 --- a/source/l/glibc/doinst.sh-glibc +++ b/source/l/glibc/doinst.sh-glibc @@ -72,6 +72,8 @@ if [ -x /sbin/ldconfig -a -d lib/incoming ]; then # swap on the fly rm -f $LIBRARY done done + # Remove stale versions of libcrypt from Slackware 14.2 or newer: + rm -f libcrypt-{2.23,2.24,2.25,2.26,2.27,2.28,2.29,2.30,2.31,2.32,2.33,2.34,2.35,2.36,2.37}.so ) fi # Finally, rename them and clean up: @@ -138,7 +140,9 @@ if [ ! -x /sbin/ldconfig ]; then ( cd lib ; rm -rf libanl.so.1 ) ( cd lib ; ln -sf libanl-@@VERSION@@.so libanl.so.1 ) ( cd lib ; rm -rf libcrypt.so.1 ) -( cd lib ; ln -sf libcrypt-@@VERSION@@.so libcrypt.so.1 ) +( cd lib ; ln -sf libcrypt1-@@VERSION@@.so libcrypt.so.1 ) +( cd lib ; rm -rf libcrypt.so.2 ) +( cd lib ; ln -sf libcrypt2-@@VERSION@@.so libcrypt.so.2 ) ( cd lib ; rm -rf libBrokenLocale.so.1 ) ( cd lib ; ln -sf libBrokenLocale-@@VERSION@@.so libBrokenLocale.so.1 ) ( cd lib ; rm -rf ld-linux.so.2 ) diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild index bac317163..044662fe5 100755 --- a/source/l/glibc/glibc.SlackBuild +++ b/source/l/glibc/glibc.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glibc VERSION=${VERSION:-$(echo glibc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-3} +BUILD=${BUILD:-2} # I was considering disabling NSCD, but MoZes talked me out of it. :) #DISABLE_NSCD=" --disable-nscd " @@ -230,7 +230,7 @@ CFLAGS="-g $OPTIMIZ" \ ../configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-kernel=2.6.32 \ + --enable-kernel=4.4 \ --with-headers=/usr/include \ --enable-add-ons \ --enable-profile \ @@ -251,6 +251,11 @@ make $NUMJOBS install install_root=$PKG || exit 1 # completes much faster. :) make $NUMJOBS localedata/install-locales install_root=$PKG DESTDIR=$PKG || exit 1 +# Build and install libxcrypt: +pushd $CWD +ARCH=$SLACKWARE_ARCH LIBDIRSUFFIX=$LIBDIRSUFFIX SLKCFLAGS=$OPTIMIZ ./libxcrypt.build +popd + # We've always had an sln symlink in /bin, so let's make sure it # remains there so as not to break any scripts that might need it: mkdir -p $PKG/bin @@ -306,8 +311,7 @@ cat nscd/nscd.conf > $PKG/etc/nscd.conf.new # Install docs: ( mkdir -p $PKG/usr/doc/glibc-$VERSION cp -a \ - BUGS CONFORMANCE COPYING* FAQ INSTALL LICENSES NAMESPACE \ - NEWS NOTES PROJECTS README* \ + CONTRIBUTED-BY* COPYING* INSTALL* LICENSES* MAINTAINERS* NEWS* README* SECURITY* SHARED-FILES* \ $PKG/usr/doc/glibc-$VERSION ) @@ -338,9 +342,20 @@ fi find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip -g 2> /dev/null ) -# Fix info dir: -rm $PKG/usr/info/dir -gzip -9 $PKG/usr/info/* +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Compress info files, if any: +if [ -d $PKG/usr/info ]; then + ( cd $PKG/usr/info + rm -f dir + gzip -9 * + ) +fi # This is junk rm $PKG/etc/ld.so.cache @@ -411,6 +426,11 @@ cp -a $PKG/lib${LIBDIRSUFFIX}/* lib${LIBDIRSUFFIX} # have to handle these files differently and so that it's easy to see what # version of glibc is in use at a glance. cd incoming + # First do the new libxcrypt links (a little bit differently): + for cryptlib in libcrypt.so.* ; do + CRYPTSO=$(echo $cryptlib | cut -f 3 -d .) + mv $cryptlib libcrypt${CRYPTSO}-${VERSION}.so + done for library in *.so.* ; do mv $library $(echo $library | cut -f 1 -d .)-${VERSION}.so done @@ -465,17 +485,13 @@ find lib${LIBDIRSUFFIX} -type l -exec rm {} \+ mkdir install cp -a $CWD/slack-desc.glibc install/slack-desc cp -a $CWD/doinst.sh-glibc install/doinst.sh -# Fix specific versioning for the symlink creation script. This part of the -# script would only be used in the case where there is no ldconfig on the -# running system that's used to install the package. That should never be the -# case, but we'll leave the code in place anyway just in case. -sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh # Call the function to fix doinst.sh where $LIBDIRSUFFIX is needed: fix_doinst ( cd lib${LIBDIRSUFFIX} mkdir incoming mv *so* incoming mv incoming/libmemusage.so . + #mv incoming/libcrypt* . # Beginning with glibc-2.34, shared objects are using their ABI sonames # directly, which is frankly, a terrible idea. It might help other package # managers, but doesn't do us any favors where we already had a system for @@ -484,6 +500,11 @@ fix_doinst # have to handle these files differently and so that it's easy to see what # version of glibc is in use at a glance. cd incoming + # First do the new libxcrypt links (a little bit differently): + for cryptlib in libcrypt.so.* ; do + CRYPTSO=$(echo $cryptlib | cut -f 3 -d .) + mv $cryptlib libcrypt${CRYPTSO}-${VERSION}.so + done for library in *.so.* ; do mv $library $(echo $library | cut -f 1 -d .)-${VERSION}.so done diff --git a/testing/source/glibc/libxcrypt.build b/source/l/glibc/libxcrypt.build index 17bc62ec5..17bc62ec5 100755 --- a/testing/source/glibc/libxcrypt.build +++ b/source/l/glibc/libxcrypt.build diff --git a/testing/source/glibc/libxcrypt.url b/source/l/glibc/libxcrypt.url index 4e0d180af..4e0d180af 100644 --- a/testing/source/glibc/libxcrypt.url +++ b/source/l/glibc/libxcrypt.url diff --git a/source/l/glibc/patches/CVE-2023-25139.patch b/source/l/glibc/patches/CVE-2023-25139.patch deleted file mode 100644 index 3361e68fa..000000000 --- a/source/l/glibc/patches/CVE-2023-25139.patch +++ /dev/null @@ -1,81 +0,0 @@ -This is a partial fix for mishandling of grouping when formatting -integers. It properly computes the width in presence of grouping -characteres when the precision is larger than the number of significant -digits. ---- - stdio-common/Makefile | 1 + - stdio-common/tst-grouping3.c | 37 +++++++++++++++++++++++++++++ - stdio-common/vfprintf-process-arg.c | 2 +- - 3 files changed, 39 insertions(+), 1 deletion(-) - create mode 100644 stdio-common/tst-grouping3.c - -diff --git a/stdio-common/Makefile b/stdio-common/Makefile -index 6e9d104524..b46d932a20 100644 ---- a/stdio-common/Makefile -+++ b/stdio-common/Makefile -@@ -195,6 +195,7 @@ tests := \ - tst-gets \ - tst-grouping \ - tst-grouping2 \ -+ tst-grouping3 \ - tst-long-dbl-fphex \ - tst-memstream-string \ - tst-obprintf \ -diff --git a/stdio-common/tst-grouping3.c b/stdio-common/tst-grouping3.c -new file mode 100644 -index 0000000000..0031ad4010 ---- /dev/null -+++ b/stdio-common/tst-grouping3.c -@@ -0,0 +1,37 @@ -+/* Test printf with grouping and padding (bug 23432) -+ Copyright (C) 2023 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <locale.h> -+#include <stdio.h> -+#include <support/check.h> -+#include <support/support.h> -+ -+static int -+do_test (void) -+{ -+ char buf[80]; -+ -+ xsetlocale (LC_NUMERIC, "de_DE.UTF-8"); -+ -+ sprintf (buf, "%+-'13.9d", 1234567); -+ TEST_COMPARE_STRING (buf, "+001.234.567 "); -+ -+ return 0; -+} -+ -+#include <support/test-driver.c> -diff --git a/stdio-common/vfprintf-process-arg.c b/stdio-common/vfprintf-process-arg.c -index 2c651946df..cd3eaf5c0c 100644 ---- a/stdio-common/vfprintf-process-arg.c -+++ b/stdio-common/vfprintf-process-arg.c -@@ -257,7 +257,7 @@ LABEL (unsigned_number): /* Unsigned number of base BASE. */ - width -= 2; - } - -- width -= workend - string + prec; -+ width -= number_length + prec; - - Xprintf_buffer_pad (buf, L_('0'), prec); - --- -2.39.1 diff --git a/source/l/glibc/patches/glibc-2.37.CVE-2023-4911.patch b/source/l/glibc/patches/glibc-2.37.CVE-2023-4911.patch deleted file mode 100644 index 074317990..000000000 --- a/source/l/glibc/patches/glibc-2.37.CVE-2023-4911.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 1056e5b4c3f2d90ed2b4a55f96add28da2f4c8fa Mon Sep 17 00:00:00 2001 -From: Siddhesh Poyarekar <siddhesh@sourceware.org> -Date: Tue, 19 Sep 2023 18:39:32 -0400 -Subject: [PATCH] tunables: Terminate if end of input is reached - (CVE-2023-4911) - -The string parsing routine may end up writing beyond bounds of tunestr -if the input tunable string is malformed, of the form name=name=val. -This gets processed twice, first as name=name=val and next as name=val, -resulting in tunestr being name=name=val:name=val, thus overflowing -tunestr. - -Terminate the parsing loop at the first instance itself so that tunestr -does not overflow. - -Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org> -Reviewed-by: Carlos O'Donell <carlos@redhat.com> ---- - NEWS | 5 +++++ - elf/dl-tunables.c | 17 +++++++++------- - - ---- ./NEWS.orig 2023-01-31 21:27:45.000000000 -0600 -+++ ./NEWS 2023-10-03 15:47:54.560781260 -0500 -@@ -28,6 +28,11 @@ - heap and prints it to the target log file, potentially revealing a - portion of the contents of the heap. - -+ CVE-2023-4911: If a tunable of the form NAME=NAME=VAL is passed in the -+ environment of a setuid program and NAME is valid, it may result in a -+ buffer overflow, which could be exploited to achieve escalated -+ privileges. This flaw was introduced in glibc 2.34. -+ - The following bugs are resolved with this release: - - [12154] network: Cannot resolve hosts which have wildcard aliases ---- ./elf/dl-tunables.c.orig 2023-01-31 21:27:45.000000000 -0600 -+++ ./elf/dl-tunables.c 2023-10-03 15:47:54.560781260 -0500 -@@ -187,11 +187,7 @@ - /* If we reach the end of the string before getting a valid name-value - pair, bail out. */ - if (p[len] == '\0') -- { -- if (__libc_enable_secure) -- tunestr[off] = '\0'; -- return; -- } -+ break; - - /* We did not find a valid name-value pair before encountering the - colon. */ -@@ -251,9 +247,16 @@ - } - } - -- if (p[len] != '\0') -- p += len + 1; -+ /* We reached the end while processing the tunable string. */ -+ if (p[len] == '\0') -+ break; -+ -+ p += len + 1; - } -+ -+ /* Terminate tunestr before we leave. */ -+ if (__libc_enable_secure) -+ tunestr[off] = '\0'; - } - #endif - diff --git a/testing/source/glibc/patches/glibc-2.38-upstream_fixes-1.patch b/source/l/glibc/patches/glibc-2.38-upstream_fixes-1.patch index e111d8aba..e111d8aba 100644 --- a/testing/source/glibc/patches/glibc-2.38-upstream_fixes-1.patch +++ b/source/l/glibc/patches/glibc-2.38-upstream_fixes-1.patch diff --git a/testing/source/glibc/patches/glibc.CVE-2023-4911.patch b/source/l/glibc/patches/glibc.CVE-2023-4911.patch index a790a8305..a790a8305 100644 --- a/testing/source/glibc/patches/glibc.CVE-2023-4911.patch +++ b/source/l/glibc/patches/glibc.CVE-2023-4911.patch diff --git a/source/l/glibc/patches/reenable_DT_HASH.patch b/source/l/glibc/patches/reenable_DT_HASH.patch index f828b011b..7b7fe9ee4 100644 --- a/source/l/glibc/patches/reenable_DT_HASH.patch +++ b/source/l/glibc/patches/reenable_DT_HASH.patch @@ -1,27 +1,7 @@ -From e47de5cb2d4dbecb58f569ed241e8e95c568f03c Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Fri, 29 Apr 2022 16:37:51 +0200 -Subject: [PATCH] Do not use --hash-style=both for building glibc shared - objects - -The comment indicates that --hash-style=both was used to maintain -compatibility with static dlopen, but we had many internal ABI -changes since then, so this compatiblity does not add value anymore. - -Reviewed-by: Carlos O'Donell <carlos@redhat.com> ---- - Makeconfig | 9 +++++++++ - Makerules | 7 +++++++ - config.make.in | 1 + - configure | 28 ++++++++++++++++++++++++++++ - configure.ac | 16 ++++++++++++++++ - 5 files changed, 61 insertions(+) - -diff --git b/Makeconfig a/Makeconfig -index 760f14e92f..0aa5fb0099 100644 ---- b/Makeconfig -+++ a/Makeconfig -@@ -362,6 +362,15 @@ relro-LDFLAGS = -Wl,-z,relro +diff -up glibc-2.38/Makeconfig.45~ glibc-2.38/Makeconfig +--- glibc-2.38/Makeconfig.45~ 2023-08-01 01:02:58.246719027 +0200 ++++ glibc-2.38/Makeconfig 2023-08-01 01:02:58.303719582 +0200 +@@ -381,6 +381,15 @@ relro-LDFLAGS = -Wl,-z,relro LDFLAGS.so += $(relro-LDFLAGS) LDFLAGS-rtld += $(relro-LDFLAGS) @@ -34,53 +14,34 @@ index 760f14e92f..0aa5fb0099 100644 +LDFLAGS-rtld += $(hashstyle-LDFLAGS) +endif + - ifeq (no,$(build-pie-default)) - pie-default = $(no-pie-ccflag) - else # build-pie-default -diff --git b/Makerules a/Makerules -index 354528b8c7..428464f092 100644 ---- b/Makerules -+++ a/Makerules -@@ -557,6 +557,13 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules - -Wl,--verbose 2>/dev/null | \ - sed > $@T \ - -e '/^=========/,/^=========/!d;/^=========/d' \ -+ $(if $(filter yes,$(have-hash-style)), \ -+ -e 's/^.*\.gnu\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ -+ -e '/^[ ]*\.hash[ ]*:.*$$/{h;d;}' \ -+ -e '/DATA_SEGMENT_ALIGN/{H;g}' \ -+ , \ -+ -e 's/^.*\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ -+ ) \ - -e 's/^.*\*(\.dynbss).*$$/& \ - PROVIDE(__start___libc_freeres_ptrs = .); \ - *(__libc_freeres_ptrs) \ -diff --git b/config.make.in a/config.make.in -index fff4c78dd0..bf728c71c0 100644 ---- b/config.make.in -+++ a/config.make.in -@@ -70,6 +70,7 @@ have-libcap = @have_libcap@ + # Linker options to enable and disable DT_RELR. + ifeq ($(have-dt-relr),yes) + dt-relr-ldflag = -Wl,-z,pack-relative-relocs +diff -up glibc-2.38/Makerules.45~ glibc-2.38/Makerules +diff -up glibc-2.38/config.make.in.45~ glibc-2.38/config.make.in +--- glibc-2.38/config.make.in.45~ 2023-08-01 01:02:58.301719562 +0200 ++++ glibc-2.38/config.make.in 2023-08-01 01:03:54.721267748 +0200 +@@ -71,6 +71,7 @@ have-libaudit = @have_libaudit@ + have-libcap = @have_libcap@ have-cc-with-libunwind = @libc_cv_cc_with_libunwind@ - fno-unit-at-a-time = @fno_unit_at_a_time@ bind-now = @bindnow@ +have-hash-style = @libc_cv_hashstyle@ - use-default-link = @use_default_link@ have-cxx-thread_local = @libc_cv_cxx_thread_local@ have-loop-to-function = @libc_cv_cc_loop_to_function@ -diff --git b/configure a/configure -index 716dc041b6..5a730dc5fc 100755 ---- b/configure -+++ a/configure -@@ -622,6 +622,7 @@ libc_cv_cc_nofma + have-textrel_ifunc = @libc_cv_textrel_ifunc@ +diff -up glibc-2.38/configure.45~ glibc-2.38/configure +--- glibc-2.38/configure.45~ 2023-07-31 19:54:16.000000000 +0200 ++++ glibc-2.38/configure 2023-08-01 01:04:54.904850299 +0200 +@@ -655,6 +655,7 @@ libc_cv_cc_submachine + libc_cv_cc_nofma libc_cv_mtls_dialect_gnu2 - fno_unit_at_a_time libc_cv_has_glob_dat +libc_cv_hashstyle libc_cv_fpie libc_cv_z_execstack ASFLAGS_config -@@ -6193,6 +6194,33 @@ $as_echo "$libc_cv_fpie" >&6; } - +@@ -7107,6 +7108,32 @@ fi + printf "%s\n" "$libc_cv_fpie" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --hash-style option" >&5 @@ -92,8 +53,8 @@ index 716dc041b6..5a730dc5fc 100755 +int _start (void) { return 42; } +EOF +if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS $no_ssp -+ -fPIC -shared -o conftest.so conftest.c -+ -Wl,--hash-style=both -nostdlib 1>&5' ++ -fPIC -shared -o conftest.so conftest.c ++ -Wl,--hash-style=both -nostdlib 1>&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? @@ -109,15 +70,13 @@ index 716dc041b6..5a730dc5fc 100755 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_hashstyle" >&5 +$as_echo "$libc_cv_hashstyle" >&6; } + -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLOB_DAT reloc" >&5 - $as_echo_n "checking for GLOB_DAT reloc... " >&6; } - if ${libc_cv_has_glob_dat+:} false; then : -diff --git b/configure.ac a/configure.ac -index d08ad4d64e..a045f6608e 100644 ---- b/configure.ac -+++ a/configure.ac -@@ -1360,6 +1360,22 @@ LIBC_TRY_CC_OPTION([-fpie], [libc_cv_fpie=yes], [libc_cv_fpie=no]) + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLOB_DAT reloc" >&5 + printf %s "checking for GLOB_DAT reloc... " >&6; } +diff -up glibc-2.38/configure.ac.45~ glibc-2.38/configure.ac +--- glibc-2.38/configure.ac.45~ 2023-07-31 19:54:16.000000000 +0200 ++++ glibc-2.38/configure.ac 2023-08-01 01:02:58.303719582 +0200 +@@ -1339,6 +1339,22 @@ LIBC_TRY_CC_OPTION([-fpie], [libc_cv_fpi AC_SUBST(libc_cv_fpie) @@ -140,6 +99,3 @@ index d08ad4d64e..a045f6608e 100644 AC_CACHE_CHECK(for GLOB_DAT reloc, libc_cv_has_glob_dat, [dnl cat > conftest.c <<EOF --- -2.37.1 - diff --git a/source/l/shared-mime-info/shared-mime-info.SlackBuild b/source/l/shared-mime-info/shared-mime-info.SlackBuild index 9b54b78ef..3db808028 100755 --- a/source/l/shared-mime-info/shared-mime-info.SlackBuild +++ b/source/l/shared-mime-info/shared-mime-info.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2012, 2016, 2018, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012, 2016, 2018, 2021, 2022, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -78,8 +78,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/shared-mime-info.skip_tests.diff.gz | patch -p1 --verbose || exit 1 - # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -97,6 +95,7 @@ meson setup \ --sysconfdir=/etc \ --localstatedir=/var \ --buildtype=release \ + -Dbuild-tests=false \ -Dupdate-mimedb=false \ .. || exit 1 # Don't use fdatasync() unless you want it to take 1000x longer diff --git a/source/l/shared-mime-info/shared-mime-info.skip_tests.diff b/source/l/shared-mime-info/shared-mime-info.skip_tests.diff deleted file mode 100644 index a05576053..000000000 --- a/source/l/shared-mime-info/shared-mime-info.skip_tests.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./meson.build.orig 2022-03-27 05:19:00.000000000 -0500 -+++ ./meson.build 2022-03-28 13:48:19.290060450 -0500 -@@ -65,7 +65,7 @@ - gio = dependency('gio-2.0', required: false) - subdir('src') - endif --subdir('tests') -+#subdir('tests') - - configure_file( - input: 'shared-mime-info.pc.in', |