From c9a1e5c935ea5bd177b165f215fb8080e648bae7 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 16 Nov 2016 15:25:20 +0100
Subject: [PATCH] Do not try to link libcrypt statically during tests

---
 glibc-fedora-nss-static-link.patch | 27 +++++++++++++++++++++++++++
 glibc.spec                         |  7 ++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 glibc-fedora-nss-static-link.patch

diff --git a/glibc-fedora-nss-static-link.patch b/glibc-fedora-nss-static-link.patch
new file mode 100644
index 0000000..3d9a11b
--- /dev/null
+++ b/glibc-fedora-nss-static-link.patch
@@ -0,0 +1,27 @@
+There is no working static library for NSS in Fedora, so we cannot
+test libcrypt (built with NSS) against it.
+
+Index: b/elf/Makefile
+===================================================================
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -1284,7 +1284,6 @@ $(objpfx)tst-dlsym-error: $(libdl)
+ 
+ $(objpfx)tst-linkall-static: \
+   $(common-objpfx)math/libm.a \
+-  $(common-objpfx)crypt/libcrypt.a \
+   $(common-objpfx)resolv/libresolv.a \
+   $(common-objpfx)dlfcn/libdl.a \
+   $(common-objpfx)login/libutil.a \
+Index: b/elf/tst-linkall-static.c
+===================================================================
+--- a/elf/tst-linkall-static.c
++++ b/elf/tst-linkall-static.c
+@@ -32,7 +32,6 @@ void *references[] =
+   {
+     &pow,                       /* libm */
+     &pthread_create,            /* libpthread */
+-    &crypt,                     /* libcrypt */
+     &res_send,                  /* libresolv */
+     &dlopen,                    /* libdl */
+     &login,                     /* libutil */
diff --git a/glibc.spec b/glibc.spec
index 7381615..f20c34b 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir  glibc-2.24-377-g530862a
 %define glibcversion 2.24.90
-%define glibcrelease 15%{?dist}
+%define glibcrelease 16%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -261,6 +261,7 @@ Patch0059: glibc-c-utf8-locale.patch
 
 # Build libcrypt twice, with and without NSS.
 Patch0060: glibc-rh1324623.patch
+Patch0061: glibc-fedora-nss-static-link.patch
 
 # Bug 13165: New condvar implementation.
 Patch0062: glibc-swbz13165.patch
@@ -878,6 +879,7 @@ microbenchmark tests on the system.
 %patch0058 -p1
 %patch0059 -p1
 %patch0060 -p1
+%patch0061 -p1
 %patch2036 -p1
 %patch2037 -p1
 %patch2110 -p1
@@ -2277,6 +2279,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Nov 16 2016 Florian Weimer <fweimer@redhat.com> - 2.24.90-16
+- Do not try to link libcrypt statically during tests
+
 * Wed Nov 16 2016 Florian Weimer <fweimer@redhat.com> - 2.24.90-15
 - Auto-sync with upstream master,
   commit 530862a63e0929128dc98fbbd463b120934434fb, fixing: