[Debian-astro-commits] [eso-midas] 01/04: Use gbp pq instead of quilt to maintain patches
Ole Streicher
olebole at moszumanska.debian.org
Wed Mar 1 13:55:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository eso-midas.
commit 0dd021ec01191fe901e95b88db735dadd248829d
Author: Ole Streicher <olebole at debian.org>
Date: Wed Mar 1 09:32:28 2017 +0100
Use gbp pq instead of quilt to maintain patches
---
debian/patches/debian_setup.patch | 29 +++++++-
debian/patches/dont_compile_sp_pty.patch | 24 ++++---
debian/patches/dont_strip_during_build.patch | 42 ++++++-----
debian/patches/fix_cleanmidas.patch | 16 +++--
debian/patches/fix_fitswdb.patch | 18 +++--
debian/patches/fix_fitswdm_c.patch | 28 +++++---
debian/patches/fix_madrid.patch | 35 +++++----
debian/patches/fix_manpages.patch | 26 +++++--
debian/patches/fix_mdb_put.patch | 31 ++++----
debian/patches/fix_rarthm_for.patch | 19 +++--
debian/patches/fix_selechar_c.patch | 54 +++++++-------
debian/patches/fix_x11_include_path.patch | 14 +++-
debian/patches/nonlinux.patch | 19 +++--
debian/patches/output_to_stdout.patch | 27 +++++--
debian/patches/propagate_cflags.patch | 103 ++++++++++++++++-----------
debian/patches/syskeys.patch | 16 +++--
debian/patches/system_readline.patch | 57 +++++++++------
17 files changed, 370 insertions(+), 188 deletions(-)
diff --git a/debian/patches/debian_setup.patch b/debian/patches/debian_setup.patch
index dadf5e7..eb5172e 100644
--- a/debian/patches/debian_setup.patch
+++ b/debian/patches/debian_setup.patch
@@ -1,8 +1,22 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Debian specific setup
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Debian specific setup
+
+---
+ install/unix/preinstall | 5 ++++-
+ install/unix/systems/Debian/make_options | 17 +++++++++++++++++
+ install/unix/systems/Debian/make_shared | 6 ++++++
+ install/unix/systems/Debian/setup | 4 ++++
+ 4 files changed, 31 insertions(+), 1 deletion(-)
+ create mode 100644 install/unix/systems/Debian/make_options
+ create mode 100644 install/unix/systems/Debian/make_shared
+ create mode 100644 install/unix/systems/Debian/setup
+
+diff --git a/install/unix/preinstall b/install/unix/preinstall
+index 5a67c84..5df619a 100755
--- a/install/unix/preinstall
+++ b/install/unix/preinstall
-@@ -121,7 +121,10 @@
+@@ -121,7 +121,10 @@ unode=`(uname -n) 2>/dev/null`
urels=`(uname -r) 2>/dev/null`
machine=`(uname -m) 2>/dev/null`
@@ -14,6 +28,9 @@ Description: Debian specific setup
system="Darwin"
elif [ "$machine" = "x86_64" ]; then
+diff --git a/install/unix/systems/Debian/make_options b/install/unix/systems/Debian/make_options
+new file mode 100644
+index 0000000..e6adb02
--- /dev/null
+++ b/install/unix/systems/Debian/make_options
@@ -0,0 +1,17 @@
@@ -34,6 +51,9 @@ Description: Debian specific setup
+EDITLIBS=-lreadline
+UIMX=uimxR5
+INSTALL_FLAG=auto
+diff --git a/install/unix/systems/Debian/make_shared b/install/unix/systems/Debian/make_shared
+new file mode 100644
+index 0000000..053e463
--- /dev/null
+++ b/install/unix/systems/Debian/make_shared
@@ -0,0 +1,6 @@
@@ -43,6 +63,9 @@ Description: Debian specific setup
+gcc $LDFLAGS -shared -Wl,-soname,$1 -o $* -lm
+rm -f $library.so
+ln -s $1 $library.so
+diff --git a/install/unix/systems/Debian/setup b/install/unix/systems/Debian/setup
+new file mode 100644
+index 0000000..322e859
--- /dev/null
+++ b/install/unix/systems/Debian/setup
@@ -0,0 +1,4 @@
diff --git a/debian/patches/dont_compile_sp_pty.patch b/debian/patches/dont_compile_sp_pty.patch
index c95893d..fb72905 100644
--- a/debian/patches/dont_compile_sp_pty.patch
+++ b/debian/patches/dont_compile_sp_pty.patch
@@ -1,13 +1,21 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Dont compile gui/GraphLib/libsrc/uimxR5/src/sp_pty.c
- This file uses either nonportable termio, or sgtty which is not available
- everywhere (again, Hurd and FreeBSD are the examples here). In principle
- it could be rewritten to use termios (which is standard today); however
- the functions from this file are not needed in midas; therefore it is
- simpler just not to compile this.
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Dont compile gui/GraphLib/libsrc/uimxR5/src/sp_pty.c This file uses
+ either nonportable termio, or sgtty which is not available everywhere
+ (again, Hurd and FreeBSD are the examples here). In principle it could be
+ rewritten to use termios (which is standard today);
+ however the functions from this file are not needed in midas;
+ therefore it is simpler just not to compile this.
+
+---
+ gui/GraphLib/libsrc/uimxR5/src/makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/gui/GraphLib/libsrc/uimxR5/src/makefile b/gui/GraphLib/libsrc/uimxR5/src/makefile
+index 326b7ff..308b4a5 100644
--- a/gui/GraphLib/libsrc/uimxR5/src/makefile
+++ b/gui/GraphLib/libsrc/uimxR5/src/makefile
-@@ -65,7 +65,6 @@
+@@ -65,7 +65,6 @@ OBJECTS =\
subproc.o\
sp_utils.o\
sp_spmd.o\
diff --git a/debian/patches/dont_strip_during_build.patch b/debian/patches/dont_strip_during_build.patch
index 5a091ad..7ce17ae 100644
--- a/debian/patches/dont_strip_during_build.patch
+++ b/debian/patches/dont_strip_during_build.patch
@@ -1,10 +1,31 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Don't strip binaries during build
- This allows a debugging during packaging. The binaries are stripped
- later with dh_strip.
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Don't strip binaries during build This allows a debugging during
+ packaging. The binaries are stripped later with dh_strip.
+
+---
+ install/unix/default_mk | 2 +-
+ install/unix/install1 | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/install/unix/default_mk b/install/unix/default_mk
+index 187d7bb..d58fc4e 100644
+--- a/install/unix/default_mk
++++ b/install/unix/default_mk
+@@ -32,7 +32,7 @@ LD77_CMD = f77
+ LD77_OPT = $(LDFLAGS)
+ LD77 = $(LD77_CMD) $(LD77_OPT)
+ RANLIB = ranlib
+-STRIP = strip
++STRIP = echo
+ AR = ar
+ AR_OPT = ruv
+ AR_XOPT = xv
+diff --git a/install/unix/install1 b/install/unix/install1
+index 43c5922..77a8aa4 100755
--- a/install/unix/install1
+++ b/install/unix/install1
-@@ -536,9 +536,9 @@
+@@ -536,9 +536,9 @@ then
fi
else
echo "NOT FOUND."
@@ -16,14 +37,3 @@ Description: Don't strip binaries during build
#*************** END: Checking the strip command **************
#*************** START: Checking the ranlib command ***********
---- a/install/unix/default_mk
-+++ b/install/unix/default_mk
-@@ -32,7 +32,7 @@
- LD77_OPT = $(LDFLAGS)
- LD77 = $(LD77_CMD) $(LD77_OPT)
- RANLIB = ranlib
--STRIP = strip
-+STRIP = echo
- AR = ar
- AR_OPT = ruv
- AR_XOPT = xv
diff --git a/debian/patches/fix_cleanmidas.patch b/debian/patches/fix_cleanmidas.patch
index 53f2347..05faf9a 100644
--- a/debian/patches/fix_cleanmidas.patch
+++ b/debian/patches/fix_cleanmidas.patch
@@ -1,10 +1,18 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use predefined MIDVERS and MIDASHOME in cleanmidas
- Cleanmidas assumes the the parent directory of "15FEBpl1.1" is "midas",
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Use predefined MIDVERS and MIDASHOME in cleanmidas Cleanmidas
+ assumes the the parent directory of "15FEBpl1.1" is "midas",
which is not required in the installation guide.
+
+---
+ system/unix/cleanmidas | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/system/unix/cleanmidas b/system/unix/cleanmidas
+index 1834c9d..5ad891c 100755
--- a/system/unix/cleanmidas
+++ b/system/unix/cleanmidas
-@@ -54,11 +54,13 @@
+@@ -54,11 +54,13 @@ ask_yn()
[ $answer = y ]
}
diff --git a/debian/patches/fix_fitswdb.patch b/debian/patches/fix_fitswdb.patch
index b0459a1..efbb045 100644
--- a/debian/patches/fix_fitswdb.patch
+++ b/debian/patches/fix_fitswdb.patch
@@ -1,8 +1,9 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Another off-by-one
- Fixes:
- .
- ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fff9e7713b1 at pc 0x7f4135c48c7c bp 0x7fff9e770e20 sp 0x7fff9e770e18
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Another off-by-one Fixes: . ERROR: AddressSanitizer:
+ stack-buffer-overflow on address 0x7fff9e7713b1 at pc 0x7f4135c48c7c bp
+ 0x7fff9e770e20 sp 0x7fff9e770e18
+
WRITE of size 1 at 0x7fff9e7713b1 thread T0
#0 0x7f4135c48c7b in fitswdb prim/dio/libsrc/fitswdb.c:243
#1 0x7f4135c4a61c in fitswhd prim/dio/libsrc/fitswhd.c:450
@@ -25,10 +26,15 @@ Address 0x7fff9e7713b1 is located in stack of thread T0 at offset 1265 in frame
[1184, 1265) 'cval' <== Memory access at offset 1265 overflows this variable
[1312, 1393) 'line'
[1440, 1521) 'help'
+---
+ prim/dio/libsrc/fitswdb.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+diff --git a/prim/dio/libsrc/fitswdb.c b/prim/dio/libsrc/fitswdb.c
+index 5428378..1075018 100644
--- a/prim/dio/libsrc/fitswdb.c
+++ b/prim/dio/libsrc/fitswdb.c
-@@ -240,12 +240,12 @@
+@@ -240,12 +240,12 @@ cont_flag = fits_info[1];
if (dtk->ctl==NCTL || dtk->ctl==SCTL) {
nc = (MXLB<nbp) ? MXLB : nbp;
SCDRDC(mfd,md->name,1,ns,nc,&nv,cval,unit,&null);
diff --git a/debian/patches/fix_fitswdm_c.patch b/debian/patches/fix_fitswdm_c.patch
index 625208d..c267aef 100644
--- a/debian/patches/fix_fitswdm_c.patch
+++ b/debian/patches/fix_fitswdm_c.patch
@@ -1,13 +1,21 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: fix nullification of fitswdm.c
- Fitswdm.c uses toNULLLONG to set an integer to some minimal value
- (funnily, not 0 but LONG_MIN!). However, this will lead to a wrong
- result if long!=int, since the argument is an int. On LinuxAMD64, this
- was fixed, but not generally. This patch make the special case for
- LinuxAMD64 as the general one.
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: fix nullification of fitswdm.c Fitswdm.c uses toNULLLONG to set an
+ integer to some minimal value (funnily, not 0 but LONG_MIN!). However,
+ this will lead to a wrong result if long!=int,
+ since the argument is an int. On LinuxAMD64, this was fixed,
+ but not generally. This patch make the special case for LinuxAMD64 as the
+ general one.
+
+---
+ prim/dio/libsrc/fitswdm.c | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/prim/dio/libsrc/fitswdm.c b/prim/dio/libsrc/fitswdm.c
+index 1ace31c..4d13ed0 100644
--- a/prim/dio/libsrc/fitswdm.c
+++ b/prim/dio/libsrc/fitswdm.c
-@@ -237,12 +237,7 @@
+@@ -237,12 +237,7 @@ switch (mff)
{ /* NULL fill if needed */
pi = p.i + ns;
i = n - ns;
@@ -20,7 +28,7 @@ Description: fix nullification of fitswdm.c
}
ioff += n;
np = 4 * ns;
-@@ -279,12 +274,7 @@
+@@ -279,12 +274,7 @@ switch (mff)
while (n--)
if (isNULLFLOAT (*pf))
{
@@ -33,7 +41,7 @@ Description: fix nullification of fitswdm.c
*pf++;
}
else
-@@ -332,12 +322,7 @@
+@@ -332,12 +322,7 @@ switch (mff)
while (n--)
if (isNULLFLOAT (*pd))
{
diff --git a/debian/patches/fix_madrid.patch b/debian/patches/fix_madrid.patch
index cd3d8bf..2439b97 100644
--- a/debian/patches/fix_madrid.patch
+++ b/debian/patches/fix_madrid.patch
@@ -1,20 +1,25 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix size of MADRID array in test
- When gfortran-6 is called with an optimization (-O1 or higher), arrays with a
- length 1 seem to be converted to a scalar and assumed to always return the same
- value.
- .
- This fails with the MADRID array, which is a placeholder for an array.
- Specifically ftoc_commf.for fails then, which leads to a missing ftoc_comm.h.
- .
- The simple workaround is to use a size > 1 here.
- .
- Note that the MADRID array is defined with a length=1 in ~350 places all over
- eso-midas. They are not changed yet since the verification succeeds. If we get
- strange bugreports, this may be considered as the problem.
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Fix size of MADRID array in test When gfortran-6 is called with an
+ optimization (-O1 or higher),
+ arrays with a length 1 seem to be converted to a scalar and assumed to always
+ return the same value. . This fails with the MADRID array,
+ which is a placeholder for an array. Specifically ftoc_commf.for fails then,
+ which leads to a missing ftoc_comm.h. . The simple workaround is to use a
+ size > 1 here. . Note that the MADRID array is defined with a length=1 in
+ ~350 places all over eso-midas. They are not changed yet since the
+ verification succeeds. If we get strange bugreports,
+ this may be considered as the problem.
+
+---
+ system/ftoc-new/ftoc_commf.for | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/system/ftoc-new/ftoc_commf.for b/system/ftoc-new/ftoc_commf.for
+index 8218d4a..c11adef 100644
--- a/system/ftoc-new/ftoc_commf.for
+++ b/system/ftoc-new/ftoc_commf.for
-@@ -34,7 +34,7 @@
+@@ -34,7 +34,7 @@ C
C
PROGRAM F2CCOM
C
diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
index 466996d..c8fa0d5 100644
--- a/debian/patches/fix_manpages.patch
+++ b/debian/patches/fix_manpages.patch
@@ -1,6 +1,16 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Put the manpages in chapter "1" instead of "1L".
- They are not local in Debian.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Put the manpages in chapter "1" instead of "1L". They are not local
+ in Debian.
+
+---
+ system/unix/man1/gomidas.1 | 4 ++--
+ system/unix/man1/helpmidas.1 | 4 ++--
+ system/unix/man1/inmidas.1 | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/system/unix/man1/gomidas.1 b/system/unix/man1/gomidas.1
+index 5dc5ab5..a1cb0bb 100644
--- a/system/unix/man1/gomidas.1
+++ b/system/unix/man1/gomidas.1
@@ -2,7 +2,7 @@
@@ -12,12 +22,14 @@ Description: Put the manpages in chapter "1" instead of "1L".
.SH NAME
gomidas \- Resume a MIDAS session.
.SH SYNOPSIS
-@@ -56,4 +56,4 @@
+@@ -56,4 +56,4 @@ X server for the display and graphical MIDAS windows.
.IP "\fBMID_WORK\fp"
Startup directory for MIDAS containing previous MIDAS saved-session files.
.SH SEE ALSO
-.IR inmidas(1L)
+.IR inmidas(1)
+diff --git a/system/unix/man1/helpmidas.1 b/system/unix/man1/helpmidas.1
+index 9556c97..c99a57d 100644
--- a/system/unix/man1/helpmidas.1
+++ b/system/unix/man1/helpmidas.1
@@ -2,7 +2,7 @@
@@ -29,12 +41,14 @@ Description: Put the manpages in chapter "1" instead of "1L".
.SH NAME
helpmidas \- Standalone GUI help for MIDAS.
.SH SYNOPSIS
-@@ -71,4 +71,4 @@
+@@ -71,4 +71,4 @@ X server for the display and graphical MIDAS windows.
.IP "\fBMID_WORK\fp"
Startup directory for MIDAS.
.SH SEE ALSO
-.IR inmidas(1L),gomidas(1L)
+.IR inmidas(1),gomidas(1)
+diff --git a/system/unix/man1/inmidas.1 b/system/unix/man1/inmidas.1
+index a074c57..aacd7ca 100644
--- a/system/unix/man1/inmidas.1
+++ b/system/unix/man1/inmidas.1
@@ -2,7 +2,7 @@
@@ -46,7 +60,7 @@ Description: Put the manpages in chapter "1" instead of "1L".
.SH NAME
inmidas \- MIDAS start-up procedure for users.
.SH SYNOPSIS
-@@ -145,4 +145,4 @@
+@@ -145,4 +145,4 @@ Set to PARALLEL or NOPARALLEL.
.IP "\fBMID_WORK\fp"
Startup directory for MIDAS.
.SH SEE ALSO
diff --git a/debian/patches/fix_mdb_put.patch b/debian/patches/fix_mdb_put.patch
index eceb4cb..86e135c 100644
--- a/debian/patches/fix_mdb_put.patch
+++ b/debian/patches/fix_mdb_put.patch
@@ -1,24 +1,29 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix another probably off-by-one error in prim/dio/libsrc/fitsmdb.c
- This shall fix the following crash:
- .
- ERROR: AddressSanitizer: global-buffer-overflow on address 0x7f5ae9867e28 at pc 0x7f5ae979569c bp 0x7fff8c3c744
- READ of size 1 at 0x7f5ae9867e28 thread T0
- #0 0x7f5ae979569b in mdb_put prim/dio/libsrc/fitsmdb.c:173
- #1 0x7f5ae978f489 in fitsckw prim/dio/libsrc/fitsckw.c:872
- #2 0x7f5ae97a3ee4 in fitsrhd prim/dio/libsrc/fitsrhd.c:258
- #3 0x401ee4 in main prim/dio/src/infile.c:263
- #4 0x7f5ae90bab44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
- #5 0x4024e2 (prim/exec/infile.exe+0x4024e2)
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Fix another probably off-by-one error in prim/dio/libsrc/fitsmdb.c
+ This shall fix the following crash: . ERROR: AddressSanitizer:
+ global-buffer-overflow on address 0x7f5ae9867e28 at pc 0x7f5ae979569c bp
+ 0x7fff8c3c744 READ of size 1 at 0x7f5ae9867e28 thread T0 #0 0x7f5ae979569b
+ in mdb_put prim/dio/libsrc/fitsmdb.c:173 #1 0x7f5ae978f489 in fitsckw
+ prim/dio/libsrc/fitsckw.c:872 #2 0x7f5ae97a3ee4 in fitsrhd
+ prim/dio/libsrc/fitsrhd.c:258 #3 0x401ee4 in main prim/dio/src/infile.c:263
+ #4 0x7f5ae90bab44 in __libc_start_main
+ (/lib/x86_64-linux-gnu/libc.so.6+0x21b44) #5 0x4024e2
+ (prim/exec/infile.exe+0x4024e2)
0x7f5ae9867e28 is located 0 bytes to the right of global variable '*.LC46' from 'fitsckw.c' (0x7f5ae9867e20) of size 8
'*.LC46' is ascii string 'COMMENT'
0x7f5ae9867e28 is located 56 bytes to the left of global variable '*.LC47' from 'fitsckw.c' (0x7f5ae9867e60) of size 3
'*.LC47' is ascii string 'O_'
+---
+ prim/dio/libsrc/fitsmdb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/prim/dio/libsrc/fitsmdb.c b/prim/dio/libsrc/fitsmdb.c
+index 92458f9..2c4a5b0 100644
--- a/prim/dio/libsrc/fitsmdb.c
+++ b/prim/dio/libsrc/fitsmdb.c
-@@ -170,7 +170,7 @@
+@@ -170,7 +170,7 @@ retstat = 0;
ps = myptr->desc;
pc = kwd->desc;
diff --git a/debian/patches/fix_rarthm_for.patch b/debian/patches/fix_rarthm_for.patch
index 9d4892a..4c03459 100644
--- a/debian/patches/fix_rarthm_for.patch
+++ b/debian/patches/fix_rarthm_for.patch
@@ -1,8 +1,10 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Wild-quess workaround for access violations in prim/general/libsrc/calc.for
- This is to hide the following problem:
- .
- ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fffe7377ec4 at pc 0x40fb5c bp 0x7fffe7377350 sp 0x7fffe7377348
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Wild-quess workaround for access violations in
+ prim/general/libsrc/calc.for This is to hide the following problem: . ERROR:
+ AddressSanitizer: stack-buffer-overflow on address 0x7fffe7377ec4 at pc
+ 0x40fb5c bp 0x7fffe7377350 sp 0x7fffe7377348
+
READ of size 4 at 0x7fffe7377ec4 thread T0
#0 0x40fb5b in opffw_ prim/general/libsrc/calc.f:129
#1 0x40900b in rarthm prim/general/src/rarthm.f:402
@@ -24,10 +26,15 @@ Address 0x7fffe7377ec4 is located in stack of thread T0 at offset 1316 in frame
[1504, 1512) 'npixa'
[1568, 1576) 'npixb'
[1632, 1640) 'npixc'
+---
+ prim/general/src/rarthm.for | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/prim/general/src/rarthm.for b/prim/general/src/rarthm.for
+index e4c1eed..43b599c 100644
--- a/prim/general/src/rarthm.for
+++ b/prim/general/src/rarthm.for
-@@ -483,11 +483,11 @@
+@@ -483,11 +483,11 @@ C now do the actual OPERAT
IF (OPERAT(1:1).NE.'Q') THEN
CALL OPFFW(OPERAT,MADRID(APNTR),MADRID(BPNTR),
+ MADRID(PNTRW),APIX,BPIX,CPIX,
diff --git a/debian/patches/fix_selechar_c.patch b/debian/patches/fix_selechar_c.patch
index 63ff953..cf2e4cb 100644
--- a/debian/patches/fix_selechar_c.patch
+++ b/debian/patches/fix_selechar_c.patch
@@ -1,27 +1,26 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix off-by-one initialization in prim/table/libsrc/selechar.c
- I am, however, not sure whether it is in charfun() in selechar.c or SCFMAP()
- in scfb.c.
- .
- It fixes the following crash:
- .
- ERROR: AddressSanitizer: heap-buffer-overflow on address 0x61a00001f76c at pc 0x42ac5b bp 0x7fffb7a62330 sp 0x7fffb7a62328
- WRITE of size 1 at 0x61a00001f76c thread T0
- #0 0x42ac5a in charfun prim/table/libsrc/selechar.c:279
- #1 0x4154f5 in level5 prim/table/libsrc/tbcomsel.c:797
- #2 0x41572a in level4 prim/table/libsrc/tbcomsel.c:720
- #3 0x415c57 in level3 prim/table/libsrc/tbcomsel.c:765
- #4 0x415d1d in level2 prim/table/libsrc/tbcomsel.c:677
- #5 0x41610e in level1 prim/table/libsrc/tbcomsel.c:636
- #6 0x4165b0 in level0 prim/table/libsrc/tbcomsel.c:595
- #7 0x41415d in level00 prim/table/libsrc/tbcomsel.c:555
- #8 0x4179ff in tbl_comp prim/table/libsrc/tbcomsel.c:204
- #9 0x4053fd in tk_cexec prim/edit/libsrc/tkeys.c:204
- #10 0x404979 in main prim/table/src/tdatatbl.c:107
- #11 0x7f1e97ae3b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
- #12 0x404d62 (prim/exec/tdatatbl.exe+0x404d62)
- .
- 0x61a00001f76c is located 0 bytes to the right of 1260-byte region [0x61a00001f280,0x61a00001f76c)
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Fix off-by-one initialization in prim/table/libsrc/selechar.c I am,
+ however,
+ not sure whether it is in charfun() in selechar.c or SCFMAP() in scfb.c. . It
+ fixes the following crash: . ERROR: AddressSanitizer: heap-buffer-overflow
+ on address 0x61a00001f76c at pc 0x42ac5b bp 0x7fffb7a62330 sp 0x7fffb7a62328
+ WRITE of size 1 at 0x61a00001f76c thread T0 #0 0x42ac5a in charfun
+ prim/table/libsrc/selechar.c:279 #1 0x4154f5 in level5
+ prim/table/libsrc/tbcomsel.c:797 #2 0x41572a in level4
+ prim/table/libsrc/tbcomsel.c:720 #3 0x415c57 in level3
+ prim/table/libsrc/tbcomsel.c:765 #4 0x415d1d in level2
+ prim/table/libsrc/tbcomsel.c:677 #5 0x41610e in level1
+ prim/table/libsrc/tbcomsel.c:636 #6 0x4165b0 in level0
+ prim/table/libsrc/tbcomsel.c:595 #7 0x41415d in level00
+ prim/table/libsrc/tbcomsel.c:555 #8 0x4179ff in tbl_comp
+ prim/table/libsrc/tbcomsel.c:204 #9 0x4053fd in tk_cexec
+ prim/edit/libsrc/tkeys.c:204 #10 0x404979 in main
+ prim/table/src/tdatatbl.c:107 #11 0x7f1e97ae3b44 in __libc_start_main
+ (/lib/x86_64-linux-gnu/libc.so.6+0x21b44) #12 0x404d62
+ (prim/exec/tdatatbl.exe+0x404d62) . 0x61a00001f76c is located 0 bytes to the
+ right of 1260-byte region [0x61a00001f280, 0x61a00001f76c)
+
allocated by thread T0 here:
#0 0x7f1e9858373f in malloc (/usr/lib/x86_64-linux-gnu/libasan.so.1+0x5473f)
#1 0x7f1e98241cf2 in SCFMAP libsrc/st/scfb.c:816
@@ -37,10 +36,15 @@ allocated by thread T0 here:
#11 0x4053fd in tk_cexec prim/edit/libsrc/tkeys.c:204
#12 0x404979 in main prim/table/src/tdatatbl.c:107
#13 0x7f1e97ae3b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
+---
+ prim/table/libsrc/selechar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/prim/table/libsrc/selechar.c b/prim/table/libsrc/selechar.c
+index aa9cabe..00ced95 100644
--- a/prim/table/libsrc/selechar.c
+++ b/prim/table/libsrc/selechar.c
-@@ -247,7 +247,7 @@
+@@ -247,7 +247,7 @@ items = 0;
nconst[ibuf[6]] = nchar;
items = nchar * ibuf[2];
SCFCRE(name,D_I1_FORMAT,F_X_MODE,F_IMA_TYPE,items,&imnoc[ibuf[6]]);
diff --git a/debian/patches/fix_x11_include_path.patch b/debian/patches/fix_x11_include_path.patch
index 06aaab9..7c8a79c 100644
--- a/debian/patches/fix_x11_include_path.patch
+++ b/debian/patches/fix_x11_include_path.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Add /usr/include/X11 to the X11 include paths
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Add /usr/include/X11 to the X11 include paths
+
+---
+ install/unix/install1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/install/unix/install1 b/install/unix/install1
+index 77a8aa4..a46da85 100755
--- a/install/unix/install1
+++ b/install/unix/install1
-@@ -615,7 +615,7 @@
+@@ -615,7 +615,7 @@ then
x11incl="found"
else
ed_moptions delete X11INC >/dev/null
diff --git a/debian/patches/nonlinux.patch b/debian/patches/nonlinux.patch
index e5f68f1..2ffb112 100644
--- a/debian/patches/nonlinux.patch
+++ b/debian/patches/nonlinux.patch
@@ -1,8 +1,17 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fixes for non-linux (kFreeBSD, Hurd)
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Fixes for non-linux (kFreeBSD, Hurd)
+
+---
+ system/unix/inmidas | 2 +-
+ test/prim/veriall.prg | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/system/unix/inmidas b/system/unix/inmidas
+index e599b8b..f17231b 100755
--- a/system/unix/inmidas
+++ b/system/unix/inmidas
-@@ -425,7 +425,7 @@
+@@ -425,7 +425,7 @@ cp $MID_WORK/.inmidas $MID_WORK/.inmidas.$tt
#
os=`uname`
case "$os" in
@@ -11,9 +20,11 @@ Description: Fixes for non-linux (kFreeBSD, Hurd)
if [ -z "$LD_LIBRARY_PATH" ] ; then
LD_LIBRARY_PATH=$MIDASHOME/$MIDVERS/lib
else
+diff --git a/test/prim/veriall.prg b/test/prim/veriall.prg
+index 71187a1..dbb3cf0 100644
--- a/test/prim/veriall.prg
+++ b/test/prim/veriall.prg
-@@ -204,6 +204,7 @@
+@@ -204,6 +204,7 @@ else
write/keyw in_b MID_WORK:veriall_{out_b(1:{inputi})}.{inputc}
endif
endif
diff --git a/debian/patches/output_to_stdout.patch b/debian/patches/output_to_stdout.patch
index b7cc376..010683b 100644
--- a/debian/patches/output_to_stdout.patch
+++ b/debian/patches/output_to_stdout.patch
@@ -1,9 +1,20 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Run compilation in foreground and write log to stdout
- instead of a file.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Run compilation in foreground and write log to stdout instead of a
+ file.
+
+---
+ install/unix/install3 | 14 ++------------
+ lib/makefile | 2 +-
+ system/ftoc/makefile | 2 +-
+ system/machine/makefile | 2 +-
+ 4 files changed, 5 insertions(+), 15 deletions(-)
+
+diff --git a/install/unix/install3 b/install/unix/install3
+index ef2a415..1cc0b4e 100755
--- a/install/unix/install3
+++ b/install/unix/install3
-@@ -112,8 +112,6 @@
+@@ -112,8 +112,6 @@ fi
echo ""
echo "WARNING: MIDAS installation will delete all dependent files."
@@ -12,7 +23,7 @@ Description: Run compilation in foreground and write log to stdout
echo ""
echo "Do you want to continue [yn]? (y): " $SV_NONL
unset answ
-@@ -138,17 +136,9 @@
+@@ -138,17 +136,9 @@ fi
# do we have the 'time' command?
if [ $CMND_YES = 2 ] ; then
@@ -32,6 +43,8 @@ Description: Run compilation in foreground and write log to stdout
- echo ""
-fi
exit 0
+diff --git a/lib/makefile b/lib/makefile
+index 2715d14..766531c 100644
--- a/lib/makefile
+++ b/lib/makefile
@@ -18,7 +18,7 @@
@@ -43,6 +56,8 @@ Description: Run compilation in foreground and write log to stdout
LIBMIDAS = $(LIBDIR)/libmidas.a
LIBGMIDAS = $(LIBDIR)/libgmidas.a
+diff --git a/system/ftoc/makefile b/system/ftoc/makefile
+index 7f8fd36..2a0e5ca 100644
--- a/system/ftoc/makefile
+++ b/system/ftoc/makefile
@@ -12,7 +12,7 @@
@@ -54,6 +69,8 @@ Description: Run compilation in foreground and write log to stdout
M = ../exec
+diff --git a/system/machine/makefile b/system/machine/makefile
+index ec185f6..b53cf57 100644
--- a/system/machine/makefile
+++ b/system/machine/makefile
@@ -16,7 +16,7 @@
diff --git a/debian/patches/propagate_cflags.patch b/debian/patches/propagate_cflags.patch
index 3c918e2..08b5b7c 100644
--- a/debian/patches/propagate_cflags.patch
+++ b/debian/patches/propagate_cflags.patch
@@ -1,10 +1,40 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Propagate CFLAGS, CPPFLAGS, and FFLAGS
- This is done to enable hardening of the code. Also, use -fPIC only
- for shared library code.
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Propagate CFLAGS, CPPFLAGS,
+ and FFLAGS This is done to enable hardening of the code. Also,
+ use -fPIC only for shared library code.
+
+---
+ install/unix/default_mk | 4 ++--
+ install/unix/install1 | 7 ++++---
+ libsrc/agl/makefile | 1 +
+ libsrc/ftoc-new/makefile | 1 +
+ libsrc/plot/makefile | 1 +
+ libsrc/tbl/makefile | 1 +
+ 6 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/install/unix/default_mk b/install/unix/default_mk
+index bf4cf2e..187d7bb 100644
+--- a/install/unix/default_mk
++++ b/install/unix/default_mk
+@@ -49,10 +49,10 @@ F_OPT=
+ E_OPT =
+ SYS =
+ SH_CMD = echo
+-SH_OPT =
++SH_OPT = -fPIC
+ SH_EXT = so.8.1
+ CFLAGS += $(C_OPT) $(DEBUG) $(SYS) $(VARARGS) -I$(INC)
+-FFLAGS = $(F_OPT) $(DEBUG) -c
++FFLAGS += $(F_OPT) $(DEBUG) -c
+ EFLAGS = $(E_OPT) -I$(INC) -I$(LINC) -f
+ EXFLAGS = -f
+ SLIB =
+diff --git a/install/unix/install1 b/install/unix/install1
+index ac61563..43c5922 100755
--- a/install/unix/install1
+++ b/install/unix/install1
-@@ -303,7 +303,7 @@
+@@ -303,7 +303,7 @@ ed_moptions delete E_OPT >/dev/null
ed_moptions delete C_OPT >/dev/null
ed_moptions delete INSTALL_FLAG >/dev/null
@@ -13,7 +43,7 @@ Description: Propagate CFLAGS, CPPFLAGS, and FFLAGS
ed_moptions add "K_OPT= $X_OPT" >/dev/null
ed_moptions add "INSTALL_FLAG=auto" >/dev/null
-@@ -331,12 +331,13 @@
+@@ -331,12 +331,13 @@ if [ $? = 4 ]; then
# 64 bit compiler
else
echo installing Midas on a 64 bit system
@@ -29,24 +59,23 @@ Description: Propagate CFLAGS, CPPFLAGS, and FFLAGS
ed_moptions add "E_OPT= $EO" >/dev/null
---- a/install/unix/default_mk
-+++ b/install/unix/default_mk
-@@ -49,10 +49,10 @@
- E_OPT =
- SYS =
- SH_CMD = echo
--SH_OPT =
-+SH_OPT = -fPIC
- SH_EXT = so.8.1
- CFLAGS += $(C_OPT) $(DEBUG) $(SYS) $(VARARGS) -I$(INC)
--FFLAGS = $(F_OPT) $(DEBUG) -c
-+FFLAGS += $(F_OPT) $(DEBUG) -c
- EFLAGS = $(E_OPT) -I$(INC) -I$(LINC) -f
- EXFLAGS = -f
- SLIB =
+diff --git a/libsrc/agl/makefile b/libsrc/agl/makefile
+index 35ac185..48f1f8d 100644
+--- a/libsrc/agl/makefile
++++ b/libsrc/agl/makefile
+@@ -28,6 +28,7 @@
+ include ../../local/default.mk
+
+ CFLAGS += $(C_OPT) $(DEBUG) $(SH_OPT) $(OSSYS) $(SYS) -I$(INC) $(X11INC) -DMIDAS
++FFLAGS += $(SH_OPT)
+
+ LIB = $(LIBDIR)/libagl3.a
+ M = ../../system/exec
+diff --git a/libsrc/ftoc-new/makefile b/libsrc/ftoc-new/makefile
+index 104cc06..26d721a 100644
--- a/libsrc/ftoc-new/makefile
+++ b/libsrc/ftoc-new/makefile
-@@ -21,6 +21,7 @@
+@@ -21,6 +21,7 @@ include ../../local/default.mk
C_OPT = $(K_OPT)
CFLAGS += $(C_OPT) $(DEBUG) $(SH_OPT) $(SYS) -I$(INC)
@@ -54,33 +83,27 @@ Description: Propagate CFLAGS, CPPFLAGS, and FFLAGS
LIB = $(LIBDIR)/libftoc.a
---- a/libsrc/tbl/makefile
-+++ b/libsrc/tbl/makefile
-@@ -22,6 +22,7 @@
+diff --git a/libsrc/plot/makefile b/libsrc/plot/makefile
+index 7eab770..632c660 100644
+--- a/libsrc/plot/makefile
++++ b/libsrc/plot/makefile
+@@ -15,6 +15,7 @@
include ../../local/default.mk
CFLAGS += $(C_OPT) $(SH_OPT) $(DEBUG) $(SYS) -I$(INC)
+FFLAGS += $(SH_OPT)
- HEADT = $(INC)/tblsys.h $(INC)/tbldef.h $(INC)/tblerr.h
-
---- a/libsrc/agl/makefile
-+++ b/libsrc/agl/makefile
-@@ -28,6 +28,7 @@
- include ../../local/default.mk
-
- CFLAGS += $(C_OPT) $(DEBUG) $(SH_OPT) $(OSSYS) $(SYS) -I$(INC) $(X11INC) -DMIDAS
-+FFLAGS += $(SH_OPT)
+ LIB = $(LIBDIR)/libplot.a
- LIB = $(LIBDIR)/libagl3.a
- M = ../../system/exec
---- a/libsrc/plot/makefile
-+++ b/libsrc/plot/makefile
-@@ -15,6 +15,7 @@
+diff --git a/libsrc/tbl/makefile b/libsrc/tbl/makefile
+index 5532a82..ee8a984 100644
+--- a/libsrc/tbl/makefile
++++ b/libsrc/tbl/makefile
+@@ -22,6 +22,7 @@
include ../../local/default.mk
CFLAGS += $(C_OPT) $(SH_OPT) $(DEBUG) $(SYS) -I$(INC)
+FFLAGS += $(SH_OPT)
- LIB = $(LIBDIR)/libplot.a
+ HEADT = $(INC)/tblsys.h $(INC)/tbldef.h $(INC)/tblerr.h
diff --git a/debian/patches/syskeys.patch b/debian/patches/syskeys.patch
index 96187d5..1f7122d 100644
--- a/debian/patches/syskeys.patch
+++ b/debian/patches/syskeys.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Write correct syskeys instead of patching in install/unix/setup
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Write correct syskeys instead of patching in install/unix/setup
+
+---
+ monit/syskeys.datorg | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/monit/syskeys.datorg b/monit/syskeys.datorg
+index 2c63bae..8dec1d2 100644
--- a/monit/syskeys.datorg
+++ b/monit/syskeys.datorg
-@@ -60,7 +60,8 @@
+@@ -60,7 +60,8 @@ C (21:30) name of editor to use for commands which need an editor
C (31:32) no. of bits for memory addresses (32 or 64)
C SECT./END_OF_KEY
MID$SYS/C/32/R
@@ -12,7 +20,7 @@ Description: Write correct syskeys instead of patching in install/unix/setup
C Sun/Solaris $vi 32
C HP/UX $vi 32
C PC/Linux $vi 32
-@@ -426,7 +427,7 @@
+@@ -426,7 +427,7 @@ C the complete debug command would become:
C $debugger debug_flags MID$EXE:module options
C SECT./END_OF_KEY
MID$DEBUG/C*40/3/R
diff --git a/debian/patches/system_readline.patch b/debian/patches/system_readline.patch
index da06a56..cdc298b 100644
--- a/debian/patches/system_readline.patch
+++ b/debian/patches/system_readline.patch
@@ -1,9 +1,32 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Use the system provided readline instead of the copy
- provided with the sources.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Wed, 1 Mar 2017 09:31:31 +0100
+Subject: Use the system provided readline instead of the copy provided with
+ the sources.
+
+---
+ install/unix/core.cnf | 1 -
+ install/unix/install1 | 4 ++--
+ install/unix/install1.sh | 4 ++--
+ monit/prepa2.c | 7 +++++--
+ 4 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/install/unix/core.cnf b/install/unix/core.cnf
+index a0c5fe7..3eb9c03 100644
+--- a/install/unix/core.cnf
++++ b/install/unix/core.cnf
+@@ -15,7 +15,6 @@
+ ./libsrc/st
+ ./libsrc/tbl
+ # ./libsrc/tw FO's termwin library not used anymore...
+-./libsrc/readline
+ ./libsrc/agl
+ ./libsrc/plot
+ ./libsrc/display
+diff --git a/install/unix/install1 b/install/unix/install1
+index a46da85..40cb2ba 100755
--- a/install/unix/install1
+++ b/install/unix/install1
-@@ -576,7 +576,7 @@
+@@ -576,7 +576,7 @@ if (make testncurs.exe) >/dev/null 2>&1
then
echo "OK."
ed_moptions replace "EDITSWITCH=-DEdit_dummy" >/dev/null
@@ -12,7 +35,7 @@ Description: Use the system provided readline instead of the copy
else
echo "Not found."
echo "*** WARNING: You'll not be able to edit Midas commands in the monitor."
-@@ -596,7 +596,7 @@
+@@ -596,7 +596,7 @@ else
if [ $answ = "c" -o $answ = "C" ]; then
ed_moptions replace "EDITSWITCH=-DNO_READLINE" >/dev/null
@@ -21,9 +44,11 @@ Description: Use the system provided readline instead of the copy
else
exit 1
fi
+diff --git a/install/unix/install1.sh b/install/unix/install1.sh
+index ac61563..3dd7346 100644
--- a/install/unix/install1.sh
+++ b/install/unix/install1.sh
-@@ -575,7 +575,7 @@
+@@ -575,7 +575,7 @@ if (make testncurs.exe) >/dev/null 2>&1
then
echo "OK."
ed_moptions replace "EDITSWITCH=-DEdit_dummy" >/dev/null
@@ -32,7 +57,7 @@ Description: Use the system provided readline instead of the copy
else
echo "Not found."
echo "*** WARNING: You'll not be able to edit Midas commands in the monitor."
-@@ -595,7 +595,7 @@
+@@ -595,7 +595,7 @@ else
if [ $answ = "c" -o $answ = "C" ]; then
ed_moptions replace "EDITSWITCH=-DNO_READLINE" >/dev/null
@@ -41,9 +66,11 @@ Description: Use the system provided readline instead of the copy
else
exit 1
fi
+diff --git a/monit/prepa2.c b/monit/prepa2.c
+index fc487aa..5b8b880 100644
--- a/monit/prepa2.c
+++ b/monit/prepa2.c
-@@ -90,6 +90,9 @@
+@@ -90,6 +90,9 @@ static char blank = {' '};
#include <osxdef.h> /* MIDAS osx definitions */
#include <midback.h> /* Context extructure */
@@ -53,7 +80,7 @@ Description: Use the system provided readline instead of the copy
extern int is_a_tty; /* Is this a terminal, (yes=1) set in prepa.c */
void using_history();
-@@ -238,7 +241,7 @@
+@@ -238,7 +241,7 @@ if (xhelp_fd == (-1)) return 0;
if (!xhelp_pid) {
if ( (fd = fopen(channame[1],"r")) == (FILE *)NULL) {
(void) printf("\n\rTry first: CREATE/GUI HELP \n\r");
@@ -62,7 +89,7 @@ Description: Use the system provided readline instead of the copy
return 0;
}
fscanf(fd,(const char *) "%d\n",&xhelp_pid);
-@@ -247,7 +250,7 @@
+@@ -247,7 +250,7 @@ if (xhelp_fd == (-1)) return 0;
xhelp_pid = 0;
unlink(channame[1]);
(void) printf("\n\rTry first: CREATE/GUI HELP \n\r");
@@ -71,13 +98,3 @@ Description: Use the system provided readline instead of the copy
return 0;
}
}
---- a/install/unix/core.cnf
-+++ b/install/unix/core.cnf
-@@ -15,7 +15,6 @@
- ./libsrc/st
- ./libsrc/tbl
- # ./libsrc/tw FO's termwin library not used anymore...
--./libsrc/readline
- ./libsrc/agl
- ./libsrc/plot
- ./libsrc/display
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git
More information about the Debian-astro-commits
mailing list