r1761 - in /experimental/gtkhtml3.14/debian: changelog control rules

[corsac at users.alioth.debian.org]

Author: corsac
Date: Mon Oct  4 18:38:29 2010
New Revision: 1761

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1761
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/gtkhtml3.14/debian/changelog
    experimental/gtkhtml3.14/debian/control
    experimental/gtkhtml3.14/debian/rules

Modified: experimental/gtkhtml3.14/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml3.14/debian/changelog?rev=1761&op=diff
==============================================================================
--- experimental/gtkhtml3.14/debian/changelog (original)
+++ experimental/gtkhtml3.14/debian/changelog Mon Oct  4 18:38:29 2010
@@ -7,15 +7,18 @@
     - rename libgtkhtml-editor0 package to libgtkhtml-editor-3.14-0 to follow
       soname change.
     - add conflicts/replaces to ease transition.
+    - add build-dep on hardening-includes.
   * debian/rules:
     - explicitly disable GTK+ 3 support.
     - add $(API_VER) to libgtkhtml-editor0 name. 
+    - include hardening rules
     - pick flags from dpkg-buildflags
-    - add --as-needed to LDFLAGS and -fPIC to CFLAGS. 
+    - add hardening flags and --as-needed to LDFLAGS
+    - add hardening flags to CFLAGS. 
   * debian/libgtkhtmleditor*.install renamed and edited to follow soname
     change.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 03 Oct 2010 11:48:42 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 04 Oct 2010 11:03:07 +0200
 
 gtkhtml3.14 (3.30.3-1) unstable; urgency=low
 

Modified: experimental/gtkhtml3.14/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml3.14/debian/control?rev=1761&op=diff
==============================================================================
--- experimental/gtkhtml3.14/debian/control (original)
+++ experimental/gtkhtml3.14/debian/control Mon Oct  4 18:38:29 2010
@@ -15,6 +15,7 @@
 Build-Depends: debhelper (>= 7.2.3~),
                cdbs (>= 0.4.37),
                dpkg-dev (>= 1.14.16),
+               hardening-includes,
                pkg-config,
                libtool,
                intltool (>= 0.36.3),

Modified: experimental/gtkhtml3.14/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml3.14/debian/rules?rev=1761&op=diff
==============================================================================
--- experimental/gtkhtml3.14/debian/rules (original)
+++ experimental/gtkhtml3.14/debian/rules Mon Oct  4 18:38:29 2010
@@ -4,6 +4,7 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/hardening-includes/hardening.make
 
 GNOME_MODULE := gtkhtml
 
@@ -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
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed
+CFLAGS+=$(HARDENING_CFLAGS)
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-static --enable-gtk3=no
 DEB_SHLIBDEPS_INCLUDE_gtkhtml$(API_VER) += $(CURDIR)/debian/libgtkhtml$(API_VER)-$(SOVERSION)/usr/lib