Update Linux "relro" support (STR #4349)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11683 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index b6e6e67af48ae90cb05af5db879d3bcdcbf592f4..61d434d97c1df22d5e8c0899b2f7a945e571853e 100644 (file)
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -8,6 +8,7 @@ CHANGES IN CUPS V1.7.2
        - Documentation fixes (STR #3259, STR #4346)
        - Fixed the Japanese localization (STR #4385)
        - Added a German localization (STR #4363)
+       - Updated Linux "relro" support (STR #4349)
        - cupsDoIORequest could miss the server status, causing failed lpadmin
          and other administrative commands (STR #4386)
        - cupsEnumDests didn't always call the callback function (STR #4380)

diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index 33c1f47fe7fbe495a2a416a82be5a858ba53ae3b..f5a39f4537e8f9a9ba4514c454cfb53b53315c8d 100644 (file)
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -3,7 +3,7 @@ dnl "$Id$"
 dnl
 dnl Compiler stuff for CUPS.
 dnl
-dnl Copyright 2007-2013 by Apple Inc.
+dnl Copyright 2007-2014 by Apple Inc.
 dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl These coded instructions, statements, and computer programs are the
@@ -185,7 +185,7 @@ if test -n "$GCC"; then
                        # The -z relro option is provided by the Linux linker command to
                        # make relocatable data read-only.
                        if test x$enable_relro = xyes; then
-                               RELROFLAGS="-Wl,-z,relro"
+                               RELROFLAGS="-Wl,-z,relro,-z,now"
                        fi
                        ;;
        esac