Drop explicit stack-protection of pieces of the system [BZ #7065]

diff --git a/ChangeLog b/ChangeLog
index 918c6f97c6797f74cf1cdf49488a626cab6d7b3d..99749a5b75759cf84deeff40dc3d36f4e449c3c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-12-26  Nick Alcock  <nick.alcock@oracle.com>
+
+       [BZ #7065]
+       * login/Makefile (pt_chown-cflags): Remove.
+       * nscd/Makefile (CFLAGS-nscd): Likewise.
+       * resolv/Makefile (CFLAGS-libresolv): Likewise.
+
 2016-12-26  Nick Alcock  <nick.alcock@oracle.com>
 
        [BZ #7065]

diff --git a/login/Makefile b/login/Makefile
index 9ff36d623ea0bdde05ea5d9e0f2887c00909746d..1a6161c96e2b44b94999b1ceaf03de0e73f56812 100644 (file)
--- a/login/Makefile
+++ b/login/Makefile
@@ -58,7 +58,6 @@ CFLAGS-getpt.c = -fexceptions
 ifeq (yesyes,$(have-fpie)$(build-shared))
 pt_chown-cflags += $(pie-ccflag)
 endif
-pt_chown-cflags += $(stack-protector)
 ifeq (yes,$(have-libcap))
 libcap = -lcap
 endif

diff --git a/nscd/Makefile b/nscd/Makefile
index 50bad32ea528b9c5dddac4e5b63f191f48c13bd4..bfd72d515d48a4e2584b195196bf4b17c66ec1ef 100644 (file)
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -84,7 +84,6 @@ CPPFLAGS-nscd += -D_FORTIFY_SOURCE=2
 ifeq (yesyes,$(have-fpie)$(build-shared))
 CFLAGS-nscd += $(pie-ccflag)
 endif
-CFLAGS-nscd += $(stack-protector)
 
 ifeq (yesyes,$(have-fpie)$(build-shared))
 LDFLAGS-nscd = -Wl,-z,now

diff --git a/resolv/Makefile b/resolv/Makefile
index be203683f7b481becb39eb996b01c47e3eed436b..06329e1f5c3aee02a0eb563f0785164383f3493f 100644 (file)
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -90,7 +90,6 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
            -Dgetnetbyname=res_getnetbyname \
            -Dgetnetbyaddr=res_getnetbyaddr
 
-CFLAGS-libresolv += $(stack-protector)
 CFLAGS-res_hconf.c = -fexceptions
 
 # The DNS NSS modules needs the resolver.