diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/01-Allow-buildflags-to-be-overridden.patch | 47 | ||||
| -rw-r--r-- | debian/patches/01-pass-cppflags-and-ldflags-to-compiler.patch | 42 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
4 files changed, 56 insertions, 43 deletions
diff --git a/debian/changelog b/debian/changelog index 0fd17e2..96fb79e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +wavemon (0.7.5-3) UNRELEASED; urgency=low + + * Remove 01-pass-cppflags-and-ldflags-to-compiler.patch and replace with + upstream commit eeaf804 as 01-Allow-buildflags-to-be-overridden.patch + - allows hardened CFLAGS, which were previously missing + + -- Jonathan McCrohan <jmccrohan@gmail.com> Mon, 25 Jun 2012 17:14:13 +0100 + wavemon (0.7.5-2) unstable; urgency=low * Mark as linux-any to save CPU cycles on KFreeBSD/Hurd buildds diff --git a/debian/patches/01-Allow-buildflags-to-be-overridden.patch b/debian/patches/01-Allow-buildflags-to-be-overridden.patch new file mode 100644 index 0000000..03414ae --- /dev/null +++ b/debian/patches/01-Allow-buildflags-to-be-overridden.patch @@ -0,0 +1,47 @@ +From eeaf8047c61fd8dc2eb12240100a8e18f72a9ace Mon Sep 17 00:00:00 2001 +From: Jonathan McCrohan <jmccrohan@gmail.com> +Date: Sun, 10 Jun 2012 23:12:44 +0100 +Subject: [PATCH] Allow buildflags to be overridden + +Required by Debian debhelper to enable build hardening: +http://wiki.debian.org/Hardening + +Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> +Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> +--- + Makefile.in | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index b7d8ece..0b27ad7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -8,10 +8,12 @@ datadir = $(datarootdir)/@PACKAGE_NAME@ + exec_perms = 0755 + install-suid-root: exec_perms = 4755 + +-CC = @CC@ +-CFLAGS = @CFLAGS@ +-DEFS = @DEFS@ +-LDLIBS = @LIBS@ ++CC ?= @CC@ ++CFLAGS ?= @CFLAGS@ ++CPPFLAGS ?= @CPPFLAGS@ ++LDFLAGS ?= @LDFLAGS@ ++DEFS ?= @DEFS@ ++LDLIBS ?= @LIBS@ + + INSTALL = @INSTALL@ + RM = rm -vf +@@ -23,7 +25,7 @@ OBJS = $(PURESRC:.c=.o) + DOCS = README NEWS THANKS AUTHORS COPYING ChangeLog + + %.o: %.c $(HEADERS) +- $(CC) $(CFLAGS) $(DEFS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $< + + all: @PACKAGE_NAME@ + @PACKAGE_NAME@: $(MAIN) $(OBJS) +-- +1.7.10 + diff --git a/debian/patches/01-pass-cppflags-and-ldflags-to-compiler.patch b/debian/patches/01-pass-cppflags-and-ldflags-to-compiler.patch deleted file mode 100644 index 41d7cdb..0000000 --- a/debian/patches/01-pass-cppflags-and-ldflags-to-compiler.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c64fb125cbfa16c8c15f3ae0f56ee6bbda84ec8a Mon Sep 17 00:00:00 2001 -From: Jonathan McCrohan <jmccrohan@gmail.com> -Date: Sun, 10 Jun 2012 00:25:56 +0100 -Subject: [PATCH] Pass CPPFLAGS and LDFLAGS to compiler - -Required by Debian Debhelper to enable build hardening: -http://wiki.debian.org/Hardening - -Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> ---- - Makefile.in | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index b7d8ece..6b06437 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -10,9 +10,12 @@ install-suid-root: exec_perms = 4755 - - CC = @CC@ - CFLAGS = @CFLAGS@ -+CPPFLAGS = @CPPFLAGS@ -+LDFLAGS = @LDFLAGS@ - DEFS = @DEFS@ - LDLIBS = @LIBS@ - -+ - INSTALL = @INSTALL@ - RM = rm -vf - -@@ -23,7 +26,7 @@ OBJS = $(PURESRC:.c=.o) - DOCS = README NEWS THANKS AUTHORS COPYING ChangeLog - - %.o: %.c $(HEADERS) -- $(CC) $(CFLAGS) $(DEFS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $< - - all: @PACKAGE_NAME@ - @PACKAGE_NAME@: $(MAIN) $(OBJS) --- -1.7.10 - diff --git a/debian/patches/series b/debian/patches/series index d710877..e2c3674 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -01-pass-cppflags-and-ldflags-to-compiler.patch +01-Allow-buildflags-to-be-overridden.patch 02-remove-extra-copyright-file.patch |