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

[Sascha Steinbiss]

Author: satta
Date: 2016-07-17 18:24:39 +0000 (Sun, 17 Jul 2016)
New Revision: 22587

Modified:
   trunk/packages/snap/trunk/debian/changelog
   trunk/packages/snap/trunk/debian/patches/build-with-gcc-6.patch
   trunk/packages/snap/trunk/debian/patches/hardening.patch
Log:
fix GCC6 building + hardening


Modified: trunk/packages/snap/trunk/debian/changelog
===================================================================
--- trunk/packages/snap/trunk/debian/changelog	2016-07-17 17:43:56 UTC (rev 22586)
+++ trunk/packages/snap/trunk/debian/changelog	2016-07-17 18:24:39 UTC (rev 22587)
@@ -1,3 +1,12 @@
+snap (2013-11-29-3) unstable; urgency=medium
+
+  * Team upload.
+  * add CPPFLAGS for full hardening.
+  * Fix building with GCC 6 by addressing a bug in zoeTools.c.
+    Closes: 831165.
+
+ -- Sascha Steinbiss <satta at debian.org>  Sun, 17 Jul 2016 17:43:09 +0000
+
 snap (2013-11-29-2) unstable; urgency=medium
 
   [ Andreas Tille ]

Modified: trunk/packages/snap/trunk/debian/patches/build-with-gcc-6.patch
===================================================================
--- trunk/packages/snap/trunk/debian/patches/build-with-gcc-6.patch	2016-07-17 17:43:56 UTC (rev 22586)
+++ trunk/packages/snap/trunk/debian/patches/build-with-gcc-6.patch	2016-07-17 18:24:39 UTC (rev 22587)
@@ -50,3 +50,18 @@
  void zoeDeleteScoreSystem (zoeScoreSystem s) {
  	int i;
  	for (i = 0; i < 22; i++) zoeFree(s->score[i]);
+--- a/Zoe/zoeTools.c
++++ b/Zoe/zoeTools.c
+@@ -149,10 +149,11 @@
+ 	do {
+ 		s[i++] = n % 10 + '0';
+ 	} while ((n /= 10) > 0);
+-	if (sign < 0)
++	if (sign < 0) {
+ 		s[i++] = '-';
+ 		s[i] = '\0';
+ 		reverse_string(s);
++	}
+ }
+ 
+ /* coor_t */

Modified: trunk/packages/snap/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/snap/trunk/debian/patches/hardening.patch	2016-07-17 17:43:56 UTC (rev 22586)
+++ trunk/packages/snap/trunk/debian/patches/hardening.patch	2016-07-17 18:24:39 UTC (rev 22587)
@@ -13,32 +13,32 @@
  LIB = -lm
  INC = -IZoe
  
-@@ -58,19 +60,19 @@ default:
+@@ -58,19 +60,19 @@
  	make gcc
  
  $(APP): $(OBJ) $(OBJECTS)
 -	$(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB)
-+	$(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB) $(LDFLAGS)
++	$(CC) -o $(APP) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(OBJECTS) $(LIB) $(LDFLAGS)
  
  $(APP2): $(OBJ2) $(OBJECTS)
 -	$(CC) -o $(APP2) $(CFLAGS) $(OBJ2) $(OBJECTS) $(LIB)
-+	$(CC) -o $(APP2) $(CFLAGS) $(OBJ2) $(OBJECTS) $(LIB) $(LDFLAGS)
++	$(CC) -o $(APP2) $(CFLAGS) $(CPPFLAGS) $(OBJ2) $(OBJECTS) $(LIB) $(LDFLAGS)
  
  $(APP3): $(OBJ3) $(OBJECTS)
 -	$(CC) -o $(APP3) $(CFLAGS) $(OBJ3) $(OBJECTS) $(LIB)
-+	$(CC) -o $(APP3) $(CFLAGS) $(OBJ3) $(OBJECTS) $(LIB) $(LDFLAGS)
++	$(CC) -o $(APP3) $(CFLAGS) $(CPPFLAGS) $(OBJ3) $(OBJECTS) $(LIB) $(LDFLAGS)
  
  $(APP4): $(OBJ4) $(OBJECTS)
 -	$(CC) -o $(APP4) $(CFLAGS) $(OBJ4) $(OBJECTS) $(LIB)
-+	$(CC) -o $(APP4) $(CFLAGS) $(OBJ4) $(OBJECTS) $(LIB) $(LDFLAGS)
++	$(CC) -o $(APP4) $(CFLAGS) $(CPPFLAGS) $(OBJ4) $(OBJECTS) $(LIB) $(LDFLAGS)
  
  $(APP5): $(OBJ5) $(OBJECTS)
 -	$(CC) -o $(APP5) $(CFLAGS) $(OBJ5) $(OBJECTS) $(LIB)
-+	$(CC) -o $(APP5) $(CFLAGS) $(OBJ5) $(OBJECTS) $(LIB) $(LDFLAGS)
++	$(CC) -o $(APP5) $(CFLAGS) $(CPPFLAGS) $(OBJ5) $(OBJECTS) $(LIB) $(LDFLAGS)
  
  clean:
  	rm -f *.o $(APP) $(APP2) $(APP3) $(APP4) $(APP5)
-@@ -93,12 +95,12 @@ tar:
+@@ -93,12 +95,12 @@
  #################
  
  gcc:
@@ -57,9 +57,18 @@
  
  
  ###################
+@@ -106,7 +108,7 @@
+ ###################
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) $(INC) -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INC) -c -o $@ $<
+ 
+ ################
+ # Dependancies #
 --- a/Zoe/Makefile
 +++ b/Zoe/Makefile
-@@ -55,22 +55,22 @@ DATE = $(shell date +\%Y-\%m-\%d)
+@@ -55,22 +55,22 @@
  ###########
  
  default:
@@ -68,27 +77,27 @@
  
  $(APP): $(OBJ) $(OBJECTS)
 -	$(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB)
-+	$(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB) $(LDFLAGS)
++	$(CC) -o $(APP) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(OBJECTS) $(LIB) $(LDFLAGS)
  
  $(APP2): $(OBJ2) $(OBJECTS)
 -	$(CC) -o $(APP2) $(CFLAGS) $(OBJ2) $(OBJECTS) $(LIB)
-+	$(CC) -o $(APP2) $(CFLAGS) $(OBJ2) $(OBJECTS) $(LIB) $(LDFLAGS)
++	$(CC) -o $(APP2) $(CFLAGS) $(CPPFLAGS) $(OBJ2) $(OBJECTS) $(LIB) $(LDFLAGS)
  
  $(APP3): $(OBJ3) $(OBJECTS)
 -	$(CC) -o $(APP3) $(CFLAGS) $(OBJ3) $(OBJECTS) $(LIB)
-+	$(CC) -o $(APP3) $(CFLAGS) $(OBJ3) $(OBJECTS) $(LIB) $(LDFLAGS)
++	$(CC) -o $(APP3) $(CFLAGS) $(CPPFLAGS) $(OBJ3) $(OBJECTS) $(LIB) $(LDFLAGS)
  
  $(APP4): $(OBJ4) $(OBJECTS)
 -	$(CC) -o $(APP4) $(CFLAGS) $(OBJ4) $(OBJECTS) $(LIB)
-+	$(CC) -o $(APP4) $(CFLAGS) $(OBJ4) $(OBJECTS) $(LIB) $(LDFLAGS)
++	$(CC) -o $(APP4) $(CFLAGS) $(CPPFLAGS) $(OBJ4) $(OBJECTS) $(LIB) $(LDFLAGS)
  
  $(APP5): $(OBJ5) $(OBJECTS)
 -	$(CC) -o $(APP5) $(CFLAGS) $(OBJ5) $(OBJECTS) $(LIB)
-+	$(CC) -o $(APP5) $(CFLAGS) $(OBJ5) $(OBJECTS) $(LIB) $(LDFLAGS)
++	$(CC) -o $(APP5) $(CFLAGS) $(CPPFLAGS) $(OBJ5) $(OBJECTS) $(LIB) $(LDFLAGS)
  
  clean:
  	rm -f *.o $(APP) $(APP2) $(APP3) $(APP4) $(APP5)
-@@ -92,14 +92,14 @@ tar:
+@@ -92,14 +92,14 @@
  #################
  
  gcc:
@@ -109,3 +118,12 @@
  
  
  ###################
+@@ -107,7 +107,7 @@
+ ###################
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+ 
+ ################
+ # Dependancies #