pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

dovecot24: Reduce diffs to mail/dovecot2 and add todo items



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sat Feb 7 12:09:06 2026 -0500
Changeset:	b631d889fce6c3abd14c2b09ac4f6ace045c4aee

Modified Files:
	dovecot24/COMMIT_MSG
	dovecot24/Makefile
	dovecot24/Makefile.common
	dovecot24/PLIST

Log Message:
dovecot24: Reduce diffs to mail/dovecot2 and add todo items

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b631d889fce6c3abd14c2b09ac4f6ace045c4aee

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

diffstat:
 dovecot24/COMMIT_MSG      | 17 +++++++++++++++++
 dovecot24/Makefile        |  8 ++++++--
 dovecot24/Makefile.common |  6 ++++++
 dovecot24/PLIST           |  2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)

diffs:
diff --git a/dovecot24/COMMIT_MSG b/dovecot24/COMMIT_MSG
index 8d1f14032a..ad2532a767 100644
--- a/dovecot24/COMMIT_MSG
+++ b/dovecot24/COMMIT_MSG
@@ -2,3 +2,20 @@ mail/dovecot24: Add version 2.4.2
 
 Originally packaged by Sad Clouds based on mail/dovecot2, and then
 modified by many in wip.
+
+While a separate package, this is logically an update to mail/dovecot2
+2.3.21.1.
+
+Packaging changes:
+
+  - \todo Explain dropped patches (one by one, even if very briefly),
+    so that a reviewer can be sure each removal is appropriate.
+  - \todo Explain why xz is dropped.
+  - openssl is no longer optional upstream, so the option is removed
+
+Upstream NEWS:
+  
+  - ?? wiki no longer included
+  - ?? change in installed default configs (beyond actual config changes)
+
+\todo
\ No newline at end of file
diff --git a/dovecot24/Makefile b/dovecot24/Makefile
index e2b6865dcd..0c46f67942 100644
--- a/dovecot24/Makefile
+++ b/dovecot24/Makefile
@@ -1,3 +1,5 @@
+# $NetBSD: Makefile,v 1.112 2024/08/19 09:29:56 adam Exp $
+
 .include "../../wip/dovecot24/Makefile.common"
 
 RCD_SCRIPTS=		dovecot
@@ -20,7 +22,7 @@ EGDIR=			${PREFIX}/share/examples/dovecot
 
 CNFS_cmd=		${SED} -ne "s,^share/examples/dovecot/,,p" PLIST
 CNFS=			${CNFS_cmd:sh}
-CONF_FILES=             ${EGDIR}/dovecot.conf ${PKG_SYSCONFDIR}/dovecot/dovecot.conf
+CONF_FILES=		${EGDIR}/dovecot.conf ${PKG_SYSCONFDIR}/dovecot/dovecot.conf
 .for file in ${CNFS}
 CONF_FILES+=		${EGDIR}/${file:Q} ${PKG_SYSCONFDIR}/dovecot/${file:Q}
 .endfor
@@ -47,6 +49,8 @@ post-install: enable-manz-by-replacing-roff-includes-with-symlinks
 	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DESTDIR}${EGDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DESTDIR}${EGDIR}
 
-# Just for REPLACE_PYTHON but it pulls in the whole Python...
+# \todo Decide if dovecot should depend on python, and explain whether
+# settings-history.py is important enough to warrant a python
+# dependency.
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/dovecot24/Makefile.common b/dovecot24/Makefile.common
index b430fe4898..daf36a6e30 100644
--- a/dovecot24/Makefile.common
+++ b/dovecot24/Makefile.common
@@ -1,3 +1,5 @@
+# $NetBSD: Makefile.common,v 1.53 2024/08/19 09:29:56 adam Exp $
+#
 # when updating to a new release, update ABI depends in
 # the buildlink3.mk file as well, since the plugins' version
 # must match (see PR 49563).
@@ -58,6 +60,9 @@ TEST_TARGET=	check
 CONFIGURE_ARGS.SunOS+=	--with-ioloop=poll
 CONFIGURE_ARGS.SunOS+=	--with-notify=none
 
+# \todo This is a change from dovecot2, so keeping it requires
+# justification (vs the view that removing it from the working copy
+# needs justification).
 # Enable platform specific extensions
 CFLAGS.FreeBSD+= -D__BSD_VISIBLE -D__XSI_VISIBLE
 CFLAGS.OpenBSD+= -D__BSD_VISIBLE -D__XSI_VISIBLE
@@ -69,4 +74,5 @@ CFLAGS.SunOS+=   -D__EXTENSIONS__
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+# \todo Explain why every program that uses Makefile.common needs this, vs only the server.
 .include "../../security/openssl/buildlink3.mk"
diff --git a/dovecot24/PLIST b/dovecot24/PLIST
index 943d3f6579..79b04e5970 100644
--- a/dovecot24/PLIST
+++ b/dovecot24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.77 2023/09/20 18:32:14 otis Exp $
 bin/doveadm
 bin/doveconf
 bin/dovecot-sysreport


Home | Main Index | Thread Index | Old Index