[proftpd-dfsg] 02/05: Manage build-flags in a more general way

[Francesco Lovergine]

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

frankie pushed a commit to branch master
in repository proftpd-dfsg.

commit ecfaa1008c73cadc79beb0bb81a9a655ff42f3c0
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Jan 10 13:42:14 2018 +0100

    Manage build-flags in a more general way
---
 debian/changelog         |  2 ++
 debian/patches/autotools | 24 +++++++++++++++++++++---
 debian/patches/series    |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cbdfddf..be49b4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ proftpd-dfsg (1.3.5e-1) unstable; urgency=medium
   * Fixed target in recent NEWS file issue to make lintian happy.
   * Fixed various spelling errors with new patch.
   * Now correctly including dpkg buildflags makefile snippets.
+  * Current autotools patch augmented with adding of the std build-flags for
+    hardening. That obsoletes contri_hardening_flags patch.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 10 Jan 2018 09:44:28 +0100
 
diff --git a/debian/patches/autotools b/debian/patches/autotools
index 7beecd9..98a6e93 100644
--- a/debian/patches/autotools
+++ b/debian/patches/autotools
@@ -2,11 +2,9 @@ Description: Do not touch config.h.in and stamp-h.in
 Author: Francesco Paolo Lovergine <frankie at debian.org>
 Forwarded: not needed
 
-Index: proftpd-dfsg/Makefile.in
-===================================================================
 --- proftpd-dfsg.orig/Makefile.in
 +++ proftpd-dfsg/Makefile.in
-@@ -233,10 +233,10 @@ dist: depend distclean spec
+@@ -233,10 +233,10 @@
  	chmod a+x configure config.sub install-sh modules/glue.sh
  
  # autoheader might not change config.h.in, so touch a stamp file.
@@ -21,3 +19,23 @@ Index: proftpd-dfsg/Makefile.in
  
  config.h: stamp-h
  stamp-h: config.h.in config.status
+--- proftpd-dfsg.orig/Make.rules.in
++++ proftpd-dfsg/Make.rules.in
+@@ -16,7 +16,7 @@
+ AR=@AR@
+ CC=@CC@
+ PLATFORM=@OSREL@ @OSTYPE@
+-LDFLAGS=@LDFLAGS@ @LIBDIRS@
++LDFLAGS=@LDFLAGS@ @LIBDIRS@ $(shell dpkg-buildflags --get LDFLAGS)
+ LIBEXECDIR=@LIBEXECDIR@
+ LIBS=@LIBS@ @LIBRARIES@
+ LIBTOOL=@LIBTOOL@
+@@ -55,7 +55,7 @@
+ 
+ # Our compiler flags.
+ #
+-CFLAGS=@CFLAGS@
++CFLAGS=@CFLAGS@ $(shell dpkg-buildflags --get CPPFLAGS)
+ DEFINES=$(PLATFORM)
+ 
+ # Module-specific libraries to link against.  These libraries may be
diff --git a/debian/patches/series b/debian/patches/series
index 980dee2..eb53372 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,7 @@ mod_cap
 odbc
 silent
 use_hypen_in_manpage
-contrib_hardening_flags
+#contrib_hardening_flags
 FTBS_on_Hurd
 reproducible_build
 not_read_whole_passwd_db

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