From f012b79549960371d416f1bf198fd7968446d6c6 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 3 Feb 2021 20:50:41 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/glibc.git#c290b4561137469528de8a9bffb7e3da57b8f20d --- glibc.spec | 123 +++++++++++++++++++++++++++++++++++++++++++---------- sources | 2 +- 2 files changed, 101 insertions(+), 24 deletions(-) diff --git a/glibc.spec b/glibc.spec index ea30e1f..e5bbfcc 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.32.9000-533-gcf12900645 +%define glibcsrcdir glibc-2.32.9000-573-gdf359a25ba %define glibcversion 2.32.9000 # Pre-release tarballs are pulled in from git using a command that is # effectively: @@ -96,7 +96,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 26%{?dist} +Release: 29%{?dist} # In general, GPLv2+ is used by programs, LGPLv2+ is used for # libraries. @@ -190,11 +190,6 @@ Recommends: (nss_hesiod(x86-32) if nss_hesiod(x86-64)) BuildRequires: gd-devel libpng-devel zlib-devel %endif %if %{with docs} -# Removing texinfo will cause check-safety.sh test to fail because it seems to -# trigger documentation generation based on dependencies. We need to fix this -# upstream in some way that doesn't depend on generating docs to validate the -# texinfo. I expect it's simply the wrong dependency for that target. -BuildRequires: texinfo >= 5.0 %endif %if %{without bootstrap} BuildRequires: libselinux-devel >= 1.33.4-3 @@ -341,6 +336,26 @@ executables. Install glibc-devel if you are going to develop programs which will use the standard C libraries. +############################################################################## +# glibc "doc" sub-package +############################################################################## +%if %{with docs} +%package doc +Summary: Documentation for GNU libc +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +# Removing texinfo will cause check-safety.sh test to fail because it seems to +# trigger documentation generation based on dependencies. We need to fix this +# upstream in some way that doesn't depend on generating docs to validate the +# texinfo. I expect it's simply the wrong dependency for that target. +BuildRequires: texinfo >= 5.0 + +%description doc +The glibc-doc package contains The GNU C Library Reference Manual in info +format. Additional package documentation is also provided. +%endif + ############################################################################## # glibc "static" sub-package ############################################################################## @@ -1296,6 +1311,9 @@ fi # Compress all of the info files. gzip -9nvf %{glibc_sysroot}%{_infodir}/libc* +# Copy the debugger interface documentation over to the right location +mkdir -p %{glibc_sysroot}%{_docdir}/glibc +cp elf/rtld-debugger-interface.txt %{glibc_sysroot}%{_docdir}/glibc %else rm -f %{glibc_sysroot}%{_infodir}/dir rm -f %{glibc_sysroot}%{_infodir}/libc.info* @@ -1394,12 +1412,6 @@ rm -rf %{glibc_sysroot}%{_prefix}/share/zoneinfo touch -r %{SOURCE0} %{glibc_sysroot}/etc/ld.so.conf touch -r inet/etc.rpc %{glibc_sysroot}/etc/rpc -# Lastly copy some additional documentation for the packages. -rm -rf documentation -mkdir documentation -cp timezone/README documentation/README.timezone -cp posix/gai.conf documentation/ - %if %{with benchtests} # Build benchmark binaries. Ignore the output of the benchmark runs. pushd build-%{target} @@ -1508,6 +1520,8 @@ ar cr %{glibc_sysroot}%{_prefix}/%{_lib}/libpthread_nonshared.a # - Files for the nscd subpackage. # * devel.filelist # - Files for the devel subpackage. +# * doc.filelist +# - Files for the documentation subpackage. # * headers.filelist # - Files for the headers subpackage. # * static.filelist @@ -1536,6 +1550,7 @@ touch common.filelist touch utils.filelist touch nscd.filelist touch devel.filelist +touch doc.filelist touch headers.filelist touch static.filelist touch libnsl.filelist @@ -1645,15 +1660,10 @@ grep -e "libmemusage.so" -e "libpcprofile.so" master.filelist >> glibc.filelist # glibc-devel ############################################################################### -%if %{with docs} -# Put the info files into the devel file list, but exclude the generated dir. -grep '%{_infodir}' master.filelist | grep -v '%{_infodir}/dir' > devel.filelist -%endif - # Put some static files into the devel package. grep '%{_libdir}/lib.*\.a' master.filelist \ | grep '/lib\(\(c\|pthread\|nldbl\|mvec\)_nonshared\|g\|ieee\|mcheck\)\.a$' \ - >> devel.filelist + > devel.filelist # Put all of the object files and *.so (not the versioned ones) into the # devel package. @@ -1667,6 +1677,16 @@ sed -i -e '\,libmemusage.so,d' \ -e '\,/libnss_[a-z]*\.so$,d' \ devel.filelist +############################################################################### +# glibc-doc +############################################################################### + +%if %{with docs} +# Put the info files into the doc file list, but exclude the generated dir. +grep '%{_infodir}' master.filelist | grep -v '%{_infodir}/dir' > doc.filelist +grep '%{_docdir}' master.filelist >> doc.filelist +%endif + ############################################################################### # glibc-headers ############################################################################### @@ -1717,12 +1737,14 @@ grep '%{_prefix}/sbin' master.filelist \ # multilib-independent. # Exceptions: # - The actual share directory, not owned by us. -# - The info files which go in devel, and the info directory. +# - The info files which go into doc, and the info directory. +# - All documentation files, which go into doc. grep '%{_prefix}/share' master.filelist \ | grep -v \ -e '%{_prefix}/share/info/libc.info.*' \ -e '%%dir %{prefix}/share/info' \ -e '%%dir %{prefix}/share' \ + -e '%{_docdir}' \ >> common.filelist ############################################################################### @@ -2192,7 +2214,6 @@ fi %attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/cache/ldconfig/aux-cache %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/ld.so.cache %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/gai.conf -%doc README NEWS INSTALL elf/rtld-debugger-interface.txt # If rpm doesn't support %license, then use %doc instead. %{!?_licensedir:%global license %%doc} %license COPYING COPYING.LIB LICENSES @@ -2201,8 +2222,6 @@ fi %dir %{_prefix}/lib/locale %dir %{_prefix}/lib/locale/C.utf8 %{_prefix}/lib/locale/C.utf8/* -%doc documentation/README.timezone -%doc documentation/gai.conf %files all-langpacks %{_prefix}/lib/locale/locale-archive @@ -2217,6 +2236,10 @@ fi %files -f devel.filelist devel +%if %{with docs} +%files -f doc.filelist doc +%endif + %files -f static.filelist static %if %{need_headers_package} @@ -2267,6 +2290,60 @@ fi %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %changelog +* Wed Jan 27 2021 Arjun Shankar - 2.32.9000-29 +- Auto-sync with upstream branch master, + commit df359a25ba6f6bda06104229fbfe284c1fb30915: +- Revert "Make libc symbols hidden in static PIE" [BZ #27237] +- benchtests: Do not build bench-timing-type with MODULE_NAME=libc +- aarch64: Fix the list of tested IFUNC variants [BZ #26818] +- Update INSTALL with package versions that are known to work +- aarch64: Move and update the definition of MTE_ENABLED +- Fix misplaced const +- Update C-SKY libm-test-ulps +- manual: Correct argument order in mount examples [BZ #27207] +- linux: mips: Fix getdents64 fallback on mips64-n32 +- x86: Properly match CPU features in /proc/cpuinfo [BZ #27222] +- x86-64: Update tst-glibc-hwcaps-2.c for x86-64 baseline +- powerpc64: Select POWER9 machine for the scv instruction +- x86: Check ifunc resolver with CPU_FEATURE_USABLE [BZ #27072] +- Revert "linux: Move {f}xstat{at} to compat symbols" for static build +- aarch64: revert memcpy optimze for kunpeng to avoid performance degradation +- Make libc symbols hidden in static PIE +- csu: Move static pie self relocation later [BZ #27072] +- Use hidden visibility for early static PIE code +- csu: Avoid weak ref for __ehdr_start in static PIE +- configure: Check for static PIE support +- elf: Avoid RELATIVE relocs in __tunables_init +- elf: Make the tunable struct definition internal only +- : Remove the C preprocessor magic +- posix: Fix fnmatch.c on bootstrap +- stdlib: Add testcase for BZ #26241 +- posix: Fix regex_internal.h on bootstrap +- Use in __libc_init_secure +- elf: Avoid RELATIVE relocation for _dl_sysinfo +- libmvec: Add extra-test-objs to test-extras +- Hurd: Add rtld-strncpy-c.c +- Update MIPS libm-test-ulps. +- Update arm libm-test-ulps. +- Update powerpc-nofpu libm-test-ulps. +- Update hppa libm-test-ulps +- ARC: nofpu: Regenerate ulps +- ld.so: Add --list-tunables to print tunable values +- math/test-tgmath2: Fix fabs failure when no long double +- x86: Move x86 processor cache info to cpu_features +- Fix x86 build with --enable-tunable=no +- ifuncmain6pie: Remove the circular IFUNC dependency [BZ #20019] + +* Tue Jan 26 2021 Fedora Release Engineering - 2.32.9000-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Jan 23 2021 Arjun Shankar - 2.32.9000-27 +- Introduce new glibc-doc.noarch subpackage (#1346925) +- Move the reference manual info pages from glibc-devel to glibc-doc +- Move debugger interface documentation from glibc to glibc-doc +- Remove unnecessary README, INSTALL, NEWS files from glibc +- Remove unnecessary README.timezone and gai.conf files from glibc-common + * Thu Jan 14 2021 Arjun Shankar - 2.32.9000-26 - Deprecate nscd (#1905135) - https://fedoraproject.org/wiki/Changes/DeprecateNSCD diff --git a/sources b/sources index 4927001..7ca9589 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glibc-2.32.9000-533-gcf12900645.tar.xz) = 11e881323260c34df2d78ad3f045532cf25e45b3216695a7d26549617d9291756a69cc1bb94163adb6390bec3249827dca84a6f224e2063ed0f9fa6b4c492283 +SHA512 (glibc-2.32.9000-573-gdf359a25ba.tar.xz) = d5457c1756810308d4ec643c4f1a19a575656b9617db34909848c9ed877d09045bc1bd447189dccce59bcbe905bac56154e7a5896c9ebcb9b89f0a22643f816f