[med-svn] r10637 - in trunk/packages/maqview/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-05-02 07:54:17 +0000 (Wed, 02 May 2012)
New Revision: 10637

Added:
   trunk/packages/maqview/trunk/debian/patches/use-dpkg-buildflags.patch
Modified:
   trunk/packages/maqview/trunk/debian/changelog
   trunk/packages/maqview/trunk/debian/patches/series
Log:
Add patch to enable propagation of environment variables into build system to support hardening flags


Modified: trunk/packages/maqview/trunk/debian/changelog
===================================================================
--- trunk/packages/maqview/trunk/debian/changelog	2012-05-01 21:12:59 UTC (rev 10636)
+++ trunk/packages/maqview/trunk/debian/changelog	2012-05-02 07:54:17 UTC (rev 10637)
@@ -1,3 +1,11 @@
+maqview (0.2.5-3) unstable; urgency=low
+
+  * debian/use-dpkg-buildflags.patch: Use build flags from environment
+    to enable hardening (Thanks to Simon Ruderich <simon at ruderich.org>
+    for the patch)
+
+ -- Andreas Tille <tille at debian.org>  Wed, 02 May 2012 09:42:34 +0200
+
 maqview (0.2.5-2) unstable; urgency=low
 
   * debian/patches/gcc-4.7.patch: Enable building with g++-4.7

Modified: trunk/packages/maqview/trunk/debian/patches/series
===================================================================
--- trunk/packages/maqview/trunk/debian/patches/series	2012-05-01 21:12:59 UTC (rev 10636)
+++ trunk/packages/maqview/trunk/debian/patches/series	2012-05-02 07:54:17 UTC (rev 10637)
@@ -1,2 +1,3 @@
 fix-gcc-4.5.patch
 gcc-4.7.patch
+use-dpkg-buildflags.patch

Added: trunk/packages/maqview/trunk/debian/patches/use-dpkg-buildflags.patch
===================================================================
--- trunk/packages/maqview/trunk/debian/patches/use-dpkg-buildflags.patch	                        (rev 0)
+++ trunk/packages/maqview/trunk/debian/patches/use-dpkg-buildflags.patch	2012-05-02 07:54:17 UTC (rev 10637)
@@ -0,0 +1,66 @@
+Description: Use build flags from environment (dpkg-buildflags).
+ Necessary for hardening flags.
+Author: Simon Ruderich <simon at ruderich.org>
+Last-Update: 2012-04-28
+
+Index: maqview-0.2.5/configure.ac
+===================================================================
+--- maqview-0.2.5.orig/configure.ac	2012-04-28 20:43:32.741129412 +0200
++++ maqview-0.2.5/configure.ac	2012-04-28 20:43:32.761129412 +0200
+@@ -13,13 +13,13 @@
+   NONE);;
+   *) is_static=1
+      AC_MSG_WARN([Library libglut will be statically linked.])
+-     LDFLAGS="-L${prefix}/lib"
+-     CPPFLAGS="-I${prefix}/include";;
++     LDFLAGS="$LDFLAGS -L${prefix}/lib"
++     CPPFLAGS="$CPPFLAGS -I${prefix}/include";;
+ esac
+ 
+ # set CFLAGS and LDFLAGS
+ 
+-true_CFLAGS="-g -O2 -Wall -W -DMAQ_LONGREADS"
++true_CFLAGS="$CFLAGS -g -O2 -Wall -W -DMAQ_LONGREADS"
+ case "${host_os}" in
+   darwin*)
+     GLLIBS="-framework OpenGL -framework GLUT"
+Index: maqview-0.2.5/Makefile.generic
+===================================================================
+--- maqview-0.2.5.orig/Makefile.generic	2012-04-28 20:43:04.181129286 +0200
++++ maqview-0.2.5/Makefile.generic	2012-04-28 20:43:32.761129412 +0200
+@@ -1,7 +1,7 @@
+ CC=			gcc
+ CXX=		g++
+-CFLAGS=		-g -Wall -O2 -D_FILE_OFFSET_BITS=64 -DHAVE_FREEGLUT# -pg -fprofile-arcs -ftest-coverage
+-CXXFLAGS=	$(CFLAGS)
++CFLAGS+=		-g -Wall -O2 -D_FILE_OFFSET_BITS=64 -DHAVE_FREEGLUT# -pg -fprofile-arcs -ftest-coverage
++CXXFLAGS:=	$(CFLAGS)
+ DFLAGS=
+ ZOBJS=		adler32.o compress.o crc32.o deflate.o gzio.o inffast.o inflate.o \
+ 			infback.o inftrees.o trees.o uncompr.o zutil.o
+@@ -18,20 +18,20 @@
+ .SUFFIXES:.c .o .cc
+ 
+ .c.o:
+-		$(CC) -c $(CFLAGS) $(DFLAGS) $< -o $@
++		$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DFLAGS) $< -o $@
+ .cc.o:
+-		$(CXX) -c $(CXXFLAGS) $(DFLAGS) $< -o $@
++		$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(DFLAGS) $< -o $@
+ 
+ all:$(PROGS)
+ 
+ zrio:$(ZOBJS) zrio_main.o
+-		$(CC) $(CFLAGS) -o $@ -DMAIN_ZRIO zrio_main.o zrio.o $(ZOBJS)
++		$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DMAIN_ZRIO zrio_main.o zrio.o $(ZOBJS)
+ 
+ maqindex:$(ZOBJS) $(OBJS) maqmap_index_main.o
+-		$(CXX) $(CFLAGS) -o $@ $(ZOBJS) $(OBJS) maqmap_index_main.o
++		$(CXX) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(ZOBJS) $(OBJS) maqmap_index_main.o
+ 
+ maqview:$(ZOBJS) $(OBJS) view_goto.o MainFrame.o view_panel.o gl_gui.o
+-		$(CXX) $(CFLAGS) -o $@ $(ZOBJS) $(OBJS) view_goto.o view_panel.o gl_gui.o MainFrame.o $(GLLIBS)
++		$(CXX) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(ZOBJS) $(OBJS) view_goto.o view_panel.o gl_gui.o MainFrame.o $(GLLIBS)
+ 
+ maqview.1:maqview.pod
+ 		pod2man --center "Bioinformatics Tools" --release "maqview-$(VERSION)" maqview.pod > $@