revert the reversion ...
authorgregor herrmann <gregoa@debian.org>
Mon, 20 Sep 2010 21:18:28 +0000 (21:18 -0000)
committergregor herrmann <gregoa@debian.org>
Mon, 20 Sep 2010 21:18:28 +0000 (21:18 -0000)
debian/changelog
debian/control
debian/rules

index c42a5395d93197a0938505a7e6aa15ef3b82d1fc..151b05863db0f938d465eb3d04e424d728b2d617 100644 (file)
@@ -1,3 +1,11 @@
+iodine (0.6.0~rc1-3) UNRELEASED; urgency=low
+
+  * Build with hardening; thanks to Romain Francoise for the bug report and
+    the patch.
+  * Set Standards-Version to 3.9.1 (no changes).
+
+ -- gregor herrmann <gregoa@debian.org>  Sun, 22 Aug 2010 00:17:11 +0200
+
 iodine (0.6.0~rc1-2) unstable; urgency=low
 
   [ tony mancill ]
index 04bdb8ebc56a17495aa58169d9f49c45d5dc045c..c6d6318df05eb9bdc0e3fcd71be576ed8f80951b 100644 (file)
@@ -4,8 +4,8 @@ Priority: extra
 Maintainer: gregor herrmann <gregoa@debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
 Build-Depends: debhelper (>= 7.0.50), po-debconf, help2man,
- zlib1g-dev, check
-Standards-Version: 3.9.0
+ zlib1g-dev, check, hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://code.kryo.se/iodine
 Vcs-Svn: http://svn.toastfreeware.priv.at/debian/iodine/trunk/
 Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/iodine/trunk/
index 9f4d32c53131e0600269765f1e97d5b449498041..8e517b2bdeddce0375712b91794e4d4f9b7dd9fa 100755 (executable)
@@ -1,5 +1,10 @@
 #!/usr/bin/make -f
 
+include /usr/share/hardening-includes/hardening.make
+
+export CFLAGS += $(HARDENING_CFLAGS)
+export LDFLAGS += $(HARDENING_LDFLAGS)
+
 %:
        dh $@