From 608ae8be4121e0a28ab464a005d41d06bbc1616dc9946ac8ec6e0281d275a69c Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 15 Jun 2011 07:27:54 +0000 Subject: [PATCH] Accepting request 73636 from home:a_jaeger:branches:openSUSE:Factory Split up package glibc-utils. OBS-URL: https://build.opensuse.org/request/show/73636 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=57 --- glibc-gai-private4.diff | 6 +++--- glibc.changes | 13 +++++++++++++ glibc.rpmlintrc | 3 +++ glibc.spec | 30 +++++++++++++++++++++++++----- missing-include-build-fix.diff | 31 +++++++++++++++++++++++++++++++ 5 files changed, 75 insertions(+), 8 deletions(-) create mode 100644 missing-include-build-fix.diff diff --git a/glibc-gai-private4.diff b/glibc-gai-private4.diff index 189b2ea..a6a1ee8 100644 --- a/glibc-gai-private4.diff +++ b/glibc-gai-private4.diff @@ -24,7 +24,7 @@ +# When the user attempts to connect to a server whose hostname has both IPv4 +# and IPv6 addresses published in DNS, an IPv6 connection using the +# transitional 6to4 service will be preferred. This happens because the scope -+# comparsion fails for IPv4, the RFC 1918 addresses are assumed to have ++# comparison fails for IPv4, the RFC 1918 addresses are assumed to have +# site-local scope, which is smaller than the global scope of the server's IPv4 +# address. For IPv6, both the server's and the client's (6to4) address have +# global scope. @@ -39,8 +39,8 @@ +# content, but it should never be preferred over IPv4 service when accessing +# dual-stacked content. +# -+# RFC 3484 even acknowledges this, by saying to "«avoid the use of transitional -+# addresses when native addresses are available"». ++# RFC 3484 even acknowledges this, by saying to "avoid the use of transitional ++# addresses when native addresses are available". +# +# An IETF draft document which describes the problem in a much more detailed +# manner than I have is available here: diff --git a/glibc.changes b/glibc.changes index ac46391..2287137 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Jun 15 07:08:35 UTC 2011 - aj@suse.de + +- Split up package glibc-utils with some debugging tools, add memusage + and memusagestat programs +- Fix compile warnings. +- Silent some rpmlint warnings. + +------------------------------------------------------------------- +Mon Jun 6 14:19:26 UTC 2011 - aj@suse.de + +- Fix typos in /etc/gai.conf (bnc#651912). + ------------------------------------------------------------------- Fri Jun 3 08:40:55 UTC 2011 - aj@suse.de diff --git a/glibc.rpmlintrc b/glibc.rpmlintrc index b88848e..20a77f3 100644 --- a/glibc.rpmlintrc +++ b/glibc.rpmlintrc @@ -1 +1,4 @@ addFilter(".*glibc-profile.* devel-file-in-non-devel-package.*/usr/lib.*/lib.*_p.a") +addFilter(".*glibc.* incorrect-fsf-address") +# False positive - glibc implements gethostbyname +addFilter(".*binary-or-shlib-calls-gethostbyname") diff --git a/glibc.spec b/glibc.spec index 514d0a3..a2667ce 100644 --- a/glibc.spec +++ b/glibc.spec @@ -21,6 +21,7 @@ Name: glibc BuildRequires: gcc-c++ libstdc++-devel BuildRequires: libselinux-devel +BuildRequires: gd-devel libpng-devel zlib-devel %define _filter_GLIBC_PRIVATE 1 %define build_locales 1 %define run_testsuite 0 @@ -131,6 +132,7 @@ 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: missing-include-build-fix.diff Patch44: glibc-ppc64-vdso-time.diff Patch45: glibc-gai-private4.diff Patch46: glibc-resolv-mdnshint.diff @@ -272,6 +274,18 @@ AutoReqProv: on These libraries are needed to develop programs which use the standard C library. +%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}-%{release} + +%description utils +The glibc-utils package contains memusage, a memory usage profiler, +mtrace, a memory leak tracer and xtrace, a function call tracer +which can be helpful during program debugging. + +If you are unsure if you need this, don't install this package. %ifarch %ix86 @@ -355,6 +369,7 @@ rm nscd/s-stamp %patch40 %patch41 -p1 %patch42 +%patch43 -p1 %patch44 -p1 %patch45 %patch46 -p1 @@ -881,7 +896,6 @@ exit 0 /%{_lib}/libdl.so.2* /%{_lib}/libm-%{version}.so /%{_lib}/libm.so.6* -/%{_lib}/libmemusage.so /%{_lib}/libnsl-%{version}.so /%{_lib}/libnsl.so.1 /%{_lib}/libnss_compat-%{version}.so @@ -896,7 +910,6 @@ exit 0 /%{_lib}/libnss_nis.so.2 /%{_lib}/libnss_nisplus-%{version}.so /%{_lib}/libnss_nisplus.so.2 -/%{_lib}/libpcprofile.so /%{_lib}/libpthread-%{version}.so /%{_lib}/libpthread.so.0 /%{_lib}/libresolv-%{version}.so @@ -978,11 +991,8 @@ exit 0 %doc %{_mandir}/man1/sprof.1.gz %doc %{_mandir}/man3/* /usr/bin/catchsegv -/usr/bin/mtrace -/usr/bin/pcprofiledump /usr/bin/rpcgen /usr/bin/sprof -/usr/bin/xtrace %{_prefix}/include/* %{_libdir}/*.o %{_libdir}/*.so @@ -1053,4 +1063,14 @@ exit 0 %{_libdir}/libutil_p.a %{_libdir}/libdl_p.a +%files utils +%defattr(-,root,root) +/%{_lib}/libmemusage.so +/%{_lib}/libpcprofile.so +%{_prefix}/bin/memusage +%{_prefix}/bin/memusagestat +%{_prefix}/bin/mtrace +%{_prefix}/bin/pcprofiledump +%{_prefix}/bin/xtrace + %changelog diff --git a/missing-include-build-fix.diff b/missing-include-build-fix.diff new file mode 100644 index 0000000..d1fc51e --- /dev/null +++ b/missing-include-build-fix.diff @@ -0,0 +1,31 @@ +2011-06-14 Andreas Jaeger + + * pthread_rwlock_init.c: Include for + memset declaration. + +2011-06-14 Andreas Jaeger + + * sysdeps/unix/sysv/linux/check_native.c: Include for + memset declaration. + +--- a/sysdeps/unix/sysv/linux/check_native.c ++++ b/sysdeps/unix/sysv/linux/check_native.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include + +--- a/nptl/pthread_rwlock_init.c ++++ b/nptl/pthread_rwlock_init.c +@@ -18,6 +18,7 @@ + 02111-1307 USA. */ + + #include "pthreadP.h" ++#include + #include + +