Wed Jan 25 19:34:04 2023 UTC ()
maildrop: update to 3.1.0. Needs newest security/courier-authlib.

3.1.0

	* Switch to libidn2.
	* Debian/Ubuntu: update lintian overrides

3.0.9
	* Adjust deb packaging. Check /etc/lsb-release and include the
	distribution release in the deb package version, to faciliate
	updating to the same version of the package in an updated release.

	Fix build dependencies.

	* Update deliverquota man page.

3.0.8

	* gcc 12 and autotools update. OpenSSL 3.0 update.
	* Add scripts to create installable .deb packages, update
	documentation.

3.0.7

	* configure.ac: Fix configure check for pcre2

3.0.6

	* Fix linking failure on some Linux distributions.

3.0.5

	* Fix linking failure on some Linux distributions.

3.0.4

	* maildrop: update to pcre2
	* Minor code tweaks, make it compileable with -Wall -Werror.

3.0.3

	* Add maildirwatch helper tool.
	* Fully install the maildirwatch tool, its man page, as well as the
	maildirkw man page and tool, which should be packaged with maildrop
	too.

3.0.2

	* spec file: add BuildRequires: %{__make} (will be required in F34).

3.0.1

	* courier-authlib API update.


(bsiegert)
diff -r1.75 -r1.76 pkgsrc/mail/maildrop/Makefile
diff -r1.24 -r1.25 pkgsrc/mail/maildrop/distinfo
diff -r1.2 -r1.3 pkgsrc/mail/maildrop/patches/patch-Makefile.in
diff -r1.2 -r1.3 pkgsrc/mail/maildrop/patches/patch-libs_maildrop_main.C
cvs diff -r1.75 -r1.76 pkgsrc/mail/maildrop/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/maildrop/Makefile 2022/06/28 11:34:21 1.75
+++ pkgsrc/mail/maildrop/Makefile 2023/01/25 19:34:04 1.76
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.75 2022/06/28 11:34:21 wiz Exp $ 1# $NetBSD: Makefile,v 1.76 2023/01/25 19:34:04 bsiegert Exp $
2 2
3DISTNAME= maildrop-3.0.0 3DISTNAME= maildrop-3.1.0
4PKGREVISION= 7 4CATEGORIES= mail
5CATEGORIES= security 
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= Courier mail delivery agent with filtering abilities 9COMMENT= Courier mail delivery agent with filtering abilities
11HOMEPAGE= https://www.courier-mta.org/maildrop/ 10HOMEPAGE= https://www.courier-mta.org/maildrop/
12 11
13DEPENDS+= courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir 12DEPENDS+= courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
14 13
15USE_TOOLS+= gmake perl pkg-config 14USE_TOOLS+= gmake perl pkg-config
16USE_TOOLS+= cat:run # used by makedat(1) 15USE_TOOLS+= cat:run # used by makedat(1)
17USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
18 17
@@ -50,15 +49,16 @@ SPECIAL_PERMS+= bin/maildrop ${REAL_ROOT @@ -50,15 +49,16 @@ SPECIAL_PERMS+= bin/maildrop ${REAL_ROOT
50 49
51.include "../../devel/sysexits/buildlink3.mk" 50.include "../../devel/sysexits/buildlink3.mk"
52 51
53INSTALLATION_DIRS= libexec/courier ${DOCDIR}/maildrop share/courier 52INSTALLATION_DIRS= libexec/courier ${DOCDIR}/maildrop share/courier
54 53
55post-install: 54post-install:
56.for aaa in ${DOCFILES} 55.for aaa in ${DOCFILES}
57 ${INSTALL_DATA} ${WRKSRC}/${aaa} ${DESTDIR}${DOCDIR}/maildrop 56 ${INSTALL_DATA} ${WRKSRC}/${aaa} ${DESTDIR}${DOCDIR}/maildrop
58.endfor 57.endfor
59 ${INSTALL_MAN} ${WRKSRC}/libs/maildrop/makedat.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 58 ${INSTALL_MAN} ${WRKSRC}/libs/maildrop/makedat.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
60# ${INSTALL_DATA} ${WRKSRC}/libs/maildrop/makedat.html ${DESTDIR}${DOCDIR} 59# ${INSTALL_DATA} ${WRKSRC}/libs/maildrop/makedat.html ${DESTDIR}${DOCDIR}
61 60
62.include "../../mail/courier-unicode/buildlink3.mk" 61.include "../../mail/courier-unicode/buildlink3.mk"
63.include "../../devel/libidn/buildlink3.mk" 62.include "../../devel/libidn2/buildlink3.mk"
 63.include "../../devel/pcre2/buildlink3.mk"
64.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"
cvs diff -r1.24 -r1.25 pkgsrc/mail/maildrop/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/maildrop/distinfo 2021/10/26 10:54:06 1.24
+++ pkgsrc/mail/maildrop/distinfo 2023/01/25 19:34:04 1.25
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.24 2021/10/26 10:54:06 nia Exp $ 1$NetBSD: distinfo,v 1.25 2023/01/25 19:34:04 bsiegert Exp $
2 2
3BLAKE2s (maildrop-3.0.0.tar.bz2) = 26d1510f606100605b5ee9e4df6d100bede52810259a665325820ec5f2aaf35f 3BLAKE2s (maildrop-3.1.0.tar.bz2) = b768a660b19ac811b135185a28a941854619b4f716333fa9247d666992828d83
4SHA512 (maildrop-3.0.0.tar.bz2) = 1f1e1682ec7c2d0c1f2e71059f186d9a9d3118194b1e558d3a6e5826721fb14a661f4d75df42ce2626430ac072b50e723b563ae00c1ebdeb4da96abfeb534eff 4SHA512 (maildrop-3.1.0.tar.bz2) = 4d4ab1acd9f81beb54af9af86d0f8c3145f962f1ff2fd5e9209e31b63054cc41b3e4a1300965a8855a39dbcfa1cdbdef2ad194af1f12e079c1361b12b293ed56
5Size (maildrop-3.0.0.tar.bz2) = 2091018 bytes 5Size (maildrop-3.1.0.tar.bz2) = 2154698 bytes
6SHA1 (patch-Makefile.in) = 6629f46889d6f3c73cac08d5ab10308a84c41ec2 6SHA1 (patch-Makefile.in) = 0a23852205a86918530a9b79b5c0451d04a6d672
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) = fe53391fa0823f471a19b924aedd558d3da63aca 9SHA1 (patch-libs_maildrop_main.C) = f476c38a0079c71b854772a6de5058436646cb62
cvs diff -r1.2 -r1.3 pkgsrc/mail/maildrop/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/mail/maildrop/patches/patch-Makefile.in 2019/05/24 14:17:17 1.2
+++ pkgsrc/mail/maildrop/patches/patch-Makefile.in 2023/01/25 19:34:04 1.3
@@ -1,80 +1,80 @@ @@ -1,80 +1,80 @@
1$NetBSD: patch-Makefile.in,v 1.2 2019/05/24 14:17:17 hauke Exp $ 1$NetBSD: patch-Makefile.in,v 1.3 2023/01/25 19:34:04 bsiegert 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 2018-09-13 23:21:07.000000000 +0000 9--- Makefile.in.orig 2022-12-02 14:42:36.000000000 +0000
10+++ Makefile.in 10+++ Makefile.in
11@@ -429,17 +429,17 @@ EXTRA_DIST = README.html INSTALL.html UP 11@@ -443,16 +443,15 @@ EXTRA_DIST = README.html INSTALL.html UP
12 maildroptips.txt COPYING.GPL manpage.css $(HTMLWWW) 12 packaging/debian/maildrop-dev.soname.lintian-overrides \
13  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- maildirmake.html maildropex.html maildir.html \ 19- maildirwatch.html maildirmake.html maildropex.html \
20+DELIVERQUOTAHTMLSOURCE =  20- maildir.html maildropfilter.html maildropgdbm.html \
21+DELIVERQUOTAHTML =  21+DELIVERQUOTAHTMLSOURCE =
22+DELIVERQUOTAMAN =  22+DELIVERQUOTAHTML =
23+MAILDROPHTML = lockmail.html \ 23+DELIVERQUOTAMAN =
24+ maildropex.html \ 24+MAILDROPHTML = lockmail.html maildropex.html \
25 maildropfilter.html maildropgdbm.html maildrop.html \ 25+ maildropfilter.html maildropgdbm.html \
26 mailbot.html makemime.html reformail.html reformime.html \ 26 maildrop.html mailbot.html makemime.html reformail.html \
27 $(am__append_1) 27 reformime.html $(am__append_1)
28-MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 \ 28-MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 \
29- maildropex.7 maildir.5 maildropfilter.7 maildropgdbm.7 \ 29- maildropex.7 maildirkw.1 maildirwatch.1 maildir.5 \
30- makemime.1 reformail.1 reformime.1 $(am__append_2) 
31+MAILDROPMAN = lockmail.1 maildrop.1 mailbot.1 \ 30+MAILDROPMAN = lockmail.1 maildrop.1 mailbot.1 \
32+ maildropex.7 maildropfilter.7 maildropgdbm.7 \ 31+ maildropex.7 \
33+ makemime.1 reformail.1 reformime.1 32 maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 \
 33 reformime.1 $(am__append_2)
34 EXTRA_LTLIBRARIES = librfc822.la librfc2045.la 34 EXTRA_LTLIBRARIES = librfc822.la librfc2045.la
35 @DEVEL_TRUE@DEVEL_MAN = rfc822.3 rfc2045.3 35@@ -1308,12 +1307,8 @@ uninstall-man: uninstall-man1 uninstall-
36 sysincludedir = $(includedir) 
37@@ -1282,12 +1282,8 @@ uninstall-man: uninstall-man1 uninstall- 
38 # Create a soft link from bindir/deliverquota to libdir/bin/deliverquota 36 # Create a soft link from bindir/deliverquota to libdir/bin/deliverquota
39  37
40 install-deliverquota: 38 install-deliverquota:
41- $(mkinstalldirs) $(DESTDIR)$(bindir) 39- $(mkinstalldirs) $(DESTDIR)$(bindir)
42- $(INSTALL_PROGRAM) libs/maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota 40- $(INSTALL_PROGRAM) libs/maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota
43- cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota 41- cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota
44  42
45 uninstall-deliverquota: 43 uninstall-deliverquota:
46- rm -f $(DESTDIR)$(bindir)/deliverquota 44- rm -f $(DESTDIR)$(bindir)/deliverquota
47  45
48 install-data-local: install-man install-deliverquota install-maildrop 46 install-data-local: install-man install-deliverquota install-maildrop
49  47
50@@ -1315,23 +1311,24 @@ install-maildrop: 48@@ -1341,25 +1336,24 @@ install-maildrop:
51 $(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \ 49 $(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
52 done 50 done
53 $(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail 51 $(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail
54- $(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
 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- $(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
59+ $(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(libexecdir)/makedatprog 59+ $(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(libexecdir)/makedatprog
60+ $(LN_S) $(libexecdir)/makedatprog $(DESTDIR)$(bindir)/makedatprog 60+ $(LN_S) $(libexecdir)/makedatprog $(DESTDIR)$(bindir)/makedatprog
61 test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ 61 test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
62- $(INSTALL_SCRIPT) libs/makedat/makedat $(DESTDIR)$(bindir)/makedat 62- $(INSTALL_SCRIPT) libs/makedat/makedat $(DESTDIR)$(bindir)/makedat
63+ $(INSTALL_SCRIPT) libs/makedat/makedat $(DESTDIR)$(libexecdir)/makedat 63+ $(INSTALL_SCRIPT) libs/makedat/makedat $(DESTDIR)$(libexecdir)/makedat
64+ $(LN_S) $(libexecdir)/makedat $(DESTDIR)$(bindir)/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 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 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
67  67
68 uninstall-maildrop: 68 uninstall-maildrop:
69- for f in maildrop mailbot maildirmake reformail lockmail makemime reformime; do \ 69- for f in maildrop mailbot maildirmake reformail lockmail makemime reformime maildirkw maildirwatch; do \
70+ for f in maildrop mailbot reformail lockmail makemime reformime; do \ 70+ for f in maildrop mailbot reformail lockmail makemime reformime ; do \
71 rm -f $(DESTDIR)$(bindir)/$$f ; \ 71 rm -f $(DESTDIR)$(bindir)/$$f ; \
72 done 72 done
73 test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ 73 test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
74- rm -f $(DESTDIR)$(bindir)/makedat ; \ 74- rm -f $(DESTDIR)$(bindir)/makedat ; \
75- rm -f $(DESTDIR)$(bindir)/makedatprog 75- rm -f $(DESTDIR)$(bindir)/makedatprog
76+ rm -f $(DESTDIR)$(libexecdir)/makedat ; \ 76+ rm -f $(DESTDIR)$(libexecdir)/makedat ; \
77+ rm -f $(DESTDIR)$(libexecdir)/makedatprog 77+ rm -f $(DESTDIR)$(libexecdir)/makedatprog
78  78
79 all-recursive: all-make-check 79 all-recursive: all-make-check
80  80
cvs diff -r1.2 -r1.3 pkgsrc/mail/maildrop/patches/patch-libs_maildrop_main.C (expand / switch to unified diff)

--- pkgsrc/mail/maildrop/patches/patch-libs_maildrop_main.C 2020/04/16 12:49:35 1.2
+++ pkgsrc/mail/maildrop/patches/patch-libs_maildrop_main.C 2023/01/25 19:34:04 1.3
@@ -1,61 +1,53 @@ @@ -1,61 +1,53 @@
1$NetBSD: patch-libs_maildrop_main.C,v 1.2 2020/04/16 12:49:35 manu Exp $ 1$NetBSD: patch-libs_maildrop_main.C,v 1.3 2023/01/25 19:34:04 bsiegert Exp $
2 2
3Make this maildrop install usable by both Courier and other MTAs. 3Make this maildrop install usable by both Courier and other MTAs.
4 4
5--- libs/maildrop/main.C.orig 2018-09-14 01:22:17.000000000 +0200 5--- libs/maildrop/main.C.orig 2021-05-22 09:00:07.000000000 +0000
6+++ libs/maildrop/main.C 2020-04-10 03:32:11.795122838 +0200 6+++ libs/maildrop/main.C
7@@ -278,13 +278,15 @@ 7@@ -279,11 +279,13 @@ static int callback_authlib(struct authi
8 void *void_arg) 
9 { 8 {
10 Maildrop &maildrop=*(Maildrop *)void_arg; 9 Maildrop &maildrop=*(Maildrop *)void_arg;
11  10
12+#if 0 /* auth_mkhomedir does not exist in courrier-authlib */ 11+#if 0 /* auth_mkhomedir does not exist in courrier-authlib */
13 if (auth_mkhomedir(auth)) 12 if (auth_mkhomedir(auth))
14 { 13 {
15 perror(auth->homedir); 14 perror(auth->homedir);
16 exit(1); 15 exit(1);
17 } 16 }
18+#endif 17+#endif
19  18
20 if (VerboseLevel() > 1) 19 if (VerboseLevel() > 1)
21 { 20 {
22 Buffer b; 21@@ -758,7 +760,7 @@ uid_t my_u=getuid();
23@@ -753,9 +755,9 @@ 
24  
25 if (!found) 22 if (!found)
26 { 23 {
27 #if HAVE_COURIER 24 #if HAVE_COURIER
28- if (!deliverymode) 25- if (!deliverymode)
29+ if (!deliverymode || !getenv("COURIER_MTA")) 26+ if (!deliverymode || !getenv("COURIER_MTA"))
30 #endif 27 #endif
31 { 28 {
32 my_pw=getpwuid(my_u); 29 my_pw=getpwuid(my_u);
33 if (!my_pw) 30@@ -818,6 +820,14 @@ Buffer value;
34@@ -813,8 +815,16 @@ 
35 if (deliverymode && orig_uid == getuid()) 
36 { 31 {
37 const char *p; 32 const char *p;
38  33
39+ /* 34+ /*
40+ * To allow one maildrop to be used by both courier MTA 35+ * To allow one maildrop to be used by both courier MTA
41+ * and others, we require courier MTA to set COURIER_MTA 36+ * and others, we require courier MTA to set COURIER_MTA
42+ * in the environment before running maildrop. 37+ * in the environment before running maildrop.
43+ */ 38+ */
44+ if (getenv("COURIER_MTA")) 39+ if (getenv("COURIER_MTA"))
45+ { /* COURIER_MTA */ 40+ { /* COURIER_MTA */
46+ 41+
47 if ((p=getenv("HOME")) && *p) 42 if ((p=getenv("HOME")) && *p)
48 maildrop.init_home=p; 43 maildrop.init_home=p;
49  44
50 if ((p=getenv("LOGNAME")) && *p) 45@@ -842,6 +852,8 @@ Buffer value;
51@@ -837,8 +847,10 @@ 
52 maildrop.init_default=p; 
53  46
54 if ((p=getenv("MAILDIRQUOTA")) && *p) 47 if ((p=getenv("MAILDIRQUOTA")) && *p)
55 maildrop.init_quota=p; 48 maildrop.init_quota=p;
56+ 49+
57+ } /* COURIER_MTA */ 50+ } /* COURIER_MTA */
58 } 51 }
59 #endif 52 #endif
60  53
61 if (deliverymode)