Date: Monday, October 12, 2015 @ 01:14:59
  Author: allan
Revision: 248901

upgpkg: glibc 2.22-4

pull upstream patchset

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc-2.22-roundup.patch

--------------------------+
 PKGBUILD                 |    6 
 glibc-2.22-roundup.patch |  439 ++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 438 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2015-10-11 23:07:53 UTC (rev 248900)
+++ PKGBUILD    2015-10-11 23:14:59 UTC (rev 248901)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.22
-pkgrel=3
+pkgrel=4
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc";
@@ -27,7 +27,7 @@
         locale-gen)
 md5sums=('e51e02bf552a0a1fbbdc948fb2f5e83c'
          'SKIP'
-         'b6b7a0e8d6e6520e40e3164ae773631d'
+         '8476d7f2bceaacde30ea2b9d4afb4bd1'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
 validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF')  # Carlos O'Donell
@@ -35,7 +35,7 @@
 prepare() {
   cd ${srcdir}/glibc-${pkgver}
 
-  # glibc-2.21..01b07c70
+  # glibc-2.21..g2b529a8
   patch -p1 -i $srcdir/glibc-2.22-roundup.patch
 
   mkdir ${srcdir}/glibc-build

Modified: glibc-2.22-roundup.patch
===================================================================
--- glibc-2.22-roundup.patch    2015-10-11 23:07:53 UTC (rev 248900)
+++ glibc-2.22-roundup.patch    2015-10-11 23:14:59 UTC (rev 248901)
@@ -1,8 +1,64 @@
 diff --git a/ChangeLog b/ChangeLog
-index cb9124e..d0d2cbd 100644
+index cb9124e..491d5c7 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,74 @@
+@@ -1,3 +1,130 @@
++2015-10-09  Carlos O'Donell  <car...@redhat.com>
++
++      [BZ #18589]
++      * string/bug-strcoll2.c: Adjust copyright, and remove contributed by.
++      * string/Makefile ($(objpfx)bug-strcoll2.out): Depend on
++      $(gen-locales).
++
++2015-10-08  Carlos O'Donell  <car...@redhat.com>
++
++      [BZ #18589]
++      * string/Makefile (tests): Add bug-strcoll2.
++      (LOCALES): Add cs_CZ.UTF-8.
++
++2015-09-28  Martin Sebor  <mse...@redhat.com>
++
++      [BZ #18969]
++      * string/Makefile (LOCALES): Define.
++      (gen-locales.mk): Include.
++      (test-strcasecmp.out, test-strncasecmp.out, tst-strxfrm.out)
++      (tst-strxfrm2.out): Add deppendency on $(gen-locales).
++      * string/tst-strxfrm2.c (do_test): Print the name of the locale
++      on setlocale failure.
++
++2015-10-08  Carlos O'Donell  <car...@redhat.com>
++
++      [BZ #18589]
++      * string/bug-strcoll2.c: New file.
++      * locale/categories.def: Revert commit
++      f13c2a8dff2329c6692a80176262ceaaf8a6f74e.
++      * locale/langinfo.h: Likewise.
++      * locale/localeinfo.h: Likewise.
++      * locale/C-collate.c: Likewise.
++      * programs/ld-collate.c (collate_output): Likewise.
++      * string/strcoll_l.c (STRDIFF): Likewise.
++      (STRCOLL): Likewise.
++      * wcsmbs/wcscoll_l.c: Likewise.
++
++2015-09-15  Roland McGrath  <rol...@hack.frob.com>
++
++      * misc/sys/param.h [!MAXHOSTNAMELEN && HOST_NAME_MAX]
++      (MAXHOSTNAMELEN): Define it to HOST_NAME_MAX.
++
++2015-09-11  Roland McGrath  <rol...@hack.frob.com>
++
++      * sysdeps/nacl/Makefile [$(subdir) = misc] (sysdep_headers):
++      Use 'override' keyword to freeze the value here, preventing
++      the addition of sys/mtio.h by sysdeps/gnu/Makefile.
++
++2015-09-04  Roland McGrath  <rol...@hack.frob.com>
++
++      [BZ #18921]
++      * sysdeps/posix/opendir.c (need_isdir_precheck) [O_DIRECTORY]:
++      Fix inverted sense of test of 'o_directory_works' value.
++      Reported by Pádraig Brady <p...@draigbrady.com>, diagnosed by
++      Bernhard Voelker <m...@bernhard-voelker.de>.
++
 +2015-08-31  Brett Neumeier <br...@neumeier.us>
 +
 +      [BZ #18870]
@@ -78,7 +134,7 @@
  
        * version.h (RELEASE): Set to "stable".
 diff --git a/NEWS b/NEWS
-index 4c31de7..ce0255a 100644
+index 4c31de7..9b10bff 100644
 --- a/NEWS
 +++ b/NEWS
 @@ -5,6 +5,12 @@ See the end for copying conditions.
@@ -89,7 +145,7 @@
 +
 +* The following bugs are resolved with this release:
 +
-+  18778, 18781, 18787, 18796, 18870, 18887.
++  18589, 18778, 18781, 18787, 18796, 18870, 18887, 18921, 18969.
 +
  Version 2.22
  
@@ -286,6 +342,97 @@
    test_ftello ();
  
    return 0;
+diff --git a/locale/C-collate.c b/locale/C-collate.c
+index d7f3c55..06dfdfa 100644
+--- a/locale/C-collate.c
++++ b/locale/C-collate.c
+@@ -144,8 +144,6 @@ const struct __locale_data _nl_C_LC_COLLATE 
attribute_hidden =
+     /* _NL_COLLATE_COLLSEQWC */
+     { .string = (const char *) collseqwc },
+     /* _NL_COLLATE_CODESET */
+-    { .string = _nl_C_codeset },
+-    /* _NL_COLLATE_ENCODING_TYPE */
+-    { .word = __cet_8bit }
++    { .string = _nl_C_codeset }
+   }
+ };
+diff --git a/locale/categories.def b/locale/categories.def
+index 045489d..a8dda53 100644
+--- a/locale/categories.def
++++ b/locale/categories.def
+@@ -58,7 +58,6 @@ DEFINE_CATEGORY
+   DEFINE_ELEMENT (_NL_COLLATE_COLLSEQMB,        "collate-collseqmb",        
std, wstring)
+   DEFINE_ELEMENT (_NL_COLLATE_COLLSEQWC,        "collate-collseqwc",        
std, wstring)
+   DEFINE_ELEMENT (_NL_COLLATE_CODESET,                "collate-codeset",      
    std, string)
+-  DEFINE_ELEMENT (_NL_COLLATE_ENCODING_TYPE,   "collate-encoding-type",    
std, word)
+   ), NO_POSTLOAD)
+ 
+ 
+diff --git a/locale/langinfo.h b/locale/langinfo.h
+index ffc5c7f..a565d9d 100644
+--- a/locale/langinfo.h
++++ b/locale/langinfo.h
+@@ -255,7 +255,6 @@ enum
+   _NL_COLLATE_COLLSEQMB,
+   _NL_COLLATE_COLLSEQWC,
+   _NL_COLLATE_CODESET,
+-  _NL_COLLATE_ENCODING_TYPE,
+   _NL_NUM_LC_COLLATE,
+ 
+   /* LC_CTYPE category: character classification.
+diff --git a/locale/localeinfo.h b/locale/localeinfo.h
+index bdab9fe..1d2ee00 100644
+--- a/locale/localeinfo.h
++++ b/locale/localeinfo.h
+@@ -110,14 +110,6 @@ enum coll_sort_rule
+   sort_mask
+ };
+ 
+-/* Collation encoding type.  */
+-enum collation_encoding_type
+-{
+-  __cet_other,
+-  __cet_8bit,
+-  __cet_utf8
+-};
+-
+ /* We can map the types of the entries into a few categories.  */
+ enum value_type
+ {
+diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
+index a39a94f..dc0fe30 100644
+--- a/locale/programs/ld-collate.c
++++ b/locale/programs/ld-collate.c
+@@ -32,7 +32,6 @@
+ #include "linereader.h"
+ #include "locfile.h"
+ #include "elem-hash.h"
+-#include "../localeinfo.h"
+ 
+ /* Uncomment the following line in the production version.  */
+ /* #define NDEBUG 1 */
+@@ -2131,8 +2130,6 @@ collate_output (struct localedef_t *locale, const struct 
charmap_t *charmap,
+         /* The words have to be handled specially.  */
+         if (idx == _NL_ITEM_INDEX (_NL_COLLATE_SYMB_HASH_SIZEMB))
+           add_locale_uint32 (&file, 0);
+-        else if (idx == _NL_ITEM_INDEX (_NL_COLLATE_ENCODING_TYPE))
+-          add_locale_uint32 (&file, __cet_other);
+         else
+           add_locale_empty (&file);
+       }
+@@ -2496,12 +2493,6 @@ collate_output (struct localedef_t *locale, const 
struct charmap_t *charmap,
+   add_locale_raw_data (&file, collate->mbseqorder, 256);
+   add_locale_collseq_table (&file, &collate->wcseqorder);
+   add_locale_string (&file, charmap->code_set_name);
+-  if (strcmp (charmap->code_set_name, "UTF-8") == 0)
+-    add_locale_uint32 (&file, __cet_utf8);
+-  else if (charmap->mb_cur_max == 1)
+-    add_locale_uint32 (&file, __cet_8bit);
+-  else
+-    add_locale_uint32 (&file, __cet_other);
+   write_locale_data (output_path, LC_COLLATE, "LC_COLLATE", &file);
+ 
+   obstack_free (&weightpool, NULL);
 diff --git a/misc/Makefile b/misc/Makefile
 index aecb0da..2f5edf6 100644
 --- a/misc/Makefile
@@ -335,6 +482,20 @@
  
     This header is provided only for backward compatibility.
     It will be removed in the next release of the GNU C Library.
+diff --git a/misc/sys/param.h b/misc/sys/param.h
+index 62b7ed2..1908b93 100644
+--- a/misc/sys/param.h
++++ b/misc/sys/param.h
+@@ -50,6 +50,9 @@
+ #if !defined NOFILE && defined OPEN_MAX
+ # define NOFILE               OPEN_MAX
+ #endif
++#if !defined MAXHOSTNAMELEN && defined HOST_NAME_MAX
++# define MAXHOSTNAMELEN       HOST_NAME_MAX
++#endif
+ #ifndef NCARGS
+ # ifdef ARG_MAX
+ #  define NCARGS      ARG_MAX
 diff --git a/misc/tst-mntent-blank-corrupt.c b/misc/tst-mntent-blank-corrupt.c
 new file mode 100644
 index 0000000..92266a3
@@ -516,6 +677,233 @@
      if ($name ne "nss_ldap" && $name ne "db1"
        && !($name =~/^nss1_/) && $name ne "thread_db"
        && $name ne "nss_test1" && $name ne "libgcc_s") {
+diff --git a/string/Makefile b/string/Makefile
+index 8424a61..ebe9354 100644
+--- a/string/Makefile
++++ b/string/Makefile
+@@ -54,7 +54,7 @@ tests                := tester inl-tester noinl-tester 
testcopy test-ffs     \
+                  tst-strtok tst-strxfrm bug-strcoll1 tst-strfry       \
+                  bug-strtok1 $(addprefix test-,$(strop-tests))        \
+                  bug-envz1 tst-strxfrm2 tst-endian tst-svc2           \
+-                 tst-strtok_r
++                 tst-strtok_r bug-strcoll2
+ 
+ xtests = tst-strcoll-overflow
+ 
+@@ -75,4 +75,17 @@ ifeq ($(run-built-tests),yes)
+ $(objpfx)tst-svc-cmp.out: tst-svc.expect $(objpfx)tst-svc.out
+       cmp $^ > $@; \
+       $(evaluate-test)
++
++LOCALES := de_DE.UTF-8 en_US.ISO-8859-1 en_US.UTF-8 \
++           tr_TR.ISO-8859-9 tr_TR.UTF-8 cs_CZ.UTF-8 \
++         da_DK.ISO-8859-1
++include ../gen-locales.mk
++
++$(objpfx)test-strcasecmp.out: $(gen-locales)
++$(objpfx)test-strncasecmp.out: $(gen-locales)
++$(objpfx)tst-strxfrm.out: $(gen-locales)
++$(objpfx)tst-strxfrm2.out: $(gen-locales)
++# bug-strcoll2 needs cs_CZ.UTF-8 and da_DK.ISO-8859-1.
++$(objpfx)bug-strcoll2.out: $(gen-locales)
++
+ endif
+diff --git a/string/bug-strcoll2.c b/string/bug-strcoll2.c
+new file mode 100644
+index 0000000..72a9ff2
+--- /dev/null
++++ b/string/bug-strcoll2.c
+@@ -0,0 +1,92 @@
++/* Bug 18589: sort-test.sh fails at random.
++   Copyright (C) 2015 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
++   <http://www.gnu.org/licenses/>.  */
++
++#include <stdio.h>
++#include <string.h>
++#include <locale.h>
++
++/* An incorrect strcoll optimization resulted in incorrect
++   results from strcoll for cs_CZ and da_DK.  */
++
++int
++test_cs_CZ (void)
++{
++  const char t1[] = "config";
++  const char t2[] = "choose";
++  if (setlocale (LC_ALL, "cs_CZ.UTF-8") == NULL)
++    {
++      perror ("setlocale");
++      return 1;
++    }
++  /* In Czech the digraph ch sorts after c, therefore we expect
++     config to sort before choose.  */
++  int a = strcoll (t1, t2);
++  int b = strcoll (t2, t1);
++  printf ("strcoll (\"%s\", \"%s\") = %d\n", t1, t2, a);
++  printf ("strcoll (\"%s\", \"%s\") = %d\n", t2, t1, b);
++  if (a < 0 && b > 0)
++    {
++      puts ("PASS: config < choose");
++      return 0;
++    }
++  else
++    {
++      puts ("FAIL: Wrong sorting in cs_CZ.UTF-8.");
++      return 1;
++    }
++}
++
++int
++test_da_DK (void)
++{
++  const char t1[] = "AS";
++  const char t2[] = "AA";
++  if (setlocale (LC_ALL, "da_DK.ISO-8859-1") == NULL)
++    {
++      perror ("setlocale");
++      return 1;
++    }
++  /* AA should be treated as the last letter of the Danish alphabet,
++     hence sorting after AS.  */
++  int a = strcoll (t1, t2);
++  int b = strcoll (t2, t1);
++  printf ("strcoll (\"%s\", \"%s\") = %d\n", t1, t2, a);
++  printf ("strcoll (\"%s\", \"%s\") = %d\n", t2, t1, b);
++  if (a < 0 && b > 0)
++    {
++      puts ("PASS: AS < AA");
++      return 0;
++    }
++  else
++    {
++      puts ("FAIL: Wrong sorting in da_DK.ISO-8859-1");
++      return 1;
++    }
++}
++
++static int
++do_test (void)
++{
++  int err = 0;
++  err |= test_cs_CZ ();
++  err |= test_da_DK ();
++  return err;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff --git a/string/strcoll_l.c b/string/strcoll_l.c
+index 8f1225f..35bc0e4 100644
+--- a/string/strcoll_l.c
++++ b/string/strcoll_l.c
+@@ -29,7 +29,6 @@
+ # define STRING_TYPE char
+ # define USTRING_TYPE unsigned char
+ # define STRCOLL __strcoll_l
+-# define STRDIFF __strdiff
+ # define STRCMP strcmp
+ # define WEIGHT_H "../locale/weight.h"
+ # define SUFFIX       MB
+@@ -42,20 +41,6 @@
+ #include "../locale/localeinfo.h"
+ #include WEIGHT_H
+ 
+-#define MASK_UTF8_7BIT  (1 << 7)
+-#define MASK_UTF8_START (3 << 6)
+-
+-size_t
+-STRDIFF (const STRING_TYPE *s, const STRING_TYPE *t)
+-{
+-  size_t n;
+-
+-  for (n = 0; *s != '\0' && *s++ == *t++; ++n)
+-    continue;
+-
+-  return n;
+-}
+-
+ /* Track status while looking for sequences in a string.  */
+ typedef struct
+ {
+@@ -269,29 +254,9 @@ STRCOLL (const STRING_TYPE *s1, const STRING_TYPE *s2, 
__locale_t l)
+   const USTRING_TYPE *extra;
+   const int32_t *indirect;
+ 
+-  /* In case there is no locale specific sort order (C / POSIX).  */
+   if (nrules == 0)
+     return STRCMP (s1, s2);
+ 
+-  /* Fast forward to the position of the first difference.  Needs to be
+-     encoding aware as the byte-by-byte comparison can stop in the middle
+-     of a char sequence for multibyte encodings like UTF-8.  */
+-  uint_fast32_t encoding =
+-    current->values[_NL_ITEM_INDEX (_NL_COLLATE_ENCODING_TYPE)].word;
+-  if (encoding != __cet_other)
+-    {
+-      size_t diff = STRDIFF (s1, s2);
+-      if (diff > 0)
+-      {
+-        if (encoding == __cet_utf8 && (*(s1 + diff) & MASK_UTF8_7BIT) != 0)
+-          do
+-            diff--;
+-          while (diff > 0 && (*(s1 + diff) & MASK_UTF8_START) != 
MASK_UTF8_START);
+-        s1 += diff;
+-        s2 += diff;
+-      }
+-    }
+-
+   /* Catch empty strings.  */
+   if (__glibc_unlikely (*s1 == '\0') || __glibc_unlikely (*s2 == '\0'))
+     return (*s1 != '\0') - (*s2 != '\0');
+@@ -358,8 +323,7 @@ STRCOLL (const STRING_TYPE *s1, const STRING_TYPE *s2, 
__locale_t l)
+                    byte-level comparison to ensure that we don't waste time
+                    going through multiple passes for totally equal strings
+                    before proceeding to subsequent passes.  */
+-                if (pass == 0 && encoding == __cet_other &&
+-                    STRCMP (s1, s2) == 0)
++                if (pass == 0 && STRCMP (s1, s2) == 0)
+                   return result;
+                 else
+                   break;
+diff --git a/string/tst-strxfrm2.c b/string/tst-strxfrm2.c
+index d5a1115..bea5aa2 100644
+--- a/string/tst-strxfrm2.c
++++ b/string/tst-strxfrm2.c
+@@ -5,6 +5,8 @@
+ static int
+ do_test (void)
+ {
++  static const char test_locale[] = "de_DE.UTF-8";
++
+   int res = 0;
+ 
+   char buf[20];
+@@ -38,9 +40,9 @@ do_test (void)
+       res = 1;
+     }
+ 
+-  if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL)
++  if (setlocale (LC_ALL, test_locale) == NULL)
+     {
+-      puts ("setlocale failed");
++      printf ("cannot set locale \"%s\"\n", test_locale);
+       res = 1;
+     }
+   else
 diff --git a/sysdeps/hppa/dl-symaddr.c b/sysdeps/hppa/dl-symaddr.c
 index b707c19..89d8baf 100644
 --- a/sysdeps/hppa/dl-symaddr.c
@@ -525,6 +913,24 @@
      return (void *) value;
  }
 +rtld_hidden_def (_dl_symbol_address)
+diff --git a/sysdeps/nacl/Makefile b/sysdeps/nacl/Makefile
+index 6749a44..1748886 100644
+--- a/sysdeps/nacl/Makefile
++++ b/sysdeps/nacl/Makefile
+@@ -132,4 +132,13 @@ ifeq ($(subdir),misc)
+ # sysdeps/.../linux/ directories, but it's still a sysdeps decision to
+ # install it.
+ sysdep_headers += bits/mman-linux.h
++
++# This defeats sysdeps/gnu/Makefile's addition of sys/mtio.h, which
++# we do not want.  This is a total kludge, but it seems no worse for
++# now than making the sysdeps/gnu/Makefile code conditional on a
++# variable we set here.  If some sysdeps/.../Makefile that is later
++# in the list than sysdeps/gnu needed to add to sysdep_headers, this
++# would break it.  But sysdeps/gnu is close to last in the list and
++# this coming up seems unlikely.
++override sysdep_headers := $(sysdep_headers)
+ endif
 diff --git a/sysdeps/nacl/start.c b/sysdeps/nacl/start.c
 index a4b6dd3..8e8bc1a 100644
 --- a/sysdeps/nacl/start.c
@@ -549,6 +955,19 @@
                     nacl_startup_argc (info),
                     nacl_startup_argv (info),
                     nacl_startup_auxv (info),
+diff --git a/sysdeps/posix/opendir.c b/sysdeps/posix/opendir.c
+index 6509f5c..9edf056 100644
+--- a/sysdeps/posix/opendir.c
++++ b/sysdeps/posix/opendir.c
+@@ -105,7 +105,7 @@ need_isdir_precheck (void)
+     tryopen_o_directory ();
+ 
+   /* We can skip the expensive `stat' call if O_DIRECTORY works.  */
+-  return o_directory_works > 0;
++  return o_directory_works < 0;
+ #endif
+   return true;
+ }
 diff --git a/sysdeps/sparc/sparc32/sem_open.c 
b/sysdeps/sparc/sparc32/sem_open.c
 index 16cb9ad..59df2d7 100644
 --- a/sysdeps/sparc/sparc32/sem_open.c
@@ -664,3 +1083,15 @@
    return SYSCALL_CANCEL (openat, fd, file, oflag, mode);
  }
  libc_hidden_def (__OPENAT)
+diff --git a/wcsmbs/wcscoll_l.c b/wcsmbs/wcscoll_l.c
+index 6d9384a..87f240d 100644
+--- a/wcsmbs/wcscoll_l.c
++++ b/wcsmbs/wcscoll_l.c
+@@ -23,7 +23,6 @@
+ #define STRING_TYPE wchar_t
+ #define USTRING_TYPE wint_t
+ #define STRCOLL __wcscoll_l
+-#define STRDIFF __wcsdiff
+ #define STRCMP __wcscmp
+ #define WEIGHT_H "../locale/weightwc.h"
+ #define SUFFIX        WC

Reply via email to