From 3048532163ccb071138a9627bfa841992f81bf0a Mon Sep 17 00:00:00 2001
From: Arjun Shankar <arjun@redhat.com>
Date: Thu, 2 Feb 2023 11:55:09 +0100
Subject: [PATCH] Port configure script to C99

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
---
 tar-configure-c99.patch | 45 +++++++++++++++++++++++++++++++++++++++++
 tar.spec                |  6 +++++-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 tar-configure-c99.patch

diff --git a/tar-configure-c99.patch b/tar-configure-c99.patch
new file mode 100644
index 0000000..49ba1b2
--- /dev/null
+++ b/tar-configure-c99.patch
@@ -0,0 +1,45 @@
+Avoid an implicit declaration of utime in the configure script.  This
+ensures that the package continues to build with future compilers
+which do not support such implicit declarations by default.
+
+This is a downstream-only patch.  Upstream, the configure file is
+generated correctly since the following gnulib commit:
+
+commit c20ba6929e5ac4a9cc72cd2b1f2d938e219adb01
+Author: Bruno Haible <bruno@clisp.org>
+Date:   Sat Jan 23 22:10:25 2021 +0100
+
+    utime: Fix configure test (regression 2020-12-04).
+    
+    Reported by Ryan Schmidt <wget@ryandesign.com> via Tim Rühsen in
+    <https://lists.gnu.org/archive/html/bug-gnulib/2021-01/msg00282.html>.
+    
+    * m4/utime.m4 (gl_FUNC_UTIME): In the test program, include <utime.h>,
+    not <time.h>.
+
+diff --git a/configure b/configure
+index 129500e018d38aa5..7ed132239c78d2ac 100755
+--- a/configure
++++ b/configure
+@@ -36685,7 +36685,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stddef.h>
+-                 #include <time.h>
++#include <utime.h>
+ 
+ int
+ main ()
+diff --git a/m4/utime.m4 b/m4/utime.m4
+index 03df7b7282500c73..bdff29d85982cd68 100644
+--- a/m4/utime.m4
++++ b/m4/utime.m4
+@@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_UTIME],
+            AC_RUN_IFELSE(
+              [AC_LANG_PROGRAM(
+                [[#include <stddef.h>
+-                 #include <time.h>
++                 #include <utime.h>
+                ]],
+                [[int result = 0;
+                  if (!utime ("conftest.tmp/", NULL))
diff --git a/tar.spec b/tar.spec
index 3605e44..d559947 100644
--- a/tar.spec
+++ b/tar.spec
@@ -10,7 +10,7 @@ Summary: GNU file archiving program
 Name: tar
 Epoch: 2
 Version: 1.34
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 URL: https://www.gnu.org/software/tar/
 
@@ -24,6 +24,7 @@ Patch3:  tar-1.29-wildcards.patch
 Patch4:  tar-1.28-atime-rofs.patch
 Patch9:  tar-1.28-document-exclude-mistakes.patch
 Patch10: tar-1.33-fix-capabilities-test.patch
+Patch11: tar-configure-c99.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -122,6 +123,9 @@ make check || (
 
 
 %changelog
+* Thu Feb 02 2023 Arjun Shankar <arjun@redhat.com> - 2:1.34-7
+- Port configure script to C99
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.34-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild