[pkgsrc/trunk]: pkgsrc/mk mk: revert RELRO default and cease use of wrappers ...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/88e7bcc257c3
branches:  trunk
changeset: 769052:88e7bcc257c3
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Nov 07 11:25:33 2021 +0000

description:
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

diffstat:

 mk/compiler/clang.mk |  4 +---
 mk/compiler/gcc.mk   |  4 +---
 mk/defaults/mk.conf  |  6 +++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diffs (62 lines):

diff -r f6a0956e6b56 -r 88e7bcc257c3 mk/compiler/clang.mk
--- a/mk/compiler/clang.mk      Sun Nov 07 10:51:41 2021 +0000
+++ b/mk/compiler/clang.mk      Sun Nov 07 11:25:33 2021 +0000
@@ -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 @@
 
 .if ${_PKGSRC_USE_RELRO} == "yes"
 _CLANG_LDFLAGS+=       ${_RELRO_LDFLAGS}
-CWRAPPERS_APPEND.cc+=  ${_RELRO_LDFLAGS}
-CWRAPPERS_APPEND.cxx+= ${_RELRO_LDFLAGS}
 .endif
 
 LDFLAGS+=      ${_CLANG_LDFLAGS}
diff -r f6a0956e6b56 -r 88e7bcc257c3 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Sun Nov 07 10:51:41 2021 +0000
+++ b/mk/compiler/gcc.mk        Sun Nov 07 11:25:33 2021 +0000
@@ -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 @@
 
 .if ${_PKGSRC_USE_RELRO} == "yes"
 _GCC_LDFLAGS+=         ${_RELRO_LDFLAGS}
-CWRAPPERS_APPEND.cc+=  ${_RELRO_LDFLAGS}
-CWRAPPERS_APPEND.cxx+= ${_RELRO_LDFLAGS}
 .endif
 
 LDFLAGS+=      ${_GCC_LDFLAGS}
diff -r f6a0956e6b56 -r 88e7bcc257c3 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Sun Nov 07 10:51:41 2021 +0000
+++ b/mk/defaults/mk.conf       Sun Nov 07 11:25:33 2021 +0000
@@ -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 @@
 #
 # 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