[med-svn] r20744 - in trunk/packages/acedb/trunk/debian: . patches
Andreas Tille
tille at moszumanska.debian.org
Fri Dec 11 15:44:54 UTC 2015
Author: tille
Date: 2015-12-11 15:44:53 +0000 (Fri, 11 Dec 2015)
New Revision: 20744
Added:
trunk/packages/acedb/trunk/debian/patches/hardening.patch
Modified:
trunk/packages/acedb/trunk/debian/changelog
trunk/packages/acedb/trunk/debian/copyright
trunk/packages/acedb/trunk/debian/patches/belvu_help.patch
trunk/packages/acedb/trunk/debian/patches/binutils-gold.patch
trunk/packages/acedb/trunk/debian/patches/blxview_gtk_namespace_conflict.patch
trunk/packages/acedb/trunk/debian/patches/dotter_help.patch
trunk/packages/acedb/trunk/debian/patches/efetch_help.patch
trunk/packages/acedb/trunk/debian/patches/no-curses.patch
trunk/packages/acedb/trunk/debian/patches/series
trunk/packages/acedb/trunk/debian/rules
Log:
DEP5, DEP5, hardening
Modified: trunk/packages/acedb/trunk/debian/changelog
===================================================================
--- trunk/packages/acedb/trunk/debian/changelog 2015-12-11 14:20:25 UTC (rev 20743)
+++ trunk/packages/acedb/trunk/debian/changelog 2015-12-11 15:44:53 UTC (rev 20744)
@@ -1,7 +1,7 @@
acedb (4.9.39+dfsg.01-6) UNRELEASED; urgency=low
[ Charles Plessy ]
- * Renamed debian/upstream-metadata.yaml to debian/upstream
+ * Renamed debian/upstream-metadata.yaml to debian/upstream/metadata
[ Andreas Tille ]
* debian/upstream: Mark original citation as specific for package
@@ -13,6 +13,12 @@
* debhelper 9
* cme fix dpkg-copyright
* short dh rules file
+ * DEP3
+ * fix typo in d/copyright
+ * run upstream test suite at build time to have some log but ignore errors
+ since not all needed functions that are used in the test suite are
+ available
+ * Propagate hardening options
-- Andreas Tille <tille at debian.org> Thu, 10 Dec 2015 15:24:16 +0100
Modified: trunk/packages/acedb/trunk/debian/copyright
===================================================================
--- trunk/packages/acedb/trunk/debian/copyright 2015-12-11 14:20:25 UTC (rev 20743)
+++ trunk/packages/acedb/trunk/debian/copyright 2015-12-11 15:44:53 UTC (rev 20744)
@@ -23,7 +23,7 @@
MRC LMB, UK, Richard Durbin (now Sanger Center)
License: GPL-2+
All code is offered at either the GNU Lesser Public License (LGPL)
- or the GNU Public License (GPL) version 2 or later. Libraries are
+ or the GNU General Public License (GPL) version 2 or later. Libraries are
offered under the terms of the LGPL, while applications are put under
the GPL. Deviations from that rule are indicated in the respective
source code.
@@ -64,7 +64,7 @@
Tom Boutell <boutell at netcom.com>
Ulrich Sauvage <ulrich at kaa.crbm.cnrs-mop.fr>
-Files: wdm5/md5*
+Files: wmd5/md5*
Copyright:
(C) 1991-2, RSA Data Security, Inc. Created 1991. All
rights reserved.
Modified: trunk/packages/acedb/trunk/debian/patches/belvu_help.patch
===================================================================
--- trunk/packages/acedb/trunk/debian/patches/belvu_help.patch 2015-12-11 14:20:25 UTC (rev 20743)
+++ trunk/packages/acedb/trunk/debian/patches/belvu_help.patch 2015-12-11 15:44:53 UTC (rev 20744)
@@ -1,6 +1,10 @@
---- acedb-4.9.39.orig/w9/belvu.c
-+++ acedb-4.9.39/w9/belvu.c
-@@ -4914,7 +4914,8 @@
+Author: Steffen Moeller <moeller at debian.org>
+Last-Update: Sun, 11 Jul 2010 06:27:12 +0200
+Description: Add -h argument for help and -v for version info
+
+--- a/w9/belvu.c
++++ b/w9/belvu.c
+@@ -4914,7 +4914,8 @@ int main(int argc, char **argv)
output_probs = 0,
init_tree = 0,
only_tree = 0,
@@ -10,7 +14,7 @@
float
makeNRinit = 0.0,
init_rmEmptyColumns = 0.0,
-@@ -4926,7 +4927,7 @@
+@@ -4926,7 +4927,7 @@ int main(int argc, char **argv)
int optc;
extern int optind;
extern char *optarg;
@@ -19,7 +23,7 @@
static char *cc_date =
#if defined(__DATE__)
-@@ -4988,6 +4989,8 @@
+@@ -4988,6 +4989,8 @@ int main(int argc, char **argv)
-t <title> Set window title.\n\
-g Draw grid line (for debugging).\n\
-u Start up with uncoloured alignment (faster).\n\
@@ -28,7 +32,7 @@
\n\
Some X options:\n\
-acefont <font> Main font.\n\
-@@ -5011,6 +5014,7 @@
+@@ -5011,6 +5014,7 @@ int main(int argc, char **argv)
case 'C': saveCoordsOn = 0; break;
case 'c': verbose = 1; break;
case 'g': gridOn = 1; break;
@@ -36,7 +40,7 @@
case 'l':
colorCodesFile = messalloc(strlen(optarg+1));
strcpy(colorCodesFile, optarg); break;
-@@ -5089,11 +5093,15 @@
+@@ -5089,11 +5093,15 @@ int main(int argc, char **argv)
case 't':
strncpy(Title, optarg, 255); break;
case 'u': colorRectangles = 0; break;
Modified: trunk/packages/acedb/trunk/debian/patches/binutils-gold.patch
===================================================================
--- trunk/packages/acedb/trunk/debian/patches/binutils-gold.patch 2015-12-11 14:20:25 UTC (rev 20743)
+++ trunk/packages/acedb/trunk/debian/patches/binutils-gold.patch 2015-12-11 15:44:53 UTC (rev 20744)
@@ -4,8 +4,8 @@
Author: Fabrice Coutadeur <fabricesp at ubuntu.com>
Forwarded: acedb at sanger.ac.uk
---- acedb-4.9.39+dfsg.01.orig/wmake/LINUX_4_DEF
-+++ acedb-4.9.39+dfsg.01/wmake/LINUX_4_DEF
+--- a/wmake/LINUX_4_DEF
++++ b/wmake/LINUX_4_DEF
@@ -28,7 +28,7 @@ COMPILER = gcc $(COPT) -Wall -DACEDB4 `
LINKER = gcc $(COPT)
@@ -15,8 +15,8 @@
### Linux uses flex to emulate the standard 'lex' program
LEX_LIBS = -lfl
---- acedb-4.9.39+dfsg.01.orig/wmake/LINUX_64_DEF
-+++ acedb-4.9.39+dfsg.01/wmake/LINUX_64_DEF
+--- a/wmake/LINUX_64_DEF
++++ b/wmake/LINUX_64_DEF
@@ -28,7 +28,7 @@ COMPILER = gcc $(COPT) -Wall -DACEDB4 `
LINKER = gcc $(COPT)
Modified: trunk/packages/acedb/trunk/debian/patches/blxview_gtk_namespace_conflict.patch
===================================================================
--- trunk/packages/acedb/trunk/debian/patches/blxview_gtk_namespace_conflict.patch 2015-12-11 14:20:25 UTC (rev 20743)
+++ trunk/packages/acedb/trunk/debian/patches/blxview_gtk_namespace_conflict.patch 2015-12-11 15:44:53 UTC (rev 20744)
@@ -1,8 +1,8 @@
-Index: acedb-4.9.39/w9/blxview.c
-===================================================================
---- acedb-4.9.39.orig/w9/blxview.c 2010-07-10 20:55:11.000000000 +0200
-+++ acedb-4.9.39/w9/blxview.c 2010-07-10 20:57:14.000000000 +0200
-@@ -3447,7 +3447,7 @@
+Description: Adapt to current version of gtk
+
+--- a/w9/blxview.c
++++ b/w9/blxview.c
+@@ -3447,7 +3447,7 @@ static char *getSeq(char *seqname, char
/********************************************************************************
** BIG PICTURE ROUTINES ***
********************************************************************************/
@@ -11,7 +11,7 @@
{
blixemSettings();
}
-@@ -3583,7 +3583,7 @@
+@@ -3583,7 +3583,7 @@ static GtkWidget *makeButtonBar(void)
item = makeNewToolbarButton(GTK_TOOLBAR(toolbar),
"Settings",
"Open the Preferences Window",
Modified: trunk/packages/acedb/trunk/debian/patches/dotter_help.patch
===================================================================
--- trunk/packages/acedb/trunk/debian/patches/dotter_help.patch 2015-12-11 14:20:25 UTC (rev 20743)
+++ trunk/packages/acedb/trunk/debian/patches/dotter_help.patch 2015-12-11 15:44:53 UTC (rev 20744)
@@ -1,8 +1,10 @@
-Index: acedb-4.9.39/w9/dotterMain.c
-===================================================================
---- acedb-4.9.39.orig/w9/dotterMain.c 2010-07-10 23:18:41.000000000 +0200
-+++ acedb-4.9.39/w9/dotterMain.c 2010-07-10 23:27:00.000000000 +0200
-@@ -230,6 +230,16 @@
+Author: Steffen Moeller <moeller at debian.org>
+Last-Update: Sun, 11 Jul 2010 06:27:12 +0200
+Description: Add -h argument for help
+
+--- a/w9/dotterMain.c
++++ b/w9/dotterMain.c
+@@ -230,6 +230,16 @@ int main(int argc, char **argv)
usage = messalloc(strlen(usageText) + strlen(dotterVersion) + strlen(cc_date) + 20);
sprintf(usage, "%s%s, compiled %s\n", usageText, dotterVersion, cc_date);
Modified: trunk/packages/acedb/trunk/debian/patches/efetch_help.patch
===================================================================
--- trunk/packages/acedb/trunk/debian/patches/efetch_help.patch 2015-12-11 14:20:25 UTC (rev 20743)
+++ trunk/packages/acedb/trunk/debian/patches/efetch_help.patch 2015-12-11 15:44:53 UTC (rev 20744)
@@ -1,8 +1,10 @@
-Index: acedb-4.9.39/w9/efetch.c
-===================================================================
---- acedb-4.9.39.orig/w9/efetch.c 2010-07-10 22:02:36.000000000 +0200
-+++ acedb-4.9.39/w9/efetch.c 2010-07-10 22:50:51.000000000 +0200
-@@ -126,25 +126,85 @@
+Author: Steffen Moeller <moeller at debian.org>
+Last-Update: Sun, 11 Jul 2010 06:27:12 +0200
+Description: Add -h argument for help and -v for version info
+
+--- a/w9/efetch.c
++++ b/w9/efetch.c
+@@ -126,25 +126,85 @@ void main(int argc, char *argv[])
-s <#> Start at position #\n\
-e <#> Stop at position #\n\
-o More options and info...\n\
@@ -97,7 +99,7 @@
case 'B':
strcpy(dbsource, optarg); break;
case 'a':
-@@ -166,43 +226,16 @@
+@@ -166,43 +226,16 @@ void main(int argc, char *argv[])
strcpy(dbfile, optarg); break;
case 'H':
display_head=1; break;
@@ -150,7 +152,7 @@
exit(0);
case 'p':
search = 1; break;
-@@ -229,8 +262,19 @@
+@@ -229,8 +262,19 @@ void main(int argc, char *argv[])
strcpy(customName, optarg); break;
case 'w':
wormpep2swiss = 1; break;
Added: trunk/packages/acedb/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/acedb/trunk/debian/patches/hardening.patch (rev 0)
+++ trunk/packages/acedb/trunk/debian/patches/hardening.patch 2015-12-11 15:44:53 UTC (rev 20744)
@@ -0,0 +1,32 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 10 Dec 2015 15:24:16 +0100
+Description: Propagate hardening options
+
+--- a/wmake/LINUX_64_DEF
++++ b/wmake/LINUX_64_DEF
+@@ -23,9 +23,9 @@ LIBCC = gcc
+ COPT = -g
+ GTKVER = glib-2.0 gtk+-2.0
+
+-COMPILER = gcc $(COPT) -Wall -DACEDB4 `../w3rdparty/include-config $(GTKVER)`
++COMPILER = gcc $(COPT) -Wall -DACEDB4 `../w3rdparty/include-config $(GTKVER)` $(CLFAGS)
+
+-LINKER = gcc $(COPT)
++LINKER = gcc $(COPT) $(LDFLAGS)
+
+ # The arg to libs-config is used if our private copy not installed.
+ LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` -lm -lreadline -lX11
+--- a/wmake/LINUX_4_DEF
++++ b/wmake/LINUX_4_DEF
+@@ -23,9 +23,9 @@ LIBCC = gcc
+ COPT = -g
+ GTKVER = glib-2.0 gtk+-2.0
+
+-COMPILER = gcc $(COPT) -Wall -DACEDB4 `../w3rdparty/include-config $(GTKVER)`
++COMPILER = gcc $(COPT) -Wall -DACEDB4 `../w3rdparty/include-config $(GTKVER)` $(CFLAGS)
+
+-LINKER = gcc $(COPT)
++LINKER = gcc $(COPT) $(LDFLAGS)
+
+ # The arg to libs-config is used if our private copy not installed.
+ LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` -lm -lreadline -lX11
Modified: trunk/packages/acedb/trunk/debian/patches/no-curses.patch
===================================================================
--- trunk/packages/acedb/trunk/debian/patches/no-curses.patch 2015-12-11 14:20:25 UTC (rev 20743)
+++ trunk/packages/acedb/trunk/debian/patches/no-curses.patch 2015-12-11 15:44:53 UTC (rev 20744)
@@ -1,6 +1,11 @@
---- acedb-4.9.39+dfsg.01.orig/wmake/LINUX_64_DEF
-+++ acedb-4.9.39+dfsg.01/wmake/LINUX_64_DEF
-@@ -28,7 +28,7 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 21 Oct 2011 21:58:00 +0200
+Bug-Debian: http://bugs.debian.org/646133
+Description: Do not build against ncurses
+
+--- a/wmake/LINUX_64_DEF
++++ b/wmake/LINUX_64_DEF
+@@ -28,7 +28,7 @@ COMPILER = gcc $(COPT) -Wall -DACEDB4 `
LINKER = gcc $(COPT)
# The arg to libs-config is used if our private copy not installed.
@@ -9,9 +14,9 @@
### Linux uses flex to emulate the standard 'lex' program
LEX_LIBS = -lfl
---- acedb-4.9.39+dfsg.01.orig/wmake/LINUX_4_DEF
-+++ acedb-4.9.39+dfsg.01/wmake/LINUX_4_DEF
-@@ -28,7 +28,7 @@
+--- a/wmake/LINUX_4_DEF
++++ b/wmake/LINUX_4_DEF
+@@ -28,7 +28,7 @@ COMPILER = gcc $(COPT) -Wall -DACEDB4 `
LINKER = gcc $(COPT)
# The arg to libs-config is used if our private copy not installed.
Modified: trunk/packages/acedb/trunk/debian/patches/series
===================================================================
--- trunk/packages/acedb/trunk/debian/patches/series 2015-12-11 14:20:25 UTC (rev 20743)
+++ trunk/packages/acedb/trunk/debian/patches/series 2015-12-11 15:44:53 UTC (rev 20744)
@@ -4,3 +4,5 @@
dotter_help.patch
binutils-gold.patch
no-curses.patch
+## debug-clean.patch
+hardening.patch
Modified: trunk/packages/acedb/trunk/debian/rules
===================================================================
--- trunk/packages/acedb/trunk/debian/rules 2015-12-11 14:20:25 UTC (rev 20743)
+++ trunk/packages/acedb/trunk/debian/rules 2015-12-11 15:44:53 UTC (rev 20744)
@@ -30,7 +30,7 @@
override_dh_auto_build:
ln -sf bin.$(ACEDB_MACHINE) bin
- $(MAKE) tools other
+ $(MAKE) tools other CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
override_dh_auto_test:
cd bin && ln -s ../w2/graphtest.c
More information about the debian-med-commit
mailing list