[rpms/tin] epel10.2: Further C compatibility fixes for the configure script

[rpms/tin] epel10.2: Further C compatibility fixes for the configure script

[Florian Weimer]

A new commit has been pushed.

Repo   : rpms/tin
Branch : epel10.2
Commit : 1f724cd60f641c3599f65e819dd2a878efa6b1a2
Author : Florian Weimer <fweimer@redhat.com>
Date   : 2023-12-15T23:57:02+01:00
Stats  : +76/-30 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/tin/c/1f724cd60f641c3599f65e819dd2a878efa6b1a2?branch=epel10.2

Log:
Further C compatibility fixes for the configure script

---
diff --git a/tin-configure-c99.patch b/tin-configure-c99.patch
index 48b56ac..e0b8a7c 100644
--- a/tin-configure-c99.patch
+++ b/tin-configure-c99.patch
@@ -1,19 +1,29 @@
-diff -up tin-2.6.2/configure.in.orig tin-2.6.2/configure.in
---- tin-2.6.2/configure.in.orig	2022-12-25 00:00:28.000000000 +0100
-+++ tin-2.6.2/configure.in	2022-12-29 01:56:02.181780502 +0100
-@@ -1013,7 +1013,8 @@ AC_CHECK_HEADER(unicode/unorm.h,[
- 		cf_try_icuuc="no"
- 		LIBS="$LIBS -licuuc"
- 		AC_TRY_LINK([#include <unicode/unorm.h>], [
--			int32_t needed, ustr = NULL;
-+			int32_t needed;
-+			const UChar *ustr = NULL;
-  			UErrorCode status;
- 			needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);], [
- 			AC_DEFINE(HAVE_LIBICUUC,1,[Define this to 1 if we have libicuuc])
-diff -up tin-2.6.2/configure.orig tin-2.6.2/configure
---- tin-2.6.2/configure.orig	2022-12-25 00:00:29.000000000 +0100
-+++ tin-2.6.2/configure	2022-12-29 01:56:46.005029879 +0100
+diff --git a/aclocal.m4 b/aclocal.m4
+index 2891764c68c773c4..5620aad356b67762 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -3517,7 +3517,7 @@ RETSIGTYPE signal_handler (int sig)
+ 	int system_status;
+ 	wait (&wait_status);
+ 	system_status = WEXITSTATUS(wait_status); /* should be nonzero */
+-	${cf_cv_main_return:-return}(system_status != 23);
++	exit(system_status != 23);
+ }
+ 
+ int main(void)
+@@ -5173,7 +5173,7 @@ AC_CACHE_CHECK([for passwd.pw_gecos], cf_cv_pw_gecos,[
+ #include <pwd.h>
+ ],[
+ 	struct passwd foo;
+-	char bar = foo.pw_gecos],
++	char *bar = foo.pw_gecos],
+ 	[cf_cv_pw_gecos=yes],
+ 	[cf_cv_pw_gecos=no])])
+ test $cf_cv_pw_gecos = no && AC_DEFINE(DONT_HAVE_PW_GECOS,1,[Define this to 1 if passwd struct has .pw_gecos])
+diff --git a/configure b/configure
+index 9e2d9ab4b6c46581..a85eaf929db2c820 100755
+--- a/configure
++++ b/configure
 @@ -24209,7 +24209,8 @@ int
  main (void)
  {
@@ -24,7 +34,18 @@ diff -up tin-2.6.2/configure.orig tin-2.6.2/configure
   			UErrorCode status;
  			needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);
    ;
-@@ -27670,7 +27670,7 @@ main (void)
+@@ -26820,8 +26821,8 @@ cat >"conftest.$ac_ext" <<_ACEOF
+ int
+ main (void)
+ {
+-struct timeval *tv;
+-struct timezone *tz;
++struct timeval tv;
++struct timezone tz;
+ gettimeofday(&tv, &tz);
+   ;
+   return 0;
+@@ -27669,7 +27670,7 @@ main (void)
  {
  
  	struct passwd foo;
@@ -33,15 +54,37 @@ diff -up tin-2.6.2/configure.orig tin-2.6.2/configure
    ;
    return 0;
  }
-diff -up tin-2.6.2/aclocal.m4.orig tin-2.6.2/aclocal.m4
---- tin-2.6.2/aclocal.m4.orig	2022-12-22 11:35:07.000000000 +0100
-+++ tin-2.6.2/aclocal.m4	2022-12-29 02:07:34.106717846 +0100
-@@ -5173,7 +5173,7 @@ AC_CACHE_CHECK([for passwd.pw_gecos], cf
- #include <pwd.h>
- ],[
- 	struct passwd foo;
--	char bar = foo.pw_gecos],
-+	char *bar = foo.pw_gecos],
- 	[cf_cv_pw_gecos=yes],
- 	[cf_cv_pw_gecos=no])])
- test $cf_cv_pw_gecos = no && AC_DEFINE(DONT_HAVE_PW_GECOS,1,[Define this to 1 if passwd struct has .pw_gecos])
+@@ -28106,7 +28107,7 @@ RETSIGTYPE signal_handler (int sig)
+ 	int system_status;
+ 	wait (&wait_status);
+ 	system_status = WEXITSTATUS(wait_status); /* should be nonzero */
+-	${cf_cv_main_return:-return}(system_status != 23);
++	exit(system_status != 23);
+ }
+ 
+ int main(void)
+diff --git a/configure.in b/configure.in
+index 7d24b24176f7c3a6..810eaf6158dc9b48 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1013,7 +1013,8 @@ AC_CHECK_HEADER(unicode/unorm.h,[
+ 		cf_try_icuuc="no"
+ 		LIBS="$LIBS -licuuc"
+ 		AC_TRY_LINK([#include <unicode/unorm.h>], [
+-			int32_t needed, ustr = NULL;
++			int32_t needed;
++			const UChar *ustr = NULL;
+  			UErrorCode status;
+ 			needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);], [
+ 			AC_DEFINE(HAVE_LIBICUUC,1,[Define this to 1 if we have libicuuc])
+@@ -1280,8 +1281,8 @@ AC_TRY_COMPILE([
+ #if HAVE_SYS_TIME_H
+ #include <sys/time.h>
+ #endif],
+-[struct timeval *tv;
+-struct timezone *tz;
++[struct timeval tv;
++struct timezone tz;
+ gettimeofday(&tv, &tz);],
+ ac_cv_func_gettimeofday_2args=yes, ac_cv_func_gettimeofday_2args=no)
+ AC_MSG_RESULT($ac_cv_func_gettimeofday_2args)

diff --git a/tin.spec b/tin.spec
index c78b2e2..0653b1c 100644
--- a/tin.spec
+++ b/tin.spec
@@ -1,6 +1,6 @@
 Name: tin
 Version: 2.6.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Basic Internet news reader
 License: BSD
 URL: http://www.tin.org/
@@ -81,6 +81,9 @@ rm -r ${workdir}
 %{_mandir}/man5/*
 
 %changelog
+* Fri Dec 15 2023 Florian Weimer <fweimer@redhat.com> - 2.6.2-6
+- Further C compatibility fixes for the configure script
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild