[Pkg-voip-commits] [kamailio] 02/02: custom hardening flags

[Victor Seva Lopez]

This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository kamailio.

commit 86442ee246e84fa353179b78db6ca7d845c670a5
Author: Victor Seva <vseva at sipwise.com>
Date:   Fri Aug 16 09:04:59 2013 +0200

    custom hardening flags
---
 debian/changelog |    7 +++++--
 debian/rules     |    7 ++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ac46af..64b759a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kamailio (4.0.3-1) UNRELEASED; urgency=low
+kamailio (4.0.3-1.1) UNRELEASED; urgency=low
 
   * New upstream release
   * debian/control:
@@ -6,8 +6,11 @@ kamailio (4.0.3-1) UNRELEASED; urgency=low
     - add sqlite3 Recommends on sqlite-modules (Close: #715230)
   * debian/patches/default_fifo.patch:
     - fix kamctlrc defaults
+  * debian/rules:
+    - use upstream CC_EXTRA_OPTS and LD_EXTRA_OPTS environment variables
+      to pass hardening flags (Close: #690396)
 
- -- Victor Seva <linuxmaniac at torreviejawireless.org>  Sat, 06 Jul 2013 16:06:23 +0200
+ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Fri, 16 Aug 2013 09:51:20 +0200
 
 kamailio (4.0.2-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index d40ef9b..b6d7564 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,6 +81,11 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
+# CFLAGS + CPPFLAGS -> CC_EXTRA_OPTS
+# LDFLAGS -> LD_EXTRA_OPTS
+CUSTOM_BUILDFLAGS:=$(shell dpkg-buildflags --export=configure| \
+sed -e 's/" CPPFLAGS="/ /' -e 's/CFLAGS/CC_EXTRA_OPTS/g' -e 's/LDFLAGS/LD_EXTRA_OPTS/g')
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -89,7 +94,7 @@ configure-stamp:
 			cfg_target=/etc/kamailio/ \
 			basedir=$(CURDIR)/debian/kamailio \
 			skip_modules="$(EXCLUDED_MODULES) $(EXTRA_EXCLUDED_MODULES)" \
-			$(shell dpkg-buildflags --export=configure) \
+			$(CUSTOM_BUILDFLAGS) \
 			group_include="kstandard" quiet=verbose
 
 	touch configure-stamp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/kamailio.git