[Pkg-xmpp-commits] [SCM] Jabberd2 XMPP server branch, master, updated. upstream/2.2.17-20-g03771f3

[W. van den Akker]

The following commit has been merged in the master branch:
commit 5031263d70707a72212d256b80282ef9f5a3771a
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Wed Jan 16 12:33:53 2013 +0100

    Added hardening options to rules.

diff --git a/debian/changelog b/debian/changelog
index 68608e5..b93e459 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ jabberd2 (2.2.17-1) UNRELEASED; urgency=low
   * debian/init, debian/default: removed resolver entries.
   * debian/rules: removed unrecognized enable-sasl and disable-rpath 
     options.
+  * debian/rules: include hardening options.
   * debian/watch: updated URL (Closes: #543415).
   * debian/dirs, debian/postinst: removed /var/run/jabber2 (Closes: #689538).
   * debian/component.d: removed 20resolver. Resolver is not included anymore
diff --git a/debian/rules b/debian/rules
index 6b66676..b289aea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,23 +8,15 @@ include /usr/share/dpatch/dpatch.make
 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
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -g
-    CONFIGURE_EXTRA_FLAGS += --enable-debug
-endif
-
-DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
-ifeq ($(DEB_HOST_ARCH_OS), linux)
-	CONFIGURE_EXTRA_FLAGS += --enable-mio=epoll
-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
 
 config.status: patch configure
 	dh_testdir

-- 
Jabberd2 XMPP server