[rpms/ckermit] epel8: Fix C99 compatibility issue

[rpms/ckermit] epel8: Fix C99 compatibility issue

[DJ Delorie]

            A new commit has been pushed.

            Repo   : rpms/ckermit
            Branch : epel8
            Commit : 19e64cef5f4eaebc6f1b08fff0e94f1e6708e987
            Author : DJ Delorie <dj@redhat.com>
            Date   : 2023-02-16T20:47:15-05:00
            Stats  : +63/-2 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/ckermit/c/19e64cef5f4eaebc6f1b08fff0e94f1e6708e987?branch=epel8

            Log:
            Fix C99 compatibility issue

Related to:

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

Note: CKermit Version 10 does not have this problem, so no upstream
bug reports or PRs are needed.

---
diff --git a/ckermit-9.0.302-fedora-c99.patch b/ckermit-9.0.302-fedora-c99.patch
new file mode 100644
index 0000000..a7df3ba
--- /dev/null
+++ b/ckermit-9.0.302-fedora-c99.patch
@@ -0,0 +1,55 @@
+diff -rup a/ckcmai.c b/ckcmai.c
+--- a/ckcmai.c	2011-08-20 17:20:42.000000000 -0400
++++ b/ckcmai.c	2023-02-16 15:19:50.728291202 -0500
+@@ -1581,6 +1581,10 @@ _PROTOTYP( int getiobs, (VOID) );
+ 
+ #include <signal.h>
+ 
++#ifndef VMS
++#include <time.h>
++#endif
++
+ #ifndef NOCCTRAP
+ #include <setjmp.h>
+ #include "ckcsig.h"
+diff -rup a/ckupty.c b/ckupty.c
+--- a/ckupty.c	2011-06-13 11:34:13.000000000 -0400
++++ b/ckupty.c	2023-02-16 16:40:33.519202100 -0500
+@@ -384,6 +384,10 @@ struct termbuf {
+ 
+ #endif /* TCSANOW */
+ 
++#ifdef HAVE_OPENPTY
++#include <pty.h>
++#endif
++
+ struct termios termbuf, termbuf2;       /* pty control structure */
+ 
+ #ifdef INIT_SPTY
+diff -rup a/ckutio.c b/ckutio.c
+--- a/ckutio.c	2011-08-20 17:22:35.000000000 -0400
++++ b/ckutio.c	2023-02-16 16:04:42.656846326 -0500
+@@ -14129,6 +14129,10 @@ extern int exp_handler, exp_stderr, exp_
+ #endif /* USE_CKUPTY_C */
+ #endif /* HAVE_OPENPTY */
+ 
++#ifdef HAVE_OPENPTY
++#include <pty.h>
++#endif
++
+ VOID
+ pty_make_raw(fd) int fd; {
+     int x = -23, i;
+diff -rup a/ckuusx.c b/ckuusx.c
+--- a/ckuusx.c	2023-02-16 15:02:46.440896650 -0500
++++ b/ckuusx.c	2023-02-16 15:43:24.925119195 -0500
+@@ -5883,6 +5883,9 @@ _PROTOTYP(char *tgetstr,(char *, char **
+ _PROTOTYP(int tputs,(char *, int, int (*)()));
+ _PROTOTYP(char *tgoto,(const char *, int, int));
+ #endif	/* BUG999 */
++#ifdef linux
++#include <term.h>
++#endif
+ 
+ #endif /* CK_CURSES */
+ 

diff --git a/ckermit.spec b/ckermit.spec
index 627ea69..bd27074 100644
--- a/ckermit.spec
+++ b/ckermit.spec
@@ -3,7 +3,7 @@
 Summary:       The quintessential all-purpose communications program
 Name:          ckermit
 Version:       9.0.%{patchlevel}
-Release:       29%{?dist}
+Release:       30%{?dist}
 License:       BSD with advertising and MIT
 # Most of the package is under a three-clause BSD license, but the file
 # ckaut2.h appears to be covered by three licenses:
@@ -20,6 +20,8 @@ Source6:       README.fedora
 # See: https://bugs.gentoo.org/669332
 Patch0:        ckermit-9.0.302-fix_build_with_glibc_2_28_and_earlier.patch
 Patch1:        ckermit-9.0.302-printw.patch
+# C99 fixes - unneeded for ckermit 10
+Patch2:        ckermit-9.0.302-fedora-c99.patch
 URL:           http://www.kermitproject.org/ck90.html
 BuildRequires:  gcc
 BuildRequires: pam-devel
@@ -48,10 +50,11 @@ communication tasks.
 cp %{SOURCE6} .
 %patch0 -p 1 -b .glibc2_28
 %patch1 -p 1 -b .printw
+%patch2 -p 1 -b .c99
 
 %build
 %make_build linux \
-        KFLAGS="-O0 $RPM_OPT_FLAGS -Wall -DOPENSSL_097 -Dsdata=s_data -DHAVE_OPENPTY -D'krb5_init_ets(__ctx)='" \
+        KFLAGS="-O0 $RPM_OPT_FLAGS -Wall -DOPENSSL_097 -Dsdata=s_data -DHAVE_OPENPTY -D'krb5_init_ets(__ctx)=' -DMAINTYPE=int" \
         LNKFLAGS="%{?optflags} %{?__global_ldflags}" \
         K4LIB= \
         K4INC= \
@@ -93,6 +96,9 @@ install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/kermit/ckermit.phone
 %doc README.fedora
 
 %changelog
+* Thu Feb 16 2023 DJ Delorie <dj@redhat.com> - 9.0.302-30
+- Fix C99 compatibility issue
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.302-29
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild