[med-svn] r16751 - trunk/packages/staden/trunk/debian/patches
Andreas Tille
tille at moszumanska.debian.org
Tue Apr 22 12:19:03 UTC 2014
Author: tille
Date: 2014-04-22 12:19:03 +0000 (Tue, 22 Apr 2014)
New Revision: 16751
Added:
trunk/packages/staden/trunk/debian/patches/hardening.patch
trunk/packages/staden/trunk/debian/patches/make_help_menus_work.patch
trunk/packages/staden/trunk/debian/patches/remove_svnversion_dep.patch
Removed:
trunk/packages/staden/trunk/debian/patches/make_help_menus_work
trunk/packages/staden/trunk/debian/patches/remove_svnversion_dep
Modified:
trunk/packages/staden/trunk/debian/patches/series
Log:
Hardening for all binaries
Added: trunk/packages/staden/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/staden/trunk/debian/patches/hardening.patch (rev 0)
+++ trunk/packages/staden/trunk/debian/patches/hardening.patch 2014-04-22 12:19:03 UTC (rev 16751)
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 21 Apr 2014 22:34:28 +0200
+Description: Hardening requires propagation of LDFLAGS into all build targets
+
+--- a/system.mk.in
++++ b/system.mk.in
+@@ -73,7 +73,7 @@ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = -L$(L) @LDFLAGS@ @CC_SEARCH_FLAGS@
+ #CLDFLAGS = -L$(L) -Wl,-rpath-link,$(L) $(subst -L,-Wl$(comma)-rpath-link$(comma),$(filter -L%,$(IOLIB_LIB)))
+-CLDFLAGS = -L$(L) @CC_SEARCH_FLAGS@
++CLDFLAGS = -L$(L) @LDFLAGS@ @CC_SEARCH_FLAGS@
+ CXXLDFLAGS = $(CLDFLAGS)
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
Deleted: trunk/packages/staden/trunk/debian/patches/make_help_menus_work
===================================================================
--- trunk/packages/staden/trunk/debian/patches/make_help_menus_work 2014-04-22 09:51:23 UTC (rev 16750)
+++ trunk/packages/staden/trunk/debian/patches/make_help_menus_work 2014-04-22 12:19:03 UTC (rev 16751)
@@ -1,54 +0,0 @@
-Author: Tim Booth <tbooth at ceh.ac.uk>
-Last-Update: Wed, 12 Jun 2013 17:47:51 +0100
-Description: Fix help menus
-
---- a/gap5/gap5rc_menu_full
-+++ b/gap5/gap5rc_menu_full
-@@ -212,12 +212,12 @@ add_command {Assembly.Map Reads.Bwa bwas
-
-
- add_command {Help.Contents} 1 0 {show_help gap5 Contents}
--add_command {Help.Introduction} 1 0 {show_help gap5 Gap4-Introduction}
-+# add_command {Help.Introduction} 1 0 {show_help gap5 Gap4-Introduction}
- add_command {Help.Output Window} 1 0 {show_help interface {UI-Output}}
- add_separator {Help.S1}
- add_command {Help.Index} 1 0 {show_help gap5 Index}
- add_separator {Help.S2}
--add_command {Help.Show Licence} 1 0 {ShowLicence}
-+add_command {Help.Show Licence} 1 0 {show_help gap5 Copyright}
-
- #For testing busy mode
- #add_command {File.Busy On} 1 2 {SetBusy}
---- a/gap4/gaprc_menu_full
-+++ b/gap4/gaprc_menu_full
-@@ -200,7 +200,7 @@ add_command {Help.Output Window} 1 0 {sh
- add_separator {Help.S1}
- add_command {Help.Index} 1 0 {show_help gap4 Index}
- add_separator {Help.S2}
--add_command {Help.Show Licence} 1 0 {ShowLicence}
-+add_command {Help.Show Licence} 1 0 {show_help gap4 Copyright}
-
- #For testing busy mode
- #add_command {File.Busy On} 1 2 {SetBusy}
---- a/gap4/gaprc_menu_mito
-+++ b/gap4/gaprc_menu_mito
-@@ -176,7 +176,7 @@ add_command {Help.Output Window} 1 0 {sh
- add_separator {Help.S1}
- add_command {Help.Index} 1 0 {show_help gap4 Index}
- add_separator {Help.S2}
--add_command {Help.Show Licence} 1 0 {ShowLicence}
-+add_command {Help.Show Licence} 1 0 {show_help gap4 Copyright}
-
- #For testing busy mode
- #add_command {File.Busy On} 1 2 {SetBusy}
---- a/pregap4/pregap4rc
-+++ b/pregap4/pregap4rc
-@@ -64,7 +64,7 @@ add_command {Help.Files} 1
- add_command {Help.Configuring Modules} 1 0 \
- {show_help pregap4 {Pregap4-Modules}}
- add_separator {Help.S2}
--add_command {Help.Show Licence} 1 0 {ShowLicence}
-+add_command {Help.Show Licence} 1 0 {show_help pregap4 Copyright}
-
- set_def WINDOW_STYLE compact
-
Added: trunk/packages/staden/trunk/debian/patches/make_help_menus_work.patch
===================================================================
--- trunk/packages/staden/trunk/debian/patches/make_help_menus_work.patch (rev 0)
+++ trunk/packages/staden/trunk/debian/patches/make_help_menus_work.patch 2014-04-22 12:19:03 UTC (rev 16751)
@@ -0,0 +1,54 @@
+Author: Tim Booth <tbooth at ceh.ac.uk>
+Last-Update: Wed, 12 Jun 2013 17:47:51 +0100
+Description: Fix help menus
+
+--- a/gap5/gap5rc_menu_full
++++ b/gap5/gap5rc_menu_full
+@@ -212,12 +212,12 @@ add_command {Assembly.Map Reads.Bwa bwas
+
+
+ add_command {Help.Contents} 1 0 {show_help gap5 Contents}
+-add_command {Help.Introduction} 1 0 {show_help gap5 Gap4-Introduction}
++# add_command {Help.Introduction} 1 0 {show_help gap5 Gap4-Introduction}
+ add_command {Help.Output Window} 1 0 {show_help interface {UI-Output}}
+ add_separator {Help.S1}
+ add_command {Help.Index} 1 0 {show_help gap5 Index}
+ add_separator {Help.S2}
+-add_command {Help.Show Licence} 1 0 {ShowLicence}
++add_command {Help.Show Licence} 1 0 {show_help gap5 Copyright}
+
+ #For testing busy mode
+ #add_command {File.Busy On} 1 2 {SetBusy}
+--- a/gap4/gaprc_menu_full
++++ b/gap4/gaprc_menu_full
+@@ -200,7 +200,7 @@ add_command {Help.Output Window} 1 0 {sh
+ add_separator {Help.S1}
+ add_command {Help.Index} 1 0 {show_help gap4 Index}
+ add_separator {Help.S2}
+-add_command {Help.Show Licence} 1 0 {ShowLicence}
++add_command {Help.Show Licence} 1 0 {show_help gap4 Copyright}
+
+ #For testing busy mode
+ #add_command {File.Busy On} 1 2 {SetBusy}
+--- a/gap4/gaprc_menu_mito
++++ b/gap4/gaprc_menu_mito
+@@ -176,7 +176,7 @@ add_command {Help.Output Window} 1 0 {sh
+ add_separator {Help.S1}
+ add_command {Help.Index} 1 0 {show_help gap4 Index}
+ add_separator {Help.S2}
+-add_command {Help.Show Licence} 1 0 {ShowLicence}
++add_command {Help.Show Licence} 1 0 {show_help gap4 Copyright}
+
+ #For testing busy mode
+ #add_command {File.Busy On} 1 2 {SetBusy}
+--- a/pregap4/pregap4rc
++++ b/pregap4/pregap4rc
+@@ -64,7 +64,7 @@ add_command {Help.Files} 1
+ add_command {Help.Configuring Modules} 1 0 \
+ {show_help pregap4 {Pregap4-Modules}}
+ add_separator {Help.S2}
+-add_command {Help.Show Licence} 1 0 {ShowLicence}
++add_command {Help.Show Licence} 1 0 {show_help pregap4 Copyright}
+
+ set_def WINDOW_STYLE compact
+
Deleted: trunk/packages/staden/trunk/debian/patches/remove_svnversion_dep
===================================================================
--- trunk/packages/staden/trunk/debian/patches/remove_svnversion_dep 2014-04-22 09:51:23 UTC (rev 16750)
+++ trunk/packages/staden/trunk/debian/patches/remove_svnversion_dep 2014-04-22 12:19:03 UTC (rev 16751)
@@ -1,21 +0,0 @@
-Jan says:
-(1) In system.mk.in, replaced "SVNVERS := $(shell @SVNVERSION@ $(SRCROOT))"
-with "SVNVERS := sourceforge-2.0.0b9-src" (svnversion prints
-"Unversioned directory" as the .svn directories aren't included in the
-archive, and the whitespace in that messes up the -D flag generated from
-SVNVERS).
-
-I think I need to set this from the Debian version, as it appears in title
-bars of applications. I don't want to set it manually.
---- a/system.mk.in
-+++ b/system.mk.in
-@@ -61,7 +61,8 @@
- # How else do we get commas in a subst text or pattern?
- comma = ,
-
--SVNVERS := $(shell @SVNVERSION@ $(SRCROOT))
-+#Use package version rather than SVN version
-+SVNVERS := $(shell dpkg-parsechangelog -l at PWD@/debian/changelog | grep Version: | cut -f2 -d' ' | cut -f1 -d- )
-
- LIB_RUNTIME_DIR = ${prefix}/lib/staden
- CC = @CC@
Added: trunk/packages/staden/trunk/debian/patches/remove_svnversion_dep.patch
===================================================================
--- trunk/packages/staden/trunk/debian/patches/remove_svnversion_dep.patch (rev 0)
+++ trunk/packages/staden/trunk/debian/patches/remove_svnversion_dep.patch 2014-04-22 12:19:03 UTC (rev 16751)
@@ -0,0 +1,21 @@
+Jan says:
+(1) In system.mk.in, replaced "SVNVERS := $(shell @SVNVERSION@ $(SRCROOT))"
+with "SVNVERS := sourceforge-2.0.0b9-src" (svnversion prints
+"Unversioned directory" as the .svn directories aren't included in the
+archive, and the whitespace in that messes up the -D flag generated from
+SVNVERS).
+
+I think I need to set this from the Debian version, as it appears in title
+bars of applications. I don't want to set it manually.
+--- a/system.mk.in
++++ b/system.mk.in
+@@ -61,7 +61,8 @@
+ # How else do we get commas in a subst text or pattern?
+ comma = ,
+
+-SVNVERS := $(shell @SVNVERSION@ $(SRCROOT))
++#Use package version rather than SVN version
++SVNVERS := $(shell dpkg-parsechangelog -l at PWD@/debian/changelog | grep Version: | cut -f2 -d' ' | cut -f1 -d- )
+
+ LIB_RUNTIME_DIR = ${prefix}/lib/staden
+ CC = @CC@
Modified: trunk/packages/staden/trunk/debian/patches/series
===================================================================
--- trunk/packages/staden/trunk/debian/patches/series 2014-04-22 09:51:23 UTC (rev 16750)
+++ trunk/packages/staden/trunk/debian/patches/series 2014-04-22 12:19:03 UTC (rev 16751)
@@ -1,7 +1,8 @@
# 1001_fix_zlib_linkage.patch
-# remove_svnversion_dep
-make_help_menus_work
+# remove_svnversion_dep.patch
+make_help_menus_work.patch
hardening_format-security.patch
+hardening.patch
fix_tcl_path.patch
fix_awk.patch
# delete_rpath_from_configure.patch
More information about the debian-med-commit
mailing list