diff -Nru simpleproxy-3.4/debian/changelog simpleproxy-3.4/debian/changelog --- simpleproxy-3.4/debian/changelog 2014-05-12 03:56:53.000000000 +0000 +++ simpleproxy-3.4/debian/changelog 2014-05-26 01:09:07.000000000 +0000 @@ -1,3 +1,10 @@ +simpleproxy (3.4-7) unstable; urgency=low + + * Added a patch to Makefile.in to allow hardening linker flags to be + honoured + + -- Andrew Pollock Mon, 26 May 2014 11:09:07 +1000 + simpleproxy (3.4-6) unstable; urgency=low * debian/control: bumped Standards-Version (no changes) diff -Nru simpleproxy-3.4/debian/patches/make_hardening_work simpleproxy-3.4/debian/patches/make_hardening_work --- simpleproxy-3.4/debian/patches/make_hardening_work 1970-01-01 00:00:00.000000000 +0000 +++ simpleproxy-3.4/debian/patches/make_hardening_work 2014-05-26 01:08:39.000000000 +0000 @@ -0,0 +1,22 @@ +Author: Andrew Pollock +Description: Allow hardening flags to be properly honoured + Without this patch, the rorelro hardening doesn't happen +Forwarded: https://sourceforge.net/p/simpleproxy/patches/5/ + +Index: simpleproxy-3.4/Makefile.in +=================================================================== +--- simpleproxy-3.4.orig/Makefile.in 2014-05-26 10:57:07.653933230 +1000 ++++ simpleproxy-3.4/Makefile.in 2014-05-26 11:01:09.892584396 +1000 +@@ -36,10 +36,10 @@ + $(INSTALL) simpleproxy.man $(mandir)/man1/simpleproxy.1 + + simpleproxy: simpleproxy.o cfg.o Makefile +- $(CC) $(CFLAGS) -o simpleproxy simpleproxy.o cfg.o $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o simpleproxy simpleproxy.o cfg.o $(LIBS) + + .c.o: +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c $< + + cfg.o: cfg.c cfg.h Makefile + simpleproxy.o: simpleproxy.c cfg.h Makefile diff -Nru simpleproxy-3.4/debian/patches/series simpleproxy-3.4/debian/patches/series --- simpleproxy-3.4/debian/patches/series 2012-02-13 17:43:20.000000000 +0000 +++ simpleproxy-3.4/debian/patches/series 2014-05-26 00:56:19.000000000 +0000 @@ -1,2 +1,3 @@ +make_hardening_work fix_mdns_use.dpatch fix_manpage.dpatch