upgraded courier-imap to courier-imap-5.2.6

indimail · Dec 4, 2023 · 48a893f · 48a893f
1 parent 5fc8b2e
commit 48a893f
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 17 deletions.
diff --git a/courier-imap-x/conf-version b/courier-imap-x/conf-version
@@ -1 +1 @@
-5.2.5
+5.2.6
diff --git a/courier-imap-x/libs/imap/ChangeLog b/courier-imap-x/libs/imap/ChangeLog
@@ -1,3 +1,14 @@
+5.2.6
+
+2023-11-17  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* rfc822: use tm_gmtoff in preference over daylight, for determining
+	TZ offset.
+
+2023-11-09  Jaco Kroon <jaco@uls.co.za>
+
+	* pop3+imap: log stls=1 (pop3) and starttls=1 (imap) on LOGIN lines.
+
 5.2.5
 
 2023-08-16  Jaco Kroon <jaco@uls.co.za>

diff --git a/courier-imap-x/libs/imap/imapd.c b/courier-imap-x/libs/imap/imapd.c
@@ -6670,8 +6670,9 @@ static void chkdisabled(const char *ip, const char *port)
 	}
 	if (p1)
 		free(p1);
-	fprintf(stderr, "imapd: %d: INFO: LOGIN, user=%s, ip=[%s], port=[%s], protocol=%s\n",
-		getpid(), getenv("AUTHENTICATED"), ip, port, protocol);
+	fprintf(stderr, "imapd: %d: INFO: LOGIN, user=%s, ip=[%s], port=[%s], protocol=%s%s\n",
+		getpid(), getenv("AUTHENTICATED"), ip, port, protocol,
+		(p1=getenv("IMAP_TLS")) != 0 && atoi(p1) ? ", starttls=1" : "");
 }
 
 static int chk_clock_skew()

diff --git a/courier-imap-x/libs/imap/pop3dserver.c b/courier-imap-x/libs/imap/pop3dserver.c
@@ -1219,8 +1219,9 @@ uid_t  euid, uid;
 	} else
 	if (p)
 		free(p);
-	fprintf(stderr, "pop3d: %d: INFO: LOGIN, user=%s, ip=[%s], port=[%s], protocol=%s\n",
-		getpid(), authaddr, remoteip, remoteport, protocol);
+	fprintf(stderr, "pop3d: %d: INFO: LOGIN, user=%s, ip=[%s], port=[%s], protocol=%s%s\n",
+		getpid(), authaddr, remoteip, remoteport, protocol,
+					(p=getenv("POP3_TLS")) != 0 && atoi(p) ? ", stls=1" : "");
 	fflush(stderr);
 	msglist_cnt=0;
 	msglist_l=0;

diff --git a/courier-imap-x/libs/maildrop/alarm.C b/courier-imap-x/libs/maildrop/alarm.C
@@ -100,7 +100,8 @@ pid_t Alarm::wait_child(int *wstatus)
 	while (1)
 	{
 		int timeout=ring();
-		(void)read(Maildrop::sigchildfd[0], &buf, 1);
+		if (read(Maildrop::sigchildfd[0], &buf, 1) < 0)
+			;
 
 		ret=waitpid(-1, wstatus, WNOHANG);
 

diff --git a/courier-imap-x/libs/maildrop/maildir.C b/courier-imap-x/libs/maildrop/maildir.C
@@ -308,7 +308,7 @@ void	Maildir::MaildirSave()
 			dir.resize(q-p);
 
 #if EXPLICITDIRSYNC
-			int syncfd=open(dir, O_RDONLY);
+			int syncfd=open(dir.c_str(), O_RDONLY);
 
 			if (syncfd >= 0)
 			{

diff --git a/courier-imap-x/libs/maildrop/maildrop.C b/courier-imap-x/libs/maildrop/maildrop.C
@@ -29,7 +29,8 @@ static void sig_fpe(int)
 
 static void sig_chld(int)
 {
-	write(maildrop.sigchildfd[1], "", 1);
+	if (write(maildrop.sigchildfd[1], "", 1) < 0)
+		;
 }
 
 void Maildrop::cleanup()

diff --git a/courier-imap-x/libs/rfc2045/rfc2045acchk.c b/courier-imap-x/libs/rfc2045/rfc2045acchk.c
@@ -60,8 +60,9 @@ int	is8bitte;
 		if (p->mime_version
 
 			&& p->firstpart == 0 /* sam - don't trigger rewrites on changes to multipart headers */
+		    && !p->firstpart /* sam - don't trigger rewrites on changes to multipart headers */
+		    )
 
-			)
 		{
 			flag=1;
 		}

diff --git a/courier-imap-x/libs/rfc822/ChangeLog b/courier-imap-x/libs/rfc822/ChangeLog
@@ -1,3 +1,8 @@
+2023-11-17  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* rfc822: use tm_gmtoff in preference over daylight, for determining
+	TZ offset.
+
 2015-03-03  Sam Varshavchik  <mrsam@courier-mta.com>
 
 	* Replace rfc822_parsedt with rfc822_parsedate_chk(), returning

diff --git a/courier-imap-x/libs/rfc822/configure.ac b/courier-imap-x/libs/rfc822/configure.ac
@@ -77,24 +77,26 @@ if test "$librfc822_cv_SYS_TIMEZONE" = ""
 then
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include	<time.h>
-int n;
+
+extern struct tm dummy;
+long n;
 ]], [[
-	n=daylight;
-	]])],[librfc822_cv_SYS_TIMEZONE=daylight],[])
+	n=dummy.tm_gmtoff;
+	]])],[librfc822_cv_SYS_TIMEZONE=tm_gmtoff],[librfc822_cv_SYS_TIMEZONE=unknown])
 fi
+)
 
 if test "$librfc822_cv_SYS_TIMEZONE" = ""
 then
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include	<time.h>
 
 extern struct tm dummy;
-long n;
+int n;
 ]], [[
-	n=dummy.tm_gmtoff;
-	]])],[librfc822_cv_SYS_TIMEZONE=tm_gmtoff],[librfc822_cv_SYS_TIMEZONE=unknown])
+	n=daylight;
+	]])],[librfc822_cv_SYS_TIMEZONE=daylight],[])
 fi
-)
 
 case $librfc822_cv_SYS_TIMEZONE in
 tm_gmtoff)

diff --git a/indimail-access/doc/ChangeLog b/indimail-access/doc/ChangeLog
@@ -4,7 +4,9 @@ Release @version@-@release@ Start 28/11/2024 End --/--/----
 01. fetchmail version upgraded to 6.5.0-beta9
 - 03/12/2023
 02. fetchmail/odmr.c: Fixed communication between SMTP and ODMR port
-03. fetchmail/odmr.c: added more SMTP code for ODMR
+03. fetchmail/odmr.c: added more SMTP codes for ODMR
+04. upgraded courier-imap to 5.2.6
+05. upgraded maildrop to 3.1.6
 
 * Tue Nov 28 2023 11:04:28 +0000 Manvendra Bhangui <indimail-access@indimail.org> 1.1.1-1.1%{?dist}
 Release 1.1.1-1.1 Start 01/03/2021 End 28/11/2023
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,8 +60,9 @@ int is8bitte; @@
     		if (p->mime_version
     			&& p->firstpart == 0 /* sam - don't trigger rewrites on changes to multipart headers */
+    		    && !p->firstpart /* sam - don't trigger rewrites on changes to multipart headers */
+    		    )
-    			)
     		{
     			flag=1;
     		}
@@ Expand Down @@