CVS commit: pkgsrc/security/cfs

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Oct  2 13:01:27 UTC 2026

Modified Files:
        pkgsrc/security/cfs: Makefile distinfo
        pkgsrc/security/cfs/patches: patch-aa

Log Message:
security/cfs: Fix RELRO/LDFLAGS

  - pass LDFLAGS in the environment
  - patch Makefile to add LDFLAGS to ld-invocation gcc calls


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/security/cfs/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/security/cfs/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/cfs/patches/patch-aa

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

Modified files:

Index: pkgsrc/security/cfs/Makefile
diff -u pkgsrc/security/cfs/Makefile:1.43 pkgsrc/security/cfs/Makefile:1.44
--- pkgsrc/security/cfs/Makefile:1.43   Tue May 13 13:47:41 2025
+++ pkgsrc/security/cfs/Makefile        Fri Oct  2 13:01:27 2026
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.43 2025/05/13 13:47:41 gdt Exp $
+# $NetBSD: Makefile,v 1.44 2026/10/02 13:01:27 gdt Exp $
 
 VERSION=               1.5.0
 VERSION_SUFFIX_DIST=
 VERSION_SUFFIX_PKG=
 DISTNAME=              cfs-${VERSION}${VERSION_SUFFIX_DIST}
 PKGNAME=               cfs-${VERSION}${VERSION_SUFFIX_PKG}
+PKGREVSION=            1
 CATEGORIES=            security
 MASTER_SITES=          https://www.bayofrum.net/dist/cfs/
 #OLD_MASTER_SITES=     https://www.mattblaze.org/software/cfs-1.4.1.tar.gz
@@ -42,6 +43,8 @@ MAKE_ENV+=            OPSYS=${OPSYS:Q}
 
 # \todo evaluate
 
+MAKE_ENV+=             LDFLAGS="${LDFLAGS}"
+
 # Required settings necessary to build CFS on various platforms.  This is
 # copied from ${WRKSRC}/Makefile and from browsing the various README files.
 #

Index: pkgsrc/security/cfs/distinfo
diff -u pkgsrc/security/cfs/distinfo:1.19 pkgsrc/security/cfs/distinfo:1.20
--- pkgsrc/security/cfs/distinfo:1.19   Tue May 13 13:47:41 2025
+++ pkgsrc/security/cfs/distinfo        Fri Oct  2 13:01:27 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2025/05/13 13:47:41 gdt Exp $
+$NetBSD: distinfo,v 1.20 2026/10/02 13:01:27 gdt Exp $
 
 BLAKE2s (cfs-1.5.0.tar.gz) = 4ac7764984e910ad73adc16498d127c9a2cd1cede52252ddc425f26e10b260d5
 SHA512 (cfs-1.5.0.tar.gz) = ff776ce9a4837076651758dcaa67e2489cc75d8181d73b2aa7d5b41b66f2ff6c3b451703e8834ae64f52d7289f5dd927d8a514a45cc92f5c58d31a768d3cb539
 Size (cfs-1.5.0.tar.gz) = 110065 bytes
-SHA1 (patch-aa) = f160b243b6722d14d451eaf725a6ca707e4e95ba
+SHA1 (patch-aa) = 737304dd967a9eb65922d83437847427903ffb21
 SHA1 (patch-ab) = dac917a40e5db080cb526b9d0ffe2dd63857c313
 SHA1 (patch-af) = 16dce5ba66737f2222526b3cd689e1381d75c663
 SHA1 (patch-cfs__attach.c) = 6a7908a2051304daaac1d90c115dd06246ab3fc0

Index: pkgsrc/security/cfs/patches/patch-aa
diff -u pkgsrc/security/cfs/patches/patch-aa:1.8 pkgsrc/security/cfs/patches/patch-aa:1.9
--- pkgsrc/security/cfs/patches/patch-aa:1.8    Sat Mar 11 01:54:01 2023
+++ pkgsrc/security/cfs/patches/patch-aa        Fri Oct  2 13:01:27 2026
@@ -1,16 +1,17 @@
-$NetBSD: patch-aa,v 1.8 2023/03/11 01:54:01 gdt Exp $
+$NetBSD: patch-aa,v 1.9 2026/10/02 13:01:27 gdt Exp $
 
 Add stanza for modern NetBSD.  \todo Send upstream.
 
 Adjust Makefile for pkgsrc norms:
 
   - Use PREFIX
+  - Use LDFLAGS (relro)
   - Comment out FreeBSD
   - Uncomment the "fail if not configured" line
   - Change installation to use INSTALL_PROGRAM
     \todo Evaluate PROGRAM vs SCRIPT; this is carried from before.
 
---- Makefile.orig      2022-12-19 22:46:57.638664951 +0000
+--- Makefile.orig      2023-02-15 11:25:27.000000000 +0000
 +++ Makefile
 @@ -48,12 +48,13 @@
  
@@ -66,6 +67,55 @@ Adjust Makefile for pkgsrc norms:
  
  # now you're done with local configuration.
  
+@@ -244,41 +252,41 @@ cfs: cfsd cattach cmkdir cdetach cname c
+       @echo
+ 
+ cfsd: $(OBJS)
+-      $(CC) $(OBJS) $(LIBS) -o cfsd
++      $(CC) $(OBJS) ${LDFLAGS} $(LIBS) -o cfsd
+ 
+ cattach: cattach.o admproto_clnt.o admproto_xdr.o getpass.o cfs_des.o \
+   cfs_cipher.o cfs_bfenc.o cfs_bfsk.o adm.o mcg.o mcgsbox.o shs.o safer.o
+       $(CC) cattach.o admproto_clnt.o admproto_xdr.o cfs_des.o \
+          cfs_bfenc.o cfs_bfsk.o cfs_cipher.o getpass.o adm.o mcg.o \
+-         mcgsbox.o shs.o safer.o $(COMPAT) $(LIBS) -o cattach
++         mcgsbox.o shs.o safer.o $(LDFLAGS) $(COMPAT) $(LIBS) -o cattach
+ 
+ cdetach: cdetach.o admproto_clnt.o admproto_xdr.o adm.o
+       $(CC) cdetach.o adm.o admproto_clnt.o admproto_xdr.o \
+-         $(LIBS) -o cdetach
++         $(LDFLAGS) $(LIBS) -o cdetach
+ 
+ cmkdir: getpass.o adm.o cfs_des.o cfs_cipher.o cmkdir.o mcg.o \
+    mcgsbox.o cfs_bfenc.o cfs_bfsk.o safer.o shs.o truerand.o
+       $(CC) cmkdir.o cfs_des.o cfs_cipher.o getpass.o adm.o mcg.o \
+          cfs_bfenc.o cfs_bfsk.o mcgsbox.o safer.o shs.o truerand.o \
+-         $(COMPAT) -o cmkdir
++         $(LDFLAGS) $(COMPAT) -o cmkdir
+ 
+ cpasswd: getpass.o cfs_des.o cfs_cipher.o cpasswd.o mcg.o \
+    mcgsbox.o cfs_bfenc.o cfs_bfsk.o safer.o shs.o truerand.o
+       $(CC) cpasswd.o cfs_des.o cfs_cipher.o getpass.o mcg.o \
+          mcgsbox.o cfs_bfenc.o cfs_bfsk.o safer.o shs.o \
+-         truerand.o  $(COMPAT) -o cpasswd
++         truerand.o  $(LDFLAGS) $(COMPAT) -o cpasswd
+ 
+ cname: cname.o getpass.o cfs_des.o cfs_cipher.o cfs_adm.o cfs_fh.o \
+    cfs_bfenc.o cfs_bfsk.o cfs_nfs.o mcg.o mcgsbox.o safer.o shs.o
+       $(CC) cname.o getpass.o cfs_des.o cfs_cipher.o cfs_adm.o cfs_fh.o \
+          cfs_nfs.o mcg.o mcgsbox.o cfs_bfenc.o cfs_bfsk.o safer.o \
+-         shs.o $(LIBS) $(COMPAT) -o cname
++         shs.o $(LDFLAGS) $(LIBS) $(COMPAT) -o cname
+ 
+ ccat: ccat.o getpass.o cfs_des.o cfs_cipher.o cfs_adm.o cfs_fh.o cfs_nfs.o \
+    mcg.o mcgsbox.o shs.o safer.o
+       $(CC) ccat.o getpass.o cfs_des.o cfs_cipher.o cfs_adm.o cfs_fh.o \
+          cfs_bfenc.o cfs_bfsk.o cfs_nfs.o mcg.o mcgsbox.o shs.o \
+-         safer.o $(LIBS) $(COMPAT) -o ccat
++         safer.o $(LDFLAGS) $(LIBS) $(COMPAT) -o ccat
+ 
+ $(OBJS): nfsproto.h admproto.h cfs.h mcg.h safer.h shs.h \
+    cfs_bf.h cfs_bfl.h cfs_bfp.h
 @@ -344,10 +352,11 @@ printout: $(SRCS) cfs.h mcg.h safer.h ad
        $(PRINTCMD) $(SRCS) cfs.h mcg.h safer.h admproto.h nfsproto.h