From 484481503ea6350c4488cc1094ce133b67ce9759757def59fd1b354df9192603 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 16 Jun 2011 13:36:45 +0000 Subject: [PATCH] Accepting request 73854 from home:a_jaeger:branches:openSUSE:Factory Split up glibc-devel-static, fix bugs. OBS-URL: https://build.opensuse.org/request/show/73854 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=61 --- getaddrinfo-ipv6-sanity.diff | 13 +++++- glibc.changes | 11 +++++ glibc.spec | 83 +++++++++++++++++++++++++++++------- 3 files changed, 90 insertions(+), 17 deletions(-) diff --git a/getaddrinfo-ipv6-sanity.diff b/getaddrinfo-ipv6-sanity.diff index c982e8b..c89228d 100644 --- a/getaddrinfo-ipv6-sanity.diff +++ b/getaddrinfo-ipv6-sanity.diff @@ -13,7 +13,16 @@ Index: sysdeps/posix/getaddrinfo.c { const struct gaih_typeproto *tp = gaih_inet_typeproto; struct gaih_servtuple *st = (struct gaih_servtuple *) &nullserv; -@@ -766,7 +766,7 @@ gaih_inet (const char *name, const struc +@@ -706,7 +706,7 @@ gaih_inet (const char *name, const struc + no_data = 0; + nss_gethostbyname4_r fct4 + = __nss_lookup_function (nip, "gethostbyname4_r"); +- if (fct4 != NULL) ++ if (fct4 != NULL && usable_ipv6) + { + int herrno; + +@@ -763,7 +763,7 @@ gaih_inet (const char *name, const struc if (fct != NULL) { if (req->ai_family == AF_INET6 @@ -22,7 +31,7 @@ Index: sysdeps/posix/getaddrinfo.c { gethosts (AF_INET6, struct in6_addr); no_inet6_data = no_data; -@@ -2157,7 +2157,7 @@ getaddrinfo (const char *name, const cha +@@ -2156,7 +2156,7 @@ getaddrinfo (const char *name, const cha if (hints->ai_family == AF_UNSPEC || hints->ai_family == AF_INET || hints->ai_family == AF_INET6) { diff --git a/glibc.changes b/glibc.changes index 300c6cf..aa254cf 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jun 16 13:33:23 UTC 2011 - aj@suse.de + +- Fix getaddrinfo IPv6 code (bnc#684534). +- Split up glibc-devel-static subpackage (bnc#655261). + +------------------------------------------------------------------- +Thu Jun 16 12:23:32 UTC 2011 - aj@suse.de + +- Reorder ld.so.conf library list (bnc#671725). + ------------------------------------------------------------------- Wed Jun 15 07:08:35 UTC 2011 - aj@suse.de diff --git a/glibc.spec b/glibc.spec index 898f0ea..84a8d8f 100644 --- a/glibc.spec +++ b/glibc.spec @@ -149,7 +149,7 @@ Patch27: glibc-2.6-configure.diff Patch28: glibc-2.2-sunrpc.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch29: glibc-2.8-getconf.diff -# PATCH-FIX-OPENSUSE only use ipv6 if real ipv6 address exists bnc#361697 +# PATCH-FIX-OPENSUSE only use ipv6 if real ipv6 address exists bnc#361697, bnc#684534 Patch30: getaddrinfo-ipv6-sanity.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch31: ppc-atomic.diff @@ -208,6 +208,7 @@ Patch502: ARM_glibc-2.10.1-local-lowlevellock.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch503: ARM_glibc-2.10.1-local-no-hwcap.diff + %description The GNU C Library provides the most important standard libraries used by nearly all programs: the standard C library, the standard math @@ -220,6 +221,7 @@ Summary: Info Files for the GNU C Library Group: Documentation/Other PreReq: %{install_info_prereq} + %description info This package contains the documentation for the GNU C library stored as info files. Due to a lack of resources, this documentation is not @@ -230,6 +232,7 @@ License: GPLv2+ ; LGPLv2.1+ Summary: HTML Documentation for the GNU C Library Group: Documentation/HTML + %description html This package contains the HTML documentation for the GNU C library. Due to a lack of resources, this documentation is not complete and is @@ -240,6 +243,7 @@ License: LGPLv2.1+ Summary: Database Sources for 'locale' Group: System/Libraries + %description i18ndata This package contains the data needed to build the locale data files to use the internationalization features of the GNU libc. It is normally @@ -260,6 +264,7 @@ Obsoletes: glibc-locale-64bit Obsoletes: glibc-locale-32bit %endif + %description locale Locale data for the internationalisation features of the GNU C library. @@ -271,6 +276,7 @@ Provides: aaa_base:/etc/init.d/nscd Provides: glibc:/usr/sbin/nscd PreReq: %insserv_prereq + %description -n nscd Nscd caches name service lookups and can dramatically improve performance with NIS, NIS+, and LDAP. @@ -288,6 +294,7 @@ Obsoletes: glibc-profile-64bit Obsoletes: glibc-profile-32bit %endif + %description profile This package contains special versions of the GNU C library which are necessary for profiling and debugging. @@ -308,16 +315,31 @@ Obsoletes: glibc-devel-32bit PreReq: /bin/rm Requires: glibc = %{version}, linux-kernel-headers + %description devel These libraries are needed to develop programs which use the standard C library. +%package devel-static + + +Summary: C library static libraries for -static linking. +Group: Development/Libraries +Requires: %{name}-devel = %{version} + + +%description devel-static +The glibc-devel-static package contains the C library static libraries +for -static linking. You don't need these, unless you link statically, +which is highly discouraged. + %package utils License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ Summary: Development utilities from GNU C library Group: Development/Languages/C and C++ Requires: glibc = %{version} + %description utils The glibc-utils package contains memusage, a memory usage profiler, mtrace, a memory leak tracer and xtrace, a function call tracer @@ -326,12 +348,15 @@ which can be helpful during program debugging. If you are unsure if you need this, don't install this package. %ifarch %ix86 + + %package obsolete License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ Summary: Obsolete Shared Libraries from the GNU C Library Group: System/Libraries Requires: glibc = %{version} + %description obsolete This package provides some old libraries from the GNU C Library which are no longer supported. Additional it provides a compatibility library @@ -344,6 +369,7 @@ versions of your software. %endif + %prep %ifarch %arm armv5tel armv7l # add glibc-ports for arm @@ -449,6 +475,7 @@ find . -name configure | xargs touch ### ####################################################################### + %build if [ -x /bin/uname.bin ]; then /bin/uname.bin -a @@ -624,6 +651,7 @@ $BuildCC -static $RPM_OPT_FLAGS -Os $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glib ### ####################################################################### + %check %if %{run_testsuite} # Increase timeout @@ -646,6 +674,7 @@ make -C cc-base check-abi || echo check-abi failed ### ####################################################################### + %install # We don't want to strip the .symtab from our libraries in find-debuginfo.sh, # certainly not from libpthread.so.* because it is used by libthread_db to find @@ -771,12 +800,8 @@ touch $RPM_BUILD_ROOT/var/run/nscd/{socket,nscd.pid} # cat > $RPM_BUILD_ROOT/etc/ld.so.conf < $RPM_BUILD_ROOT/etc/ld.so.conf <