[pkgsrc/trunk]: pkgsrc courier-0.65.0 et al:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc courier-0.65.0 et al:
From: pettai <pettai%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 09:32:00 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/637d7dd6c15e
branches:  trunk
changeset: 576657:637d7dd6c15e
user:      pettai <pettai%pkgsrc.org@localhost>
date:      Tue Jun 15 23:01:23 2010 +0000

description:
courier-0.65.0 et al:

* gpglib/list.c: Handle GnuPG 2 --with-colons output format changes.
* gpglib/mimegpgfork.c: GnuPG 2 wants --batch when specifying passphrase-fd.
* tcpd/configure.in: Check if explicit linking with libgpg-error is required.
* tcpd/libcouriergnutls.c (tls_connect): Fix bad call to
  gnutls_server_name_set(). Affects Courier compiled with GnuTLS support.
* maildrop/mailbot.c (main): Set close-on-exec bit on opened files.
* courier/doc/courier.sgml: Move the SPF section to a separate refsect2
  to work around misformatting by the manpage stylesheet.
* rfc2045/rfc2045reply.c (mkreply): Fix sender's name in the reply salutation.
* html/en-us/newmsg.html: Ditto.
* rfc2045/reformime.sgml: Document the -c option to reformime.
* imapd.c (main): Fix typo in alert message.
* Big quota patch (with some changes).

(See the Changelog(s) for previous releases)

Based on patch(es) from PR pkg/42989 by Brian Candler.

diffstat:

 mail/courier-maildir/distinfo     |   8 ++++----
 mail/courier-mta/Makefile         |   7 +++----
 mail/courier-mta/Makefile.common  |   4 ++--
 mail/courier-mta/distinfo         |  27 +++++++++++++--------------
 mail/courier-mta/patches/patch-aa |  17 ++++++++---------
 mail/courier-mta/patches/patch-ab |  17 ++---------------
 mail/courier-mta/patches/patch-ac |  17 +++++++++--------
 mail/courier-mta/patches/patch-ad |   6 +++---
 mail/courier-mta/patches/patch-af |   4 ++--
 mail/courier-mta/patches/patch-ah |   6 +++---
 mail/courier-mta/patches/patch-an |  10 +++++-----
 mail/courier-mta/patches/patch-ax |   4 ++--
 mail/courier-mta/patches/patch-ay |   4 ++--
 mail/courier-mta/patches/patch-az |  18 ------------------
 meta-pkgs/courier/Makefile        |  12 ++++++------
 net/couriertcpd/Makefile          |   3 +--
 net/couriertcpd/distinfo          |   8 ++++----
 17 files changed, 69 insertions(+), 103 deletions(-)

diffs (truncated from 452 to 300 lines):

diff -r c1891590ec8a -r 637d7dd6c15e mail/courier-maildir/distinfo
--- a/mail/courier-maildir/distinfo     Tue Jun 15 22:19:15 2010 +0000
+++ b/mail/courier-maildir/distinfo     Tue Jun 15 23:01:23 2010 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2008/02/19 18:45:18 jlam Exp $
+$NetBSD: distinfo,v 1.13 2010/06/15 23:01:23 pettai Exp $
 
-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 (courier-0.65.0.tar.bz2) = 4e5b7e64a35fe886a59621bc87e7f111428f19bc
+RMD160 (courier-0.65.0.tar.bz2) = e5fc4742da27b3b97bd2592ad3ecc96618abada3
+Size (courier-0.65.0.tar.bz2) = 7099997 bytes
diff -r c1891590ec8a -r 637d7dd6c15e mail/courier-mta/Makefile
--- a/mail/courier-mta/Makefile Tue Jun 15 22:19:15 2010 +0000
+++ b/mail/courier-mta/Makefile Tue Jun 15 23:01:23 2010 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2010/03/21 16:29:40 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/15 23:01:23 pettai Exp $
 
 DISTNAME=      courier-${COURIER_VERSION}
 PKGNAME=       ${DISTNAME:S/-/-mta-/}
-PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -15,7 +14,7 @@
 
 DEPENDS+=      courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
 DEPENDS+=      couriertcpd>=${COURIER_VERSION}:../../net/couriertcpd
-DEPENDS+=      maildrop>=2.0.4nb3:../../mail/maildrop
+DEPENDS+=      maildrop>=2.5.0:../../mail/maildrop
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 USE_TOOLS+=            gmake perl:run
@@ -45,7 +44,7 @@
 CONFIGURE_ARGS+=       --with-paranoid-smtpext
 CONFIGURE_ARGS+=       --with-piddir=${COURIER_STATEDIR:Q}/tmp
 CONFIGURE_ARGS+=       --with-transport=${COURIER_TRANSPORTS:M*:Q}
-CONFIGURE_ARGS+=       --without-certdb
+#CONFIGURE_ARGS+=      --with-certdb=${SSLCERTS}
 
 # This argument is actually here just to make the "webmail" configure
 # script work.  The value is not actually used since in reality, we are
diff -r c1891590ec8a -r 637d7dd6c15e mail/courier-mta/Makefile.common
--- a/mail/courier-mta/Makefile.common  Tue Jun 15 22:19:15 2010 +0000
+++ b/mail/courier-mta/Makefile.common  Tue Jun 15 23:01:23 2010 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.10 2009/05/19 08:59:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.11 2010/06/15 23:01:23 pettai Exp $
 
-COURIER_VERSION=       0.58.0
+COURIER_VERSION=       0.65.0
 LICENSE=               gnu-gpl-v3
 
 .include "../../mk/bsd.prefs.mk"
diff -r c1891590ec8a -r 637d7dd6c15e mail/courier-mta/distinfo
--- a/mail/courier-mta/distinfo Tue Jun 15 22:19:15 2010 +0000
+++ b/mail/courier-mta/distinfo Tue Jun 15 23:01:23 2010 +0000
@@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.12 2010/01/09 22:16:20 heinz Exp $
+$NetBSD: distinfo,v 1.13 2010/06/15 23:01:23 pettai Exp $
 
-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) = 133f2b48bdff76568b89e51908734a7e29cf9e03
-SHA1 (patch-ac) = 3db182c84827d53af35ea45b7296b98ecf0579d8
-SHA1 (patch-ad) = faa1d2f21f55550efa631c25435fefee5b235bf2
+SHA1 (courier-0.65.0.tar.bz2) = 4e5b7e64a35fe886a59621bc87e7f111428f19bc
+RMD160 (courier-0.65.0.tar.bz2) = e5fc4742da27b3b97bd2592ad3ecc96618abada3
+Size (courier-0.65.0.tar.bz2) = 7099997 bytes
+SHA1 (patch-aa) = eaf5ade8fb49254aeeb66a3dc07368d1559d62e8
+SHA1 (patch-ab) = 0152fc7e178cd6634142e05606b5cfa66bfa163d
+SHA1 (patch-ac) = 78ce4535d6a0d88d00cf0199c879786cde0eb1c1
+SHA1 (patch-ad) = a93db864d07813fe80f6345528ec0ae472fde0a7
 SHA1 (patch-ae) = e52ab2f6a4e253dc4a28291db6744ea2593f2fc3
-SHA1 (patch-af) = a3bcc672fc05e05497d7408c1a96ad52226aee01
+SHA1 (patch-af) = 17afc29c101568e87d941a1f87860523d02b5ac9
 SHA1 (patch-ag) = 1bedd756d9932365896da82704941cdbc06e1dfd
-SHA1 (patch-ah) = 78e0db8d5319d985d7e8aec4c1240561fead3a00
+SHA1 (patch-ah) = d3ee8e92a2927d25f77791db6468b17e6d0e0cf0
 SHA1 (patch-ai) = 1337870d95bb46882980553ffba6ec6956bc9147
 SHA1 (patch-aj) = cf666ac5c05e9fb5aef9c23d534edefa745ab547
 SHA1 (patch-al) = 1c7935b46b7affafa86e4a858ba6a79b7fbebbc5
-SHA1 (patch-an) = 1c78baf7fc393b013c47745b914571aff94f1497
-SHA1 (patch-ax) = ed01509d1868b92e80ec98e320ac285345584e31
-SHA1 (patch-ay) = 499f46a7116da4f7adfa6e7c2d7e4e4856174a9f
-SHA1 (patch-az) = fbe1667536989486e62ecdb50a74cb3c38e3fb0d
+SHA1 (patch-an) = 972f23b312fdd2895a319f1549ba3563e92f8f3a
+SHA1 (patch-ax) = cd7fc4f373e83c1d6777103dc075455f98d24f51
+SHA1 (patch-ay) = d4b391e76167cd27012f928587d5feb57ea1b4ff
diff -r c1891590ec8a -r 637d7dd6c15e mail/courier-mta/patches/patch-aa
--- a/mail/courier-mta/patches/patch-aa Tue Jun 15 22:19:15 2010 +0000
+++ b/mail/courier-mta/patches/patch-aa Tue Jun 15 23:01:23 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2010/06/15 23:01:23 pettai Exp $
 
 --- courier/Makefile.in.orig   2007-11-23 22:26:43.000000000 -0500
 +++ courier/Makefile.in
-@@ -46,16 +46,16 @@ build_triplet = @build@
+@@ -47,16 +47,16 @@ build_triplet = @build@
  host_triplet = @host@
  target_triplet = @target@
  pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \
@@ -24,16 +24,15 @@
        @EXTRASBIN@ $(am__empty)
  cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@
  subdir = .
-@@ -433,7 +433,7 @@ BUILT_SOURCES = prefix.h exec_prefix.h s
+@@ -477,29 +477,26 @@ BUILT_SOURCES = prefix.h exec_prefix.h s
        uidgid.h configargs.h sort.h webmlmdhandlerslist.H
  RFCERRTXTIN = rfcerrheader.txt
  RFCERRTXTNOIN = rfcerr2045.txt rfcerr2046.txt rfcerr2047.txt
 -extrapkglib = makedatprog courierpop3login pcpd
 +extrapkglib = 
- pkglibexecdir = $(libexecdir)/courier
  webmaildir = $(libexecdir)/courier/webmail
  webmail_SOURCES = 
-@@ -441,22 +441,19 @@ sqwebmaild_SOURCES = 
+ sqwebmaild_SOURCES = 
  
  # Don't forget to change perms.sh.in, if webmailimagedir moves.
  webmailimagedir = $(datadir)/sqwebmail/images
@@ -62,7 +61,7 @@
  
  mlmdatadir = $(datadir)/couriermlm
  mlmdata_DATA = \
-@@ -512,7 +509,7 @@ mlmdata_DATA = \
+@@ -555,7 +552,7 @@ mlmdata_DATA = \
        webmlmsublist.tmpl.html \
        webmlm.tmpl.html
  
@@ -71,7 +70,7 @@
  cmdlibdir = @libexecdir@/courier
  
  # Subdirectories
-@@ -1673,6 +1670,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$
+@@ -1896,6 +1893,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$
  courierpop3login$(EXEEXT): ../imap/pop3login$(EXEEXT)
        cp -f ../imap/pop3login$(EXEEXT) courierpop3login$(EXEEXT)
  
@@ -84,7 +83,7 @@
  sort.h:
        echo '#define SORT "$(SORT)"' >sort.h
  
-@@ -1828,39 +1831,21 @@ dist-hook:
+@@ -2051,39 +2054,21 @@ dist-hook:
  
  install-exec-hook:
        for d in $(bindir) $(sbindir) $(libexecdir) $(libexecdir)/courier \
@@ -126,7 +125,7 @@
        test -f $(DESTDIR)$(sysconfdir)/enablefiltering && exit 0; \
                echo esmtp >$(DESTDIR)$(sysconfdir)/enablefiltering
        test -f $(DESTDIR)$(sysconfdir)/aliases/system && exit 0; \
-@@ -1872,10 +1857,6 @@ install-data-hook:
+@@ -2095,10 +2080,6 @@ install-data-hook:
        rm -f $(DESTDIR)$(bindir)/rmail
        $(LN_S) sendmail $(DESTDIR)$(bindir)/rmail
        -$(mkinstalldirs) $(DESTDIR)@mandir@/man8
diff -r c1891590ec8a -r 637d7dd6c15e mail/courier-mta/patches/patch-ab
--- a/mail/courier-mta/patches/patch-ab Tue Jun 15 22:19:15 2010 +0000
+++ b/mail/courier-mta/patches/patch-ab Tue Jun 15 23:01:23 2010 +0000
@@ -1,21 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2010/01/09 22:16:20 heinz Exp $
-
-  first hunk: make option "--without-ldapaliasd" work (see patch-az)
+$NetBSD: patch-ab,v 1.6 2010/06/15 23:01:23 pettai Exp $
 
 --- courier/configure.orig     2007-11-24 03:26:42.000000000 +0000
 +++ courier/configure
-@@ -21071,7 +21071,9 @@ LIBS="$saveLIBS"
- 
- # Check whether --with-ldapaliasd was given.
- if test "${with_ldapaliasd+set}" = set; then
--  withval=$with_ldapaliasd; ldapaliasd="$withval"; ldapaliasd="yes"
-+  withval=$with_ldapaliasd; ldapaliasd="$withval"
-+else
-+  ldapaliasd="yes"
- fi
- 
- 
-@@ -22366,9 +22368,9 @@ done
+@@ -18398,9 +18398,9 @@ done
  
  if test "$testmode" = "0"
  then
diff -r c1891590ec8a -r 637d7dd6c15e mail/courier-mta/patches/patch-ac
--- a/mail/courier-mta/patches/patch-ac Tue Jun 15 22:19:15 2010 +0000
+++ b/mail/courier-mta/patches/patch-ac Tue Jun 15 23:01:23 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2008/02/19 18:45:24 jlam Exp $
+$NetBSD: patch-ac,v 1.6 2010/06/15 23:01:23 pettai Exp $
 
 --- courier/doc/Makefile.in.orig       2007-11-17 19:48:53.000000000 -0500
 +++ courier/doc/Makefile.in
-@@ -151,7 +151,7 @@ top_srcdir = @top_srcdir@
+@@ -169,7 +169,7 @@ top_srcdir = @top_srcdir@
  version = @version@
  htmldocdir = @datadir@/htmldoc
  CLEANFILES = permissions.dat
@@ -11,7 +11,7 @@
                draft-varshavchik-exdata-smtpext.txt \
                draft-varshavchik-verp-smtpext.txt \
                draft-varshavchik-security-smtpext.txt \
-@@ -189,66 +189,38 @@ htmlin = \
+@@ -207,67 +189,38 @@ htmlin = \
                courier.html \
                courierldapaliasd.html \
                couriermlm.html \
@@ -63,7 +63,8 @@
 -man1 = sendmail.1 preline.1 maildirmake.1 cancelmsg.1 lockmail.1 maildrop.1 \
 -      mailq.1 mailbot.1 makemime.1 mimegpg.1 maildiracl.1 \
 -      makedat.1 reformail.1 reformime.1 couriermlm.1 testmxlookup.1 \
--      dot-forward.1 couriertls.1 couriertcpd.1 maildirkw.1 webmlmd.1
+-      dot-forward.1 couriertls.1 couriertcpd.1 maildirkw.1 \
+-      webmlmd.1
 -
 -man5 = dot-courier.5 maildir.5
 -man7 = localmailfilter.7 maildirquota.7 maildropgdbm.7 maildropfilter.7 \
@@ -83,21 +84,21 @@
 -      mkesmtpdcert.8 mkimapdcert.8 mkpop3dcert.8 \
 +      mkesmtpdcert.8 \
        makealiases.8 makepercentrelay.8 makesmtpaccess.8 \
--      pop3d.8 submit.8 imapd.8
+-      pop3d.8 pop3d-ssl.8 submit.8 imapd.8
 +      submit.8
  
  BUILT_SOURCES = \
        aliaslookup.html aliaslookup.8 \
-@@ -275,7 +247,7 @@ BUILT_SOURCES = \
+@@ -294,7 +265,7 @@ BUILT_SOURCES = \
        webmlmd.html.in webmlmd.1.in
  
- EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES)
+ EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES) dotforward.1 pop3d-ssl.8
 -man_LINKS = $(man8dir)/courierpop3login.8 \
 +man_LINKS = \
        $(man1dir)/rmail.1 $(man1dir)/dotforward.1 \
        $(man8dir)/makesmtpaccess-msa.8 \
        $(man8dir)/esmtpd-msa.8
-@@ -1156,8 +1128,7 @@ preline.1: preline.1.in
+@@ -1215,8 +1186,7 @@ preline.1: preline.1.in
  
  install-man-extra:
        cd $(DESTDIR)$(man8dir) ; \
diff -r c1891590ec8a -r 637d7dd6c15e mail/courier-mta/patches/patch-ad
--- a/mail/courier-mta/patches/patch-ad Tue Jun 15 22:19:15 2010 +0000
+++ b/mail/courier-mta/patches/patch-ad Tue Jun 15 23:01:23 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2008/02/19 18:45:24 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2010/06/15 23:01:23 pettai Exp $
 
 --- courier/filters/Makefile.in.orig   2007-11-17 19:49:01.000000000 -0500
 +++ courier/filters/Makefile.in
-@@ -236,11 +236,12 @@ SUBDIRS = libfilter perlfilter
+@@ -283,11 +283,12 @@ SUBDIRS = libfilter perlfilter
  CLEANFILES = $(htmldoc_DATA) $(man_MANS) filtersocketdir.h filteractivedir.h \
        pidfile.h permissions.dat
  
@@ -16,7 +16,7 @@
  filtersocketdir = $(localstatedir)/filters
  allfiltersocketdir = $(localstatedir)/allfilters
  filterconfdir = $(sysconfdir)/filters
-@@ -931,16 +932,12 @@ install-exec-hook:
+@@ -1083,16 +1084,12 @@ install-exec-hook:
  install-data-hook:
        -$(mkinstalldirs) $(DESTDIR)$(filtersocketdir)
        -$(mkinstalldirs) $(DESTDIR)$(allfiltersocketdir)
diff -r c1891590ec8a -r 637d7dd6c15e mail/courier-mta/patches/patch-af
--- a/mail/courier-mta/patches/patch-af Tue Jun 15 22:19:15 2010 +0000
+++ b/mail/courier-mta/patches/patch-af Tue Jun 15 23:01:23 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2007/10/15 15:37:14 jlam Exp $
+$NetBSD: patch-af,v 1.4 2010/06/15 23:01:23 pettai Exp $
 
 --- courier/filters/perlfilter/Makefile.in.orig        Sat Jul 21 20:31:15 2007
 +++ courier/filters/perlfilter/Makefile.in
-@@ -207,7 +207,8 @@ top_srcdir = @top_srcdir@
+@@ -234,7 +234,8 @@ top_srcdir = @top_srcdir@
  EXTRA_DIST = perlfilter-wrapper.pl perlfilter-example.pl
  BUILT_SOURCES = filtersocketdir.h wrapperpl.h xsinit.c
  CLEANFILES = $(BUILT_SOURCES) permissions.dat
diff -r c1891590ec8a -r 637d7dd6c15e mail/courier-mta/patches/patch-ah
--- a/mail/courier-mta/patches/patch-ah Tue Jun 15 22:19:15 2010 +0000
+++ b/mail/courier-mta/patches/patch-ah Tue Jun 15 23:01:23 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2007/08/10 17:57:05 jlam Exp $
+$NetBSD: patch-ah,v 1.3 2010/06/15 23:01:23 pettai Exp $
 
 --- courier/module.local/deliver.c.orig        2006-05-28 11:29:52.000000000 -0400
 +++ courier/module.local/deliver.c
-@@ -635,7 +635,7 @@ static int docommand(const char *extensi
+@@ -649,7 +649,7 @@ static int docommand(const char *extensi
                const char *defaultmail,
                int recursion_level)
  {
@@ -11,7 +11,7 @@
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of gnustep-objc to 1.6.1
Next by Date: [pkgsrc/trunk]: pkgsrc/cad/fastcap Use more void.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of gnustep-objc to 1.6.1
Next by Thread: [pkgsrc/trunk]: pkgsrc/cad/fastcap Use more void.
Indexes:
Home | Main Index | Thread Index | Old Index