diff options
| author | Andreas Metzler <ametzler@debian.org> | 2012-09-15 14:34:50 +0000 |
|---|---|---|
| committer | Andreas Metzler <ametzler@downhill.at.eu.org> | 2012-09-15 14:34:50 +0000 |
| commit | 22165096fd0ea3113f7ee089df0c367e11bd4b8e (patch) | |
| tree | 25a57251cb037750f7a10690d4c28bdac1ca6de4 | |
| parent | 75c1054d25ba5136be698e58bdb2a3e85682d261 (diff) | |
| download | exim4-22165096fd0ea3113f7ee089df0c367e11bd4b8e.tar.gz | |
Fix hardening support. (Thanks, Simon Ruderich) + Append $(CPPFLAGS) to CFLAGS, the exim buildsystem does not use it. + Set LFLAGS += $(LDFLAGS) in debian/rules. Closes: #687645
svn path=/exim/trunk/; revision=2754
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | debian/rules | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index d13e773..5881daf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ exim4 (4.80-5) UNRELEASED; urgency=low * NOT RELEASED YET * Fix grammar error in debian/manpages/exim4-config_files.5. (Thanks, Regid Ichira) + * Fix hardening support. (Thanks, Simon Ruderich) + + Append $(CPPFLAGS) to CFLAGS, the exim buildsystem does not use it. + + Set LFLAGS += $(LDFLAGS) in debian/rules. + Closes: #687645 -- Andreas Metzler <ametzler@debian.org> Sat, 23 Jun 2012 18:48:53 +0200 diff --git a/debian/rules b/debian/rules index 7716b09..fbaf763 100755 --- a/debian/rules +++ b/debian/rules @@ -21,8 +21,11 @@ DPKG_EXPORT_BUILDFLAGS := 1 include /usr/share/dpkg/buildflags.mk endif -CFLAGS := $(CFLAGS) $(shell getconf LFS_CFLAGS) -D_LARGEFILE_SOURCE -fno-strict-aliasing -Wall +# The build system ignores CPPFLAGS, append them to CFLAGS +CFLAGS := $(CFLAGS) $(shell getconf LFS_CFLAGS) -D_LARGEFILE_SOURCE -fno-strict-aliasing -Wall $(CPPFLAGS) export CFLAGS +# LFLAGS is used where GNU would use LDFLAGS +export LFLAGS += $(LDFLAGS) LC_ALL=C export LC_ALL |