CVS commit: pkgsrc/mail/majordomo

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Mar 18 17:04:39 UTC 2026

Modified Files:
        pkgsrc/mail/majordomo: distinfo
        pkgsrc/mail/majordomo/patches: patch-ak

Log Message:
majordomo: Fix build with recent GCC


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mail/majordomo/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/majordomo/patches/patch-ak

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

Modified files:

Index: pkgsrc/mail/majordomo/distinfo
diff -u pkgsrc/mail/majordomo/distinfo:1.23 pkgsrc/mail/majordomo/distinfo:1.24
--- pkgsrc/mail/majordomo/distinfo:1.23 Tue Oct 26 10:54:07 2021
+++ pkgsrc/mail/majordomo/distinfo      Wed Mar 18 17:04:39 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2021/10/26 10:54:07 nia Exp $
+$NetBSD: distinfo,v 1.24 2026/03/18 17:04:39 nia Exp $
 
 BLAKE2s (majordomo-1.94.5.tgz) = 74e635a5c657f5e8716c67090090b08edacbbb5bd1fca65737d1aa595e58c833
 SHA512 (majordomo-1.94.5.tgz) = d771ee99f31110676ce526687c8c2f47e0b45afd14643fb10b46bed0e238cd9edc6394fb385ac5ed0bbf19e5ca3c368f7af06a3dc17ccccddac4999678285136
@@ -13,7 +13,7 @@ SHA1 (patch-ag) = 759a32dacb26221d83de97
 SHA1 (patch-ah) = ac08fa5d2fa321afe7fdf72783f8f2c887073bcd
 SHA1 (patch-ai) = ed36da4ae9aced322dd5c9c2119becf54f12a6aa
 SHA1 (patch-aj) = e423f61f6b493ae6ae30dda8b0de3ffa10caeefe
-SHA1 (patch-ak) = ea8a6b5e7ae563dd91fcb727d8c2634bdc65de02
+SHA1 (patch-ak) = 045f90d6dd8b0466a3426318b4b8b56f70d96315
 SHA1 (patch-al) = 776088c5916b1b0516e8abaecd69870ba57f4a76
 SHA1 (patch-am) = 74e46f28cb152e152594d949b0116f1370dd1ae3
 SHA1 (patch-an) = 2e9a38d7d9eb46f472cec555349f19cad0a5036b

Index: pkgsrc/mail/majordomo/patches/patch-ak
diff -u pkgsrc/mail/majordomo/patches/patch-ak:1.5 pkgsrc/mail/majordomo/patches/patch-ak:1.6
--- pkgsrc/mail/majordomo/patches/patch-ak:1.5  Sun Dec 11 11:53:23 2011
+++ pkgsrc/mail/majordomo/patches/patch-ak      Wed Mar 18 17:04:39 2026
@@ -1,30 +1,35 @@
-$NetBSD: patch-ak,v 1.5 2011/12/11 11:53:23 marino Exp $
+$NetBSD: patch-ak,v 1.6 2026/03/18 17:04:39 nia Exp $
 
 add necessary headers
 make it use getpwnam to find uid and gid to set to instead of hardwiring these
 
 --- wrapper.c.orig     1997-08-27 15:01:12.000000000 +0000
 +++ wrapper.c
-@@ -15,11 +15,17 @@ static char rcs_header[] = "$Header: /so
+@@ -15,11 +15,11 @@ static char rcs_header[] = "$Header: /so
  
  #include <stdio.h>
  #include <sysexits.h>
+-
+-#if defined(sun) && defined(sparc)
 +#include <pwd.h>
 +#include <errno.h>
- 
--#if defined(sun) && defined(sparc)
-+#if (defined(sun) && defined(sparc)) || defined(__NetBSD__)
  #include <stdlib.h>
- #endif
- 
-+#ifdef __NetBSD__
+-#endif
+-
 +#include <sys/types.h>
 +#include <unistd.h>
-+#endif
  
  #ifndef STRCHR
  #  include <string.h>
-@@ -65,6 +71,9 @@ main(argc, argv, env)
+@@ -57,6 +57,7 @@ char * new_env[] = {
+     
+ int new_env_size = 7;                         /* to prevent overflow problems */
+ 
++int
+ main(argc, argv, env)
+     int argc;
+     char * argv[];
+@@ -65,6 +66,9 @@ main(argc, argv, env)
  {
      char * prog;
      int e, i;
@@ -34,7 +39,7 @@ make it use getpwnam to find uid and gid
  
      if (argc < 2) {
        fprintf(stderr, "USAGE: %s program [<arg> ...]\n", argv[0]);
-@@ -115,7 +124,6 @@ main(argc, argv, env)
+@@ -115,7 +119,6 @@ main(argc, argv, env)
      int groups[] =  { POSIX_GID, 0 };
      if (setgroups(1, groups) == -1) {
  #endif
@@ -42,7 +47,7 @@ make it use getpwnam to find uid and gid
  
        fprintf(stderr, "%s: error setgroups failed errno %d", argv[0],
                errno);
-@@ -123,7 +131,16 @@ main(argc, argv, env)
+@@ -123,7 +126,16 @@ main(argc, argv, env)
  }
  #endif
          
@@ -59,7 +64,7 @@ make it use getpwnam to find uid and gid
  #ifdef POSIX_GID
      setgid(POSIX_GID);
  #else
-@@ -135,6 +152,7 @@ main(argc, argv, env)
+@@ -135,6 +147,7 @@ main(argc, argv, env)
  #else
      setuid(geteuid());
  #endif