[Pkg-mailman-hackers] Pkg-mailman commit - rev 696 - in trunk/debian: . patches

[Thijs Kinkhorst]

Author: thijs
Date: 2012-03-17 17:15:57 +0000 (Sat, 17 Mar 2012)
New Revision: 696

Added:
   trunk/debian/patches/02_use_dpkg_buildflags.patch
Modified:
   trunk/debian/changelog
Log:
Ensure CPPFLAGS and LDFLAGS are actually used during build,
thanks Simon Ruderich for the patch! (closes: #663590)



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2011-10-08 15:44:32 UTC (rev 695)
+++ trunk/debian/changelog	2012-03-17 17:15:57 UTC (rev 696)
@@ -1,3 +1,10 @@
+mailman (1:2.1.14-4) unstable; urgency=low
+
+  * Ensure CPPFLAGS and LDFLAGS are actually used during build,
+    thanks Simon Ruderich for the patch! (closes: #663590)
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Sat, 17 Mar 2012 18:13:48 +0100
+
 mailman (1:2.1.14-3) unstable; urgency=low
 
   * Make man page descruptions match more keywords (closes: #597112).

Added: trunk/debian/patches/02_use_dpkg_buildflags.patch
===================================================================
--- trunk/debian/patches/02_use_dpkg_buildflags.patch	                        (rev 0)
+++ trunk/debian/patches/02_use_dpkg_buildflags.patch	2012-03-17 17:15:57 UTC (rev 696)
@@ -0,0 +1,41 @@
+Description: Use CPPFLAGS/LDFLAGS from environment (dpkg-buildflags).
+ Necessary for hardening flags.
+Author: Simon Ruderich <simon at ruderich.org>
+Last-Update: 2012-03-12
+
+--- mailman-2.1.14.orig/src/Makefile.in
++++ mailman-2.1.14/src/Makefile.in
+@@ -43,6 +43,8 @@ MAILMAN_USER=	@MAILMAN_USER@
+ # Customizable but not set by configure
+ OPT=		@OPT@
+ CFLAGS=		@CFLAGS@ $(OPT) $(DEFS) $(LIBS)
++CPPFLAGS=	@CPPFLAGS@
++LDFLAGS=	@LDFLAGS@
+ CGIDIR= 	$(exec_prefix)/cgi-bin
+ CGIEXT=		@CGIEXT@
+ MAILDIR=	$(exec_prefix)/mail
+@@ -91,19 +93,19 @@ PROGRAMS= $(CGI_PROGS) $(MAIL_PROGS) $(A
+ all: $(PROGRAMS)
+ 
+ mailman: $(srcdir)/mail-wrapper.c $(COMMONOBJS)
+-	$(CC) -I. $(MAIL_FLAGS) $(CFLAGS) $(COMMONOBJS) -o $@ $(srcdir)/mail-wrapper.c
++	$(CC) -I. $(MAIL_FLAGS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(COMMONOBJS) -o $@ $(srcdir)/mail-wrapper.c
+ 
+ #addaliases: $(srcdir)/alias-wrapper.c $(COMMONOBJS)
+-#	$(CC) -I. $(ALIAS_FLAGS) $(CFLAGS) -o $@ $(srcdir)/alias-wrapper.c
++#	$(CC) -I. $(ALIAS_FLAGS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(srcdir)/alias-wrapper.c
+ 
+ $(CGI_PROGS): $(srcdir)/cgi-wrapper.c $(COMMONOBJS)
+-	$(CC) -DSCRIPT="\"$@\"" -I. $(CGI_FLAGS) $(CFLAGS) $(COMMONOBJS) -o $@ $(srcdir)/cgi-wrapper.c
++	$(CC) -DSCRIPT="\"$@\"" -I. $(CGI_FLAGS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(COMMONOBJS) -o $@ $(srcdir)/cgi-wrapper.c
+ 
+ common.o: $(srcdir)/common.c $(srcdir)/common.h Makefile
+-	$(CC) -c -I. $(COMMON_FLAGS) $(CFLAGS) $(srcdir)/common.c
++	$(CC) -c -I. $(COMMON_FLAGS) $(CFLAGS) $(CPPFLAGS) $(srcdir)/common.c
+ 
+ vsnprintf.o: $(srcdir)/vsnprintf.c Makefile
+-	$(CC) -c -I. $(COMMON_FLAGS) $(CFLAGS) $(srcdir)/vsnprintf.c
++	$(CC) -c -I. $(COMMON_FLAGS) $(CFLAGS) $(CPPFLAGS) $(srcdir)/vsnprintf.c
+ 
+ install: all
+ 	for f in $(CGI_PROGS); \