CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Nov  7 11:25:33 UTC 2021

Modified Files:
        pkgsrc/mk/compiler: clang.mk gcc.mk
        pkgsrc/mk/defaults: mk.conf

Log Message:
mk: revert RELRO default and cease use of wrappers until some more
substantial changes to infrastructure and testing can be performed
to ensure it's applied universally without breaking anything


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mk/compiler/clang.mk
cvs rdiff -u -r1.231 -r1.232 pkgsrc/mk/compiler/gcc.mk
cvs rdiff -u -r1.321 -r1.322 pkgsrc/mk/defaults/mk.conf

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

Modified files:

Index: pkgsrc/mk/compiler/clang.mk
diff -u pkgsrc/mk/compiler/clang.mk:1.30 pkgsrc/mk/compiler/clang.mk:1.31
--- pkgsrc/mk/compiler/clang.mk:1.30    Sat Nov  6 10:03:32 2021
+++ pkgsrc/mk/compiler/clang.mk Sun Nov  7 11:25:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: clang.mk,v 1.30 2021/11/06 10:03:32 nia Exp $
+# $NetBSD: clang.mk,v 1.31 2021/11/07 11:25:33 nia Exp $
 #
 # This is the compiler definition for the clang compiler.
 #
@@ -74,8 +74,6 @@ _SSP_CFLAGS=          -fstack-protector
 
 .if ${_PKGSRC_USE_RELRO} == "yes"
 _CLANG_LDFLAGS+=       ${_RELRO_LDFLAGS}
-CWRAPPERS_APPEND.cc+=  ${_RELRO_LDFLAGS}
-CWRAPPERS_APPEND.cxx+= ${_RELRO_LDFLAGS}
 .endif
 
 LDFLAGS+=      ${_CLANG_LDFLAGS}

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.231 pkgsrc/mk/compiler/gcc.mk:1.232
--- pkgsrc/mk/compiler/gcc.mk:1.231     Sat Nov  6 10:03:32 2021
+++ pkgsrc/mk/compiler/gcc.mk   Sun Nov  7 11:25:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.231 2021/11/06 10:03:32 nia Exp $
+# $NetBSD: gcc.mk,v 1.232 2021/11/07 11:25:33 nia Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -650,8 +650,6 @@ _GCC_LDFLAGS+=      -L${_dir_} ${COMPILER_RPA
 
 .if ${_PKGSRC_USE_RELRO} == "yes"
 _GCC_LDFLAGS+=         ${_RELRO_LDFLAGS}
-CWRAPPERS_APPEND.cc+=  ${_RELRO_LDFLAGS}
-CWRAPPERS_APPEND.cxx+= ${_RELRO_LDFLAGS}
 .endif
 
 LDFLAGS+=      ${_GCC_LDFLAGS}

Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.321 pkgsrc/mk/defaults/mk.conf:1.322
--- pkgsrc/mk/defaults/mk.conf:1.321    Tue Nov  2 09:02:48 2021
+++ pkgsrc/mk/defaults/mk.conf  Sun Nov  7 11:25:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.321 2021/11/02 09:02:48 nia Exp $
+# $NetBSD: mk.conf,v 1.322 2021/11/07 11:25:33 nia Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -271,14 +271,14 @@ PKGSRC_USE_FORTIFY?= strong
 #
 # Keywords: fortify FORTIFY_SOURCE
 
-PKGSRC_USE_RELRO?= partial
+PKGSRC_USE_RELRO?= no
 # Link with RELRO by default (on supported platforms). This makes the
 # exploitation of some security vulnerabilities more difficult in some cases.
 # Possible values:
 #      no:      Do not pass any flags for RELRO
 #      partial: Pass -Wl,-z,relro
 #      full:    Pass -Wl,-z,relro -Wl,-z,now
-# Default: partial
+# Default: no
 #
 # Keywords: relro