CVS commit: pkgsrc/security/libfido2

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Sep  1 09:56:56 UTC 2023

Modified Files:
        pkgsrc/security/libfido2: distinfo
Added Files:
        pkgsrc/security/libfido2/patches: patch-CMakeLists.txt

Log Message:
libfido2: -Werror with arbitrary toolchains considered harmful


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/libfido2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/libfido2/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/security/libfido2/distinfo
diff -u pkgsrc/security/libfido2/distinfo:1.8 pkgsrc/security/libfido2/distinfo:1.9
--- pkgsrc/security/libfido2/distinfo:1.8       Wed Mar 15 14:38:13 2023
+++ pkgsrc/security/libfido2/distinfo   Fri Sep  1 09:56:56 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2023/03/15 14:38:13 adam Exp $
+$NetBSD: distinfo,v 1.9 2023/09/01 09:56:56 nia Exp $
 
 BLAKE2s (libfido2-1.13.0.tar.gz) = bb230689076829bf6d298811c1b4c1d6b6715795747482b4c2b6a8695a0939e3
 SHA512 (libfido2-1.13.0.tar.gz) = 90f8452cee4c9cc72241478e697c5c692ccff5ab27752f2f296c3623ee297d1f80a85a359b4d0656c67790084c116aac921894e762eb52d3a79056e5014c03e7
 Size (libfido2-1.13.0.tar.gz) = 652777 bytes
+SHA1 (patch-CMakeLists.txt) = 7b1f8653d6d6cdd542e866754fd6eaf556277ab3

Added files:

Index: pkgsrc/security/libfido2/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/security/libfido2/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Fri Sep  1 09:56:56 2023
+++ pkgsrc/security/libfido2/patches/patch-CMakeLists.txt       Fri Sep  1 09:56:56 2023
@@ -0,0 +1,43 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2023/09/01 09:56:56 nia Exp $
+
+Remove overzealous compiler options and let pkgsrc define the
+stack protection to use.
+
+--- CMakeLists.txt.orig        2023-02-20 08:21:28.000000000 +0000
++++ CMakeLists.txt
+@@ -90,7 +90,6 @@ if(NOT MSVC)
+ endif()
+ 
+ check_c_compiler_flag("-Wshorten-64-to-32" HAVE_SHORTEN_64_TO_32)
+-check_c_compiler_flag("-Werror -fstack-protector-all" HAVE_STACK_PROTECTOR_ALL)
+ 
+ check_include_files(cbor.h HAVE_CBOR_H)
+ check_include_files(endian.h HAVE_ENDIAN_H)
+@@ -123,7 +122,7 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC
+ try_compile(HAVE_POSIX_IOCTL
+     "${CMAKE_CURRENT_BINARY_DIR}/posix_ioctl_check.o"
+     "${CMAKE_CURRENT_SOURCE_DIR}/openbsd-compat/posix_ioctl_check.c"
+-    COMPILE_DEFINITIONS "-Werror -Woverflow -Wsign-conversion")
++    COMPILE_DEFINITIONS "-Woverflow -Wsign-conversion")
+ 
+ list(APPEND CHECK_VARIABLES
+       HAVE_ARC4RANDOM_BUF
+@@ -295,7 +294,6 @@ else()
+ 
+       add_compile_options(-Wall)
+       add_compile_options(-Wextra)
+-      add_compile_options(-Werror)
+       add_compile_options(-Wshadow)
+       add_compile_options(-Wcast-qual)
+       add_compile_options(-Wwrite-strings)
+@@ -316,10 +314,6 @@ else()
+               add_compile_options(-Wshorten-64-to-32)
+       endif()
+ 
+-      if(HAVE_STACK_PROTECTOR_ALL)
+-              add_compile_options(-fstack-protector-all)
+-      endif()
+-
+       set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g2")
+       set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-omit-frame-pointer")
+       set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2")