[med-svn] r17539 - in trunk/packages/arb/trunk/debian: . patches
Andreas Tille
tille at moszumanska.debian.org
Tue Jul 29 07:32:07 UTC 2014
Author: tille
Date: 2014-07-29 07:32:07 +0000 (Tue, 29 Jul 2014)
New Revision: 17539
Added:
trunk/packages/arb/trunk/debian/patches/10_config.makefiles.patch
trunk/packages/arb/trunk/debian/patches/20_Makefile_main.patch
trunk/packages/arb/trunk/debian/patches/21_Makefiles.patch
trunk/packages/arb/trunk/debian/patches/30_tmpfile_CVE-2008-5378.patch
trunk/packages/arb/trunk/debian/patches/70_hardening.patch
trunk/packages/arb/trunk/debian/patches/80_no_GL.patch
Removed:
trunk/packages/arb/trunk/debian/patches/20_Makefiles
trunk/packages/arb/trunk/debian/patches/20_config.makefiles
trunk/packages/arb/trunk/debian/patches/30_Makefile_main
trunk/packages/arb/trunk/debian/patches/hardening.patch
trunk/packages/arb/trunk/debian/patches/tmpfile_CVE-2008-5378.patch
Modified:
trunk/packages/arb/trunk/debian/changelog
trunk/packages/arb/trunk/debian/patches/series
Log:
Switch of GL for the moment since it generates build errors. Hopefully this patch can be deactivated by fixing the GL build problems; consistent naming of patches
Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog 2014-07-28 19:43:14 UTC (rev 17538)
+++ trunk/packages/arb/trunk/debian/changelog 2014-07-29 07:32:07 UTC (rev 17539)
@@ -3,6 +3,8 @@
* New upstream version
* debian/upstream -> debian/upstream/metadata
* Build-Depends: libglib2.0-dev
+ * debian/patches/0_no_GL.patch: Switch of GL for the moment since it
+ generates build errors (FIXME)
TODO: Run test suite
-- Andreas Tille <tille at debian.org> Mon, 28 Jul 2014 14:36:39 +0200
Copied: trunk/packages/arb/trunk/debian/patches/10_config.makefiles.patch (from rev 17536, trunk/packages/arb/trunk/debian/patches/20_config.makefiles)
===================================================================
--- trunk/packages/arb/trunk/debian/patches/10_config.makefiles.patch (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/10_config.makefiles.patch 2014-07-29 07:32:07 UTC (rev 17539)
@@ -0,0 +1,33 @@
+Author: Andreas Tille <tille at debian.org>
+Description: Set basic makefile configuration variables
+
+--- /dev/null
++++ b/config.makefile
+@@ -0,0 +1,27 @@
++# --------------------------------------------------------------------------------
++# If this file is named config.makefile.template then copy it to config.makefile
++# DO NOT EDIT config.makefile.template
++# --------------------------------------------------------------------------------
++
++# Enter your name (upper case, no spaces) here, to enable '#ifdef DEVEL_YOURNAME #endif' sections
++DEVELOPER=ANY
++
++DEBUG=0# build with debug information
++DEBUG_GRAPHICS = 0# force instant graphic update
++# SEER = 1
++OPENGL=1
++# ARB_64=0# compile on 64 bit machine (has no effect yet)
++ARB_64 := $(shell if [ `dpkg-architecture -qDEB_BUILD_ARCH_BITS` -eq 64 ] ; then echo 1 ; else echo 0 ; fi)
++
++# --------------------------------------------------------------------------------
++# target machine section
++# [Note: Uncomment one section, depending on your machine type and compiler options]
++
++# ********* LINUX / gcc g++ / static ********
++MACH = LINUX# Linux g++ and gcc
++LINUX = 1
++ECGS = 1# use GCC? (always 1 for LINUX)
++
++# ******** Debian GNU/Linux and (K)Ubuntu system ********
++DEBIAN = 1
++
Copied: trunk/packages/arb/trunk/debian/patches/20_Makefile_main.patch (from rev 17536, trunk/packages/arb/trunk/debian/patches/30_Makefile_main)
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_Makefile_main.patch (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/20_Makefile_main.patch 2014-07-29 07:32:07 UTC (rev 17539)
@@ -0,0 +1,16 @@
+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
+
+--- a/Makefile
++++ b/Makefile
+@@ -96,7 +96,7 @@ ALLOWED_gcc_VERSIONS=\
+ 4.6.1 4.6.2 4.6.3 \
+ 4.7.1 4.7.2 4.7.3 \
+ 4.8.0 4.8.1 4.8.2 4.8.3 \
+- 4.9.0 \
++ 4.9.0 4.9.1 \
+
+ # supported clang versions:
+ ALLOWED_clang_VERSIONS=\
Deleted: trunk/packages/arb/trunk/debian/patches/20_Makefiles
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_Makefiles 2014-07-28 19:43:14 UTC (rev 17538)
+++ trunk/packages/arb/trunk/debian/patches/20_Makefiles 2014-07-29 07:32:07 UTC (rev 17539)
@@ -1,59 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Mon, 28 Jul 2014 15:06:57 +0200
-Description: Fix various clean targets
-
---- a/NAMES_COM/Makefile
-+++ b/NAMES_COM/Makefile
-@@ -20,7 +20,7 @@ AISC_COMPILER=../AISC/aisc
- AISC_PROTOTYPER=../AISC_MKPTPS/aisc_mkpt
- AISC_DEPENDS = $(wildcard AISC/*.pa) $(AISC_COMPILER) $(AISC_PROTOTYPER)
-
--include AISC/export2sub
-+include $(ARBHOME)/AISC_COM/AISC/export2sub
-
- $(MAIN): server.a
-
-@@ -33,7 +33,7 @@ depends:
-
- clean:
- @rm -f .depends
-- @$(MAKE) -r -f AISC/Makefile clean
-+ @$(MAKE) -r -f ../AISC/Makefile clean
-
- # DO NOT DELETE
-
---- a/PROBE_COM/Makefile
-+++ b/PROBE_COM/Makefile
-@@ -20,7 +20,7 @@ AISC_COMPILER=../AISC/aisc
- AISC_PROTOTYPER=../AISC_MKPTPS/aisc_mkpt
- AISC_DEPENDS = $(wildcard AISC/*.pa) $(AISC_COMPILER) $(AISC_PROTOTYPER)
-
--include AISC/export2sub
-+include $(ARBHOME)/AISC_COM/AISC/export2sub
-
- $(MAIN): server.a
-
-@@ -33,7 +33,7 @@ depends:
-
- clean:
- @rm -f .depends
-- @$(MAKE) -r -f AISC/Makefile clean
-+ @$(MAKE) -r -f ../AISC/Makefile clean
-
- # DO NOT DELETE
-
---- a/GDEHELP/Makefile.helpfiles
-+++ b/GDEHELP/Makefile.helpfiles
-@@ -2,9 +2,9 @@
-
- .SUFFIXES: .doc .help .html
-
--# GENHELPDEST, GENDOCDEST and HELPFILELIST are passed from 'Makefile'
-+# GENHELPDEST, GENDOCDEST and HELP_NAMES are passed from 'Makefile'
-
--HELP_NAMES=$(shell cat $(HELPFILELIST))
-+# HELP_NAMES=$(shell cat $(HELPFILELIST))
- HELP_TARGETS=$(addprefix $(GENHELPDEST)/,$(HELP_NAMES))
- HELP_PLAIN=./HELP_PLAIN
- HELP_WRITTEN=./HELP_WRITTEN
-
Deleted: trunk/packages/arb/trunk/debian/patches/20_config.makefiles
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_config.makefiles 2014-07-28 19:43:14 UTC (rev 17538)
+++ trunk/packages/arb/trunk/debian/patches/20_config.makefiles 2014-07-29 07:32:07 UTC (rev 17539)
@@ -1,33 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Description: Set basic makefile configuration variables
-
---- /dev/null
-+++ b/config.makefile
-@@ -0,0 +1,27 @@
-+# --------------------------------------------------------------------------------
-+# If this file is named config.makefile.template then copy it to config.makefile
-+# DO NOT EDIT config.makefile.template
-+# --------------------------------------------------------------------------------
-+
-+# Enter your name (upper case, no spaces) here, to enable '#ifdef DEVEL_YOURNAME #endif' sections
-+DEVELOPER=ANY
-+
-+DEBUG=0# build with debug information
-+DEBUG_GRAPHICS = 0# force instant graphic update
-+# SEER = 1
-+OPENGL=1
-+# ARB_64=0# compile on 64 bit machine (has no effect yet)
-+ARB_64 := $(shell if [ `dpkg-architecture -qDEB_BUILD_ARCH_BITS` -eq 64 ] ; then echo 1 ; else echo 0 ; fi)
-+
-+# --------------------------------------------------------------------------------
-+# target machine section
-+# [Note: Uncomment one section, depending on your machine type and compiler options]
-+
-+# ********* LINUX / gcc g++ / static ********
-+MACH = LINUX# Linux g++ and gcc
-+LINUX = 1
-+ECGS = 1# use GCC? (always 1 for LINUX)
-+
-+# ******** Debian GNU/Linux and (K)Ubuntu system ********
-+DEBIAN = 1
-+
Copied: trunk/packages/arb/trunk/debian/patches/21_Makefiles.patch (from rev 17536, trunk/packages/arb/trunk/debian/patches/20_Makefiles)
===================================================================
--- trunk/packages/arb/trunk/debian/patches/21_Makefiles.patch (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/21_Makefiles.patch 2014-07-29 07:32:07 UTC (rev 17539)
@@ -0,0 +1,59 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 28 Jul 2014 15:06:57 +0200
+Description: Fix various clean targets
+
+--- a/NAMES_COM/Makefile
++++ b/NAMES_COM/Makefile
+@@ -20,7 +20,7 @@ AISC_COMPILER=../AISC/aisc
+ AISC_PROTOTYPER=../AISC_MKPTPS/aisc_mkpt
+ AISC_DEPENDS = $(wildcard AISC/*.pa) $(AISC_COMPILER) $(AISC_PROTOTYPER)
+
+-include AISC/export2sub
++include $(ARBHOME)/AISC_COM/AISC/export2sub
+
+ $(MAIN): server.a
+
+@@ -33,7 +33,7 @@ depends:
+
+ clean:
+ @rm -f .depends
+- @$(MAKE) -r -f AISC/Makefile clean
++ @$(MAKE) -r -f ../AISC/Makefile clean
+
+ # DO NOT DELETE
+
+--- a/PROBE_COM/Makefile
++++ b/PROBE_COM/Makefile
+@@ -20,7 +20,7 @@ AISC_COMPILER=../AISC/aisc
+ AISC_PROTOTYPER=../AISC_MKPTPS/aisc_mkpt
+ AISC_DEPENDS = $(wildcard AISC/*.pa) $(AISC_COMPILER) $(AISC_PROTOTYPER)
+
+-include AISC/export2sub
++include $(ARBHOME)/AISC_COM/AISC/export2sub
+
+ $(MAIN): server.a
+
+@@ -33,7 +33,7 @@ depends:
+
+ clean:
+ @rm -f .depends
+- @$(MAKE) -r -f AISC/Makefile clean
++ @$(MAKE) -r -f ../AISC/Makefile clean
+
+ # DO NOT DELETE
+
+--- a/GDEHELP/Makefile.helpfiles
++++ b/GDEHELP/Makefile.helpfiles
+@@ -2,9 +2,9 @@
+
+ .SUFFIXES: .doc .help .html
+
+-# GENHELPDEST, GENDOCDEST and HELPFILELIST are passed from 'Makefile'
++# GENHELPDEST, GENDOCDEST and HELP_NAMES are passed from 'Makefile'
+
+-HELP_NAMES=$(shell cat $(HELPFILELIST))
++# HELP_NAMES=$(shell cat $(HELPFILELIST))
+ HELP_TARGETS=$(addprefix $(GENHELPDEST)/,$(HELP_NAMES))
+ HELP_PLAIN=./HELP_PLAIN
+ HELP_WRITTEN=./HELP_WRITTEN
+
Deleted: trunk/packages/arb/trunk/debian/patches/30_Makefile_main
===================================================================
--- trunk/packages/arb/trunk/debian/patches/30_Makefile_main 2014-07-28 19:43:14 UTC (rev 17538)
+++ trunk/packages/arb/trunk/debian/patches/30_Makefile_main 2014-07-29 07:32:07 UTC (rev 17539)
@@ -1,16 +0,0 @@
-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
-
---- a/Makefile
-+++ b/Makefile
-@@ -96,7 +96,7 @@ ALLOWED_gcc_VERSIONS=\
- 4.6.1 4.6.2 4.6.3 \
- 4.7.1 4.7.2 4.7.3 \
- 4.8.0 4.8.1 4.8.2 4.8.3 \
-- 4.9.0 \
-+ 4.9.0 4.9.1 \
-
- # supported clang versions:
- ALLOWED_clang_VERSIONS=\
Copied: trunk/packages/arb/trunk/debian/patches/30_tmpfile_CVE-2008-5378.patch (from rev 17536, trunk/packages/arb/trunk/debian/patches/tmpfile_CVE-2008-5378.patch)
===================================================================
--- trunk/packages/arb/trunk/debian/patches/30_tmpfile_CVE-2008-5378.patch (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/30_tmpfile_CVE-2008-5378.patch 2014-07-29 07:32:07 UTC (rev 17539)
@@ -0,0 +1,18 @@
+Author: Andreas Tille <tille at debian.org>
+BugClosed: http://bugs.debian.org/508942
+Last-Update: Mon, 28 Jul 2014 15:31:20 +0200
+Description: This patch fixes tmpfile issues reported in CVE-2008-5378
+
+--- a/SH/arb_panic
++++ b/SH/arb_panic
+@@ -22,7 +22,9 @@ echo " There may be more than one datab
+ echo " --------------------------------"
+
+ for i in $chooser ; do
+- /bin/echo " - >" `ls $i` "<";
++ if [ ! -L "$i" ] ; then
++ /bin/echo " - >" `ls $i` "<";
++ fi
+ done
+ echo " --------------------------------"
+
Copied: trunk/packages/arb/trunk/debian/patches/70_hardening.patch (from rev 17536, trunk/packages/arb/trunk/debian/patches/hardening.patch)
===================================================================
--- trunk/packages/arb/trunk/debian/patches/70_hardening.patch (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/70_hardening.patch 2014-07-29 07:32:07 UTC (rev 17539)
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 04 Dec 2013 09:24:14 +0100
+Description: Propagate hardening options
+
+--- a/Makefile
++++ b/Makefile
+@@ -197,7 +197,7 @@ endif
+
+ ifeq ($(DEBIAN),1)
+ lflags += -rpath=/usr/lib/arb/lib -z relro
+- clflags += -Wl,-rpath=/usr/lib/arb/lib -Wl,-z,relro
++ clflags += -Wl,-rpath=/usr/lib/arb/lib $(LDFLAGS)
+ endif
+
+ ifeq ($(DEBUG),1)
Added: trunk/packages/arb/trunk/debian/patches/80_no_GL.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/80_no_GL.patch (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/80_no_GL.patch 2014-07-29 07:32:07 UTC (rev 17539)
@@ -0,0 +1,16 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 28 Jul 2014 14:36:39 +0200
+Description: Switch of GL for the moment since it generates build errors
+ Hopefully this patch can be deactivated by fixing the GL build problems
+
+--- a/config.makefile
++++ b/config.makefile
+@@ -9,7 +9,7 @@ DEVELOPER=ANY
+ DEBUG=0# build with debug information
+ DEBUG_GRAPHICS = 0# force instant graphic update
+ # SEER = 1
+-OPENGL=1
++OPENGL=0
+ # ARB_64=0# compile on 64 bit machine (has no effect yet)
+ ARB_64 := $(shell if [ `dpkg-architecture -qDEB_BUILD_ARCH_BITS` -eq 64 ] ; then echo 1 ; else echo 0 ; fi)
+
Deleted: trunk/packages/arb/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/hardening.patch 2014-07-28 19:43:14 UTC (rev 17538)
+++ trunk/packages/arb/trunk/debian/patches/hardening.patch 2014-07-29 07:32:07 UTC (rev 17539)
@@ -1,15 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Wed, 04 Dec 2013 09:24:14 +0100
-Description: Propagate hardening options
-
---- a/Makefile
-+++ b/Makefile
-@@ -197,7 +197,7 @@ endif
-
- ifeq ($(DEBIAN),1)
- lflags += -rpath=/usr/lib/arb/lib -z relro
-- clflags += -Wl,-rpath=/usr/lib/arb/lib -Wl,-z,relro
-+ clflags += -Wl,-rpath=/usr/lib/arb/lib $(LDFLAGS)
- endif
-
- ifeq ($(DEBUG),1)
Modified: trunk/packages/arb/trunk/debian/patches/series
===================================================================
--- trunk/packages/arb/trunk/debian/patches/series 2014-07-28 19:43:14 UTC (rev 17538)
+++ trunk/packages/arb/trunk/debian/patches/series 2014-07-29 07:32:07 UTC (rev 17539)
@@ -1,8 +1,9 @@
-20_config.makefiles
-30_Makefile_main
-20_Makefiles
-tmpfile_CVE-2008-5378.patch
+10_config.makefiles.patch
+20_Makefile_main.patch
+21_Makefiles.patch
+30_tmpfile_CVE-2008-5378.patch
40_add_libGLU.patch
50_fix_gcc-4.8.patch
60_use_debian_packaged_raxml.patch
-hardening.patch
+70_hardening.patch
+80_no_GL.patch
Deleted: trunk/packages/arb/trunk/debian/patches/tmpfile_CVE-2008-5378.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/tmpfile_CVE-2008-5378.patch 2014-07-28 19:43:14 UTC (rev 17538)
+++ trunk/packages/arb/trunk/debian/patches/tmpfile_CVE-2008-5378.patch 2014-07-29 07:32:07 UTC (rev 17539)
@@ -1,18 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-BugClosed: http://bugs.debian.org/508942
-Last-Update: Mon, 28 Jul 2014 15:31:20 +0200
-Description: This patch fixes tmpfile issues reported in CVE-2008-5378
-
---- a/SH/arb_panic
-+++ b/SH/arb_panic
-@@ -22,7 +22,9 @@ echo " There may be more than one datab
- echo " --------------------------------"
-
- for i in $chooser ; do
-- /bin/echo " - >" `ls $i` "<";
-+ if [ ! -L "$i" ] ; then
-+ /bin/echo " - >" `ls $i` "<";
-+ fi
- done
- echo " --------------------------------"
-
More information about the debian-med-commit
mailing list