CVS commit: pkgsrc/mail/dbmail

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/mail/dbmail
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Fri, 2 Jan 2026 17:57:31 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Jan  2 17:57:31 UTC 2026

Modified Files:
        pkgsrc/mail/dbmail: Makefile PLIST distinfo options.mk
        pkgsrc/mail/dbmail/files: dbmail.sh dbmailimapd.sh dbmaillmtpd.sh
            dbmailpop3d.sh
Added Files:
        pkgsrc/mail/dbmail/files: dbmailhttpd.sh dbmailsieved.sh
Removed Files:
        pkgsrc/mail/dbmail: MESSAGE
        pkgsrc/mail/dbmail/files: dbmailtimsieved.sh

Log Message:
dbmail: update to 3.5.5

pkgsrc changes:
  package now creates an unprivileged user
  conf file subsitutions for sane pgksrc defaults

3.5.5
  DBMail 3.5.5 offers new features and a few bug fixes, including a new
  authentication method, improved support for Postfix, logging improvements
  and listing forwarders.
DBMail 3.5.4
  Te main changes are better support for docker and systemd, MySQL compression
  and an anomaly in how libzdb handles NULLs.

Version 3.5.3
  Various memory leaks fixed
  Fix invalid free and invalid read
  sieve port changed to 4190 as per rfc5804

3.5.2
  This release focuses on ease of use:
  Long options added
  Man pages updated
  Help refactored

3.5.1
  This release has focused on reliability plus making DBMail easier to install
  and manage with significant improvements in documentation and logging.

3.5.0
  automatic table creation on first install
  Improved logging config
  Required header names added if required
  curl library added for SMTP forwarding
  dbmail-sieved for starttls (deprecated dbmail-timsieved removed)
  Checks refactored for gmime3
  dbmail-announce mailing list added for release and other announcements
  dbmail-general mailing list added for general discussion
  Numerous bug fixes


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 pkgsrc/mail/dbmail/MESSAGE
cvs rdiff -u -r1.87 -r1.88 pkgsrc/mail/dbmail/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/mail/dbmail/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/dbmail/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/dbmail/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/dbmail/files/dbmail.sh \
    pkgsrc/mail/dbmail/files/dbmailimapd.sh \
    pkgsrc/mail/dbmail/files/dbmaillmtpd.sh \
    pkgsrc/mail/dbmail/files/dbmailpop3d.sh
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/dbmail/files/dbmailhttpd.sh \
    pkgsrc/mail/dbmail/files/dbmailsieved.sh
cvs rdiff -u -r1.1 -r0 pkgsrc/mail/dbmail/files/dbmailtimsieved.sh

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

Modified files:

Index: pkgsrc/mail/dbmail/Makefile
diff -u pkgsrc/mail/dbmail/Makefile:1.87 pkgsrc/mail/dbmail/Makefile:1.88
--- pkgsrc/mail/dbmail/Makefile:1.87    Thu Oct 23 20:38:08 2025
+++ pkgsrc/mail/dbmail/Makefile Fri Jan  2 17:57:31 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.87 2025/10/23 20:38:08 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2026/01/02 17:57:31 tnn Exp $
 
-DISTNAME=      dbmail-3.3.1
-PKGREVISION=   11
+DISTNAME=      dbmail-3.5.5
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=dbmail/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,7 +10,10 @@ HOMEPAGE=    https://github.com/dbmail/dbma
 COMMENT=       Store and retrieve mail messages in a database
 LICENSE=       gnu-gpl-v2
 
-USE_TOOLS+=            gmake pkg-config pax
+TOOL_DEPENDS+=         asciidoc-[0-9]*:../../textproc/asciidoc
+TOOL_DEPENDS+=         xmlto-[0-9]*:../../textproc/xmlto
+
+USE_TOOLS+=            gmake pkg-config pax perl
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
@@ -19,22 +21,34 @@ CONFIGURE_ARGS+=    --with-logdir=${VARBASE
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}/run
 CONFIGURE_ARGS+=       --with-zdb=${BUILDLINK_PREFIX.libzdb}
+CONFIGURE_ARGS+=       --enable-manpages
+REPLACE_PERL+=         man/fixsp.pl
 
-BUILD_DEFS+=           VARBASE
+BUILD_DEFS+=           VARBASE DBMAIL_USER DBMAIL_GROUP
 
 EGDIR=                 ${PREFIX}/share/examples/dbmail
 CONF_FILES_PERMS+=     ${EGDIR}/dbmail.conf ${PKG_SYSCONFDIR}/dbmail.conf \
-                         ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0640
-RCD_SCRIPTS=           dbmail dbmailimapd dbmaillmtpd dbmailpop3d
+                         ${DBMAIL_USER} ${DBMAIL_GROUP} 0640
+OWN_DIRS_PERMS+=       ${VARBASE}/log/dbmail ${DBMAIL_USER} ${DBMAIL_GROUP} 0750
+OWN_DIRS_PERMS+=       ${VARBASE}/run/dbmail ${DBMAIL_USER} ${DBMAIL_GROUP} 0750
+RCD_SCRIPTS=           dbmail dbmailhttpd dbmailimapd dbmaillmtpd dbmailpop3d
 DATADIR=               ${PREFIX}/share/dbmail
 
-MESSAGE_SUBST+=                DATADIR=${DATADIR}
-
-SUBST_CLASSES+=                sysconf
-SUBST_STAGE.sysconf=   do-configure
-SUBST_FILES.sysconf=   man/commonopts.txt
-SUBST_SED.sysconf=     -e 's|/etc/dbmail\.conf|${PKG_SYSCONFDIR}/dbmail.conf|g'
-SUBST_MESSAGE.sysconf= Fixing sysconf paths.
+DBMAIL_USER?=          dbmail
+DBMAIL_GROUP?=         dbmail
+PKG_USERS_VARS=                DBMAIL_USER
+PKG_GROUPS_VARS=       DBMAIL_GROUP
+PKG_GROUPS=            ${DBMAIL_GROUP}
+PKG_USERS=             ${DBMAIL_USER}:${DBMAIL_GROUP}
+
+SUBST_CLASSES+=                fix-cfg
+SUBST_STAGE.fix-cfg=   pre-configure
+SUBST_MESSAGE.fix-cfg= Substituting configurtion defaults.
+SUBST_FILES.fix-cfg=   dbmail.conf
+SUBST_SED.fix-cfg=     -e 's,nobody$$,${DBMAIL_USER},g'
+SUBST_SED.fix-cfg+=    -e 's,nogroup$$,${DBMAIL_GROUP},g'
+SUBST_SED.fix-cfg+=    -e 's,/var/run/dbmail$$,${VARBASE}/run/dbmail,g'
+SUBST_SED.fix-cfg+=    -e 's,/var/log/dbmail/dbmail.log$$,${VARBASE}/log/dbmail/dbmail.log,g'
 
 INSTALLATION_DIRS=     lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin ${EGDIR} ${DATADIR}/sql
 
@@ -53,4 +67,5 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8
 .include "../../mail/gmime3/buildlink3.mk"
 .include "../../security/mhash/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/dbmail/PLIST
diff -u pkgsrc/mail/dbmail/PLIST:1.14 pkgsrc/mail/dbmail/PLIST:1.15
--- pkgsrc/mail/dbmail/PLIST:1.14       Sat Oct 29 15:48:59 2022
+++ pkgsrc/mail/dbmail/PLIST    Fri Jan  2 17:57:31 2026
@@ -1,8 +1,20 @@
-@comment $NetBSD: PLIST,v 1.14 2022/10/29 15:48:59 tnn Exp $
+@comment $NetBSD: PLIST,v 1.15 2026/01/02 17:57:31 tnn Exp $
 ${PLIST.ldap}lib/dbmail/libauth_ldap.la
 lib/dbmail/libauth_sql.la
 lib/dbmail/libdbmail.la
 ${PLIST.sieve}lib/dbmail/libsort_sieve.la
+man/man1/dbmail-deliver.1
+man/man1/dbmail.1
+man/man5/dbmail.conf.5
+man/man8/dbmail-export.8
+man/man8/dbmail-httpd.8
+man/man8/dbmail-imapd.8
+man/man8/dbmail-lmtpd.8
+man/man8/dbmail-pop3d.8
+man/man8/dbmail-sievecmd.8
+man/man8/dbmail-sieved.8
+man/man8/dbmail-users.8
+man/man8/dbmail-util.8
 sbin/dbmail-deliver
 sbin/dbmail-export
 sbin/dbmail-httpd
@@ -10,7 +22,7 @@ sbin/dbmail-imapd
 sbin/dbmail-lmtpd
 sbin/dbmail-pop3d
 ${PLIST.sieve}sbin/dbmail-sievecmd
-${PLIST.sieve}sbin/dbmail-timsieved
+${PLIST.sieve}sbin/dbmail-sieved
 sbin/dbmail-users
 sbin/dbmail-util
 share/dbmail/sql/mysql/2_1_7-2_2_0.mysql
@@ -32,7 +44,9 @@ share/dbmail/sql/mysql/upgrades/32003.my
 share/dbmail/sql/mysql/upgrades/32004.mysql
 share/dbmail/sql/mysql/upgrades/32005.mysql
 share/dbmail/sql/mysql/upgrades/32006.mysql
-share/dbmail/sql/mysql/upgrades/upgrade.mysql
+share/dbmail/sql/mysql/upgrades/35001.mysql
+share/dbmail/sql/mysql/upgrades/35002.mysql
+share/dbmail/sql/mysql/upgrades/create_tables.mysql
 share/dbmail/sql/postgresql/2_1_7-2_2_0.pgsql
 share/dbmail/sql/postgresql/2_2-3_0.pgsql
 share/dbmail/sql/postgresql/2_2_5-2_3_0.pgsql
@@ -49,7 +63,9 @@ share/dbmail/sql/postgresql/upgrades/320
 share/dbmail/sql/postgresql/upgrades/32004.psql
 share/dbmail/sql/postgresql/upgrades/32005.psql
 share/dbmail/sql/postgresql/upgrades/32006.psql
-share/dbmail/sql/postgresql/upgrades/upgrade.psql
+share/dbmail/sql/postgresql/upgrades/35001.psql
+share/dbmail/sql/postgresql/upgrades/35002.psql
+share/dbmail/sql/postgresql/upgrades/create_tables.psql
 share/dbmail/sql/sqlite/2_1_7-2_2_0.sqlite
 share/dbmail/sql/sqlite/2_2-3_0.sqlite
 share/dbmail/sql/sqlite/2_2_5-2_3_0.sqlite
@@ -65,8 +81,6 @@ share/dbmail/sql/sqlite/upgrades/32003.s
 share/dbmail/sql/sqlite/upgrades/32004.sqlite
 share/dbmail/sql/sqlite/upgrades/32005.sqlite
 share/dbmail/sql/sqlite/upgrades/32006.sqlite
-share/dbmail/sql/sqlite/upgrades/upgrade.sqlite
+share/dbmail/sql/sqlite/upgrades/35001.sqlite
+share/dbmail/sql/sqlite/upgrades/35002.sqlite
 share/examples/dbmail/dbmail.conf
-@pkgdir man/man8
-@pkgdir man/man5
-@pkgdir man/man1

Index: pkgsrc/mail/dbmail/distinfo
diff -u pkgsrc/mail/dbmail/distinfo:1.21 pkgsrc/mail/dbmail/distinfo:1.22
--- pkgsrc/mail/dbmail/distinfo:1.21    Sat Oct 29 15:48:59 2022
+++ pkgsrc/mail/dbmail/distinfo Fri Jan  2 17:57:31 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.21 2022/10/29 15:48:59 tnn Exp $
+$NetBSD: distinfo,v 1.22 2026/01/02 17:57:31 tnn Exp $
 
-BLAKE2s (dbmail-3.3.1.tar.gz) = f9d06cffb648109ba1e99c9b7908b77f3a61262d4d5eb5b847ba76361dde62bb
-SHA512 (dbmail-3.3.1.tar.gz) = d0324d79d4871cc46ce3bbc5c0d8c2f587d57f262a878f685b776d8e1b4a58a67e5a0f0cf0f48c939dc3424f8a44dd78e929ea2588ab10d0246a10b3ee5c55c5
-Size (dbmail-3.3.1.tar.gz) = 2523029 bytes
+BLAKE2s (dbmail-3.5.5.tar.gz) = 27c6f8c250c2d50975cd64f9dce085c00224394fc0c1a0fd4552c9213de92bfa
+SHA512 (dbmail-3.5.5.tar.gz) = e852b695e5dfb717ca18821855de3ec8c38017a834a4a898f0d8c659eedcd133101cf87b566d1e6dc92b69c0c78715f77b74a550e70023a57044aa4472bcb86b
+Size (dbmail-3.5.5.tar.gz) = 2553083 bytes
 SHA1 (patch-src_dbmail.h.in) = 04feedc90991b5080c6528b01223f190813941a4

Index: pkgsrc/mail/dbmail/options.mk
diff -u pkgsrc/mail/dbmail/options.mk:1.13 pkgsrc/mail/dbmail/options.mk:1.14
--- pkgsrc/mail/dbmail/options.mk:1.13  Sat Aug 15 10:52:50 2020
+++ pkgsrc/mail/dbmail/options.mk       Fri Jan  2 17:57:31 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2020/08/15 10:52:50 tnn Exp $
+# $NetBSD: options.mk,v 1.14 2026/01/02 17:57:31 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.dbmail
 PKG_SUPPORTED_OPTIONS= ldap sieve
@@ -15,11 +15,11 @@ PLIST_VARS+=                ldap sieve
 .include "../../mail/libsieve/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-sieve=${BUILDLINK_PREFIX.libsieve}
 PLIST.sieve=           yes
-FILES_SUBST+=          TIMSIEVED="dbmailtimsieved"
-RCD_SCRIPTS+=          dbmailtimsieved
+FILES_SUBST+=          SIEVED="dbmailsieved"
+RCD_SCRIPTS+=          dbmailsieved
 .else
 CONFIGURE_ARGS+=       --without-sieve
-FILES_SUBST+=          TIMSIEVED=""
+FILES_SUBST+=          SIEVED=""
 .endif
 
 ###

Index: pkgsrc/mail/dbmail/files/dbmail.sh
diff -u pkgsrc/mail/dbmail/files/dbmail.sh:1.2 pkgsrc/mail/dbmail/files/dbmail.sh:1.3
--- pkgsrc/mail/dbmail/files/dbmail.sh:1.2      Sat Nov  3 11:39:50 2007
+++ pkgsrc/mail/dbmail/files/dbmail.sh  Fri Jan  2 17:57:31 2026
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbmail.sh,v 1.2 2007/11/03 11:39:50 obache Exp $
+# $NetBSD: dbmail.sh,v 1.3 2026/01/02 17:57:31 tnn Exp $
 #
 
 # KEYWORD: nostart
@@ -44,7 +44,7 @@ dbmailrcd()
        done
 }
 
-COMMAND_LIST="dbmailimapd dbmailpop3d dbmaillmtpd @TIMSIEVED@"
+COMMAND_LIST="dbmailhttpd dbmailimapd dbmailpop3d dbmaillmtpd @SIEVED@"
 
 name="dbmail"
 start_cmd="forward_commands"
Index: pkgsrc/mail/dbmail/files/dbmailimapd.sh
diff -u pkgsrc/mail/dbmail/files/dbmailimapd.sh:1.2 pkgsrc/mail/dbmail/files/dbmailimapd.sh:1.3
--- pkgsrc/mail/dbmail/files/dbmailimapd.sh:1.2 Sat Nov  3 11:39:50 2007
+++ pkgsrc/mail/dbmail/files/dbmailimapd.sh     Fri Jan  2 17:57:31 2026
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbmailimapd.sh,v 1.2 2007/11/03 11:39:50 obache Exp $
+# $NetBSD: dbmailimapd.sh,v 1.3 2026/01/02 17:57:31 tnn Exp $
 #
 
 # PROVIDE: dbmailimap mail
@@ -12,7 +12,7 @@ name="dbmailimapd"
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/dbmail.conf"
 command="@PREFIX@/sbin/dbmail-imapd"
-pidfile="@VARBASE@/run/dbmail-imapd.pid"
+pidfile="@VARBASE@/run/dbmail/dbmail-imapd.pid"
 
 load_rc_config $name
 run_rc_command "$1"
Index: pkgsrc/mail/dbmail/files/dbmaillmtpd.sh
diff -u pkgsrc/mail/dbmail/files/dbmaillmtpd.sh:1.2 pkgsrc/mail/dbmail/files/dbmaillmtpd.sh:1.3
--- pkgsrc/mail/dbmail/files/dbmaillmtpd.sh:1.2 Sat Nov  3 11:39:50 2007
+++ pkgsrc/mail/dbmail/files/dbmaillmtpd.sh     Fri Jan  2 17:57:31 2026
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbmaillmtpd.sh,v 1.2 2007/11/03 11:39:50 obache Exp $
+# $NetBSD: dbmaillmtpd.sh,v 1.3 2026/01/02 17:57:31 tnn Exp $
 #
 
 # PROVIDE: dbmaillmtp mail
@@ -12,7 +12,7 @@ name="dbmaillmtpd"
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/dbmail.conf"
 command="@PREFIX@/sbin/dbmail-lmtpd"
-pidfile="@VARBASE@/run/dbmail-lmtpd.pid"
+pidfile="@VARBASE@/run/dbmail/dbmail-lmtpd.pid"
 
 load_rc_config $name
 run_rc_command "$1"
Index: pkgsrc/mail/dbmail/files/dbmailpop3d.sh
diff -u pkgsrc/mail/dbmail/files/dbmailpop3d.sh:1.2 pkgsrc/mail/dbmail/files/dbmailpop3d.sh:1.3
--- pkgsrc/mail/dbmail/files/dbmailpop3d.sh:1.2 Sat Nov  3 11:39:50 2007
+++ pkgsrc/mail/dbmail/files/dbmailpop3d.sh     Fri Jan  2 17:57:31 2026
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbmailpop3d.sh,v 1.2 2007/11/03 11:39:50 obache Exp $
+# $NetBSD: dbmailpop3d.sh,v 1.3 2026/01/02 17:57:31 tnn Exp $
 #
 
 # PROVIDE: dbmailpop3 mail
@@ -12,7 +12,7 @@ name="dbmailpop3d"
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/dbmail.conf"
 command="@PREFIX@/sbin/dbmail-pop3d"
-pidfile="@VARBASE@/run/dbmail-pop3d.pid"
+pidfile="@VARBASE@/run/dbmail/dbmail-pop3d.pid"
 
 load_rc_config $name
 run_rc_command "$1"

Added files:

Index: pkgsrc/mail/dbmail/files/dbmailhttpd.sh
diff -u /dev/null pkgsrc/mail/dbmail/files/dbmailhttpd.sh:1.1
--- /dev/null   Fri Jan  2 17:57:31 2026
+++ pkgsrc/mail/dbmail/files/dbmailhttpd.sh     Fri Jan  2 17:57:31 2026
@@ -0,0 +1,18 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: dbmailhttpd.sh,v 1.1 2026/01/02 17:57:31 tnn Exp $
+#
+
+# PROVIDE: dbmailhttp mail
+# REQUIRE: 
+
+. /etc/rc.subr
+
+name="dbmailhttpd"
+rcvar=${name}
+required_files="@PKG_SYSCONFDIR@/dbmail.conf"
+command="@PREFIX@/sbin/dbmail-httpd"
+pidfile="@VARBASE@/run/dbmail/dbmail-httpd.pid"
+
+load_rc_config $name
+run_rc_command "$1"
Index: pkgsrc/mail/dbmail/files/dbmailsieved.sh
diff -u /dev/null pkgsrc/mail/dbmail/files/dbmailsieved.sh:1.1
--- /dev/null   Fri Jan  2 17:57:31 2026
+++ pkgsrc/mail/dbmail/files/dbmailsieved.sh    Fri Jan  2 17:57:31 2026
@@ -0,0 +1,18 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: dbmailsieved.sh,v 1.1 2026/01/02 17:57:31 tnn Exp $
+#
+
+# PROVIDE: dbmailieved mail
+# REQUIRE: 
+
+. /etc/rc.subr
+
+name="dbmailsieved"
+rcvar=${name}
+required_files="@PKG_SYSCONFDIR@/dbmail.conf"
+command="@PREFIX@/sbin/dbmail-sieved"
+pidfile="@VARBASE@/run/dbmail/dbmail-sieved.pid"
+
+load_rc_config $name
+run_rc_command "$1"

Prev by Date: CVS commit: pkgsrc/databases/libzdb
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/databases/libzdb
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index