[med-svn] r11914 - in trunk/packages/arb/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-07-27 13:41:23 +0000 (Fri, 27 Jul 2012)
New Revision: 11914

Modified:
   trunk/packages/arb/trunk/debian/changelog
   trunk/packages/arb/trunk/debian/compat
   trunk/packages/arb/trunk/debian/control
   trunk/packages/arb/trunk/debian/patches/30_Makefile_main
   trunk/packages/arb/trunk/debian/rules
Log:
Enable hardening


Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog	2012-07-27 12:51:29 UTC (rev 11913)
+++ trunk/packages/arb/trunk/debian/changelog	2012-07-27 13:41:23 UTC (rev 11914)
@@ -8,9 +8,15 @@
   * debian/po/nl.po: Add Dutch translation of debconf templates
     Thanks for the translation to Jeroen Schot <schot at A-Eskwadraat.nl>
     Closes: #654763
-  * debian/patches/30_Makefile_main: Enable gcc-4.7 as well
-    Closes: #682404
+  * debian/patches/30_Makefile_main:
+     - Enable gcc-4.7 as well
+       Closes: #682404
+     - Enable using hardening flags
   * debian/patches/gcc-4.7.patch: Fix gcc-4.7 build issue
+  * debhelper 9 (control+compat)
+  * debian/rules:
+     - Fixed clean target
+     - propagate hardening flags
 
  -- Andreas Tille <tille at debian.org>  Thu, 26 Jul 2012 12:15:21 +0200
 

Modified: trunk/packages/arb/trunk/debian/compat
===================================================================
--- trunk/packages/arb/trunk/debian/compat	2012-07-27 12:51:29 UTC (rev 11913)
+++ trunk/packages/arb/trunk/debian/compat	2012-07-27 13:41:23 UTC (rev 11914)
@@ -1 +1 @@
-8
+9

Modified: trunk/packages/arb/trunk/debian/control
===================================================================
--- trunk/packages/arb/trunk/debian/control	2012-07-27 12:51:29 UTC (rev 11913)
+++ trunk/packages/arb/trunk/debian/control	2012-07-27 13:41:23 UTC (rev 11914)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
 Build-Depends: chrpath,
-               debhelper (>= 8),
+               debhelper (>= 9),
                dpkg-dev (>= 1.15.4),
                freeglut3-dev | libglu-dev,
                libbio-perl-perl,

Modified: trunk/packages/arb/trunk/debian/patches/30_Makefile_main
===================================================================
--- trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2012-07-27 12:51:29 UTC (rev 11913)
+++ trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2012-07-27 13:41:23 UTC (rev 11914)
@@ -1,3 +1,11 @@
+Author: Andreas Tille <tille at debian.org>
+Date: Thu, 26 Jul 2012 12:15:21 +0200
+Description: Some adaptations to Debian
+  * Enable building with Debian default compiler
+  * Enable fixing rpath issue when build under Debian
+  * Fix X11 path
+  * Enable propagation of hardening flags
+
 --- arb-5.3.orig/Makefile
 +++ arb-5.3/Makefile
 @@ -58,7 +58,9 @@
@@ -38,10 +46,25 @@
  XINCLUDES:=-I$(XHOME)/include
  
  ifdef DARWIN
-@@ -304,7 +315,7 @@
+@@ -281,9 +292,9 @@
+ #	(instead define variables above)
+ # -------------------------------------------------------------------------
  
- lflags += $(ldynamic)
+-cflags += -W -Wall $(dflags) $(extended_warnings) $(cdynamic)
++cflags += $(CFLAGS) -W -Wall $(dflags) $(extended_warnings) $(cdynamic)
  
+-cppflags := $(extended_cpp_warnings)
++cppflags := $(extended_cpp_warnings) $(CPPFLAGS)
+ 
+ ifeq ($(DEVELOPER),RALF)
+ HAVE_GNUPP0X=`SOURCE_TOOLS/requireVersion.pl 4.3 $(GCC_VERSION_FOUND)`
+@@ -302,9 +313,9 @@
+ 
+ PP := $(CPPreal)# preprocessor
+ 
+-lflags += $(ldynamic)
++lflags += $(ldynamic) $(LDFLAGS)
+ 
 -LINK_STATIC_LIB := ld $(lflags) -r -o# link static lib
 +LINK_STATIC_LIB := ld -rpath=/usr/lib/arb/lib -r -o# link static lib
  LINK_EXECUTABLE := $(GPP) $(lflags) $(cdynamic) -o# link executable (c++)

Modified: trunk/packages/arb/trunk/debian/rules
===================================================================
--- trunk/packages/arb/trunk/debian/rules	2012-07-27 12:51:29 UTC (rev 11913)
+++ trunk/packages/arb/trunk/debian/rules	2012-07-27 13:41:23 UTC (rev 11914)
@@ -26,9 +26,13 @@
 	export LC_ALL=C ; \
 	export PATH=$(ARBHOME)/bin:$${PATH} ; \
 	export LD_LIBRARY_PATH=$(ARBHOME)/lib:$${LD_LIBRARY_PATH}; \
-	  $(MAKE) DEBIAN=1 ARBHOME=$(ARBHOME) ARB_64=$(ARB_64) all ; \
+	  $(MAKE) DEBIAN=1 ARBHOME=$(ARBHOME) ARB_64=$(ARB_64) \
+	  CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" \
+	  all ; \
 	export LD_LIBRARY_PATH=$(ARBHOME)/lib:$${LD_LIBRARY_PATH}; \
-	  $(MAKE) DEBIAN=1 ARBHOME=$(ARBHOME) ARB_64=$(ARB_64) arbxtras
+	  $(MAKE) DEBIAN=1 ARBHOME=$(ARBHOME) ARB_64=$(ARB_64) \
+	  CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" \
+	  arbxtras
 	export LD_LIBRARY_PATH=$(ARBHOME)/lib:$${LD_LIBRARY_PATH}; \
 	  cd HELP_SOURCE; $(MAKE) ARBHOME=$(ARBHOME) html
 
@@ -45,7 +49,8 @@
                          lib/arb_tcp.dat lib/ARB.pm \
 			 *.last_gcc TEMPLATES/arb_build.h \
 			 GDE/MOLPHY/prot_tml.h \
-			 PERL2ARB/perlmain.c
+			 PERL2ARB/perlmain.c \
+			 PERL2ARB/ARB.bs PERL_SCRIPTS/test/test.stamp PERL2ARB/MYMETA.yml
 FILESTOREMOVE=libXm.so.3 NALIGNER/NALIGNER.com lib/nas/names.dat $(RemoveFromSourceAndBuild)
 DIRSTOREMOVE=INCLUDE HELP_SOURCE/Xml lib/help lib/help_html PERL5 lib/perl5 PROBE_SERVER/bin PERL2ARB/blib/man3 PROBE_SET/bin
 DirsToKeepOnlyMAKEFILE=bin