From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 4 Aug 2010 13:46:24 +0000 (+0200)
Subject: glibc: Update to 2.12.1.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=215545b28a49ec694af1cc99f7d1fc11de9c5967;p=ipfire-3.x.git

glibc: Update to 2.12.1.

Truncated the fedora patch because Changelog didn't apply.
---

diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm
index ad694b872..8e1b99ab7 100644
--- a/pkgs/core/glibc/glibc.nm
+++ b/pkgs/core/glibc/glibc.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = glibc
-PKG_VER        = 2.12
+PKG_VER        = 2.12.1
 PKG_REL        = 0
 
 PKG_MAINTAINER = Michael Tremer <michael.tremer@ipfire.org>
@@ -55,7 +55,7 @@ CXXFLAGS += $(GLIBC_FLAGS)
 
 OPTIMIZED_KERNEL = 2.6.18
 
-PKG_OBJECTS   += $(THISAPP).tar.bz2
+PKG_OBJECTS   += $(THISAPP).tar.gz
 
 # $(THISAPP)-pt_pax-1.patch - Support for PT_PaX markings.
 
diff --git a/pkgs/core/glibc/patches/glibc-fedora.patch b/pkgs/core/glibc/patches/glibc-fedora.patch
index 5a7fce94d..e2f6bb376 100644
--- a/pkgs/core/glibc/patches/glibc-fedora.patch
+++ b/pkgs/core/glibc/patches/glibc-fedora.patch
@@ -1,89 +1,3 @@
---- glibc-2.12-2-gc4ccff1/ChangeLog
-+++ glibc-2.12-1/ChangeLog
-@@ -241,6 +241,12 @@
- 
- 	* Makerules (libc-abis): Fix search for libc-abis in add-ons.
- 
-+2010-04-06  Ulrich Drepper  <drepper@redhat.com>
-+
-+	* sysdeps/posix/getaddrinfo.c (default_scopes): Assign global
-+	scope to RFC 1918 addresses.
-+	* posix/gai.conf: Document difference from RFC 3484.
-+
- 2010-04-05  Thomas Schwinge  <thomas@schwinge.name>
- 
- 	* sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/.
-@@ -995,6 +1001,19 @@
- 	* sysdeps/x86_64/fpu/fegetenv.c: Likewise
- 	* sysdeps/s390/fpu/fegetenv.c: Likewise.  Remove unused headers.
- 
-+2009-10-27  Aurelien Jarno  <aurelien@aurel32.net>
-+
-+	[BZ #10855]
-+	* locale/programs/locarchive.c: use MMAP_SHARED to reserve memory
-+	used later with MMAP_FIXED | MMAP_SHARED to cope with different
-+	alignment restrictions.
-+
-+2010-02-08  Andreas Schwab  <schwab@redhat.com>
-+
-+	[BZ #11155]
-+	* sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c: Include i386
-+	version.
-+
- 2010-02-05  H.J. Lu  <hongjiu.lu@intel.com>
- 
- 	[BZ #11230]
-@@ -2938,6 +2957,11 @@ d2009-10-30  Ulrich Drepper  <drepper@re
- 	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
- 	the unique symbol hash table should not be const.
- 
-+2009-07-22  Jakub Jelinek  <jakub@redhat.com>
-+
-+	* Makeconfig (ASFLAGS): Append $(sysdep-ASFLAGS).
-+	* sysdeps/i386/Makefile (sysdep-ASFLAGS): Add -U__i686.
-+
- 2009-07-21  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -3203,6 +3227,11 @@ d2009-10-30  Ulrich Drepper  <drepper@re
- 	out common code into new function get_common_indeces. Determine
- 	extended family and model for Intel processors.
- 
-+2009-06-26  Andreas Schwab  <aschwab@redhat.com>
-+
-+	* timezone/zic.c (stringzone): Don't try to generate a POSIX TZ
-+	string when the timezone ends in DST.
-+
- 2009-06-26  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -11896,6 +11925,10 @@ d2009-10-30  Ulrich Drepper  <drepper@re
- 	[BZ #4368]
- 	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
- 
-+2007-04-16  Jakub Jelinek  <jakub@redhat.com>
-+
-+	* locale/programs/locarchive.c (add_alias, insert_name): Remove static.
-+
- 2007-04-16  Ulrich Drepper  <drepper@redhat.com>
- 
- 	[BZ #4364]
-@@ -13153,6 +13186,15 @@ d2009-10-30  Ulrich Drepper  <drepper@re
- 	separators also if no non-zero digits found.
- 	* stdlib/Makefile (tests): Add tst-strtod3.
- 
-+2006-12-10  Jakub Jelinek  <jakub@redhat.com>
-+
-+	* sysdeps/unix/sysv/linux/netlinkaccess.h: Include linux/if_addr.h
-+	if IFA_MAX is not defined.
-+	(IFA_RTA, IFA_PAYLOAD, IFLA_RTA, IFLA_PAYLOAD): Define if not
-+	defined.
-+	* sysdeps/unix/sysv/linux/check_pf.c: Include netlinkaccess.h
-+	instead of asm/types.h, linux/netlink.h and linux/rtnetlink.h.
-+
- 2006-12-09  Ulrich Drepper  <drepper@redhat.com>
- 
- 	[BZ #3632]
 --- glibc-2.12-2-gc4ccff1/ChangeLog.15
 +++ glibc-2.12-1/ChangeLog.15
 @@ -477,6 +477,14 @@