From f1cae61f79d900a2595bac1ebf834dc4e9b6b578 Mon Sep 17 00:00:00 2001 From: corsac Date: Tue, 15 May 2012 20:16:34 +0000 Subject: [PATCH] - disable silent rules so build logs are useful. - disable building test for now since it fails with gcc-4.7. * debian/lightdm.lintian-overrides added, override warning for hardening checks, we do enable build flags. git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@6990 0c9b3bff-18ee-0310-b944-d1aa2700132f --- debian/changelog | 4 ++++ debian/lightdm.lintian-overrides | 6 ++++++ debian/rules | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 debian/lightdm.lintian-overrides diff --git a/debian/changelog b/debian/changelog index aa26391..1742106 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ lightdm (1.2.2-1) UNRELEASED; urgency=low * New upstream release. closes: #673036 * debian/rules: - build with --parallel. + - disable silent rules so build logs are useful. + - disable building test for now since it fails with gcc-4.7. + * debian/lightdm.lintian-overrides added, override warning for hardening + checks, we do enable build flags. -- Yves-Alexis Perez Tue, 15 May 2012 21:11:43 +0200 diff --git a/debian/lightdm.lintian-overrides b/debian/lightdm.lintian-overrides new file mode 100644 index 0000000..93b3dd5 --- /dev/null +++ b/debian/lightdm.lintian-overrides @@ -0,0 +1,6 @@ +# we do use -fstack-protector and FORTIFY +liblightdm-gobject-1-0: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/liblightdm-gobject-1.so.0.0.0 +liblightdm-qt-2-0: hardening-no-stackprotector usr/lib/x86_64-linux-gnu/liblightdm-qt-2.so.0.0.0 +lightdm: hardening-no-stackprotector usr/bin/dm-tool +lightdm: hardening-no-stackprotector usr/lib/x86_64-linux-gnu/lightdm/lightdm-guest-session-wrapper +lightdm: hardening-no-stackprotector usr/lib/x86_64-linux-gnu/lightdm/lightdm-set-defaults diff --git a/debian/rules b/debian/rules index e0d7ca4..b5ffea3 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) override_dh_auto_configure: - dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=lightdm-xsession --enable-introspection=no + dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=lightdm-xsession --enable-introspection=no --disable-silent-rules --disable-tests override_dh_installinit: dh_installinit --noscripts -- 2.39.2