[pkgsrc/trunk]: pkgsrc/mail/courier-mta Update mail/courier-mta to version 0....

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail/courier-mta Update mail/courier-mta to version 0....
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:48:31 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c6e12ce9ac98
branches:  trunk
changeset: 538806:c6e12ce9ac98
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Feb 19 18:45:23 2008 +0000

description:
Update mail/courier-mta to version 0.58.0.  Changes from version 0.57.1
include:

+ Add full DESTDIR support.

+ Don't create empty, unused directories under
  ${PREFIX}/share/examples/courier.

+ Teach mkesmtpdcert generate certificates and keys using the either
  GNUTLS or OpenSSL tools.

* Fix a memory stomp in local delivery agent.

* Get rid of the hard 30 minute timeout in sendmail(8).

* Rewrite input processing for submit(8) process to use non-blocking
  I/O to read standard input. When the message source is local (or
  dsn), get rid of the hard 30 minute timeout, and poll stdin with a
  5 minute poll() timeout, at which point the timestamps on all open
  control and data files are pinged, to keep courierd from purging
  them based on their old timestamp.  Continue to use a hard timeout
  for all non-local mail.

diffstat:

 mail/courier-mta/Makefile                   |  29 ++++++++++++++----------
 mail/courier-mta/Makefile.common            |   4 +-
 mail/courier-mta/distinfo                   |  23 +++++++++++--------
 mail/courier-mta/files/courierd.sh          |   4 +-
 mail/courier-mta/files/courieresmtp.sh      |  18 ++++++++++++++-
 mail/courier-mta/files/courieresmtpmsa.sh   |  18 ++++++++++++++-
 mail/courier-mta/files/courieresmtps.sh     |  18 ++++++++++++++-
 mail/courier-mta/files/courierfilter.sh     |   4 ++-
 mail/courier-mta/files/courierldapaliasd.sh |   3 +-
 mail/courier-mta/files/webmlm.sh            |   8 ++++++-
 mail/courier-mta/options.mk                 |  33 ++++++++++++++++++++++++----
 mail/courier-mta/patches/patch-aa           |  14 ++++++++---
 mail/courier-mta/patches/patch-ab           |   6 ++--
 mail/courier-mta/patches/patch-ac           |  12 +++++-----
 mail/courier-mta/patches/patch-ad           |  21 ++++++++++++++++-
 mail/courier-mta/patches/patch-ag           |  28 ++++++++++++++++++++++++
 mail/courier-mta/patches/patch-ai           |  33 ++--------------------------
 mail/courier-mta/patches/patch-aj           |  22 +++++++++---------
 mail/courier-mta/patches/patch-ax           |  22 +++++++++++++++++++
 mail/courier-mta/patches/patch-ay           |  14 ++++++++++++
 20 files changed, 240 insertions(+), 94 deletions(-)

diffs (truncated from 671 to 300 lines):

diff -r 224bfc019d92 -r c6e12ce9ac98 mail/courier-mta/Makefile
--- a/mail/courier-mta/Makefile Tue Feb 19 18:45:18 2008 +0000
+++ b/mail/courier-mta/Makefile Tue Feb 19 18:45:23 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2007/10/17 13:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2008/02/19 18:45:23 jlam Exp $
 
 DISTNAME=      courier-${COURIER_VERSION}
 PKGNAME=       ${DISTNAME:S/-/-mta-/}
-PKGREVISION=   1
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -15,9 +14,10 @@
 
 DEPENDS+=      courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
 DEPENDS+=      couriertcpd>=${COURIER_VERSION}:../../net/couriertcpd
-DEPENDS+=      maildrop>=2.0.4nb2:../../mail/maildrop
+DEPENDS+=      maildrop>=2.0.4nb3:../../mail/maildrop
 
-USE_TOOLS+=            gmake openssl:run perl:run
+PKG_DESTDIR_SUPPORT=   user-destdir
+USE_TOOLS+=            gmake perl:run
 USE_LANGUAGES=         c c++
 GCC_REQD+=             3.0     # need Standard C++ Library
 
@@ -30,8 +30,9 @@
 
 USERGROUP_PHASE=       configure
 
-CONFIGURE_ENV+=                OPENSSL=${TOOLS_OPENSSL:Q}
-CONFIGURE_ENV+=                PROCMAIL=${LOCALBASE:Q}/bin/procmail
+CONFIGURE_ENV+=                CERTTOOL=${COURIER_CERTTOOL:Q}
+CONFIGURE_ENV+=                OPENSSL=${COURIER_OPENSSL:Q}
+CONFIGURE_ENV+=                PROCMAIL=${PREFIX:Q}/bin/procmail
 
 CONFIGURE_ARGS+=       --datadir=${DATADIR:Q}
 CONFIGURE_ARGS+=       --with-mailuid=${PKG_UID.${COURIER_USER}}
@@ -59,11 +60,12 @@
                        courier/filters/courierfilter.html.in           \
                        courier/module.esmtp/esmtpd-msa.dist.in         \
                        courier/module.esmtp/esmtpd-ssl.dist.in         \
-                       courier/module.esmtp/esmtpd.cnf.in              \
+                       courier/module.esmtp/esmtpd.cnf.openssl.in      \
                        courier/module.esmtp/esmtpd.dist.in             \
                        courier/module.esmtp/mkesmtpdcert.in
 SUBST_SED.courier=     -e "s|^ESMTPDSTART=.*|ESMTPDSTART=YES|g"        \
                        -e "s|^ESMTPDSSLSTART=.*|ESMTPDSSLSTART=YES|g"  \
+                       -e "s|@mydatadir@|@sysconfdir@|g"               \
                        -e "s|@datadir@/esmtpd.pem|@sysconfdir@/esmtpd.pem|g" \
                        -e "s|@datadir@/esmtpd.rand|@sysconfdir@/esmtpd.rand|g" \
                        -e "s|@libexecdir@/filters|@libexecdir@/courier/filters|g"
@@ -78,7 +80,7 @@
 
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     ${WRKDIR}/mailer.conf
-SUBST_SED.paths+=      -e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.paths+=      -e "s,@PREFIX@,${PREFIX:Q},g"
 SUBST_STAGE.paths=     post-patch
 
 REPLACE_PERL+= courier/webadmin/*.pl courier/webadmin/*.pl.in webadmin/*.pl
@@ -96,9 +98,12 @@
        cd ${WRKSRC}/courier && \
                ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install-permissions
        ${CHOWN} ${COURIER_USER}:${COURIER_GROUP} \
-               ${DATADIR}/filterctl ${PREFIX}/sbin/courierfilter
-       ${CHMOD} 0500 ${DATADIR}/filterctl ${PREFIX}/sbin/courierfilter
-       ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR}
-       ${INSTALL_DATA} ${WRKDIR}/locallowercase ${EGDIR}/locallowercase
+               ${DESTDIR}${DATADIR}/filterctl \
+               ${DESTDIR}${PREFIX}/sbin/courierfilter
+       ${CHMOD} 0500 ${DESTDIR}${DATADIR}/filterctl \
+               ${DESTDIR}${PREFIX}/sbin/courierfilter
+       ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${DESTDIR}${EGDIR}
+       ${INSTALL_DATA} ${WRKDIR}/locallowercase \
+               ${DESTDIR}${EGDIR}/locallowercase
 
 .include "../../mk/bsd.pkg.mk"
diff -r 224bfc019d92 -r c6e12ce9ac98 mail/courier-mta/Makefile.common
--- a/mail/courier-mta/Makefile.common  Tue Feb 19 18:45:18 2008 +0000
+++ b/mail/courier-mta/Makefile.common  Tue Feb 19 18:45:23 2008 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.8 2007/10/31 14:22:55 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2008/02/19 18:45:23 jlam Exp $
 
-COURIER_VERSION=       0.57.1
+COURIER_VERSION=       0.58.0
 #LICENSE=              gnu-gpl-v3
 
 .include "../../mk/bsd.prefs.mk"
diff -r 224bfc019d92 -r c6e12ce9ac98 mail/courier-mta/distinfo
--- a/mail/courier-mta/distinfo Tue Feb 19 18:45:18 2008 +0000
+++ b/mail/courier-mta/distinfo Tue Feb 19 18:45:23 2008 +0000
@@ -1,16 +1,19 @@
-$NetBSD: distinfo,v 1.10 2007/10/17 13:50:30 jlam Exp $
+$NetBSD: distinfo,v 1.11 2008/02/19 18:45:23 jlam Exp $
 
-SHA1 (courier-0.57.1.tar.bz2) = 5e602d4a4d5dd33b17146c7f54467ac6352e9340
-RMD160 (courier-0.57.1.tar.bz2) = 28b9f409e281403280b69f3a4f4be8b9e4f74dc2
-Size (courier-0.57.1.tar.bz2) = 7098660 bytes
-SHA1 (patch-aa) = 10e3bc04883578ea235d9631ee72ead707f92a68
-SHA1 (patch-ab) = e01fd7a1b3993b849c2495874f61c68a89384f9d
-SHA1 (patch-ac) = 7790248b02a333e11f1429c88e7428b7e0fedb8d
-SHA1 (patch-ad) = 0899aea066310909e4595974e5df69980a4db5d2
+SHA1 (courier-0.58.0.tar.bz2) = 964d81e6de5390678c9f10dddbc176273b925f6d
+RMD160 (courier-0.58.0.tar.bz2) = 940fb7967d154aeeb462691beb508155b3df4e29
+Size (courier-0.58.0.tar.bz2) = 7123136 bytes
+SHA1 (patch-aa) = 3f5465bd153d51f1dd6ed2f7849c098957afec2e
+SHA1 (patch-ab) = 6b46f55cafc63611d841e03dbe53c9f0b6731920
+SHA1 (patch-ac) = 3db182c84827d53af35ea45b7296b98ecf0579d8
+SHA1 (patch-ad) = faa1d2f21f55550efa631c25435fefee5b235bf2
 SHA1 (patch-ae) = e52ab2f6a4e253dc4a28291db6744ea2593f2fc3
 SHA1 (patch-af) = a3bcc672fc05e05497d7408c1a96ad52226aee01
+SHA1 (patch-ag) = 1bedd756d9932365896da82704941cdbc06e1dfd
 SHA1 (patch-ah) = 78e0db8d5319d985d7e8aec4c1240561fead3a00
-SHA1 (patch-ai) = a66ce54eb2bc9ecb9905588a7bf5e3423ac57214
-SHA1 (patch-aj) = 5e3bcd5c8b0186dd048807deb6603102d05f1303
+SHA1 (patch-ai) = 1337870d95bb46882980553ffba6ec6956bc9147
+SHA1 (patch-aj) = cf666ac5c05e9fb5aef9c23d534edefa745ab547
 SHA1 (patch-al) = 1c7935b46b7affafa86e4a858ba6a79b7fbebbc5
 SHA1 (patch-an) = 1c78baf7fc393b013c47745b914571aff94f1497
+SHA1 (patch-ax) = ed01509d1868b92e80ec98e320ac285345584e31
+SHA1 (patch-ay) = 499f46a7116da4f7adfa6e7c2d7e4e4856174a9f
diff -r 224bfc019d92 -r c6e12ce9ac98 mail/courier-mta/files/courierd.sh
--- a/mail/courier-mta/files/courierd.sh        Tue Feb 19 18:45:18 2008 +0000
+++ b/mail/courier-mta/files/courierd.sh        Tue Feb 19 18:45:23 2008 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierd.sh,v 1.4 2007/08/10 17:57:04 jlam Exp $
+# $NetBSD: courierd.sh,v 1.5 2008/02/19 18:45:24 jlam Exp $
 #
 # Courier core processes 
 #
@@ -36,7 +36,7 @@
                        @COURIER_USER@ @COURIER_GROUP@ 0750
        mkdir_perms @COURIER_STATEDIR@/msgs \
                        @COURIER_USER@ @COURIER_GROUP@ 0750
-       mkdir_perms @COURIER_STATEDIR@/tmp\
+       mkdir_perms @COURIER_STATEDIR@/tmp \
                        @COURIER_USER@ @COURIER_GROUP@ 0770
        mkdir_perms @COURIER_STATEDIR@/track \
                        @COURIER_USER@ @COURIER_GROUP@ 0755
diff -r 224bfc019d92 -r c6e12ce9ac98 mail/courier-mta/files/courieresmtp.sh
--- a/mail/courier-mta/files/courieresmtp.sh    Tue Feb 19 18:45:18 2008 +0000
+++ b/mail/courier-mta/files/courieresmtp.sh    Tue Feb 19 18:45:23 2008 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courieresmtp.sh,v 1.4 2007/09/22 04:42:03 jlam Exp $
+# $NetBSD: courieresmtp.sh,v 1.5 2008/02/19 18:45:24 jlam Exp $
 #
 # Courier ESMTP services daemon
 #
@@ -17,9 +17,25 @@
 pidfile="@COURIER_STATEDIR@/tmp/esmtp.pid"
 required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-ssl"
 
+start_precmd="${name}_prestart"
 start_cmd="${name}_doit start"
 stop_cmd="${name}_doit stop"
 
+mkdir_perms()
+{
+       dir="$1"; user="$2"; group="$3"; mode="$4"
+       @TEST@ -d $dir || @MKDIR@ $dir
+       @CHOWN@ $user $dir
+       @CHGRP@ $group $dir
+       @CHMOD@ $mode $dir
+}
+
+courieresmtp_prestart()
+{
+       mkdir_perms @COURIER_STATEDIR@/tmp \
+               @COURIER_USER@ @COURIER_GROUP@ 0770
+}
+
 courieresmtp_doit()
 {
        action=$1
diff -r 224bfc019d92 -r c6e12ce9ac98 mail/courier-mta/files/courieresmtpmsa.sh
--- a/mail/courier-mta/files/courieresmtpmsa.sh Tue Feb 19 18:45:18 2008 +0000
+++ b/mail/courier-mta/files/courieresmtpmsa.sh Tue Feb 19 18:45:23 2008 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courieresmtpmsa.sh,v 1.4 2007/09/22 04:42:03 jlam Exp $
+# $NetBSD: courieresmtpmsa.sh,v 1.5 2008/02/19 18:45:24 jlam Exp $
 #
 # Courier ESMTP-MSA (RFC 2476) services daemon
 #
@@ -17,9 +17,25 @@
 pidfile="@COURIER_STATEDIR@/tmp/esmtpd-msa.pid"
 required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-msa"
 
+start_precmd="${name}_prestart"
 start_cmd="${name}_doit start"
 stop_cmd="${name}_doit stop"
 
+mkdir_perms()
+{
+       dir="$1"; user="$2"; group="$3"; mode="$4"
+       @TEST@ -d $dir || @MKDIR@ $dir
+       @CHOWN@ $user $dir
+       @CHGRP@ $group $dir
+       @CHMOD@ $mode $dir
+}
+
+courieresmtpmsa_prestart()
+{
+       mkdir_perms @COURIER_STATEDIR@/tmp \
+               @COURIER_USER@ @COURIER_GROUP@ 0770
+}
+
 courieresmtpmsa_doit()
 {
        action=$1
diff -r 224bfc019d92 -r c6e12ce9ac98 mail/courier-mta/files/courieresmtps.sh
--- a/mail/courier-mta/files/courieresmtps.sh   Tue Feb 19 18:45:18 2008 +0000
+++ b/mail/courier-mta/files/courieresmtps.sh   Tue Feb 19 18:45:23 2008 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courieresmtps.sh,v 1.5 2007/09/22 04:42:03 jlam Exp $
+# $NetBSD: courieresmtps.sh,v 1.6 2008/02/19 18:45:24 jlam Exp $
 #
 # Courier ESMTP/SSL services daemon
 #
@@ -17,9 +17,25 @@
 pidfile="@COURIER_STATEDIR@/tmp/esmtpd-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-ssl"
 
+start_precmd="${name}_prestart"
 start_cmd="${name}_doit start"
 stop_cmd="${name}_doit stop"
 
+mkdir_perms()
+{
+       dir="$1"; user="$2"; group="$3"; mode="$4"
+       @TEST@ -d $dir || @MKDIR@ $dir
+       @CHOWN@ $user $dir
+       @CHGRP@ $group $dir
+       @CHMOD@ $mode $dir
+}
+
+courieresmtps_prestart()
+{
+       mkdir_perms @COURIER_STATEDIR@/tmp \
+               @COURIER_USER@ @COURIER_GROUP@ 0770
+}
+
 courieresmtps_doit()
 {
        action=$1
diff -r 224bfc019d92 -r c6e12ce9ac98 mail/courier-mta/files/courierfilter.sh
--- a/mail/courier-mta/files/courierfilter.sh   Tue Feb 19 18:45:18 2008 +0000
+++ b/mail/courier-mta/files/courierfilter.sh   Tue Feb 19 18:45:23 2008 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierfilter.sh,v 1.5 2007/09/22 04:42:03 jlam Exp $
+# $NetBSD: courierfilter.sh,v 1.6 2008/02/19 18:45:24 jlam Exp $
 #
 # Courier mail filter daemon
 #
@@ -40,6 +40,8 @@
                        @COURIER_USER@ @COURIER_GROUP@ 0750
        mkdir_perms @PKG_SYSCONFDIR@/filters/active \
                        @COURIER_USER@ @COURIER_GROUP@ 0750
+       mkdir_perms @COURIER_STATEDIR@/tmp \
+                       @COURIER_USER@ @COURIER_GROUP@ 0770
 }
 
 courierfilter_doit()
diff -r 224bfc019d92 -r c6e12ce9ac98 mail/courier-mta/files/courierldapaliasd.sh
--- a/mail/courier-mta/files/courierldapaliasd.sh       Tue Feb 19 18:45:18 2008 +0000
+++ b/mail/courier-mta/files/courierldapaliasd.sh       Tue Feb 19 18:45:23 2008 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierldapaliasd.sh,v 1.4 2007/08/10 17:57:04 jlam Exp $
+# $NetBSD: courierldapaliasd.sh,v 1.5 2008/02/19 18:45:24 jlam Exp $
 #
 # Courier LDAP mail aliasing daemon
 #
@@ -32,7 +32,6 @@
 
 courierldapaliasd_prestart()
 {
-       @MKDIR@ @COURIER_STATEDIR@
        mkdir_perms @COURIER_STATEDIR@/tmp \
                        @COURIER_USER@ @COURIER_GROUP@ 0770
 }
diff -r 224bfc019d92 -r c6e12ce9ac98 mail/courier-mta/files/webmlm.sh
--- a/mail/courier-mta/files/webmlm.sh  Tue Feb 19 18:45:18 2008 +0000
+++ b/mail/courier-mta/files/webmlm.sh  Tue Feb 19 18:45:23 2008 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: webmlm.sh,v 1.3 2007/09/22 05:07:49 jlam Exp $
Prev by Date: [pkgsrc/trunk]: pkgsrc/mail/maildrop + Update to latest courier-maildir depen...
Next by Date: [pkgsrc/trunk]: pkgsrc/net/couriertcpd Update net/couriertcpd to version 0.58...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mail/maildrop + Update to latest courier-maildir depen...
Next by Thread: [pkgsrc/trunk]: pkgsrc/net/couriertcpd Update net/couriertcpd to version 0.58...
Indexes:
Home | Main Index | Thread Index | Old Index