[Pkg-xmpp-commits] [SCM] Jabber MUC (Multi User Chat) branch, master, updated. 4c58bfc81ee5c55a96cbf52d160070ce687b61cb

[W. van den Akker]

The following commit has been merged in the master branch:
commit c27482c9f3e506530e1d6f97cd1b71e9a47d2c78
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Fri Jan 18 11:03:12 2013 +0100

    Add hardening options.

diff --git a/debian/changelog b/debian/changelog
index cb7d612..f2d96fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ jabber-muc (0.8-4) UNRELEASED; urgency=low
     - debian/postinst: removed /var/run entries.
     - debian/lintian-overrides: removed. Not needed anymore.
     - debian/rules: removed lintian-overrides copy operation.
+  * debian/rules: include hardening options.
 
  -- Willem van den Akker <wvdakker at wilsoft.nl>  Fri, 18 Jan 2013 10:03:25 +0100
 
diff --git a/debian/rules b/debian/rules
index 5a6a7e0..e9dcd95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,13 +6,15 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+# set hardening option
+include /usr/share/hardening-includes/hardening.make
+
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS)
+export CFLAGS
+export LDFLAGS
 
 configure: configure-stamp
 

-- 
Jabber MUC (Multi User Chat)