r1993 - in /unstable/evolution-data-server3/debian: changelog compat control rules

[corsac at users.alioth.debian.org]

Author: corsac
Date: Fri Sep 30 19:57:21 2011
New Revision: 1993

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1993
Log:
* debian/control:
  - drop hardening-includes and update debhelper build-dep to 8.9.4 for
    hardening flags
* debian/rules:
  - switch hardening flags setting to dh9 way.
* debian/compat bumped to 9.

Modified:
    unstable/evolution-data-server3/debian/changelog
    unstable/evolution-data-server3/debian/compat
    unstable/evolution-data-server3/debian/control
    unstable/evolution-data-server3/debian/rules

Modified: unstable/evolution-data-server3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server3/debian/changelog?rev=1993&op=diff
==============================================================================
--- unstable/evolution-data-server3/debian/changelog (original)
+++ unstable/evolution-data-server3/debian/changelog Fri Sep 30 19:57:21 2011
@@ -3,8 +3,14 @@
   * New upstream release.
     - correctly use secure connection (if used in imap) when storing mail in
       sent folder.  This fixes CVE-2011-3355.                   closes: #641052
-
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 30 Sep 2011 21:53:18 +0200
+  * debian/control:
+    - drop hardening-includes and update debhelper build-dep to 8.9.4 for
+      hardening flags
+  * debian/rules:
+    - switch hardening flags setting to dh9 way.
+  * debian/compat bumped to 9.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 30 Sep 2011 21:56:24 +0200
 
 evolution-data-server3 (3.0.3-2) unstable; urgency=low
 

Modified: unstable/evolution-data-server3/debian/compat
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server3/debian/compat?rev=1993&op=diff
==============================================================================
--- unstable/evolution-data-server3/debian/compat (original)
+++ unstable/evolution-data-server3/debian/compat Fri Sep 30 19:57:21 2011
@@ -1,1 +1,1 @@
-5
+9

Modified: unstable/evolution-data-server3/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server3/debian/control?rev=1993&op=diff
==============================================================================
--- unstable/evolution-data-server3/debian/control (original)
+++ unstable/evolution-data-server3/debian/control Fri Sep 30 19:57:21 2011
@@ -17,9 +17,8 @@
 Homepage: http://www.gnome.org/projects/evolution/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution-data-server
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server
-Build-Depends: debhelper (>= 7.2.3~),
+Build-Depends: debhelper (>= 8.9.4),
                cdbs (>= 0.4.37),
-               hardening-includes,
                dpkg-dev (>= 1.14.16),
                pkg-config (>= 0.16),
                flex,

Modified: unstable/evolution-data-server3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server3/debian/rules?rev=1993&op=diff
==============================================================================
--- unstable/evolution-data-server3/debian/rules (original)
+++ unstable/evolution-data-server3/debian/rules Fri Sep 30 19:57:21 2011
@@ -8,21 +8,18 @@
 #include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/hardening-includes/hardening.make
 
 GNOME_MODULE := evolution-data-server
 
-DEB_SHLIBDEPS_INCLUDE += debian/tmp/usr/lib
+DEB_SHLIBDEPS_INCLUDE += debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 
 DEB_DH_MAKESHLIBS_ARGS_ALL += -V
 DEB_DH_MAKESHLIBS_ARGS_libcamel-1.2-23 += -V'libcamel-1.2-23 (>= $(DEB_GNOME_VERSION)), libcamel-1.2-23 (<< $(DEB_GNOME_NEXTVERSION))'
 
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 DEB_CONFIGURE_EXTRA_FLAGS += --sysconfdir=/etc \
 	--libexecdir=\$${prefix}/lib/evolution \
@@ -39,12 +36,12 @@
 DEB_FIXPERMS_EXCLUDE_evolution-data-server += usr/lib/evolution/camel-lock-helper*
 
 binary-install/evolution-data-server::
-	chgrp mail $(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel-lock-helper*
-	chmod g+s $(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel-lock-helper*
-	chrpath -d -k $(CURDIR)/debian/evolution-data-server/usr/lib/evolution-data-server/*/*.so \
-		$(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel*1.2
-	rm $(CURDIR)/debian/tmp/usr/lib/evolution-data-server/*/*.la
-	rm $(CURDIR)/debian/tmp/usr/lib/*.la
+	chgrp mail $(CURDIR)/debian/evolution-data-server/usr/lib/$(DEB_HOST_MULTIARCH)/evolution/camel-lock-helper*
+	chmod g+s $(CURDIR)/debian/evolution-data-server/usr/lib/$(DEB_HOST_MULTIARCH)/evolution/camel-lock-helper*
+	chrpath -d -k $(CURDIR)/debian/evolution-data-server/usr/lib/$(DEB_HOST_MULTIARCH)/evolution-data-server/*/*.so \
+		$(CURDIR)/debian/evolution-data-server/usr/lib/$(DEB_HOST_MULTIARCH)/evolution/camel*1.2
+	rm $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/evolution-data-server/*/*.la
+	rm $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
 common-binary-post-install-indep::
 	dh_bugfiles -A