Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_16955785894320"
MIME-Version: 1.0
Date: Sun, 24 Sep 2023 18:03:09 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/mail/dovecot2
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: schmonz@netbsd.org
Message-Id: <20230924180309.A642FFBDB@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_16955785894320
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Sun Sep 24 18:03:09 UTC 2023

Modified Files:
	pkgsrc/mail/dovecot2: distinfo
Added Files:
	pkgsrc/mail/dovecot2/patches:
	    patch-src_lib-storage_index_dbox-common_dbox-storage.c
	    patch-src_lib_compat.h

Log Message:
dovecot2: apply upstream PR to fix macOS build.


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 pkgsrc/mail/dovecot2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/dovecot2/patches/patch-src_lib-storage_index_dbox-common_dbox-storage.c \
    pkgsrc/mail/dovecot2/patches/patch-src_lib_compat.h

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


--_----------=_16955785894320
Content-Disposition: inline
Content-Length: 4170
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/dovecot2/distinfo
diff -u pkgsrc/mail/dovecot2/distinfo:1.121 pkgsrc/mail/dovecot2/distinfo:1.122
--- pkgsrc/mail/dovecot2/distinfo:1.121	Wed Sep 20 18:32:14 2023
+++ pkgsrc/mail/dovecot2/distinfo	Sun Sep 24 18:03:09 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.121 2023/09/20 18:32:14 otis Exp $
+$NetBSD: distinfo,v 1.122 2023/09/24 18:03:09 schmonz Exp $
 
 BLAKE2s (dovecot-2.3.21.tar.gz) = 8279638bc72f97d9787b454e814dbe008b8d40aeed07019dca58ed5e7e2772fb
 SHA512 (dovecot-2.3.21.tar.gz) = 2d463c38639c3fd3d617ee5b1a4e4d0c11362339c4d4d62a5a90164a8b10bc58919545679bbf379139bdb743fdb013033abfddc1fc6401eb8099463cdc2401ca
@@ -9,6 +9,8 @@ SHA1 (patch-ae) = c1e76d75fab4b13d3b9b33
 SHA1 (patch-af) = 15aa10e75845ef258cd6934b8209a7744eb5aa4c
 SHA1 (patch-src_imap_imap-client.h) = 1a2bf95ab6af57d88862a1512624bf263f4c2ce7
 SHA1 (patch-src_lib-ldap_ldap-private.h) = 2d5ce32330ad4164cc75f8d209ba499d37ed01fc
+SHA1 (patch-src_lib-storage_index_dbox-common_dbox-storage.c) = 9c3aaef274726f1b9706dd29870c1d00c2fd0824
+SHA1 (patch-src_lib_compat.h) = 4e8ab6a8fd9e7aaee8c834832eec995cbfd64317
 SHA1 (patch-src_lib_connection.h) = c147511f4ff50e4b5a048c3a363f0af90ee4c6ad
 SHA1 (patch-src_lib_test-file-cache.c) = 7eb5cf9d3a44be141ab1597b270f20bf36547b6c
 SHA1 (patch-src_old-stats_mail-stats.h) = 0d40c618445c089af2646a6864c3e909812282af

Added files:

Index: pkgsrc/mail/dovecot2/patches/patch-src_lib-storage_index_dbox-common_dbox-storage.c
diff -u /dev/null pkgsrc/mail/dovecot2/patches/patch-src_lib-storage_index_dbox-common_dbox-storage.c:1.1
--- /dev/null	Sun Sep 24 18:03:09 2023
+++ pkgsrc/mail/dovecot2/patches/patch-src_lib-storage_index_dbox-common_dbox-storage.c	Sun Sep 24 18:03:09 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_lib-storage_index_dbox-common_dbox-storage.c,v 1.1 2023/09/24 18:03:09 schmonz Exp $
+
+Apply upstream PR #211 to fix macOS build.
+
+--- src/lib-storage/index/dbox-common/dbox-storage.c.orig	2023-09-14 13:17:46.000000000 +0000
++++ src/lib-storage/index/dbox-common/dbox-storage.c
+@@ -293,8 +293,8 @@ int dbox_mailbox_list_cleanup(struct mai
+ 		   if the directory exists. In case, get also the ctime */
+ 		struct stat stats;
+ 		if (stat(path, &stats) == 0) {
+-			last_temp_file_scan = stats.st_atim.tv_sec;
+-			change_time = stats.st_ctim.tv_sec;
++			last_temp_file_scan = ST_ATIME_SEC(stats);
++			change_time = ST_CTIME_SEC(stats);
+ 		} else {
+ 			if (errno != ENOENT)
+ 				e_error(user->event, "stat(%s) failed: %m", path);
Index: pkgsrc/mail/dovecot2/patches/patch-src_lib_compat.h
diff -u /dev/null pkgsrc/mail/dovecot2/patches/patch-src_lib_compat.h:1.1
--- /dev/null	Sun Sep 24 18:03:09 2023
+++ pkgsrc/mail/dovecot2/patches/patch-src_lib_compat.h	Sun Sep 24 18:03:09 2023
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_lib_compat.h,v 1.1 2023/09/24 18:03:09 schmonz Exp $
+
+Apply upstream PR #211 to fix macOS build.
+
+--- src/lib/compat.h.orig	2023-09-14 13:17:46.000000000 +0000
++++ src/lib/compat.h
+@@ -110,15 +110,24 @@ typedef int socklen_t;
+ #  define ST_ATIME_NSEC(st) ((unsigned long)(st).st_atim.tv_nsec)
+ #  define ST_MTIME_NSEC(st) ((unsigned long)(st).st_mtim.tv_nsec)
+ #  define ST_CTIME_NSEC(st) ((unsigned long)(st).st_ctim.tv_nsec)
++#  define ST_ATIME_SEC(st) ((unsigned long)(st).st_atim.tv_sec)
++#  define ST_MTIME_SEC(st) ((unsigned long)(st).st_mtim.tv_sec)
++#  define ST_CTIME_SEC(st) ((unsigned long)(st).st_ctim.tv_sec)
+ #elif defined (HAVE_STAT_XTIMESPEC)
+ #  define HAVE_ST_NSECS
+ #  define ST_ATIME_NSEC(st) ((unsigned long)(st).st_atimespec.tv_nsec)
+ #  define ST_MTIME_NSEC(st) ((unsigned long)(st).st_mtimespec.tv_nsec)
+ #  define ST_CTIME_NSEC(st) ((unsigned long)(st).st_ctimespec.tv_nsec)
++#  define ST_ATIME_SEC(st) ((unsigned long)(st).st_atimespec.tv_sec)
++#  define ST_MTIME_SEC(st) ((unsigned long)(st).st_mtimespec.tv_sec)
++#  define ST_CTIME_SEC(st) ((unsigned long)(st).st_ctimespec.tv_sec)
+ #else
+ #  define ST_ATIME_NSEC(st) 0UL
+ #  define ST_MTIME_NSEC(st) 0UL
+ #  define ST_CTIME_NSEC(st) 0UL
++#  define ST_ATIME_SEC(st) 0UL
++#  define ST_MTIME_SEC(st) 0UL
++#  define ST_CTIME_SEC(st) 0UL
+ #endif
+ 
+ #ifdef HAVE_ST_NSECS


--_----------=_16955785894320--