Accepting request 146380 from Base:System

Update to 2.17 release (forwarded request 146379 from a_jaeger)

OBS-URL: https://build.opensuse.org/request/show/146380
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=133
This commit is contained in:
Ismail Dönmez 2012-12-30 11:19:16 +00:00 committed by Git OBS Bridge
commit 587f5b18fa
10 changed files with 8089 additions and 114 deletions

View File

@ -20,4 +20,3 @@ glibc-devel-static
glibc-profile
arch i586 block!
glibc-utils
arch i586 block!

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:71986496690c30d7b37cd140bda4e5a471c5c32d2ade05348fe6eacee1de235e
size 11130856

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d0ad63189c3d0799ee671b0b565f8d113c43d1759894c9002ba58bf212af8abf
size 11173392

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Dec 25 16:50:52 UTC 2012 - aj@suse.de
- Update to glibc 2.17 release (git id c758a6861537):
* bump version number
* update translations
-------------------------------------------------------------------
Tue Dec 18 10:28:01 UTC 2012 - schwab@suse.de
- Move glibc-utils subpackage to own specfile and enable programs that
require libgd
- Filter GLIBC_PRIVATE symbols
- Don't stop at first error in testsuite run
-------------------------------------------------------------------
Mon Dec 17 11:16:49 UTC 2012 - schwab@suse.de

View File

@ -18,7 +18,7 @@
# PLEASE run pre_checkin.sh in this directory before submitting
# this package. Otherwise the .spec and .changes for glibc-testsuite
# aren't updated.
# and glibc-utils aren't updated.
# Run with osc --with=fast_build to have a shorter turnaround
# It will avoid building some parts of glibc
@ -27,10 +27,14 @@
%define crypt_bf_version 1.2
Name: glibc-testsuite
%define normal_build ("%{name}" == "glibc")
%define utils_build ("%{name}" == "glibc-utils")
%define testsuite_build ("%{name}" == "glibc-testsuite")
# UTILS-SUMMARY-BEGIN
Summary: Standard Shared Libraries (from the GNU C Library)
License: LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+
Group: System/Libraries
# UTILS-SUMMARY-END
BuildRequires: fdupes
BuildRequires: libselinux-devel
BuildRequires: makeinfo
@ -40,8 +44,11 @@ BuildRequires: pkgconfig(systemd)
BuildRequires: gcc-c++
BuildRequires: libstdc++-devel
%endif
%if %{utils_build}
BuildRequires: gd-devel
%endif
%define _filter_GLIBC_PRIVATE 1
%define __filter_GLIBC_PRIVATE 1
%if %_target_cpu == "i686"
# For i686 let's only build what's different from i586, so
# no need to build documentation
@ -49,7 +56,7 @@ BuildRequires: libstdc++-devel
%define build_locales 1
%define build_html 0
%else
%if %{with fast_build}
%if %{with fast_build} || %{utils_build}
%define build_profile 0
%define build_locales 0
%define build_html 0
@ -68,7 +75,7 @@ BuildRequires: libstdc++-devel
%ifarch ppc
%define powerpc_optimize_base power3
%define powerpc_optimize_tune power3
%define powerpc_optimize_cpu_power4 1
%define powerpc_optimize_cpu_power4 %{normal_build}
%else
%define powerpc_optimize_base power4
%define powerpc_optimize_tune power5
@ -94,6 +101,28 @@ BuildRequires: libstdc++-devel
# 2.6.16 is the SLES 10 kernel, use this as oldest supported kernel
%define enablekernel 2.6.16
%endif
Version: 2.17
Release: 0
%define glibc_major_version 2.17
%define git_id c758a6861537
Url: http://www.gnu.org/software/libc/libc.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: glibc-%{version}-%{git_id}.tar.xz
Source3: noversion.tar.bz2
Source4: manpages.tar.bz2
Source5: nsswitch.conf
Source7: bindresvport.blacklist
Source8: glibc_post_upgrade.c
Source9: glibc.rpmlintrc
Source10: baselibs.conf
# For systemd
Source20: nscd.conf
Source21: nscd.service
# 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
%if %{normal_build}
# ngpt was used in 8.1 and SLES8
Obsoletes: ngpt < 2.2.2
Obsoletes: ngpt-devel < 2.2.2
@ -112,30 +141,13 @@ Obsoletes: glibc-32bit
Provides: ld-linux.so.3
Provides: ld-linux.so.3(GLIBC_2.4)
%endif
Version: 2.16.90
Release: 0
%define glibc_major_version 2.16.90
%define git_id 4641d57e1e00
Url: http://www.gnu.org/software/libc/libc.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: glibc-%{version}-%{git_id}.tar.xz
Source3: noversion.tar.bz2
Source4: manpages.tar.bz2
Source5: nsswitch.conf
Source7: bindresvport.blacklist
Source8: glibc_post_upgrade.c
Source9: glibc.rpmlintrc
Source10: baselibs.conf
# For systemd
Source20: nscd.conf
Source21: nscd.service
# 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
Requires(pre): filesystem
Recommends: glibc-extra
Provides: rtld(GNU_HASH)
%endif # %{normal_build}
%if %{utils_build}
Requires: glibc = %{version}
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %_target_cpu == "i686"
# We need to avoid to have only the src rpm from i686 on the media,
@ -358,19 +370,6 @@ 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
Summary: Development utilities from GNU C library
License: LGPL-2.1+
Group: Development/Languages/C and C++
Requires: glibc = %{version}
%description utils
The glibc-utils package contains 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.
# makedb requires libselinux. We add this program in a separate
# package so that glibc does not require libselinux.
%package extra
@ -699,7 +698,7 @@ export TIMEOUTFACTOR=16
# s390,s390x: tst-timer* fails
make %{?_smp_mflags} -C cc-base -k check || echo make check failed
%else
make %{?_smp_mflags} -C cc-base check
make %{?_smp_mflags} -C cc-base -k check
%endif
%endif
# This has to pass on all platforms!
@ -714,7 +713,7 @@ make %{?_smp_mflags} -C cc-base check-abi
#######################################################################
%install
%if !%{testsuite_build}
%if %{normal_build}
# 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
# some non-exported symbols in order to detect if threading support
@ -913,7 +912,35 @@ ln -s ld-%{glibc_major_version}.so %{buildroot}/lib/ld-linux.so.3
# Move getconf to %{_libexecdir}/getconf/ to avoid cross device link
mv %{buildroot}%{_bindir}/getconf %{buildroot}%{_libexecdir}/getconf/getconf
ln -s %{_libexecdir}/getconf/getconf %{buildroot}%{_bindir}/getconf
%endif # !%{testsuite_build}
# Remove unwanted files (packaged in glibc-utils)
rm -f %{buildroot}/%{_lib}/libmemusage*
rm -f %{buildroot}/%{_lib}/libpcprofile*
rm -f %{buildroot}%{_bindir}/memusage*
rm -f %{buildroot}%{_bindir}/mtrace
rm -f %{buildroot}%{_bindir}/pcprofiledump
rm -f %{buildroot}%{_bindir}/sotruss
rm -f %{buildroot}%{_bindir}/xtrace
rm -f %{buildroot}%{_bindir}/pldd
rm -f %{buildroot}%{_mandir}/man1/mtrace.*
rm -rf %{buildroot}%{_libdir}/audit
%endif # %{normal_build}
%if %{utils_build}
make %{?_smp_mflags} install_root=%{buildroot} install -C cc-base \
subdirs='malloc debug elf'
cd manpages; make install_root=%{buildroot} install; cd ..
# Remove unwanted files
rm -f %{buildroot}/%{_lib}/ld*.so* %{buildroot}/%{_lib}/lib[!mp]*
rm -f %{buildroot}%{_libdir}/lib*
rm -f %{buildroot}%{_bindir}/{catchsegv,ldd*,sprof}
rm -f %{buildroot}%{_mandir}/man1/[!m]*
rm -rf %{buildroot}%{_mandir}/man[!1]
rm -rf %{buildroot}/sbin %{buildroot}%{_includedir}
%endif # %{utils_build}
#######################################################################
###
@ -921,6 +948,7 @@ ln -s %{_libexecdir}/getconf/getconf %{buildroot}%{_bindir}/getconf
###
#######################################################################
%if %{normal_build}
# Note: glibc_post_upgrade does:
# %%set_permissions %%{_libexecdir}/pt_chown
# since we cannot do it in our own post section
@ -940,6 +968,8 @@ os.execute("/usr/bin/chkstat -n --warn --system -e %{_libexecdir}/pt_chown")
%postun -p /sbin/ldconfig
%endif # %{normal_build}
%post locale
for l in /usr/share/locale/locale.alias %{_libdir}/gconv/gconv-modules; do
[ -d "$l.d" ] || continue
@ -974,7 +1004,7 @@ exit 0
%service_del_postun nscd.service
exit 0
%if !%{testsuite_build}
%if %{normal_build}
%files
#######################################################################
###
@ -1223,27 +1253,28 @@ exit 0
%{_libdir}/libdl_p.a
%endif
%files utils
%files extra
%defattr(-,root,root)
%{_bindir}/makedb
/var/lib/misc/Makefile
%endif # %{normal_build}
%if %{utils_build}
%files
%defattr(-,root,root)
/%{_lib}/libmemusage.so
/%{_lib}/libpcprofile.so
%dir /%{_libdir}/audit
/%{_libdir}/audit/sotruss-lib.so
# These need gd-devel for building
# %%{_bindir}/memusage
# %%{_bindir}/memusagestat
%dir %{_libdir}/audit
%{_libdir}/audit/sotruss-lib.so
%{_bindir}/memusage
%{_bindir}/memusagestat
%{_bindir}/mtrace
%{_bindir}/pcprofiledump
%{_bindir}/sotruss
%{_bindir}/xtrace
%{_bindir}/pldd
%doc %{_mandir}/man1/mtrace.1.gz
%files extra
%defattr(-,root,root)
%{_bindir}/makedb
/var/lib/misc/Makefile
%endif # !%{testsuite_build}
%endif # %{utils_build}
%changelog

6582
glibc-utils.changes Normal file

File diff suppressed because it is too large Load Diff

1280
glibc-utils.spec Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Dec 25 16:50:52 UTC 2012 - aj@suse.de
- Update to glibc 2.17 release (git id c758a6861537):
* bump version number
* update translations
-------------------------------------------------------------------
Tue Dec 18 10:28:01 UTC 2012 - schwab@suse.de
- Move glibc-utils subpackage to own specfile and enable programs that
require libgd
- Filter GLIBC_PRIVATE symbols
- Don't stop at first error in testsuite run
-------------------------------------------------------------------
Mon Dec 17 11:16:49 UTC 2012 - schwab@suse.de

View File

@ -18,7 +18,7 @@
# PLEASE run pre_checkin.sh in this directory before submitting
# this package. Otherwise the .spec and .changes for glibc-testsuite
# aren't updated.
# and glibc-utils aren't updated.
# Run with osc --with=fast_build to have a shorter turnaround
# It will avoid building some parts of glibc
@ -27,10 +27,14 @@
%define crypt_bf_version 1.2
Name: glibc
%define normal_build ("%{name}" == "glibc")
%define utils_build ("%{name}" == "glibc-utils")
%define testsuite_build ("%{name}" == "glibc-testsuite")
# UTILS-SUMMARY-BEGIN
Summary: Standard Shared Libraries (from the GNU C Library)
License: LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+
Group: System/Libraries
# UTILS-SUMMARY-END
BuildRequires: fdupes
BuildRequires: libselinux-devel
BuildRequires: makeinfo
@ -40,8 +44,11 @@ BuildRequires: pkgconfig(systemd)
BuildRequires: gcc-c++
BuildRequires: libstdc++-devel
%endif
%if %{utils_build}
BuildRequires: gd-devel
%endif
%define _filter_GLIBC_PRIVATE 1
%define __filter_GLIBC_PRIVATE 1
%if %_target_cpu == "i686"
# For i686 let's only build what's different from i586, so
# no need to build documentation
@ -49,7 +56,7 @@ BuildRequires: libstdc++-devel
%define build_locales 1
%define build_html 0
%else
%if %{with fast_build}
%if %{with fast_build} || %{utils_build}
%define build_profile 0
%define build_locales 0
%define build_html 0
@ -68,7 +75,7 @@ BuildRequires: libstdc++-devel
%ifarch ppc
%define powerpc_optimize_base power3
%define powerpc_optimize_tune power3
%define powerpc_optimize_cpu_power4 1
%define powerpc_optimize_cpu_power4 %{normal_build}
%else
%define powerpc_optimize_base power4
%define powerpc_optimize_tune power5
@ -94,6 +101,28 @@ BuildRequires: libstdc++-devel
# 2.6.16 is the SLES 10 kernel, use this as oldest supported kernel
%define enablekernel 2.6.16
%endif
Version: 2.17
Release: 0
%define glibc_major_version 2.17
%define git_id c758a6861537
Url: http://www.gnu.org/software/libc/libc.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: glibc-%{version}-%{git_id}.tar.xz
Source3: noversion.tar.bz2
Source4: manpages.tar.bz2
Source5: nsswitch.conf
Source7: bindresvport.blacklist
Source8: glibc_post_upgrade.c
Source9: glibc.rpmlintrc
Source10: baselibs.conf
# For systemd
Source20: nscd.conf
Source21: nscd.service
# 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
%if %{normal_build}
# ngpt was used in 8.1 and SLES8
Obsoletes: ngpt < 2.2.2
Obsoletes: ngpt-devel < 2.2.2
@ -112,30 +141,13 @@ Obsoletes: glibc-32bit
Provides: ld-linux.so.3
Provides: ld-linux.so.3(GLIBC_2.4)
%endif
Version: 2.16.90
Release: 0
%define glibc_major_version 2.16.90
%define git_id 4641d57e1e00
Url: http://www.gnu.org/software/libc/libc.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: glibc-%{version}-%{git_id}.tar.xz
Source3: noversion.tar.bz2
Source4: manpages.tar.bz2
Source5: nsswitch.conf
Source7: bindresvport.blacklist
Source8: glibc_post_upgrade.c
Source9: glibc.rpmlintrc
Source10: baselibs.conf
# For systemd
Source20: nscd.conf
Source21: nscd.service
# 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
Requires(pre): filesystem
Recommends: glibc-extra
Provides: rtld(GNU_HASH)
%endif # %{normal_build}
%if %{utils_build}
Requires: glibc = %{version}
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %_target_cpu == "i686"
# We need to avoid to have only the src rpm from i686 on the media,
@ -358,19 +370,6 @@ 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
Summary: Development utilities from GNU C library
License: LGPL-2.1+
Group: Development/Languages/C and C++
Requires: glibc = %{version}
%description utils
The glibc-utils package contains 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.
# makedb requires libselinux. We add this program in a separate
# package so that glibc does not require libselinux.
%package extra
@ -699,7 +698,7 @@ export TIMEOUTFACTOR=16
# s390,s390x: tst-timer* fails
make %{?_smp_mflags} -C cc-base -k check || echo make check failed
%else
make %{?_smp_mflags} -C cc-base check
make %{?_smp_mflags} -C cc-base -k check
%endif
%endif
# This has to pass on all platforms!
@ -714,7 +713,7 @@ make %{?_smp_mflags} -C cc-base check-abi
#######################################################################
%install
%if !%{testsuite_build}
%if %{normal_build}
# 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
# some non-exported symbols in order to detect if threading support
@ -913,7 +912,35 @@ ln -s ld-%{glibc_major_version}.so %{buildroot}/lib/ld-linux.so.3
# Move getconf to %{_libexecdir}/getconf/ to avoid cross device link
mv %{buildroot}%{_bindir}/getconf %{buildroot}%{_libexecdir}/getconf/getconf
ln -s %{_libexecdir}/getconf/getconf %{buildroot}%{_bindir}/getconf
%endif # !%{testsuite_build}
# Remove unwanted files (packaged in glibc-utils)
rm -f %{buildroot}/%{_lib}/libmemusage*
rm -f %{buildroot}/%{_lib}/libpcprofile*
rm -f %{buildroot}%{_bindir}/memusage*
rm -f %{buildroot}%{_bindir}/mtrace
rm -f %{buildroot}%{_bindir}/pcprofiledump
rm -f %{buildroot}%{_bindir}/sotruss
rm -f %{buildroot}%{_bindir}/xtrace
rm -f %{buildroot}%{_bindir}/pldd
rm -f %{buildroot}%{_mandir}/man1/mtrace.*
rm -rf %{buildroot}%{_libdir}/audit
%endif # %{normal_build}
%if %{utils_build}
make %{?_smp_mflags} install_root=%{buildroot} install -C cc-base \
subdirs='malloc debug elf'
cd manpages; make install_root=%{buildroot} install; cd ..
# Remove unwanted files
rm -f %{buildroot}/%{_lib}/ld*.so* %{buildroot}/%{_lib}/lib[!mp]*
rm -f %{buildroot}%{_libdir}/lib*
rm -f %{buildroot}%{_bindir}/{catchsegv,ldd*,sprof}
rm -f %{buildroot}%{_mandir}/man1/[!m]*
rm -rf %{buildroot}%{_mandir}/man[!1]
rm -rf %{buildroot}/sbin %{buildroot}%{_includedir}
%endif # %{utils_build}
#######################################################################
###
@ -921,6 +948,7 @@ ln -s %{_libexecdir}/getconf/getconf %{buildroot}%{_bindir}/getconf
###
#######################################################################
%if %{normal_build}
# Note: glibc_post_upgrade does:
# %%set_permissions %%{_libexecdir}/pt_chown
# since we cannot do it in our own post section
@ -940,6 +968,8 @@ os.execute("/usr/bin/chkstat -n --warn --system -e %{_libexecdir}/pt_chown")
%postun -p /sbin/ldconfig
%endif # %{normal_build}
%post locale
for l in /usr/share/locale/locale.alias %{_libdir}/gconv/gconv-modules; do
[ -d "$l.d" ] || continue
@ -974,7 +1004,7 @@ exit 0
%service_del_postun nscd.service
exit 0
%if !%{testsuite_build}
%if %{normal_build}
%files
#######################################################################
###
@ -1223,27 +1253,28 @@ exit 0
%{_libdir}/libdl_p.a
%endif
%files utils
%files extra
%defattr(-,root,root)
%{_bindir}/makedb
/var/lib/misc/Makefile
%endif # %{normal_build}
%if %{utils_build}
%files
%defattr(-,root,root)
/%{_lib}/libmemusage.so
/%{_lib}/libpcprofile.so
%dir /%{_libdir}/audit
/%{_libdir}/audit/sotruss-lib.so
# These need gd-devel for building
# %%{_bindir}/memusage
# %%{_bindir}/memusagestat
%dir %{_libdir}/audit
%{_libdir}/audit/sotruss-lib.so
%{_bindir}/memusage
%{_bindir}/memusagestat
%{_bindir}/mtrace
%{_bindir}/pcprofiledump
%{_bindir}/sotruss
%{_bindir}/xtrace
%{_bindir}/pldd
%doc %{_mandir}/man1/mtrace.1.gz
%files extra
%defattr(-,root,root)
%{_bindir}/makedb
/var/lib/misc/Makefile
%endif # !%{testsuite_build}
%endif # %{utils_build}
%changelog

View File

@ -2,6 +2,28 @@
# This script is called automatically during autobuild checkin.
sed -e 's/^Name:.*glibc/&-testsuite/' glibc.spec > glibc-testsuite.spec
cp glibc.changes glibc-testsuite.changes
awk '/^Name:/{ $0 = $0 "-utils" }
/UTILS-SUMMARY-BEGIN/ {
ignore = 1
print "\
Summary: Development utilities from GNU C library\n\
License: LGPL-2.1+\n\
Group: Development/Languages/C and C++"
}
/UTILS-SUMMARY-END/ { ignore = 0 }
/^%description$/ {
ignore = 1
print "\
%description\n\
The glibc-utils package contains mtrace, a memory leak tracer and\n\
xtrace, a function call tracer which can be helpful during program\n\
debugging.\n\
\n\
If you are unsure if you need this, don'\''t install this package.\n"
}
/^%package/ { ignore = 0}
!ignore { print }' glibc.spec > glibc-utils.spec
cp glibc.changes glibc-utils.changes
osc service localrun format_spec_file