Accepting request 876231 from Base:System

- Disable x86 ISA level for now (bsc#1182522, BZ #27318)
- nss-revert-api.patch: Workaround for nss-compat brokeness (bsc#1182247,
  BZ #27416) (forwarded request 876230 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/876231
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=246

glibc-nsswitch-usr.diff

@@ -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)
+     {

glibc.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Mar  2 11:57:15 UTC 2021 - Andreas Schwab <schwab@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 <schwab@suse.de>
+
+- Fix build of utils flavor for usrmerge
+
 -------------------------------------------------------------------
 Thu Feb 18 11:29:12 UTC 2021 - Andreas Schwab <schwab@suse.de>
 

glibc.spec

@@ -200,6 +200,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ###
 # 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 @@ 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 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 @@ Internal usrmerge bootstrap helper
 
 %prep
 %setup -n glibc-%{version} -q -a 4
+%patch1 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -584,6 +578,8 @@ profile="--enable-profile"
 %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 @@ rm -f %{buildroot}%{slibdir}/ld*.so* %{buildroot}%{slibdir}/lib[!mp]*
 %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}