gcc 12, autotool updates, sqwebmail fixes.

12 files changed, 44 insertions, 60 deletions

diff --git a/sqwebmail/ChangeLog b/sqwebmail/ChangeLog
index e3a1a4a..ea1a963 100644
--- a/sqwebmail/ChangeLog
+++ b/sqwebmail/ChangeLog
@@ -1,3 +1,12 @@
+6.0.10
+
+2022-05-22  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* gcc 12 and autotools update. Fix minor use after free bugs
+	when showing links to decoded PGP attachments, and if the
+	calendar module is enabled, and the calendaring server runs out
+	of disk space.
+
 2022-04-14  Sam Varshavchik  <mrsam@courier-mta.com>
 
 	* Add scripts to create installable .deb packages, update
diff --git a/sqwebmail/configure.ac b/sqwebmail/configure.ac
index d23672a..9df40fe 100644
--- a/sqwebmail/configure.ac
+++ b/sqwebmail/configure.ac
@@ -2,7 +2,7 @@ dnl
 dnl Copyright 1998 - 2022 Double Precision, Inc.  See COPYING for
 dnl distribution information.
 
-AC_INIT(sqwebmail, 6.0.9, [courier-sqwebmail@lists.sourceforge.net])
+AC_INIT([sqwebmail],[6.0.10],[courier-sqwebmail@lists.sourceforge.net])
 
 >confdefs.h  # Kill PACKAGE_ macros
 
@@ -17,9 +17,7 @@ AC_PROG_MAKE_SET
 dnl Checks for programs.
 AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
-AC_PROG_CC_C99
-AC_LIBTOOL_DLOPEN
-AM_PROG_LIBTOOL
+LT_INIT
 
 if test "$GCC" = yes ; then
         CXXFLAGS="$CXXFLAGS -Wall"
@@ -181,21 +179,21 @@ AC_SUBST(piddir)
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
-AC_HEADER_STDC
+
 AC_CHECK_HEADERS(fcntl.h sys/wait.h sys/select.h sys/uio.h sys/stat.h sys/time.h utime.h unistd.h locale.h crypt.h wchar.h strings.h)
 
 AC_HEADER_SYS_WAIT
-AC_HEADER_TIME
+AC_CHECK_HEADERS_ONCE([sys/time.h])
+
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_STRUCT_TM
 AC_TYPE_PID_T
 AC_TYPE_UID_T
-AC_TYPE_SIGNAL
 AC_SYS_LARGEFILE
 
-AC_TRY_RUN( [
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 
 #include	<stdio.h>
 #include	<stdlib.h>
@@ -210,16 +208,14 @@ FILE	*fp=fopen("conftestval", "w");
 	fclose(fp);
 	return (0);
 }
-]
-	, [ MAXLONGSIZE=`wc -c conftestval | awk ' { print $1 } '  ` ],
-	[
+
+	]])],[ MAXLONGSIZE=`wc -c conftestval | awk ' { print $1 } '  ` ],[
 		AC_MSG_ERROR(Unable to run test program.)
-	] ,
-	[
+	 ],[
 		MAXLONGSIZE=60
 		AC_MSG_WARN([Cross compiling, setting MAXLONGSIZE to $MAXLONGSIZE])
-	]
-		)
+
+		])
 
 dnl Checks for library functions.
 AC_FUNC_STRFTIME
@@ -228,7 +224,7 @@ AC_REPLACE_FUNCS(strdup)
 
 AC_CACHE_CHECK([for crypt() prototype],sqwebmail_cv_NEED_CRYPT_PROTOTYPE,
 
-AC_TRY_COMPILE( [
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
        #if HAVE_CRYPT_H
        #include <crypt.h>
        #endif
@@ -237,8 +233,7 @@ AC_TRY_COMPILE( [
        #endif
        int crypt(int, int);
 
-        ], [], sqwebmail_cv_NEED_CRYPT_PROTOTYPE=1,
-                sqwebmail_cv_NEED_CRYPT_PROTOTYPE=0 )
+        ]], [[]])],[sqwebmail_cv_NEED_CRYPT_PROTOTYPE=1],[sqwebmail_cv_NEED_CRYPT_PROTOTYPE=0 ])
 
 )
 
@@ -496,7 +491,8 @@ do
     fi
 done
 
-AC_OUTPUT(Makefile sendit.sh cleancache.pl sqwebmaild.dist)
+AC_CONFIG_FILES([Makefile sendit.sh cleancache.pl sqwebmaild.dist])
+AC_OUTPUT
 
 if test ! -d html/$lang
 then
diff --git a/sqwebmail/folder.c b/sqwebmail/folder.c
index 89478b1..37349c3 100644
--- a/sqwebmail/folder.c
+++ b/sqwebmail/folder.c
@@ -53,16 +53,11 @@
 #endif
 #endif
 
-#if	TIME_WITH_SYS_TIME
-#include	<sys/time.h>
 #include	<time.h>
-#else
-#if	HAVE_SYS_TIME_H
+#if HAVE_SYS_TIME_H
 #include	<sys/time.h>
-#else
-#include	<time.h>
-#endif
 #endif
+
 #if	HAVE_SYS_STAT_H
 #include	<sys/stat.h>
 #endif
diff --git a/sqwebmail/folder.h b/sqwebmail/folder.h
index 74c4a8c..48d7878 100644
--- a/sqwebmail/folder.h
+++ b/sqwebmail/folder.h
@@ -21,15 +21,9 @@
 #include	<unistd.h>
 #endif
 
-#if	TIME_WITH_SYS_TIME
-#include	<sys/time.h>
 #include	<time.h>
-#else
-#if	HAVE_SYS_TIME_H
+#if HAVE_SYS_TIME_H
 #include	<sys/time.h>
-#else
-#include	<time.h>
-#endif
 #endif
 
 typedef struct {
diff --git a/sqwebmail/html/configure.ac b/sqwebmail/html/configure.ac
index 9690cee..97b9e46 100644
--- a/sqwebmail/html/configure.ac
+++ b/sqwebmail/html/configure.ac
@@ -2,7 +2,7 @@ dnl
 dnl Copyright 1998 - 1999 Double Precision, Inc.  See COPYING for
 dnl distribution information.
 
-AC_INIT(sqwebmail, 0.23, [courier-sqwebmail@lists.sourceforge.net])
+AC_INIT([sqwebmail],[0.23],[courier-sqwebmail@lists.sourceforge.net])
 
 >confdefs.h  # Kill PACKAGE_ macros
 
@@ -24,7 +24,8 @@ htmldir="$datadir/sqwebmail/html"
 AC_SUBST(htmldir)
 AC_CONFIG_SUBDIRS($LANGUAGES)
 AC_SUBST(LANGUAGES)
-AC_OUTPUT(Makefile README_LANG.html)
+AC_CONFIG_FILES([Makefile README_LANG.html])
+AC_OUTPUT
 
 # Set up soft links
 
diff --git a/sqwebmail/html/en-us/configure.ac b/sqwebmail/html/en-us/configure.ac
index fc54ed1..18a3795 100644
--- a/sqwebmail/html/en-us/configure.ac
+++ b/sqwebmail/html/en-us/configure.ac
@@ -1,6 +1,6 @@
 dnl
 
-AC_INIT(sqwebmail-en-us, 0.1, [courier-sqwebmail@lists.sourceforge.net])
+AC_INIT([sqwebmail-en-us],[0.1],[courier-sqwebmail@lists.sourceforge.net])
 
 >confdefs.h  # Kill PACKAGE_ macros
 
@@ -33,4 +33,5 @@ AC_SUBST(htmldir)
 AC_SUBST(htmldir)
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/sqwebmail/images/configure.ac b/sqwebmail/images/configure.ac
index 2fc7c8d..13c6aaa 100644
--- a/sqwebmail/images/configure.ac
+++ b/sqwebmail/images/configure.ac
@@ -4,7 +4,7 @@ dnl configure.in,v 1.1 2000/05/24 17:08:11 mrsam Exp
 dnl Copyright 2000-2007 Double Precision, Inc.  See COPYING for
 dnl distribution information.
 
-AC_INIT(sqwebmail-images,0.10, [courier-users@lists.sourceforge.net])
+AC_INIT([sqwebmail-images],[0.10],[courier-users@lists.sourceforge.net])
 
 >confdefs.h  # Kill PACKAGE_ macros
 
@@ -24,4 +24,5 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 
 dnl Checks for library functions.
 
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/sqwebmail/ispell.c b/sqwebmail/ispell.c
index 4666897..61418da 100644
--- a/sqwebmail/ispell.c
+++ b/sqwebmail/ispell.c
@@ -26,7 +26,7 @@
 #include	<string.h>
 
 static pid_t ispell_pid;
-static RETSIGTYPE (*prevsighandler)(int);
+static void (*prevsighandler)(int);
 
 #ifndef	ISPELL
 #define	ISPELL	"/usr/bin/ispell"
diff --git a/sqwebmail/msg2html.c b/sqwebmail/msg2html.c
index 74ecfb6..a3bb4da 100644
--- a/sqwebmail/msg2html.c
+++ b/sqwebmail/msg2html.c
@@ -1066,12 +1066,12 @@ static char *convertcid(const char *cidurl, void *voidp)
 	else
 		p=(*cid_info->info->get_url_to_mime_part)(mimeid,
 							  cid_info->info);
-	free(mimeid);
-
 	if (*mimegpgfilename && rfc->parent &&
 	    libmail_gpgmime_is_decoded(rfc->parent, &dummy))
 		add_decoded_link(rfc->parent, mimeid, dummy);
 
+	free(mimeid);
+
 	return p;
 }
 
diff --git a/sqwebmail/sqconfig.h b/sqwebmail/sqconfig.h
index 5cb79b5..dcad127 100644
--- a/sqwebmail/sqconfig.h
+++ b/sqwebmail/sqconfig.h
@@ -15,15 +15,9 @@
 #include	"config.h"
 #endif
 
-#if	TIME_WITH_SYS_TIME
-#include	<sys/time.h>
 #include	<time.h>
-#else
-#if	HAVE_SYS_TIME_H
+#if HAVE_SYS_TIME_H
 #include	<sys/time.h>
-#else
-#include	<time.h>
-#endif
 #endif
 
 extern const char *read_sqconfig(const char *, const char *, time_t *);
diff --git a/sqwebmail/sqwebmail.c b/sqwebmail/sqwebmail.c
index 7d7ea62..6074b2a 100644
--- a/sqwebmail/sqwebmail.c
+++ b/sqwebmail/sqwebmail.c
@@ -2002,7 +2002,7 @@ void cleanup()
 
 
 
-static RETSIGTYPE catch_sig(int n)
+static void catch_sig(int n)
 {
 	n=n;
 	cleanup();
diff --git a/sqwebmail/token.c b/sqwebmail/token.c
index ad8acfb..48c286a 100644
--- a/sqwebmail/token.c
+++ b/sqwebmail/token.c
@@ -16,15 +16,9 @@
 #if	HAVE_UNISTD_H
 #include	<unistd.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
+#include	<time.h>
+#if HAVE_SYS_TIME_H
+#include	<sys/time.h>
 #endif
 
 void tokennew()
@@ -61,4 +55,3 @@ void tokensave()
 {
 	write_sqconfig(".", TOKENFILE, cgi("msgtoken"));
 }
-