r1763 - in /experimental/evolution/debian: changelog control rules

[corsac at users.alioth.debian.org]

Author: corsac
Date: Mon Oct  4 18:39:10 2010
New Revision: 1763

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1763
Log:
  - add build-dep on hardening-includes.
  - include hardening rules.
  - add hardening flags and --as-needed to LDFLAGS
  - add hardening flags to CFLAGS.

Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/control
    experimental/evolution/debian/rules

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=1763&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Mon Oct  4 18:39:10 2010
@@ -4,9 +4,12 @@
   * debian/control:
     - bump build-deps for 2.32 release.
     - add  build-dep on libchamplain and geoclue to add contacts map plugin.
+    - add build-dep on hardening-includes.
   * debian/rules:
     - pick flags from dpkg-buildflags.
-    - add --as-needed to LDFLAGS
+    - include hardening rules.
+    - add hardening flags and --as-needed to LDFLAGS
+    - add hardening flags to CFLAGS.
     - explicitly disable GTK3 build.
     - don't disable contact maps, drop pilot conduit disabling (useless now).
   * debian/patches:
@@ -18,7 +21,7 @@
   * debian/evolution-plugins-experimental.install:
     - add contact-maps and dbx-import plugins.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 02 Oct 2010 19:22:03 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 04 Oct 2010 08:15:30 +0200
 
 evolution (2.30.3-2) unstable; urgency=low
 

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=1763&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Mon Oct  4 18:39:10 2010
@@ -17,6 +17,7 @@
 Build-Depends: debhelper (>= 7.2.3~),
                cdbs (>= 0.4.52),
                dpkg-dev (>= 1.14.16),
+               hardening-includes,
                scrollkeeper,
                flex,
                bison,

Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=1763&op=diff
==============================================================================
--- experimental/evolution/debian/rules (original)
+++ experimental/evolution/debian/rules Mon Oct  4 18:39:10 2010
@@ -6,6 +6,7 @@
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk                  
+include /usr/share/hardening-includes/hardening.make
 
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg')
 
@@ -17,11 +18,11 @@
 DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})'
 DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins
 
-
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-CFLAGS += -fPIC
+CFLAGS += $(HARDENING_CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed $(HARDENING_LDFLAGS)
+
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
 	--with-openldap \