diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-04-06 22:20:49 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-04-06 22:24:13 +0200 |
| commit | e37595d9617658e3098b1d1b3f9f5d9aad4daf53 (patch) | |
| tree | fa1b033206bf5465779aeadec07a13e85cd5fccd /gnu/packages/patches/glibc-locale-incompatibility.patch | |
| parent | 61516a1613efd0e12afc83922b005e5218b3624a (diff) | |
| download | guix-e37595d9617658e3098b1d1b3f9f5d9aad4daf53.tar guix-e37595d9617658e3098b1d1b3f9f5d9aad4daf53.tar.gz | |
gnu: glibc: Update to 2.23.
* gnu/packages/base.scm (glibc): Update to 2.23. Remove
"glibc-locale-incompatibility.patch" and "glibc-CVE-2015-7547.patch",
now unneeded.
[arguments]: Add "libc_cv_ssp_strong=no" to #:configure-flags. Remove
now unneeded patching of 'configure'.
* gnu/packages/patches/glibc-CVE-2015-7547.patch: Remove.
* gnu/packages/patches/glibc-locale-incompatibility.patch: Remove.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/packages/patches/glibc-locale-incompatibility.patch')
| -rw-r--r-- | gnu/packages/patches/glibc-locale-incompatibility.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/gnu/packages/patches/glibc-locale-incompatibility.patch b/gnu/packages/patches/glibc-locale-incompatibility.patch deleted file mode 100644 index baf30a79a7..0000000000 --- a/gnu/packages/patches/glibc-locale-incompatibility.patch +++ /dev/null @@ -1,23 +0,0 @@ -This patch avoids an assertion failure when incompatible locale data -is encountered: - - https://sourceware.org/ml/libc-alpha/2015-09/msg00575.html - ---- glibc-2.22/locale/loadlocale.c 2015-09-22 17:16:02.321981548 +0200 -+++ glibc-2.22/locale/loadlocale.c 2015-09-22 17:17:34.814659064 +0200 -@@ -120,10 +120,11 @@ - _nl_value_type_LC_XYZ array. There are all pointers. */ - switch (category) - { --#define CATTEST(cat) \ -- case LC_##cat: \ -- assert (cnt < (sizeof (_nl_value_type_LC_##cat) \ -- / sizeof (_nl_value_type_LC_##cat[0]))); \ -+#define CATTEST(cat) \ -+ case LC_##cat: \ -+ if (cnt >= (sizeof (_nl_value_type_LC_##cat) \ -+ / sizeof (_nl_value_type_LC_##cat[0]))) \ -+ goto puntdata; \ - break - CATTEST (NUMERIC); - CATTEST (TIME); |