[med-svn] r17479 - in trunk/packages/aragorn/trunk/debian: . patches

[Sascha Steinbiss]

Author: sascha-guest
Date: 2014-07-16 22:32:02 +0000 (Wed, 16 Jul 2014)
New Revision: 17479

Modified:
   trunk/packages/aragorn/trunk/debian/changelog
   trunk/packages/aragorn/trunk/debian/patches/spelling.diff
   trunk/packages/aragorn/trunk/debian/rules
Log:
fix hardening issues


Modified: trunk/packages/aragorn/trunk/debian/changelog
===================================================================
--- trunk/packages/aragorn/trunk/debian/changelog	2014-07-16 21:03:44 UTC (rev 17478)
+++ trunk/packages/aragorn/trunk/debian/changelog	2014-07-16 22:32:02 UTC (rev 17479)
@@ -1,3 +1,10 @@
+aragorn (1.2.36-4) unstable; urgency=low
+
+  * Fix hardening flags
+  * Add patch description
+
+ -- Sascha Steinbiss <sascha at steinbiss.name>  Wed, 16 Jul 2014 23:29:34 +0100
+
 aragorn (1.2.36-3) unstable; urgency=low
 
   * hardening-includes => use dpkg-buildflags instead

Modified: trunk/packages/aragorn/trunk/debian/patches/spelling.diff
===================================================================
--- trunk/packages/aragorn/trunk/debian/patches/spelling.diff	2014-07-16 21:03:44 UTC (rev 17478)
+++ trunk/packages/aragorn/trunk/debian/patches/spelling.diff	2014-07-16 22:32:02 UTC (rev 17479)
@@ -1,3 +1,5 @@
+Author: Sascha Steinbiss <sascha at steinbiss.name>
+Description: Fix spelling error in upstream provided manpage
 --- a/aragorn.1
 +++ b/aragorn.1
 @@ -362,7 +362,7 @@

Modified: trunk/packages/aragorn/trunk/debian/rules
===================================================================
--- trunk/packages/aragorn/trunk/debian/rules	2014-07-16 21:03:44 UTC (rev 17478)
+++ trunk/packages/aragorn/trunk/debian/rules	2014-07-16 22:32:02 UTC (rev 17479)
@@ -4,13 +4,11 @@
 export DESTDIR=$(CURDIR)/debian/aragorn
 export DH_ALWAYS_EXCLUDE=.gitignore
 
-include /usr/share/hardening-includes/hardening.make
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
-
 %:
 	dh $@
 
@@ -18,7 +16,7 @@
 	rm -f aragorn 
 
 override_dh_auto_build:
-	$(CC) $(CFLAGS) $(LDFLAGS) -O3 -ffast-math -finline-functions -o aragorn *.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O3 -ffast-math -finline-functions -o aragorn *.c
 
 override_dh_auto_install:
 	mkdir -p $(DESTDIR)/usr/bin