CVS commit: pkgsrc/mail/maildrop

["Hans Rosenfeld" <hans%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hans
Date:           Mon Feb 12 21:15:50 UTC 2024

Modified Files:
        pkgsrc/mail/maildrop: Makefile PLIST distinfo
        pkgsrc/mail/maildrop/patches: patch-Makefile.in

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/mail/maildrop/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mail/maildrop/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/mail/maildrop/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/maildrop/patches/patch-Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/maildrop/Makefile
diff -u pkgsrc/mail/maildrop/Makefile:1.77 pkgsrc/mail/maildrop/Makefile:1.78
--- pkgsrc/mail/maildrop/Makefile:1.77  Tue Oct 24 22:09:46 2023
+++ pkgsrc/mail/maildrop/Makefile       Mon Feb 12 21:15:49 2024
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2023/10/24 22:09:46 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2024/02/12 21:15:49 hans Exp $
 
-DISTNAME=      maildrop-3.1.0
-PKGREVISION=   1
+DISTNAME=      maildrop-3.1.6
 CATEGORIES=    mail
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
-EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Courier mail delivery agent with filtering abilities
@@ -29,7 +26,6 @@ BUILD_DEFS+=          QMAIL_DAEMON_USER
 CONFIGURE_ARGS+=       --datadir=${DATADIR}
 CONFIGURE_ARGS+=       --libexecdir=${LIBEXECDIR}
 CONFIGURE_ARGS+=       --with-etcdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --with-makedatprog=${LIBEXECDIR}/makedatprog
 CONFIGURE_ARGS+=       --enable-maildirquota
 CONFIGURE_ARGS+=       --enable-maildrop-uid=${REAL_ROOT_USER}
 CONFIGURE_ARGS+=       --enable-maildrop-gid=${COURIER_GROUP}

Index: pkgsrc/mail/maildrop/PLIST
diff -u pkgsrc/mail/maildrop/PLIST:1.10 pkgsrc/mail/maildrop/PLIST:1.11
--- pkgsrc/mail/maildrop/PLIST:1.10     Fri May 24 13:17:57 2019
+++ pkgsrc/mail/maildrop/PLIST  Mon Feb 12 21:15:49 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2019/05/24 13:17:57 hauke Exp $
+@comment $NetBSD: PLIST,v 1.11 2024/02/12 21:15:49 hans Exp $
 bin/lockmail
 bin/mailbot
 bin/maildrop
@@ -7,8 +7,6 @@ bin/makedatprog
 bin/makemime
 bin/reformail
 bin/reformime
-libexec/courier/makedat
-libexec/courier/makedatprog
 man/man1/lockmail.1
 man/man1/mailbot.1
 man/man1/maildrop.1

Index: pkgsrc/mail/maildrop/distinfo
diff -u pkgsrc/mail/maildrop/distinfo:1.25 pkgsrc/mail/maildrop/distinfo:1.26
--- pkgsrc/mail/maildrop/distinfo:1.25  Wed Jan 25 19:34:04 2023
+++ pkgsrc/mail/maildrop/distinfo       Mon Feb 12 21:15:49 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2023/01/25 19:34:04 bsiegert Exp $
+$NetBSD: distinfo,v 1.26 2024/02/12 21:15:49 hans Exp $
 
-BLAKE2s (maildrop-3.1.0.tar.bz2) = b768a660b19ac811b135185a28a941854619b4f716333fa9247d666992828d83
-SHA512 (maildrop-3.1.0.tar.bz2) = 4d4ab1acd9f81beb54af9af86d0f8c3145f962f1ff2fd5e9209e31b63054cc41b3e4a1300965a8855a39dbcfa1cdbdef2ad194af1f12e079c1361b12b293ed56
-Size (maildrop-3.1.0.tar.bz2) = 2154698 bytes
-SHA1 (patch-Makefile.in) = 0a23852205a86918530a9b79b5c0451d04a6d672
+BLAKE2s (maildrop-3.1.6.tar.bz2) = 0417825359ab75397fdf14854a252e2b0d22708ad65020328c50f49f669a36b9
+SHA512 (maildrop-3.1.6.tar.bz2) = 93364747c603d1d566f756e7ba8b10fd38d10749b269f1bf64596a56fe2b06f529f4b59b6256a5be0c44169f2c8cc9dcd7de91b3cc03288719ffee5db330b1d5
+Size (maildrop-3.1.6.tar.bz2) = 2156136 bytes
+SHA1 (patch-Makefile.in) = 304e380f0a78a5de2a8a271fc4dac44e9e7c4c62
 SHA1 (patch-libs_maildrop_configure) = 76b12b194463095a65cde90d992ac6b023b694e2
 SHA1 (patch-libs_maildrop_filelock.C) = d278b66bf77fe46f5ad51f860b6e5efdd7d7f29b
 SHA1 (patch-libs_maildrop_main.C) = f476c38a0079c71b854772a6de5058436646cb62

Index: pkgsrc/mail/maildrop/patches/patch-Makefile.in
diff -u pkgsrc/mail/maildrop/patches/patch-Makefile.in:1.3 pkgsrc/mail/maildrop/patches/patch-Makefile.in:1.4
--- pkgsrc/mail/maildrop/patches/patch-Makefile.in:1.3  Wed Jan 25 19:34:04 2023
+++ pkgsrc/mail/maildrop/patches/patch-Makefile.in      Mon Feb 12 21:15:50 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile.in,v 1.3 2023/01/25 19:34:04 bsiegert Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2024/02/12 21:15:50 hans Exp $
 
 Do not install maildir related tools & doc - they presumably get
 installed by some other courier-* package if you want them. (The
@@ -6,7 +6,7 @@ FreeBSD mail/maildrop port just 'maildro
 
 Install system binaries in {libexecdir} where applicable.
 
---- Makefile.in.orig   2022-12-02 14:42:36.000000000 +0000
+--- Makefile.in.orig   2023-08-03 23:46:53.000000000 +0000
 +++ Makefile.in
 @@ -443,16 +443,15 @@ EXTRA_DIST = README.html INSTALL.html UP
        packaging/debian/maildrop-dev.soname.lintian-overrides \
@@ -45,7 +45,7 @@ Install system binaries in {libexecdir} 
  
  install-data-local: install-man install-deliverquota install-maildrop
  
-@@ -1341,25 +1336,24 @@ install-maildrop:
+@@ -1341,9 +1336,6 @@ install-maildrop:
                $(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
        done
        $(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail
@@ -55,14 +55,7 @@ Install system binaries in {libexecdir} 
        $(INSTALL_PROGRAM) libs/rfc2045/reformime $(DESTDIR)$(bindir)/reformime
        $(INSTALL_PROGRAM) libs/rfc2045/makemime $(DESTDIR)$(bindir)/makemime
        test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
--              $(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
-+              $(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(libexecdir)/makedatprog
-+              $(LN_S) $(libexecdir)/makedatprog $(DESTDIR)$(bindir)/makedatprog
-       test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
--              $(INSTALL_SCRIPT)  libs/makedat/makedat     $(DESTDIR)$(bindir)/makedat
-+              $(INSTALL_SCRIPT)  libs/makedat/makedat     $(DESTDIR)$(libexecdir)/makedat
-+              $(LN_S) $(libexecdir)/makedat $(DESTDIR)$(bindir)/makedat
-       . libs/maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail
+@@ -1354,7 +1346,7 @@ install-maildrop:
        . libs/maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
  
  uninstall-maildrop:
@@ -71,10 +64,3 @@ Install system binaries in {libexecdir} 
                rm -f $(DESTDIR)$(bindir)/$$f ; \
        done
        test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
--              rm -f $(DESTDIR)$(bindir)/makedat ; \
--              rm -f $(DESTDIR)$(bindir)/makedatprog
-+              rm -f $(DESTDIR)$(libexecdir)/makedat ; \
-+              rm -f $(DESTDIR)$(libexecdir)/makedatprog
- 
- all-recursive: all-make-check
-