Accepting request 71163 from home:a_jaeger:branches:openSUSE:Factory

Update to glibc 2.13

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

glibc-2.11.3-b72646ad0c41.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe7395ed702de089ef4f719d3ca0ae0477dbe9c3c0a049aa4bd89f441a00b72e
-size 15666419

glibc-2.13-996cf2ef0727.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:023aef147d380f0e4ca2ff0617355b0ef69e41f00db7c463c800fabdb62e8faa
+size 16381764

glibc-2.6-configure.diff

@@ -1,17 +1,15 @@
-Index: configure.in
-===================================================================
---- configure.in.orig
-+++ configure.in
-@@ -1395,7 +1395,7 @@ EOF
+--- configure.in.orig	2011-05-20 15:36:44.880141789 +0200
++++ configure.in	2011-05-20 15:39:31.237690293 +0200
+@@ -1406,7 +1406,7 @@
  		      fi
  		    fi
  		  fi
 -		  rm -f conftest.[cs]
-+		  rm -f conftest*
++		  rm -f conftest.*
  		 ])
      if test $libc_cv_visibility_attribute != yes; then
        AC_MSG_ERROR(compiler support for visibility attribute is required)
-@@ -1411,7 +1411,7 @@ EOF
+@@ -1422,7 +1422,7 @@
  		  int bar (int x) { return x; }
  EOF
  		  libc_cv_broken_visibility_attribute=yes
@@ -20,25 +18,23 @@ Index: configure.in
  changequote(,)dnl
  		    if grep '\.hidden[ 	_]foo' conftest.s >/dev/null; then
  changequote([,])dnl
-Index: configure
-===================================================================
---- configure.orig
-+++ configure
-@@ -6272,7 +6272,7 @@ EOF
- 		      fi
- 		    fi
- 		  fi
--		  rm -f conftest.cs
-+		  rm -f conftest*
- 
- fi
- { $as_echo "$as_me:$LINENO: result: $libc_cv_visibility_attribute" >&5
-@@ -6296,7 +6296,7 @@ else
+--- configure.orig	2011-05-20 15:39:38.413972560 +0200
++++ configure	2011-05-20 15:40:52.292884126 +0200
+@@ -6112,7 +6112,7 @@
  		  int bar (int x) { return x; }
  EOF
  		  libc_cv_broken_visibility_attribute=yes
 -		  if { ac_try='${CC-cc} -Werror -S conftest.c -o conftest.s1>&5'
-+		  if { ac_try='${CC-cc} -Werror -S conftest.c -o conftest.s >&5'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++		  if { ac_try='${CC-cc} -Werror -S conftest.c -o conftest.s>&5'
+   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
    (eval $ac_try) 2>&5
    ac_status=$?
+@@ -6753,7 +6753,7 @@
+ 		  else
+ 		    libc_cv_have_section_quotes=unknown
+ 		  fi
+-		  rm -f conftest.cs
++		  rm -f conftest.*
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_have_section_quotes" >&5

glibc-compiled-binaries.diff

@@ -19,11 +19,23 @@ Index: config.make.in
  force-install = @force_install@
  
  # Build tools.
+Index: configure.in
+===================================================================
+--- configure.in.orig	2011-05-20 15:39:31.237690293 +0200
++++ configure.in	2011-05-20 15:43:55.595111363 +0200
+@@ -16,6 +16,7 @@
+   AC_CHECK_PROGS(BUILD_CC, gcc cc)
+ fi
+ AC_SUBST(cross_compiling)
++AC_SUBST(compiled_binaries_can_run_on_buildhost)
+ AC_PROG_CPP
+ # We need the C++ compiler only for testing.
+ AC_PROG_CXX
 Index: configure
 ===================================================================
---- configure.orig
-+++ configure
-@@ -589,6 +589,7 @@ ac_clean_files=
+--- configure.orig	2011-05-20 15:46:40.675628746 +0200
++++ configure	2011-05-20 15:40:52.292884126 +0200
+@@ -545,6 +545,7 @@
  ac_config_libobj_dir=.
  LIBOBJS=
  cross_compiling=no
@@ -31,7 +43,7 @@ Index: configure
  subdirs=
  MFLAGS=
  MAKEFLAGS=
-@@ -742,6 +743,7 @@ CXXFLAGS
+@@ -697,6 +696,7 @@
  CXX
  CPP
  cross_compiling
@@ -39,8 +51,8 @@ Index: configure
  BUILD_CC
  OBJEXT
  ac_ct_CC
-@@ -1294,6 +1296,13 @@ do
-    { (exit 1); exit 1; }; }
+@@ -1244,6 +1242,13 @@
+   as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
  done
  
 +# Check whether --enable-runbinaries was given.
@@ -53,36 +65,24 @@ Index: configure
  # There might be people who depend on the old broken behavior: `$host'
  # used to hold the argument of --host etc.
  # FIXME: To remove some day.
-@@ -1309,6 +1318,7 @@ if test "x$host_alias" != x; then
-     If a cross compiler is detected then cross compile mode will be used." >&2
+@@ -1266,6 +1257,7 @@
+     If a cross compiler is detected then cross compile mode will be used" >&2
    elif test "x$build_alias" != "x$host_alias"; then
      cross_compiling=yes
 +    compiled_binaries_can_run_on_buildhost=no
    fi
  fi
  
-@@ -1501,6 +1511,9 @@ Optional Features:
+@@ -1454,6 +1444,9 @@
+   --enable-experimental-malloc
                            enable experimental malloc features
    --enable-nss-crypt      enable libcrypt to use nss
- 
 +  --enable-runbinaries    the compiled binaries should run on the buildhost because
 +                          it happens to have a compatible cpu
 +
+ 
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-Index: configure.in
-===================================================================
---- configure.in.orig
-+++ configure.in
-@@ -16,6 +16,7 @@ if test $host != $build; then
-   AC_CHECK_PROGS(BUILD_CC, gcc cc)
- fi
- AC_SUBST(cross_compiling)
-+AC_SUBST(compiled_binaries_can_run_on_buildhost)
- AC_PROG_CPP
- # We need the C++ compiler only for testing.
- AC_PROG_CXX
 Index: posix/Makefile
 ===================================================================
 --- posix/Makefile.orig

glibc-ports-2.10.1-2b2b217196.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:efc4a2a614a97203c3c9847db37f40e52596776439b512b57f1606a12361b8f2
-size 585531

glibc-ports-2.13.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b11c4501ae929883447f409c31d65e82822b1c5693075a825a3d54612876ee5a
+size 625945

glibc-version.diff

@@ -2,19 +2,22 @@ Index: csu/version.c
 ===================================================================
 --- csu/version.c.orig
 +++ csu/version.c
-@@ -24,16 +24,20 @@ static const char __libc_release[] = REL
+@@ -25,19 +25,23 @@ static const char __libc_release[] = REL
  static const char __libc_version[] = VERSION;
  
  static const char banner[] =
 -"GNU C Library "RELEASE" release version "VERSION", by Roland McGrath et al.\n\
 +"GNU C Library "RELEASE" release version "VERSION" ("CVSDATE"), by Roland McGrath et al.\n\
- Copyright (C) 2009 Free Software Foundation, Inc.\n\
+ Copyright (C) 2011 Free Software Foundation, Inc.\n\
  This is free software; see the source for copying conditions.\n\
  There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
  PARTICULAR PURPOSE.\n\
 +Configured for "CONFHOST".\n\
  Compiled by GNU CC version "__VERSION__".\n"
  #include "version-info.h"
+ #ifdef LIBC_ABIS_STRING
+ LIBC_ABIS_STRING
+ #endif
  #ifdef GLIBC_OLDEST_ABI
  "The oldest ABI supported: " GLIBC_OLDEST_ABI ".\n"
  #endif

glibc.changes

@@ -4,6 +4,13 @@ Mon May 23 08:44:47 UTC 2011 - rguenther@novell.com
 - Update longlong.h from GCC sources.  Fixes s390 build with -mzarch.
   [bnc#695102]
 
+-------------------------------------------------------------------
+Fri May 20 14:45:44 UTC 2011 - aj@suse.de
+
+- Fix obsoletes and provides.
+- Update to glibc 2.13
+- Drop ld-prelink-unique.diff, it is part of 2.13.
+
 -------------------------------------------------------------------
 Tue Feb 22 12:57:07 CET 2011 - pbaudis@suse.cz
 

glibc.spec

@@ -52,8 +52,8 @@ BuildRequires:  libselinux-devel
 License:        GPLv2+
 Summary:        Standard Shared Libraries (from the GNU C Library)
 Group:          System/Libraries
-Obsoletes:      ngpt <= 2.2.2 ngpt-devel <= 2.2.2
-Provides:       ntpt = 2.2.2 ngpt-devel = 2.2.2
+Obsoletes:      ngpt < 2.2.2 ngpt-devel < 2.2.2
+Provides:       ngpt = 2.2.2 ngpt-devel = 2.2.2
 # bug437293
 %ifarch ppc64
 Obsoletes:      glibc-64bit
@@ -63,13 +63,13 @@ Obsoletes:      glibc-32bit
 %endif
 Provides:       rtld(GNU_HASH)
 AutoReqProv:    on
-Version:        2.11.3
-Release:        3
+Version:        2.13
+Release:        1
 Url:            http://www.gnu.org/software/libc/libc.html
 PreReq:         filesystem
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source:         glibc-%{version}-b72646ad0c41.tar.bz2
-Source2:        glibc-ports-2.10.1-2b2b217196.tar.bz2
+Source:         glibc-%{version}-996cf2ef0727.tar.bz2
+Source2:        http://ftp.gnu.org/gnu/glibc/glibc-ports-2.13.tar.bz2
 Source3:        noversion.tar.bz2
 Source4:        manpages.tar.bz2
 Source5:        usr.sbin.nscd
@@ -128,7 +128,6 @@ Patch39:        glibc-2.10.99-ia64-include.diff
 Patch40:        libm-x86-64-exceptions.diff
 Patch41:        glibc-uio-cell.diff
 Patch42:        glibc-statfs64-ia64.diff
-Patch43:        ld-prelink-unique.diff
 Patch44:        glibc-ppc64-vdso-time.diff
 Patch45:        glibc-gai-private4.diff
 Patch46:        glibc-resolv-mdnshint.diff
@@ -251,7 +250,7 @@ License:        BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+
 Summary:        Include Files and Libraries Mandatory for Development
 Group:          Development/Libraries/C and C++
 Obsoletes:      epoll = 1.0
-Provides:       epoll <= 1.0
+Provides:       epoll < 1.0
 # bug437293
 %ifarch ppc64
 Obsoletes:      glibc-devel-64bit
@@ -348,7 +347,6 @@ rm nscd/s-stamp
 %patch40
 %patch41 -p1
 %patch42
-%patch43 -p1
 %patch44 -p1
 %patch45
 %patch46 -p1

ld-prelink-unique.diff

@@ -1,57 +0,0 @@
-2010-03-23  Jakub Jelinek  <jakub@redhat.com>
-
-	* elf/dl-lookup.c (do_lookup_x): If tab->entries is NULL,
-	but tab->size != 0, just unlock and goto success, without
-	allocating anything or entering anything into the hash table.
-	(_dl_debug_bindings): Temporarily set tab->entries to NULL
-	around do_lookup_x in undef_map->l_local_scope[0].
-
---- libc/elf/dl-lookup.c.jj	2009-12-16 00:10:37.000000000 +0100
-+++ libc/elf/dl-lookup.c	2010-03-23 11:03:45.850560036 +0100
-@@ -1,5 +1,6 @@
- /* Look up a symbol in the loaded objects.
--   Copyright (C) 1995-2005, 2006, 2007, 2009 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2005, 2006, 2007, 2009, 2010
-+   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
-@@ -414,6 +415,20 @@ do_lookup_x (const char *undef_name, uin
- 		  assert (!RTLD_CHECK_FOREIGN_CALL);
- #endif
- 
-+#ifdef SHARED
-+		  /* If tab->entries is NULL, but tab->size is not, it means
-+		     this is the second, conflict finding, lookup for
-+		     LD_TRACE_PRELINKING in _dl_debug_bindings.  Don't
-+		     allocate anything and don't enter anything into the
-+		     hash table.  */
-+		  if (__builtin_expect (tab->size, 0))
-+		    {
-+		      assert (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK);
-+		      __rtld_lock_unlock_recursive (tab->lock);
-+		      goto success;
-+		    }
-+#endif
-+
- #define INITIAL_NUNIQUE_SYM_TABLE 31
- 		  size = INITIAL_NUNIQUE_SYM_TABLE;
- 		  entries = calloc (sizeof (struct unique_sym), size);
-@@ -917,13 +932,17 @@ _dl_debug_bindings (const char *undef_na
- 	{
- 	  const uint_fast32_t new_hash = dl_new_hash (undef_name);
- 	  unsigned long int old_hash = 0xffffffff;
-+	  struct unique_sym *saved_entries
-+	    = GL(dl_ns)[LM_ID_BASE]._ns_unique_sym_table.entries;
- 
-+	  GL(dl_ns)[LM_ID_BASE]._ns_unique_sym_table.entries = NULL;
- 	  do_lookup_x (undef_name, new_hash, &old_hash, *ref, &val,
- 		       undef_map->l_local_scope[0], 0, version, 0, NULL,
- 		       type_class, undef_map);
- 
- 	  if (val.s != value->s || val.m != value->m)
- 	    conflict = 1;
-+	  GL(dl_ns)[LM_ID_BASE]._ns_unique_sym_table.entries = saved_entries;
- 	}
- 
-       if (value->s)