r13692 - in non-free/packages/trunk/assaultcube/debian: . patches

[Martin Werner]

Author: arand-guest
Date: 2012-06-07 16:24:15 +0000 (Thu, 07 Jun 2012)
New Revision: 13692

Added:
   non-free/packages/trunk/assaultcube/debian/patches/build-with-ldflags.patch
Removed:
   non-free/packages/trunk/assaultcube/debian/patches/build-with-debug-symbols.patch
Modified:
   non-free/packages/trunk/assaultcube/debian/changelog
   non-free/packages/trunk/assaultcube/debian/compat
   non-free/packages/trunk/assaultcube/debian/control
   non-free/packages/trunk/assaultcube/debian/patches/series
   non-free/packages/trunk/assaultcube/debian/rules
Log:
Initial enabling of hardning

* dh 9
* Only does stack protection and read-only relocations
* Remove debug patch since it gets pulled in vi CXXFLAGS
* New patch to add LDFLAGS

Modified: non-free/packages/trunk/assaultcube/debian/changelog
===================================================================
--- non-free/packages/trunk/assaultcube/debian/changelog	2012-06-07 16:24:12 UTC (rev 13691)
+++ non-free/packages/trunk/assaultcube/debian/changelog	2012-06-07 16:24:15 UTC (rev 13692)
@@ -10,6 +10,12 @@
     - zlib1g-dev      -> libz-dev
   * Standards-Version 3.9.3
     - Set final DEP-5 Format: link
+  * Enable SOME hardening
+    - dh compat level 9
+    - Added build-with-ldflags.patch:
+      Patch which appends $(LDFLAGS) for hardening linker options
+    - Removed build-with-debug-symbols.patch
+      Now handled in d/rules instead
 
  -- Martin Erik Werner <martinerikwerner at gmail.com>  Tue, 28 Feb 2012 01:04:22 +0100
 

Modified: non-free/packages/trunk/assaultcube/debian/compat
===================================================================
--- non-free/packages/trunk/assaultcube/debian/compat	2012-06-07 16:24:12 UTC (rev 13691)
+++ non-free/packages/trunk/assaultcube/debian/compat	2012-06-07 16:24:15 UTC (rev 13692)
@@ -1 +1 @@
-7
+9

Modified: non-free/packages/trunk/assaultcube/debian/control
===================================================================
--- non-free/packages/trunk/assaultcube/debian/control	2012-06-07 16:24:12 UTC (rev 13691)
+++ non-free/packages/trunk/assaultcube/debian/control	2012-06-07 16:24:15 UTC (rev 13692)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Martin Erik Werner <martinerikwerner at gmail.com>
 Build-Depends: autotools-dev,
-               debhelper (>= 8),
+               debhelper (>= 9),
                libgl1-mesa-dev | libgl-dev,
                libopenal-dev,
                libsdl-image1.2-dev,

Deleted: non-free/packages/trunk/assaultcube/debian/patches/build-with-debug-symbols.patch
===================================================================
--- non-free/packages/trunk/assaultcube/debian/patches/build-with-debug-symbols.patch	2012-06-07 16:24:12 UTC (rev 13691)
+++ non-free/packages/trunk/assaultcube/debian/patches/build-with-debug-symbols.patch	2012-06-07 16:24:15 UTC (rev 13692)
@@ -1,16 +0,0 @@
-Description: Build with debug symbols
- On Debian we compile with debug symbols for debug packages, and strip for the
- normal packages, hence we need build with debugging symbols.
-Author: Martin Erik Werner <martinerikwerner at gmail.com>
-Forwarded: not-needed
-Last-Update: 2011-10-28
-
---- a/source/src/Makefile
-+++ b/source/src/Makefile
-@@ -1,5 +1,5 @@
- //CXX=g++-gcc-4.2.3
--CXXFLAGS= -O3 -fomit-frame-pointer
-+CXXFLAGS= -O3 -fomit-frame-pointer -g
- override CXXFLAGS+= -Wall -fsigned-char
- 
- PLATFORM= $(shell uname -s)

Added: non-free/packages/trunk/assaultcube/debian/patches/build-with-ldflags.patch
===================================================================
--- non-free/packages/trunk/assaultcube/debian/patches/build-with-ldflags.patch	                        (rev 0)
+++ non-free/packages/trunk/assaultcube/debian/patches/build-with-ldflags.patch	2012-06-07 16:24:15 UTC (rev 13692)
@@ -0,0 +1,19 @@
+--- a/source/src/Makefile
++++ b/source/src/Makefile
+@@ -165,13 +165,13 @@
+ 
+ else
+ client: libenet $(CLIENT_OBJS)
+-	$(CXX) $(CXXFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS)
+ 
+ server: libenet $(SERVER_OBJS)
+-	$(CXX) $(CXXFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS)  
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS)  
+ 
+ master: libenet $(MASTER_OBJS)
+-	$(CXX) $(CXXFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS)  
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS)  
+ 	
+ client_install: client
+ 	install -D ac_client ../../bin_unix/$(PLATFORM_PREFIX)_client

Modified: non-free/packages/trunk/assaultcube/debian/patches/series
===================================================================
--- non-free/packages/trunk/assaultcube/debian/patches/series	2012-06-07 16:24:12 UTC (rev 13691)
+++ non-free/packages/trunk/assaultcube/debian/patches/series	2012-06-07 16:24:15 UTC (rev 13692)
@@ -1,5 +1,5 @@
 windowed-mode-by-default.patch
 fix-install-target.patch
 fix-clean-target.patch
-build-with-debug-symbols.patch
 build-with-lX11.patch
+build-with-ldflags.patch

Modified: non-free/packages/trunk/assaultcube/debian/rules
===================================================================
--- non-free/packages/trunk/assaultcube/debian/rules	2012-06-07 16:24:12 UTC (rev 13691)
+++ non-free/packages/trunk/assaultcube/debian/rules	2012-06-07 16:24:15 UTC (rev 13692)
@@ -7,6 +7,13 @@
 	rm -rf bin_unix/
 	dh_auto_clean
 
+override_dh_auto_build:
+	dh_auto_build -- \
+		CPPFLAGS="$(CPPFLAGS)" \
+		CFLAGS="$(CFLAGS)" \
+		CXXFLAGS="$(CXXFLAGS)" \
+		LDFLAGS="$(LDFLAGS)"
+
 override_dh_auto_install:
 	install -D source/src/ac_client \
 		debian/tmp/usr/lib/games/assaultcube/assaultcube