[supertransball2] 08/14: Add hardening.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository supertransball2.

commit be85fc90f356636db35df90352f05905166a4272
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun Sep 6 03:33:05 2015 +0200

    Add hardening.patch
    
    Use dpkg-buildflags instead of hardening-wrapper for providing all hardening
    build flags.
---
 .../patches/0001-Fix-unix-paths-and-Makefile.patch | 44 +++++++++++-----------
 debian/patches/hardening.patch                     | 26 +++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/debian/patches/0001-Fix-unix-paths-and-Makefile.patch b/debian/patches/0001-Fix-unix-paths-and-Makefile.patch
index 3e29384..fbda101 100644
--- a/debian/patches/0001-Fix-unix-paths-and-Makefile.patch
+++ b/debian/patches/0001-Fix-unix-paths-and-Makefile.patch
@@ -2,7 +2,7 @@ From: Markus Koschany <apo at gambaru.de>
 Date: Thu, 1 Nov 2012 01:38:45 +0100
 Subject: Fix unix paths and Makefile
 MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
 This patch fixes various path issues and the Makefile. It was created
@@ -14,27 +14,27 @@ supertransball2 is gone. It didn't work anyway. The Makefile
 has been further improved. Now supertransball2 doesn't link against
 libsdl_sound anymore which was superfluous.
 ---
- sources/Makefile                  |   21 ++++++++++++++++-----
- sources/configuration.cpp         |    7 +++++++
- sources/encoder.cpp               |   12 +++++++++++-
- sources/game.cpp                  |   10 +++++++++-
- sources/main.cpp                  |   32 +++++++++++++++++++++++++++++++-
- sources/maps.cpp                  |    4 ++++
- sources/replays.cpp               |    8 ++++++++
- sources/state_changepack.cpp      |    8 ++++++--
- sources/state_chooseship.cpp      |    2 +-
- sources/state_endsequence.cpp     |    2 +-
- sources/state_game.cpp            |   10 +++++-----
- sources/state_gameover.cpp        |    2 +-
- sources/state_instructions.cpp    |    2 +-
- sources/state_interphase.cpp      |    7 ++++++-
- sources/state_keyredefinition.cpp |    2 +-
- sources/state_levelfinished.cpp   |    2 +-
- sources/state_logo.cpp            |    2 +-
- sources/state_mainmenu.cpp        |    6 +++++-
- sources/state_replay.cpp          |   10 +++++-----
- sources/state_replaymanager.cpp   |   11 ++++++++++-
- sources/state_typetext.cpp        |    2 +-
+ sources/Makefile                  | 21 ++++++++++++++++-----
+ sources/configuration.cpp         |  7 +++++++
+ sources/encoder.cpp               | 12 +++++++++++-
+ sources/game.cpp                  | 10 +++++++++-
+ sources/main.cpp                  | 32 +++++++++++++++++++++++++++++++-
+ sources/maps.cpp                  |  4 ++++
+ sources/replays.cpp               |  8 ++++++++
+ sources/state_changepack.cpp      |  8 ++++++--
+ sources/state_chooseship.cpp      |  2 +-
+ sources/state_endsequence.cpp     |  2 +-
+ sources/state_game.cpp            | 10 +++++-----
+ sources/state_gameover.cpp        |  2 +-
+ sources/state_instructions.cpp    |  2 +-
+ sources/state_interphase.cpp      |  7 ++++++-
+ sources/state_keyredefinition.cpp |  2 +-
+ sources/state_levelfinished.cpp   |  2 +-
+ sources/state_logo.cpp            |  2 +-
+ sources/state_mainmenu.cpp        |  6 +++++-
+ sources/state_replay.cpp          | 10 +++++-----
+ sources/state_replaymanager.cpp   | 11 ++++++++++-
+ sources/state_typetext.cpp        |  2 +-
  21 files changed, 131 insertions(+), 31 deletions(-)
 
 diff --git a/sources/Makefile b/sources/Makefile
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..4806af5
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,26 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sun, 6 Sep 2015 03:32:49 +0200
+Subject: hardening
+
+---
+ sources/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sources/Makefile b/sources/Makefile
+index c8d7a72..650d769 100644
+--- a/sources/Makefile
++++ b/sources/Makefile
+@@ -14,11 +14,11 @@ all: $(TARGET)
+ 
+ 
+ %.o: %.cpp
+-	c++ -c -g3 -O3 $< -o $@ `sdl-config --cflags` -I/usr/local/include/SDL
++	c++ -c -g3 -O3 $< -o $@ $(CPPFLAGS) $(CFLAGS) `sdl-config --cflags` -I/usr/local/include/SDL
+ 
+ # dynamically linked binary:
+ $(TARGET): $(OBJS)
+-	c++ $^ -o $@ `sdl-config --libs` -lSDL_image -lSDL_mixer -lSGE -I/usr/local/include/SDL
++	c++ $^ -o $@ $(LDFLAGS) `sdl-config --libs` -lSDL_image -lSDL_mixer -lSGE -I/usr/local/include/SDL
+ 	mv ./$(TARGET) ..
+ 
+ clean:
diff --git a/debian/patches/series b/debian/patches/series
index 1b73daf..e2a0a2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix-unix-paths-and-Makefile.patch
+hardening.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/supertransball2.git