Mon Feb 12 21:15:50 2024 UTC (104d)
Update maildrop to 3.1.6

Deliver makedat and makedatprog directly in ${PREFIX}/bin to avoid conflicts with courier-imap.

Changes since 3.0.0:
* maildrop: fix compilation error.
* Fix spurious gcc 13 compiler warnings.
* Updated Dovecode authentication fix.
* Fix build with Dovecot authentication turned on.
* Update to C++11, replacing internal classes with modern C++ library classes.
* Fix the -V command line option to also explicitly set VERBOSE, fix assorted -V logging bugs.
* all: update configure.ac to require at least version 2.0.5 of libidn
* maildrop: remove unsafe SIGALRM handler.


(hans)
diff -r1.77 -r1.78 pkgsrc/mail/maildrop/Makefile
diff -r1.10 -r1.11 pkgsrc/mail/maildrop/PLIST
diff -r1.25 -r1.26 pkgsrc/mail/maildrop/distinfo
diff -r1.3 -r1.4 pkgsrc/mail/maildrop/patches/patch-Makefile.in
cvs diff -r1.77 -r1.78 pkgsrc/mail/maildrop/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/maildrop/Makefile 2023/10/24 22:09:46 1.77
+++ pkgsrc/mail/maildrop/Makefile 2024/02/12 21:15:49 1.78
@@ -1,45 +1,41 @@ @@ -1,45 +1,41 @@
1# $NetBSD: Makefile,v 1.77 2023/10/24 22:09:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.78 2024/02/12 21:15:49 hans Exp $
2 2
3DISTNAME= maildrop-3.1.0 3DISTNAME= maildrop-3.1.6
4PKGREVISION= 1 
5CATEGORIES= mail 4CATEGORIES= mail
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} 
7EXTRACT_SUFX= .tar.bz2 
8 5
9MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= Courier mail delivery agent with filtering abilities 7COMMENT= Courier mail delivery agent with filtering abilities
11HOMEPAGE= https://www.courier-mta.org/maildrop/ 8HOMEPAGE= https://www.courier-mta.org/maildrop/
12 9
13DEPENDS+= courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir 10DEPENDS+= courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
14 11
15USE_TOOLS+= gmake perl pkg-config 12USE_TOOLS+= gmake perl pkg-config
16USE_TOOLS+= cat:run # used by makedat(1) 13USE_TOOLS+= cat:run # used by makedat(1)
17USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
18 15
19.include "options.mk" 16.include "options.mk"
20.include "../../mail/courier-mta/Makefile.common" 17.include "../../mail/courier-mta/Makefile.common"
21 18
22DOCFILES= README README.postfix README.dovecotauth maildroptips.txt 19DOCFILES= README README.postfix README.dovecotauth maildroptips.txt
23 20
24# These are the users that may invoke maildrop with the "-d user" 21# These are the users that may invoke maildrop with the "-d user"
25# argument (mailbox delivery mode). 22# argument (mailbox delivery mode).
26MAILDROP_TRUSTED_USERS?= ${REAL_ROOT_USER} ${COURIER_USER} ${QMAIL_DAEMON_USER} 23MAILDROP_TRUSTED_USERS?= ${REAL_ROOT_USER} ${COURIER_USER} ${QMAIL_DAEMON_USER}
27BUILD_DEFS+= QMAIL_DAEMON_USER 24BUILD_DEFS+= QMAIL_DAEMON_USER
28 25
29CONFIGURE_ARGS+= --datadir=${DATADIR} 26CONFIGURE_ARGS+= --datadir=${DATADIR}
30CONFIGURE_ARGS+= --libexecdir=${LIBEXECDIR} 27CONFIGURE_ARGS+= --libexecdir=${LIBEXECDIR}
31CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} 28CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR}
32CONFIGURE_ARGS+= --with-makedatprog=${LIBEXECDIR}/makedatprog 
33CONFIGURE_ARGS+= --enable-maildirquota 29CONFIGURE_ARGS+= --enable-maildirquota
34CONFIGURE_ARGS+= --enable-maildrop-uid=${REAL_ROOT_USER} 30CONFIGURE_ARGS+= --enable-maildrop-uid=${REAL_ROOT_USER}
35CONFIGURE_ARGS+= --enable-maildrop-gid=${COURIER_GROUP} 31CONFIGURE_ARGS+= --enable-maildrop-gid=${COURIER_GROUP}
36CONFIGURE_ARGS+= --enable-trusted-users=${MAILDROP_TRUSTED_USERS:Q} 32CONFIGURE_ARGS+= --enable-trusted-users=${MAILDROP_TRUSTED_USERS:Q}
37CONFIGURE_ARGS+= --enable-trusted-groups=${COURIER_GROUP} 33CONFIGURE_ARGS+= --enable-trusted-groups=${COURIER_GROUP}
38CONFIGURE_ARGS+= --enable-syslog=1 34CONFIGURE_ARGS+= --enable-syslog=1
39 35
40INSTALL_AM_MAKEFLAGS+= htmldir=${DOCDIR:Q} 36INSTALL_AM_MAKEFLAGS+= htmldir=${DOCDIR:Q}
41INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q} 37INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
42 38
43REQD_DIRS= ${DATADIR} ${DOCDIR} ${LIBEXECDIR} 39REQD_DIRS= ${DATADIR} ${DOCDIR} ${LIBEXECDIR}
44 40
45# Note special permissions for some binaries. These are set to match 41# Note special permissions for some binaries. These are set to match
cvs diff -r1.10 -r1.11 pkgsrc/mail/maildrop/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/maildrop/PLIST 2019/05/24 13:17:57 1.10
+++ pkgsrc/mail/maildrop/PLIST 2024/02/12 21:15:49 1.11
@@ -1,24 +1,22 @@ @@ -1,24 +1,22 @@
1@comment $NetBSD: PLIST,v 1.10 2019/05/24 13:17:57 hauke Exp $ 1@comment $NetBSD: PLIST,v 1.11 2024/02/12 21:15:49 hans Exp $
2bin/lockmail 2bin/lockmail
3bin/mailbot 3bin/mailbot
4bin/maildrop 4bin/maildrop
5bin/makedat 5bin/makedat
6bin/makedatprog 6bin/makedatprog
7bin/makemime 7bin/makemime
8bin/reformail 8bin/reformail
9bin/reformime 9bin/reformime
10libexec/courier/makedat 
11libexec/courier/makedatprog 
12man/man1/lockmail.1 10man/man1/lockmail.1
13man/man1/mailbot.1 11man/man1/mailbot.1
14man/man1/maildrop.1 12man/man1/maildrop.1
15man/man1/makedat.1 13man/man1/makedat.1
16man/man1/makemime.1 14man/man1/makemime.1
17man/man1/reformail.1 15man/man1/reformail.1
18man/man1/reformime.1 16man/man1/reformime.1
19man/man7/maildropex.7 17man/man7/maildropex.7
20man/man7/maildropfilter.7 18man/man7/maildropfilter.7
21man/man7/maildropgdbm.7 19man/man7/maildropgdbm.7
22share/doc/courier/lockmail.html 20share/doc/courier/lockmail.html
23share/doc/courier/mailbot.html 21share/doc/courier/mailbot.html
24share/doc/courier/maildrop.html 22share/doc/courier/maildrop.html
cvs diff -r1.25 -r1.26 pkgsrc/mail/maildrop/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/maildrop/distinfo 2023/01/25 19:34:04 1.25
+++ pkgsrc/mail/maildrop/distinfo 2024/02/12 21:15:49 1.26
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.25 2023/01/25 19:34:04 bsiegert Exp $ 1$NetBSD: distinfo,v 1.26 2024/02/12 21:15:49 hans Exp $
2 2
3BLAKE2s (maildrop-3.1.0.tar.bz2) = b768a660b19ac811b135185a28a941854619b4f716333fa9247d666992828d83 3BLAKE2s (maildrop-3.1.6.tar.bz2) = 0417825359ab75397fdf14854a252e2b0d22708ad65020328c50f49f669a36b9
4SHA512 (maildrop-3.1.0.tar.bz2) = 4d4ab1acd9f81beb54af9af86d0f8c3145f962f1ff2fd5e9209e31b63054cc41b3e4a1300965a8855a39dbcfa1cdbdef2ad194af1f12e079c1361b12b293ed56 4SHA512 (maildrop-3.1.6.tar.bz2) = 93364747c603d1d566f756e7ba8b10fd38d10749b269f1bf64596a56fe2b06f529f4b59b6256a5be0c44169f2c8cc9dcd7de91b3cc03288719ffee5db330b1d5
5Size (maildrop-3.1.0.tar.bz2) = 2154698 bytes 5Size (maildrop-3.1.6.tar.bz2) = 2156136 bytes
6SHA1 (patch-Makefile.in) = 0a23852205a86918530a9b79b5c0451d04a6d672 6SHA1 (patch-Makefile.in) = 304e380f0a78a5de2a8a271fc4dac44e9e7c4c62
7SHA1 (patch-libs_maildrop_configure) = 76b12b194463095a65cde90d992ac6b023b694e2 7SHA1 (patch-libs_maildrop_configure) = 76b12b194463095a65cde90d992ac6b023b694e2
8SHA1 (patch-libs_maildrop_filelock.C) = d278b66bf77fe46f5ad51f860b6e5efdd7d7f29b 8SHA1 (patch-libs_maildrop_filelock.C) = d278b66bf77fe46f5ad51f860b6e5efdd7d7f29b
9SHA1 (patch-libs_maildrop_main.C) = f476c38a0079c71b854772a6de5058436646cb62 9SHA1 (patch-libs_maildrop_main.C) = f476c38a0079c71b854772a6de5058436646cb62
cvs diff -r1.3 -r1.4 pkgsrc/mail/maildrop/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/mail/maildrop/patches/patch-Makefile.in 2023/01/25 19:34:04 1.3
+++ pkgsrc/mail/maildrop/patches/patch-Makefile.in 2024/02/12 21:15:50 1.4
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-Makefile.in,v 1.3 2023/01/25 19:34:04 bsiegert Exp $ 1$NetBSD: patch-Makefile.in,v 1.4 2024/02/12 21:15:50 hans Exp $
2 2
3Do not install maildir related tools & doc - they presumably get 3Do not install maildir related tools & doc - they presumably get
4installed by some other courier-* package if you want them. (The 4installed by some other courier-* package if you want them. (The
5FreeBSD mail/maildrop port just 'maildrop-' prefixes those binaries?) 5FreeBSD mail/maildrop port just 'maildrop-' prefixes those binaries?)
6 6
7Install system binaries in {libexecdir} where applicable. 7Install system binaries in {libexecdir} where applicable.
8 8
9--- Makefile.in.orig 2022-12-02 14:42:36.000000000 +0000 9--- Makefile.in.orig 2023-08-03 23:46:53.000000000 +0000
10+++ Makefile.in 10+++ Makefile.in
11@@ -443,16 +443,15 @@ EXTRA_DIST = README.html INSTALL.html UP 11@@ -443,16 +443,15 @@ EXTRA_DIST = README.html INSTALL.html UP
12 packaging/debian/maildrop-dev.soname.lintian-overrides \ 12 packaging/debian/maildrop-dev.soname.lintian-overrides \
13 packaging/debian/rules packaging/debian/source/format 13 packaging/debian/rules packaging/debian/source/format
14 scriptdir = $(pkgdatadir)/scripts 14 scriptdir = $(pkgdatadir)/scripts
15-DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html 15-DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html
16-DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE) 16-DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
17-DELIVERQUOTAMAN = maildirquota.7 deliverquota.8 17-DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
18-MAILDROPHTML = lockmail.html maildiracl.html maildirkw.html \ 18-MAILDROPHTML = lockmail.html maildiracl.html maildirkw.html \
19- maildirwatch.html maildirmake.html maildropex.html \ 19- maildirwatch.html maildirmake.html maildropex.html \
20- maildir.html maildropfilter.html maildropgdbm.html \ 20- maildir.html maildropfilter.html maildropgdbm.html \
21+DELIVERQUOTAHTMLSOURCE = 21+DELIVERQUOTAHTMLSOURCE =
22+DELIVERQUOTAHTML = 22+DELIVERQUOTAHTML =
@@ -35,46 +35,32 @@ Install system binaries in {libexecdir}  @@ -35,46 +35,32 @@ Install system binaries in {libexecdir}
35@@ -1308,12 +1307,8 @@ uninstall-man: uninstall-man1 uninstall- 35@@ -1308,12 +1307,8 @@ uninstall-man: uninstall-man1 uninstall-
36 # Create a soft link from bindir/deliverquota to libdir/bin/deliverquota 36 # Create a soft link from bindir/deliverquota to libdir/bin/deliverquota
37  37
38 install-deliverquota: 38 install-deliverquota:
39- $(mkinstalldirs) $(DESTDIR)$(bindir) 39- $(mkinstalldirs) $(DESTDIR)$(bindir)
40- $(INSTALL_PROGRAM) libs/maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota 40- $(INSTALL_PROGRAM) libs/maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota
41- cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota 41- cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota
42  42
43 uninstall-deliverquota: 43 uninstall-deliverquota:
44- rm -f $(DESTDIR)$(bindir)/deliverquota 44- rm -f $(DESTDIR)$(bindir)/deliverquota
45  45
46 install-data-local: install-man install-deliverquota install-maildrop 46 install-data-local: install-man install-deliverquota install-maildrop
47  47
48@@ -1341,25 +1336,24 @@ install-maildrop: 48@@ -1341,9 +1336,6 @@ install-maildrop:
49 $(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \ 49 $(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
50 done 50 done
51 $(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail 51 $(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail
52- $(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake 52- $(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake
53- $(INSTALL_PROGRAM) libs/maildir/maildirkw $(DESTDIR)$(bindir)/maildirkw 53- $(INSTALL_PROGRAM) libs/maildir/maildirkw $(DESTDIR)$(bindir)/maildirkw
54- $(INSTALL_PROGRAM) libs/maildir/maildirwatch $(DESTDIR)$(bindir)/maildirwatch 54- $(INSTALL_PROGRAM) libs/maildir/maildirwatch $(DESTDIR)$(bindir)/maildirwatch
55 $(INSTALL_PROGRAM) libs/rfc2045/reformime $(DESTDIR)$(bindir)/reformime 55 $(INSTALL_PROGRAM) libs/rfc2045/reformime $(DESTDIR)$(bindir)/reformime
56 $(INSTALL_PROGRAM) libs/rfc2045/makemime $(DESTDIR)$(bindir)/makemime 56 $(INSTALL_PROGRAM) libs/rfc2045/makemime $(DESTDIR)$(bindir)/makemime
57 test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ 57 test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
58- $(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog 58@@ -1354,7 +1346,7 @@ install-maildrop:
59+ $(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(libexecdir)/makedatprog 
60+ $(LN_S) $(libexecdir)/makedatprog $(DESTDIR)$(bindir)/makedatprog 
61 test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ 
62- $(INSTALL_SCRIPT) libs/makedat/makedat $(DESTDIR)$(bindir)/makedat 
63+ $(INSTALL_SCRIPT) libs/makedat/makedat $(DESTDIR)$(libexecdir)/makedat 
64+ $(LN_S) $(libexecdir)/makedat $(DESTDIR)$(bindir)/makedat 
65 . libs/maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail 
66 . libs/maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail 59 . libs/maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
67  60
68 uninstall-maildrop: 61 uninstall-maildrop:
69- for f in maildrop mailbot maildirmake reformail lockmail makemime reformime maildirkw maildirwatch; do \ 62- for f in maildrop mailbot maildirmake reformail lockmail makemime reformime maildirkw maildirwatch; do \
70+ for f in maildrop mailbot reformail lockmail makemime reformime ; do \ 63+ for f in maildrop mailbot reformail lockmail makemime reformime ; do \
71 rm -f $(DESTDIR)$(bindir)/$$f ; \ 64 rm -f $(DESTDIR)$(bindir)/$$f ; \
72 done 65 done
73 test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ 66 test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
74- rm -f $(DESTDIR)$(bindir)/makedat ; \ 
75- rm -f $(DESTDIR)$(bindir)/makedatprog 
76+ rm -f $(DESTDIR)$(libexecdir)/makedat ; \ 
77+ rm -f $(DESTDIR)$(libexecdir)/makedatprog 
78  
79 all-recursive: all-make-check 
80