From: Michael Tremer Date: Mon, 20 Dec 2010 11:23:35 +0000 (+0100) Subject: glibc: Update to 2.12.2. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9a1ddc152a45baf433b2c152181cf38e079abc1;p=ipfire-3.x.git glibc: Update to 2.12.2. Closes #112. --- diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm index 1d71ce984..2e520f11b 100644 --- a/pkgs/core/glibc/glibc.nm +++ b/pkgs/core/glibc/glibc.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = glibc -PKG_VER = 2.12.1 -PKG_REL = 4 +PKG_VER = 2.12.2 +PKG_REL = 0 # TODO tzdata @@ -55,7 +55,7 @@ CXXFLAGS += $(GLIBC_FLAGS) OPTIMIZED_KERNEL = 2.6.18 -PKG_OBJECTS += $(THISAPP).tar.gz +PKG_OBJECTS += $(THISAPP).tar.xz # $(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 e2f6bb376..2a1f881d7 100644 --- a/pkgs/core/glibc/patches/glibc-fedora.patch +++ b/pkgs/core/glibc/patches/glibc-fedora.patch @@ -1,5 +1,30 @@ ---- glibc-2.12-2-gc4ccff1/ChangeLog.15 -+++ glibc-2.12-1/ChangeLog.15 +--- glibc-2.12.2/ChangeLog ++++ /ChangeLog +@@ -329,6 +329,11 @@ + (do_preload): Use __RTLD_SECURE instead of is_preloaded. + (dlmopen_doit): Add __RTLD_SECURE to mode bits. + ++2010-12-13 Andreas Schwab ++ ++ * elf/dl-object.c (_dl_new_object): Ignore origin of privileged ++ program. ++ + 2010-10-06 Ulrich Drepper + + * string/bug-strstr1.c: New file. +@@ -375,6 +380,10 @@ + + * version.h (VERSION): Bump for 2.12.1 release. + ++2010-06-21 Andreas Schwab ++ ++ * sysdeps/i386/i686/Makefile: Don't pass -mtune to assembler. ++ + 2010-06-02 Kirill A. Shutemov + + * elf/dl-reloc.c: Flush cache after solving TEXTRELs if arch +--- glibc-2.12.2/ChangeLog.15 ++++ /ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -65,8 +90,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.12-2-gc4ccff1/ChangeLog.16 -+++ glibc-2.12-1/ChangeLog.16 +--- glibc-2.12.2/ChangeLog.16 ++++ /ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -120,8 +145,94 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.12-2-gc4ccff1/Makeconfig -+++ glibc-2.12-1/Makeconfig +--- glibc-2.12.2/ChangeLog.17 ++++ /ChangeLog.17 +@@ -256,6 +256,12 @@ + + * Makerules (libc-abis): Fix search for libc-abis in add-ons. + ++2010-04-06 Ulrich Drepper ++ ++ * 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 + + * sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/. +@@ -1010,6 +1016,19 @@ + * sysdeps/x86_64/fpu/fegetenv.c: Likewise + * sysdeps/s390/fpu/fegetenv.c: Likewise. Remove unused headers. + ++2009-10-27 Aurelien Jarno ++ ++ [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 ++ ++ [BZ #11155] ++ * sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c: Include i386 ++ version. ++ + 2010-02-05 H.J. Lu + + [BZ #11230] +@@ -2953,6 +2972,11 @@ d2009-10-30 Ulrich Drepper + * 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 ++ ++ * Makeconfig (ASFLAGS): Append $(sysdep-ASFLAGS). ++ * sysdeps/i386/Makefile (sysdep-ASFLAGS): Add -U__i686. ++ + 2009-07-21 Ulrich Drepper + + * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove +@@ -3218,6 +3242,11 @@ d2009-10-30 Ulrich Drepper + out common code into new function get_common_indeces. Determine + extended family and model for Intel processors. + ++2009-06-26 Andreas Schwab ++ ++ * timezone/zic.c (stringzone): Don't try to generate a POSIX TZ ++ string when the timezone ends in DST. ++ + 2009-06-26 Ulrich Drepper + + * resolv/resolv.h: Define RES_SNGLKUPREOP. +@@ -11911,6 +11940,10 @@ d2009-10-30 Ulrich Drepper + [BZ #4368] + * stdlib/stdlib.h: Remove obsolete part of comment for realpath. + ++2007-04-16 Jakub Jelinek ++ ++ * locale/programs/locarchive.c (add_alias, insert_name): Remove static. ++ + 2007-04-16 Ulrich Drepper + + [BZ #4364] +@@ -13168,6 +13201,15 @@ d2009-10-30 Ulrich Drepper + separators also if no non-zero digits found. + * stdlib/Makefile (tests): Add tst-strtod3. + ++2006-12-10 Jakub Jelinek ++ ++ * 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 + + [BZ #3632] +--- glibc-2.12.2/Makeconfig ++++ /Makeconfig @@ -789,12 +789,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -138,8 +249,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.12-2-gc4ccff1/csu/Makefile -+++ glibc-2.12-1/csu/Makefile +--- glibc-2.12.2/csu/Makefile ++++ /csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -150,9 +261,9 @@ vpath initfini.c $(sysdirs) ---- glibc-2.12-2-gc4ccff1/csu/elf-init.c -+++ glibc-2.12-1/csu/elf-init.c -@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, +--- glibc-2.12.2/csu/elf-init.c ++++ /csu/elf-init.c +@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **) extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -176,8 +287,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.12-2-gc4ccff1/debug/tst-chk1.c -+++ glibc-2.12-1/debug/tst-chk1.c +--- glibc-2.12.2/debug/tst-chk1.c ++++ /debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -206,8 +317,20 @@ # define O 0 # else # define O 1 ---- glibc-2.12-2-gc4ccff1/elf/ldconfig.c -+++ glibc-2.12-1/elf/ldconfig.c +--- glibc-2.12.2/elf/dl-object.c ++++ /elf/dl-object.c +@@ -220,6 +220,9 @@ _dl_new_object (char *realname, const char *libname, int type, + out: + new->l_origin = origin; + } ++ else if (INTUSE(__libc_enable_secure) && type == lt_executable) ++ /* The origin of a privileged program cannot be trusted. */ ++ new->l_origin = (char *) -1; + + return new; + } +--- glibc-2.12.2/elf/ldconfig.c ++++ /elf/ldconfig.c @@ -1031,17 +1031,19 @@ search_dirs (void) @@ -230,7 +353,7 @@ if (do_chroot && opt_chroot) { -@@ -1102,7 +1104,14 @@ parse_conf (const char *filename, bool d +@@ -1102,7 +1104,14 @@ parse_conf (const char *filename, bool do_chroot) cp += 8; while ((dir = strsep (&cp, " \t")) != NULL) if (dir[0] != '\0') @@ -246,7 +369,7 @@ } else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5])) { -@@ -1165,7 +1174,7 @@ parse_conf (const char *filename, bool d +@@ -1165,7 +1174,7 @@ parse_conf (const char *filename, bool do_chroot) config files to read. */ static void parse_conf_include (const char *config_file, unsigned int lineno, @@ -255,7 +378,7 @@ { if (opt_chroot && pattern[0] != '/') error (EXIT_FAILURE, 0, -@@ -1197,7 +1206,7 @@ parse_conf_include (const char *config_f +@@ -1197,7 +1206,7 @@ parse_conf_include (const char *config_file, unsigned int lineno, { case 0: for (size_t i = 0; i < gl.gl_pathc; ++i) @@ -288,9 +411,9 @@ + add_arch_dirs (config_file); } - char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.12-2-gc4ccff1/elf/tst-stackguard1.c -+++ glibc-2.12-1/elf/tst-stackguard1.c + const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; +--- glibc-2.12.2/elf/tst-stackguard1.c ++++ /elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -315,16 +438,16 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.12-2-gc4ccff1/include/bits/stdlib-ldbl.h -+++ glibc-2.12-1/include/bits/stdlib-ldbl.h +--- glibc-2.12.2/include/bits/stdlib-ldbl.h ++++ /include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.12-2-gc4ccff1/include/bits/wchar-ldbl.h -+++ glibc-2.12-1/include/bits/wchar-ldbl.h +--- glibc-2.12.2/include/bits/wchar-ldbl.h ++++ /include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.12-2-gc4ccff1/include/features.h -+++ glibc-2.12-1/include/features.h +--- glibc-2.12.2/include/features.h ++++ /include/features.h @@ -308,8 +308,13 @@ #endif @@ -341,8 +464,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.12-2-gc4ccff1/intl/locale.alias -+++ glibc-2.12-1/intl/locale.alias +--- glibc-2.12.2/intl/locale.alias ++++ /intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -352,8 +475,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.12-2-gc4ccff1/libio/stdio.h -+++ glibc-2.12-1/libio/stdio.h +--- glibc-2.12.2/libio/stdio.h ++++ /libio/stdio.h @@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -367,8 +490,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.12-2-gc4ccff1/locale/iso-4217.def -+++ glibc-2.12-1/locale/iso-4217.def +--- glibc-2.12.2/locale/iso-4217.def ++++ /locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -377,7 +500,7 @@ DEFINE_INT_CURR("AED") /* United Arab Emirates Dirham */ DEFINE_INT_CURR("AFN") /* Afghanistan Afgani */ DEFINE_INT_CURR("ALL") /* Albanian Lek */ -@@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD") /* Armenia Dram +@@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD") /* Armenia Dram */ DEFINE_INT_CURR("ANG") /* Netherlands Antilles */ DEFINE_INT_CURR("AOA") /* Angolan Kwanza */ DEFINE_INT_CURR("ARS") /* Argentine Peso */ @@ -392,7 +515,7 @@ DEFINE_INT_CURR("BGN") /* Bulgarian Lev */ DEFINE_INT_CURR("BHD") /* Bahraini Dinar */ DEFINE_INT_CURR("BIF") /* Burundi Franc */ -@@ -44,6 +47,7 @@ DEFINE_INT_CURR("CUP") /* Cuban Peso * +@@ -44,6 +47,7 @@ DEFINE_INT_CURR("CUP") /* Cuban Peso */ DEFINE_INT_CURR("CVE") /* Cape Verde Escudo */ DEFINE_INT_CURR("CYP") /* Cypriot Pound */ DEFINE_INT_CURR("CZK") /* Czech Koruna */ @@ -400,7 +523,7 @@ DEFINE_INT_CURR("DJF") /* Djibouti Franc */ DEFINE_INT_CURR("DKK") /* Danish Krone (Faroe Islands, Greenland) */ DEFINE_INT_CURR("DOP") /* Dominican Republic */ -@@ -51,16 +55,20 @@ DEFINE_INT_CURR("DZD") /* Algerian Dina +@@ -51,16 +55,20 @@ DEFINE_INT_CURR("DZD") /* Algerian Dinar */ DEFINE_INT_CURR("EEK") /* Estonian Kroon */ DEFINE_INT_CURR("EGP") /* Egyptian Pound */ DEFINE_INT_CURR("ERN") /* Eritrean Nakfa */ @@ -421,7 +544,7 @@ DEFINE_INT_CURR("GTQ") /* Guatemala Quetzal */ DEFINE_INT_CURR("GYD") /* Guyana Dollar */ DEFINE_INT_CURR("HKD") /* Hong Kong Dollar */ -@@ -69,12 +77,14 @@ DEFINE_INT_CURR("HRK") /* Croatia Kuna +@@ -69,12 +77,14 @@ DEFINE_INT_CURR("HRK") /* Croatia Kuna */ DEFINE_INT_CURR("HTG") /* Haiti Gourde */ DEFINE_INT_CURR("HUF") /* Hungarian Forint */ DEFINE_INT_CURR("IDR") /* Indonesia Rupiah */ @@ -436,7 +559,7 @@ DEFINE_INT_CURR("JEP") /* Jersey Pound */ DEFINE_INT_CURR("JMD") /* Jamaican Dollar */ DEFINE_INT_CURR("JOD") /* Jordanian Dinar */ -@@ -94,6 +104,7 @@ DEFINE_INT_CURR("LKR") /* Sri Lankan Ru +@@ -94,6 +104,7 @@ DEFINE_INT_CURR("LKR") /* Sri Lankan Rupee */ DEFINE_INT_CURR("LRD") /* Liberian Dollar */ DEFINE_INT_CURR("LSL") /* Lesotho Maloti */ DEFINE_INT_CURR("LTL") /* Lithuanian Litas */ @@ -444,7 +567,7 @@ DEFINE_INT_CURR("LVL") /* Latvia Lat */ DEFINE_INT_CURR("LYD") /* Libyan Arab Jamahiriya Dinar */ DEFINE_INT_CURR("MAD") /* Moroccan Dirham */ -@@ -114,6 +125,7 @@ DEFINE_INT_CURR("MZM") /* Mozambique Me +@@ -114,6 +125,7 @@ DEFINE_INT_CURR("MZM") /* Mozambique Metical */ DEFINE_INT_CURR("NAD") /* Namibia Dollar */ DEFINE_INT_CURR("NGN") /* Nigeria Naira */ DEFINE_INT_CURR("NIO") /* Nicaragua Cordoba Oro */ @@ -452,7 +575,7 @@ DEFINE_INT_CURR("NOK") /* Norwegian Krone */ DEFINE_INT_CURR("NPR") /* Nepalese Rupee */ DEFINE_INT_CURR("NZD") /* New Zealand Dollar */ -@@ -124,6 +136,7 @@ DEFINE_INT_CURR("PGK") /* Papau New Gui +@@ -124,6 +136,7 @@ DEFINE_INT_CURR("PGK") /* Papau New Guinea Kina */ DEFINE_INT_CURR("PHP") /* Philippines Peso */ DEFINE_INT_CURR("PKR") /* Pakistan Rupee */ DEFINE_INT_CURR("PLN") /* Polish Zloty */ @@ -460,9 +583,9 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.12-2-gc4ccff1/locale/programs/locarchive.c -+++ glibc-2.12-1/locale/programs/locarchive.c -@@ -134,7 +134,7 @@ create_archive (const char *archivefname +--- glibc-2.12.2/locale/programs/locarchive.c ++++ /locale/programs/locarchive.c +@@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah) size_t reserved = RESERVE_MMAP_SIZE; int xflags = 0; if (total < reserved @@ -471,7 +594,7 @@ -1, 0)) != MAP_FAILED)) xflags = MAP_FIXED; else -@@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const vo +@@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b) /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, locale_data_t data, bool replace); @@ -484,7 +607,7 @@ static bool -@@ -396,7 +396,7 @@ enlarge_archive (struct locarhandle *ah, +@@ -396,7 +396,7 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) size_t reserved = RESERVE_MMAP_SIZE; int xflags = 0; if (total < reserved @@ -493,7 +616,7 @@ -1, 0)) != MAP_FAILED)) xflags = MAP_FIXED; else -@@ -614,7 +614,7 @@ open_archive (struct locarhandle *ah, bo +@@ -614,7 +614,7 @@ open_archive (struct locarhandle *ah, bool readonly) int xflags = 0; void *p; if (st.st_size < reserved @@ -520,9 +643,9 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.12-2-gc4ccff1/localedata/Makefile -+++ glibc-2.12-1/localedata/Makefile -@@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo +--- glibc-2.12.2/localedata/Makefile ++++ /localedata/Makefile +@@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ $(LOCALEDEF) --alias-file=../intl/locale.alias \ @@ -530,8 +653,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.12-2-gc4ccff1/localedata/SUPPORTED -+++ glibc-2.12-1/localedata/SUPPORTED +--- glibc-2.12.2/localedata/SUPPORTED ++++ /localedata/SUPPORTED @@ -85,6 +85,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -573,9 +696,9 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.12-2-gc4ccff1/localedata/locales/cy_GB -+++ glibc-2.12-1/localedata/locales/cy_GB -@@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" t_fmt "" @@ -589,9 +712,9 @@ END LC_TIME LC_MESSAGES ---- glibc-2.12-2-gc4ccff1/localedata/locales/en_GB -+++ glibc-2.12-1/localedata/locales/en_GB -@@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" t_fmt "" @@ -602,8 +725,8 @@ date_fmt "/ / " ---- glibc-2.12-2-gc4ccff1/localedata/locales/no_NO -+++ glibc-2.12-1/localedata/locales/no_NO +--- glibc-2.12.2/localedata/locales/no_NO ++++ /localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -674,8 +797,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.12-2-gc4ccff1/localedata/locales/zh_TW -+++ glibc-2.12-1/localedata/locales/zh_TW +--- glibc-2.12.2/localedata/locales/zh_TW ++++ /localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -703,14 +826,15 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.12-2-gc4ccff1/malloc/mcheck.c -+++ glibc-2.12-1/malloc/mcheck.c -@@ -24,9 +24,25 @@ +--- glibc-2.12.2/malloc/mcheck.c ++++ /malloc/mcheck.c +@@ -25,10 +25,26 @@ # include # include # include +# include # include + # include #endif +#ifdef _LIBC @@ -731,7 +855,7 @@ /* Old hook values. */ static void (*old_free_hook) (__ptr_t ptr, __const __ptr_t); static __ptr_t (*old_malloc_hook) (__malloc_size_t size, const __ptr_t); -@@ -197,7 +213,7 @@ freehook (__ptr_t ptr, const __ptr_t cal +@@ -199,7 +215,7 @@ freehook (__ptr_t ptr, const __ptr_t caller) if (old_free_hook != NULL) (*old_free_hook) (ptr, caller); else @@ -740,7 +864,7 @@ __free_hook = freehook; } -@@ -214,7 +230,7 @@ mallochook (__malloc_size_t size, const +@@ -222,7 +238,7 @@ mallochook (__malloc_size_t size, const __ptr_t caller) hdr = (struct hdr *) (*old_malloc_hook) (sizeof (struct hdr) + size + 1, caller); else @@ -749,7 +873,7 @@ __malloc_hook = mallochook; if (hdr == NULL) return NULL; -@@ -245,7 +261,7 @@ memalignhook (__malloc_size_t alignment, +@@ -259,7 +275,7 @@ memalignhook (__malloc_size_t alignment, __malloc_size_t size, if (old_memalign_hook != NULL) block = (*old_memalign_hook) (alignment, slop + size + 1, caller); else @@ -758,7 +882,7 @@ __memalign_hook = memalignhook; if (block == NULL) return NULL; -@@ -300,8 +316,8 @@ reallochook (__ptr_t ptr, __malloc_size_ +@@ -320,8 +336,8 @@ reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller) sizeof (struct hdr) + size + 1, caller); else @@ -769,7 +893,7 @@ __free_hook = freehook; __malloc_hook = mallochook; __memalign_hook = memalignhook; -@@ -361,8 +377,8 @@ mcheck (func) +@@ -381,8 +397,8 @@ mcheck (func) if (__malloc_initialized <= 0 && !mcheck_used) { /* We call malloc() once here to ensure it is initialized. */ @@ -780,8 +904,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.12-2-gc4ccff1/manual/libc.texinfo -+++ glibc-2.12-1/manual/libc.texinfo +--- glibc-2.12.2/manual/libc.texinfo ++++ /manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -791,8 +915,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.12-2-gc4ccff1/misc/sys/cdefs.h -+++ glibc-2.12-1/misc/sys/cdefs.h +--- glibc-2.12.2/misc/sys/cdefs.h ++++ /misc/sys/cdefs.h @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -836,8 +960,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.12-2-gc4ccff1/nis/nss -+++ glibc-2.12-1/nis/nss +--- glibc-2.12.2/nis/nss ++++ /nis/nss @@ -25,7 +25,7 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get @@ -847,9 +971,9 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.12-2-gc4ccff1/nptl/ChangeLog -+++ glibc-2.12-1/nptl/ChangeLog -@@ -3884,6 +3884,15 @@ +--- glibc-2.12.2/nptl/ChangeLog ++++ /nptl/ChangeLog +@@ -3938,6 +3938,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -865,7 +989,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -4620,6 +4629,11 @@ +@@ -4674,6 +4683,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -877,7 +1001,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6694,6 +6708,11 @@ +@@ -6748,6 +6762,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -889,9 +1013,9 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.12-2-gc4ccff1/nptl/Makefile -+++ glibc-2.12-1/nptl/Makefile -@@ -341,7 +341,8 @@ endif +--- glibc-2.12.2/nptl/Makefile ++++ /nptl/Makefile +@@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -901,7 +1025,7 @@ endif CFLAGS-flockfile.c = -D_IO_MTSAFE_IO -@@ -527,15 +528,19 @@ $(addprefix $(objpfx), \ +@@ -529,15 +530,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a $(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so @@ -923,8 +1047,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.12-2-gc4ccff1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.12-1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.12.2/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ /nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -933,8 +1057,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.12-2-gc4ccff1/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.12-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.12.2/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ /nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -942,8 +1066,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.12-2-gc4ccff1/nptl/tst-stackguard1.c -+++ glibc-2.12-1/nptl/tst-stackguard1.c +--- glibc-2.12.2/nptl/tst-stackguard1.c ++++ /nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -968,8 +1092,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.12-2-gc4ccff1/nscd/nscd.conf -+++ glibc-2.12-1/nscd/nscd.conf +--- glibc-2.12.2/nscd/nscd.conf ++++ /nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -979,8 +1103,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.12-2-gc4ccff1/nscd/nscd.init -+++ glibc-2.12-1/nscd/nscd.init +--- glibc-2.12.2/nscd/nscd.init ++++ /nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1021,7 +1145,7 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd -@@ -83,7 +72,7 @@ restart() { +@@ -83,11 +72,11 @@ restart() { # See how we were called. case "$1" in start) @@ -1030,6 +1154,11 @@ RETVAL=$? ;; stop) +- stop ++ [ ! -e /var/lock/subsys/nscd ] || stop + RETVAL=$? + ;; + status) @@ -99,14 +88,17 @@ case "$1" in RETVAL=$? ;; @@ -1052,9 +1181,9 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.12-2-gc4ccff1/posix/Makefile -+++ glibc-2.12-1/posix/Makefile -@@ -305,15 +305,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi +--- glibc-2.12.2/posix/Makefile ++++ /posix/Makefile +@@ -317,15 +317,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1074,8 +1203,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.12-2-gc4ccff1/posix/gai.conf -+++ glibc-2.12-1/posix/gai.conf +--- glibc-2.12.2/posix/gai.conf ++++ /posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -1100,8 +1229,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.12-2-gc4ccff1/posix/getconf.speclist.h -+++ glibc-2.12-1/posix/getconf.speclist.h +--- glibc-2.12.2/posix/getconf.speclist.h ++++ /posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1142,8 +1271,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.12-2-gc4ccff1/streams/Makefile -+++ glibc-2.12-1/streams/Makefile +--- glibc-2.12.2/streams/Makefile ++++ /streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1153,8 +1282,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.12-2-gc4ccff1/sysdeps/generic/dl-cache.h -+++ glibc-2.12-1/sysdeps/generic/dl-cache.h +--- glibc-2.12.2/sysdeps/generic/dl-cache.h ++++ /sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1170,8 +1299,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-2.12-2-gc4ccff1/sysdeps/i386/Makefile -+++ glibc-2.12-1/sysdeps/i386/Makefile +--- glibc-2.12.2/sysdeps/i386/Makefile ++++ /sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1196,8 +1325,30 @@ endif ifeq ($(subdir),elf) ---- glibc-2.12-2-gc4ccff1/sysdeps/ia64/Makefile -+++ glibc-2.12-1/sysdeps/ia64/Makefile +--- glibc-2.12.2/sysdeps/i386/i686/Makefile ++++ /sysdeps/i386/i686/Makefile +@@ -9,19 +9,3 @@ stack-align-test-flags += -msse + ifeq ($(subdir),string) + sysdep_routines += cacheinfo + endif +- +-ifeq (yes,$(config-asflags-i686)) +-CFLAGS-.o += -Wa,-mtune=i686 +-CFLAGS-.os += -Wa,-mtune=i686 +-CFLAGS-.op += -Wa,-mtune=i686 +-CFLAGS-.og += -Wa,-mtune=i686 +-CFLAGS-.ob += -Wa,-mtune=i686 +-CFLAGS-.oS += -Wa,-mtune=i686 +- +-ASFLAGS-.o += -Wa,-mtune=i686 +-ASFLAGS-.os += -Wa,-mtune=i686 +-ASFLAGS-.op += -Wa,-mtune=i686 +-ASFLAGS-.og += -Wa,-mtune=i686 +-ASFLAGS-.ob += -Wa,-mtune=i686 +-ASFLAGS-.oS += -Wa,-mtune=i686 +-endif +--- glibc-2.12.2/sysdeps/ia64/Makefile ++++ /sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1209,8 +1360,8 @@ endif endif ---- glibc-2.12-2-gc4ccff1/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.12-1/sysdeps/ia64/ia64libgcc.S +--- glibc-2.12.2/sysdeps/ia64/ia64libgcc.S ++++ /sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1562,8 +1713,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.12-2-gc4ccff1/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.12-1/sysdeps/ia64/libgcc-compat.c +--- glibc-2.12.2/sysdeps/ia64/libgcc-compat.c ++++ /sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1649,8 +1800,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.12-2-gc4ccff1/sysdeps/posix/getaddrinfo.c -+++ glibc-2.12-1/sysdeps/posix/getaddrinfo.c +--- glibc-2.12.2/sysdeps/posix/getaddrinfo.c ++++ /sysdeps/posix/getaddrinfo.c @@ -1099,10 +1099,12 @@ static const struct scopeentry /* Link-local addresses: scope 2. */ { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 }, @@ -1664,8 +1815,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.12-2-gc4ccff1/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.12-1/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.12.2/sysdeps/powerpc/powerpc64/Makefile ++++ /sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1674,8 +1825,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.12-2-gc4ccff1/sysdeps/unix/nice.c -+++ glibc-2.12-1/sysdeps/unix/nice.c +--- glibc-2.12.2/sysdeps/unix/nice.c ++++ /sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1690,8 +1841,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.12-1/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.12.2/sysdeps/unix/sysv/linux/check_pf.c ++++ /sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -1707,8 +1858,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.12-1/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.12.2/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ /sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -1723,7 +1874,7 @@ #ifndef MIN # define MIN(a,b) (((a)<(b))?(a):(b)) -@@ -80,6 +83,32 @@ _dl_setup_stack_chk_guard (void *dl_rand +@@ -80,6 +83,32 @@ _dl_setup_stack_chk_guard (void *dl_random) unsigned char *p = (unsigned char *) &ret; p[sizeof (ret) - 1] = 255; p[sizeof (ret) - 2] = '\n'; @@ -1756,8 +1907,8 @@ } else #endif ---- glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.12-1/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.12.2/sysdeps/unix/sysv/linux/futimesat.c ++++ /sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1800,8 +1951,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.12-1/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.12.2/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ /sysdeps/unix/sysv/linux/i386/dl-cache.h @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -1862,8 +2013,8 @@ + } while (0) + +#include_next ---- glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.12-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.12.2/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ /sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -1896,29 +2047,29 @@ + } while (0) + #include_next ---- glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.12-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.12.2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ /sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.12-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.12.2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ /sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.12-1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.12.2/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ /sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.12-1/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.12.2/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ /sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -1944,8 +2095,8 @@ struct netlink_res { ---- glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.12-1/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.12.2/sysdeps/unix/sysv/linux/paths.h ++++ /sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -1955,14 +2106,14 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c -+++ glibc-2.12-1/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c +--- glibc-2.12.2/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c ++++ /sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c @@ -1 +1 @@ -#include "../../fxstat.c" +#include "../../i386/fxstat.c" ---- glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.12-1/sysdeps/unix/sysv/linux/tcsetattr.c -@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios +--- glibc-2.12.2/sysdeps/unix/sysv/linux/tcsetattr.c ++++ /sysdeps/unix/sysv/linux/tcsetattr.c +@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; unsigned long int cmd; @@ -1970,7 +2121,7 @@ switch (optional_actions) { -@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios +@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios_p) memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0], __KERNEL_NCCS * sizeof (cc_t)); @@ -2007,8 +2158,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.12-2-gc4ccff1/timezone/zic.c -+++ glibc-2.12-1/timezone/zic.c +--- glibc-2.12.2/timezone/zic.c ++++ /timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) return;