From 309c89b9153e81c877a61afa7aa8db6826b102a3 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Nov 26 2022 20:29:17 +0000
Subject: Port configure script to C99 (#2148656)


Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>

---

diff --git a/alpine-configure-c99.patch b/alpine-configure-c99.patch
new file mode 100644
index 0000000..55dceba
--- /dev/null
+++ b/alpine-configure-c99.patch
@@ -0,0 +1,29 @@
+Avoid implicit int in qsort_t configure check, which can cause
+the check to always fail for stricter C99 compilers.
+
+diff --git a/configure b/configure
+index 2c417775d04165f3..956e56e223765ca5 100755
+--- a/configure
++++ b/configure
+@@ -22034,7 +22034,7 @@ else
+ #endif
+ 
+ extern void *base;
+-extern sortf(const void *, const void *);
++extern int sortf(const void *, const void *);
+ int sortf(a, b)
+   const void *a;
+   const void *b; { return 0; }
+diff --git a/configure.ac b/configure.ac
+index 4fa94f16078daf61..9aa815cb9d08dddd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1964,7 +1964,7 @@ ac_cv_func_qsort_argtype,
+ #endif
+ 
+ extern void *base;
+-extern sortf(const void *, const void *);
++extern int sortf(const void *, const void *);
+ int sortf(a, b)
+   const void *a;
+   const void *b; { return 0; }
diff --git a/alpine.spec b/alpine.spec
index 32e045c..8b52228 100644
--- a/alpine.spec
+++ b/alpine.spec
@@ -6,7 +6,7 @@
 Summary: powerful, easy to use console email client
 Name: alpine
 Version: 2.26
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: ASL 2.0
 URL:     http://alpine.x10host.com/
@@ -15,6 +15,7 @@ Source1: README.fedora
 
 Patch1: alpine-2.24-useragent.patch
 Patch2: alpine-2.23-gcc10.patch
+Patch3: alpine-configure-c99.patch
 
 # Using "Conflicts" instead of Obsoletes because while alpine is substantially
 # compatible with pine the change to Unicode breaks important user
@@ -74,6 +75,7 @@ GNU Build System's autotools.
 %setup -q -n alpine-%{version}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 install -m644 -p %{SOURCE1} .
 
@@ -124,6 +126,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed
 
 
 %changelog
+* Sat Nov 26 2022 Florian Weimer <fweimer@redhat.com> - 2.26-3
+- Port configure script to C99 (#2148656)
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.26-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild