Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package courier-imap for openSUSE:Factory 
checked in at 2021-08-03 22:48:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/courier-imap (Old)
 and      /work/SRC/openSUSE:Factory/.courier-imap.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "courier-imap"

Tue Aug  3 22:48:44 2021 rev:63 rq:909887 version:5.1.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/courier-imap/courier-imap.changes        
2021-04-26 16:40:16.418139542 +0200
+++ /work/SRC/openSUSE:Factory/.courier-imap.new.1899/courier-imap.changes      
2021-08-03 22:49:06.956469719 +0200
@@ -1,0 +2,13 @@
+Mon Aug  2 09:16:44 UTC 2021 - Arjen de Korte <[email protected]>
+
+- update to 5.1.4
+  * all: code changes so that courier can be compiled with -Wall
+    -Werror gcc flags. The default compilation flags are not changed.
+    This also includes changes to the configuration scripts, which
+    includes removing outdated configuration settings.
+  * pop3: buffer input by ourselves, clear input buffer before
+    switching to TLS.
+  * imap: fix crash if the connection to the client is terminated at
+    the wrong/right time.
+
+-------------------------------------------------------------------

Old:
----
  courier-imap-5.1.3.tar.bz2
  courier-imap-5.1.3.tar.bz2.sig

New:
----
  courier-imap-5.1.4.tar.bz2
  courier-imap-5.1.4.tar.bz2.sig

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ courier-imap.spec ++++++
--- /var/tmp/diff_new_pack.PUFpGX/_old  2021-08-03 22:49:07.492469072 +0200
+++ /var/tmp/diff_new_pack.PUFpGX/_new  2021-08-03 22:49:07.496469067 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           courier-imap
-Version:        5.1.3
+Version:        5.1.4
 Release:        0
 Summary:        An IMAP and POP3 Server for Maildir MTAs
 License:        GPL-3.0-or-later

++++++ courier-imap-5.1.3.tar.bz2 -> courier-imap-5.1.4.tar.bz2 ++++++
++++ 2612 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/configure.ac new/courier-imap-5.1.4/configure.ac
--- old/courier-imap-5.1.3/configure.ac 2021-04-24 17:48:12.000000000 +0200
+++ new/courier-imap-5.1.4/configure.ac 2021-08-01 15:32:35.000000000 +0200
@@ -4,7 +4,7 @@
 dnl distribution information.
 
 AC_PREREQ(2.59)
-AC_INIT(courier-imap, 5.1.3, [[email protected]])
+AC_INIT(courier-imap, 5.1.4, [[email protected]])
 AC_CONFIG_SRCDIR(libs/imap/imapd.c)
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/courier-imap.spec 
new/courier-imap-5.1.4/courier-imap.spec
--- old/courier-imap-5.1.3/courier-imap.spec    2021-04-24 18:47:58.000000000 
+0200
+++ new/courier-imap-5.1.4/courier-imap.spec    2021-08-01 15:55:37.000000000 
+0200
@@ -26,13 +26,13 @@
 %define _missing_doc_files_terminate_build 1
 %define _unpackaged_files_terminate_build 1
 
-Summary: Courier-IMAP 5.1.3 IMAP server
+Summary: Courier-IMAP 5.1.4 IMAP server
 Name: courier-imap
-Version: 5.1.3
+Version: 5.1.4
 Release: 1%{courier_release}
 License: GPL
 Group: Applications/Mail
-Source: %{name}-5.1.3.tar.bz2
+Source: %{name}-5.1.4.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires: coreutils sed
 %if %suse_version
@@ -92,7 +92,7 @@
 # SuSE specific settings
 %if %suse_version
 # some templates for SuSE distribs.
-%define templdir       ${RPM_BUILD_DIR}/%{name}-5.1.3/packaging/suse
+%define templdir       ${RPM_BUILD_DIR}/%{name}-5.1.4/packaging/suse
 %define _sysconfdir    /etc/courier-imap
 %define        _mandir         /usr/share/man
 %define initlndir      /usr/sbin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/gdbmobj/configure.ac 
new/courier-imap-5.1.4/libs/gdbmobj/configure.ac
--- old/courier-imap-5.1.3/libs/gdbmobj/configure.ac    2020-04-21 
13:51:59.000000000 +0200
+++ new/courier-imap-5.1.4/libs/gdbmobj/configure.ac    2021-05-22 
11:00:04.000000000 +0200
@@ -49,27 +49,4 @@
 
 dnl Checks for library functions.
 
-AC_LANG_CPLUSPLUS
-AC_CACHE_CHECK([if the C++ compiler needs -fhandle-exceptions],
-       ac_cv_need_handlexceptions,
-
-AC_TRY_COMPILE([],
-[
-throw;
-], ac_cv_need_handlexceptions=no,
-ac_cv_need_handlexceptions=yes)
-)
-
-if test "$ac_cv_need_handlexceptions" = "yes"
-then
-       case "$CXXFLAGS" in
-       *handle-exceptions*)
-               ;;
-       *)
-               CXXFLAGS="-fhandle-exceptions $CXXFLAGS"
-               CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-O2//'`
-               ;;
-       esac
-fi
-
 AC_OUTPUT(Makefile)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/imap/ChangeLog 
new/courier-imap-5.1.4/libs/imap/ChangeLog
--- old/courier-imap-5.1.3/libs/imap/ChangeLog  2021-04-24 17:48:24.000000000 
+0200
+++ new/courier-imap-5.1.4/libs/imap/ChangeLog  2021-08-01 15:33:18.000000000 
+0200
@@ -1,3 +1,17 @@
+5.1.4
+
+2021-08-01  Sam Varshavchik  <[email protected]>
+
+       * imapd.c (bye): Just call exit(), we may be in an inconstent state.
+
+2021-06-15  Sam Varshavchik  <[email protected]>
+
+       * pop3login: use unbuffered reads, handle our own buffering.
+
+2021-05-21  Sam Varshavchik  <[email protected]>
+
+       * Minor code tweaks, make it compleable with -Wall -Werror.
+
 5.1.3
 
 2021-04-01  Sam Varshavchik  <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/imap/config.h.in 
new/courier-imap-5.1.4/libs/imap/config.h.in
--- old/courier-imap-5.1.3/libs/imap/config.h.in        2021-04-24 
18:29:56.000000000 +0200
+++ new/courier-imap-5.1.4/libs/imap/config.h.in        2021-08-01 
15:34:01.000000000 +0200
@@ -43,9 +43,6 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
 /* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR
 
@@ -55,9 +52,6 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strncasecmp' function. */
-#undef HAVE_STRNCASECMP
-
 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
    */
 #undef HAVE_SYS_DIR_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/imap/configure.ac 
new/courier-imap-5.1.4/libs/imap/configure.ac
--- old/courier-imap-5.1.3/libs/imap/configure.ac       2021-04-24 
17:48:24.000000000 +0200
+++ new/courier-imap-5.1.4/libs/imap/configure.ac       2021-08-01 
15:33:18.000000000 +0200
@@ -4,7 +4,7 @@
 dnl Copyright 1998 - 2021 Double Precision, Inc.  See COPYING for
 dnl distribution information.
 
-AC_INIT(courier-imap, 5.1.3, [[email protected]])
+AC_INIT(courier-imap, 5.1.4, [[email protected]])
 
 >confdefs.h  # Kill PACKAGE_ macros
 
@@ -113,7 +113,7 @@
 
 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)
+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_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
@@ -152,7 +152,7 @@
 
 dnl Checks for library functions.
 
-AC_CHECK_FUNCS(strerror utime utimes strcasecmp strncasecmp setlocale poll 
getaddrinfo)
+AC_CHECK_FUNCS(strerror utime utimes setlocale poll getaddrinfo)
 
 AC_DEFINE_UNQUOTED(SOCKET_TIMEOUT,60,
        [ Read/write timeout ])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/imap/imapd.c 
new/courier-imap-5.1.4/libs/imap/imapd.c
--- old/courier-imap-5.1.3/libs/imap/imapd.c    2021-03-26 12:16:18.000000000 
+0100
+++ new/courier-imap-5.1.4/libs/imap/imapd.c    2021-08-01 15:33:18.000000000 
+0200
@@ -2414,16 +2414,6 @@
 
 void bye()
 {
-       if (current_temp_fd >= 0)
-               close(current_temp_fd);
-       if (current_temp_fn)
-               unlink(current_temp_fn);
-
-       if (current_mailbox)
-               free(current_mailbox);
-       imapscan_free(&current_maildir_info);
-       maildirwatch_cleanup();
-       fetch_free_cached();
        exit(0);
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/imap/mailboxlist.c 
new/courier-imap-5.1.4/libs/imap/mailboxlist.c
--- old/courier-imap-5.1.3/libs/imap/mailboxlist.c      2018-07-14 
21:57:16.000000000 +0200
+++ new/courier-imap-5.1.4/libs/imap/mailboxlist.c      2021-05-22 
11:00:04.000000000 +0200
@@ -1006,13 +1006,7 @@
 
        /* First component, INBOX, is case insensitive */
 
-       if (
-#if    HAVE_STRNCASECMP
-           strncasecmp(name, INBOX, sizeof(INBOX)-1) == 0
-#else
-           strnicmp(name, INBOX, sizeof(INBOX)-1) == 0
-#endif
-           )
+       if (strncasecmp(name, INBOX, sizeof(INBOX)-1) == 0)
                for (i=0; name[i] && name[i] != HIERCH; i++)
                        name[i]=toupper( (int)(unsigned char)name[i] );
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/imap/pop3login.c 
new/courier-imap-5.1.4/libs/imap/pop3login.c
--- old/courier-imap-5.1.3/libs/imap/pop3login.c        2021-04-02 
11:00:03.000000000 +0200
+++ new/courier-imap-5.1.4/libs/imap/pop3login.c        2021-06-16 
11:00:09.000000000 +0200
@@ -48,6 +48,63 @@
        return p;
 }
 
+static char getline_buf[1024];
+static size_t getline_buf_size=0;
+static size_t getline_i=0;
+
+static int safe_getc()
+{
+       if (getline_i >= getline_buf_size)
+       {
+               int n=read(0, getline_buf, sizeof(getline_buf));
+
+               if (n < 0)
+                       n=0;
+
+               if (n == 0)
+                       return -1;
+
+               getline_buf_size=n;
+               getline_i=0;
+       }
+
+       return (int)(unsigned char)getline_buf[getline_i++];
+}
+
+static void safe_fflush()
+{
+       getline_i=getline_buf_size=0;
+}
+
+static char *safe_fgets(char *buf, size_t buf_size)
+{
+       size_t i;
+
+       for (i=0; i+1 < buf_size; ++i)
+       {
+               int ch=safe_getc();
+
+               if (ch < 0)
+               {
+                       if (i == 0)
+                               return NULL;
+                       break;
+               }
+
+               buf[i]=ch;
+               if (ch == '\n')
+               {
+                       ++i;
+                       break;
+               }
+       }
+
+       if (i < buf_size)
+               buf[i]=0;
+
+       return buf;
+}
+
 static int     starttls()
 {
        char *argvec[4];
@@ -76,7 +133,7 @@
 
        printf("+OK Begin SSL/TLS negotiation now.\r\n");
        fflush(stdout);
-       fflush(stdin);
+       safe_fflush();
        cinfo.username=MAILUSER;
 
        if (couriertls_start(argvec, &cinfo))
@@ -101,7 +158,6 @@
                exit(1);
        }
        close(pipefd[0]);
-       fflush(stdin);
        putenv("POP3_STARTTLS=NO");
        putenv("POP3_TLS_REQUIRED=0");
        putenv("POP3_TLS=1");
@@ -116,7 +172,7 @@
        printf("+ %s\r\n", s);
        fflush(stdout);
 
-       if (fgets(buf, sizeof(buf), stdin) == 0)        return (0);
+       if (safe_fgets(buf, sizeof(buf)) == 0)  return (0);
        if ((p=strchr(buf, '\n')) == 0) return (0);
        if (p > buf && p[-1] == '\r')   --p;
        *p=0;
@@ -285,7 +341,7 @@
        fflush(stdout);
        fflush(stderr);
        alarm(60);
-       while (fgets(buf, sizeof(buf), stdin))
+       while (safe_fgets(buf, sizeof(buf)))
        {
                c=1;
                for (p=buf; *p; p++)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/imap/smap.c new/courier-imap-5.1.4/libs/imap/smap.c
--- old/courier-imap-5.1.3/libs/imap/smap.c     2021-03-01 23:59:53.000000000 
+0100
+++ new/courier-imap-5.1.4/libs/imap/smap.c     2021-05-22 11:00:04.000000000 
+0200
@@ -3245,6 +3245,7 @@
                        while (*(p=getword(&ptr)))
                        {
                                char *q=strchr(p, '=');
+                               char *comma=q;
 
                                if (q)
                                        *q++=0;
@@ -3335,7 +3336,7 @@
                                {
                                        memset(&add_flags, 0,
                                               sizeof(add_flags));
-                                       *--q='=';
+                                       *(q=comma)='=';
                                        parseflags(q, &add_flags);
 
                                        if (strchr(rights_buf,
@@ -3370,7 +3371,7 @@
                                                write_error_exit(0);
                                        }
 
-                                       *--q='=';
+                                       *(q=comma)='=';
                                        parsekeywords(q, &addKeywords);
                                        okmsg="KEYWORDS set";
                                }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/liblock/configure.ac 
new/courier-imap-5.1.4/libs/liblock/configure.ac
--- old/courier-imap-5.1.3/libs/liblock/configure.ac    2020-04-21 
13:51:59.000000000 +0200
+++ new/courier-imap-5.1.4/libs/liblock/configure.ac    2021-05-22 
11:00:04.000000000 +0200
@@ -42,8 +42,8 @@
 liblock_cv_hasoff64t="no"
 AC_TRY_COMPILE([
 #include <sys/types.h>
-],[
 off64_t        n;
+],[
 
        n=0;
 ], liblock_cv_hasoff64t="yes")
@@ -72,8 +72,8 @@
 #if     HAVE_SYS_FCNTL_H
 #include        <sys/fcntl.h>
 #endif
-],[
 flock_t t;
+],[
 ], liblock_cv_hasflock_t="yes"))
 
 if test "$liblock_cv_hasflock_t" = "yes"
@@ -95,8 +95,8 @@
 AC_TRY_LINK([
 #define        LL_OFFSET_TYPE  $LL_OFFSET_TYPE
 #include "${srcdir}/lockfcntl.c"
-],[
 int n;
+],[
 ], liblock_cv_hasfcntl="yes"))
 if test "$liblock_cv_hasfcntl" = "yes"
 then
@@ -109,8 +109,8 @@
 AC_TRY_LINK([
 #define        LL_OFFSET_TYPE  $LL_OFFSET_TYPE
 #include "${srcdir}/lockflock.c"
-],[
 int n;
+],[
 ], liblock_cv_hasflock="yes"))
 if test "$liblock_cv_hasflock" = "yes"
 then
@@ -123,8 +123,8 @@
 AC_TRY_LINK([
 #define        LL_OFFSET_TYPE  $LL_OFFSET_TYPE
 #include "${srcdir}/locklockf.c"
-],[
 int n;
+],[
 ], liblock_cv_haslockf="yes"))
 if test "$liblock_cv_haslockf" = "yes"
 then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/liblock/locktest.c 
new/courier-imap-5.1.4/libs/liblock/locktest.c
--- old/courier-imap-5.1.3/libs/liblock/locktest.c      2014-07-13 
15:54:58.000000000 +0200
+++ new/courier-imap-5.1.4/libs/liblock/locktest.c      2021-05-22 
11:00:04.000000000 +0200
@@ -13,6 +13,13 @@
 #if    USE_LOCKF
 #include       "locklockf.c"
 #endif
+#if    HAVE_UNISTD_H
+#include       <unistd.h>
+#endif
+#include <sys/types.h>
+#if HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
 #include       <signal.h>
 #include       <stdlib.h>
 #include       <string.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/maildir/config.h.in 
new/courier-imap-5.1.4/libs/maildir/config.h.in
--- old/courier-imap-5.1.3/libs/maildir/config.h.in     2021-03-14 
19:00:40.000000000 +0100
+++ new/courier-imap-5.1.4/libs/maildir/config.h.in     2021-05-22 
20:41:20.000000000 +0200
@@ -49,9 +49,6 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/maildir/configure.ac 
new/courier-imap-5.1.4/libs/maildir/configure.ac
--- old/courier-imap-5.1.3/libs/maildir/configure.ac    2021-03-01 
23:59:53.000000000 +0100
+++ new/courier-imap-5.1.4/libs/maildir/configure.ac    2021-05-22 
11:00:04.000000000 +0200
@@ -74,7 +74,7 @@
 AC_SUBST(COURIER_UNICODE_CXXFLAGS)
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
+AC_CHECK_FUNCS(symlink readlink utime utimes)
 
 AC_CHECK_FUNCS(inotify_init inotify_init1)
 
@@ -85,7 +85,7 @@
 #include       <unistd.h>
 #endif
 
-extern "C" int gethostname(int,int);
+extern int gethostname(int,int);
 ],[
 ],maildir_cv_SYS_GETHOSTNAME=yes,maildir_cv_SYS_GETHOSTNAME=no
 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/md5/configure.ac 
new/courier-imap-5.1.4/libs/md5/configure.ac
--- old/courier-imap-5.1.3/libs/md5/configure.ac        2020-04-21 
13:51:59.000000000 +0200
+++ new/courier-imap-5.1.4/libs/md5/configure.ac        2021-05-22 
11:00:04.000000000 +0200
@@ -35,7 +35,7 @@
 dnl Checks for header files.
 AC_HEADER_STDC
 
-AC_CHECK_HEADERS(sys/types.h)
+AC_CHECK_HEADERS(sys/types.h stdint.h)
 
 
 AC_ARG_WITH(int32,
@@ -49,8 +49,11 @@
 #if HAVE_SYS_TYPES_H
 #include       <sys/types.h>
 #endif
+#if HAVE_STDINT_H
+#include       <stdint.h>
+#endif
+uint32_t i;
                ],[
-                       uint32_t        i=0;
                ], [ AC_MSG_RESULT(yes) ; int32="uint32_t"], [
 
                AC_MSG_RESULT(no)
@@ -60,8 +63,11 @@
 #if HAVE_SYS_TYPES_H
 #include       <sys/types.h>
 #endif
+#if HAVE_STDINT_H
+#include       <stdint.h>
+#endif
+u_int32_t      i;
                        ],[
-                               u_int32_t       i=0;
                        ], [AC_MSG_RESULT(yes); int32="u_int32_t"],[
 
                        AC_MSG_RESULT(no)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/md5/md5.h new/courier-imap-5.1.4/libs/md5/md5.h
--- old/courier-imap-5.1.3/libs/md5/md5.h       2013-08-25 20:52:10.000000000 
+0200
+++ new/courier-imap-5.1.4/libs/md5/md5.h       2021-05-22 11:00:04.000000000 
+0200
@@ -24,6 +24,9 @@
 #include       <sys/types.h>
 #endif
 
+#if    HAVE_STDINT_H
+#include       <stdint.h>
+#endif
 #define        MD5_DIGEST_SIZE 16
 #define        MD5_BLOCK_SIZE  64
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/rfc1035/config.h.in 
new/courier-imap-5.1.4/libs/rfc1035/config.h.in
--- old/courier-imap-5.1.3/libs/rfc1035/config.h.in     2020-11-05 
02:09:51.000000000 +0100
+++ new/courier-imap-5.1.4/libs/rfc1035/config.h.in     2021-05-22 
20:40:57.000000000 +0200
@@ -27,9 +27,6 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/rfc1035/configure.ac 
new/courier-imap-5.1.4/libs/rfc1035/configure.ac
--- old/courier-imap-5.1.3/libs/rfc1035/configure.ac    2020-04-21 
13:51:59.000000000 +0200
+++ new/courier-imap-5.1.4/libs/rfc1035/configure.ac    2021-05-22 
11:00:04.000000000 +0200
@@ -32,7 +32,7 @@
 fi
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(sys/types.h sys/time.h unistd.h arpa/inet.h netinet/in.h)
+AC_CHECK_HEADERS(sys/types.h sys/time.h unistd.h arpa/inet.h netinet/in.h 
strings.h stdint.h)
 
 USENSL=no
 saveLIBS="$LIBS"
@@ -88,8 +88,11 @@
 #if HAVE_SYS_TYPES_H
 #include       <sys/types.h>
 #endif
+#if HAVE_STDINT_H
+#include       <stdint.h>
+#endif
+uint32_t n;
                ],[
-                       uint32_t        i=0;
                ], [ AC_MSG_RESULT(yes) ; int32="uint32_t"], [
 
                AC_MSG_RESULT(no)
@@ -99,8 +102,11 @@
 #if HAVE_SYS_TYPES_H
 #include       <sys/types.h>
 #endif
+#if HAVE_STDINT_H
+#include       <stdint.h>
+#endif
+u_int32_t n;
                        ],[
-                               u_int32_t       i=0;
                        ], [AC_MSG_RESULT(yes); int32="u_int32_t"],[
 
                        AC_MSG_RESULT(no)
@@ -139,8 +145,11 @@
 #if HAVE_SYS_TYPES_H
 #include       <sys/types.h>
 #endif
+#if HAVE_STDINT_H
+#include       <stdint.h>
+#endif
+uint16_t n;
                ],[
-                       uint16_t        i=0;
                ], [ AC_MSG_RESULT(yes) ; int16="uint16_t"], [
 
                AC_MSG_RESULT(no)
@@ -150,8 +159,11 @@
 #if HAVE_SYS_TYPES_H
 #include       <sys/types.h>
 #endif
+#if HAVE_STDINT_H
+#include       <stdint.h>
+#endif
+u_int16_t n;
                        ],[
-                               u_int16_t       i=0;
                        ], [AC_MSG_RESULT(yes); int16="u_int16_t"],[
 
                        AC_MSG_RESULT(no)
@@ -206,8 +218,6 @@
 
 dnl Checks for library functions.
 
-AC_CHECK_FUNCS(strcasecmp)
-
 dnl Other checks
 
 if test "$GCC" = "yes"
@@ -229,10 +239,10 @@
 #include <arpa/inet.h>
 
         ], [
-struct in6_addr in6a;
-struct sockaddr_in6 sain6;
-struct sockaddr_storage soas;
-int x=PF_INET6;
+       (void)(sizeof(struct in6_addr)+
+                            sizeof(struct sockaddr_in6)+
+                            sizeof(struct sockaddr_storage)+
+                            PF_INET6);
 
        ], rfc1035_cv_hasipv6structs=yes,
                 rfc1035_cv_hasipv6structs=no )
@@ -257,9 +267,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-] , [
 struct in6_addr in6a;
 
+] , [
        in6a.s6_addr16 $LB 0 $RB =0;
        in6a.s6_addr32 $LB 0 $RB =0;
 ],
@@ -270,9 +280,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+struct in6_addr in6a;
 
         ], [
-struct in6_addr in6a;
 
        in6a.__u6_addr.__u6_addr16 $LB 0 $RB =0;
        in6a.__u6_addr.__u6_addr32 $LB 0 $RB =0;
@@ -284,10 +294,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-
-        ], [
 struct in6_addr in6a;
 
+        ], [
        in6a._S6_un._S6_u8 $LB 0 $RB = 0;
        in6a._S6_un._S6_u32 $LB 0 $RB = 0;
 
@@ -346,17 +355,17 @@
 fi
 
 AC_CACHE_CHECK([for alloca],
-       rfc1035_cv_alloca,
+       [rfc1035_cv_alloca],
 
 AC_TRY_COMPILE( [
 #include <stdio.h>
 #include <stdlib.h>
 
         ], [
-char *p=(char *)alloca(10);
+(void)(char *)alloca(10);
 
        ], rfc1035_cv_alloca=yes,
-                rfc1035_cv_alloca,=no )
+                rfc1035_cv_alloca=no )
 )
 
 ipv6=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/rfc1035/rfc1035.h 
new/courier-imap-5.1.4/libs/rfc1035/rfc1035.h
--- old/courier-imap-5.1.3/libs/rfc1035/rfc1035.h       2020-05-08 
11:00:06.000000000 +0200
+++ new/courier-imap-5.1.4/libs/rfc1035/rfc1035.h       2021-05-22 
11:00:04.000000000 +0200
@@ -21,7 +21,9 @@
 #if HAVE_NETINET_IN_H
 #include       <netinet/in.h>
 #endif
-
+#if HAVE_STDINT_H
+#include       <stdint.h>
+#endif
 #ifdef  __cplusplus
 extern "C" {
 #endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/rfc1035/rfc1035str.c 
new/courier-imap-5.1.4/libs/rfc1035/rfc1035str.c
--- old/courier-imap-5.1.3/libs/rfc1035/rfc1035str.c    2013-08-25 
20:52:11.000000000 +0200
+++ new/courier-imap-5.1.4/libs/rfc1035/rfc1035str.c    2021-05-22 
11:00:04.000000000 +0200
@@ -52,12 +52,6 @@
        {"UNIMPLEMENTED", 4},
        {"REFUSED",     5}};
 
-#if HAVE_STRCASECMP
-#define        COMPARE(a,b)    strcasecmp((a), (b))
-#else
-#define        COMPARE(a,b)    stricmp((a), (b))
-#endif
-
 void rfc1035_type_itostr(int n, void (*func)(const char *, void *), void *arg)
 {
        unsigned i;
@@ -82,7 +76,7 @@
 unsigned i;
 
        for (i=0; i<sizeof(typetab)/sizeof(typetab[0]); i++)
-               if (COMPARE(typetab[i].name, n) == 0) return (typetab[i].num);
+               if (strcasecmp(typetab[i].name, n) == 0) return 
(typetab[i].num);
        return (-1);
 }
 
@@ -100,7 +94,7 @@
 unsigned i;
 
        for (i=0; i<sizeof(classtab)/sizeof(classtab[0]); i++)
-               if (COMPARE(classtab[i].name, n) == 0) return (classtab[i].num);
+               if (strcasecmp(classtab[i].name, n) == 0) return 
(classtab[i].num);
        return (-1);
 }
 
@@ -118,8 +112,8 @@
 unsigned i;
 
        for (i=0; i<sizeof(opcodetab)/sizeof(opcodetab[0]); i++)
-               if (COMPARE(opcodetab[i].name, n) == 0)
-                               return (opcodetab[i].num);
+               if (strcasecmp(opcodetab[i].name, n) == 0)
+                       return (opcodetab[i].num);
        return (-1);
 }
 
@@ -137,7 +131,7 @@
 unsigned i;
 
        for (i=0; i<sizeof(rcodetab)/sizeof(rcodetab[0]); i++)
-               if (COMPARE(rcodetab[i].name, n) == 0)
-                               return (rcodetab[i].num);
+               if (strcasecmp(rcodetab[i].name, n) == 0)
+                       return (rcodetab[i].num);
        return (-1);
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/rfc1035/testlookup.c 
new/courier-imap-5.1.4/libs/rfc1035/testlookup.c
--- old/courier-imap-5.1.3/libs/rfc1035/testlookup.c    2020-05-08 
11:00:06.000000000 +0200
+++ new/courier-imap-5.1.4/libs/rfc1035/testlookup.c    2021-05-22 
11:00:04.000000000 +0200
@@ -312,8 +312,13 @@
        {
                char namebuf[RFC1035_MAXNAMESIZE+1];
 
-               namebuf[0]=0;
-               strncat(namebuf, q_name, RFC1035_MAXNAMESIZE);
+               size_t l=strlen(q_name);
+
+               if (l > RFC1035_MAXNAMESIZE)
+                       l=RFC1035_MAXNAMESIZE;
+
+               memcpy(namebuf, q_name, l);
+               namebuf[l]=0;
 
                if (rfc1035_resolve_cname_multiple(&res, namebuf,
                                                   q_type, q_class,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/rfc2045/configure.ac 
new/courier-imap-5.1.4/libs/rfc2045/configure.ac
--- old/courier-imap-5.1.3/libs/rfc2045/configure.ac    2020-04-21 
13:51:59.000000000 +0200
+++ new/courier-imap-5.1.4/libs/rfc2045/configure.ac    2021-05-22 
11:00:04.000000000 +0200
@@ -60,8 +60,6 @@
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS(setlocale)
-AC_CHECK_FUNC(strncasecmp,,CFLAGS="$CFLAGS -Dstrncasecmp=strnicmp")
-AC_CHECK_FUNC(strcasecmp,,CFLAGS="$CFLAGS -Dstrcasecmp=stricmp")
 
 AC_ARG_WITH(package, [], package="$withval",
        [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/rfc822/config.h.in 
new/courier-imap-5.1.4/libs/rfc822/config.h.in
--- old/courier-imap-5.1.3/libs/rfc822/config.h.in      2020-11-05 
02:09:45.000000000 +0100
+++ new/courier-imap-5.1.4/libs/rfc822/config.h.in      2021-05-22 
20:40:21.000000000 +0200
@@ -21,18 +21,12 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strncasecmp' function. */
-#undef HAVE_STRNCASECMP
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/rfc822/configure.ac 
new/courier-imap-5.1.4/libs/rfc822/configure.ac
--- old/courier-imap-5.1.3/libs/rfc822/configure.ac     2020-04-21 
13:51:59.000000000 +0200
+++ new/courier-imap-5.1.4/libs/rfc822/configure.ac     2021-05-22 
11:00:04.000000000 +0200
@@ -29,7 +29,7 @@
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(locale.h)
+AC_CHECK_HEADERS(locale.h strings.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -58,28 +58,31 @@
 AC_MSG_CHECKING([if Libidn should be used])
 AC_MSG_RESULT($libidn)
 
-AC_CHECK_FUNCS(strcasecmp strncasecmp setlocale)
+AC_CHECK_FUNCS(setlocale)
 
 AC_CACHE_CHECK([how to calculate alternate timezone],librfc822_cv_SYS_TIMEZONE,
 
 AC_TRY_COMPILE([
 #include       <time.h>
+time_t  t;
 ],[
-time_t t=altzone;
+t=altzone;
 ], librfc822_cv_SYS_TIMEZONE=altzone,
 
        AC_TRY_COMPILE([
 #include       <time.h>
+int n;
 ],[
-int    n=daylight;
+       n=daylight;
        ], librfc822_cv_SYS_TIMEZONE=daylight,
 
        AC_TRY_COMPILE([
 #include       <time.h>
 
 extern struct tm dummy;
+long n;
 ],[
-long   n=dummy.tm_gmtoff;
+       n=dummy.tm_gmtoff;
        ] ,librfc822_cv_SYS_TIMEZONE=tm_gmtoff,
                librfc822_cv_SYS_TIMEZONE=unknown
                        )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/rfc822/imapsubj.c 
new/courier-imap-5.1.4/libs/rfc822/imapsubj.c
--- old/courier-imap-5.1.3/libs/rfc822/imapsubj.c       2013-08-25 
20:52:11.000000000 +0200
+++ new/courier-imap-5.1.4/libs/rfc822/imapsubj.c       2021-05-22 
11:00:04.000000000 +0200
@@ -10,19 +10,10 @@
 #include       <ctype.h>
 #include       <stdlib.h>
 #include       <string.h>
-#include       "rfc822.h"
-
-#if    HAVE_STRCASECMP
-
-#else
-#define        strcasecmp      stricmp
-#endif
-
-#if    HAVE_STRNCASECMP
-
-#else
-#define        strncasecmp     strnicmp
+#if    HAVE_STRINGS_H
+#include       <strings.h>
 #endif
+#include       "rfc822.h"
 
 /* Skip over blobs */
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/sha1/configure.ac 
new/courier-imap-5.1.4/libs/sha1/configure.ac
--- old/courier-imap-5.1.3/libs/sha1/configure.ac       2020-04-21 
13:51:59.000000000 +0200
+++ new/courier-imap-5.1.4/libs/sha1/configure.ac       2021-05-22 
11:00:04.000000000 +0200
@@ -32,7 +32,7 @@
 
 dnl Checks for header files.
 
-AC_CHECK_HEADERS(sys/types.h)
+AC_CHECK_HEADERS(sys/types.h stdint.h)
 
 AC_ARG_WITH(int32,
 [  --with-int32='type'     use 'type' for an unsigned 32 bit integer type
@@ -45,8 +45,11 @@
 #if HAVE_SYS_TYPES_H
 #include       <sys/types.h>
 #endif
+#if HAVE_STDINT_H
+#include       <stdint.h>
+#endif
+uint32_t i;
                ],[
-                       uint32_t        i=0;
                ], [ AC_MSG_RESULT(yes) ; int32="uint32_t"], [
 
                AC_MSG_RESULT(no)
@@ -56,8 +59,11 @@
 #if HAVE_SYS_TYPES_H
 #include       <sys/types.h>
 #endif
+#if HAVE_STDINT_H
+#include       <stdint.h>
+#endif
+u_int32_t i;
                        ],[
-                               u_int32_t       i=0;
                        ], [AC_MSG_RESULT(yes); int32="u_int32_t"],[
 
                        AC_MSG_RESULT(no)
@@ -99,8 +105,11 @@
 #if HAVE_SYS_TYPES_H
 #include       <sys/types.h>
 #endif
+#if HAVE_STDINT_H
+#include       <stdint.h>
+#endif
+uint64_t       i;
                ],[
-                       uint64_t        i=0;
                ], [ AC_MSG_RESULT(yes) ; int64="uint64_t"], [
 
                AC_MSG_RESULT(no)
@@ -110,8 +119,11 @@
 #if HAVE_SYS_TYPES_H
 #include       <sys/types.h>
 #endif
+#if HAVE_STDINT_H
+#include       <stdint.h>
+#endif
+u_int64_t      i;
                        ],[
-                               u_int64_t       i=0;
                        ], [AC_MSG_RESULT(yes); int64="u_int64_t"],[
 
                        AC_MSG_RESULT(no)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/sha1/sha1.h new/courier-imap-5.1.4/libs/sha1/sha1.h
--- old/courier-imap-5.1.3/libs/sha1/sha1.h     2013-08-25 20:52:11.000000000 
+0200
+++ new/courier-imap-5.1.4/libs/sha1/sha1.h     2021-05-22 11:00:04.000000000 
+0200
@@ -14,6 +14,9 @@
 #if    HAVE_SYS_TYPES_H
 #include       <sys/types.h>
 #endif
+#if    HAVE_STDINT_H
+#include       <stdint.h>
+#endif
 
 #define        SHA1_DIGEST_SIZE        20
 #define        SHA1_BLOCK_SIZE         64
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/soxwrap/configure.ac 
new/courier-imap-5.1.4/libs/soxwrap/configure.ac
--- old/courier-imap-5.1.3/libs/soxwrap/configure.ac    2020-04-21 
13:51:59.000000000 +0200
+++ new/courier-imap-5.1.4/libs/soxwrap/configure.ac    2021-05-22 
11:00:04.000000000 +0200
@@ -124,13 +124,13 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-
-        ], [
 struct in6_addr in6a;
 struct sockaddr_in6 sain6;
 struct sockaddr_storage soas;
 int x=PF_INET6;
 
+        ], [
+
        ], soxwrap_cv_hasipv6structs=yes,
                 soxwrap_cv_hasipv6structs=no )
 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/tcpd/config.h.in 
new/courier-imap-5.1.4/libs/tcpd/config.h.in
--- old/courier-imap-5.1.3/libs/tcpd/config.h.in        2021-03-02 
07:06:21.000000000 +0100
+++ new/courier-imap-5.1.4/libs/tcpd/config.h.in        2021-05-22 
20:41:32.000000000 +0200
@@ -40,7 +40,7 @@
 /* Whether OpenSSL supports ALPN */
 #undef HAVE_OPENSSL_ALPN
 
-/* When OpenSSL supports SNI */
+/* Whether OpenSSL supports SNI */
 #undef HAVE_OPENSSL_SNI
 
 /* Define to 1 if you have the `setpgid' function. */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/tcpd/configure.ac 
new/courier-imap-5.1.4/libs/tcpd/configure.ac
--- old/courier-imap-5.1.3/libs/tcpd/configure.ac       2021-03-01 
23:59:53.000000000 +0100
+++ new/courier-imap-5.1.4/libs/tcpd/configure.ac       2021-05-22 
11:00:04.000000000 +0200
@@ -208,9 +208,8 @@
 #include <stropts.h>
 #include <fcntl.h>
 ],[ {
-        struct strfdinsert      ins;
-        queue_t                 *pointer;
-       int i=I_FDINSERT;
+       (void)(sizeof(struct strfdinsert) +
+               sizeof(queue_t) + I_FDINSERT)
 }
 ], tcpd_cv_svr3=yes, tcpd_cv_svr3=no))
 
@@ -223,6 +222,7 @@
 
 #include       <stdio.h>
 #include       <unistd.h>
+#include       <stdlib.h>
 
 int main(int argc, char **argv)
 {
@@ -328,7 +328,7 @@
                AC_MSG_CHECKING(whether OpenSSL requires Kerberos)
                AC_TRY_COMPILE( [
 #include <openssl/ssl.h>
-], [ int x=1; ], :,
+], [ ], :,
                 [
                        KRBFLAGS=`$KRB5CONFIG --cflags`
                        CFLAGS="$CFLAGS $KRBFLAGS"
@@ -336,7 +336,7 @@
 
                        AC_TRY_COMPILE( [
 #include <openssl/ssl.h>
-], [ int x=1; ], [ KRBLIBS="`$KRB5CONFIG --libs`" ],
+], [ ], [ KRBLIBS="`$KRB5CONFIG --libs`" ],
    AC_MSG_ERROR(OpenSSL test build failed) )
                        ]
 )
@@ -544,7 +544,7 @@
 #include <openssl/rand.h>
 ],
 [
-char dummy[1];
+unsigned char dummy[1];
 unsigned char a[1], b[1];
 
 EVP_CIPHER_CTX *ctx=EVP_CIPHER_CTX_new();
@@ -568,11 +568,13 @@
 
                AC_TRY_COMPILE( [
 #include <openssl/ssl.h>
+
+SSL *p;
 ],
 [
-SSL_get_servername((SSL *)0, TLSEXT_NAMETYPE_host_name);
+(void)SSL_get_servername(p, TLSEXT_NAMETYPE_host_name);
 ], [
-                AC_DEFINE_UNQUOTED(HAVE_OPENSSL_SNI,1,[ When OpenSSL supports 
SNI ])
+                AC_DEFINE_UNQUOTED(HAVE_OPENSSL_SNI,1,[ Whether OpenSSL 
supports SNI ])
                ])
 
                TLSLIBRARY="$LIBCOURIERTLSOPENSSL"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/tcpd/tcpd.c new/courier-imap-5.1.4/libs/tcpd/tcpd.c
--- old/courier-imap-5.1.3/libs/tcpd/tcpd.c     2021-03-28 20:24:40.000000000 
+0200
+++ new/courier-imap-5.1.4/libs/tcpd/tcpd.c     2021-05-22 11:00:04.000000000 
+0200
@@ -1605,9 +1605,13 @@
        int found;
        unsigned char query_A[] = {RFC1035_TYPE_A, 0},
                query_A_and_TXT[] = {RFC1035_TYPE_A, RFC1035_TYPE_TXT, 0};
+       size_t l=strlen(nameptr);
 
-       hostname[0]=0;
-       strncat(hostname, nameptr, RFC1035_MAXNAMESIZE);
+       if (l > RFC1035_MAXNAMESIZE)
+               l=RFC1035_MAXNAMESIZE;
+
+       memcpy(hostname, nameptr, l);
+       hostname[l]=0;
 
        if (!varname)   varname="BLOCK";
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/libs/waitlib/confwait.c 
new/courier-imap-5.1.4/libs/waitlib/confwait.c
--- old/courier-imap-5.1.3/libs/waitlib/confwait.c      2013-08-25 
20:52:11.000000000 +0200
+++ new/courier-imap-5.1.4/libs/waitlib/confwait.c      2021-05-22 
11:00:04.000000000 +0200
@@ -14,6 +14,7 @@
 #endif
 #include       <stdio.h>
 #include       <signal.h>
+#include       <stdlib.h>
 
 #if    HAVE_UNISTD_H
 #include       <unistd.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/courier-imap-5.1.3/rpm.release new/courier-imap-5.1.4/rpm.release
--- old/courier-imap-5.1.3/rpm.release  2021-04-24 18:47:58.000000000 +0200
+++ new/courier-imap-5.1.4/rpm.release  2021-08-01 15:55:37.000000000 +0200
@@ -1,2 +1,2 @@
-VERSION=5.1.3
+VERSION=5.1.4
 RELEASE=1

Reply via email to