[hamradio-commits] [axmail] 01/06: Debian Hardening patches

[Dave Hibberd]

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

hibby-guest pushed a commit to branch master
in repository axmail.

commit e93b2e56a6618df635664deff67a9ce1a68b034f
Author: Dave Hibberd <dave.hibberd at gmail.com>
Date:   Tue Apr 5 21:45:57 2016 +0100

    Debian Hardening patches
---
 debian/control                           |  6 +++---
 debian/copyright                         |  4 +++-
 debian/patches/{fix_cflags => hardening} | 12 +++++++++---
 debian/patches/series                    |  2 +-
 debian/rules                             |  3 +++
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index cb40d5b..d27d1c5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Priority: optional
 Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
 Uploaders: Dave Hibberd <d at vehibberd.com>
 Build-Depends: debhelper (>= 9), postfix
-Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/axmail.git
-Vcs-Git: http://anonscm.debian.org/git/pkg-hamradio/axmail.git
+Standards-Version: 3.9.7
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-hamradio/axmail.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-hamradio/axmail.git
 Homepage: http://sourceforge.net/projects/axmail/
 
 Package: axmail
diff --git a/debian/copyright b/debian/copyright
index 0c6f34b..c0daf80 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,12 +9,14 @@ Copyright:
 License: GPL-2+
 
 Files: mbox.c head.c
+Copyright:
 	(C) 1993 Ian Jackson <ijackson at nyx.cs.du.edu>
 	(C) Scott Adkins <sadkins at ohiou.edu>
 License: GPL-2+
 
 Files: debian/*
-Copyright: (C) 2015 Dave Hibberd <d at vehibberd.com>
+Copyright: 
+	(C) 2015 Dave Hibberd <d at vehibberd.com>
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/patches/fix_cflags b/debian/patches/hardening
similarity index 54%
rename from debian/patches/fix_cflags
rename to debian/patches/hardening
index d8ca85d..2ec9618 100644
--- a/debian/patches/fix_cflags
+++ b/debian/patches/hardening
@@ -1,10 +1,10 @@
-Description: Patch to enable debhelper to pick suitable CFLAGS
+Description: Patch to ensure debhelper can apply appropriate CFLAGS, CPPFLAGS and LDFLAGS
 Author: Dave Hibberd <d at vehibberd.com>
-Last-Update: 2015-09-19
+Last-Update: 2016-04-05
 
 --- a/Makefile
 +++ b/Makefile
-@@ -2,7 +2,7 @@
+@@ -2,12 +2,12 @@
  
  CC = gcc
  LD = gcc
@@ -13,3 +13,9 @@ Last-Update: 2015-09-19
  LIBS = -lcrypt
  MODULES = utils.o config.o adduser.o command.o mailcmd.o mbox.o head.o lock.o axmail.o quit.o
  
+ .c.o:
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $<
+ 
+ upgrade: installbin installhelp
+ 
diff --git a/debian/patches/series b/debian/patches/series
index cb21668..5d55193 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-fix_cflags
+hardening
 install_locations
 install_dir_creation
diff --git a/debian/rules b/debian/rules
index fbf29c7..eabadf9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 %:
 	dh $@
 
@@ -7,4 +9,5 @@
 
 override_dh_auto_build:
 	cat README | sed '27,338!d' > changelog
+	rm INSTALL
 	dh_auto_build

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