From 799f88f953393ea45f722b71669744948c12a422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Fri, 9 Jun 2023 09:06:25 +0200
Subject: [PATCH] Temporally dropped y2038-vs-32-bit test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
---
 ...s-drop.patch => grep-3.11-tests-drop.patch | 38 +++++++++++++++++++
 grep.spec                                     |  4 +-
 2 files changed, 40 insertions(+), 2 deletions(-)
 rename grep-3.11-gnulib-tests-drop.patch => grep-3.11-tests-drop.patch (69%)

diff --git a/grep-3.11-gnulib-tests-drop.patch b/grep-3.11-tests-drop.patch
similarity index 69%
rename from grep-3.11-gnulib-tests-drop.patch
rename to grep-3.11-tests-drop.patch
index 843ffb0..3bb0cea 100644
--- a/grep-3.11-gnulib-tests-drop.patch
+++ b/grep-3.11-tests-drop.patch
@@ -66,3 +66,41 @@ index 3556ae5..06a70c3 100644
  ## begin gnulib module strtoumax-tests
  
  TESTS += test-strtoumax
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 9b4422e..c460801 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -192,7 +192,6 @@ TESTS =						\
+   word-multi-file				\
+   word-multibyte				\
+   write-error-msg				\
+-  y2038-vs-32-bit				\
+   yesno						\
+   z-anchor-newline
+ 
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 8ae7bb4..a6d6d97 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -2077,7 +2077,6 @@ TESTS = \
+   word-multi-file				\
+   word-multibyte				\
+   write-error-msg				\
+-  y2038-vs-32-bit				\
+   yesno						\
+   z-anchor-newline
+ 
+@@ -3291,13 +3290,6 @@ write-error-msg.log: write-error-msg
+ 	--log-file $$b.log --trs-file $$b.trs \
+ 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-y2038-vs-32-bit.log: y2038-vs-32-bit
+-	@p='y2038-vs-32-bit'; \
+-	b='y2038-vs-32-bit'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ yesno.log: yesno
+ 	@p='yesno'; \
+ 	b='yesno'; \
diff --git a/grep.spec b/grep.spec
index 6252ce2..73af990 100644
--- a/grep.spec
+++ b/grep.spec
@@ -15,8 +15,8 @@ Source6: grepconf.sh
 
 # upstream ticket 39445
 Patch0: grep-3.5-help-align.patch
-# upstream ticket 63965, maybe glibc bug, temporal drop of some gnulib tests shouldn't cause any harm
-Patch1: grep-3.11-gnulib-tests-drop.patch
+# upstream ticket 63965, maybe glibc bug, temporal drop of some gnulib tests and y2038 test, it shouldn't cause any harm
+Patch1: grep-3.11-tests-drop.patch
 
 BuildRequires: gcc
 BuildRequires: pcre2-devel