Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at 2012-04-23 16:10:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glibc (Old) and /work/SRC/openSUSE:Factory/.glibc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glibc", Maintainer is "jfch@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/glibc/glibc.changes 2012-04-18 12:34:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glibc.new/glibc.changes 2012-04-23 16:11:07.000000000 +0200 @@ -1,0 +2,32 @@ +Sun Apr 22 11:35:05 UTC 2012 - aj@suse.de + +- gcc 4.7 does not build crt files properly on powerpc64, backport + patch from upstream to handle this + (glibc-2.16-powerpc-initfini.patch) + +------------------------------------------------------------------- +Fri Apr 20 18:28:18 UTC 2012 - aj@suse.de + +- Disable patch x86-cpuid-level2.patch, this should be fixed in + valgrind now. + +------------------------------------------------------------------- +Thu Apr 19 11:12:43 UTC 2012 - aj@suse.de + +- Reorder patches, refresh to apply cleanly with -p1. + +------------------------------------------------------------------- +Wed Apr 18 11:35:48 UTC 2012 - aj@suse.de + +- Build profiled libs only for base. +- Cleanup patches. +- Remove glibc-2.14-fix-ctors.patch, we have proper support in + binutils now. + +------------------------------------------------------------------- +Tue Apr 17 12:35:21 UTC 2012 - aj@suse.de + +- The dynamic linker for armv7 hardware float is called + /lib/ld-linux-armhf.so.3. Provide symlink for old location. + +------------------------------------------------------------------- Old: ---- glibc-2.14-fix-ctors.patch glibc-2.4.90-nscd.diff glibc-fix-lookup-crash.patch New: ---- glibc-2.16-powerpc-initfini.patch glibc-nscd.conf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:12.000000000 +0200 @@ -120,17 +120,17 @@ Source2: glibc-ports-%{glibc_ports_ver}-%{ports_git_id}.tar.bz2 Source3: noversion.tar.bz2 Source4: manpages.tar.bz2 -Source8: nsswitch.conf -Source9: nscd.init -Source10: bindresvport.blacklist -Source12: glibc_post_upgrade.c -Source15: glibc.rpmlintrc -Source16: baselibs.conf +Source5: nsswitch.conf +Source6: nscd.init +Source7: bindresvport.blacklist +Source8: glibc_post_upgrade.c +Source9: glibc.rpmlintrc +Source10: baselibs.conf # For systemd Source20: nscd.conf Source21: nscd.service Source22: nscd.socket -# +# crypt_blowfish Source50: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz Source51: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz.sign @@ -146,8 +146,8 @@ # ### -# Patches are ordered as: -# Patches that we will never upstream or which have not been looked at: 0000-0999 +# Patches are ordered in the following groups: +# Patches that we will never upstream or which have not been looked at: 0-999 # Patches taken from upstream: 1000-2000 # Patches that are going upstream, waiting approval: 2000-3000 ### @@ -155,96 +155,95 @@ ### # Patches that upstream will not accept ### -# PATCH-FIX-OPENSUSE remove lfs test from testsuite aj@suse.de -Patch0: glibc-testsuite.patch -# PATCH-FIX-OPENSUSE handle glibc binaries -Patch1: glibc-2.3.90-noversion.diff -# PATCH-FIX-OPENSUSE reload /etc/resolv.conf on change -Patch3: glibc-resolv-reload.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch4: glibc-2.3.locales.diff.bz2 + +### +# openSUSE specific patches - won't go upstream +### +### openSUSE extensions, configuration # PATCH-FEATURE-OPENSUSE -- add crypt_blowfish support - bnc#700876 -Patch5: glibc-2.14-crypt.diff +Patch1: glibc-2.14-crypt.diff # PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de -Patch6: glibc-2.14-crypt-versioning.diff -# PATCH-FIX-OPENSUSE add some extra information to version output - kukuk@suse.de -Patch7: glibc-version.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch8: glibc-2.4.90-revert-only-euro.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch12: glibc-2.3.2.no_archive.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch14: glibc-2.3.90-bindresvport.blacklist.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch16: glibc-2.4.90-no_NO.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch20: glibc-2.4-china.diff -# PATCH-FIX-OPENSUSE Fix gb18030 code bnc#54080 -Patch21: gb18030.patch.bz2 -# PATCH-FIX-OPENSUSE Handle timestamp, adjust nscd.conf -Patch22: glibc-2.4.90-nscd.diff +Patch2: glibc-2.14-crypt-versioning.diff +# PATCH-FEATURE-OPENSUSE -- add sha support to crypt_blowfish lnussel@suse.de +Patch3: crypt_blowfish-1.2-sha.diff +# PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de +Patch4: crypt_blowfish-1.2-versioning.diff +# PATCH-FIX-OPENSUSE Avoid build failure on noexecstack marker on ARM dmueller@suse.de +Patch5: crypt_blowfish-1.2-hack_around_arm.diff # PATCH-FIX-OPENSUSE Fix path for nscd databases -Patch23: glibc-2.3.3-nscd-db-path.diff +Patch6: glibc-2.3.3-nscd-db-path.diff +# PATCH-FIX-OPENSUSE Fix path for nss_db (bnc#753657) - aj@suse.de +Patch7: nss-db-path.patch +# PATCH-FIX-OPENSUSE adjust nscd.conf +Patch8: glibc-nscd.conf.patch +# PATCH-FIX-OPENSUSE do not use compile time in binaries +Patch9: glibc-nodate.patch +# PATCH-FIX-OPENSUSE -- add some extra information to version output - kukuk@suse.de +Patch10: glibc-version.diff +# PATCH-FIX-OPENSUSE remove lfs test from testsuite aj@suse.de +Patch11: glibc-testsuite.patch +# PATCH-FIX-OPENSUSE handle old glibc binaries +Patch12: glibc-2.3.90-noversion.diff +# PATCH-FIX-OPENSUSE -- Make --no-archive default for localedef - kukuk@suse.de +Patch13: glibc-2.3.2.no_archive.diff +# PATCH-FIX-OPENSUSE -- add blacklist for bindresvport +Patch14: glibc-2.3.90-bindresvport.blacklist.diff # PATCH-FIX-OPENSUSE prefer -lang rpm packages -Patch25: glibc-2.3.90-langpackdir.diff -# PATCH-FIX-OPENSUSE Fix hangs in UDP RPC calls bso#5379 bnc#257745 aj@suse.de -Patch28: glibc-2.2-sunrpc.diff +Patch15: glibc-2.3.90-langpackdir.diff # PATCH-FIX-OPENSUSE Do not generate hardlink for getconf -Patch29: glibc-2.8-getconf.diff -# PATCH-FIX-OPENSUSE only use ipv6 if real ipv6 address exists bnc#361697, bnc#684534 -Patch30: getaddrinfo-ipv6-sanity.diff +Patch16: glibc-2.8-getconf.diff # PATCH-FIX-OPENSUSE add option --enable-runbinaries to disable running of compiled binaries -Patch33: glibc-compiled-binaries.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch36: glibc-no-unwind-tables.diff -# PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility kukuk@suse.de -Patch38: glibc-cpusetsize.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch45: glibc-gai-private4.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch46: glibc-resolv-mdnshint.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch47: glibc-nscd-hconf.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch49: glibc-fini-unwind.diff -# PATCH-FIX-OPENSUSE bnc#657627, http://sourceware.org/bugzilla/show_bug.cgi?id=12561 -Patch52: glibc-elf-localscope.diff -# FIX-OPENSUSE compile some files with -fno-strict-aliasing -Patch58: glibc-strict-aliasing.diff -# PATCH-FIX-OPENSUSE disable rewriting ::1 to 127.0.0.1 for /etc/hosts bnc#684534, bnc#706719 -Patch65: glibc-fix-double-loopback.diff +Patch17: glibc-compiled-binaries.diff +# PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility kukuk@suse.de (XXX: Review) +Patch18: glibc-cpusetsize.diff +# PATCH-FIX-OPENSUSE Do not trigger an abort when an i586 Intel CPU is running the i686 library, as valgrind does. bnc#681398 aj@suse.de +# According the the Debian bug report, this is fixed in valgrind now, so disable +# this patch. +Patch19: x86-cpuid-level2.patch + +### Locale related patches +# PATCH-FIX-OPENSUSE Add additional locales +Patch100: glibc-2.3.locales.diff.bz2 +# PATCH-FIX-OPENSUSE Support pre-EURO currencies (XXX: Still needed?) +Patch101: glibc-2.4.90-revert-only-euro.diff +# PATCH-FIX-OPENSUSE -- Add no_NO back (XXX: Still needed?) +Patch102: glibc-2.4.90-no_NO.diff +# PATCH-FIX-OPENSUSE -- Renames for China +Patch103: glibc-2.4-china.diff +# PATCH-FIX-OPENSUSE Fix gb18030 code bnc#54080 +Patch104: gb18030.patch.bz2 + +### Broken patches in glibc that we revert for now: # PATCH-FEATURE-OPENSUSE Revert sunrpc removal aj@suse.de -Patch66: glibc2.14-revert-sunrpc-removal.patch +Patch200: glibc2.14-revert-sunrpc-removal.patch # PATCH-FIX-OPENSUSE revert seeking on fclose for now bnc#711829 matz@suse.de -Patch67: glibc-revert-fseek-on-fclose.diff -# PATCH-FIX-OPENSUSE Fix crash (access-after-free) in dl_lookup_x bnc#703140, bso#13579 matz@suse.de -Patch68: glibc-fix-lookup-crash.patch -# PATCH-FIX-OPENSUSE Fix crash (access-after-free) in dl_lookup_x bnc#703140, bso#13579 matz@suse.de -Patch69: glibc-fix-noload.patch -# PATCH-FIX-OPENSUSE Do not trigger an abort when an i586 Intel CPU is running the i686 library, as valgrind does. bnc#681398 aj@suse.de -Patch71: x86-cpuid-level2.patch -# PATCH-FIX-OPENSUSE Run ctors (bnc#717671) aj@suse.de -Patch74: glibc-2.14-fix-ctors.patch -# PATCH-FEATURE-OPENSUSE -- add sha support to crypt_blowfish lnussel@suse.de -Patch80: crypt_blowfish-1.2-sha.diff -# PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de -Patch81: crypt_blowfish-1.2-versioning.diff -# PATCH-FIX-OPENSUSE Avoid build failure on noexecstack marker on ARM dmueller@suse.de -Patch82: crypt_blowfish-1.2-hack_around_arm.diff -# PATCH-FIX-OPENSUSE avoid false positive warning that triggers brp postcheck fail -Patch84: nscd-avoid-gcc-warning.diff -# PATCH-FIX-OPENSUSE fixed build-compare by omitting one more date - meissner@suse.de -Patch87: glibc-nodate.patch +Patch201: glibc-revert-fseek-on-fclose.diff # PATCH-FIX-OPENSUSE revert pthread-cond-wait change since it causes hangs - aj@suse.de -Patch88: pthread-cond-wait-revert.patch -# PATCH-FIX-OPENSUSE Fix cycle detection - aj@suse.de -Patch95: cycle-detection.patch -# PATCH-FIX-OPENSUSE Fix LD_PROFILE (glibc bug#13818) - aj@suse.de -Patch96: glibc-ld-profile.patch -# PATCH-FIX-OPENSUSE Fix path for nss_db (bnc#753657) - aj@suse.de -Patch97: nss-db-path.patch -# PATCH-FIX-OPENSUSE Fix cycle detection 2 (from Fedora) - aj@suse.de -Patch100: glibc-sw13618-2.patch +Patch202: pthread-cond-wait-revert.patch + +### Network related patches +# PATCH-FIX-OPENSUSE reload /etc/resolv.conf on change +Patch300: glibc-resolv-reload.diff +# PATCH-FIX-OPENSUSE Fix hangs in UDP RPC calls bso#5379 bnc#257745 aj@suse.de +Patch301: glibc-2.2-sunrpc.diff +# PATCH-FIX-OPENSUSE only use ipv6 if real ipv6 address exists bnc#361697, bnc#684534 +Patch302: getaddrinfo-ipv6-sanity.diff +# PATCH-FIX-OPENSUSE Consider private IPv4 addresses as global-scope in gai.conf [bnc#597616] +Patch303: glibc-gai-private4.diff +# PATCH-FIX-OPENSUSE Warn about usage of mdns in resolv.conv +Patch304: glibc-resolv-mdnshint.diff +# PATCH-FIX-OPENSUSE nscd does not account for 'multi on' in /etc/host.conf when ai-resolving host bso#11928 +Patch305: glibc-nscd-hconf.diff +# PATCH-FIX-OPENSUSE disable rewriting ::1 to 127.0.0.1 for /etc/hosts bnc#684534, bnc#706719 +Patch306: glibc-fix-double-loopback.diff + +### Misc patches +# PATCH-FIX-OPENSUSE don't use unwind tables for initfini (solved differently for glibc 2.16) +Patch400: glibc-no-unwind-tables.diff +# FIX-OPENSUSE compile some files with -fno-strict-aliasing +Patch401: glibc-strict-aliasing.diff +# PATCH-FIX-OPENSUSE avoid false positive warning that triggers brp postcheck fail +Patch402: nscd-avoid-gcc-warning.diff ### # Patches from upstream @@ -269,6 +268,8 @@ Patch1008: glibc-2.16-fix-check-localplt.patch # PATCH-FIX-UPSTREAM - Allow compilation with -altivec aj@suse.de Patch1009: glibc-uio-cell.diff +# PATCH-FIX-UPSTREAM - do not use initfini anymore +Patch1010: glibc-2.16-powerpc-initfini.patch ### # Patches awaiting upstream approval @@ -279,6 +280,18 @@ Patch2002: armhf-ld-so.patch # PATCH-FIX-UPSTREAM Fix crash when nscd is not running (bso#135949) - aj@suse.de Patch2003: glibc-nscd-crash-bso13594.patch +# PATCH-FIX-OPENSUSE Fix crash (access-after-free) in dl_lookup_x bnc#703140, bso#13579 matz@suse.de +Patch2004: glibc-fix-noload.patch +# PATCH-FIX-OPENSUSE bnc#657627, http://sourceware.org/bugzilla/show_bug.cgi?id=12561 +Patch2005: glibc-elf-localscope.diff +# PATCH-FIX-OPENSUSE Fix cycle detection - aj@suse.de +Patch2006: cycle-detection.patch +# PATCH-FIX-OPENSUSE Fix cycle detection 2 (from Fedora) - aj@suse.de +Patch2007: glibc-sw13618-2.patch +# PATCH-FIX-OPENSUSE Fix LD_PROFILE (glibc bug#13818) - aj@suse.de +Patch2008: glibc-ld-profile.patch +# PATCH-FIX-OPENSUSE _fini does not have proper unwinding information on x86_64 bso#11610 +Patch2009: glibc-fini-unwind.diff %description The GNU C Library provides the most important standard libraries used @@ -460,80 +473,86 @@ # Owl crypt_blowfish tar -xzf %SOURCE50 pushd crypt_blowfish-%{crypt_bf_version} -%patch80 -p1 -%patch81 -p1 -%patch82 +%patch3 -p1 +%patch4 -p1 +%patch5 popd mv crypt/{crypt.h,gnu-crypt.h} mv crypt_blowfish-%crypt_bf_version/*.[chS] crypt/ # -%patch0 -# libNoVersion part is only active on ix86 %patch1 -p1 -%patch3 -%patch4 -%patch5 -p1 +%patch2 -p1 %patch6 -p1 -%patch7 -%patch8 -%patch12 -%patch14 -%patch16 -p1 -%patch20 -p1 -%patch21 -p1 +%patch7 -p1 +%patch8 -p1 # avoid changing nscd_stat.c mtime to avoid code generation # differences on each rebuild touch -r nscd/nscd_stat.c nscd/s-stamp -%patch22 -%patch23 +%patch9 -p1 touch -r nscd/s-stamp nscd/nscd_stat.c rm nscd/s-stamp -%patch25 -%patch28 -p1 -%patch29 -%patch30 -%patch33 -p1 -%patch36 -p1 -%patch38 -%patch1009 -p1 -%patch45 -%patch46 -p1 -%patch47 -p1 -%patch49 -# XXX: Does not pass testsuite, still there's no better solution yet -%patch52 -%patch58 -p1 -%patch65 -p1 -%patch66 -p1 -%patch67 -p1 -# XXX Patch 69 replaces 68, remove soon -#%patch68 -p1 -%patch69 -p1 -%patch71 -p1 -%patch2001 -p1 -%patch74 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +# This should be fixed in valgrind now +#%patch19 -p1 + +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 + +%patch200 -p1 +%patch201 -p1 +%patch202 -p1 -R + +%patch300 -p1 +%patch301 -p1 +%patch302 -p1 +%patch303 -p1 +%patch304 -p1 +%patch305 -p1 +%patch306 -p1 + +%patch400 -p1 +%patch401 -p1 +%patch402 -p1 + %patch1000 -p1 -%patch84 -p1 -%patch87 -p1 -%patch88 -p1 -R %patch1001 -p1 %patch1002 -p1 %patch1003 -p1 %patch1004 -p1 %patch1005 -p1 -%patch95 -p1 -# XXX Disable, it breaks the testsuite, test elf/tst-audit2 -# %patch96 -p1 -%patch97 -p1 -%patch2003 -p1 %patch1006 -p1 -%patch100 -p1 %patch1007 -p1 %patch1008 -p1 +%patch1009 -p1 +%ifarch ppc ppc64 +# to support further architectures, some more changes are needed +%patch1010 -p1 +%endif + +%patch2001 -p1 %ifarch armv7l -# Disable for now -#%patch2002 -p1 +%patch2002 -p1 %endif +%patch2003 -p1 +%patch2004 -p1 +# XXX: Does not pass testsuite, still there's no better solution yet +%patch2005 -p1 +%patch2006 -p1 +%patch2007 -p1 +# XXX Disable, it breaks the testsuite, test elf/tst-audit2 +# %patch2008 -p1 +%patch2009 -p1 # # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! @@ -664,13 +683,17 @@ conf_cflags="$cflags" %endif + profile="--disable-profile" +%if %{build_profile} + if [ "$dirname" = "base" ] ; then + profile="--enable-profile" + fi +%endif CFLAGS="$conf_cflags" CC="$BuildCC" CXX="$BuildCCplus" ../configure \ --prefix=%{_prefix} \ --libexecdir=%{_libdir} --infodir=%{_infodir} \ --enable-add-ons=nptl$addons \ -%if %{build_profile} - --enable-profile \ -%endif + $profile \ "$@" \ %if %{enable_stackguard_randomization} --enable-stackguard-randomization \ @@ -916,8 +939,8 @@ install -m 0700 glibc_post_upgrade %{buildroot}%{_sbindir} -install -m 644 $RPM_SOURCE_DIR/bindresvport.blacklist %{buildroot}/etc -install -m 644 $RPM_SOURCE_DIR/nsswitch.conf %{buildroot}/etc +install -m 644 %{SOURCE7} %{buildroot}/etc +install -m 644 %{SOURCE5} %{buildroot}/etc install -m 644 posix/gai.conf %{buildroot}/etc mkdir -p %{buildroot}/etc/default @@ -944,7 +967,7 @@ cp nscd/nscd.conf %{buildroot}/etc mkdir -p %{buildroot}/etc/init.d -install -m 755 $RPM_SOURCE_DIR/nscd.init %{buildroot}/etc/init.d/nscd +install -m 755 %{SOURCE6} %{buildroot}/etc/init.d/nscd ln -sf /etc/init.d/nscd %{buildroot}/usr/sbin/rcnscd mkdir -p %{buildroot}/var/run/nscd touch %{buildroot}/var/run/nscd/{passwd,group,hosts} @@ -998,7 +1021,7 @@ %ifarch armv7l # Provide compatibility link -# XXX ln -s ld-%{version}.so %{buildroot}/lib/ld-linux.so.3 +ln -s ld-%{version}.so %{buildroot}/lib/ld-linux.so.3 %endif ####################################################################### @@ -1077,7 +1100,7 @@ # Each architecture has a different name for the dynamic linker: %ifarch %arm %ifarch armv7l -#XXX /%{_lib}/ld-linux-armhf.so.3 +/%{_lib}/ld-linux-armhf.so.3 # Keep compatibility link /%{_lib}/ld-linux.so.3 %else ++++++ armhf-ld-so.patch ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:12.000000000 +0200 @@ -1,3 +1,9 @@ +For backward compatibility with armhf binaries built with the +old linker SONAME, we need to fake out the linker to believe +the new is the old, until such a point as everything is rebuilt. + +Patch for elf/dl-load.c taken from Debian. + diff --git a/sysdeps/arm/shlib-versions b/sysdeps/arm/shlib-versions index 491dd0a..5464959 100644 --- a/glibc-ports-2.15/sysdeps/arm/shlib-versions @@ -8,3 +14,21 @@ -arm.*-.*-linux-gnueabi.* ld=ld-linux.so.3 +arm.*-.*-linux-gnueabi.* ld=ld-linux-armhf.so.3 arm.*-.*-linux.* ld=ld-linux.so.2 + +--- glibc-2.15/elf/dl-load.c.~1~ 2011-12-30 23:13:56.000000000 +0100 ++++ glibc-2.15/elf/dl-load.c 2012-04-18 15:05:33.203485389 +0200 +@@ -2082,10 +2082,13 @@ + soname = ((const char *) D_PTR (l, l_info[DT_STRTAB]) + + l->l_info[DT_SONAME]->d_un.d_val); + if (strcmp (name, soname) != 0) ++#ifdef __arm__ ++ if (strcmp(name, "ld-linux.so.3") || strcmp(soname, "ld-linux-armhf.so.3")) ++#endif + continue; + + /* We have a match on a new name -- cache it. */ +- add_name_to_object (l, soname); ++ add_name_to_object (l, name); + l->l_soname_added = 1; + } + ++++++ getaddrinfo-ipv6-sanity.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:12.000000000 +0200 @@ -1,9 +1,9 @@ References: bnc#361697 -Index: sysdeps/posix/getaddrinfo.c +Index: glibc-2.15/sysdeps/posix/getaddrinfo.c =================================================================== ---- sysdeps/posix/getaddrinfo.c.orig -+++ sysdeps/posix/getaddrinfo.c +--- glibc-2.15.orig/sysdeps/posix/getaddrinfo.c ++++ glibc-2.15/sysdeps/posix/getaddrinfo.c @@ -269,7 +269,7 @@ extern service_user *__nss_hosts_databas static int gaih_inet (const char *name, const struct gaih_service *service, ++++++ glibc-2.16-fix-check-localplt.patch ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:12.000000000 +0200 @@ -11,10 +11,10 @@ * sysdeps/i386/fpu/feupdateenv.c (__feupdateenv) Invoke __feraiseexcept instead of feraiseexcept. -diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c -index 70f9ee2..6e2ce35 100644 ---- a/sysdeps/i386/fpu/feupdateenv.c -+++ b/sysdeps/i386/fpu/feupdateenv.c +Index: glibc-2.15/sysdeps/i386/fpu/feupdateenv.c +=================================================================== +--- glibc-2.15.orig/sysdeps/i386/fpu/feupdateenv.c ++++ glibc-2.15/sysdeps/i386/fpu/feupdateenv.c @@ -1,5 +1,5 @@ /* Install given floating-point environment and raise exceptions. - Copyright (C) 1997,99,2000,01,07,2010 Free Software Foundation, Inc. @@ -22,7 +22,7 @@ This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. -@@ -44,7 +44,7 @@ __feupdateenv (const fenv_t *envp) +@@ -45,7 +45,7 @@ __feupdateenv (const fenv_t *envp) /* Raise the saved exception. Incidently for us the implementation defined format of the values in objects of type fexcept_t is the same as the ones specified using the FE_* constants. */ ++++++ glibc-2.16-powerpc-initfini.patch ++++++ ++++ 795 lines (skipped) ++++++ glibc-2.3.2.no_archive.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:12.000000000 +0200 @@ -3,10 +3,10 @@ - Make --no-archive default for localedef -Index: locale/programs/localedef.c +Index: glibc-2.15/locale/programs/localedef.c =================================================================== ---- locale/programs/localedef.c.orig -+++ locale/programs/localedef.c +--- glibc-2.15.orig/locale/programs/localedef.c ++++ glibc-2.15/locale/programs/localedef.c @@ -82,7 +82,7 @@ const char *alias_file; static struct localedef_t *locales; ++++++ glibc-2.3.3-nscd-db-path.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:12.000000000 +0200 @@ -2,12 +2,10 @@ * nscd/nscd.h: Move persistent storage back to /var/run/nscd -Index: nscd/nscd.h +Index: glibc-2.15/nscd/nscd.h =================================================================== -diff --git a/nscd/nscd.h b/nscd/nscd.h -index fdaf01b..23b6a94 100644 ---- nscd/nscd.h -+++ nscd/nscd.h +--- glibc-2.15.orig/nscd/nscd.h ++++ glibc-2.15/nscd/nscd.h @@ -113,11 +113,11 @@ struct database_dyn ++++++ glibc-2.3.90-bindresvport.blacklist.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:12.000000000 +0200 @@ -1,7 +1,7 @@ -Index: sunrpc/bindrsvprt.c +Index: glibc-2.15/sunrpc/bindrsvprt.c =================================================================== ---- sunrpc/bindrsvprt.c.orig -+++ sunrpc/bindrsvprt.c +--- glibc-2.15.orig/sunrpc/bindrsvprt.c ++++ glibc-2.15/sunrpc/bindrsvprt.c @@ -29,28 +29,108 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ ++++++ glibc-2.3.90-langpackdir.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:12.000000000 +0200 @@ -1,7 +1,7 @@ -Index: intl/loadmsgcat.c +Index: glibc-2.15/intl/loadmsgcat.c =================================================================== ---- intl/loadmsgcat.c.orig -+++ intl/loadmsgcat.c +--- glibc-2.15.orig/intl/loadmsgcat.c ++++ glibc-2.15/intl/loadmsgcat.c @@ -806,8 +806,52 @@ _nl_load_domain (domain_file, domainbind if (domain_file->filename == NULL) goto out; ++++++ glibc-2.3.locales.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:13.000000000 +0200 @@ -1,8 +1,8 @@ -Index: localedata/SUPPORTED +Index: glibc-2.3/localedata/SUPPORTED =================================================================== ---- localedata/SUPPORTED.orig -+++ localedata/SUPPORTED -@@ -430,3 +430,13 @@ zh_TW.UTF-8/UTF-8 \ +--- glibc-2.3/localedata/SUPPORTED.orig ++++ glibc-2.3/localedata/SUPPORTED +@@ -437,3 +437,13 @@ zh_TW.UTF-8/UTF-8 \ zh_TW/BIG5 \ zu_ZA.UTF-8/UTF-8 \ zu_ZA/ISO-8859-1 \ @@ -16,10 +16,10 @@ +sh_YU.UTF-8/UTF-8 \ +sh_YU/ISO-8859-2 \ + -Index: localedata/locales/LC_COLLATE.ISO14651 +Index: glibc-2.3/localedata/locales/LC_COLLATE.ISO14651 =================================================================== --- /dev/null -+++ localedata/locales/LC_COLLATE.ISO14651 ++++ glibc-2.3/localedata/locales/LC_COLLATE.ISO14651 @@ -0,0 +1,68282 @@ +LC_COLLATE + @@ -68303,10 +68303,10 @@ + +END LC_COLLATE + -Index: localedata/locales/LC_CTYPE.BASE +Index: glibc-2.3/localedata/locales/LC_CTYPE.BASE =================================================================== --- /dev/null -+++ localedata/locales/LC_CTYPE.BASE ++++ glibc-2.3/localedata/locales/LC_CTYPE.BASE @@ -0,0 +1,5263 @@ +comment_char % +escape_char / @@ -73571,10 +73571,10 @@ +END LC_CTYPE + + -Index: localedata/locales/en_BE +Index: glibc-2.3/localedata/locales/en_BE =================================================================== --- /dev/null -+++ localedata/locales/en_BE ++++ glibc-2.3/localedata/locales/en_BE @@ -0,0 +1,264 @@ +comment_char % +escape_char / @@ -73840,10 +73840,10 @@ +END LC_MEASUREMENT + + -Index: localedata/locales/en_BE@euro +Index: glibc-2.3/localedata/locales/en_BE@euro =================================================================== --- /dev/null -+++ localedata/locales/en_BE@euro ++++ glibc-2.3/localedata/locales/en_BE@euro @@ -0,0 +1,264 @@ +comment_char % +escape_char / @@ -74109,10 +74109,10 @@ +END LC_MEASUREMENT + + -Index: localedata/locales/sh_YU +Index: glibc-2.3/localedata/locales/sh_YU =================================================================== --- /dev/null -+++ localedata/locales/sh_YU ++++ glibc-2.3/localedata/locales/sh_YU @@ -0,0 +1,264 @@ +comment_char % +escape_char / ++++++ glibc-2.4.90-revert-only-euro.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:13.000000000 +0200 @@ -1,7 +1,7 @@ -Index: locale/iso-4217.def +Index: glibc-2.15/locale/iso-4217.def =================================================================== ---- locale/iso-4217.def.orig -+++ locale/iso-4217.def +--- glibc-2.15.orig/locale/iso-4217.def ++++ glibc-2.15/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! ++++++ glibc-2.8-getconf.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:13.000000000 +0200 @@ -2,10 +2,10 @@ glibc.i586: E: hardlink-across-partition (Badness: 10000) /usr/lib/getconf/POSIX_V7_ILP32_OFFBIG /usr/bin/getconf -Index: posix/Makefile +Index: glibc-2.15/posix/Makefile =================================================================== ---- posix/Makefile.orig -+++ posix/Makefile +--- glibc-2.15.orig/posix/Makefile ++++ glibc-2.15/posix/Makefile @@ -316,8 +316,7 @@ $(inst_libexecdir)/getconf: $(inst_bindi $(addprefix $(..)./scripts/mkinstalldirs ,\ $(filter-out $(wildcard $@),$@)) ++++++ glibc-cpusetsize.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:13.000000000 +0200 @@ -1,7 +1,7 @@ -Index: bits/sched.h +Index: glibc-2.15/bits/sched.h =================================================================== ---- bits/sched.h.orig -+++ bits/sched.h +--- glibc-2.15.orig/bits/sched.h ++++ glibc-2.15/bits/sched.h @@ -54,7 +54,7 @@ struct __sched_param #if defined _SCHED_H && !defined __cpu_set_t_defined # define __cpu_set_t_defined @@ -11,10 +11,10 @@ # define __NCPUBITS (8 * sizeof (__cpu_mask)) /* Type for array elements in 'cpu_set_t'. */ -Index: sysdeps/unix/sysv/linux/bits/sched.h +Index: glibc-2.15/sysdeps/unix/sysv/linux/bits/sched.h =================================================================== ---- sysdeps/unix/sysv/linux/bits/sched.h.orig -+++ sysdeps/unix/sysv/linux/bits/sched.h +--- glibc-2.15.orig/sysdeps/unix/sysv/linux/bits/sched.h ++++ glibc-2.15/sysdeps/unix/sysv/linux/bits/sched.h @@ -113,7 +113,7 @@ struct __sched_param #if defined _SCHED_H && !defined __cpu_set_t_defined # define __cpu_set_t_defined ++++++ glibc-elf-localscope.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:13.000000000 +0200 @@ -1,7 +1,8 @@ -diff -ru elf~/dl-close.c elf/dl-close.c ---- elf~/dl-close.c 2011-02-04 00:35:03.000000000 +0100 -+++ elf/dl-close.c 2011-02-22 02:16:12.367883000 +0100 -@@ -180,24 +186,28 @@ +Index: glibc-2.15/elf/dl-close.c +=================================================================== +--- glibc-2.15.orig/elf/dl-close.c ++++ glibc-2.15/elf/dl-close.c +@@ -180,24 +180,28 @@ _dl_close_worker (struct link_map *map) /* Signal the object is still needed. */ l->l_idx = IDX_STILL_USED; @@ -42,7 +43,7 @@ ++lp; } } -@@ -206,19 +216,25 @@ +@@ -206,19 +210,25 @@ _dl_close_worker (struct link_map *map) for (unsigned int j = 0; j < l->l_reldeps->act; ++j) { struct link_map *jmap = l->l_reldeps->list[j]; ++++++ glibc-fini-unwind.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:13.000000000 +0200 @@ -1,7 +1,7 @@ -Index: sysdeps/x86_64/elf/initfini.c +Index: glibc-2.15/sysdeps/x86_64/elf/initfini.c =================================================================== ---- sysdeps/x86_64/elf/initfini.c.orig 2004-08-16 06:50:55.000000000 +0200 -+++ sysdeps/x86_64/elf/initfini.c 2010-04-16 16:41:11.000000000 +0200 +--- glibc-2.15.orig/sysdeps/x86_64/elf/initfini.c ++++ glibc-2.15/sysdeps/x86_64/elf/initfini.c @@ -44,6 +44,25 @@ * crtn.s puts the corresponding function epilogues in the .init and .fini sections. */ ++++++ glibc-gai-private4.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:13.000000000 +0200 @@ -1,5 +1,7 @@ ---- posix/gai.conf~ 2010-05-12 04:10:58.087661000 +0200 -+++ posix/gai.conf 2010-05-12 04:14:40.638820000 +0200 +Index: glibc-2.15/posix/gai.conf +=================================================================== +--- glibc-2.15.orig/posix/gai.conf ++++ glibc-2.15/posix/gai.conf @@ -67,11 +67,66 @@ #scopev4 ::ffff:192.168.0.0/112 5 #scopev4 ::ffff:0.0.0.0/96 14 ++++++ glibc-nodate.patch ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:13.000000000 +0200 @@ -1,3 +1,23 @@ +Index: glibc-2.15/nscd/nscd_stat.c +=================================================================== +--- glibc-2.15/nscd/nscd_stat.c.orig 2010-01-18 18:01:41.000000000 +0100 ++++ glibc-2.15/nscd/nscd_stat.c 2010-02-14 15:02:41.000000000 +0100 +@@ -37,8 +37,13 @@ + #endif /* HAVE_SELINUX */ + + +-/* We use this to make sure the receiver is the same. */ ++/* We use this to make sure the receiver is the same. Capture mtime ++ of this file if possible. */ ++#if defined(__TIMESTAMP__) ++static const char compilation[21] = __TIMESTAMP__; ++#else + static const char compilation[21] = __DATE__ " " __TIME__; ++#endif + + /* Statistic data for one database. */ + struct dbstat + Index: glibc-2.15/csu/Makefile =================================================================== --- glibc-2.15.orig/csu/Makefile ++++++ glibc-nscd-hconf.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:13.000000000 +0200 @@ -1,10 +1,10 @@ See: http://sourceware.org/bugzilla/show_bug.cgi?id=11928 -diff --git a/nscd/aicache.c b/nscd/aicache.c -index 3cb2208..2e92929 100644 ---- a/nscd/aicache.c -+++ b/nscd/aicache.c +Index: glibc-2.15/nscd/aicache.c +=================================================================== +--- glibc-2.15.orig/nscd/aicache.c ++++ glibc-2.15/nscd/aicache.c @@ -26,6 +26,7 @@ #include <time.h> #include <unistd.h> @@ -13,7 +13,7 @@ #include "dbg_log.h" #include "nscd.h" -@@ -103,6 +104,8 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req, +@@ -103,6 +104,8 @@ addhstaiX (struct database_dyn *db, int if (__res_maybe_init (&_res, 0) == -1) no_more = 1; @@ -22,11 +22,11 @@ /* If we are looking for both IPv4 and IPv6 address we don't want the lookup functions to automatically promote IPv4 addresses to -diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c -index ed55bec..c79b85a 100644 ---- a/resolv/res_hconf.c -+++ b/resolv/res_hconf.c -@@ -84,7 +84,9 @@ static const struct cmd +Index: glibc-2.15/resolv/res_hconf.c +=================================================================== +--- glibc-2.15.orig/resolv/res_hconf.c ++++ glibc-2.15/resolv/res_hconf.c +@@ -83,7 +83,9 @@ static const struct cmd }; /* Structure containing the state. */ ++++++ glibc-nscd.conf.patch ++++++ Index: glibc-2.15/nscd/nscd.conf =================================================================== --- glibc-2.15.orig/nscd/nscd.conf +++ glibc-2.15/nscd/nscd.conf @@ -61,11 +61,11 @@ auto-propagate group yes enable-cache hosts yes - positive-time-to-live hosts 3600 - negative-time-to-live hosts 20 + positive-time-to-live hosts 600 + negative-time-to-live hosts 0 suggested-size hosts 211 check-files hosts yes - persistent hosts yes + persistent hosts no shared hosts yes max-db-size hosts 33554432 ++++++ glibc-resolv-mdnshint.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:13.000000000 +0200 @@ -1,8 +1,8 @@ -diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c -index ed55bec..f06db75 100644 ---- a/resolv/res_hconf.c -+++ b/resolv/res_hconf.c -@@ -243,9 +243,12 @@ parse_line (const char *fname, int line_num, const char *str) +Index: glibc-2.15/resolv/res_hconf.c +=================================================================== +--- glibc-2.15.orig/resolv/res_hconf.c ++++ glibc-2.15/resolv/res_hconf.c +@@ -242,9 +242,12 @@ parse_line (const char *fname, int line_ if (c == NULL) { char *buf; ++++++ glibc-resolv-reload.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:13.000000000 +0200 @@ -72,9 +72,10 @@ Content-Disposition: inline; filename="glibc-2.5-resolvconf.patch" -diff -ur resolv.orig/res_libc.c resolv/res_libc.c ---- resolv.orig/res_libc.c 2005-11-01 01:06:40.000000000 +0100 -+++ resolv/res_libc.c 2010-03-15 14:13:18.000000000 +0100 +Index: glibc-2.15/resolv/res_libc.c +=================================================================== +--- glibc-2.15.orig/resolv/res_libc.c ++++ glibc-2.15/resolv/res_libc.c @@ -22,7 +22,7 @@ #include <arpa/nameser.h> #include <resolv.h> @@ -84,7 +85,7 @@ /* The following bit is copied from res_data.c (where it is #ifdef'ed out) since res_init() should go into libc.so but the rest of that -@@ -89,12 +89,34 @@ +@@ -89,12 +89,34 @@ res_init(void) { return (__res_vinit(&_res, 1)); } @@ -119,6 +120,3 @@ if (__res_initstamp != resp->_u._ext.initstamp) { if (resp->nscount > 0) __res_iclose (resp, true); - - ---------------060407080409020101000002-- ++++++ glibc-testsuite.patch ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:13.000000000 +0200 @@ -1,9 +1,9 @@ test-lfs runs for ever on ReiserFS. Let's disable it completely. -Index: io/Makefile +Index: glibc-2.15/io/Makefile =================================================================== ---- io/Makefile.orig -+++ io/Makefile +--- glibc-2.15.orig/io/Makefile ++++ glibc-2.15/io/Makefile @@ -64,7 +64,7 @@ static-only-routines = stat fstat lstat others := pwd ++++++ glibc-uio-cell.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:13.000000000 +0200 @@ -1,8 +1,3 @@ -Refused by Ulrich Drepper: -http://sourceware.org/ml/libc-alpha/2011-07/msg00046.html - -We have to keep it until gcc handles this better. - 2009-11-06 Petr Baudis <pasky@suse.cz> * include/sys/uio.h: Change __vector to __iovec to avoid clash ++++++ glibc-version.diff ++++++ --- /var/tmp/diff_new_pack.0AaZHD/_old 2012-04-23 16:11:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0AaZHD/_new 2012-04-23 16:11:13.000000000 +0200 @@ -1,8 +1,8 @@ -Index: csu/version.c +Index: glibc-2.15/csu/version.c =================================================================== ---- csu/version.c.orig -+++ csu/version.c -@@ -25,19 +25,20 @@ static const char __libc_release[] = REL +--- glibc-2.15.orig/csu/version.c ++++ glibc-2.15/csu/version.c +@@ -25,11 +25,12 @@ static const char __libc_release[] = REL static const char __libc_version[] = VERSION; static const char banner[] = @@ -16,11 +16,3 @@ 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 - "For bug reporting instructions, please see:\n\ - <http://www.gnu.org/software/libc/bugs.html>.\n"; - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org