[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.7-4-ga9bd2d1



The following commit has been merged in the master branch:
commit a9bd2d199b089b664f72a3d4d35ee57583ecb85e
Author: Marc Deslauriers <marc.deslauriers@ubuntu.com>
Date:   Sun May 20 08:53:37 2012 +0200

    t: Fix Ubuntu compatibility in binaries-hardening test
    
      * t/tests/binaries-hardening/debian/Makefile: stack protector and
        relro are enabled by default in Ubuntu. Make sure we specifically
        disable them to properly test lintian.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index f543628..fa51112 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ lintian (2.5.8) UNRELEASED; urgency=low
     + [NT] Generate empty ".so" files used in the test.  This
       resolves an issue where dpkg-source would exclude them
       causing a FTBFS.  (Closes: #673198)
+    + [NT] Fix test failure in derivatives where some hardening
+      flags are enabled by default.  Thanks to Marc Deslauriers
+      for the report and the patch.  (Closes: #673449)
 
  -- Niels Thykier <niels@thykier.net>  Wed, 16 May 2012 13:57:40 +0200
 
diff --git a/t/tests/binaries-hardening/debian/Makefile b/t/tests/binaries-hardening/debian/Makefile
index 40ce958..f6560c2 100644
--- a/t/tests/binaries-hardening/debian/Makefile
+++ b/t/tests/binaries-hardening/debian/Makefile
@@ -1,6 +1,10 @@
 all: weak.1 strong.1
 	# Build without dpkg-buildflags.
-	gcc -o weak hello.c
+	gcc -o weak \
+		-fno-stack-protector \
+		-Wl,-z,norelro \
+		-U_FORTIFY_SOURCE \
+		hello.c
 	gcc -o strong \
 		$(shell dpkg-buildflags --get CPPFLAGS) \
 		$(shell dpkg-buildflags --get CFLAGS) \

-- 
Debian package checker


Reply to: