debian: static build no longer needs -fno-stack-protector

From: Kees Cook <kees@debian.org>

I noticed that the debian/rules contains "-fno-stack-protector".  While
this used to be needed a while back, this is no longer required, as the
stack protection code will be statically compiled into the static e2fsprogs
correctly now.

Addresses-Debian-Bug: #573923

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/debian/rules b/debian/rules
index 1c7ea40e55e98570cfa5b580cdff85ae97faa2b4..6cf47a1b594c6db79a4b9ad7ce395bfb664087af 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -227,17 +227,17 @@ ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
        if type diet > /dev/null  2>&1 ; then \
                cd ${staticbuilddir} && AWK=/usr/bin/awk \
                ${topdir}/configure ${STATIC_CONF_FLAGS} \
-               --with-diet-libc CFLAGS="${CFLAGS} -fno-stack-protector"; \
+               --with-diet-libc CFLAGS="${CFLAGS}"; \
        else \
                cd ${staticbuilddir} && AWK=/usr/bin/awk \
                        ${topdir}/configure ${STATIC_CONF_FLAGS} \
-                       CFLAGS="${CFLAGS} -fno-stack-protector"; \
+                       CFLAGS="${CFLAGS}"; \
        fi
 else
        cd ${staticbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
                ${topdir}/configure ${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} \
                --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
-               CFLAGS="${CFLAGS} -fno-stack-protector"
+               CFLAGS="${CFLAGS}"
 endif
        mkdir -p ${STAMPSDIR}
        touch ${CFGSTATICSTAMP}