Package: e2fsprogs
Version: 1.41.10-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu lucid ubuntu-patch

Hello!

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.

Trivial patch attached...

-Kees

-- 
Kees Cook                                            @debian.org
diff -uNrp e2fsprogs-1.41.10~/debian/changelog e2fsprogs-1.41.10/debian/changelog
--- e2fsprogs-1.41.10~/debian/changelog	2010-02-08 20:13:12.000000000 -0800
+++ e2fsprogs-1.41.10/debian/changelog	2010-03-14 17:13:19.472541994 -0700
@@ -1,3 +1,9 @@
+e2fsprogs (1.41.10-2) unstable; urgency=low
+
+  * debian/rules: can be compiled statically with stack protector now.
+
+ -- Kees Cook <k...@debian.org>  Sun, 14 Mar 2010 17:13:08 -0700
+
 e2fsprogs (1.41.10-1) unstable; urgency=low
 
   * New upstream release
diff -uNrp e2fsprogs-1.41.10~/debian/rules e2fsprogs-1.41.10/debian/rules
--- e2fsprogs-1.41.10~/debian/rules	2010-01-30 18:16:20.000000000 -0800
+++ e2fsprogs-1.41.10/debian/rules	2010-03-14 17:12:52.562542938 -0700
@@ -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}

Reply via email to