dovecot24: fix warnings around re#defining memcpy.

[Olaf Seibert (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Tue Feb 3 19:02:37 2026 +0100
Changeset:	f11bc88feb37bd068a4d41928ac16ad975dc01d3

Modified Files:
	dovecot24/TODO
	dovecot24/distinfo
Added Files:
	dovecot24/patches/patch-src_lib_lib.h

Log Message:
dovecot24: fix warnings around re#defining memcpy.

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

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

diffstat:
 dovecot24/TODO                        | 17 +----------------
 dovecot24/distinfo                    |  1 +
 dovecot24/patches/patch-src_lib_lib.h | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 16 deletions(-)

diffs:
diff --git a/dovecot24/TODO b/dovecot24/TODO
index bbeea909e5..494f5f0f11 100644
--- a/dovecot24/TODO
+++ b/dovecot24/TODO
@@ -2,19 +2,4 @@
 ERROR: [check-interpreter.mk] The interpreter "/usr/bin/env" of "/tmp/pkgsrc/wip/dovecot24/default/.destdir/usr/pkg/libexec/dovecot/settings-history.py" is not allowed.
 *** Error code 1
 
-I get lots of compiler warnings (with gcc12) about re#defining memcpy() such as
-
-  CC       welcome-plugin.lo
-In file included from welcome-plugin.c:3:
-../../../src/lib/lib.h:79: warning: "memcpy" redefined
-   79 | #  define memcpy(dest, src, n) i_memcpy(dest, src, n)
-      |
-In file included from /usr/include/string.h:127,
-                 from ../../../src/lib/lib.h:22:
-/usr/include/ssp/string.h:95: note: this is the location of the previous definition
-   95 | #define memcpy(dst, src, len) __ssp_bos_check3(memcpy, dst, src, len)
-      |
-
-
-The original #define seems to come from the stack smashing protection. Maybe we do not want to override this with whatever i_memcpy() is?
-Or if we do, it should be cleaner, such as with an #undef memcpy beforehand.
+--with-ssl seems to be an non-existing option for configure.
diff --git a/dovecot24/distinfo b/dovecot24/distinfo
index 6f84465f01..b50950831a 100644
--- a/dovecot24/distinfo
+++ b/dovecot24/distinfo
@@ -4,3 +4,4 @@ BLAKE2s (dovecot-2.4.2.tar.gz) = a8356102681d217d8f51c72a366ac0596341cfefe2c6304
 SHA512 (dovecot-2.4.2.tar.gz) = 0524695341abe711d3a811c56156889d6fef7a09becc684c6f1dc1e5add605969ca8794eb7d44bfbc49f70515f22e8640b5828443addecfe4798fb8b174670ae
 Size (dovecot-2.4.2.tar.gz) = 7807240 bytes
 SHA1 (patch-src_lib-var-expand-crypt_Makefile.in) = af912cfaeab81e8948ef9cb9e35629b8ad66b7b2
+SHA1 (patch-src_lib_lib.h) = cac10ddeb45cf4de4f1d3d15d568ae72f403dc7b
diff --git a/dovecot24/patches/patch-src_lib_lib.h b/dovecot24/patches/patch-src_lib_lib.h
new file mode 100644
index 0000000000..10425b7dc2
--- /dev/null
+++ b/dovecot24/patches/patch-src_lib_lib.h
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Fix re-definition warnings like
+
+CC       welcome-plugin.lo
+In file included from welcome-plugin.c:3:
+../../../src/lib/lib.h:79: warning: "memcpy" redefined
+   79 | #  define memcpy(dest, src, n) i_memcpy(dest, src, n)
+      |
+In file included from /usr/include/string.h:127,
+                 from ../../../src/lib/lib.h:22:
+/usr/include/ssp/string.h:95: note: this is the location of the previous definition
+   95 | #define memcpy(dst, src, len) __ssp_bos_check3(memcpy, dst, src, len)
+      |
+
+--- src/lib/lib.h.orig	2026-02-03 17:35:03.025316093 +0000
++++ src/lib/lib.h
+@@ -76,6 +76,7 @@ static inline void *i_memcpy(void *dest,
+ 	return memcpy(dest, src, n);
+ }
+ #ifndef __cplusplus
++#  undef memcpy /* /usr/include/ssp/string.h:95 already defined this; the above i_memcpy() will use that definition. */
+ #  define memcpy(dest, src, n) i_memcpy(dest, src, n)
+ #endif
+