[med-svn] r15275 - trunk/packages/ugene/trunk/debian/patches

[Andreas Tille]

Author: tille
Date: 2013-11-26 07:19:17 +0000 (Tue, 26 Nov 2013)
New Revision: 15275

Added:
   trunk/packages/ugene/trunk/debian/patches/hardening.patch
Removed:
   trunk/packages/ugene/trunk/debian/patches/do_not_strip.patch
Modified:
   trunk/packages/ugene/trunk/debian/patches/series
Log:
Try some patch to propagate hardening options which does not work yet


Deleted: trunk/packages/ugene/trunk/debian/patches/do_not_strip.patch
===================================================================
--- trunk/packages/ugene/trunk/debian/patches/do_not_strip.patch	2013-11-25 16:10:19 UTC (rev 15274)
+++ trunk/packages/ugene/trunk/debian/patches/do_not_strip.patch	2013-11-26 07:19:17 UTC (rev 15275)
@@ -1,20 +0,0 @@
-Index: ugene-1.9.8/Makefile
-===================================================================
---- ugene-1.9.8.orig/Makefile	2011-11-01 18:07:10.000000000 +0100
-+++ ugene-1.9.8/Makefile	2011-11-07 00:02:19.000000000 +0100
-@@ -2508,7 +2508,6 @@
- install_binscript: FORCE
- 	@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/bin/ 
- 	-$(INSTALL_PROGRAM) /home/moeller/alioth/debian-med/packages/ugene/ugene-1.9.8/ugene $(INSTALL_ROOT)/usr/bin/
--	-strip $(INSTALL_ROOT)/usr/bin/ugene
- 
- 
- uninstall_binscript:  FORCE
-@@ -2519,7 +2518,6 @@
- install_ugene_starter: FORCE
- 	@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/lib64/ugene/ || $(MKDIR) $(INSTALL_ROOT)/usr/lib64/ugene/ 
- 	-$(INSTALL_PROGRAM) /home/moeller/alioth/debian-med/packages/ugene/ugene-1.9.8/src/_release/ugene $(INSTALL_ROOT)/usr/lib64/ugene/
--	-strip $(INSTALL_ROOT)/usr/lib64/ugene/ugene
- 
- 
- uninstall_ugene_starter:  FORCE

Added: trunk/packages/ugene/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/ugene/trunk/debian/patches/hardening.patch	                        (rev 0)
+++ trunk/packages/ugene/trunk/debian/patches/hardening.patch	2013-11-26 07:19:17 UTC (rev 15275)
@@ -0,0 +1,20 @@
+--- a/src/ugene_globals.pri
++++ b/src/ugene_globals.pri
+@@ -7,6 +7,10 @@ DEFINES+=UGENE_VER_MAJOR=$${UGENE_VER_MA
+ DEFINES+=UGENE_VER_MINOR=$${UGENE_VER_MINOR}
+ DEFINES+=UGENE_VER_PATCH=$${UGENE_VER_PATCH}
+ 
++CFLAGS += $(CFLAGS)
++CXXFLAGS += $(CXXFLAGS)
++LDFLAGS += $(LDFLAGS)
++
+ #win32 : CONFIG -= flat  #group the files within the source/header group depending on the directory they reside in file system
+ win32 : QMAKE_CXXFLAGS += /MP # use parallel build with nmake
+ win32 : DEFINES+= _WINDOWS
+@@ -133,4 +137,4 @@ defineTest( exclude_list_enabled ) {
+ defineTest( without_non_free ) {
+     contains( UGENE_WITHOUT_NON_FREE, 1 ) : return (true)
+     return (false)
+-}
+\ No newline at end of file
++}

Modified: trunk/packages/ugene/trunk/debian/patches/series
===================================================================
--- trunk/packages/ugene/trunk/debian/patches/series	2013-11-25 16:10:19 UTC (rev 15274)
+++ trunk/packages/ugene/trunk/debian/patches/series	2013-11-26 07:19:17 UTC (rev 15275)
@@ -1,2 +1,2 @@
-#do_not_strip.patch
 use_debian_sqlite.patch
+hardening.patch