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

[Andreas Tille]

Author: tille
Date: 2013-10-25 15:02:37 +0000 (Fri, 25 Oct 2013)
New Revision: 14986

Modified:
   trunk/packages/snap/trunk/debian/changelog
   trunk/packages/snap/trunk/debian/patches/hardening.patch
Log:
Fixed propagation of hardening options


Modified: trunk/packages/snap/trunk/debian/changelog
===================================================================
--- trunk/packages/snap/trunk/debian/changelog	2013-10-25 14:57:53 UTC (rev 14985)
+++ trunk/packages/snap/trunk/debian/changelog	2013-10-25 15:02:37 UTC (rev 14986)
@@ -18,7 +18,6 @@
   * 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
 

Modified: trunk/packages/snap/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/snap/trunk/debian/patches/hardening.patch	2013-10-25 14:57:53 UTC (rev 14985)
+++ trunk/packages/snap/trunk/debian/patches/hardening.patch	2013-10-25 15:02:37 UTC (rev 14986)
@@ -13,6 +13,31 @@
  LIB = -lm
  INC = -IZoe
  
+@@ -58,19 +60,19 @@ default:
+ 	make gcc
+ 
+ $(APP): $(OBJ) $(OBJECTS)
+-	$(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB)
++	$(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB) $(LDFLAGS)
+ 
+ $(APP2): $(OBJ2) $(OBJECTS)
+-	$(CC) -o $(APP2) $(CFLAGS) $(OBJ2) $(OBJECTS) $(LIB)
++	$(CC) -o $(APP2) $(CFLAGS) $(OBJ2) $(OBJECTS) $(LIB) $(LDFLAGS)
+ 
+ $(APP3): $(OBJ3) $(OBJECTS)
+-	$(CC) -o $(APP3) $(CFLAGS) $(OBJ3) $(OBJECTS) $(LIB)
++	$(CC) -o $(APP3) $(CFLAGS) $(OBJ3) $(OBJECTS) $(LIB) $(LDFLAGS)
+ 
+ $(APP4): $(OBJ4) $(OBJECTS)
+-	$(CC) -o $(APP4) $(CFLAGS) $(OBJ4) $(OBJECTS) $(LIB)
++	$(CC) -o $(APP4) $(CFLAGS) $(OBJ4) $(OBJECTS) $(LIB) $(LDFLAGS)
+ 
+ $(APP5): $(OBJ5) $(OBJECTS)
+-	$(CC) -o $(APP5) $(CFLAGS) $(OBJ5) $(OBJECTS) $(LIB)
++	$(CC) -o $(APP5) $(CFLAGS) $(OBJ5) $(OBJECTS) $(LIB) $(LDFLAGS)
+ 
+ clean:
+ 	rm -f *.o $(APP) $(APP2) $(APP3) $(APP4) $(APP5)
 @@ -93,12 +95,12 @@ tar:
  #################
  
@@ -34,7 +59,7 @@
  ###################
 --- a/Zoe/Makefile
 +++ b/Zoe/Makefile
-@@ -55,7 +55,7 @@ DATE = $(shell date +\%Y-\%m-\%d)
+@@ -55,22 +55,22 @@ DATE = $(shell date +\%Y-\%m-\%d)
  ###########
  
  default:
@@ -42,7 +67,27 @@
 +	make gcc CFLAGS="$(CFLAGS)"
  
  $(APP): $(OBJ) $(OBJECTS)
- 	$(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB)
+-	$(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB)
++	$(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB) $(LDFLAGS)
+ 
+ $(APP2): $(OBJ2) $(OBJECTS)
+-	$(CC) -o $(APP2) $(CFLAGS) $(OBJ2) $(OBJECTS) $(LIB)
++	$(CC) -o $(APP2) $(CFLAGS) $(OBJ2) $(OBJECTS) $(LIB) $(LDFLAGS)
+ 
+ $(APP3): $(OBJ3) $(OBJECTS)
+-	$(CC) -o $(APP3) $(CFLAGS) $(OBJ3) $(OBJECTS) $(LIB)
++	$(CC) -o $(APP3) $(CFLAGS) $(OBJ3) $(OBJECTS) $(LIB) $(LDFLAGS)
+ 
+ $(APP4): $(OBJ4) $(OBJECTS)
+-	$(CC) -o $(APP4) $(CFLAGS) $(OBJ4) $(OBJECTS) $(LIB)
++	$(CC) -o $(APP4) $(CFLAGS) $(OBJ4) $(OBJECTS) $(LIB) $(LDFLAGS)
+ 
+ $(APP5): $(OBJ5) $(OBJECTS)
+-	$(CC) -o $(APP5) $(CFLAGS) $(OBJ5) $(OBJECTS) $(LIB)
++	$(CC) -o $(APP5) $(CFLAGS) $(OBJ5) $(OBJECTS) $(LIB) $(LDFLAGS)
+ 
+ clean:
+ 	rm -f *.o $(APP) $(APP2) $(APP3) $(APP4) $(APP5)
 @@ -92,14 +92,14 @@ tar:
  #################