CVS commit: pkgsrc/mail/safecat

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Mar 19 07:50:47 UTC 2026

Modified Files:
        pkgsrc/mail/safecat: distinfo
        pkgsrc/mail/safecat/patches: patch-hier.c
Added Files:
        pkgsrc/mail/safecat/patches: patch-alloc.c patch-auto-str.c
            patch-install.c patch-instcheck.c patch-readwrite.h patch-safecat.c

Log Message:
safecat: Fix build with recent GCC.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/safecat/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/safecat/patches/patch-alloc.c \
    pkgsrc/mail/safecat/patches/patch-auto-str.c \
    pkgsrc/mail/safecat/patches/patch-install.c \
    pkgsrc/mail/safecat/patches/patch-instcheck.c \
    pkgsrc/mail/safecat/patches/patch-readwrite.h \
    pkgsrc/mail/safecat/patches/patch-safecat.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/safecat/patches/patch-hier.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/safecat/distinfo
diff -u pkgsrc/mail/safecat/distinfo:1.16 pkgsrc/mail/safecat/distinfo:1.17
--- pkgsrc/mail/safecat/distinfo:1.16   Tue Oct 26 10:54:29 2021
+++ pkgsrc/mail/safecat/distinfo        Thu Mar 19 07:50:46 2026
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:54:29 nia Exp $
+$NetBSD: distinfo,v 1.17 2026/03/19 07:50:46 nia Exp $
 
 BLAKE2s (safecat-1.13.tar.gz) = 58a2c076ab94d0fcde2de072d16df7a1e6dafc0fe012d7d2bd720181702fcc22
 SHA512 (safecat-1.13.tar.gz) = e6f7401b55a61f70715b3d222c8286c0125c5e7b3b132e5e8d3c8573a6c45dba75b29a459c7e93d7c0760300f0a62635d8ea4eacde9b0b1ff7637b3f6c63e210
 Size (safecat-1.13.tar.gz) = 33953 bytes
 SHA1 (patch-Makefile) = e6db6ab21c37d4b1ff9d71f9dd4d17880e370725
-SHA1 (patch-hier.c) = b4483673a6eb3a2c55da096a1b01a3a5a9a053a9
+SHA1 (patch-alloc.c) = 4bff394dfd4ac827ce1dd1246608c14a534824cd
+SHA1 (patch-auto-str.c) = e94b4e13edbe0bcf215585598631f7450840a7df
+SHA1 (patch-hier.c) = 01804b50ae8bc58458999a75840e11cf9edb0c57
+SHA1 (patch-install.c) = 2181355ae659abd8c9f4c407a123156b3617c369
+SHA1 (patch-instcheck.c) = c58069f70450adf5b31de508985f1907de2a4cca
+SHA1 (patch-readwrite.h) = 512a2d13eae9f33d534d28bc95d3fdbb8a0b68c1
+SHA1 (patch-safecat.c) = 8513c43536791f03d4292d2f0a7b156a6db5f65b
 SHA1 (patch-tryulong32.c) = 2ffcf9c1dc8ca5182c915ec9b4da571d67d11dec

Index: pkgsrc/mail/safecat/patches/patch-hier.c
diff -u pkgsrc/mail/safecat/patches/patch-hier.c:1.2 pkgsrc/mail/safecat/patches/patch-hier.c:1.3
--- pkgsrc/mail/safecat/patches/patch-hier.c:1.2        Fri Apr  1 11:20:58 2016
+++ pkgsrc/mail/safecat/patches/patch-hier.c    Thu Mar 19 07:50:46 2026
@@ -1,10 +1,22 @@
-$NetBSD: patch-hier.c,v 1.2 2016/04/01 11:20:58 jperkin Exp $
+$NetBSD: patch-hier.c,v 1.3 2026/03/19 07:50:46 nia Exp $
 
 Use PKGMANDIR.
 
 --- hier.c.orig        2001-04-14 11:09:54.000000000 +0000
 +++ hier.c
-@@ -7,11 +7,8 @@ void hier()
+@@ -1,5 +1,11 @@
+ #include "auto_home.h"
+ 
++void h(char *, int, int, int);
++
++void d(char *, char *, int, int, int);
++
++void c(char *, char *, char *file, int, int, int);
++
+ void hier()
+ {
+   h(auto_home,-1,-1,02755);
+@@ -7,11 +13,8 @@ void hier()
    c(auto_home,"bin","safecat",-1,-1,0755);
    c(auto_home,"bin","maildir",-1,-1,0755);
  

Added files:

Index: pkgsrc/mail/safecat/patches/patch-alloc.c
diff -u /dev/null pkgsrc/mail/safecat/patches/patch-alloc.c:1.1
--- /dev/null   Thu Mar 19 07:50:47 2026
+++ pkgsrc/mail/safecat/patches/patch-alloc.c   Thu Mar 19 07:50:46 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-alloc.c,v 1.1 2026/03/19 07:50:46 nia Exp $
+
+Fix build with modern GCC.
+
+--- alloc.c.orig       2026-03-19 07:40:47.554030003 +0000
++++ alloc.c
+@@ -1,7 +1,6 @@
+ #include "alloc.h"
+ #include "error.h"
+-extern char *malloc();
+-extern void free();
++#include <stdlib.h>
+ 
+ #define ALIGNMENT 16 /* XXX: assuming that this alignment is enough */
+ #define SPACE 4096 /* must be multiple of ALIGNMENT */
Index: pkgsrc/mail/safecat/patches/patch-auto-str.c
diff -u /dev/null pkgsrc/mail/safecat/patches/patch-auto-str.c:1.1
--- /dev/null   Thu Mar 19 07:50:47 2026
+++ pkgsrc/mail/safecat/patches/patch-auto-str.c        Thu Mar 19 07:50:46 2026
@@ -0,0 +1,20 @@
+$NetBSD: patch-auto-str.c,v 1.1 2026/03/19 07:50:46 nia Exp $
+
+Fix conflict with libc function.
+
+--- auto-str.c.orig    2000-02-29 04:10:12.000000000 +0000
++++ auto-str.c
+@@ -5,11 +5,12 @@
+ char buf1[256];
+ substdio ss1 = SUBSTDIO_FDBUF(write,1,buf1,sizeof(buf1));
+ 
+-void puts(s)
++void myputs(s)
+ char *s;
+ {
+   if (substdio_puts(&ss1,s) == -1) _exit(111);
+ }
++#define puts myputs
+ 
+ void main(argc,argv)
+ int argc;
Index: pkgsrc/mail/safecat/patches/patch-install.c
diff -u /dev/null pkgsrc/mail/safecat/patches/patch-install.c:1.1
--- /dev/null   Thu Mar 19 07:50:47 2026
+++ pkgsrc/mail/safecat/patches/patch-install.c Thu Mar 19 07:50:46 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-install.c,v 1.1 2026/03/19 07:50:46 nia Exp $
+
+Fix implicit function declarations.
+
+--- install.c.orig     2000-02-29 04:10:12.000000000 +0000
++++ install.c
+@@ -4,6 +4,8 @@
+ #include "open.h"
+ #include "readwrite.h"
+ #include "exit.h"
++#include <sys/stat.h>
++#include <unistd.h>
+ 
+ extern void hier();
+ 
Index: pkgsrc/mail/safecat/patches/patch-instcheck.c
diff -u /dev/null pkgsrc/mail/safecat/patches/patch-instcheck.c:1.1
--- /dev/null   Thu Mar 19 07:50:47 2026
+++ pkgsrc/mail/safecat/patches/patch-instcheck.c       Thu Mar 19 07:50:46 2026
@@ -0,0 +1,21 @@
+$NetBSD: patch-instcheck.c,v 1.1 2026/03/19 07:50:46 nia Exp $
+
+Fix implicit function declarations.
+
+--- instcheck.c.orig   2026-03-19 07:33:03.286024914 +0000
++++ instcheck.c
+@@ -1,5 +1,6 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+ #include "strerr.h"
+ #include "error.h"
+ #include "readwrite.h"
+@@ -101,6 +102,7 @@ int mode;
+   perm("",home,"/",file,S_IFREG,uid,gid,mode);
+ }
+ 
++int
+ main()
+ {
+   hier();
Index: pkgsrc/mail/safecat/patches/patch-readwrite.h
diff -u /dev/null pkgsrc/mail/safecat/patches/patch-readwrite.h:1.1
--- /dev/null   Thu Mar 19 07:50:47 2026
+++ pkgsrc/mail/safecat/patches/patch-readwrite.h       Thu Mar 19 07:50:46 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-readwrite.h,v 1.1 2026/03/19 07:50:46 nia Exp $
+
+Fix implicit function declarations.
+
+--- readwrite.h.orig   2000-02-29 04:10:12.000000000 +0000
++++ readwrite.h
+@@ -1,7 +1,6 @@
+ #ifndef READWRITE_H
+ #define READWRITE_H
+ 
+-extern int read();
+-extern int write();
++#include <unistd.h>
+ 
+ #endif
Index: pkgsrc/mail/safecat/patches/patch-safecat.c
diff -u /dev/null pkgsrc/mail/safecat/patches/patch-safecat.c:1.1
--- /dev/null   Thu Mar 19 07:50:47 2026
+++ pkgsrc/mail/safecat/patches/patch-safecat.c Thu Mar 19 07:50:46 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-safecat.c,v 1.1 2026/03/19 07:50:46 nia Exp $
+
+Fix implicit function declarations.
+
+--- safecat.c.orig     2026-03-19 07:32:32.937755930 +0000
++++ safecat.c
+@@ -24,6 +24,7 @@
+ #include <fcntl.h>
+ #include <signal.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ 
+ /* Support for large files (on Linux systems, if the appropriate
+    compile-time flag is used. */