CVS commit: pkgsrc/chat/mumble

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Dec 17 16:25:39 UTC 2025

Modified Files:
        pkgsrc/chat/mumble: distinfo
Added Files:
        pkgsrc/chat/mumble/patches: patch-cmake_compiler.cmake

Log Message:
mumble: Let infrastructure handle hardening.

Should help the SunOS build, where some of these hardening flags are
unsupported.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/chat/mumble/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/mumble/patches/patch-cmake_compiler.cmake

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

Modified files:

Index: pkgsrc/chat/mumble/distinfo
diff -u pkgsrc/chat/mumble/distinfo:1.12 pkgsrc/chat/mumble/distinfo:1.13
--- pkgsrc/chat/mumble/distinfo:1.12    Thu Mar 21 10:34:10 2024
+++ pkgsrc/chat/mumble/distinfo Wed Dec 17 16:25:39 2025
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.12 2024/03/21 10:34:10 nia Exp $
+$NetBSD: distinfo,v 1.13 2025/12/17 16:25:39 nia Exp $
 
 BLAKE2s (mumble-1.4.287.tar.gz) = 3de53d3709cccb51c93c6efa192633e14b9bd48fe7f9c25f7782cbb9c020c86b
 SHA512 (mumble-1.4.287.tar.gz) = 34ed30c18257ba8deae6938009a90147c8bc3a0aca28e69bea7ec0262e8d2cdacb9a840fac7d3dd623a52ef8d5903ed5424b62b483af21d6df6aa9632eae9d82
 Size (mumble-1.4.287.tar.gz) = 9457292 bytes
+SHA1 (patch-cmake_compiler.cmake) = ebd1066e2efbe9ab66bfe92c7d8dcb338448a928
 SHA1 (patch-overlay__gl_init__unix.c) = e8db446ee6b62af5c8e580a3927664c9b52bf4f7
 SHA1 (patch-src_HostAddress.cpp) = 34ea0777f76dc236e96b83e43ba486952c676a1c
 SHA1 (patch-src_ProcessResolver.cpp) = f75286127d01c2f44308d6483e2af5b5e7bc1304

Added files:

Index: pkgsrc/chat/mumble/patches/patch-cmake_compiler.cmake
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-cmake_compiler.cmake:1.1
--- /dev/null   Wed Dec 17 16:25:39 2025
+++ pkgsrc/chat/mumble/patches/patch-cmake_compiler.cmake       Wed Dec 17 16:25:39 2025
@@ -0,0 +1,38 @@
+$NetBSD: patch-cmake_compiler.cmake,v 1.1 2025/12/17 16:25:39 nia Exp $
+
+Let infrastructure insert hardening options where supported.
+
+--- cmake/compiler.cmake.orig  2025-12-17 13:33:34.185032683 +0000
++++ cmake/compiler.cmake
+@@ -107,31 +107,6 @@ elseif(UNIX OR MINGW)
+                       )
+               endif()
+       else()
+-              if(NOT MINGW)
+-                      add_link_options(
+-                              "-Wl,-z,relro"
+-                              "-Wl,-z,now"
+-                      )
+-              endif()
+-
+-              # Ensure _FORTIFY_SOURCE is not used in debug builds.
+-              #
+-              # First, ensure _FORTIFY_SOURCE is undefined.
+-              # Then -- and, only for release builds -- set _FORTIFY_SOURCE=2.
+-              #
+-              # We can't use _FORTIFY_SOURCE in debug builds (which are built with -O0) because _FORTIFY_SOURCE=1 requires -O1 and _FORTIFY_SOURCE=2 requires -O2.
+-              # Modern GLIBCs warn about this since https://sourceware.org/bugzilla/show_bug.cgi?id=13979.
+-              # In Mumble builds with warnings-as-errors, this will cause build failures.
+-              add_compile_options("-U_FORTIFY_SOURCE")
+-
+-              if(NOT MINGW)
+-                      add_compile_options($<$<CONFIG:Debug>:-fstack-protector>)
+-              endif()
+-
+-              add_compile_options(
+-                      $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>
+-              )
+-
+               add_link_options(
+                       $<$<CONFIG:Debug>:-Wl,--no-add-needed>
+               )