summaryrefslogtreecommitdiff
path: root/source/l/glibc
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-01-20 03:08:10 +0000
committerEric Hameleers <alien@slackware.com>2021-01-20 08:59:50 +0100
commitcc9d4b4c4dc0c973528cc4645d8d68082e0a140a (patch)
tree28012cf63e64636c7b981de2b2f17f35e39fc4f0 /source/l/glibc
parentaddce63adb18aea9025ba1e08d04ccbd22e3cb98 (diff)
downloadcurrent-cc9d4b4c4dc0c973528cc4645d8d68082e0a140a.tar.gz
Wed Jan 20 03:08:10 UTC 202120210120030810
a/btrfs-progs-5.10-x86_64-1.txz: Upgraded. a/dialog-1.3_20210117-x86_64-1.txz: Upgraded. a/glibc-solibs-2.32-x86_64-1.txz: Upgraded. a/kernel-firmware-20210119_0578970-noarch-1.txz: Upgraded. a/kernel-generic-5.10.9-x86_64-1.txz: Upgraded. a/kernel-huge-5.10.9-x86_64-1.txz: Upgraded. a/kernel-modules-5.10.9-x86_64-1.txz: Upgraded. d/gcc-10.2.0-x86_64-3.txz: Rebuilt. d/gcc-brig-10.2.0-x86_64-3.txz: Rebuilt. d/gcc-g++-10.2.0-x86_64-3.txz: Rebuilt. d/gcc-gdc-10.2.0-x86_64-3.txz: Rebuilt. d/gcc-gfortran-10.2.0-x86_64-3.txz: Rebuilt. d/gcc-gnat-10.2.0-x86_64-3.txz: Rebuilt. d/gcc-go-10.2.0-x86_64-3.txz: Rebuilt. d/gcc-objc-10.2.0-x86_64-3.txz: Rebuilt. d/help2man-1.47.17-x86_64-1.txz: Upgraded. d/kernel-headers-5.10.9-x86-1.txz: Upgraded. d/rust-1.49.0-x86_64-1.txz: Upgraded. k/kernel-source-5.10.9-noarch-1.txz: Upgraded. kde/krita-4.4.2-x86_64-1.txz: Upgraded. l/glibc-2.32-x86_64-1.txz: Upgraded. l/glibc-i18n-2.32-x86_64-1.txz: Upgraded. l/glibc-profile-2.32-x86_64-1.txz: Upgraded. n/dnsmasq-2.83-x86_64-1.txz: Upgraded. n/openldap-2.4.57-x86_64-1.txz: Upgraded. xap/mozilla-firefox-78.6.1esr-x86_64-2.txz: Rebuilt. xap/mozilla-thunderbird-78.6.1-x86_64-2.txz: Rebuilt. xap/seamonkey-2.53.5.1-x86_64-2.txz: Rebuilt. xap/xaos-4.2.1-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l/glibc')
-rw-r--r--source/l/glibc/glibc-2.29.en_US.no.am.pm.date.format.diff14
-rw-r--r--source/l/glibc/glibc-2.32.en_US.no.am.pm.date.format.diff14
-rwxr-xr-xsource/l/glibc/glibc.SlackBuild6
-rw-r--r--source/l/glibc/patches/glibc.8a80ee5e2bab17a1f8e1e78fab5c33ac7efa8b29.patch40
-rw-r--r--source/l/glibc/patches/glibc.b0f6679bcd738ea244a14acd879d974901e56c8e.patch28
-rw-r--r--source/l/glibc/patches/glibc.b6d2c4475d5abc05dd009575b90556bdd3c78ad0.patch37
-rw-r--r--source/l/glibc/patches/glibc.e1df30fbc2e2167a982c0e77a7ebee28f4dd0800.patch50
7 files changed, 17 insertions, 172 deletions
diff --git a/source/l/glibc/glibc-2.29.en_US.no.am.pm.date.format.diff b/source/l/glibc/glibc-2.29.en_US.no.am.pm.date.format.diff
deleted file mode 100644
index 0a14ca3b..00000000
--- a/source/l/glibc/glibc-2.29.en_US.no.am.pm.date.format.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./localedata/locales/en_US.orig 2019-01-31 10:45:36.000000000 -0600
-+++ ./localedata/locales/en_US 2019-01-31 22:35:02.033009166 -0600
-@@ -118,7 +118,10 @@
- t_fmt_ampm "%I:%M:%S %p"
- %
- % Appropriate date and time representation for date(1)
--date_fmt "%a %d %b %Y %r %Z"
-+% [ 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/source/l/glibc/glibc-2.32.en_US.no.am.pm.date.format.diff b/source/l/glibc/glibc-2.32.en_US.no.am.pm.date.format.diff
new file mode 100644
index 00000000..5ca84bca
--- /dev/null
+++ b/source/l/glibc/glibc-2.32.en_US.no.am.pm.date.format.diff
@@ -0,0 +1,14 @@
+--- ./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/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild
index f00ad08b..7c5fcc7a 100755
--- a/source/l/glibc/glibc.SlackBuild
+++ b/source/l/glibc/glibc.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, MN, USA
+# 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
@@ -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:-2}
+BUILD=${BUILD:-1}
# I was considering disabling NSCD, but MoZes talked me out of it. :)
#DISABLE_NSCD=" --disable-nscd "
@@ -154,7 +154,7 @@ apply_patches() {
# 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.29.en_US.no.am.pm.date.format.diff.gz | patch -p1 --verbose || exit 1
+ 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
diff --git a/source/l/glibc/patches/glibc.8a80ee5e2bab17a1f8e1e78fab5c33ac7efa8b29.patch b/source/l/glibc/patches/glibc.8a80ee5e2bab17a1f8e1e78fab5c33ac7efa8b29.patch
deleted file mode 100644
index 2dbdbd9c..00000000
--- a/source/l/glibc/patches/glibc.8a80ee5e2bab17a1f8e1e78fab5c33ac7efa8b29.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8a80ee5e2bab17a1f8e1e78fab5c33ac7efa8b29 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Wed, 21 Aug 2019 09:25:22 -0700
-Subject: [PATCH] Fix bad pointer / leak in regex code
-
-This was found by Coverity (CID 1484201). [BZ#24844]
-* posix/regex_internal.c (create_cd_newstate): Fix use of bad
-pointer and/or memory leak when storage is exhausted.
-
-diff --git a/posix/regex_internal.c b/posix/regex_internal.c
-index 9004ce8..f53ded9 100644
---- a/posix/regex_internal.c
-+++ b/posix/regex_internal.c
-@@ -1716,15 +1716,19 @@ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
- {
- if (newstate->entrance_nodes == &newstate->nodes)
- {
-- newstate->entrance_nodes = re_malloc (re_node_set, 1);
-- if (__glibc_unlikely (newstate->entrance_nodes == NULL))
-+ re_node_set *entrance_nodes = re_malloc (re_node_set, 1);
-+ if (__glibc_unlikely (entrance_nodes == NULL))
- {
- free_state (newstate);
- return NULL;
- }
-+ newstate->entrance_nodes = entrance_nodes;
- if (re_node_set_init_copy (newstate->entrance_nodes, nodes)
- != REG_NOERROR)
-- return NULL;
-+ {
-+ free_state (newstate);
-+ return NULL;
-+ }
- nctx_nodes = 0;
- newstate->has_constraint = 1;
- }
---
-2.9.3
-
-
diff --git a/source/l/glibc/patches/glibc.b0f6679bcd738ea244a14acd879d974901e56c8e.patch b/source/l/glibc/patches/glibc.b0f6679bcd738ea244a14acd879d974901e56c8e.patch
deleted file mode 100644
index 24c22a39..00000000
--- a/source/l/glibc/patches/glibc.b0f6679bcd738ea244a14acd879d974901e56c8e.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b0f6679bcd738ea244a14acd879d974901e56c8e Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Thu, 1 Aug 2019 14:06:24 +0200
-Subject: [PATCH] malloc: Remove unwanted leading whitespace in malloc_info [BZ
- #24867]
-
-It was introduced in commit 6c8dbf00f536d78b1937b5af6f57be47fd376344
-("Reformat malloc to gnu style.").
-
-Reviewed-by: Carlos O'Donell <carlos@redhat.com>
-
-diff --git a/malloc/malloc.c b/malloc/malloc.c
-index 00ce48c..343d89f 100644
---- a/malloc/malloc.c
-+++ b/malloc/malloc.c
-@@ -5491,7 +5491,7 @@ __malloc_info (int options, FILE *fp)
-
- for (size_t i = 0; i < nsizes; ++i)
- if (sizes[i].count != 0 && i != NFASTBINS)
-- fprintf (fp, " \
-+ fprintf (fp, "\
- <size from=\"%zu\" to=\"%zu\" total=\"%zu\" count=\"%zu\"/>\n",
- sizes[i].from, sizes[i].to, sizes[i].total, sizes[i].count);
-
---
-2.9.3
-
-
diff --git a/source/l/glibc/patches/glibc.b6d2c4475d5abc05dd009575b90556bdd3c78ad0.patch b/source/l/glibc/patches/glibc.b6d2c4475d5abc05dd009575b90556bdd3c78ad0.patch
deleted file mode 100644
index b28c7943..00000000
--- a/source/l/glibc/patches/glibc.b6d2c4475d5abc05dd009575b90556bdd3c78ad0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b6d2c4475d5abc05dd009575b90556bdd3c78ad0 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
-Date: Thu, 8 Aug 2019 22:02:27 +0200
-Subject: [PATCH] malloc: Fix missing accounting of top chunk in malloc_info
- [BZ #24026]
-
-Fixes `<total type="rest" size="..."> incorrectly showing as 0 most
-of the time.
-
-The rest value being wrong is significant because to compute the
-actual amount of memory handed out via malloc, the user must subtract
-it from <system type="current" size="...">. That result being wrong
-makes investigating memory fragmentation issues like
-<https://bugzilla.redhat.com/show_bug.cgi?id=843478> close to
-impossible.
-
-diff --git a/malloc/malloc.c b/malloc/malloc.c
-index 343d89f..0e65d63 100644
---- a/malloc/malloc.c
-+++ b/malloc/malloc.c
-@@ -5406,6 +5406,12 @@ __malloc_info (int options, FILE *fp)
-
- __libc_lock_lock (ar_ptr->mutex);
-
-+ /* Account for top chunk. The top-most available chunk is
-+ treated specially and is never in any bin. See "initial_top"
-+ comments. */
-+ avail = chunksize (ar_ptr->top);
-+ nblocks = 1; /* Top always exists. */
-+
- for (size_t i = 0; i < NFASTBINS; ++i)
- {
- mchunkptr p = fastbin (ar_ptr, i);
---
-2.9.3
-
-
diff --git a/source/l/glibc/patches/glibc.e1df30fbc2e2167a982c0e77a7ebee28f4dd0800.patch b/source/l/glibc/patches/glibc.e1df30fbc2e2167a982c0e77a7ebee28f4dd0800.patch
deleted file mode 100644
index d5dabb4a..00000000
--- a/source/l/glibc/patches/glibc.e1df30fbc2e2167a982c0e77a7ebee28f4dd0800.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From e1df30fbc2e2167a982c0e77a7ebee28f4dd0800 Mon Sep 17 00:00:00 2001
-From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-Date: Thu, 25 Jul 2019 11:22:17 -0300
-Subject: [PATCH] Get new entropy on each attempt __gen_tempname (BZ #15813)
-
-This is missing bit for fully fix BZ#15813 (the other two were fixed
-by 359653aaacad463).
-
-Checked on x86_64-linux-gnu.
-
- [BZ #15813]
- sysdeps/posix/tempname.c (__gen_tempname): get entrypy on each
- attempt.
-
-diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c
-index de34694..310df3c 100644
---- a/sysdeps/posix/tempname.c
-+++ b/sysdeps/posix/tempname.c
-@@ -186,7 +186,6 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
- {
- int len;
- char *XXXXXX;
-- uint64_t value;
- unsigned int count;
- int fd = -1;
- int save_errno = errno;
-@@ -218,13 +217,13 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
- /* This is where the Xs start. */
- XXXXXX = &tmpl[len - 6 - suffixlen];
-
-- /* Get some more or less random data. */
-- RANDOM_BITS (value);
-- value ^= (uint64_t)__getpid () << 32;
--
-- for (count = 0; count < attempts; value += 7777, ++count)
-+ uint64_t pid = (uint64_t) __getpid () << 32;
-+ for (count = 0; count < attempts; ++count)
- {
-- uint64_t v = value;
-+ uint64_t v;
-+ /* Get some more or less random data. */
-+ RANDOM_BITS (v);
-+ v ^= pid;
-
- /* Fill in the random bits. */
- XXXXXX[0] = letters[v % 62];
---
-2.9.3
-
-