[med-svn] r12682 - in trunk/packages/cdbfasta/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-12-18 15:59:17 +0000 (Tue, 18 Dec 2012)
New Revision: 12682

Added:
   trunk/packages/cdbfasta/trunk/debian/patches/hardening.patch
Modified:
   trunk/packages/cdbfasta/trunk/debian/changelog
   trunk/packages/cdbfasta/trunk/debian/compat
   trunk/packages/cdbfasta/trunk/debian/control
   trunk/packages/cdbfasta/trunk/debian/patches/series
   trunk/packages/cdbfasta/trunk/debian/rules
Log:
debhelper 9 (control+compat) + some manual changes for hardening


Modified: trunk/packages/cdbfasta/trunk/debian/changelog
===================================================================
--- trunk/packages/cdbfasta/trunk/debian/changelog	2012-12-18 15:57:33 UTC (rev 12681)
+++ trunk/packages/cdbfasta/trunk/debian/changelog	2012-12-18 15:59:17 UTC (rev 12682)
@@ -2,6 +2,7 @@
 
   * Initial upload to Debian (Closes: #696233)
   * debian/cdbfasta_usage.html: Add separate upstream documentation
+  * debhelper 9 (control+compat) + some manual changes for hardening
 
  -- Andreas Tille <tille at debian.org>  Tue, 18 Dec 2012 16:41:28 +0100
 

Modified: trunk/packages/cdbfasta/trunk/debian/compat
===================================================================
--- trunk/packages/cdbfasta/trunk/debian/compat	2012-12-18 15:57:33 UTC (rev 12681)
+++ trunk/packages/cdbfasta/trunk/debian/compat	2012-12-18 15:59:17 UTC (rev 12682)
@@ -1 +1 @@
-8
+9

Modified: trunk/packages/cdbfasta/trunk/debian/control
===================================================================
--- trunk/packages/cdbfasta/trunk/debian/control	2012-12-18 15:57:33 UTC (rev 12681)
+++ trunk/packages/cdbfasta/trunk/debian/control	2012-12-18 15:59:17 UTC (rev 12682)
@@ -6,7 +6,7 @@
 Uploaders: Steffen Moeller <moeller at debian.org>,
  Andreas Tille <tille at debian.org>,
  Tim Booth <tbooth at ceh.ac.uk>
-Build-Depends: debhelper (>= 8), zlib1g-dev, help2man
+Build-Depends: debhelper (>= 9), zlib1g-dev, help2man
 Standards-Version: 3.9.4
 Homepage: http://cdbfasta.sourceforge.net/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/cdbfasta/trunk/

Added: trunk/packages/cdbfasta/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/cdbfasta/trunk/debian/patches/hardening.patch	                        (rev 0)
+++ trunk/packages/cdbfasta/trunk/debian/patches/hardening.patch	2012-12-18 15:59:17 UTC (rev 12682)
@@ -0,0 +1,20 @@
+Description: Regard hardening CFLAGS setting
+ Unfortunately I did not succeeded in also injecting LDFLAGS in the same manner.
+ It was simply ignored.  So I decided to override the LINKER variable in debian/rules.
+Author: Andreas Tille <tille at debian.org>
+Date: Tue, 18 Dec 2012 16:41:28 +0100
+
+--- a/Makefile
++++ b/Makefile
+@@ -33,9 +33,9 @@ else
+ endif
+ 
+ ifeq ($(findstring nommap,$(MAKECMDGOALS)),)
+-  CFLAGS = $(DBGFLAGS) $(BASEFLAGS)
++  CFLAGS := $(DBGFLAGS) $(BASEFLAGS) $(CFLAGS)
+ else
+-  CFLAGS = $(DBGFLAGS) $(BASEFLAGS) -DNO_MMAP
++  CFLAGS := $(DBGFLAGS) $(BASEFLAGS) -DNO_MMAP $(CFLAGS)
+ endif
+ 
+ %.o : %.c

Modified: trunk/packages/cdbfasta/trunk/debian/patches/series
===================================================================
--- trunk/packages/cdbfasta/trunk/debian/patches/series	2012-12-18 15:57:33 UTC (rev 12681)
+++ trunk/packages/cdbfasta/trunk/debian/patches/series	2012-12-18 15:59:17 UTC (rev 12682)
@@ -1 +1,2 @@
 workaround-lintian-false-positive
+hardening.patch

Modified: trunk/packages/cdbfasta/trunk/debian/rules
===================================================================
--- trunk/packages/cdbfasta/trunk/debian/rules	2012-12-18 15:57:33 UTC (rev 12681)
+++ trunk/packages/cdbfasta/trunk/debian/rules	2012-12-18 15:59:17 UTC (rev 12682)
@@ -7,8 +7,11 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ 
+	dh $@
 
+override_dh_auto_build:
+	dh_auto_build -- LINKER="g++ $(LDFLAGS)"
+
 override_dh_installman:
 	help2man --no-info --no-discard-stderr --version-option=-v ./cdbfasta |\
 	    sed 's/^Invalid argument:.*//' |\