b70c8423a2
- manual merge from master
17 lines
433 B
Diff
17 lines
433 B
Diff
diff -up nss/coreconf/Linux.mk.relro nss/coreconf/Linux.mk
|
|
--- nss/coreconf/Linux.mk.relro 2013-04-09 14:29:45.943228682 -0700
|
|
+++ nss/coreconf/Linux.mk 2013-04-09 14:31:26.194953927 -0700
|
|
@@ -174,6 +174,12 @@ endif
|
|
endif
|
|
endif
|
|
|
|
+# harden DSOs/executables a bit against exploits
|
|
+ifeq (2.6,$(firstword $(sort 2.6 $(OS_RELEASE))))
|
|
+DSO_LDOPTS+=-Wl,-z,relro
|
|
+LDFLAGS += -Wl,-z,relro
|
|
+endif
|
|
+
|
|
USE_SYSTEM_ZLIB = 1
|
|
ZLIB_LIBS = -lz
|
|
|