[SCM] Packaging for vavoom branch, master, updated. debian/1.33-3-2-gaafd9e6

[gustavo panizzo gfa]

The following commit has been merged in the master branch:
commit aafd9e607ca7d4dd829f046de9060265f9fdcf87
Author: gustavo panizzo gfa <gfa at zumbi.com.ar>
Date:   Wed May 30 10:56:43 2012 -0300

    enable hardening flags

diff --git a/debian/changelog b/debian/changelog
index 6c18282..3d6e7fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ vavoom (1.33-3) unstable; urgency=low
   * copyright file updated to comply with machine-readable format, version 1.0
     aka DEP-5
   * patches standarized to DEP-3
+  * enable hardening
 
  -- gustavo panizzo <gfa at zumbi.com.ar>  Thu, 28 Mar 2012 14:20:50 -0300
 
diff --git a/debian/patches/fix-hardening b/debian/patches/fix-hardening
new file mode 100644
index 0000000..96f9987
--- /dev/null
+++ b/debian/patches/fix-hardening
@@ -0,0 +1,57 @@
+Description: patches to enable hardening on vavoom 
+ simple fixes to enable hardened build
+Author: gustavo panizzo <gfa at zumbi.com.ar>
+Origin: vendor
+Forwarded: no
+Last-Update: 2012-05-28
+
+--- vavoom-1.33.orig/utils/vcc/vcc.cpp
++++ vavoom-1.33/utils/vcc/vcc.cpp
+@@ -122,7 +122,7 @@ int main(int argc, char **argv)
+ 	}
+ 	catch (VException& e)
+ 	{
+-		FatalError(e.What());
++		FatalError("%s", e.What());
+ 	}
+ 	return 0;
+ }
+
+--- vavoom-1.33.orig/source/misc.cpp
++++ vavoom-1.33/source/misc.cpp
+@@ -119,7 +119,7 @@ void FOutputDevice::Logf(EName Type, con
+ 
+ void VLogSysError::Serialise(const char* V, EName)
+ {
+-	Sys_Error(V);
++	Sys_Error("%s", V);
+ }
+ 
+ //==========================================================================
+@@ -130,7 +130,7 @@ void VLogSysError::Serialise(const char*
+ 
+ void VLogHostError::Serialise(const char* V, EName)
+ {
+-	Host_Error(V);
++	Host_Error("%s", V);
+ }
+ 
+ //==========================================================================
+
+--- vavoom-1.33.orig/source/vc_object.cpp
++++ vavoom-1.33/source/vc_object.cpp
+@@ -477,12 +477,12 @@ IMPLEMENT_FUNCTION(VObject, IsDestroyed)
+ 
+ IMPLEMENT_FUNCTION(VObject, Error)
+ {
+-	Host_Error(*PF_FormatString());
++	Host_Error("%s", *PF_FormatString());
+ }
+ 
+ IMPLEMENT_FUNCTION(VObject, FatalError)
+ {
+-	Sys_Error(*PF_FormatString());
++	Sys_Error("%s", *PF_FormatString());
+ }
+ 
+ //**************************************************************************
diff --git a/debian/patches/series b/debian/patches/series
index d6bc083..e3730ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ spelling-fixes
 freedoom-support.patch
 freedoom-vlaunch.patch
 fix-FTBFS-Hurd.patch
+fix-hardening
diff --git a/debian/rules b/debian/rules
index 49d9beb..dcf4a3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,16 @@
 #!/usr/bin/make -f
 
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
+
+export CPPFLAGS
+export CFLAGS
+export CXXFLAGS
+export LDFLAGS
+
 %:
 	dh --buildsystem=cmake $@
 

-- 
Packaging for vavoom