From 6ee17d0f7938cac5c98b1f361ace10c04928ceac Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Thu, 8 Aug 2024 09:48:29 -0400
Subject: [PATCH] Update i386 libm-test-ulps (RHEL-52428)

Resolves: RHEL-52428
---
 glibc-RHEL-52428-1.patch | 34 ++++++++++++++++++++++++++++++++++
 glibc-RHEL-52428-2.patch | 26 ++++++++++++++++++++++++++
 glibc.spec               |  7 ++++++-
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 glibc-RHEL-52428-1.patch
 create mode 100644 glibc-RHEL-52428-2.patch

diff --git a/glibc-RHEL-52428-1.patch b/glibc-RHEL-52428-1.patch
new file mode 100644
index 0000000..dee870c
--- /dev/null
+++ b/glibc-RHEL-52428-1.patch
@@ -0,0 +1,34 @@
+commit 56e098118a31753a9f755948bb5a47bc7111e214
+Author: Andreas Schwab <schwab@suse.de>
+Date:   Thu Aug 15 12:14:35 2019 +0200
+
+    Update i386 libm-test-ulps
+
+    Conflicts: ChangeLog removed
+
+diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps
+index e83bae71b4..2232296fe0 100644
+--- a/sysdeps/i386/fpu/libm-test-ulps
++++ b/sysdeps/i386/fpu/libm-test-ulps
+@@ -1158,8 +1158,8 @@ float128: 4
+ idouble: 4
+ ifloat: 5
+ ifloat128: 4
+-ildouble: 7
+-ldouble: 7
++ildouble: 8
++ldouble: 8
+
+ Function: Imaginary part of "clog10_upward":
+ double: 2
+@@ -2222,8 +2222,8 @@ float128: 8
+ idouble: 5
+ ifloat: 5
+ ifloat128: 8
+-ildouble: 5
+-ldouble: 5
++ildouble: 6
++ldouble: 6
+
+ Function: "log":
+ double: 1
diff --git a/glibc-RHEL-52428-2.patch b/glibc-RHEL-52428-2.patch
new file mode 100644
index 0000000..6dbb642
--- /dev/null
+++ b/glibc-RHEL-52428-2.patch
@@ -0,0 +1,26 @@
+Author: Patsy Griffin <patsy@redhat.com>
+
+    i386: update ulps
+
+    This change fixes 3 test failures:
+	math/test-ildouble-lgamma
+	math/test-ldouble-finite-lgamma
+	math/test-ldouble-lgamma
+
+    This is a downstream only patch as upstream removed entries for
+    i{float,double,ldouble} by commit: 1c15464ca05f36db5c582856d3770d5e8bde9d61.
+    The ldouble change is already upstream.
+
+--- a/sysdeps/i386/fpu/libm-test-ulps	2024-08-06 15:51:18.182808710 -0400
++++ b/sysdeps/i386/fpu/libm-test-ulps	2024-08-06 18:01:50.579719841 -0400
+@@ -2030,8 +2030,8 @@ double: 5
+ float: 5
+ idouble: 5
+ ifloat: 5
+-ildouble: 5
+-ldouble: 5
++ildouble: 6
++ldouble: 6
+ 
+ Function: "hypot":
+ double: 1
diff --git a/glibc.spec b/glibc.spec
index 91e70d1..01f8f6f 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -132,7 +132,7 @@ end \
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: %{glibcrelease}.2
+Release: %{glibcrelease}.3
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -1188,6 +1188,8 @@ Patch1000: glibc-RHEL-34264.patch
 Patch1001: glibc-RHEL-34267-1.patch
 Patch1002: glibc-RHEL-34267-2.patch
 Patch1003: glibc-RHEL-34273.patch
+Patch1004: glibc-RHEL-52428-1.patch
+Patch1005: glibc-RHEL-52428-2.patch
 
 ##############################################################################
 # Continued list of core "glibc" package information:
@@ -3019,6 +3021,9 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Mon Aug  5 2024 Patsy Griffin <patsy@redhat.com> - 2.28-251.3
+- Update i386 libm-test-ulps (RHEL-52428)
+
 * Fri Apr 26 2024 Florian Weimer <fweimer@redhat.com> - 2.28-251.2
 - CVE-2024-33599: nscd: buffer overflow in netgroup cache (RHEL-34264)
 - CVE-2024-33600: nscd: null pointer dereferences in netgroup cache (RHEL-34267)