updated courier-imap, maildrop

1. upgraded courier-imap to 5.2.7
2. upgraded maildrop to 3.1.7

courier-imap-x/Makefile.am

@@ -174,6 +174,9 @@ all-gmake-check:
 		echo "instead of make, as you were told by the INSTALL file (you did read the" ; \
 		echo "INSTALL file, did you?)" ; echo "" ; exit 1
 
+check-am:
+	cd libs/imap; $(MAKE) check-version TOPLEVEL_VERSION="`echo $(VERSION) | cut -d. -f1-3`"
+
 lockmail.html: libs/liblock/lockmail.html
 	cp -f $(srcdir)/libs/liblock/lockmail.html lockmail.html
 maildir.html: libs/maildir/maildir.html
@@ -274,7 +277,7 @@ htmldoc: INSTALL.html libs/imap/README.html $(MAILDROPHTML) \
 		xsltproc --nonet $(srcdir)/imap-format.xsl \
 			 $$f.tmp2 >$$f; \
 		rm -f $$f.tmp*; done
-	mv -f doc/*.html $(WWW)/imap
+	cp -f doc/*.html $(WWW)/imap
 	cp -f courier-imap.png bg.png $(WWW)/imap
 	cp manpage.css html
 	rm -rf doc

courier-imap-x/NEWS

@@ -2,8 +2,8 @@
 
    Contents of this NEWS file:
 
-     Introduction
-     Shared folders and access control lists
+   > Introduction
+   > Shared folders and access control lists
 
   Introduction
 
@@ -34,25 +34,26 @@
    supported. Here's a summary of the differences between the two shared
    folder mechanisms:
 
-      POSIX-based shared folders              ACL shared folders
-                                  May be used with virtual accounts only;
-     May be used with system      cannot be used on systems that have
-     accounts only^1              end-user login shell access: bypassing ACLs
-                                  and accessing the folders directly is
-                                  trivial
-     Access rights based on       Access rights based on IMAP access control
-     traditional POSIX filesystem lists
-     permissions
-     Sharable folders must be set A site-specific process must be installed
-     up manually, using the       to compile an index of all virtual
-     "maildirmake" command        mailboxes; afterwords, individual users may
-                                  create and manage shared folders themselves
-
-       ^1 This is because access rights are governed by filesystem
-       permissions. POSIX shared folders may also be used with virtual
-       accounts, but it will not be possible to grant read-only access to
-       shared folders, and everyone will be able to delete messages from
-       shared folders (instead of only the creator of each message)
+   >   POSIX-based shared folders                ACL shared folders
+   >                                 May be used with virtual accounts only;
+   > May be used with system         cannot be used on systems that have
+   > accounts only^1                 end-user login shell access: bypassing
+   >                                 ACLs and accessing the folders directly is
+   >                                 trivial
+   > Access rights based on          Access rights based on IMAP access control
+   > traditional POSIX filesystem    lists
+   > permissions
+   >                                 A site-specific process must be installed
+   > Sharable folders must be set up to compile an index of all virtual
+   > manually, using the             mailboxes; afterwords, individual users
+   > "maildirmake" command           may create and manage shared folders
+   >                                 themselves
+
+   >> ^1 This is because access rights are governed by filesystem
+   >> permissions. POSIX shared folders may also be used with virtual
+   >> accounts, but it will not be possible to grant read-only access to
+   >> shared folders, and everyone will be able to delete messages from
+   >> shared folders (instead of only the creator of each message)
 
    After installation, read the "maildiracl" manual page for a brief overview
    of access control lists.

courier-imap-x/NEWS.html

@@ -34,7 +34,7 @@ <h3><a name="intro" id="intro">Introduction</a></h3>
 
 <p>Courier-IMAP 4.0 brings many changes and improvements. All
 authentication-related code in Courier-IMAP has been moved into the external
-<a href="http://www.courier-mta.org/authlib/">Courier Authentication
+<a href="https://www.courier-mta.org/authlib/">Courier Authentication
 Library</a>. See the contents of the <a href="INSTALL.html">INSTALL</a> file
 for more information. Courier-IMAP now includes an IMAP/POP3 aggregation
 proxy, like Perdition. See the "imap/README.proxy" file in the source

courier-imap-x/conf-version

@@ -1 +1 @@
-5.2.6
+5.2.7

courier-imap-x/libs/imap/ChangeLog

@@ -1,3 +1,27 @@
+5.2.7
+
+2024-06-14  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* tcpd: support per-local port custom -haproxy configuration.
+	Multiple updates to the couriertcpd man page, updated documentation
+	for ipv6 and CIDR support.
+
+2024-06-10  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* tcpd: remove -noidentlookup, implement -haproxy
+
+2024-05-31  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* couriertcpd: set the IP_FREEBIND option on all listening sockets.
+
+2024-04-06  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* courier-imap.spec.in: Packaging fixes.
+
+2023-12-23  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* Update rpm spec to match updated courier-authlib packaging.
+
 5.2.6
 
 2023-11-17  Sam Varshavchik  <mrsam@courier-mta.com>

courier-imap-x/libs/imap/Makefile.am

@@ -234,3 +234,10 @@ testsuite-imap:
 
 testsuite-smap:
 	@LC_ALL=C; export LC_ALL; test "@smap@" = "yes" || exit 0; @SHELL@ $(srcdir)/smaptestsuite | ./testsuitefix.pl | sort
+
+testsuite-pop3:
+	@LC_ALL=C @SHELL@ pop3testsuite | sed 's/^--=_.*/--mimeboundary/;s/ENOMEM.*/ENOMEM/;s/boundary=.*/boundary=/'
+
+check-version:
+	test "$(VERSION)" = "$(TOPLEVEL_VERSION)" && exit 0; \
+		echo "Makefile.am version mismatch"; exit 1

courier-imap-x/libs/imap/imapd.dist.in

@@ -66,12 +66,15 @@ MAXPERIP=4
 
 PIDFILE=@piddir@/imapd.pid
 
-##NAME: TCPDOPTS:0
+##NAME: TCPDOPTS:1
 #
-# Miscellaneous couriertcpd options that shouldn't be changed.
+# Other couriertcpd(1) options.  The following defaults should be fine.
 #
+# See the couriertcpd(1) manual page for a list of other options. Namely:
+# -haproxy enables HAProxy version 1 support, see the manual page for more
+# information.
 
-TCPDOPTS="-nodnslookup -noidentlookup"
+TCPDOPTS="-nodnslookup"
 
 ##NAME: ACCESSFILE:0
 #

courier-imap-x/libs/imap/pop3d.dist.in

@@ -104,12 +104,15 @@ ADDRESS=0
 #  AUTHSERVICE110=pop3
 #  AUTHSERVICE995=pop3s
 
-##NAME: TCPDOPTS:0
+##NAME: TCPDOPTS:1
 #
 # Other couriertcpd(1) options.  The following defaults should be fine.
 #
+# See the couriertcpd(1) manual page for a list of other options. Namely:
+# -haproxy enables HAProxy version 1 support, see the manual page for more
+# information.
 
-TCPDOPTS="-nodnslookup -noidentlookup"
+TCPDOPTS="-nodnslookup"
 
 ##NAME: LOGGEROPTS:0
 #

courier-imap-x/libs/maildir/maildir.5

@@ -4,12 +4,12 @@
 .\"     Title: maildir
 .\"    Author: Sam Varshavchik
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/16/2019
+.\"      Date: 06/14/2024
 .\"    Manual: Double Precision, Inc.
 .\"    Source: Courier Mail Server
 .\"  Language: English
 .\"
-.TH "MAILDIR" "5" "11/16/2019" "Courier Mail Server" "Double Precision, Inc\&."
+.TH "MAILDIR" "5" "06/14/2024" "Courier Mail Server" "Double Precision, Inc\&."
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -292,7 +292,7 @@ Author
 .IP " 2." 4
 Courier
 .RS 4
-\%http://www.courier-mta.org
+\%https://www.courier-mta.org
 .RE
 .IP " 3." 4
 \fBdeliverquota\fR(8)

courier-imap-x/libs/maildir/maildir.html

@@ -164,7 +164,7 @@
 call);
 and <span class="quote">“<span class="quote">cnt</span>”</span> is the message's size, in bytes.</p><p>
 The <span class="quote">“<span class="quote">,S=<em class="replaceable"><code>cnt</code></em></span>”</span>
-part optimizes the <a class="ulink" href="http://www.courier-mta.org" target="_top" shape="rect"><span class="application">Courier</span></a> mail server's
+part optimizes the <a class="ulink" href="https://www.courier-mta.org" target="_top" shape="rect"><span class="application">Courier</span></a> mail server's
 maildir quota enhancement; it allows the size of all the mail stored in
 the maildir to be added up without issuing the
 <span class="citerefentry"><span class="refentrytitle">stat</span>(2)</span>

courier-imap-x/libs/maildir/maildirkw.1

@@ -4,12 +4,12 @@
 .\"     Title: maildirkw
 .\"    Author: Sam Varshavchik
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/04/2020
+.\"      Date: 06/14/2024
 .\"    Manual: Double Precision, Inc.
 .\"    Source: Courier Mail Server
 .\"  Language: English
 .\"
-.TH "MAILDIRKW" "1" "11/04/2020" "Courier Mail Server" "Double Precision, Inc\&."
+.TH "MAILDIRKW" "1" "06/14/2024" "Courier Mail Server" "Double Precision, Inc\&."
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -97,7 +97,7 @@ Author
 .IP " 1." 4
 SMAP1
 .RS 4
-\%http://www.courier-mta.org/cone/smap1.html
+\%https://www.courier-mta.org/cone/smap1.html
 .RE
 .IP " 2." 4
 \fBmaildiracl\fR(1)

courier-imap-x/libs/maildir/maildirkw.html

@@ -39,7 +39,7 @@
 <code class="option">-c</code> enables case-sensitive keywords.
 IMAP keywords are normally case insensitive.
 <code class="option">-c</code> needs to be used if the
-<a class="ulink" href="http://www.courier-mta.org/cone/smap1.html" target="_top" shape="rect">SMAP1</a>
+<a class="ulink" href="https://www.courier-mta.org/cone/smap1.html" target="_top" shape="rect">SMAP1</a>
 protocol extension is used, which uses case sensitive keywords.</p></div><div class="refsect1"><a id="maildirkw_see_also" shape="rect"> </a><h2>SEE ALSO</h2><p>
 <a class="ulink" href="maildiracl.html" target="_top" shape="rect"><span class="citerefentry"><span class="refentrytitle">maildiracl</span>(1)</span></a>,
 <a class="ulink" href="maildirmake.html" target="_top" shape="rect"><span class="citerefentry"><span class="refentrytitle">maildirmake</span>(1)</span></a>.</p></div></div></body></html>