Revert "glibc minor fixes of old bugfix patches already applied in newer versions"

This reverts commit 76a8e0e9c015bed6db2823f4fdcf4aec675d500a.

Reverting glibc 2.6 for stable-rc-0.14

4 files changed, 291 insertions, 5 deletions

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 3294b762e5..ab54b58e5f 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,8 +1,3 @@
-2007-09-23 David Brown <dmlb2000@gmail.com>
-	* PRE_BUILD: nisplus_fix.diff and iconv_open.patch removed not needed
-	* nisplus_fix.diff: removed
-	* iconv_open.patch: removed
-
 2007-09-16 David Brown <dmlb2000@gmail.com>
 	* DETAILS: removed GLIBC_ARCH altogether
 	* BUILD: removed GLIBC_ARCH gone... and some syntax errors as a result
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 90b4daedc3..4436ef3ae8 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -8,6 +8,11 @@ local GLIBC_LIBIDN_DIR=$SOURCE_DIRECTORY/glibc-libidn-$VERSION           &&
 
 if  [  "$GLIBC_NPTL"  =  "y"  ];  then
   cd      $SOURCE_DIRECTORY                           &&
+  # fix for upstream bug http://sourceware.org/bugzilla/show_bug.cgi?id=2429
+  patch  -p1  <  $SCRIPT_DIRECTORY/nisplus_fix.diff                      &&
+  # fix for upstream bug https://bugzilla.samba.org/show_bug.cgi?id=3678
+  patch  -p1  <  $SCRIPT_DIRECTORY/glibc-2.4-iconv_open.patch            &&
+
   if [ "$GLIBC_USEIDN" = "y" ]; then
     #
     # Unpack glibc-libidn
diff --git a/libs/glibc/glibc-2.4-iconv_open.patch b/libs/glibc/glibc-2.4-iconv_open.patch
new file mode 100644
index 0000000000..4847879693
--- /dev/null
+++ b/libs/glibc/glibc-2.4-iconv_open.patch
@@ -0,0 +1,82 @@
+Submitted By: Joe Ciccone <<a href="http://linuxfromscratch.org/mailman/listinfo/patches">jciccone at gmail.com</a>>
+Date: 2006-06-19
+Initial Package Version: 2.4
+Upstream Status: In CVS
+Origin: <a href="https://bugzilla.samba.org/show_bug.cgi?id=3678">https://bugzilla.samba.org/show_bug.cgi?id=3678</a>
+Description: Fixes a problem that showed up in samba. It would fail to
+             start with the following error.
+
+smbd: gconv_db.c:232: __gconv_release_step: Assertion `step->__end_fct ==
+((void *)0)' failed.
+
+diff -Naur glibc-2.4.orig/iconv/gconv_db.c glibc-2.4/iconv/gconv_db.c
+--- glibc-2.4.orig/iconv/gconv_db.c	2005-12-19 02:25:25.000000000 -0500
++++ glibc-2.4/iconv/gconv_db.c	2006-06-19 11:42:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* Provide access to the collection of available transformation modules.
+-   Copyright (C) 1997-2003, 2004, 2005 Free Software Foundation, Inc.
++   Copyright (C) 1997-2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+ 
+@@ -227,7 +227,7 @@
+       step->__shlib_handle = NULL;
+ #endif
+     }
+-  else
++  else if (step->__shlib_handle == NULL)
+     /* Builtin modules should not have end functions.  */
+     assert (step->__end_fct == NULL);
+ }
+diff -Naur glibc-2.4.orig/iconvdata/Makefile glibc-2.4/iconvdata/Makefile
+--- glibc-2.4.orig/iconvdata/Makefile	2005-11-16 03:15:54.000000000 -0500
++++ glibc-2.4/iconvdata/Makefile	2006-06-19 11:38:42.000000000 -0400
+@@ -65,7 +65,8 @@
+ include ../Makeconfig
+ 
+ ifeq (yes,$(build-shared))
+-tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4
++tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
++	tst-iconv6
+ ifeq ($(have-thread-library),yes)
+ tests += bug-iconv3
+ endif
+diff -Naur glibc-2.4.orig/iconvdata/tst-iconv6.c glibc-2.4/iconvdata/tst-iconv6.c
+--- glibc-2.4.orig/iconvdata/tst-iconv6.c	1969-12-31 19:00:00.000000000 -0500
++++ glibc-2.4/iconvdata/tst-iconv6.c	2006-06-19 11:38:42.000000000 -0400
+@@ -0,0 +1,35 @@
++/* BZ #2569 */
++
++#include <iconv.h>
++#include <stdio.h>
++
++static int
++do_test (void)
++{
++  iconv_t cd0 = iconv_open ("ISO-8859-7", "UTF-16LE");
++  if (cd0 == (iconv_t) -1)
++    {
++      puts ("first iconv_open failed");
++      return 1;
++    }
++  iconv_t cd1 = iconv_open ("ISO-8859-7", "UTF-16LE");
++  if (cd1 == (iconv_t) -1)
++    {
++      puts ("second iconv_open failed");
++      return 1;
++    }
++  if (iconv_close (cd0) != 0)
++    {
++      puts ("first iconv_close failed");
++      return 1;
++    }
++  if (iconv_close (cd1) != 0)
++    {
++      puts ("second iconv_close failed");
++      return 1;
++    }
++  return 0;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
diff --git a/libs/glibc/nisplus_fix.diff b/libs/glibc/nisplus_fix.diff
new file mode 100644
index 0000000000..16ec31e17d
--- /dev/null
+++ b/libs/glibc/nisplus_fix.diff
@@ -0,0 +1,204 @@
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-alias.c,v
+retrieving revision 1.17
+retrieving revision 1.18
+diff -u -r1.17 -r1.18
+--- libc/nis/nss_nisplus/nisplus-alias.c	2005/12/03 17:01:45	1.17
++++ libc/nis/nss_nisplus/nisplus-alias.c	2006/03/25 20:59:19	1.18
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1997,1998,2001,2002,2003,2005 Free Software Foundation, Inc.
++/* Copyright (C) 1997, 1998, 2001, 2002, 2003, 2005, 2006
++   Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
+ 
+@@ -51,7 +52,7 @@
+       static const char prefix[] = "mail_aliases.org_dir.";
+ 
+       char *p = malloc (sizeof (prefix) + local_dir_len);
+-      if (tablename_val == NULL)
++      if (p == NULL)
+ 	{
+ 	  *errnop = errno;
+ 	  return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-ethers.c,v
+retrieving revision 1.21
+retrieving revision 1.22
+diff -u -r1.21 -r1.22
+--- libc/nis/nss_nisplus/nisplus-ethers.c	2005/12/03 21:45:55	1.21
++++ libc/nis/nss_nisplus/nisplus-ethers.c	2006/03/25 20:59:19	1.22
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1997,1998,2000-2003,2005 Free Software Foundation, Inc.
++/* Copyright (C) 1997,1998,2000-2003,2005,2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
+ 
+@@ -94,7 +94,7 @@
+       static const char prefix[] = "ethers.org_dir.";
+ 
+       char *p = malloc (sizeof (prefix) + local_dir_len);
+-      if (tablename_val == NULL)
++      if (p == NULL)
+ 	{
+ 	  *errnop = errno;
+ 	  return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-grp.c,v
+retrieving revision 1.18
+retrieving revision 1.19
+diff -u -r1.18 -r1.19
+--- libc/nis/nss_nisplus/nisplus-grp.c	2005/12/03 05:04:16	1.18
++++ libc/nis/nss_nisplus/nisplus-grp.c	2006/03/25 20:59:19	1.19
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1997, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++/* Copyright (C) 1997, 2001, 2002, 2003, 2005, 2006
++   Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
+ 
+@@ -47,7 +48,7 @@
+       static const char prefix[] = "group.org_dir.";
+ 
+       char *p = malloc (sizeof (prefix) + local_dir_len);
+-      if (tablename_val == NULL)
++      if (p == NULL)
+ 	{
+ 	  *errnop = errno;
+ 	  return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-hosts.c,v
+retrieving revision 1.28
+retrieving revision 1.29
+diff -u -r1.28 -r1.29
+--- libc/nis/nss_nisplus/nisplus-hosts.c	2005/12/03 17:47:33	1.28
++++ libc/nis/nss_nisplus/nisplus-hosts.c	2006/03/25 20:59:19	1.29
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1997-2002, 2003, 2005 Free Software Foundation, Inc.
++/* Copyright (C) 1997-2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
+ 
+@@ -186,7 +186,7 @@
+       static const char prefix[] = "hosts.org_dir.";
+ 
+       char *p = malloc (sizeof (prefix) + local_dir_len);
+-      if (tablename_val == NULL)
++      if (p == NULL)
+ 	{
+ 	  *errnop = errno;
+ 	  return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-network.c,v
+retrieving revision 1.21
+retrieving revision 1.22
+diff -u -r1.21 -r1.22
+--- libc/nis/nss_nisplus/nisplus-network.c	2005/12/03 22:35:12	1.21
++++ libc/nis/nss_nisplus/nisplus-network.c	2006/03/25 20:59:19	1.22
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1997,1998,2000-2003,2005 Free Software Foundation, Inc.
++/* Copyright (C) 1997,1998,2000-2003,2005,2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
+ 
+@@ -148,7 +148,7 @@
+       static const char prefix[] = "networks.org_dir.";
+ 
+       char *p = malloc (sizeof (prefix) + local_dir_len);
+-      if (tablename_val == NULL)
++      if (p == NULL)
+ 	{
+ 	  *errnop = errno;
+ 	  return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-proto.c,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- libc/nis/nss_nisplus/nisplus-proto.c	2005/12/03 19:33:09	1.20
++++ libc/nis/nss_nisplus/nisplus-proto.c	2006/03/25 20:59:19	1.21
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1997,1998,2001,2002,2003,2005 Free Software Foundation, Inc.
++/* Copyright (C) 1997, 1998, 2001, 2002, 2003, 2005, 2006
++   Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
+ 
+@@ -147,7 +148,7 @@
+       static const char prefix[] = "protocols.org_dir.";
+ 
+       char *p = malloc (sizeof (prefix) + local_dir_len);
+-      if (tablename_val == NULL)
++      if (p == NULL)
+ 	{
+ 	  *errnop = errno;
+ 	  return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-pwd.c,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- libc/nis/nss_nisplus/nisplus-pwd.c	2005/12/03 20:39:34	1.20
++++ libc/nis/nss_nisplus/nisplus-pwd.c	2006/03/25 20:59:19	1.21
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1997,1999,2001,2002,2003,2005 Free Software Foundation, Inc.
++/* Copyright (C) 1997, 1999, 2001, 2002, 2003, 2005, 2006
++   Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
+ 
+@@ -44,7 +45,7 @@
+       static const char prefix[] = "passwd.org_dir.";
+ 
+       char *p = malloc (sizeof (prefix) + local_dir_len);
+-      if (pwd_tablename_val == NULL)
++      if (p == NULL)
+ 	{
+ 	  *errnop = errno;
+ 	  return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-rpc.c,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- libc/nis/nss_nisplus/nisplus-rpc.c	2005/12/03 19:54:38	1.20
++++ libc/nis/nss_nisplus/nisplus-rpc.c	2006/03/25 20:59:19	1.21
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1997,1998,2001,2002,2003,2005 Free Software Foundation, Inc.
++/* Copyright (C) 1997, 1998, 2001, 2002, 2003, 2005, 2006
++   Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
+ 
+@@ -144,7 +145,7 @@
+       static const char prefix[] = "rpc.org_dir.";
+ 
+       char *p = malloc (sizeof (prefix) + local_dir_len);
+-      if (tablename_val == NULL)
++      if (p == NULL)
+ 	{
+ 	  *errnop = errno;
+ 	  return NSS_STATUS_TRYAGAIN;
+===================================================================
+RCS file: /cvs/glibc/libc/nis/nss_nisplus/nisplus-service.c,v
+retrieving revision 1.22
+retrieving revision 1.23
+diff -u -r1.22 -r1.23
+--- libc/nis/nss_nisplus/nisplus-service.c	2005/12/03 20:11:34	1.22
++++ libc/nis/nss_nisplus/nisplus-service.c	2006/03/25 20:59:19	1.23
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1997-1999,2001,2002,2003,2005 Free Software Foundation, Inc.
++/* Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2006
++   Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
+ 
+@@ -151,7 +152,7 @@
+       static const char prefix[] = "services.org_dir.";
+ 
+       char *p = malloc (sizeof (prefix) + local_dir_len);
+-      if (tablename_val == NULL)
++      if (p == NULL)
+ 	{
+ 	  *errnop = errno;
+ 	  return NSS_STATUS_TRYAGAIN;