[med-svn] r14985 - in trunk/packages/snap/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2013-10-25 14:57:53 +0000 (Fri, 25 Oct 2013)
New Revision: 14985

Added:
   trunk/packages/snap/trunk/debian/patches/hardening.patch
Modified:
   trunk/packages/snap/trunk/debian/changelog
   trunk/packages/snap/trunk/debian/patches/series
   trunk/packages/snap/trunk/debian/rules
Log:
Try to propagate hardening options (not finished yet)


Modified: trunk/packages/snap/trunk/debian/changelog
===================================================================
--- trunk/packages/snap/trunk/debian/changelog	2013-10-25 14:36:48 UTC (rev 14984)
+++ trunk/packages/snap/trunk/debian/changelog	2013-10-25 14:57:53 UTC (rev 14985)
@@ -17,6 +17,8 @@
      - Use help2man to create simple man pages where possible
   * debian/bin/snap: wrapper to set environment variable ZOE to implement
     hint given in 00README installation instructions
+  * debian/patches/hardening.patch: Propagate hardening options
+    TODO: Not finished yet.
 
  -- Andreas Tille <tille at debian.org>  Fri, 25 Oct 2013 16:39:26 +0200
 

Added: trunk/packages/snap/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/snap/trunk/debian/patches/hardening.patch	                        (rev 0)
+++ trunk/packages/snap/trunk/debian/patches/hardening.patch	2013-10-25 14:57:53 UTC (rev 14985)
@@ -0,0 +1,66 @@
+Author: Andreas Tille <tille at debian.org>
+LastChanged: Fri, 25 Oct 2013 16:39:26 +0200
+Description: Propagate Hardening options
+
+--- a/Makefile
++++ b/Makefile
+@@ -2,6 +2,8 @@
+ # Makefile for SNAP  #
+ ######################
+ 
++export CFLAGS LDFLAGS
++
+ LIB = -lm
+ INC = -IZoe
+ 
+@@ -93,12 +95,12 @@ tar:
+ #################
+ 
+ gcc:
+-	cd Zoe; make;
+-	make $(APP)  CC="gcc" CFLAGS="-O2 -Wall -Werror"
+-	make $(APP2) CC="gcc" CFLAGS="-O2 -Wall -Werror"
+-	make $(APP3) CC="gcc" CFLAGS="-O2 -Wall -Werror"
+-	make $(APP4) CC="gcc" CFLAGS="-O2 -Wall -Werror"
+-	make $(APP5) CC="gcc" CFLAGS="-O2 -Wall -Werror"
++	cd Zoe; make CFLAGS="$(CFLAGS)";
++	make $(APP)  CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++	make $(APP2) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++	make $(APP3) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++	make $(APP4) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++	make $(APP5) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
+ 
+ 
+ ###################
+--- a/Zoe/Makefile
++++ b/Zoe/Makefile
+@@ -55,7 +55,7 @@ DATE = $(shell date +\%Y-\%m-\%d)
+ ###########
+ 
+ default:
+-	make gcc
++	make gcc CFLAGS="$(CFLAGS)"
+ 
+ $(APP): $(OBJ) $(OBJECTS)
+ 	$(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB)
+@@ -92,14 +92,14 @@ tar:
+ #################
+ 
+ gcc:
+-	make $(APP)  CC="gcc" CFLAGS="-O2 -Wall -Werror"
++	make $(APP)  CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
+ 
+ all:
+-	make $(APP)  CC="gcc" CFLAGS="-O2 -Wall -Werror"
+-	make $(APP2) CC="gcc" CFLAGS="-O2 -Wall -Werror"
+-	make $(APP3) CC="gcc" CFLAGS="-O2 -Wall -Werror"
+-	make $(APP4) CC="gcc" CFLAGS="-O2 -Wall -Werror"
+-	make $(APP5) CC="gcc" CFLAGS="-O2 -Wall -Werror"
++	make $(APP)  CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++	make $(APP2) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++	make $(APP3) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++	make $(APP4) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++	make $(APP5) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
+ 
+ 
+ ###################

Modified: trunk/packages/snap/trunk/debian/patches/series
===================================================================
--- trunk/packages/snap/trunk/debian/patches/series	2013-10-25 14:36:48 UTC (rev 14984)
+++ trunk/packages/snap/trunk/debian/patches/series	2013-10-25 14:57:53 UTC (rev 14985)
@@ -1 +1,2 @@
 unused-but-set-variable.patch
+hardening.patch

Modified: trunk/packages/snap/trunk/debian/rules
===================================================================
--- trunk/packages/snap/trunk/debian/rules	2013-10-25 14:36:48 UTC (rev 14984)
+++ trunk/packages/snap/trunk/debian/rules	2013-10-25 14:57:53 UTC (rev 14985)
@@ -24,6 +24,9 @@
 	cp -a Zoe/depend Zoe/depend.orig
 	dh_auto_config
 
+override_dh_auto_build:
+	dh_auto_build CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+
 override_dh_installman:
 	mkdir -p $(mandir)
 	help2man --no-info --no-discard-stderr -h "" \