Package: foremost Version: 1.5.7-5 Tags: patch Only adding flags to the default -O2 will not allow build option "noopt" to work.
From faa2c13f600818fc2aac0c293ff55a2935265041 Mon Sep 17 00:00:00 2001 From: Yann Dirson <y...@blade-group.com> Date: Sun, 7 Aug 2016 13:46:04 +0200 Subject: [PATCH] Fix build to honor flags set by dh --- debian/changelog | 7 +++++++ debian/patches/fix-hurd-and-kfreebsd-build.patch | 8 +++++--- debian/patches/fix-hurd-max-path.patch | 8 +++++--- debian/patches/fix-lintian-hardening-warnings.patch | 16 +--------------- debian/patches/series | 1 + 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index c92258a..133fc97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +foremost (1.5.7-5.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix build to honor flags set by dh. + + -- Yann Dirson <dir...@debian.org> Sun, 07 Aug 2016 13:18:25 +0200 + foremost (1.5.7-5) unstable; urgency=medium * Update maintainer email address. diff --git a/debian/patches/fix-hurd-and-kfreebsd-build.patch b/debian/patches/fix-hurd-and-kfreebsd-build.patch index 10d11e6..93434bb 100644 --- a/debian/patches/fix-hurd-and-kfreebsd-build.patch +++ b/debian/patches/fix-hurd-and-kfreebsd-build.patch @@ -1,8 +1,10 @@ Fixed hurd-i386, kfreebsd-i386 and kfreebsd-amd64 build by adding its respective rules to Makefile. ---- a/Makefile -+++ b/Makefile -@@ -76,6 +76,8 @@ +Index: debian-pkg-foremost/Makefile +=================================================================== +--- debian-pkg-foremost.orig/Makefile ++++ debian-pkg-foremost/Makefile +@@ -74,6 +74,8 @@ mac: goals netbsd: unix openbsd: unix freebsd: unix diff --git a/debian/patches/fix-hurd-max-path.patch b/debian/patches/fix-hurd-max-path.patch index 8016ea9..22ebec3 100644 --- a/debian/patches/fix-hurd-max-path.patch +++ b/debian/patches/fix-hurd-max-path.patch @@ -1,7 +1,9 @@ Fix FTBFS of hurd-i386 by defining the missing PATH_MAX macro. ---- a/Makefile -+++ b/Makefile -@@ -76,7 +76,10 @@ +Index: debian-pkg-foremost/Makefile +=================================================================== +--- debian-pkg-foremost.orig/Makefile ++++ debian-pkg-foremost/Makefile +@@ -74,7 +74,10 @@ mac: goals netbsd: unix openbsd: unix freebsd: unix diff --git a/debian/patches/fix-lintian-hardening-warnings.patch b/debian/patches/fix-lintian-hardening-warnings.patch index 0d5af69..3c49163 100644 --- a/debian/patches/fix-lintian-hardening-warnings.patch +++ b/debian/patches/fix-lintian-hardening-warnings.patch @@ -1,18 +1,4 @@ -Add hardening flags to compilation. Fix a format string in order to do -so. ---- a/Makefile -+++ b/Makefile -@@ -37,7 +37,9 @@ - WINCC = $(RAW_CC) $(RAW_FLAGS) -D__WIN32 - - # Generic "how to compile C files" --CC = $(RAW_CC) $(RAW_FLAGS) -D__UNIX -+CC = $(RAW_CC) $(RAW_FLAGS) -D__UNIX $(shell dpkg-buildflags --get CFLAGS)\ -+ $(shell dpkg-buildflags --get CPPFLAGS) \ -+ $(shell dpkg-buildflags --get LDFLAGS) - .c.o: - $(CC) -c $< - +Fix a format string in order to add hardening flags. --- a/extract.c +++ b/extract.c @@ -2145,7 +2145,7 @@ diff --git a/debian/patches/series b/debian/patches/series index 7308fb4..a6b8af7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ fix-config-file-path.patch fix-lintian-hardening-warnings.patch fix-hurd-and-kfreebsd-build.patch fix-hurd-max-path.patch +fix-make-flags.patch -- 2.8.1
