Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at 2017-08-24 17:38:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glibc (Old) and /work/SRC/openSUSE:Factory/.glibc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glibc" Thu Aug 24 17:38:39 2017 rev:210 rq:514073 version:2.26 Changes: -------- --- /work/SRC/openSUSE:Factory/glibc/glibc-testsuite.changes 2017-04-25 08:53:59.510691967 +0200 +++ /work/SRC/openSUSE:Factory/.glibc.new/glibc-testsuite.changes 2017-08-24 17:38:43.679937109 +0200 @@ -1,0 +2,107 @@ +Wed Aug 2 14:32:58 UTC 2017 - [email protected] + +- Update to glibc 2.26 + * A per-thread cache has been added to malloc + * Unicode 10.0.0 Support + * Improvements to the DNS stub resolver + * New function reallocarray, which resizes an allocated block (like + realloc) to the product of two sizes, with a guaranteed clean failure + upon integer overflow in the multiplication + * New wrappers for the Linux-specific system calls preadv2 and pwritev2 + * posix_spawnattr_setflags now supports the flag POSIX_SPAWN_SETSID, to + create a new session ID for the spawned process + * errno.h is now safe to use from C-preprocessed assembly language on all + supported operating systems + * On ia64, powerpc64le, x86-32, and x86-64, the math library now implements + 128-bit floating point as defined by ISO/IEC/IEEE 60559:2011 (IEEE + 754-2008) and ISO/IEC TS 18661-3:2015 + * The synchronization that pthread_spin_unlock performs has been changed to + now be equivalent to a C11 atomic store with release memory order to the + spin lock's memory location + * The DNS stub resolver no longer performs EDNS fallback + * res_mkquery and res_nmkquery no longer support the IQUERY opcode + * The _res_opcodes variable has been removed from libresolv + * <string.h> no longer includes inline versions of any string functions, + as this kind of optimization is better done by the compiler + * The nonstandard header <xlocale.h> has been removed + * The obsolete header <sys/ultrasound.h> has been removed + * The obsolete signal constant SIGUNUSED is no longer defined by <signal.h> + * The obsolete function cfree has been removed + * The stack_t type no longer has the name struct sigaltstack + * The ucontext_t type no longer has the name struct ucontext + * On S/390 GNU/Linux, the constants defined by <sys/ptrace.h> have been + synced with the kernel + * Linux kernel 3.2 or later is required at runtime, on all architectures + supported by that kernel + * The DNS stub resolver limits the advertised UDP buffer size to 1200 bytes, + to avoid fragmentation-based spoofing attacks (CVE-2017-12132) + * LD_LIBRARY_PATH is now ignored in binaries running in privileged + AT_SECURE mode to guard against local privilege escalation attacks + (CVE-2017-1000366) + * Avoid printing a backtrace from the __stack_chk_fail function since it + is called on a corrupt stack and a backtrace is unreliable on a + corrupt stack (CVE-2010-3192) + * A use-after-free vulnerability in clntudp_call in the Sun RPC system + has been fixed (CVE-2017-12133) + * fate#322258, fate#321513, fate#322453 +- fts-symbol-redirect.patch, glibc-resolv-reload.diff, glibc-2.2-sunrpc.diff, + i686-memchr-sse.patch, ld-hwcap-mask-suid.patch, ld-library-path-suid.patch, + sunrpc-use-after-free.patch, test-math-vector-sincos-aliasing.patch, + tunables-bigendian.patch: Removed + +------------------------------------------------------------------- +Tue Jul 25 07:32:25 UTC 2017 - [email protected] + +- Fix RPM group + +------------------------------------------------------------------- +Thu Jul 20 12:17:21 UTC 2017 - [email protected] + +- s390-elision-enable-envvar.patch: enable TLE only if + GLIBC_ELISION_ENABLE=yes is defined (fate#322271) + +------------------------------------------------------------------- +Wed Jun 21 15:15:12 UTC 2017 - [email protected] + +- ld-hwcap-mask-suid.patch: Ignore and remove LD_HWCAP_MASK for AT_SECURE + programs (BZ #21209) +- ld-library-path-suid.patch: Completely ignore LD_LIBRARY_PATH for + AT_SECURE=1 programs (CVE-2017-1000366, bsc#1039357, BZ #21624) + +------------------------------------------------------------------- +Wed Jun 14 12:22:21 UTC 2017 - [email protected] + +- Remove glibc-cpusetsize.diff, no longer useful + +------------------------------------------------------------------- +Wed May 31 10:35:31 UTC 2017 - [email protected] + +- fts-symbol-redirect.patch: Fix symbol redirect for fts_set (bsc#1041123, + BZ #21289) + +------------------------------------------------------------------- +Mon May 29 18:10:31 UTC 2017 - [email protected] + +- test-math-vector-sincos-aliasing.patch: Fix test-math-vector-sincos.h + aliasing + +------------------------------------------------------------------- +Mon May 29 10:24:22 UTC 2017 - [email protected] + +- add-locales.patch: renamed from glibc-2.3.locales.diff.bz2, drop en_BE + locales (bsc#1039502) + +------------------------------------------------------------------- +Tue May 23 09:54:08 UTC 2017 - [email protected] + +- Remove glibc-testsuite.patch, no longer relevant + +------------------------------------------------------------------- +Mon May 22 10:04:59 UTC 2017 - [email protected] + +- Use multibuild feature +- Remove obsolete check-build.sh +- glibc.rpmlintrc: remove obsolete entries +- Use %tmpfiles_create in nscd postin + +------------------------------------------------------------------- glibc-utils.changes: same change glibc.changes: same change Old: ---- _service check-build.sh glibc-2.2-sunrpc.diff glibc-2.25.tar.xz glibc-2.25.tar.xz.sig glibc-2.3.locales.diff.bz2 glibc-cpusetsize.diff glibc-resolv-reload.diff glibc-testsuite.patch i686-memchr-sse.patch sunrpc-use-after-free.patch tunables-bigendian.patch New: ---- add-locales.patch glibc-2.26.tar.xz glibc-2.26.tar.xz.sig glibc-testsuite.spec.in glibc-utils.spec.in s390-elision-enable-envvar.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.7lqlDy/_old 2017-08-24 17:38:48.619241724 +0200 +++ /var/tmp/diff_new_pack.7lqlDy/_new 2017-08-24 17:38:48.623241161 +0200 @@ -16,27 +16,35 @@ # -%define build_snapshot 0 - -# PLEASE run pre_checkin.sh in this directory before submitting -# this package. Otherwise the .spec and .changes for glibc-testsuite -# 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 %bcond_with fast_build %define crypt_bf_version 1.3 +%define build_snapshot 0 + +%define flavor testsuite 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 +Summary: Testsuite results from the GNU C Library +License: LGPL-2.1+ +Group: Development/Libraries/C and C++ + +%bcond_with all +%define build_main 1 +%define build_utils %{with all} +%define build_testsuite %{with all} +%if "%flavor" == "utils" +%define build_main 0 +%define build_utils 1 +%define build_testsuite 0 +%endif +%if "%flavor" == "testsuite" +%define build_main 0 +%define build_utils 0 +%define build_testsuite 1 +%endif + BuildRequires: audit-devel BuildRequires: fdupes BuildRequires: libcap-devel @@ -45,16 +53,21 @@ BuildRequires: pwdutils BuildRequires: systemd-rpm-macros BuildRequires: xz -%if %{testsuite_build} +%if %{build_testsuite} BuildRequires: gcc-c++ BuildRequires: gdb BuildRequires: glibc-devel-static BuildRequires: libstdc++-devel BuildRequires: python-pexpect %endif -%if %{utils_build} +%if %{build_utils} BuildRequires: gd-devel %endif +%if "%flavor" == "i686" +ExclusiveArch: i586 i686 +BuildArch: i686 +%global optflags %(echo "%optflags"|sed -e s/i586/i686/) -march=i686 -mtune=generic +%endif %define __filter_GLIBC_PRIVATE 1 %ifarch i686 @@ -64,7 +77,7 @@ %define build_locales 1 %define build_html 0 %else -%if %{with fast_build} || %{utils_build} +%if %{with fast_build} || %{build_utils} && %{without all} %define build_profile 0 %define build_locales 0 %define build_html 0 @@ -76,7 +89,7 @@ %endif %endif -%define build_variants %{normal_build} +%define build_variants %{build_main} %define disable_assert 0 %define enable_stackguard_randomization 1 @@ -103,14 +116,23 @@ %define powerpc_optimize_cpu_power7 0 %define powerpc_optimize_cpu_cell 0 %endif # ppc, ppc64 -# 3.0 is the SLES 11 SP3 kernel -# 3.1 is the openSUSE 12.1 kernel -%define enablekernel 3.0 +# glibc requires at least kernel 3.2 +%define enablekernel 3.2 +# some architectures need a newer kernel +%ifarch ppc64le +%define enablekernel 3.10 +%endif +%ifarch aarch64 +%define enablekernel 3.7 +%endif +%ifarch ia64 +%define enablekernel 3.2.18 +%endif -Version: 2.25 +Version: 2.26 Release: 0 %if !%{build_snapshot} -%define git_id db0242e30234 +%define git_id 1c9a5c270d8b %define libversion %version %else %define git_id %(echo %version | sed 's/.*\.g//') @@ -118,9 +140,11 @@ %endif Url: http://www.gnu.org/software/libc/libc.html BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: http://ftp.gnu.org/pub/gnu/glibc/glibc-%{version}.tar.xz %if !%{build_snapshot} +Source: http://ftp.gnu.org/pub/gnu/glibc/glibc-%{version}.tar.xz Source1: http://ftp.gnu.org/pub/gnu/glibc/glibc-%{version}.tar.xz.sig +%else +Source: glibc-%{version}.tar.xz %endif Source2: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=libc&download=1#/glibc.keyring Source3: noversion.tar.bz2 @@ -138,7 +162,7 @@ # The sign key uses MD5 which is no longer accepted by gpg #Source51: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz.sign -%if %{normal_build} +%if %{build_main} # ngpt was used in 8.1 and SLES8 Obsoletes: ngpt < 2.2.2 Obsoletes: ngpt-devel < 2.2.2 @@ -160,8 +184,8 @@ Requires(pre): filesystem Recommends: glibc-extra Provides: rtld(GNU_HASH) -%endif # %{normal_build} -%if %{utils_build} +%endif +%if %{build_utils} Requires: glibc = %{version} %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -207,8 +231,6 @@ Patch9: glibc-nodate.patch # PATCH-FIX-OPENSUSE -- add some extra information to version output - [email protected] Patch10: glibc-version.diff -# PATCH-FIX-OPENSUSE remove lfs test from testsuite [email protected] -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 - [email protected] @@ -217,16 +239,16 @@ Patch14: glibc-bindresvport-blacklist.diff # PATCH-FIX-OPENSUSE prefer -lang rpm packages Patch15: glibc-2.3.90-langpackdir.diff -# PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility [email protected] (XXX: Review) -Patch18: glibc-cpusetsize.diff # PATCH-FEATURE-SLE Use nscd user for nscd Patch19: nscd-server-user.patch # PATCH-FEATURE-SLE powerpc: enable TLE only if GLIBC_ELISION_ENABLE=yes is defined Patch21: powerpc-elision-enable-envvar.patch +# PATCH-FEATURE-SLE s390: enable TLE only if GLIBC_ELISION_ENABLE=yes is defined +Patch22: s390-elision-enable-envvar.patch ### Locale related patches # PATCH-FIX-OPENSUSE Add additional locales -Patch100: glibc-2.3.locales.diff.bz2 +Patch100: add-locales.patch # PATCH-FIX-OPENSUSE -- Add no_NO back (XXX: Still needed?) Patch102: glibc-2.4.90-no_NO.diff # PATCH-FIX-OPENSUSE -- Renames for China @@ -239,10 +261,6 @@ ### Broken patches in glibc that we revert for now: ### 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 [email protected] -Patch301: glibc-2.2-sunrpc.diff # PATCH-FIX-OPENSUSE Warn about usage of mdns in resolv.conv Patch304: glibc-resolv-mdnshint.diff # PATCH-FIX-OPENSUSE disable rewriting ::1 to 127.0.0.1 for /etc/hosts bnc#684534, bnc#706719 @@ -251,12 +269,6 @@ ### # Patches from upstream ### -# PATCH-FIX-UPSTREAM Fix getting tunable values on big-endian (BZ #21109) -Patch1000: tunables-bigendian.patch -# PATCH-FIX-UPSTREAM Fix i686 memchr overflow calculation (BZ #21182) -Patch1001: i686-memchr-sse.patch -# PATCH-FIX-UPSTREAM Avoid use-after-free read access in clntudp_call (BZ #21115) -Patch1002: sunrpc-use-after-free.patch ### # Patches awaiting upstream approval @@ -281,10 +293,22 @@ Patch3000: manpages.patch %description +%if %build_main The GNU C Library provides the most important standard libraries used by nearly all programs: the standard C library, the standard math library, and the POSIX thread library. A system is not functional without these libraries. +%endif +%if %build_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, do not install this package. +%endif +%if %build_testsuite +This package contains the testsuite results from the GNU C Library. +%endif %package info Summary: Info Files for the GNU C Library @@ -408,7 +432,7 @@ %package extra Summary: Extra binaries from GNU C Library License: LGPL-2.1+ -Group: Development/Languages/C and C++ +Group: Development/Libraries/C and C++ Requires: glibc = %{version} %description extra @@ -457,14 +481,13 @@ touch -r nscd/s-stamp nscd/nscd_stat.c rm nscd/s-stamp %patch10 -p1 -%patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch18 -p1 %patch19 -p1 %patch21 -p1 +%patch22 -p1 %patch100 -p1 %patch102 -p1 @@ -472,15 +495,9 @@ %patch104 -p1 %patch105 -p1 -%patch300 -p1 -%patch301 -p1 %patch304 -p1 %patch306 -p1 -%patch1000 -p1 -%patch1001 -p1 -%patch1002 -p1 - %patch2000 -p1 %patch2001 -p1 %patch2002 -p1 @@ -636,7 +653,7 @@ $profile $elision \ "$@" \ --build=%{target} --host=%{target} \ -%ifarch armv7hl ppc ppc64 ppc64le %{ix86} x86_64 sparc sparc64 s390 s390x +%ifarch armv7hl ppc ppc64 ppc64le i686 x86_64 sparc sparc64 s390 s390x --enable-multi-arch \ %endif %ifarch mipsel @@ -652,7 +669,8 @@ --enable-tunables \ --enable-kernel=%{enablekernel} \ --with-bugurl=http://bugs.opensuse.org \ - --enable-bind-now --enable-obsolete-rpc \ + --enable-bind-now \ + --enable-obsolete-rpc --enable-obsolete-nsl \ --disable-timezone-tools # Should we enable --enable-systemtap? # Should we enable --enable-nss-crypt to build use freebl3 hash functions? @@ -751,7 +769,7 @@ ####################################################################### %check -%if %{testsuite_build} +%if %{build_testsuite} # The testsuite will fail if asneeded is used export SUSE_ASNEEDED=0 # Increase timeout @@ -793,7 +811,7 @@ ####################################################################### %install -%if %{normal_build} +%if %{build_main} # 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 @@ -994,6 +1012,7 @@ mv %{buildroot}%{_bindir}/getconf %{buildroot}%{_libexecdir}/getconf/getconf ln -s %{_libexecdir}/getconf/getconf %{buildroot}%{_bindir}/getconf +%if !%{build_utils} # Remove unwanted files (packaged in glibc-utils) rm -f %{buildroot}/%{_lib}/libmemusage* rm -f %{buildroot}/%{_lib}/libpcprofile* @@ -1011,6 +1030,7 @@ rm -f %{buildroot}%{_bindir}/makedb %{buildroot}/var/lib/misc/Makefile rm -f %{buildroot}%{_sbindir}/nscd %endif # i686 +%endif # !utils # LSB %ifarch %ix86 @@ -1032,9 +1052,9 @@ ln -sf /%{_lib}/ld64.so.1 $RPM_BUILD_ROOT/%{_lib}/ld-lsb-s390x.so.3 %endif -%endif # %{normal_build} +%else # !main -%if %{utils_build} +%if %{build_utils} make %{?_smp_mflags} install_root=%{buildroot} install -C cc-base \ subdirs='malloc debug elf' @@ -1047,7 +1067,9 @@ rm -rf %{buildroot}%{_mandir}/man* rm -rf %{buildroot}/sbin %{buildroot}%{_includedir} -%endif # %{utils_build} +%endif # utils + +%endif # !main ####################################################################### ### @@ -1055,13 +1077,9 @@ ### ####################################################################### -%if %{normal_build} %post -p %{_sbindir}/glibc_post_upgrade - %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 @@ -1086,7 +1104,7 @@ %post -n nscd %service_add_post nscd.service -mkdir -p /run/nscd +%tmpfiles_create /usr/lib/tmpfiles.d/nscd.conf # Previously we had nscd.socket, remove it test -x /usr/bin/systemctl && /usr/bin/systemctl stop nscd.socket 2>/dev/null || : test -x /usr/bin/systemctl && /usr/bin/systemctl disable nscd.socket 2>/dev/null || : @@ -1098,14 +1116,8 @@ %service_del_postun nscd.service exit 0 -%if %{normal_build} %files -####################################################################### -### -### FILES -### -####################################################################### - +%if %{build_main} # glibc %defattr(-,root,root) %doc LICENSES @@ -1381,10 +1393,9 @@ /var/lib/misc/Makefile %endif # !i686 -%endif # %{normal_build} +%endif # main -%if %{utils_build} -%files +%if %{build_utils} %defattr(-,root,root) /%{_lib}/libmemusage.so /%{_lib}/libpcprofile.so @@ -1397,6 +1408,6 @@ %{_bindir}/sotruss %{_bindir}/xtrace %{_bindir}/pldd -%endif # %{utils_build} +%endif # utils %changelog ++++++ glibc-utils.spec ++++++ --- /var/tmp/diff_new_pack.7lqlDy/_old 2017-08-24 17:38:48.675233841 +0200 +++ /var/tmp/diff_new_pack.7lqlDy/_new 2017-08-24 17:38:48.687232152 +0200 @@ -16,25 +16,35 @@ # -%define build_snapshot 0 - -# PLEASE run pre_checkin.sh in this directory before submitting -# this package. Otherwise the .spec and .changes for glibc-testsuite -# 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 %bcond_with fast_build %define crypt_bf_version 1.3 +%define build_snapshot 0 + +%define flavor utils Name: glibc-utils -%define normal_build ("%{name}" == "glibc") -%define utils_build ("%{name}" == "glibc-utils") -%define testsuite_build ("%{name}" == "glibc-testsuite") -Summary: Development utilities from GNU C library +Summary: Development utilities from the GNU C Library License: LGPL-2.1+ -Group: Development/Languages/C and C++ +Group: Development/Libraries/C and C++ + +%bcond_with all +%define build_main 1 +%define build_utils %{with all} +%define build_testsuite %{with all} +%if "%flavor" == "utils" +%define build_main 0 +%define build_utils 1 +%define build_testsuite 0 +%endif +%if "%flavor" == "testsuite" +%define build_main 0 +%define build_utils 0 +%define build_testsuite 1 +%endif + BuildRequires: audit-devel BuildRequires: fdupes BuildRequires: libcap-devel @@ -43,16 +53,21 @@ BuildRequires: pwdutils BuildRequires: systemd-rpm-macros BuildRequires: xz -%if %{testsuite_build} +%if %{build_testsuite} BuildRequires: gcc-c++ BuildRequires: gdb BuildRequires: glibc-devel-static BuildRequires: libstdc++-devel BuildRequires: python-pexpect %endif -%if %{utils_build} +%if %{build_utils} BuildRequires: gd-devel %endif +%if "%flavor" == "i686" +ExclusiveArch: i586 i686 +BuildArch: i686 +%global optflags %(echo "%optflags"|sed -e s/i586/i686/) -march=i686 -mtune=generic +%endif %define __filter_GLIBC_PRIVATE 1 %ifarch i686 @@ -62,7 +77,7 @@ %define build_locales 1 %define build_html 0 %else -%if %{with fast_build} || %{utils_build} +%if %{with fast_build} || %{build_utils} && %{without all} %define build_profile 0 %define build_locales 0 %define build_html 0 @@ -74,7 +89,7 @@ %endif %endif -%define build_variants %{normal_build} +%define build_variants %{build_main} %define disable_assert 0 %define enable_stackguard_randomization 1 @@ -101,14 +116,23 @@ %define powerpc_optimize_cpu_power7 0 %define powerpc_optimize_cpu_cell 0 %endif # ppc, ppc64 -# 3.0 is the SLES 11 SP3 kernel -# 3.1 is the openSUSE 12.1 kernel -%define enablekernel 3.0 +# glibc requires at least kernel 3.2 +%define enablekernel 3.2 +# some architectures need a newer kernel +%ifarch ppc64le +%define enablekernel 3.10 +%endif +%ifarch aarch64 +%define enablekernel 3.7 +%endif +%ifarch ia64 +%define enablekernel 3.2.18 +%endif -Version: 2.25 +Version: 2.26 Release: 0 %if !%{build_snapshot} -%define git_id db0242e30234 +%define git_id 1c9a5c270d8b %define libversion %version %else %define git_id %(echo %version | sed 's/.*\.g//') @@ -116,9 +140,11 @@ %endif Url: http://www.gnu.org/software/libc/libc.html BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: http://ftp.gnu.org/pub/gnu/glibc/glibc-%{version}.tar.xz %if !%{build_snapshot} +Source: http://ftp.gnu.org/pub/gnu/glibc/glibc-%{version}.tar.xz Source1: http://ftp.gnu.org/pub/gnu/glibc/glibc-%{version}.tar.xz.sig +%else +Source: glibc-%{version}.tar.xz %endif Source2: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=libc&download=1#/glibc.keyring Source3: noversion.tar.bz2 @@ -136,7 +162,7 @@ # The sign key uses MD5 which is no longer accepted by gpg #Source51: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz.sign -%if %{normal_build} +%if %{build_main} # ngpt was used in 8.1 and SLES8 Obsoletes: ngpt < 2.2.2 Obsoletes: ngpt-devel < 2.2.2 @@ -158,8 +184,8 @@ Requires(pre): filesystem Recommends: glibc-extra Provides: rtld(GNU_HASH) -%endif # %{normal_build} -%if %{utils_build} +%endif +%if %{build_utils} Requires: glibc = %{version} %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -205,8 +231,6 @@ Patch9: glibc-nodate.patch # PATCH-FIX-OPENSUSE -- add some extra information to version output - [email protected] Patch10: glibc-version.diff -# PATCH-FIX-OPENSUSE remove lfs test from testsuite [email protected] -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 - [email protected] @@ -215,16 +239,16 @@ Patch14: glibc-bindresvport-blacklist.diff # PATCH-FIX-OPENSUSE prefer -lang rpm packages Patch15: glibc-2.3.90-langpackdir.diff -# PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility [email protected] (XXX: Review) -Patch18: glibc-cpusetsize.diff # PATCH-FEATURE-SLE Use nscd user for nscd Patch19: nscd-server-user.patch # PATCH-FEATURE-SLE powerpc: enable TLE only if GLIBC_ELISION_ENABLE=yes is defined Patch21: powerpc-elision-enable-envvar.patch +# PATCH-FEATURE-SLE s390: enable TLE only if GLIBC_ELISION_ENABLE=yes is defined +Patch22: s390-elision-enable-envvar.patch ### Locale related patches # PATCH-FIX-OPENSUSE Add additional locales -Patch100: glibc-2.3.locales.diff.bz2 +Patch100: add-locales.patch # PATCH-FIX-OPENSUSE -- Add no_NO back (XXX: Still needed?) Patch102: glibc-2.4.90-no_NO.diff # PATCH-FIX-OPENSUSE -- Renames for China @@ -237,10 +261,6 @@ ### Broken patches in glibc that we revert for now: ### 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 [email protected] -Patch301: glibc-2.2-sunrpc.diff # PATCH-FIX-OPENSUSE Warn about usage of mdns in resolv.conv Patch304: glibc-resolv-mdnshint.diff # PATCH-FIX-OPENSUSE disable rewriting ::1 to 127.0.0.1 for /etc/hosts bnc#684534, bnc#706719 @@ -249,12 +269,6 @@ ### # Patches from upstream ### -# PATCH-FIX-UPSTREAM Fix getting tunable values on big-endian (BZ #21109) -Patch1000: tunables-bigendian.patch -# PATCH-FIX-UPSTREAM Fix i686 memchr overflow calculation (BZ #21182) -Patch1001: i686-memchr-sse.patch -# PATCH-FIX-UPSTREAM Avoid use-after-free read access in clntudp_call (BZ #21115) -Patch1002: sunrpc-use-after-free.patch ### # Patches awaiting upstream approval @@ -279,11 +293,22 @@ Patch3000: manpages.patch %description +%if %build_main +The GNU C Library provides the most important standard libraries used +by nearly all programs: the standard C library, the standard math +library, and the POSIX thread library. A system is not functional +without these libraries. +%endif +%if %build_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. +If you are unsure if you need this, do not install this package. +%endif +%if %build_testsuite +This package contains the testsuite results from the GNU C Library. +%endif %package info Summary: Info Files for the GNU C Library @@ -407,7 +432,7 @@ %package extra Summary: Extra binaries from GNU C Library License: LGPL-2.1+ -Group: Development/Languages/C and C++ +Group: Development/Libraries/C and C++ Requires: glibc = %{version} %description extra @@ -456,14 +481,13 @@ touch -r nscd/s-stamp nscd/nscd_stat.c rm nscd/s-stamp %patch10 -p1 -%patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch18 -p1 %patch19 -p1 %patch21 -p1 +%patch22 -p1 %patch100 -p1 %patch102 -p1 @@ -471,15 +495,9 @@ %patch104 -p1 %patch105 -p1 -%patch300 -p1 -%patch301 -p1 %patch304 -p1 %patch306 -p1 -%patch1000 -p1 -%patch1001 -p1 -%patch1002 -p1 - %patch2000 -p1 %patch2001 -p1 %patch2002 -p1 @@ -635,7 +653,7 @@ $profile $elision \ "$@" \ --build=%{target} --host=%{target} \ -%ifarch armv7hl ppc ppc64 ppc64le %{ix86} x86_64 sparc sparc64 s390 s390x +%ifarch armv7hl ppc ppc64 ppc64le i686 x86_64 sparc sparc64 s390 s390x --enable-multi-arch \ %endif %ifarch mipsel @@ -651,7 +669,8 @@ --enable-tunables \ --enable-kernel=%{enablekernel} \ --with-bugurl=http://bugs.opensuse.org \ - --enable-bind-now --enable-obsolete-rpc \ + --enable-bind-now \ + --enable-obsolete-rpc --enable-obsolete-nsl \ --disable-timezone-tools # Should we enable --enable-systemtap? # Should we enable --enable-nss-crypt to build use freebl3 hash functions? @@ -750,7 +769,7 @@ ####################################################################### %check -%if %{testsuite_build} +%if %{build_testsuite} # The testsuite will fail if asneeded is used export SUSE_ASNEEDED=0 # Increase timeout @@ -792,7 +811,7 @@ ####################################################################### %install -%if %{normal_build} +%if %{build_main} # 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 @@ -993,6 +1012,7 @@ mv %{buildroot}%{_bindir}/getconf %{buildroot}%{_libexecdir}/getconf/getconf ln -s %{_libexecdir}/getconf/getconf %{buildroot}%{_bindir}/getconf +%if !%{build_utils} # Remove unwanted files (packaged in glibc-utils) rm -f %{buildroot}/%{_lib}/libmemusage* rm -f %{buildroot}/%{_lib}/libpcprofile* @@ -1010,6 +1030,7 @@ rm -f %{buildroot}%{_bindir}/makedb %{buildroot}/var/lib/misc/Makefile rm -f %{buildroot}%{_sbindir}/nscd %endif # i686 +%endif # !utils # LSB %ifarch %ix86 @@ -1031,9 +1052,9 @@ ln -sf /%{_lib}/ld64.so.1 $RPM_BUILD_ROOT/%{_lib}/ld-lsb-s390x.so.3 %endif -%endif # %{normal_build} +%else # !main -%if %{utils_build} +%if %{build_utils} make %{?_smp_mflags} install_root=%{buildroot} install -C cc-base \ subdirs='malloc debug elf' @@ -1046,7 +1067,9 @@ rm -rf %{buildroot}%{_mandir}/man* rm -rf %{buildroot}/sbin %{buildroot}%{_includedir} -%endif # %{utils_build} +%endif # utils + +%endif # !main ####################################################################### ### @@ -1054,13 +1077,9 @@ ### ####################################################################### -%if %{normal_build} %post -p %{_sbindir}/glibc_post_upgrade - %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 @@ -1085,7 +1104,7 @@ %post -n nscd %service_add_post nscd.service -mkdir -p /run/nscd +%tmpfiles_create /usr/lib/tmpfiles.d/nscd.conf # Previously we had nscd.socket, remove it test -x /usr/bin/systemctl && /usr/bin/systemctl stop nscd.socket 2>/dev/null || : test -x /usr/bin/systemctl && /usr/bin/systemctl disable nscd.socket 2>/dev/null || : @@ -1097,14 +1116,8 @@ %service_del_postun nscd.service exit 0 -%if %{normal_build} %files -####################################################################### -### -### FILES -### -####################################################################### - +%if %{build_main} # glibc %defattr(-,root,root) %doc LICENSES @@ -1380,10 +1393,9 @@ /var/lib/misc/Makefile %endif # !i686 -%endif # %{normal_build} +%endif # main -%if %{utils_build} -%files +%if %{build_utils} %defattr(-,root,root) /%{_lib}/libmemusage.so /%{_lib}/libpcprofile.so @@ -1396,6 +1408,6 @@ %{_bindir}/sotruss %{_bindir}/xtrace %{_bindir}/pldd -%endif # %{utils_build} +%endif # utils %changelog ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.7lqlDy/_old 2017-08-24 17:38:48.763221453 +0200 +++ /var/tmp/diff_new_pack.7lqlDy/_new 2017-08-24 17:38:48.767220890 +0200 @@ -16,27 +16,41 @@ # -%define build_snapshot 0 - -# PLEASE run pre_checkin.sh in this directory before submitting -# this package. Otherwise the .spec and .changes for glibc-testsuite -# 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 %bcond_with fast_build %define crypt_bf_version 1.3 +%define build_snapshot 0 + +# INCLUDE glibc$flavor.spec.in +%ifarch i686 +%define flavor i686 +%else +%define flavor %nil +%endif 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 +# END INCLUDE glibc$flavor.spec.in + +%bcond_with all +%define build_main 1 +%define build_utils %{with all} +%define build_testsuite %{with all} +%if "%flavor" == "utils" +%define build_main 0 +%define build_utils 1 +%define build_testsuite 0 +%endif +%if "%flavor" == "testsuite" +%define build_main 0 +%define build_utils 0 +%define build_testsuite 1 +%endif + BuildRequires: audit-devel BuildRequires: fdupes BuildRequires: libcap-devel @@ -45,16 +59,21 @@ BuildRequires: pwdutils BuildRequires: systemd-rpm-macros BuildRequires: xz -%if %{testsuite_build} +%if %{build_testsuite} BuildRequires: gcc-c++ BuildRequires: gdb BuildRequires: glibc-devel-static BuildRequires: libstdc++-devel BuildRequires: python-pexpect %endif -%if %{utils_build} +%if %{build_utils} BuildRequires: gd-devel %endif +%if "%flavor" == "i686" +ExclusiveArch: i586 i686 +BuildArch: i686 +%global optflags %(echo "%optflags"|sed -e s/i586/i686/) -march=i686 -mtune=generic +%endif %define __filter_GLIBC_PRIVATE 1 %ifarch i686 @@ -64,7 +83,7 @@ %define build_locales 1 %define build_html 0 %else -%if %{with fast_build} || %{utils_build} +%if %{with fast_build} || %{build_utils} && %{without all} %define build_profile 0 %define build_locales 0 %define build_html 0 @@ -76,7 +95,7 @@ %endif %endif -%define build_variants %{normal_build} +%define build_variants %{build_main} %define disable_assert 0 %define enable_stackguard_randomization 1 @@ -103,14 +122,23 @@ %define powerpc_optimize_cpu_power7 0 %define powerpc_optimize_cpu_cell 0 %endif # ppc, ppc64 -# 3.0 is the SLES 11 SP3 kernel -# 3.1 is the openSUSE 12.1 kernel -%define enablekernel 3.0 +# glibc requires at least kernel 3.2 +%define enablekernel 3.2 +# some architectures need a newer kernel +%ifarch ppc64le +%define enablekernel 3.10 +%endif +%ifarch aarch64 +%define enablekernel 3.7 +%endif +%ifarch ia64 +%define enablekernel 3.2.18 +%endif -Version: 2.25 +Version: 2.26 Release: 0 %if !%{build_snapshot} -%define git_id db0242e30234 +%define git_id 1c9a5c270d8b %define libversion %version %else %define git_id %(echo %version | sed 's/.*\.g//') @@ -118,9 +146,11 @@ %endif Url: http://www.gnu.org/software/libc/libc.html BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: http://ftp.gnu.org/pub/gnu/glibc/glibc-%{version}.tar.xz %if !%{build_snapshot} +Source: http://ftp.gnu.org/pub/gnu/glibc/glibc-%{version}.tar.xz Source1: http://ftp.gnu.org/pub/gnu/glibc/glibc-%{version}.tar.xz.sig +%else +Source: glibc-%{version}.tar.xz %endif Source2: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=libc&download=1#/glibc.keyring Source3: noversion.tar.bz2 @@ -138,7 +168,7 @@ # The sign key uses MD5 which is no longer accepted by gpg #Source51: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz.sign -%if %{normal_build} +%if %{build_main} # ngpt was used in 8.1 and SLES8 Obsoletes: ngpt < 2.2.2 Obsoletes: ngpt-devel < 2.2.2 @@ -160,8 +190,8 @@ Requires(pre): filesystem Recommends: glibc-extra Provides: rtld(GNU_HASH) -%endif # %{normal_build} -%if %{utils_build} +%endif +%if %{build_utils} Requires: glibc = %{version} %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -207,8 +237,6 @@ Patch9: glibc-nodate.patch # PATCH-FIX-OPENSUSE -- add some extra information to version output - [email protected] Patch10: glibc-version.diff -# PATCH-FIX-OPENSUSE remove lfs test from testsuite [email protected] -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 - [email protected] @@ -217,16 +245,16 @@ Patch14: glibc-bindresvport-blacklist.diff # PATCH-FIX-OPENSUSE prefer -lang rpm packages Patch15: glibc-2.3.90-langpackdir.diff -# PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility [email protected] (XXX: Review) -Patch18: glibc-cpusetsize.diff # PATCH-FEATURE-SLE Use nscd user for nscd Patch19: nscd-server-user.patch # PATCH-FEATURE-SLE powerpc: enable TLE only if GLIBC_ELISION_ENABLE=yes is defined Patch21: powerpc-elision-enable-envvar.patch +# PATCH-FEATURE-SLE s390: enable TLE only if GLIBC_ELISION_ENABLE=yes is defined +Patch22: s390-elision-enable-envvar.patch ### Locale related patches # PATCH-FIX-OPENSUSE Add additional locales -Patch100: glibc-2.3.locales.diff.bz2 +Patch100: add-locales.patch # PATCH-FIX-OPENSUSE -- Add no_NO back (XXX: Still needed?) Patch102: glibc-2.4.90-no_NO.diff # PATCH-FIX-OPENSUSE -- Renames for China @@ -239,10 +267,6 @@ ### Broken patches in glibc that we revert for now: ### 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 [email protected] -Patch301: glibc-2.2-sunrpc.diff # PATCH-FIX-OPENSUSE Warn about usage of mdns in resolv.conv Patch304: glibc-resolv-mdnshint.diff # PATCH-FIX-OPENSUSE disable rewriting ::1 to 127.0.0.1 for /etc/hosts bnc#684534, bnc#706719 @@ -251,12 +275,6 @@ ### # Patches from upstream ### -# PATCH-FIX-UPSTREAM Fix getting tunable values on big-endian (BZ #21109) -Patch1000: tunables-bigendian.patch -# PATCH-FIX-UPSTREAM Fix i686 memchr overflow calculation (BZ #21182) -Patch1001: i686-memchr-sse.patch -# PATCH-FIX-UPSTREAM Avoid use-after-free read access in clntudp_call (BZ #21115) -Patch1002: sunrpc-use-after-free.patch ### # Patches awaiting upstream approval @@ -281,10 +299,22 @@ Patch3000: manpages.patch %description +%if %build_main The GNU C Library provides the most important standard libraries used by nearly all programs: the standard C library, the standard math library, and the POSIX thread library. A system is not functional without these libraries. +%endif +%if %build_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, do not install this package. +%endif +%if %build_testsuite +This package contains the testsuite results from the GNU C Library. +%endif %package info Summary: Info Files for the GNU C Library @@ -408,7 +438,7 @@ %package extra Summary: Extra binaries from GNU C Library License: LGPL-2.1+ -Group: Development/Languages/C and C++ +Group: Development/Libraries/C and C++ Requires: glibc = %{version} %description extra @@ -457,14 +487,13 @@ touch -r nscd/s-stamp nscd/nscd_stat.c rm nscd/s-stamp %patch10 -p1 -%patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch18 -p1 %patch19 -p1 %patch21 -p1 +%patch22 -p1 %patch100 -p1 %patch102 -p1 @@ -472,15 +501,9 @@ %patch104 -p1 %patch105 -p1 -%patch300 -p1 -%patch301 -p1 %patch304 -p1 %patch306 -p1 -%patch1000 -p1 -%patch1001 -p1 -%patch1002 -p1 - %patch2000 -p1 %patch2001 -p1 %patch2002 -p1 @@ -636,7 +659,7 @@ $profile $elision \ "$@" \ --build=%{target} --host=%{target} \ -%ifarch armv7hl ppc ppc64 ppc64le %{ix86} x86_64 sparc sparc64 s390 s390x +%ifarch armv7hl ppc ppc64 ppc64le i686 x86_64 sparc sparc64 s390 s390x --enable-multi-arch \ %endif %ifarch mipsel @@ -652,7 +675,8 @@ --enable-tunables \ --enable-kernel=%{enablekernel} \ --with-bugurl=http://bugs.opensuse.org \ - --enable-bind-now --enable-obsolete-rpc \ + --enable-bind-now \ + --enable-obsolete-rpc --enable-obsolete-nsl \ --disable-timezone-tools # Should we enable --enable-systemtap? # Should we enable --enable-nss-crypt to build use freebl3 hash functions? @@ -751,7 +775,7 @@ ####################################################################### %check -%if %{testsuite_build} +%if %{build_testsuite} # The testsuite will fail if asneeded is used export SUSE_ASNEEDED=0 # Increase timeout @@ -793,7 +817,7 @@ ####################################################################### %install -%if %{normal_build} +%if %{build_main} # 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 @@ -994,6 +1018,7 @@ mv %{buildroot}%{_bindir}/getconf %{buildroot}%{_libexecdir}/getconf/getconf ln -s %{_libexecdir}/getconf/getconf %{buildroot}%{_bindir}/getconf +%if !%{build_utils} # Remove unwanted files (packaged in glibc-utils) rm -f %{buildroot}/%{_lib}/libmemusage* rm -f %{buildroot}/%{_lib}/libpcprofile* @@ -1011,6 +1036,7 @@ rm -f %{buildroot}%{_bindir}/makedb %{buildroot}/var/lib/misc/Makefile rm -f %{buildroot}%{_sbindir}/nscd %endif # i686 +%endif # !utils # LSB %ifarch %ix86 @@ -1032,9 +1058,9 @@ ln -sf /%{_lib}/ld64.so.1 $RPM_BUILD_ROOT/%{_lib}/ld-lsb-s390x.so.3 %endif -%endif # %{normal_build} +%else # !main -%if %{utils_build} +%if %{build_utils} make %{?_smp_mflags} install_root=%{buildroot} install -C cc-base \ subdirs='malloc debug elf' @@ -1047,7 +1073,9 @@ rm -rf %{buildroot}%{_mandir}/man* rm -rf %{buildroot}/sbin %{buildroot}%{_includedir} -%endif # %{utils_build} +%endif # utils + +%endif # !main ####################################################################### ### @@ -1055,13 +1083,9 @@ ### ####################################################################### -%if %{normal_build} %post -p %{_sbindir}/glibc_post_upgrade - %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 @@ -1086,7 +1110,7 @@ %post -n nscd %service_add_post nscd.service -mkdir -p /run/nscd +%tmpfiles_create /usr/lib/tmpfiles.d/nscd.conf # Previously we had nscd.socket, remove it test -x /usr/bin/systemctl && /usr/bin/systemctl stop nscd.socket 2>/dev/null || : test -x /usr/bin/systemctl && /usr/bin/systemctl disable nscd.socket 2>/dev/null || : @@ -1098,14 +1122,8 @@ %service_del_postun nscd.service exit 0 -%if %{normal_build} %files -####################################################################### -### -### FILES -### -####################################################################### - +%if %{build_main} # glibc %defattr(-,root,root) %doc LICENSES @@ -1381,10 +1399,9 @@ /var/lib/misc/Makefile %endif # !i686 -%endif # %{normal_build} +%endif # main -%if %{utils_build} -%files +%if %{build_utils} %defattr(-,root,root) /%{_lib}/libmemusage.so /%{_lib}/libpcprofile.so @@ -1397,6 +1414,6 @@ %{_bindir}/sotruss %{_bindir}/xtrace %{_bindir}/pldd -%endif # %{utils_build} +%endif # utils %changelog ++++++ abort-no-flush.patch ++++++ --- /var/tmp/diff_new_pack.7lqlDy/_old 2017-08-24 17:38:48.855208503 +0200 +++ /var/tmp/diff_new_pack.7lqlDy/_new 2017-08-24 17:38:48.859207940 +0200 @@ -18,7 +18,7 @@ struct abort_msg_s *__abort_msg __attribute__ ((nocommon)); libc_hidden_def (__abort_msg) @@ -66,16 +63,8 @@ abort (void) - __sigprocmask (SIG_UNBLOCK, &sigs, (sigset_t *) NULL); + __sigprocmask (SIG_UNBLOCK, &sigs, 0); } - /* Flush all streams. We cannot close them now because the user ++++++ add-locales.patch ++++++ Index: glibc-2.25/localedata/SUPPORTED =================================================================== --- glibc-2.25.orig/localedata/SUPPORTED +++ glibc-2.25/localedata/SUPPORTED @@ -129,6 +129,7 @@ en_CA.UTF-8/UTF-8 \ en_CA/ISO-8859-1 \ en_DK.UTF-8/UTF-8 \ en_DK/ISO-8859-1 \ +en_GB.ISO-8859-15/ISO-8859-15 \ en_GB.UTF-8/UTF-8 \ en_GB/ISO-8859-1 \ en_HK.UTF-8/UTF-8 \ @@ -145,6 +146,7 @@ en_PH.UTF-8/UTF-8 \ en_PH/ISO-8859-1 \ en_SG.UTF-8/UTF-8 \ en_SG/ISO-8859-1 \ +en_US.ISO-8859-15/ISO-8859-15 \ en_US.UTF-8/UTF-8 \ en_US/ISO-8859-1 \ en_ZA.UTF-8/UTF-8 \ @@ -269,6 +271,8 @@ it_IT/ISO-8859-1 \ it_IT@euro/ISO-8859-15 \ iu_CA/UTF-8 \ ja_JP.EUC-JP/EUC-JP \ +ja_JP.SHIFT_JISX0213/SHIFT_JISX0213 \ +ja_JP.SJIS/SHIFT_JIS \ ja_JP.UTF-8/UTF-8 \ ka_GE.UTF-8/UTF-8 \ ka_GE/GEORGIAN-PS \ ++++++ fnmatch-collating-elements.patch ++++++ --- /var/tmp/diff_new_pack.7lqlDy/_old 2017-08-24 17:38:48.987189922 +0200 +++ /var/tmp/diff_new_pack.7lqlDy/_new 2017-08-24 17:38:48.991189358 +0200 @@ -19,9 +19,9 @@ tst-pathconf tst-getaddrinfo4 tst-rxspencer-no-utf8 \ tst-fnmatch3 bug-regex36 tst-getaddrinfo5 \ + tst-fnmatch4 tst-fnmatch5 \ - tst-posix_spawn-fd \ - tst-posix_fadvise tst-posix_fadvise64 - xtests := bug-ga2 + tst-posix_spawn-fd tst-posix_spawn-setsid \ + tst-posix_fadvise tst-posix_fadvise64 \ + tst-sysconf-empty-chroot Index: glibc-2.22/posix/fnmatch.c =================================================================== --- glibc-2.22.orig/posix/fnmatch.c ++++++ glibc-2.25.tar.xz -> glibc-2.26.tar.xz ++++++ /work/SRC/openSUSE:Factory/glibc/glibc-2.25.tar.xz /work/SRC/openSUSE:Factory/.glibc.new/glibc-2.26.tar.xz differ: char 25, line 1 ++++++ glibc-testsuite.spec.in ++++++ %define flavor testsuite Name: glibc-testsuite Summary: Testsuite results from the GNU C Library License: LGPL-2.1+ Group: Development/Libraries/C and C++ ++++++ glibc-utils.spec.in ++++++ %define flavor utils Name: glibc-utils Summary: Development utilities from the GNU C Library License: LGPL-2.1+ Group: Development/Libraries/C and C++ ++++++ glibc.keyring ++++++ Binary files /var/tmp/diff_new_pack.7lqlDy/_old and /var/tmp/diff_new_pack.7lqlDy/_new differ ++++++ glibc.rpmlintrc ++++++ --- /var/tmp/diff_new_pack.7lqlDy/_old 2017-08-24 17:38:49.283148255 +0200 +++ /var/tmp/diff_new_pack.7lqlDy/_new 2017-08-24 17:38:49.283148255 +0200 @@ -1,25 +1,20 @@ -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") +# glibc-profile is a devel package +addFilter("glibc-profile.* devel-file-in-non-devel-package.*/usr/lib.*/lib.*_p.a") +# glibc is not a devel package +addFilter("glibc\\..* non-devel-file-in-devel-package") +# getent deliberately uses gethostbyname +addFilter("binary-or-shlib-calls-gethostbyname /usr/bin/getent") # We do need to keep the symtab (see comments in glibc.spec), so this is intented: -addFilter(".*unstripped-binary-or-object.*") -# The duplication is intented: -addFilter(".*files-duplicate /usr/lib64/libbsd-compat.a /usr/lib.*/libg.a") +addFilter("unstripped-binary-or-object") # ld.so is special: -addFilter(".*shared-lib-without-dependency-information /lib.*/ld-2.*.so") +addFilter("shared-lib-without-dependency-information /lib.*/ld-2.*\\.so") # Handled via glibc_post_upgrade: -addFilter(".*permissions-missing-postin missing %set_permissions /usr/.*pt_chown in %post") -# Do not require permissions, this will lead to a cycle (bnc#700925): -addFilter("glibc\..*: permissions-missing-requires") +addFilter("postin-without-ldconfig") # We will not rename glibc to follow the shlib policy addFilter("shlib-policy-missing-suffix") -# The dynamic linker and libnsl call exit - this is fine -addFilter(".*shared-lib-calls-exit.*") +# libpthread and libnsl call exit - this is fine +addFilter("shared-lib-calls-exit") # The man-pages package contains a number of man pages for programs that come # with glibc, therefore do not warn about them -addFilter(".*glibc.*no-manual-page-for-binary getent") -addFilter(".*glibc.*no-manual-page-for-binary iconv") -addFilter(".*glibc.*no-manual-page-for-binary ldd") -addFilter(".*glibc.*no-manual-page-for-binary ldconfig") -addFilter(".*nscd.*no-manual-page-for-binary nscd") +addFilter("glibc.*no-manual-page-for-binary (getent|iconv|ldd|ldconfig|locale)") +addFilter("nscd.*no-manual-page-for-binary nscd") ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.7lqlDy/_old 2017-08-24 17:38:49.399131926 +0200 +++ /var/tmp/diff_new_pack.7lqlDy/_new 2017-08-24 17:38:49.407130800 +0200 @@ -1,29 +1,8 @@ -#!/bin/bash -# 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; next } -/^%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 - +#!/bin/sh +for flavor in utils testsuite; do + sed -e "/^# INCLUDE /r glibc-$flavor.spec.in" \ + -e "/^# INCLUDE /,/^# END INCLUDE /d" \ + glibc.spec > glibc-$flavor.spec + cp glibc.changes glibc-$flavor.changes +done +osc service lr format_spec_file ++++++ s390-elision-enable-envvar.patch ++++++ Index: glibc-2.25/sysdeps/unix/sysv/linux/s390/elision-conf.c =================================================================== --- glibc-2.25.orig/sysdeps/unix/sysv/linux/s390/elision-conf.c +++ glibc-2.25/sysdeps/unix/sysv/linux/s390/elision-conf.c @@ -21,6 +21,7 @@ #include <elision-conf.h> #include <unistd.h> #include <dl-procinfo.h> +#include <string.h> /* Reasonable initial tuning values, may be revised in the future. This is a conservative initial value. */ @@ -64,7 +65,17 @@ elision_init (int argc __attribute__ ((u When false elision is never attempted. */ int elision_available = (GLRO (dl_hwcap) & HWCAP_S390_TE) ? 1 : 0; - __pthread_force_elision = __libc_enable_secure ? 0 : elision_available; + /* Scan the environment and conditionally enable TLE. */ + if (elision_available != 0 && __libc_enable_secure == 0) + { + for ( ; *environ != NULL; environ++) + if (**environ == 'G' + && strcmp (*environ, "GLIBC_ELISION_ENABLE=yes") == 0) + { + __pthread_force_elision = elision_available; + break; + } + } } #ifdef SHARED
