[Pkg-voip-commits] r9858 - in /kamailio/trunk/debian: backports/squeeze changelog control patches/hardening_flags.patch patches/series rules

tzafrir at alioth.debian.org tzafrir at alioth.debian.org
Thu Jun 28 22:29:45 UTC 2012 

Author: tzafrir
Date: Thu Jun 28 22:29:45 2012
New Revision: 9858

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9858
Log:
* Make sure hardening *FLAGS make it through the build system:
  - hardening_flags.patch: get them through.
  - Use buildflags.mk from dpkg-dev (and require 1.16.1.1).

Added:
    kamailio/trunk/debian/patches/hardening_flags.patch
Modified:
    kamailio/trunk/debian/backports/squeeze
    kamailio/trunk/debian/changelog
    kamailio/trunk/debian/control
    kamailio/trunk/debian/patches/series
    kamailio/trunk/debian/rules

Modified: kamailio/trunk/debian/backports/squeeze
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/backports/squeeze?rev=9858&op=diff
==============================================================================
--- kamailio/trunk/debian/backports/squeeze (original)
+++ kamailio/trunk/debian/backports/squeeze Thu Jun 28 22:29:45 2012
@@ -13,6 +13,10 @@
 sed -i -e  's#debhelper[^,$]*[\ ,$]\+\(.*\)$#debhelper (>= 8), \1#' debian/control
 echo 8 > debian/compat
 
+# Hardening flags
+sed -i -e '/^ dpkg-dev/d' debian/control
+sed -i -e '/^include.*buildflags.mk/d' debian/rules
+
 # No libhiredis:
 sed -i -e '/libhiredis-dev/d' -e '/^Package: kamailio-redis-modules/,/^$/d' \
 	debian/control
@@ -23,4 +27,5 @@
 	debian/control
 sed -i -e 's/ mono[ ,$]*//' debian/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mono/' debian/rules
+
 exit 0

Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9858&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Thu Jun 28 22:29:45 2012
@@ -1,5 +1,6 @@
 kamailio (3.3.0-1) UNRELEASED; urgency=low
 
+  [ Victor Seva ]
   * New upstream release
   * debian/rules:
     + replaced for the kamailio debian/rules. 
@@ -25,6 +26,11 @@
     + using copyright-format/1.0/
   * debian/backports
     + added squeeze script
+
+  [ Tzafrir Cohen ]
+  * Make sure hardening *FLAGS make it through the build system:
+    - hardening_flags.patch: get them through.
+    - Use buildflags.mk from dpkg-dev (and require 1.16.1.1).
 
  -- Victor Seva <linuxmaniac at torreviejawireless.org>  Tue, 26 Jun 2012 08:33:17 +0200
 

Modified: kamailio/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/control?rev=9858&op=diff
==============================================================================
--- kamailio/trunk/debian/control (original)
+++ kamailio/trunk/debian/control Thu Jun 28 22:29:45 2012
@@ -7,7 +7,7 @@
  debhelper (>= 9),
  quilt (>= 0.46-7~),
  docbook-xml,
- dpkg-dev (>= 1.13.19),
+ dpkg-dev (>= 1.16.1.1),
  flex,
  libconfuse-dev,
  libcurl4-gnutls-dev,

Added: kamailio/trunk/debian/patches/hardening_flags.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/hardening_flags.patch?rev=9858&op=file
==============================================================================
--- kamailio/trunk/debian/patches/hardening_flags.patch (added)
+++ kamailio/trunk/debian/patches/hardening_flags.patch Thu Jun 28 22:29:45 2012
@@ -1,0 +1,28 @@
+Description: Do pass hardening {C,CPP,LD}FLAGS
+Author: Tzafrir Cohen <tzafrir at debian.org>
+
+Make sure that the *FLAGS variables set by dpkg-buildflags make it to kamailio:
+* add CPPFLAGS to CFLAGS
+* Don't reset CFLAGS and LDFLAGS
+
+--- a/Makefile.defs
++++ b/Makefile.defs
+@@ -855,8 +855,6 @@ ifeq ($(use_fast_lock), yes)
+ 	found_lock_method=yes
+ endif
+ 
+-CFLAGS=
+-LDFLAGS=
+ C_INCLUDES=
+ # setting CFLAGS
+ ifeq ($(mode), release)
+--- a/Makefile
++++ b/Makefile
+@@ -563,6 +563,7 @@ config.mak: Makefile.defs
+ 	@echo "# this file is autogenerated by make cfg" >$@
+ 	@$(call mapf2,cfg_save_var,saved_fixed_vars,$(@))
+ 	@$(call mapf2,cfg_save_var2,saved_chg_vars,$(@))
++	@echo "CFLAGS += $(CPPFLAGS)" >>$@
+ 	@echo "override makefile_defs:=1" >>$@
+ 	@echo "C_DEFS:=\$$(filter-out \$$(DEFS_RM) \$$(extra_defs),\$$(C_DEFS))" \
+ 					"\$$(extra_defs)"  >>$@

Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=9858&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Thu Jun 28 22:29:45 2012
@@ -2,3 +2,4 @@
 upstream/0002-modules_k-presence_xml-Xcap-auth-reason-when-user-de.patch
 multiarch_support.patch
 no_INSTALL_file.patch
+hardening_flags.patch

Modified: kamailio/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/rules?rev=9858&op=diff
==============================================================================
--- kamailio/trunk/debian/rules (original)
+++ kamailio/trunk/debian/rules Thu Jun 28 22:29:45 2012
@@ -10,6 +10,10 @@
 URL := http://www.kamailio.org/pub/kamailio/$(UPVERSION)/src/kamailio-$(UPVERSION)_src.tar.gz
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -89,6 +93,7 @@
 			cfg_target=/etc/kamailio/ \
 			basedir=$(CURDIR)/debian/kamailio \
 			skip_modules="$(EXCLUDED_MODULES) $(EXTRA_EXCLUDED_MODULES)" \
+			$(shell dpkg-buildflags --export=configure) \
 			group_include="kstandard"
 
 	touch configure-stamp

More information about the Pkg-voip-commits mailing list