debian: Add hardening flags

Suggested-by: Pierre-Elliott Bécue <peb@debian.org>
Signed-off-by: Helge Deller <deller@gmx.de>

3 files changed, 8 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 2e96423..b4b2ba7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ rbootd (3.0) UNRELEASED; urgency=medium
   * Convert to Debian native format
   * Drop trailing spaces in debian/rules file
   * Clean up rbootd init.d file, add status and LSB description
+  * Add hardening flags
 
  -- Helge Deller <deller@gmx.de>  Thu, 24 Sep 2020 20:13:47 +0200
 
diff --git a/debian/rules b/debian/rules
index 50cdf56..09f4a44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,15 +10,16 @@
 # paternity under the Copyright, Designs and Patents Act 1988.)
 # This file may have to be extensively modified
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 package=rbootd
 
 ARCH  := $(shell dpkg --print-architecture)
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS = -g -O2 -Wall $(shell getconf LFS_CFLAGS)
-else
-CFLAGS = -O2 -Wall $(shell getconf LFS_CFLAGS)
-endif
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS += $(shell getconf LFS_CFLAGS)
+
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 STRIP = -s
 endif
diff --git a/rbootd.c b/rbootd.c
index ec78c18..6eb6bdc 100644
--- a/rbootd.c
+++ b/rbootd.c
@@ -181,7 +181,7 @@ main(argc, argv)
 		if ((IntfName = BpfGetIntfName(&errmsg)) == NULL) {
 #endif
 			syslog(LOG_NOTICE, "restarted (%s)", "??");
-			syslog(LOG_ERR, errmsg);
+			syslog(LOG_ERR, errmsg, 0);
 			Exit(0);
 		}
 	}