Accepting request 338135 from home:Andreas_Schwab:Factory

- strcoll-remove-strdiff-opt.patch: Remove incorrect STRDIFF-based
  optimization (BZ #18589)

- iconv-reset-input-buffer.patch: Fix iconv buffer handling with IGNORE
  error handler (BZ #18830)

OBS-URL: https://build.opensuse.org/request/show/338135
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=418

glibc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package glibc
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -238,6 +238,8 @@ Patch1001:      openat64-readd-o-largefile.patch
 Patch1002:      mntent-blank-line.patch
 # PATCH-FIX-UPSTREAM Fix opendir inverted o_directory_works test (BZ #18921)
 Patch1003:      opendir-o-directory-check.patch
+# PATCH-FIX-UPSTREAM strcoll: Remove incorrect STRDIFF-based optimization (BZ #18589)
+Patch1004:      strcoll-remove-strdiff-opt.patch
 
 ### 
 # Patches awaiting upstream approval
@@ -258,8 +260,10 @@ Patch2007:      static-dlopen.patch
 Patch2008:      fnmatch-collating-elements.patch
 # PATCH-FIX-UPSTREAM Properly reread entry after failure in nss_files getent function (BZ #18991)
 Patch2009:      nss-files-long-lines-2.patch
-# PATCH-FIX-UPSTREAM [BZ #18743] PowerPC: Fix a race condition when eliding a lock
+# PATCH-FIX-UPSTREAM PowerPC: Fix a race condition when eliding a lock (BZ #18743)
 Patch2010:      0001-powerpc-Fix-a-race-condition-when-eliding-a-lock-20150730.patch
+# PATCH-FIX-UPSTREAM Fix iconv buffer handling with IGNORE error handler (BZ #18830)
+Patch2011:      iconv-reset-input-buffer.patch
 
 # Non-glibc patches
 # PATCH-FIX-OPENSUSE Remove debianisms from manpages
@@ -463,6 +467,7 @@ rm nscd/s-stamp
 %patch1001 -p1
 %patch1002 -p1
 %patch1003 -p1
+%patch1004 -p1
 
 %patch2000 -p1
 %patch2002 -p1
@@ -473,6 +478,7 @@ rm nscd/s-stamp
 %patch2008 -p1
 %patch2009 -p1
 %patch2010 -p1
+%patch2011 -p1
 
 %patch3000