diff options
Diffstat (limited to 'testing')
-rw-r--r-- | testing/source/glibc/doinst.sh-aaa_glibc-solibs | 155 | ||||
-rw-r--r-- | testing/source/glibc/doinst.sh-glibc | 158 | ||||
-rw-r--r-- | testing/source/glibc/glibc-2.32.en_US.no.am.pm.date.format.diff | 14 | ||||
-rw-r--r-- | testing/source/glibc/glibc-c-utf8-locale.patch | 270 | ||||
-rwxr-xr-x | testing/source/glibc/glibc-cvs-checkout.sh | 3 | ||||
-rwxr-xr-x | testing/source/glibc/glibc.SlackBuild | 470 | ||||
-rw-r--r-- | testing/source/glibc/glibc.locale.no-archive.diff | 10 | ||||
-rw-r--r-- | testing/source/glibc/glibc.ru_RU.CP1251.diff | 10 | ||||
-rw-r--r-- | testing/source/glibc/patches/0001-nsswitch-return-result-when-nss-database-is-locked.patch | 47 | ||||
-rwxr-xr-x | testing/source/glibc/profile.d/glibc.csh.new | 9 | ||||
-rwxr-xr-x | testing/source/glibc/profile.d/glibc.sh.new | 8 | ||||
-rw-r--r-- | testing/source/glibc/slack-desc.aaa_glibc-solibs | 19 | ||||
-rw-r--r-- | testing/source/glibc/slack-desc.glibc | 19 | ||||
-rw-r--r-- | testing/source/glibc/slack-desc.glibc-debug | 19 | ||||
-rw-r--r-- | testing/source/glibc/slack-desc.glibc-i18n | 19 | ||||
-rw-r--r-- | testing/source/glibc/slack-desc.glibc-profile | 19 |
16 files changed, 0 insertions, 1249 deletions
diff --git a/testing/source/glibc/doinst.sh-aaa_glibc-solibs b/testing/source/glibc/doinst.sh-aaa_glibc-solibs deleted file mode 100644 index d5fea2e5..00000000 --- a/testing/source/glibc/doinst.sh-aaa_glibc-solibs +++ /dev/null @@ -1,155 +0,0 @@ -#!/bin/sh -# Copyright (C) 2002, 2005 Slackware Linux, Inc. -# Copyright 2005, 2006, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program 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 General Public License for more details. -# -# Swap glibc on the fly. -# -# If we're on a running system we have to handle this _very_ carefully. :-) -# The tricks involved here get trickier every time... - -# OK, now we have to be sure of a few things. First, you do have a 2.6 -# kernel running, right? - -if [ -r /proc/ksyms ]; then - echo "FATAL: you need to be running a 2.6.x kernel in order to upgrade" - echo "to this version of glibc." - echo - sleep 999 - exit 1 -fi - -# Next, stop using the /lib/ntpl libraries. These are now obsolete and -# will break the installation if present: -if [ -d lib/tls ]; then - mkdir -p lib/obsolete - mv lib/tls lib/obsolete -fi -if [ -x sbin/ldconfig ]; then - sbin/ldconfig -r . 2> /dev/null -fi - -# Install NPTL glibc libraries: -if [ -x /sbin/ldconfig -a -d lib/incoming ]; then # swap on the fly - # Try to protect with flock against another installpkg/removepkg running - # ldconfig while we're doing the on-the-fly install: - mkdir -p run/lock/pkgtools - ( flock 9 || exit 11 - # First create copies of the incoming libraries: - ( cd lib/incoming - for file in * ; do - if [ ! -r ../${file}.incoming ]; then - cp -a $file ../${file}.incoming - fi - done - ) - # Then switch to them all at once: - /sbin/ldconfig -l lib/*.incoming 2> /dev/null - # Remove old versions of the glibc libraries. If you really don't want to - # do this for some reason, create a file /etc/glibc-nowipe. - if [ ! -r etc/glibc-nowipe ]; then - ( cd lib - for INCOMING in incoming/*-* ; do - LIBPREFIX=$(basename $INCOMING | cut -f 1 -d -) - for LIBRARY in ${LIBPREFIX}-* ; do - # Don't remove the library if it ends in .incoming: - if [ "$(echo $LIBRARY | rev | cut -f 1 -d .)" = "gnimocni" ]; then - continue - fi - # Don't remove symlinks: - if [ -L $LIBRARY ]; then - continue - fi - rm -f $LIBRARY - done - done - ) - fi - # Finally, rename them and clean up: - ( cd lib - for file in *.incoming ; do - rm -f `basename $file .incoming` - cp -a $file `basename $file .incoming` - /sbin/ldconfig -l `basename $file .incoming` 2> /dev/null - rm -f $file - done - ) - ) 9> run/lock/pkgtools/ldconfig.lock -else # no ldconfig? This is a broken situation, but we will do what we can: - ( cd lib/incoming - for file in * ; do - cp -a $file .. - done - ) -fi -# Now, get rid of the temporary directory: -rm -rf lib/incoming -# Done installing NPTL glibc libraries. - -# Handle config files: -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} -config etc/profile.d/glibc.csh.new -config etc/profile.d/glibc.sh.new -# Clearly you already decided this issue. :-) -rm -f etc/profile.d/glibc.csh.new -rm -f etc/profile.d/glibc.sh.new - -# This block below *should* be dead code, but it's probably safer to leave it -# here as a fallback. It no longer has complete coverage of all the links -# that would be needed in /lib${LIBDIRSUFFIX}, but it covers enough that if -# we did fall back on this the machine would boot until it reached the boot -# time call to ldconfig, which would then take care of any missing links. -if [ ! -x /sbin/ldconfig ]; then -( cd lib ; rm -rf libm.so.6 ) -( cd lib ; ln -sf libm-@@VERSION@@.so libm.so.6 ) -( cd lib ; rm -rf libnss_files.so.2 ) -( cd lib ; ln -sf libnss_files-@@VERSION@@.so libnss_files.so.2 ) -( cd lib ; rm -rf libresolv.so.2 ) -( cd lib ; ln -sf libresolv-@@VERSION@@.so libresolv.so.2 ) -( cd lib ; rm -rf libutil.so.1 ) -( cd lib ; ln -sf libutil-@@VERSION@@.so libutil.so.1 ) -( cd lib ; rm -rf libnss_compat.so.2 ) -( cd lib ; ln -sf libnss_compat-@@VERSION@@.so libnss_compat.so.2 ) -( cd lib ; rm -rf libthread_db.so.1 ) -( cd lib ; ln -sf libthread_db-1.0.so libthread_db.so.1 ) -( cd lib ; rm -rf libnss_hesiod.so.2 ) -( cd lib ; ln -sf libnss_hesiod-@@VERSION@@.so libnss_hesiod.so.2 ) -( 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 ; rm -rf libBrokenLocale.so.1 ) -( cd lib ; ln -sf libBrokenLocale-@@VERSION@@.so libBrokenLocale.so.1 ) -( cd lib ; rm -rf ld-linux.so.2 ) -( cd lib ; ln -sf ld-@@VERSION@@.so ld-linux.so.2 ) -( cd lib ; rm -rf libdl.so.2 ) -( cd lib ; ln -sf libdl-@@VERSION@@.so libdl.so.2 ) -( cd lib ; rm -rf libnss_dns.so.2 ) -( cd lib ; ln -sf libnss_dns-@@VERSION@@.so libnss_dns.so.2 ) -( cd lib ; rm -rf libpthread.so.0 ) -( cd lib ; ln -sf libpthread-@@VERSION@@.so libpthread.so.0 ) -( cd lib ; rm -rf libc.so.6 ) -( cd lib ; ln -sf libc-@@VERSION@@.so libc.so.6 ) -( cd lib ; rm -rf librt.so.1 ) -( cd lib ; ln -sf librt-@@VERSION@@.so librt.so.1 ) -fi - diff --git a/testing/source/glibc/doinst.sh-glibc b/testing/source/glibc/doinst.sh-glibc deleted file mode 100644 index 2ed07ad0..00000000 --- a/testing/source/glibc/doinst.sh-glibc +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/sh -# Copyright (C) 2002, 2005 Slackware Linux, Inc. -# Copyright 2005, 2006, 2007, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program 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 General Public License for more details. -# -# Swap glibc on the fly. -# -# If we're on a running system we have to handle this _very_ carefully. :-) -# The tricks involved here get trickier every time... - -# OK, now we have to be sure of a few things. First, you do have a 2.6 -# kernel running, right? - -if [ -r /proc/ksyms ]; then - echo "FATAL: you need to be running a 2.6.x kernel in order to upgrade" - echo "to this version of glibc." - echo - sleep 999 - exit 1 -fi - -# Next, stop using the /lib/ntpl libraries. These are now obsolete and -# will break the installation if present: -if [ -d lib/tls ]; then - mkdir -p lib/obsolete - mv lib/tls lib/obsolete -fi -if [ -x sbin/ldconfig ]; then - sbin/ldconfig -r . 2> /dev/null -fi - -# Install NPTL glibc libraries: -if [ -x /sbin/ldconfig -a -d lib/incoming ]; then # swap on the fly - # Try to protect with flock against another installpkg/removepkg running - # ldconfig while we're doing the on-the-fly install: - mkdir -p run/lock/pkgtools - ( flock 9 || exit 11 - # First create copies of the incoming libraries: - ( cd lib/incoming - for file in * ; do - if [ ! -r ../${file}.incoming ]; then - cp -a $file ../${file}.incoming - fi - done - ) - # Then switch to them all at once: - /sbin/ldconfig -l lib/*.incoming 2> /dev/null - # Remove old versions of the glibc libraries. If you really don't want to - # do this for some reason, create a file /etc/glibc-nowipe. - if [ ! -r etc/glibc-nowipe ]; then - ( cd lib - for INCOMING in incoming/*-* ; do - LIBPREFIX=$(basename $INCOMING | cut -f 1 -d -) - for LIBRARY in ${LIBPREFIX}-* ; do - # Don't remove the library if it ends in .incoming: - if [ "$(echo $LIBRARY | rev | cut -f 1 -d .)" = "gnimocni" ]; then - continue - fi - # Don't remove symlinks: - if [ -L $LIBRARY ]; then - continue - fi - rm -f $LIBRARY - done - done - ) - fi - # Finally, rename them and clean up: - ( cd lib - for file in *.incoming ; do - rm -f `basename $file .incoming` - cp -a $file `basename $file .incoming` - /sbin/ldconfig -l `basename $file .incoming` 2> /dev/null - rm -f $file - done - ) - ) 9> run/lock/pkgtools/ldconfig.lock -else # no ldconfig? This is a broken situation, but we will do what we can: - ( cd lib/incoming - for file in * ; do - cp -a $file .. - done - ) -fi -# Now, get rid of the temporary directory: -rm -rf lib/incoming -# Done installing NPTL glibc libraries. - -# Handle config files: -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} -config etc/nscd.conf.new -config etc/profile.d/glibc.csh.new -config etc/profile.d/glibc.sh.new -# Clearly you already decided this issue. :-) -rm -f etc/profile.d/glibc.csh.new -rm -f etc/profile.d/glibc.sh.new - -# This block below *should* be dead code, but it's probably safer to leave it -# here as a fallback. It no longer has complete coverage of all the links -# that would be needed in /lib${LIBDIRSUFFIX}, but it covers enough that if -# we did fall back on this the machine would boot until it reached the boot -# time call to ldconfig, which would then take care of any missing links. -# In case there's no ldconfig, make the links manually: -if [ ! -x /sbin/ldconfig ]; then -( cd lib ; rm -rf libm.so.6 ) -( cd lib ; ln -sf libm-@@VERSION@@.so libm.so.6 ) -( cd lib ; rm -rf libnss_files.so.2 ) -( cd lib ; ln -sf libnss_files-@@VERSION@@.so libnss_files.so.2 ) -( cd lib ; rm -rf libresolv.so.2 ) -( cd lib ; ln -sf libresolv-@@VERSION@@.so libresolv.so.2 ) -( cd lib ; rm -rf libutil.so.1 ) -( cd lib ; ln -sf libutil-@@VERSION@@.so libutil.so.1 ) -( cd lib ; rm -rf libnss_compat.so.2 ) -( cd lib ; ln -sf libnss_compat-@@VERSION@@.so libnss_compat.so.2 ) -( cd lib ; rm -rf libthread_db.so.1 ) -( cd lib ; ln -sf libthread_db-1.0.so libthread_db.so.1 ) -( cd lib ; rm -rf libnss_hesiod.so.2 ) -( cd lib ; ln -sf libnss_hesiod-@@VERSION@@.so libnss_hesiod.so.2 ) -( 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 ; rm -rf libBrokenLocale.so.1 ) -( cd lib ; ln -sf libBrokenLocale-@@VERSION@@.so libBrokenLocale.so.1 ) -( cd lib ; rm -rf ld-linux.so.2 ) -( cd lib ; ln -sf ld-@@VERSION@@.so ld-linux.so.2 ) -( cd lib ; rm -rf libdl.so.2 ) -( cd lib ; ln -sf libdl-@@VERSION@@.so libdl.so.2 ) -( cd lib ; rm -rf libnss_dns.so.2 ) -( cd lib ; ln -sf libnss_dns-@@VERSION@@.so libnss_dns.so.2 ) -( cd lib ; rm -rf libpthread.so.0 ) -( cd lib ; ln -sf libpthread-@@VERSION@@.so libpthread.so.0 ) -( cd lib ; rm -rf libc.so.6 ) -( cd lib ; ln -sf libc-@@VERSION@@.so libc.so.6 ) -( cd lib ; rm -rf librt.so.1 ) -( cd lib ; ln -sf librt-@@VERSION@@.so librt.so.1 ) -fi - -# More links: diff --git a/testing/source/glibc/glibc-2.32.en_US.no.am.pm.date.format.diff b/testing/source/glibc/glibc-2.32.en_US.no.am.pm.date.format.diff deleted file mode 100644 index 5ca84bca..00000000 --- a/testing/source/glibc/glibc-2.32.en_US.no.am.pm.date.format.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- ./localedata/locales/en_US.orig 2021-01-16 18:40:31.050990981 -0600 -+++ ./localedata/locales/en_US 2021-01-16 18:42:44.784983583 -0600 -@@ -121,7 +121,10 @@ - % different from d_t_fmt for historical reasons and has been different - % since 2000 when date_fmt was added as a GNU extension. At the end - % of 2018 it was adjusted to use 12H time (bug 24046) instead of 24H. --date_fmt "%a %b %e %r %Z %Y" -+% [ Slackware editor's note - no thank you, US users -+% of UNIX-like systems expect a 24 hour clock, just -+% like users in the vast majority of other locales. ] -+%date_fmt "%a %d %b %Y %r %Z" - % - % Strings for AM/PM - % diff --git a/testing/source/glibc/glibc-c-utf8-locale.patch b/testing/source/glibc/glibc-c-utf8-locale.patch deleted file mode 100644 index 7fabf303..00000000 --- a/testing/source/glibc/glibc-c-utf8-locale.patch +++ /dev/null @@ -1,270 +0,0 @@ -From 2eda7b462b415105f5a05c1323372d4e39d46439 Mon Sep 17 00:00:00 2001 -From: Mike FABIAN <mfabian@redhat.com> -Date: Mon, 10 Aug 2015 15:58:12 +0200 -Subject: [PATCH] Add a C.UTF-8 locale - ---- - localedata/SUPPORTED | 1 + - localedata/locales/C | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 239 insertions(+) - create mode 100644 localedata/locales/C - -diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED -index 8ca023e..2a78391 100644 ---- a/localedata/SUPPORTED -+++ b/localedata/SUPPORTED -@@ -1,6 +1,7 @@ - # This file names the currently supported and somewhat tested locales. - # If you have any additions please file a glibc bug report. - SUPPORTED-LOCALES=\ -+C.UTF-8/UTF-8 \ - aa_DJ.UTF-8/UTF-8 \ - aa_DJ/ISO-8859-1 \ - aa_ER/UTF-8 \ -diff --git a/localedata/locales/C b/localedata/locales/C -new file mode 100644 -index 0000000..fdf460e ---- /dev/null -+++ b/localedata/locales/C -@@ -0,0 +1,238 @@ -+escape_char / -+comment_char % -+% Locale for C locale in UTF-8 -+ -+LC_IDENTIFICATION -+title "C locale" -+source "" -+address "" -+contact "" -+email "mfabian@redhat.com" -+tel "" -+fax "" -+language "C" -+territory "" -+revision "1.0" -+date "2015-08-10" -+% -+category "i18n:2012";LC_IDENTIFICATION -+category "i18n:2012";LC_CTYPE -+category "i18n:2012";LC_COLLATE -+category "i18n:2012";LC_TIME -+category "i18n:2012";LC_NUMERIC -+category "i18n:2012";LC_MONETARY -+category "i18n:2012";LC_MESSAGES -+category "i18n:2012";LC_PAPER -+category "i18n:2012";LC_NAME -+category "i18n:2012";LC_ADDRESS -+category "i18n:2012";LC_TELEPHONE -+category "i18n:2012";LC_MEASUREMENT -+END LC_IDENTIFICATION -+ -+LC_CTYPE -+copy "i18n" -+ -+translit_start -+include "translit_combining";"" -+translit_end -+ -+END LC_CTYPE -+ -+LC_COLLATE -+order_start forward -+<U0000> -+.. -+<UFFFF> -+<U10000> -+.. -+<U1FFFF> -+<U20000> -+.. -+<U2FFFF> -+<UE0000> -+.. -+<UEFFFF> -+<UF0000> -+.. -+<UFFFFF> -+<U100000> -+.. -+<U10FFFF> -+UNDEFINED -+order_end -+END LC_COLLATE -+ -+LC_MONETARY -+% This is the 14652 i18n fdcc-set definition for -+% the LC_MONETARY category -+% (except for the int_curr_symbol and currency_symbol, they are empty in -+% the 14652 i18n fdcc-set definition and also empty in -+% glibc/locale/C-monetary.c. But localedef complains in that case). -+% -+% Using "USD" for int_curr_symbol. But maybe "XXX" would be better? -+% XXX is "No currency" (https://en.wikipedia.org/wiki/ISO_4217) -+int_curr_symbol "<U0055><U0053><U0044><U0020>" -+% Using "$" for currency_symbol. But maybe <U00A4> would be better? -+% U+00A4 is the "generic currency symbol" -+% (https://en.wikipedia.org/wiki/Currency_sign_%28typography%29) -+currency_symbol "<U0024>" -+mon_decimal_point "<U002E>" -+mon_thousands_sep "" -+mon_grouping -1 -+positive_sign "" -+negative_sign "<U002D>" -+int_frac_digits -1 -+frac_digits -1 -+p_cs_precedes -1 -+int_p_sep_by_space -1 -+p_sep_by_space -1 -+n_cs_precedes -1 -+int_n_sep_by_space -1 -+n_sep_by_space -1 -+p_sign_posn -1 -+n_sign_posn -1 -+% -+END LC_MONETARY -+ -+LC_NUMERIC -+% This is the POSIX Locale definition for -+% the LC_NUMERIC category. -+% -+decimal_point "<U002E>" -+thousands_sep "" -+grouping -1 -+END LC_NUMERIC -+ -+LC_TIME -+% This is the POSIX Locale definition for -+% the LC_TIME category. -+% -+% Abbreviated weekday names (%a) -+abday "<U0053><U0075><U006E>";"<U004D><U006F><U006E>";/ -+ "<U0054><U0075><U0065>";"<U0057><U0065><U0064>";/ -+ "<U0054><U0068><U0075>";"<U0046><U0072><U0069>";/ -+ "<U0053><U0061><U0074>" -+ -+% Full weekday names (%A) -+day "<U0053><U0075><U006E><U0064><U0061><U0079>";/ -+ "<U004D><U006F><U006E><U0064><U0061><U0079>";/ -+ "<U0054><U0075><U0065><U0073><U0064><U0061><U0079>";/ -+ "<U0057><U0065><U0064><U006E><U0065><U0073><U0064><U0061><U0079>";/ -+ "<U0054><U0068><U0075><U0072><U0073><U0064><U0061><U0079>";/ -+ "<U0046><U0072><U0069><U0064><U0061><U0079>";/ -+ "<U0053><U0061><U0074><U0075><U0072><U0064><U0061><U0079>" -+ -+% Abbreviated month names (%b) -+abmon "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/ -+ "<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/ -+ "<U004D><U0061><U0079>";"<U004A><U0075><U006E>";/ -+ "<U004A><U0075><U006C>";"<U0041><U0075><U0067>";/ -+ "<U0053><U0065><U0070>";"<U004F><U0063><U0074>";/ -+ "<U004E><U006F><U0076>";"<U0044><U0065><U0063>" -+ -+% Full month names (%B) -+mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/ -+ "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0079>";/ -+ "<U004D><U0061><U0072><U0063><U0068>";/ -+ "<U0041><U0070><U0072><U0069><U006C>";/ -+ "<U004D><U0061><U0079>";/ -+ "<U004A><U0075><U006E><U0065>";/ -+ "<U004A><U0075><U006C><U0079>";/ -+ "<U0041><U0075><U0067><U0075><U0073><U0074>";/ -+ "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/ -+ "<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/ -+ "<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/ -+ "<U0044><U0065><U0063><U0065><U006D><U0062><U0065><U0072>" -+ -+% Week description, consists of three fields: -+% 1. Number of days in a week. -+% 2. Gregorian date that is a first weekday (19971130 for Sunday, 19971201 for Monday). -+% 3. The weekday number to be contained in the first week of the year. -+% -+% ISO 8601 conforming applications should use the values 7, 19971201 (a -+% Monday), and 4 (Thursday), respectively. -+week 7;19971201;4 -+first_weekday 1 -+first_workday 1 -+ -+% Appropriate date and time representation (%c) -+% "%a %b %e %H:%M:%S %Y" -+d_t_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0059>" -+ -+% Appropriate date representation (%x) -+% "%m/%d/%y" -+d_fmt "<U0025><U006D><U002F><U0025><U0064><U002F><U0025><U0079>" -+ -+% Appropriate time representation (%X) -+% "%H:%M:%S" -+t_fmt "<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>" -+ -+% Appropriate AM/PM time representation (%r) -+% "%I:%M:%S %p" -+t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070>" -+ -+% Equivalent of AM/PM (%p) "AM"/"PM" -+% -+am_pm "<U0041><U004D>";"<U0050><U004D>" -+ -+% Appropriate date representation (date(1)) "%a %b %e %H:%M:%S %Z %Y" -+date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A><U0020><U0025><U0059>" -+END LC_TIME -+ -+LC_MESSAGES -+% This is the POSIX Locale definition for -+% the LC_NUMERIC category. -+% -+yesexpr "<U005E><U005B><U0079><U0059><U005D>" -+noexpr "<U005E><U005B><U006E><U004E><U005D>" -+yesstr "<U0059><U0065><U0073>" -+nostr "<U004E><U006F>" -+END LC_MESSAGES -+ -+LC_PAPER -+% This is the ISO/IEC 14652 "i18n" definition for -+% the LC_PAPER category. -+% (A4 paper, this is also used in the built in C/POSIX -+% locale in glibc/locale/C-paper.c) -+height 297 -+width 210 -+END LC_PAPER -+ -+LC_NAME -+% This is the ISO/IEC 14652 "i18n" definition for -+% the LC_NAME category. -+% "%p%t%g%t%m%t%f" -+% (also used in the built in C/POSIX locale in glibc/locale/C-name.c) -+name_fmt "<U0025><U0070><U0025><U0074><U0025><U0067><U0025><U0074>/ -+<U0025><U006D><U0025><U0074><U0025><U0066>" -+END LC_NAME -+ -+LC_ADDRESS -+% This is the ISO/IEC 14652 "i18n" definition for -+% the LC_ADDRESS category. -+% "%a%N%f%N%d%N%b%N%s %h %e %r%N%C-%z %T%N%c%N" -+% (also used in the built in C/POSIX locale in glibc/locale/C-address.c) -+postal_fmt "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/ -+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/ -+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/ -+<U004E><U0025><U0043><U002D><U0025><U007A><U0020><U0025><U0054><U0025>/ -+<U004E><U0025><U0063><U0025><U004E>" -+END LC_ADDRESS -+ -+LC_TELEPHONE -+% This is the ISO/IEC 14652 "i18n" definition for -+% the LC_TELEPHONE category. -+% "+%c %a %l" -+tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ -+<U006C>" -+% (also used in the built in C/POSIX locale in glibc/locale/C-telephone.c) -+END LC_TELEPHONE -+ -+LC_MEASUREMENT -+% This is the ISO/IEC 14652 "i18n" definition for -+% the LC_MEASUREMENT category. -+% (same as in the built in C/POSIX locale in glibc/locale/C-measurement.c) -+%metric -+measurement 1 -+END LC_MEASUREMENT -+ --- -2.4.3 - diff --git a/testing/source/glibc/glibc-cvs-checkout.sh b/testing/source/glibc/glibc-cvs-checkout.sh deleted file mode 100755 index 022d0117..00000000 --- a/testing/source/glibc/glibc-cvs-checkout.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "The password below is \"anoncvs\":" -cvs -z 9 -d :pserver:anoncvs@sources.redhat.com:/cvs/glibc login -cvs -z 9 -d :pserver:anoncvs@sources.redhat.com:/cvs/glibc co libc diff --git a/testing/source/glibc/glibc.SlackBuild b/testing/source/glibc/glibc.SlackBuild deleted file mode 100755 index a2735943..00000000 --- a/testing/source/glibc/glibc.SlackBuild +++ /dev/null @@ -1,470 +0,0 @@ -#!/bin/bash - -# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -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:-1_testing} - -# I was considering disabling NSCD, but MoZes talked me out of it. :) -#DISABLE_NSCD=" --disable-nscd " - -# $ARCH may be preset, otherwise i586 compatibility with i686 binary -# structuring is the Slackware default. -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -# 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 -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "glibc-$VERSION-$ARCH-$BUILD.txz" - echo "glibc-i18n-$VERSION-$ARCH-$BUILD.txz" - echo "glibc-profile-$VERSION-$ARCH-$BUILD.txz" - echo "aaa_glibc-solibs-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -# Work around -Werror failure with gcc-10.2.0. -# NOTE: Until the next glibc release takes care of this issue, this will -# likely need to be updated with every new gcc release's version. Yes, we -# could pass --disable-werror by default, but I'd rather not just shove a -# stick in it like that. -if [ "$(gcc -dumpversion)" = "10.2.0" ]; then - if [ "$VERSION" = "2.30" ]; then - WERROR="--disable-werror" - fi -fi - -# I'll break this out as an option for fun :-) -case $ARCH in - i386) - OPTIMIZ="-O3 -march=i386 -mcpu=i686" - LIBDIRSUFFIX="" - ;; - i486) - OPTIMIZ="-O3 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" - ;; - i586) - OPTIMIZ="-O3 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" - ;; - i686) - OPTIMIZ="-O3 -march=i686" - LIBDIRSUFFIX="" - ;; - athlon) - OPTIMIZ="-O3 -march=athlon" - LIBDIRSUFFIX="" - ;; - s390) - OPTIMIZ="-O3" - LIBDIRSUFFIX="" - ;; - x86_64) - OPTIMIZ="-O3 -fPIC" - LIBDIRSUFFIX="64" - ;; - *) - OPTIMIZ="-O3" - LIBDIRSUFFIX="" - ;; -esac - -case $ARCH in - x86_64) - TARGET=${TARGET:-x86_64} - ;; - i586) - # This should be i586 for all 32-bit x86 arch: - TARGET=${TARGET:-i586} - ;; -esac - -# Hand off the $ARCH variable to $SLACKWARE_ARCH to avoid confusing glibc: -SLACKWARE_ARCH=$ARCH -unset ARCH - -CVSVER=${VERSION}${CHECKOUT} - -# NOTE!!! glibc needs to be built against the sanitized kernel headers, -# which will be installed under /usr/include by the kernel-headers package. -# Be sure the correct version of the headers package is installed BEFORE -# building glibc! - -TMP=${TMP:-/tmp} -mkdir -p $TMP - -# This function fixes a doinst.sh file for x86_64. -# With thanks to Fred Emmott. -fix_doinst() { - if [ "x$LIBDIRSUFFIX" = "x" ]; then - return; - fi; - # Fix "( cd usr/lib ;" occurrences - sed -i "s#lib ;#lib${LIBDIRSUFFIX} ;#" install/doinst.sh - # Fix "lib/" occurrences - sed -i "s#lib/#lib${LIBDIRSUFFIX}/#g" install/doinst.sh - # Fix "( cd lib" occurrences - sed -i "s#( cd lib\$#( cd lib${LIBDIRSUFFIX}#" install/doinst.sh - - if [ "$SLACKWARE_ARCH" = "x86_64" ]; then - sed -i 's#ld-linux.so.2#ld-linux-x86-64.so.2#' install/doinst.sh - fi -} - -# This is a patch function to put all glibc patches in the build script -# up near the top. -apply_patches() { - # Use old-style locale directories rather than a single (and strangely - # formatted) /usr/lib/locale/locale-archive file: - zcat $CWD/glibc.locale.no-archive.diff.gz | patch -p1 --verbose || exit 1 - # Support ru_RU.CP1251 locale: - zcat $CWD/glibc.ru_RU.CP1251.diff.gz | patch -p1 --verbose || exit 1 - # Add a C.UTF-8 locale: - zcat $CWD/glibc-c-utf8-locale.patch.gz | patch -p1 --verbose || exit 1 - # Don't use AM/PM format for date(1). That's just plain crazy. - zcat $CWD/glibc-2.32.en_US.no.am.pm.date.format.diff.gz | patch -p1 --verbose || exit 1 - # Other regression fixes from git: - for git_patch in $CWD/patches/*.patch.gz ; do - zcat $git_patch | patch -p1 --verbose || exit 1 - done -} - -# This is going to be the initial $DESTDIR: -export PKG=$TMP/package-glibc-incoming-tree -PGLIBC=$TMP/package-glibc -PSOLIBS=$TMP/package-aaa_glibc-solibs -PI18N=$TMP/package-glibc-i18n -PPROFILE=$TMP/package-glibc-profile -PDEBUG=$TMP/package-glibc-debug - -# Empty these locations first: -for dir in $PKG $PGLIBC $PSOLIBS $PZONE $PI18N $PPROFILE $PDEBUG ; do - if [ -d $dir ]; then - rm -rf $dir - fi - mkdir -p $dir -done -if [ -d $TMP/glibc-$VERSION ]; then - rm -rf $TMP/glibc-$VERSION -fi - -# Create an incoming directory structure for glibc to be built into: -mkdir -p $PKG/lib${LIBDIRSUFFIX} -mkdir -p $PKG/sbin -mkdir -p $PKG/usr/bin -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} -mkdir -p $PKG/usr/sbin -mkdir -p $PKG/usr/include -mkdir -p $PKG/usr/doc -mkdir -p $PKG/usr/man -mkdir -p $PKG/usr/share -mkdir -p $PKG/var/db/nscd -mkdir -p $PKG/var/run/nscd - -# Begin extract/compile: -cd $TMP -rm -rf glibc-$CVSVER -tar xvf $CWD/glibc-$CVSVER.tar.xz \ - || tar xvf $CWD/glibc-$CVSVER.tar.lz \ - || tar xvf $CWD/glibc-$CVSVER.tar.bz2 \ - || tar xvf $CWD/glibc-$CVSVER.tar.gz -cd glibc-$CVSVER - -# Apply patches; exit if any fail. -apply_patches -if [ ! $? = 0 ]; then - exit 1 -fi - -# Clean up leftover CVS directories: -find . -type d -name CVS -exec rm -r {} \+ 2> /dev/null - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -# Make build directory: -mkdir build-glibc-$VERSION -cd build-glibc-$VERSION || exit 1 - -echo "BUILDING DAS NPTL GLIBC" -# We are setting the variable below so that x86 ISA level is not included -# in shared libraries. Without this, glibc compiled with -march= may not -# run on some CPUs that it should be able to support. Needed for glibc-2.33. -# FIXME: revisit this with future glibc releases! -libc_cv_include_x86_isa_level=no \ -CFLAGS="-g $OPTIMIZ" \ -../configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-kernel=2.6.32 \ - --with-headers=/usr/include \ - --enable-add-ons \ - --enable-profile \ - $DISABLE_NSCD \ - $WERROR \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --with-tls \ - --with-__thread \ - --without-cvs \ - $TARGET-slackware-linux - -make $NUMJOBS || exit 1 -make $NUMJOBS install install_root=$PKG || exit 1 -# Don't use this, as it makes the i18n package WAY bigger: -#make localedata/install-locale-files DESTDIR=$PKG || exit 1 -# This is ugly run in parallel, and seems to hang at the end. But it actually -# completes much faster. :) -make $NUMJOBS localedata/install-locales install_root=$PKG DESTDIR=$PKG || exit 1 - -# 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 -( cd $PKG/bin ; ln -sf /sbin/sln sln ) - -# This bit was mostly copped from Fedora Rawhide's .spec file. I'm not -# entirely sure how important it is, since I'm not aware of anything -# we ship trying to link libpthread as static. What it does is make sure -# that anything linking libpthread static includes all of the functions -# so that the resulting binary doesn't rely on parts of the library that -# were not linked in. Optimizing actually working over binary size, so -# to speak. -( cd $PKG/usr/lib${LIBDIRSUFFIX} - gcc -r -nostdlib -o libpthread.o -Wl,--whole-archive ./libpthread.a - rm libpthread.a - ar rcs libpthread.a libpthread.o - rm libpthread.o -) - -# The prevailing standard seems to be putting unstripped libraries in -# /usr/lib/debug/ and stripping the debugging symbols from all the other -# libraries. -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/debug -cp -a $PKG/lib${LIBDIRSUFFIX}/l*.so* $PKG/usr/lib${LIBDIRSUFFIX}/debug -cp -a $PKG/usr/lib${LIBDIRSUFFIX}/*.a $PKG/usr/lib${LIBDIRSUFFIX}/debug -# Don't need debug+profile: -( cd $PKG/usr/lib${LIBDIRSUFFIX}/debug ; rm -f *_p.* ) -# NOTE: Is there really a reason for the glibc-debug package? -# If you're debugging glibc, you can also compile it, right? - -## COMMENTED OUT: There's no reason for profile libs to include -g information. -## Put back unstripped profiling libraries: -#mv $PKG/usr/lib${LIBDIRSUFFIX}/debug/*_p.a $PKG/usr/lib${LIBDIRSUFFIX} -# It might be best to put the unstripped and profiling libraries in glibc-debug and glibc-profile. - -# I don't think "strip -g" causes the pthread problems. It's --strip-unneeded that does. -strip -g $PKG/lib${LIBDIRSUFFIX}/l*.so* -strip -g $PKG/usr/lib${LIBDIRSUFFIX}/l*.so* -strip -g $PKG/usr/lib${LIBDIRSUFFIX}/lib*.a - -# Remove the rquota.x and rquota.h include files, as they are provided by -# the quota package: -rm -f $PKG/usr/include/rpcsvc/rquota.{h,x} - -# Back to the sources dir to add some files/docs: -cd $TMP/glibc-$CVSVER - -# We'll automatically install the config file for the Name Server Cache Daemon. -# Perhaps this should also have some commented-out startup code in rc.inet2... -mkdir -p $PKG/etc -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* \ - $PKG/usr/doc/glibc-$VERSION -) - -# Trim the NEWS file to omit ancient history: -if [ -r NEWS ]; then - DOCSDIR=$(echo $PKG/usr/doc/glibc-$VERSION) - cat NEWS | head -n 1000 > $DOCSDIR/NEWS - touch -r NEWS $DOCSDIR/NEWS -fi - -# OK, there are some very old Linux standards that say that any binaries in a /bin or -# /sbin directory (and the directories themselves) should be group bin rather than -# group root, unless a specific group is really needed for some reason. -# -# I can't find any mention of this in more recent standards docs, and always thought -# that it was pretty cosmetic anyway (hey, if there's a reason -- fill me in!), so -# it's possible that this ownership change won't be followed in the near future -# (it's a PITA, and causes many bug reports when the perms change is occasionally -# forgotten). -# -# But, it's hard to get me to break old habits, so we'll continue the tradition here: -# -# No, no we won't. You know how we love to break traditions. - -# Strip most binaries: -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null - 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/* - -# This is junk -rm $PKG/etc/ld.so.cache -( cd $PKG - find . -name "*.orig" -exec rm {} \+ -) - -################################## -# OK, time to make some packages # -################################## - -# glibc-profile: -cd $PPROFILE -mkdir -p usr/lib${LIBDIRSUFFIX} -# Might as well just grab these with 'mv' to simplify things later: -mv $PKG/usr/lib${LIBDIRSUFFIX}/lib*_p.a usr/lib${LIBDIRSUFFIX} -# Profile libs should be stripped. Use the debug libs to debug... -( cd usr/lib${LIBDIRSUFFIX} ; strip -g *.a ) -mkdir install -cp -a $CWD/slack-desc.glibc-profile install/slack-desc -makepkg -l y -c n $TMP/glibc-profile-$VERSION-$SLACKWARE_ARCH-$BUILD.txz - -# THIS IS NO LONGER PACKAGED (or is it? might be better to let it be made, and then ship it or not...) -# glibc-debug: -cd $PDEBUG -mkdir -p usr/lib${LIBDIRSUFFIX} -# Might as well just grab these with 'mv' to simplify things later: -mv $PKG/usr/lib${LIBDIRSUFFIX}/debug usr/lib${LIBDIRSUFFIX} -mkdir install -cp -a $CWD/slack-desc.glibc-debug install/slack-desc -## Don't package this: -#makepkg -l y -c n $TMP/glibc-debug-$VERSION-$SLACKWARE_ARCH-$BUILD.txz -## INSTEAD, NUKE THESE LIBS -#rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/debug - -# glibc-i18n: -cd $PI18N -mkdir -p usr/lib${LIBDIRSUFFIX}/locale -mv $PKG/usr/lib${LIBDIRSUFFIX}/locale/* usr/lib${LIBDIRSUFFIX}/locale -mkdir -p usr/share/{i18n,locale} -mv $PKG/usr/share/i18n/* usr/share/i18n -mv $PKG/usr/share/locale/* usr/share/locale -# Leave copies of the C, POSIX, and en_US locales in the main glibc package: -cp -a usr/lib${LIBDIRSUFFIX}/locale/{C,en_US}* $PKG/usr/lib${LIBDIRSUFFIX}/locale -mkdir -p $PKG/usr/share/i18n/locales -cp -a usr/share/i18n/locales/{C,POSIX,en_US} $PKG/usr/share/i18n/locales -mkdir install -cp -a $CWD/slack-desc.glibc-i18n install/slack-desc -makepkg -l y -c n $TMP/glibc-i18n-$VERSION-$SLACKWARE_ARCH-$BUILD.txz - -# aaa_glibc-solibs: -cd $PSOLIBS -mkdir -p etc/profile.d -cp -a $CWD/profile.d/* etc/profile.d -chown -R root:root etc -chmod 755 etc/profile.d/* -mkdir -p lib${LIBDIRSUFFIX} -cp -a $PKG/lib${LIBDIRSUFFIX}/* lib${LIBDIRSUFFIX} -( cd lib${LIBDIRSUFFIX} - mkdir incoming - mv *so* incoming - mv incoming/libSegFault.so . -) -mkdir -p usr -cp -a $PKG/usr/bin usr -mv usr/bin/ldd . -rm usr/bin/* -mv ldd usr/bin -mkdir -p usr/lib${LIBDIRSUFFIX} -# The gconv directory has a lot of stuff, but including it here will save some problems. -# Seems standard elsewhere. -cp -a $PKG/usr/lib${LIBDIRSUFFIX}/gconv usr/lib${LIBDIRSUFFIX} -mkdir -p usr/libexec -cp -a $PKG/usr/libexec/pt_chown usr/libexec -# Same usr.bin deal: -cp -a $PKG/sbin . -mv sbin/ldconfig . -rm sbin/* -mv ldconfig sbin -mkdir install -cp -a $CWD/slack-desc.aaa_glibc-solibs install/slack-desc -cp -a $CWD/doinst.sh-aaa_glibc-solibs 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 -# Only scrub the links in /lib{,64} that will be created by ldconfig: -find lib${LIBDIRSUFFIX} -type l -exec rm {} \+ -# Build the package: -makepkg -l y -c n $TMP/aaa_glibc-solibs-$VERSION-$SLACKWARE_ARCH-$BUILD.txz - -# And finally, the complete "all-in-one" glibc package is created -# from whatever was leftover: -cd $PGLIBC -mv $PKG/* . -mkdir -p etc/profile.d -cp -a $CWD/profile.d/* etc/profile.d -chown -R root:root etc -chmod 755 etc/profile.d/* -# Only scrub the links in /lib{,64} that will be created by ldconfig: -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/libSegFault.so . -) -# Build the package: -/sbin/makepkg -l y -c n $TMP/glibc-$VERSION-$SLACKWARE_ARCH-$BUILD.txz - -# Done! -echo -echo "glibc packages built in $TMP!" diff --git a/testing/source/glibc/glibc.locale.no-archive.diff b/testing/source/glibc/glibc.locale.no-archive.diff deleted file mode 100644 index 173bafc7..00000000 --- a/testing/source/glibc/glibc.locale.no-archive.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./localedata/Makefile.orig 2019-02-16 14:05:01.794154302 -0600 -+++ ./localedata/Makefile 2019-02-16 14:06:25.744146460 -0600 -@@ -413,6 +413,7 @@ - echo -n '...'; \ - input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ - $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \ -+ --no-archive \ - -i locales/$$input -f charmaps/$$charset \ - $(addprefix --prefix=,$(install_root)) $$locale \ - && echo ' done'; diff --git a/testing/source/glibc/glibc.ru_RU.CP1251.diff b/testing/source/glibc/glibc.ru_RU.CP1251.diff deleted file mode 100644 index 376cf76a..00000000 --- a/testing/source/glibc/glibc.ru_RU.CP1251.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./localedata/SUPPORTED.orig 2005-07-17 20:50:35.000000000 -0500 -+++ ./localedata/SUPPORTED 2006-08-22 01:33:09.000000000 -0500 -@@ -270,6 +270,7 @@ - ro_RO/ISO-8859-2 \ - ru_RU.KOI8-R/KOI8-R \ - ru_RU.UTF-8/UTF-8 \ -+ru_RU.CP1251/CP1251 \ - ru_RU/ISO-8859-5 \ - ru_UA.UTF-8/UTF-8 \ - ru_UA/KOI8-U \ diff --git a/testing/source/glibc/patches/0001-nsswitch-return-result-when-nss-database-is-locked.patch b/testing/source/glibc/patches/0001-nsswitch-return-result-when-nss-database-is-locked.patch deleted file mode 100644 index 45836925..00000000 --- a/testing/source/glibc/patches/0001-nsswitch-return-result-when-nss-database-is-locked.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c3479fb7939898ec22c655c383454d6e8b982a67 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Fri, 5 Feb 2021 07:32:18 +0000 -Subject: [PATCH] nsswitch: return result when nss database is locked [BZ - #27343] - -Before the change nss_database_check_reload_and_get() did not populate -the '*result' value when it returned success in a case of chroot -detection. This caused initgroups() to use garage pointer in the -following test (extracted from unbound): - -``` - -int main() { - // load some NSS modules - struct passwd * pw = getpwnam("root"); - - chdir("/tmp"); - chroot("/tmp"); - chdir("/"); - // access nsswitch.conf in a chroot - initgroups("root", 0); -} -``` - -Reviewed-by: DJ Delorie <dj@redhat.com> ---- - nss/nss_database.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/nss/nss_database.c b/nss/nss_database.c -index cf0306adc4..e1bef6bd75 100644 ---- a/nss/nss_database.c -+++ b/nss/nss_database.c -@@ -398,8 +398,9 @@ nss_database_check_reload_and_get (struct nss_database_state *local, - && (str.st_ino != local->root_ino - || str.st_dev != local->root_dev))) - { -- /* Change detected; disable reloading. */ -+ /* Change detected; disable reloading and return current state. */ - atomic_store_release (&local->data.reload_disabled, 1); -+ *result = local->data.services[database_index]; - __libc_lock_unlock (local->lock); - __nss_module_disable_loading (); - return true; --- -2.27.0 diff --git a/testing/source/glibc/profile.d/glibc.csh.new b/testing/source/glibc/profile.d/glibc.csh.new deleted file mode 100755 index 1f33e966..00000000 --- a/testing/source/glibc/profile.d/glibc.csh.new +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/csh -# Set more relaxed (glibc-2.3.5 like) malloc() checking. -# -# This relaxes the default paranoia level so that it reports -# bugs, but does not kill the questionable process. You can -# get away with running broken programs with this setting, -# but at a possible performance and security cost. -# -#setenv MALLOC_CHECK_ 1 diff --git a/testing/source/glibc/profile.d/glibc.sh.new b/testing/source/glibc/profile.d/glibc.sh.new deleted file mode 100755 index 979f4879..00000000 --- a/testing/source/glibc/profile.d/glibc.sh.new +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# Set more relaxed (glibc-2.3.5 like) malloc() checking. -# -# This relaxes the default paranoia level so that it reports -# bugs, but does not kill the questionable process. You can -# get away with running broken programs with this setting, -# but at a possible performance and security cost. -#export MALLOC_CHECK_=1 diff --git a/testing/source/glibc/slack-desc.aaa_glibc-solibs b/testing/source/glibc/slack-desc.aaa_glibc-solibs deleted file mode 100644 index 1604bace..00000000 --- a/testing/source/glibc/slack-desc.aaa_glibc-solibs +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -aaa_glibc-solibs: aaa_glibc-solibs (shared GNU C libraries) -aaa_glibc-solibs: -aaa_glibc-solibs: This package contains the shared libraries, binaries, and support -aaa_glibc-solibs: files required to run most Linux applications linked with glibc. -aaa_glibc-solibs: -aaa_glibc-solibs: -aaa_glibc-solibs: -aaa_glibc-solibs: -aaa_glibc-solibs: -aaa_glibc-solibs: -aaa_glibc-solibs: diff --git a/testing/source/glibc/slack-desc.glibc b/testing/source/glibc/slack-desc.glibc deleted file mode 100644 index 63992d6b..00000000 --- a/testing/source/glibc/slack-desc.glibc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -glibc: glibc (GNU C libraries) -glibc: -glibc: This package contains the GNU C libraries and header files. You'll -glibc: need this package to compile programs. -glibc: -glibc: The GNU C library was originally authored by Roland McGrath. -glibc: -glibc: Homepage: https://www.gnu.org/software/libc/ -glibc: -glibc: -glibc: diff --git a/testing/source/glibc/slack-desc.glibc-debug b/testing/source/glibc/slack-desc.glibc-debug deleted file mode 100644 index 8cb64d59..00000000 --- a/testing/source/glibc/slack-desc.glibc-debug +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -glibc-debug: glibc-debug (GNU C libraries with debugging symbols) -glibc-debug: -glibc-debug: This package contains versions of the GNU C libraries with debugging -glibc-debug: information. These are needed only if you wish to be able to step -glibc-debug: through C library routines while debugging programs. Most debugging -glibc-debug: efforts will not require these. -glibc-debug: To use these libraries, set LD_LIBRARY_PATH when calling the debugger: -glibc-debug: LD_LIBRARY_PATH=/usr/lib/debug gdb <executable> -glibc-debug: -glibc-debug: Or, use this approach if you need to debug a setuid binary: -glibc-debug: su user -c "LD_LIBRARY_PATH=/usr/lib/debug gdb <executable>" diff --git a/testing/source/glibc/slack-desc.glibc-i18n b/testing/source/glibc/slack-desc.glibc-i18n deleted file mode 100644 index a697bc3d..00000000 --- a/testing/source/glibc/slack-desc.glibc-i18n +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -glibc-i18n: glibc-i18n (locale files from glibc) -glibc-i18n: -glibc-i18n: These files go in /usr/lib/locale, /usr/share/i18n/, and -glibc-i18n: /usr/share/locale/ to provide internationalization support. -glibc-i18n: You'll need this package unless you will be using US English only. -glibc-i18n: -glibc-i18n: -glibc-i18n: -glibc-i18n: -glibc-i18n: -glibc-i18n: diff --git a/testing/source/glibc/slack-desc.glibc-profile b/testing/source/glibc/slack-desc.glibc-profile deleted file mode 100644 index 4b4100e0..00000000 --- a/testing/source/glibc/slack-desc.glibc-profile +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -glibc-profile: glibc-profile (GNU C libraries with profiling support) -glibc-profile: -glibc-profile: This package contains static versions of the GNU C libraries with -glibc-profile: support for profiling binaries using gprof. gprof calculates how -glibc-profile: much time a program spends in each routine which can suggest where -glibc-profile: to concentrate efforts to improve performance. -glibc-profile: -glibc-profile: See the gprof man page for more details. -glibc-profile: -glibc-profile: -glibc-profile: |