Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package glibc for openSUSE:Factory checked
in at 2021-03-07 15:19:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glibc (Old)
and /work/SRC/openSUSE:Factory/.glibc.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glibc"
Sun Mar 7 15:19:35 2021 rev:246 rq:876231 version:2.33
Changes:
--------
--- /work/SRC/openSUSE:Factory/glibc/glibc.changes 2021-02-23
20:21:57.587738184 +0100
+++ /work/SRC/openSUSE:Factory/.glibc.new.2378/glibc.changes 2021-03-07
15:19:37.304551099 +0100
@@ -1,0 +2,12 @@
+Tue Mar 2 11:57:15 UTC 2021 - Andreas Schwab <sch...@suse.de>
+
+- Disable x86 ISA level for now (bsc#1182522, BZ #27318)
+- nss-revert-api.patch: Workaround for nss-compat brokeness (bsc#1182247,
+ BZ #27416)
+
+-------------------------------------------------------------------
+Mon Mar 1 16:43:55 UTC 2021 - Andreas Schwab <sch...@suse.de>
+
+- Fix build of utils flavor for usrmerge
+
+-------------------------------------------------------------------
New:
----
nss-revert-api.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glibc.spec ++++++
--- /var/tmp/diff_new_pack.UGa3Xz/_old 2021-03-07 15:19:38.476552295 +0100
+++ /var/tmp/diff_new_pack.UGa3Xz/_new 2021-03-07 15:19:38.480552299 +0100
@@ -200,6 +200,8 @@
###
# Patches that upstream will not accept
###
+# PATCH-FIX-OPENSUSE Work around for nss-compat brokeness
+Patch1: nss-revert-api.patch
###
# openSUSE specific patches - won't go upstream
@@ -415,18 +417,9 @@
for -static linking. You don't need these, unless you link statically,
which is highly discouraged.
-
-
-
-
-
-
-
-
+%package extra
# makedb requires libselinux. We add this program in a separate
# package so that glibc does not require libselinux.
-
-%package extra
Summary: Extra binaries from GNU C Library
License: LGPL-2.1-or-later
Group: Development/Libraries/C and C++
@@ -452,6 +445,7 @@
%prep
%setup -n glibc-%{version} -q -a 4
+%patch1 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
@@ -584,6 +578,8 @@
%else
profile="--disable-profile"
%endif
+# Disable x86 ISA level support for now (bsc#1182522)
+export libc_cv_include_x86_isa_level=no
../configure \
CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \
CC="$BuildCC" CXX="$BuildCCplus" \
@@ -922,7 +918,11 @@
%if "%{rtlddir}" != "%{slibdir}"
rm -f %{buildroot}%{rtlddir}/ld*.so*
%endif
+%if "%{_libdir}" != "%{slibdir}"
rm -f %{buildroot}%{_libdir}/lib*
+%else
+rm -f %{buildroot}%{_libdir}/lib*.a
+%endif
rm -f %{buildroot}%{_bindir}/{catchsegv,ldd*,sprof}
rm -rf %{buildroot}%{_mandir}/man*
rm -rf %{buildroot}%{rootsbindir} %{buildroot}%{_includedir}
++++++ glibc-nsswitch-usr.diff ++++++
--- /var/tmp/diff_new_pack.UGa3Xz/_old 2021-03-07 15:19:38.588552409 +0100
+++ /var/tmp/diff_new_pack.UGa3Xz/_new 2021-03-07 15:19:38.588552409 +0100
@@ -1,13 +1,15 @@
-Index: glibc-2.31/nss/nss_database.c
+Index: glibc-2.33/nss/nsswitch.c
===================================================================
---- glibc-2.31.orig/nss/nss_database.c
-+++ glibc-2.31/nss/nss_database.c
-@@ -294,6 +294,8 @@ nss_database_reload (struct nss_database_data *staging,
- struct file_change_detection *initial)
- {
- FILE *fp = fopen (_PATH_NSSWITCH_CONF, "rce");
-+ if (fp == NULL)
-+ fp = fopen ("/usr" _PATH_NSSWITCH_CONF, "rce");
- if (fp == NULL)
- switch (errno)
- {
+--- glibc-2.33.orig/nss/nsswitch.c
++++ glibc-2.33/nss/nsswitch.c
+@@ -126,6 +126,10 @@ __nss_database_lookup2 (const char *data
+ /* Read config file. */
+ service_table = nss_parse_file (_PATH_NSSWITCH_CONF);
+
++ /* Retry with the OS vendor provided config file. */
++ if (service_table == NULL)
++ service_table = nss_parse_file ("/usr" _PATH_NSSWITCH_CONF);
++
+ /* Test whether configuration data is available. */
+ if (service_table != NULL)
+ {
++++++ nss-revert-api.patch ++++++
++++ 4609 lines (skipped)
