From c769a3ef7acc044cd1910b0b6f2a7f4fff93b9d9 Mon Sep 17 00:00:00 2001
From: Arjun Shankar <arjun.is@lostca.se>
Date: Wed, 31 May 2017 14:37:21 +0200
Subject: [PATCH] Disable the NULL buffer test in login/tst-ptsname.c. It leads
 to a build failure during 'make check'.

---
 glibc-Disable-buf-NULL-in-login-tst-ptsname.c | 17 +++++++++++++++++
 glibc.spec                                    | 13 ++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 glibc-Disable-buf-NULL-in-login-tst-ptsname.c

diff --git a/glibc-Disable-buf-NULL-in-login-tst-ptsname.c b/glibc-Disable-buf-NULL-in-login-tst-ptsname.c
new file mode 100644
index 0000000..60f3524
--- /dev/null
+++ b/glibc-Disable-buf-NULL-in-login-tst-ptsname.c
@@ -0,0 +1,17 @@
+Author: Arjun Shankar <arjun.is@lostca.se>
+Date:   Wed May 31 14:09:46 2017 +0200
+
+    Disable buf=NULL in login/tst-ptsname.c
+
+Index: b/login/tst-ptsname.c
+===================================================================
+--- a/login/tst-ptsname.c
++++ b/login/tst-ptsname.c
+@@ -70,7 +70,6 @@ do_test (void)
+   if (fd != -1)
+     {
+       result |= do_single_test (fd, buf, sizeof (buf), 0);
+-      result |= do_single_test (fd, NULL, sizeof (buf), EINVAL);
+       result |= do_single_test (fd, buf, 1, ERANGE);
+       close (fd);
+     }
diff --git a/glibc.spec b/glibc.spec
index 8756477..d80a961 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir  glibc-2.25-362-g231a59c
 %define glibcversion 2.25.90
-%define glibcrelease 3%{?dist}
+%define glibcrelease 4%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -295,6 +295,12 @@ Patch2037: glibc-rh1315108.patch
 # sln implemented by ldconfig, to conserve disk space.
 Patch2112: glibc-rh1315476-2.patch
 
+# Disable the NULL buffer test in login/tst-ptsname.c. It leads to a build
+# failure during 'make check'. A solution is being discussed at:
+# * [v1] https://sourceware.org/ml/libc-alpha/2017-05/msg00726.html
+# * [v2] https://sourceware.org/ml/libc-alpha/2017-05/msg00835.html
+Patch2200: glibc-Disable-buf-NULL-in-login-tst-ptsname.c
+
 ##############################################################################
 # End of glibc patches.
 ##############################################################################
@@ -863,6 +869,7 @@ microbenchmark tests on the system.
 %patch2037 -p1
 %patch2112 -p1
 %patch0061 -p1
+%patch2200 -p1
 
 ##############################################################################
 # %%prep - Additional prep required...
@@ -2268,6 +2275,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed May 31 2017 Arjun Shankar <arjun.is@lostca.se> - 2.25.90-4
+- Disable the NULL buffer test in login/tst-ptsname.c. It leads to a build
+  failure during 'make check'. A permanent solution is being discussed
+  upstream.
 * Tue May 23 2017 Arjun Shankar <arjun.is@lostca.se> - 2.25.90-3
 - Auto-sync with upstream master,
   commit 231a59ce2c5719d2d77752c21092960e28837b4a.