r1762 - in /experimental/evolution-data-server/debian: changelog control rules

[corsac at users.alioth.debian.org]

Author: corsac
Date: Mon Oct  4 18:38:40 2010
New Revision: 1762

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

Modified:
    experimental/evolution-data-server/debian/changelog
    experimental/evolution-data-server/debian/control
    experimental/evolution-data-server/debian/rules

Modified: experimental/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/changelog?rev=1762&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/changelog (original)
+++ experimental/evolution-data-server/debian/changelog Mon Oct  4 18:38:40 2010
@@ -10,6 +10,7 @@
     - rename libedataserver, libcamel1.2, libebook1.2, libedataserverui1.2,
       libedata-book1.2, libecal1.2, libedata-cal1.2 packages to follow 
       soname changes.
+    - add build-dep on hardening-includes.
   * debian/patches:
     - 01_imapx_lockup dropped, included upstream.
     - 65_evolution-color dropped as well, not relevant anymore.
@@ -21,8 +22,10 @@
         included upstream.
   * debian/rules:
     - explicitly disable gtk3 build.
-    - get flags from dpkg-buildflags
-    - add --as-needed to LDFLAGS.
+    - get flags from dpkg-buildflags.
+    - include hardening rules.
+    - add hardening and --as-needed to LDFLAGS.
+    - add hardening to CFLAGS.
   * debian/libcamel1.2-14.shlibs: 
     - bump depends/conflicts for 2.32.
     - bump soversion to 19.
@@ -35,7 +38,7 @@
   * debian/libedata-cal1.2-7.install renamed to follow soname change.
   * lintian overrides updated to follow soname changes.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 02 Oct 2010 15:50:36 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 04 Oct 2010 08:38:26 +0200
 
 evolution-data-server (2.30.3-2) unstable; urgency=low
 

Modified: experimental/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/control?rev=1762&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/control (original)
+++ experimental/evolution-data-server/debian/control Mon Oct  4 18:38:40 2010
@@ -20,6 +20,7 @@
 Build-Depends: debhelper (>= 7.2.3~),
                cdbs (>= 0.4.37),
                dh-autoreconf,
+               hardening-includes,
                dpkg-dev (>= 1.14.16),
                pkg-config (>= 0.16),
                flex,

Modified: experimental/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/rules?rev=1762&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/rules (original)
+++ experimental/evolution-data-server/debian/rules Mon Oct  4 18:38:40 2010
@@ -7,6 +7,7 @@
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk                  
+include /usr/share/hardening-includes/hardening.make
 
 
 DEB_SHLIBDEPS_INCLUDE += debian/tmp/usr/lib
@@ -15,8 +16,8 @@
 
 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+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed
 
 DEB_CONFIGURE_EXTRA_FLAGS += --sysconfdir=/etc \
 	--libexecdir=\$${prefix}/lib/evolution \