CVS commit: pkgsrc/print/cups-base

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov 18 17:38:35 UTC 2025

Modified Files:
        pkgsrc/print/cups-base: Makefile distinfo
        pkgsrc/print/cups-base/patches: patch-config-scripts_cups-compiler.m4

Log Message:
cups-base: Build fixes.

On Darwin, don't run strip during the build. In obscure circumstances
this doesn't work, and we should let the infrastructure handle stripping
binaries anyway, not packages.

Avoid spamming warnings about _FORTIFY_SOURCE being duplicated by
also not specifying it locally. Just let the infrastructure insert the
flag on supported systems.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/print/cups-base/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/print/cups-base/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/print/cups-base/patches/patch-config-scripts_cups-compiler.m4

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

Modified files:

Index: pkgsrc/print/cups-base/Makefile
diff -u pkgsrc/print/cups-base/Makefile:1.78 pkgsrc/print/cups-base/Makefile:1.79
--- pkgsrc/print/cups-base/Makefile:1.78        Thu Oct 23 20:38:58 2025
+++ pkgsrc/print/cups-base/Makefile     Tue Nov 18 17:38:35 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2025/10/23 20:38:58 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2025/11/18 17:38:35 nia Exp $
 
 PKGREVISION= 1
 .include "../../print/cups/Makefile.common"
@@ -39,6 +39,9 @@ CONFIGURE_ARGS+=      --with-tls=gnutls
 
 CONFIGURE_ENV+=                DSOFLAGS=${LDFLAGS:M*:Q}
 
+ALL_ENV.Darwin+=       STRIP= INSTALL_STRIP_LIB=
+MAKE_FLAGS.Darwin+=    STRIP= INSTALL_STRIP_LIB=
+
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 

Index: pkgsrc/print/cups-base/distinfo
diff -u pkgsrc/print/cups-base/distinfo:1.44 pkgsrc/print/cups-base/distinfo:1.45
--- pkgsrc/print/cups-base/distinfo:1.44        Sun Sep 21 18:27:11 2025
+++ pkgsrc/print/cups-base/distinfo     Tue Nov 18 17:38:35 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2025/09/21 18:27:11 wiz Exp $
+$NetBSD: distinfo,v 1.45 2025/11/18 17:38:35 nia Exp $
 
 BLAKE2s (cups-2.4.14-source.tar.gz) = 2ca241d55570f440fce3de4740b4f197300603989945f89d3b024aefcfc724b3
 SHA512 (cups-2.4.14-source.tar.gz) = c6d46b737e2fdf37a429947bc5cc3d752785187aa339bd6de94733576aead29929ae510f960c9842cb7ddc86697d7841e5aa6b9d9c9dece907a2b8f468d038a0
@@ -9,7 +9,7 @@ SHA1 (patch-at) = 9517bff0bf2c892f0723a2
 SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a
 SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e
 SHA1 (patch-config-scripts_cups-common.m4) = f0f35ce3d995569331b6d1c90117fdbbb3f389fb
-SHA1 (patch-config-scripts_cups-compiler.m4) = 5446340c9b4976b0814a72e680025f5cab5da54a
+SHA1 (patch-config-scripts_cups-compiler.m4) = 0804b605a053f5f1d53b633221f37b6498be2837
 SHA1 (patch-config-scripts_cups-directories.m4) = 272a10e2ae70c589a65d73fe788f62fcbb2392b0
 SHA1 (patch-config-scripts_cups-gssapi.m4) = 79de7d8c7bb8b2071817f505412d23fa8df5f68f
 SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df

Index: pkgsrc/print/cups-base/patches/patch-config-scripts_cups-compiler.m4
diff -u pkgsrc/print/cups-base/patches/patch-config-scripts_cups-compiler.m4:1.4 pkgsrc/print/cups-base/patches/patch-config-scripts_cups-compiler.m4:1.5
--- pkgsrc/print/cups-base/patches/patch-config-scripts_cups-compiler.m4:1.4    Tue May 10 20:47:37 2022
+++ pkgsrc/print/cups-base/patches/patch-config-scripts_cups-compiler.m4        Tue Nov 18 17:38:35 2025
@@ -1,11 +1,22 @@
-$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.4 2022/05/10 20:47:37 markd Exp $
+$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.5 2025/11/18 17:38:35 nia Exp $
 
-Disable SSP checks, leave pkgsrc to enable/disable it.
+Disable hardening, leave pkgsrc to enable/disable it.
 PIE needs to be tested with linking.
 
---- config-scripts/cups-compiler.m4.orig       2022-01-27 11:11:42.000000000 +0000
+--- config-scripts/cups-compiler.m4.orig       2025-09-11 16:53:21.000000000 +0000
 +++ config-scripts/cups-compiler.m4
-@@ -131,14 +131,14 @@ AS_IF([test -n "$GCC"], [
+@@ -108,10 +108,6 @@ AS_IF([test -n "$GCC"], [
+     ], [echo "$CXXFLAGS $CFLAGS" | grep -q _FORTIFY_SOURCE], [
+         # Don't add _FORTIFY_SOURCE if it is already there
+     ], [
+-      # Otherwise use the Fortify enhancements to catch any unbounded
+-      # string operations...
+-      CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=3"
+-      CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=3"
+     ])
+ 
+     # Default optimization options...
+@@ -133,14 +129,14 @@ AS_IF([test -n "$GCC"], [
      OLDCFLAGS="$CFLAGS"
      CFLAGS="$CFLAGS -fstack-protector-strong"
      AC_LINK_IFELSE([AC_LANG_PROGRAM()], [
@@ -22,7 +33,7 @@ PIE needs to be tested with linking.
            AC_MSG_RESULT([yes])
        ], [
            AC_MSG_RESULT([no])
-@@ -164,7 +164,7 @@ AS_IF([test -n "$GCC"], [
+@@ -166,7 +162,7 @@ AS_IF([test -n "$GCC"], [
            ])
        ], [*], [
            CFLAGS="$CFLAGS -fPIE -pie"