gcc 12, autotool updates, sqwebmail fixes.

11 files changed, 27 insertions, 71 deletions

diff --git a/imap/ChangeLog b/imap/ChangeLog
index dad6c2e..568ad8c 100644
--- a/imap/ChangeLog
+++ b/imap/ChangeLog
@@ -1,3 +1,9 @@
+5.1.8
+
+2022-05-22  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* gcc 12 and autotools update. OpenSSL 3.0 update.
+
 2022-04-17  Sam Varshavchik  <mrsam@courier-mta.com>
 
 	* courier, courier-imap: remove the --disable-root-check configure
diff --git a/imap/configure.ac b/imap/configure.ac
index 7d02802..dee12b5 100644
--- a/imap/configure.ac
+++ b/imap/configure.ac
@@ -4,7 +4,7 @@ dnl
 dnl Copyright 1998 - 2022 Double Precision, Inc.  See COPYING for
 dnl distribution information.
 
-AC_INIT(courier-imap, 5.1.7, [courier-users@lists.sourceforge.net])
+AC_INIT([courier-imap],[5.1.8],[courier-users@lists.sourceforge.net])
 
 >confdefs.h  # Kill PACKAGE_ macros
 
@@ -18,13 +18,11 @@ AC_CONFIG_HEADERS(config.h)
 dnl Checks for programs.
 AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
-AC_PROG_CC_C99
 AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_CXX
-AC_LIBTOOL_DLOPEN
-AM_PROG_LIBTOOL
+LT_INIT
 AC_PATH_PROGS(PERL, perl5 perl, perl, $LPATH)
 
 if test "$PERL" = "perl"
@@ -117,9 +115,16 @@ AC_ARG_WITH(piddir, [  --with-piddir         Directory where imapd.pid is create
 AC_SUBST(piddir)
 
 dnl Checks for header files.
-AC_HEADER_STDC
+
 AC_CHECK_HEADERS(locale.h unistd.h sys/stat.h sys/wait.h time.h sys/time.h sys/utsname.h utime.h strings.h)
-AC_HEADER_TIME
+AC_CHECK_HEADERS_ONCE([sys/time.h])
+# Obsolete code to be removed.
+if test $ac_cv_header_sys_time_h = yes; then
+  AC_DEFINE([TIME_WITH_SYS_TIME],[1],[Define to 1 if you can safely include both <sys/time.h>
+	     and <time.h>.  This macro is obsolete.])
+fi
+# End of obsolete code.
+
 AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
 
@@ -127,7 +132,6 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
 AC_TYPE_SIZE_T
-AC_TYPE_SIGNAL
 AC_SYS_LARGEFILE
 
 AC_CACHE_CHECK([for socklen_t],
@@ -391,7 +395,8 @@ int main()
 . ../rootcerts/rootcertsdir.cnf
 AC_SUBST(cacerts)
 
-AC_OUTPUT(Makefile imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist
+AC_CONFIG_FILES([Makefile imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist
 	testsuitefix.pl mkimapdcert mkpop3dcert mkdhparams
 	imapd.cnf.gnutls pop3d.cnf.gnutls
-	imapd.cnf.openssl pop3d.cnf.openssl)
+	imapd.cnf.openssl pop3d.cnf.openssl])
+AC_OUTPUT
diff --git a/imap/imapd.c b/imap/imapd.c
index 8529657..161de8d 100644
--- a/imap/imapd.c
+++ b/imap/imapd.c
@@ -36,15 +36,9 @@
 #if	HAVE_UTIME_H
 #include	<utime.h>
 #endif
-#if TIME_WITH_SYS_TIME
-#include	<sys/time.h>
 #include	<time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include	<sys/time.h>
-#else
-#include	<time.h>
-#endif
 #endif
 #if HAVE_LOCALE_H
 #include	<locale.h>
diff --git a/imap/imapwrite.c b/imap/imapwrite.c
index 6167fa8..e148cf4 100644
--- a/imap/imapwrite.c
+++ b/imap/imapwrite.c
@@ -14,15 +14,9 @@
 #include	<unistd.h>
 #endif
 #include	<sys/types.h>
-#if TIME_WITH_SYS_TIME
-#include        <sys/time.h>
-#include        <time.h>
-#else
+#include	<time.h>
 #if HAVE_SYS_TIME_H
-#include        <sys/time.h>
-#else
-#include        <time.h>
-#endif
+#include	<sys/time.h>
 #endif
 
 #include	"imapwrite.h"
diff --git a/imap/mailboxlist.c b/imap/mailboxlist.c
index ce6cf55..4ac4f73 100644
--- a/imap/mailboxlist.c
+++ b/imap/mailboxlist.c
@@ -31,18 +31,9 @@
 #include <ndir.h>
 #endif
 #endif
-#if	HAVE_UTIME_H
-#include	<utime.h>
-#endif
-#if TIME_WITH_SYS_TIME
-#include	<sys/time.h>
 #include	<time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include	<sys/time.h>
-#else
-#include	<time.h>
-#endif
 #endif
 
 #include	<sys/types.h>
diff --git a/imap/mainloop.c b/imap/mainloop.c
index dc4b06f..a36ad5a 100644
--- a/imap/mainloop.c
+++ b/imap/mainloop.c
@@ -25,7 +25,7 @@ extern unsigned long header_count, body_count;
 extern unsigned long bytes_received_count, bytes_sent_count;
 extern time_t start_time;
 
-static RETSIGTYPE sigexit(int n)
+static void sigexit(int n)
 {
 	static char byemsg[]="* BYE Courier-IMAP server shut down by signal.\r\n";
 	const char *a=getenv("AUTHENTICATED");
@@ -63,9 +63,6 @@ static RETSIGTYPE sigexit(int n)
 		; /* Suppress gcc warning */
 
 	exit(0);
-#if	RETSIGTYPE != void
-	return (0);
-#endif
 }
 
 
diff --git a/imap/mysignal.c b/imap/mysignal.c
index 3dca78d..feaec38 100644
--- a/imap/mysignal.c
+++ b/imap/mysignal.c
@@ -12,12 +12,9 @@
 
 static int n;
 
-static RETSIGTYPE trap(int signum)
+static void trap(int signum)
 {
 	n=signum;
-#if	RETSIGTYPE != void
-	return (0);
-#endif
 }
 
 void trap_signals()
diff --git a/imap/pop3dserver.c b/imap/pop3dserver.c
index 82a1ec0..3ba46ce 100644
--- a/imap/pop3dserver.c
+++ b/imap/pop3dserver.c
@@ -28,15 +28,9 @@
 #if	HAVE_SYS_STAT_H
 #include	<sys/stat.h>
 #endif
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
+#include	<time.h>
 #if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
+#include	<sys/time.h>
 #endif
 #include	<stdio.h>
 #include	<stdlib.h>
@@ -958,13 +952,10 @@ static void acctout(const char *disc)
 	free(p);
 }
 
-static RETSIGTYPE bye(int signum)
+static void bye(int signum)
 {
 	acctout("INFO: TIMEOUT");
 	exit(0);
-#if	RETSIGTYPE != void
-	return (0);
-#endif
 }
 
 static void loop()
diff --git a/imap/smap.c b/imap/smap.c
index c0334ea..9839931 100644
--- a/imap/smap.c
+++ b/imap/smap.c
@@ -19,15 +19,9 @@
 #if	HAVE_UTIME_H
 #include	<utime.h>
 #endif
-#if TIME_WITH_SYS_TIME
-#include	<sys/time.h>
 #include	<time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include	<sys/time.h>
-#else
-#include	<time.h>
-#endif
 #endif
 #if HAVE_LOCALE_H
 #include	<locale.h>
diff --git a/imap/smapsnapshot.c b/imap/smapsnapshot.c
index 6ffc226..14f1717 100644
--- a/imap/smapsnapshot.c
+++ b/imap/smapsnapshot.c
@@ -19,15 +19,9 @@
 #if	HAVE_UTIME_H
 #include	<utime.h>
 #endif
-#if TIME_WITH_SYS_TIME
-#include	<sys/time.h>
 #include	<time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include	<sys/time.h>
-#else
-#include	<time.h>
-#endif
 #endif
 #if HAVE_LOCALE_H
 #include	<locale.h>
diff --git a/imap/storeinfo.c b/imap/storeinfo.c
index cc31c31..b44e521 100644
--- a/imap/storeinfo.c
+++ b/imap/storeinfo.c
@@ -29,17 +29,10 @@
 #if	HAVE_UTIME_H
 #include	<utime.h>
 #endif
-#if TIME_WITH_SYS_TIME
-#include	<sys/time.h>
 #include	<time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include	<sys/time.h>
-#else
-#include	<time.h>
 #endif
-#endif
-
 
 #if SMAP
 extern int smapflag;