CVS commit: pkgsrc/mail/imap-uw

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Oct 26 17:28:47 UTC 2025

Modified Files:
        pkgsrc/mail/imap-uw: Makefile distinfo hacks.mk
        pkgsrc/mail/imap-uw/patches: patch-ai patch-az patch-bd
Added Files:
        pkgsrc/mail/imap-uw/patches: patch-src_mlock_mlock.c

Log Message:
mail/imap-uw: fix build with GCC14


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 pkgsrc/mail/imap-uw/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/mail/imap-uw/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/imap-uw/hacks.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/imap-uw/patches/patch-ai
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/imap-uw/patches/patch-az \
    pkgsrc/mail/imap-uw/patches/patch-bd
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/imap-uw/patches/patch-src_mlock_mlock.c

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

Modified files:

Index: pkgsrc/mail/imap-uw/Makefile
diff -u pkgsrc/mail/imap-uw/Makefile:1.155 pkgsrc/mail/imap-uw/Makefile:1.156
--- pkgsrc/mail/imap-uw/Makefile:1.155  Sat Apr 19 07:58:01 2025
+++ pkgsrc/mail/imap-uw/Makefile        Sun Oct 26 17:28:47 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.155 2025/04/19 07:58:01 wiz Exp $
+# $NetBSD: Makefile,v 1.156 2025/10/26 17:28:47 vins Exp $
 #
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
@@ -11,7 +11,7 @@
 
 DISTNAME=      imap-2007f
 PKGNAME=       ${DISTNAME:S/-/-uw-/}
-PKGREVISION=   13
+PKGREVISION=   14
 CATEGORIES=    mail
 #MASTER_SITES= ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=  .tar.Z

Index: pkgsrc/mail/imap-uw/distinfo
diff -u pkgsrc/mail/imap-uw/distinfo:1.52 pkgsrc/mail/imap-uw/distinfo:1.53
--- pkgsrc/mail/imap-uw/distinfo:1.52   Sun Jan 30 04:00:42 2022
+++ pkgsrc/mail/imap-uw/distinfo        Sun Oct 26 17:28:47 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2022/01/30 04:00:42 gutteridge Exp $
+$NetBSD: distinfo,v 1.53 2025/10/26 17:28:47 vins Exp $
 
 BLAKE2s (imap-2007f.tar.Z) = 6e67d03b84ec0fed4db99c81aea92160304c1f0c7c9ece7d5e9c4375f1490621
 SHA512 (imap-2007f.tar.Z) = 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
@@ -11,7 +11,7 @@ SHA1 (patch-ae) = 85e0917ce1934f6789bbce
 SHA1 (patch-af) = f3a7d2dad7b95940bdb7ee812ee19622cc594c75
 SHA1 (patch-ag) = 9c580a6a89f89f798a42e5ee45de87fe8159700a
 SHA1 (patch-ah) = ca68ec33fbf8ac4138669588b32098eb4f156f75
-SHA1 (patch-ai) = 312d2bd29be2f8fc03c24a635afcb0ca4ae33832
+SHA1 (patch-ai) = 249d5b723d13c06920002110469d9fe22fbeaebc
 SHA1 (patch-aj) = 961d90bf0eab651678f5bf04f19742cc4c0ecde3
 SHA1 (patch-al) = aeb9021e41756db7c67346212dbb441ba7d9885a
 SHA1 (patch-am) = f0c5d250d69976c85537c9b8080365e8c2391c9d
@@ -26,11 +26,11 @@ SHA1 (patch-av) = 3851cbacd805dad0c16ba7
 SHA1 (patch-aw) = 4aa5b487426ed583ad137c58e117247b52fef494
 SHA1 (patch-ax) = 0edac03adc6f80102d6063170123b1d1b304cde9
 SHA1 (patch-ay) = a39cd708e2bfb2f03661cefb56249c7243b80c7f
-SHA1 (patch-az) = 3dd4367ef56b921051509e2acafcd91b460ccfa6
+SHA1 (patch-az) = b7255bff909d9a87c7c5ca43fd1e6e382a63351c
 SHA1 (patch-ba) = 9f4784050ad0cd61d9324517821077976485d41c
 SHA1 (patch-bb) = b6b5a5294019c23376187b4ff324bf58fdbc113e
 SHA1 (patch-bc) = ae0119037fee2e94c6b60de3c9efc946ed4cfb68
-SHA1 (patch-bd) = 044ea6110a11aea99121463d772e94c08fece9b3
+SHA1 (patch-bd) = 3d1ffaf08317b3038f491c9e433f898fbcab4112
 SHA1 (patch-be) = 73afbc9f3c65d3adce37a3f1ee7f55e0ec665a54
 SHA1 (patch-bf) = 63c582e88bd6286295d5d9639bafec355278d537
 SHA1 (patch-bg) = c95483ed73d7c6015df99967c0509cf0ea67d28f
@@ -40,4 +40,5 @@ SHA1 (patch-src_c-client_mail.c) = fca90
 SHA1 (patch-src_c-client_misc.c) = d22ca95fb333b5234c66440faf5d6e30a148bad1
 SHA1 (patch-src_c-client_misc.h) = 5cf51d186b04ebb45c79b8042bbdcb01716dd2ce
 SHA1 (patch-src_mlock_Makefile) = 6bf652f597ad21dffa44e01d6cb89525eeaf7fc9
+SHA1 (patch-src_mlock_mlock.c) = 5cdc25f4295479fb772959cb84e51c0a9fa97c01
 SHA1 (patch-src_osdep_unix_ssl__unix.c) = cdb4ce9420f649d7cbd6d1e433336c6be94b10f9

Index: pkgsrc/mail/imap-uw/hacks.mk
diff -u pkgsrc/mail/imap-uw/hacks.mk:1.2 pkgsrc/mail/imap-uw/hacks.mk:1.3
--- pkgsrc/mail/imap-uw/hacks.mk:1.2    Mon Dec 15 11:46:35 2014
+++ pkgsrc/mail/imap-uw/hacks.mk        Sun Oct 26 17:28:47 2025
@@ -1,4 +1,7 @@
-# $NetBSD: hacks.mk,v 1.2 2014/12/15 11:46:35 jperkin Exp $
+# $NetBSD: hacks.mk,v 1.3 2025/10/26 17:28:47 vins Exp $
+
+.if !defined(IMAP_UW_HACKS_MK)
+IMAP_UW_HACKS_MK=      defined
 
 .include "../../mk/compiler.mk"
 
@@ -11,3 +14,29 @@
 PKG_HACKS+=            alpha-codegen
 BUILDLINK_TRANSFORM+=  opt:-O[0-9]*:-O
 .endif
+
+### [Mon Sept 8 17:32:19 UTC 2025 : vins]
+### GCC14 enforces `-Werror=incompatible-pointer-type', which makes imap-uw
+### build fail on SunOS. This is essentially due to bitrotting code in the
+### OS-dependent routines for Solaris, inside the imap-uw codebase.
+### The rationale of using SUBST here is to avoid maintaining multiple
+### patches addressing the same issue.
+
+.if ${OPSYS} == "SunOS"
+
+PKG_HACKS+=            incompatible-pointer-types
+
+SUBST_CLASSES+=                hacks
+SUBST_STAGE.hacks=     pre-configure
+SUBST_MESSAGE.hacks=   Applying fixes for OS-dependent routines on SunOS.
+SUBST_FILES.hacks+=    src/osdep/unix/news.c src/osdep/unix/mh.c \
+                       src/osdep/unix/mix.c src/osdep/unix/mx.c \
+                       src/osdep/unix/os_soln.h src/osdep/unix/scandir.c
+SUBST_SED.hacks+=      -e "s:const struct direct \*name:struct direct \*name:g"
+SUBST_SED.hacks+=      -e "s:void \*d1:const void \*d1:g"
+SUBST_SED.hacks+=      -e "s:void \*d2:const void \*d2:g"
+SUBST_SED.hacks+=      -e "s:const struct direct \**d1:const void \*d1:g"
+SUBST_SED.hacks+=      -e "s:const struct direct \**d2:const void \*d2:g"
+
+.endif
+.endif  # IMAP_UW_HACKS_MK

Index: pkgsrc/mail/imap-uw/patches/patch-ai
diff -u pkgsrc/mail/imap-uw/patches/patch-ai:1.5 pkgsrc/mail/imap-uw/patches/patch-ai:1.6
--- pkgsrc/mail/imap-uw/patches/patch-ai:1.5    Fri Aug  3 17:03:30 2007
+++ pkgsrc/mail/imap-uw/patches/patch-ai        Sun Oct 26 17:28:47 2025
@@ -1,6 +1,8 @@
-$NetBSD: patch-ai,v 1.5 2007/08/03 17:03:30 obache Exp $
+$NetBSD: patch-ai,v 1.6 2025/10/26 17:28:47 vins Exp $
 
---- src/mtest/mtest.c.orig     2007-06-05 20:32:31.000000000 +0000
+Replace gets(). Unsupported as of C11. 
+
+--- src/mtest/mtest.c.orig     2011-07-23 00:20:17.000000000 +0000
 +++ src/mtest/mtest.c
 @@ -41,6 +41,11 @@
  
@@ -14,3 +16,47 @@ $NetBSD: patch-ai,v 1.5 2007/08/03 17:03
  #ifndef unix
  # define unix 0
  #endif
+@@ -83,7 +88,20 @@ void display_body (BODY *body,char *pfx,
+ void status (MAILSTREAM *stream);
+ void prompt (char *msg,char *txt);
+ void smtptest (long debug);
+-
++
++/* fgets wrapper */
++
++char *mgets(char *buf, size_t sz) {
++    if (buf != NULL && sz > 0) {
++      if (fgets(buf, sz, stdin)) {
++            buf[strcspn(buf, "\n")] = '\0';
++          return buf;
++      }
++      *buf = '\0';            /* clear buffer at end of file */
++    }
++    return NULL;
++}
++
+ /* Main program - initialization */
+ 
+ int main ()
+@@ -594,8 +612,9 @@ void status (MAILSTREAM *stream)
+ 
+ void prompt (char *msg,char *txt)
+ {
++  size_t sz = sizeof txt;
+   printf ("%s",msg);
+-  gets (txt);
++  mgets (txt, sz);
+ }
+ 
+ /* Interfaces to C-client */
+@@ -778,8 +797,9 @@ void smtptest (long debug)
+   msg->subject = cpystr (line);
+   puts (" Msg (end with a line with only a '.'):");
+   body->type = TYPETEXT;
++  size_t sz = sizeof line;
+   *text = '\0';
+-  while (gets (line)) {
++  while (mgets (line, sz)) {
+     if (line[0] == '.') {
+       if (line[1] == '\0') break;
+       else strcat (text,".");

Index: pkgsrc/mail/imap-uw/patches/patch-az
diff -u pkgsrc/mail/imap-uw/patches/patch-az:1.3 pkgsrc/mail/imap-uw/patches/patch-az:1.4
--- pkgsrc/mail/imap-uw/patches/patch-az:1.3    Fri Jul 18 10:40:28 2014
+++ pkgsrc/mail/imap-uw/patches/patch-az        Sun Oct 26 17:28:47 2025
@@ -1,16 +1,17 @@
-$NetBSD: patch-az,v 1.3 2014/07/18 10:40:28 ryoon Exp $
+$NetBSD: patch-az,v 1.4 2025/10/26 17:28:47 vins Exp $
 
 --- src/tmail/tmail.c.orig     2011-07-23 00:19:58.000000000 +0000
 +++ src/tmail/tmail.c
-@@ -29,7 +29,6 @@
+@@ -29,7 +29,7 @@
  #include <stdio.h>
  #include <pwd.h>
  #include <errno.h>
 -extern int errno;             /* just in case */
++#include <ctype.h>
  #include <sysexits.h>
  #include <sys/file.h>
  #include <sys/stat.h>
-@@ -559,7 +558,9 @@ int delivery_unsafe (char *path,uid_t ui
+@@ -559,7 +559,9 @@ int delivery_unsafe (char *path,uid_t ui
    case S_IFCHR: strcat (tmp,"character special"); break;
    case S_IFBLK: strcat (tmp,"block special"); break;
    case S_IFLNK: strcat (tmp,"symbolic link"); break;
Index: pkgsrc/mail/imap-uw/patches/patch-bd
diff -u pkgsrc/mail/imap-uw/patches/patch-bd:1.3 pkgsrc/mail/imap-uw/patches/patch-bd:1.4
--- pkgsrc/mail/imap-uw/patches/patch-bd:1.3    Fri Jul 18 10:40:28 2014
+++ pkgsrc/mail/imap-uw/patches/patch-bd        Sun Oct 26 17:28:47 2025
@@ -1,16 +1,17 @@
-$NetBSD: patch-bd,v 1.3 2014/07/18 10:40:28 ryoon Exp $
+$NetBSD: patch-bd,v 1.4 2025/10/26 17:28:47 vins Exp $
 
 --- src/dmail/dmail.c.orig     2011-07-23 00:19:57.000000000 +0000
 +++ src/dmail/dmail.c
-@@ -29,7 +29,6 @@
+@@ -29,7 +29,7 @@
  #include <stdio.h>
  #include <pwd.h>
  #include <errno.h>
 -extern int errno;             /* just in case */
++#include <ctype.h>
  #include <sysexits.h>
  #include <sys/file.h>
  #include <sys/stat.h>
-@@ -438,7 +437,9 @@ int delivery_unsafe (char *path,struct s
+@@ -438,7 +438,9 @@ int delivery_unsafe (char *path,struct s
    case S_IFCHR: strcat (tmp,"character special"); break;
    case S_IFBLK: strcat (tmp,"block special"); break;
    case S_IFLNK: strcat (tmp,"symbolic link"); break;

Added files:

Index: pkgsrc/mail/imap-uw/patches/patch-src_mlock_mlock.c
diff -u /dev/null pkgsrc/mail/imap-uw/patches/patch-src_mlock_mlock.c:1.1
--- /dev/null   Sun Oct 26 17:28:47 2025
+++ pkgsrc/mail/imap-uw/patches/patch-src_mlock_mlock.c Sun Oct 26 17:28:47 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_mlock_mlock.c,v 1.1 2025/10/26 17:28:47 vins Exp $
+
+Needed for write(2). 
+
+--- src/mlock/mlock.c.orig     2011-07-23 00:19:57.000000000 +0000
++++ src/mlock/mlock.c
+@@ -40,6 +40,7 @@
+ #include <netdb.h>
+ #include <ctype.h>
+ #include <string.h>
++#include <unistd.h>
+ 
+ #define LOCKTIMEOUT 5         /* lock timeout in minutes */
+ #define LOCKPROTECTION 0664