[Debian-astro-commits] [eso-midas] 03/04: Rediff patches and remove all patches that were applied upstream
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 447b91c33ed3f663d464af5ec8fa6ab54569514a
Author: Ole Streicher <olebole at debian.org>
Date: Wed Mar 1 09:53:55 2017 +0100
Rediff patches and remove all patches that were applied upstream
ESO incorporated almost all of my patches. Whow!
Now, there is even a Debian configuration subdir!
---
debian/patches/debian_setup.patch | 75 ------------------
debian/patches/dont_compile_sp_pty.patch | 25 ------
debian/patches/dont_strip_during_build.patch | 39 ----------
debian/patches/fix_cleanmidas.patch | 32 --------
debian/patches/fix_fitswdb.patch | 52 -------------
debian/patches/fix_fitswdm_c.patch | 56 --------------
debian/patches/fix_madrid.patch | 30 --------
debian/patches/fix_manpages.patch | 68 -----------------
debian/patches/fix_mdb_put.patch | 34 ---------
debian/patches/fix_rarthm_for.patch | 50 ------------
debian/patches/fix_selechar_c.patch | 55 --------------
debian/patches/fix_x11_include_path.patch | 21 ------
debian/patches/nonlinux.patch | 34 ---------
debian/patches/output_to_stdout.patch | 46 +----------
debian/patches/propagate_cflags.patch | 109 ---------------------------
debian/patches/series | 16 ----
debian/patches/syskeys.patch | 31 --------
debian/patches/system_readline.patch | 100 ------------------------
18 files changed, 2 insertions(+), 871 deletions(-)
diff --git a/debian/patches/debian_setup.patch b/debian/patches/debian_setup.patch
deleted file mode 100644
index eb5172e..0000000
--- a/debian/patches/debian_setup.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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 @@ unode=`(uname -n) 2>/dev/null`
- urels=`(uname -r) 2>/dev/null`
- machine=`(uname -m) 2>/dev/null`
-
--if [ "$uname" = "Darwin" ]; then
-+if [ -d "Debian" -a -f "/etc/debian_version" ]; then
-+ system="Debian"
-+
-+elif [ "$uname" = "Darwin" ]; then
- 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 @@
-+CC=gcc
-+LDCC=gcc $(LDFLAGS)
-+FC=gfortran
-+LD77_CMD=gfortran $(LDFLAGS)
-+F_OPT=
-+C_OPT=
-+SYS=
-+SLIB=-Wl,-rpath,/usr/lib/eso-midas/$(MIDVERS)/lib
-+SH_OPT=-fPIC
-+SH_CMD=$(MIDASHOME)/$(MIDVERS)/local/make_shared
-+GUI_OPT=-DPATH_MAX=1024
-+E_OPT=$(shell if test $(shell getconf LONG_BIT) = 64 ; then echo -Z; fi)
-+STRIP=echo
-+EDITFLAGS=-DVOID_SIGHANDLER -DHAVE_ALLOCA -DHAVE_ALLOCA_H -DHAVE_GETPW_DECLS -DHAVE_DIRENT_H -DHAVE_STRING_H -DLinux -DHAVE_UNISTD_H -DHAVE_STDLIB_H
-+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 @@
-+#!/bin/sh
-+shift
-+library=`basename $1 | sed 's/\.so\..*$//'`
-+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 @@
-+host_os=Debian
-+debugger=gdb
-+ps_print="lpr -h"
-+ascii_print="lpr -h -P"
diff --git a/debian/patches/dont_compile_sp_pty.patch b/debian/patches/dont_compile_sp_pty.patch
deleted file mode 100644
index fb72905..0000000
--- a/debian/patches/dont_compile_sp_pty.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 @@ OBJECTS =\
- subproc.o\
- sp_utils.o\
- sp_spmd.o\
-- sp_pty.o\
- swidget.o \
- t_error.o\
- uimx.o\
diff --git a/debian/patches/dont_strip_during_build.patch b/debian/patches/dont_strip_during_build.patch
deleted file mode 100644
index 7ce17ae..0000000
--- a/debian/patches/dont_strip_during_build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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 @@ then
- fi
- else
- echo "NOT FOUND."
-- echo "*** STRIP set to echo."
-- ed_moptions add STRIP=echo >/dev/null
- fi
-+echo "*** STRIP set to echo."
-+ed_moptions add STRIP=echo >/dev/null
- #*************** END: Checking the strip command **************
-
- #*************** START: Checking the ranlib command ***********
diff --git a/debian/patches/fix_cleanmidas.patch b/debian/patches/fix_cleanmidas.patch
deleted file mode 100644
index 05faf9a..0000000
--- a/debian/patches/fix_cleanmidas.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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 @@ ask_yn()
- [ $answer = y ]
- }
-
--
- MID_HERE=`pwd`
--MIDVERS=`echo $MID_HERE | sed 's/^.*midas\/\([^\/]*\).*$/\1/'`
--MIDASHOME=`echo $MID_HERE | sed 's/\/'$MIDVERS'.*$//'`
--
-+if [ -z "$MIDVERS" ] ; then
-+ MIDVERS=`echo $MID_HERE | sed 's/^.*midas\/\([^\/]*\).*$/\1/'`
-+fi
-+if [ -z "$MIDASHOME" ] ; then
-+ MIDASHOME=`echo $MID_HERE | sed 's/\/'$MIDVERS'.*$//'`
-+fi
- MID_HOME=$MIDASHOME/$MIDVERS
-
- export MIDASHOME MIDVERS
diff --git a/debian/patches/fix_fitswdb.patch b/debian/patches/fix_fitswdb.patch
deleted file mode 100644
index efbb045..0000000
--- a/debian/patches/fix_fitswdb.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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
- #2 0x7f4135caab6e in SCFSAV libsrc/st/scfa.c:157
- #3 0x7f4135caff75 in SCFCLO libsrc/st/scfb.c:483
- #4 0x7f4135cba83e in SCSEPI libsrc/st/scs.c:353
- #5 0x7f4135cc6cd8 in stsepi_ libsrc/ftoc/sts.c:67
- #6 0x409fb7 in statis prim/display/src/statis.f:1034
- #7 0x40549c in main prim/display/src/statis.f:1056
- #8 0x7f4134de2b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
- #9 0x405a92 (prim/exec/statis.exe+0x405a92)
-
-Address 0x7fff9e7713b1 is located in stack of thread T0 at offset 1265 in frame
- #0 0x7f4135c45c7f in fitswdb prim/dio/libsrc/fitswdb.c:88
-
- This frame has 21 object(s):
- [32, 36) 'nv'
- [...]
- [1056, 1137) 'com'
- [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 @@ 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);
-- cval[nv] = '\0';
-- for (nn=0; nn<nv; nn++)
-+ cval[nv-1] = '\0';
-+ for (nn=0; nn<nv-1; nn++)
- if (cval[nn]<' ' || '~'<cval[nn])
- cval[nn] = ' ';
- if(dtk->ctl==SCTL) {
-- ival = nv-1;
-+ ival = nv-2;
- while (ival && cval[ival]==' ') ival--;
- cval[++ival] = '\0';
- }
diff --git a/debian/patches/fix_fitswdm_c.patch b/debian/patches/fix_fitswdm_c.patch
deleted file mode 100644
index c267aef..0000000
--- a/debian/patches/fix_fitswdm_c.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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 @@ switch (mff)
- { /* NULL fill if needed */
- pi = p.i + ns;
- i = n - ns;
--
--#ifdef LinuxAMD64
- while (i--) toNULLINT (*pi++);
--#else
-- while (i--) toNULLLONG (*pi++);
--#endif
- }
- ioff += n;
- np = 4 * ns;
-@@ -279,12 +274,7 @@ switch (mff)
- while (n--)
- if (isNULLFLOAT (*pf))
- {
--
--#ifdef LinuxAMD64
- toNULLINT (*pi++);
--#else
-- toNULLLONG (*pi++);
--#endif
- *pf++;
- }
- else
-@@ -332,12 +322,7 @@ switch (mff)
- while (n--)
- if (isNULLFLOAT (*pd))
- {
--
--#ifdef LinuxAMD64
- toNULLINT (*pi++);
--#else
-- toNULLLONG (*pi++);
--#endif
- *pd++;
- }
- else
diff --git a/debian/patches/fix_madrid.patch b/debian/patches/fix_madrid.patch
deleted file mode 100644
index 2439b97..0000000
--- a/debian/patches/fix_madrid.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 @@ C
- C
- PROGRAM F2CCOM
- C
-- INTEGER MADRID(1)
-+ INTEGER MADRID(3)
- INTEGER VALUE(3)
- INTEGER STAT,MANY,NOPIX,NOBYT
- INTEGER*8 PNTR
diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
deleted file mode 100644
index c8fa0d5..0000000
--- a/debian/patches/fix_manpages.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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 @@
- .\" Copyright (c) 1989 European Southern Observatory.
- .\" All rights reserved.
- .\"
--.TH gomidas 1L "07 July 1993" MIDAS
-+.TH gomidas 1 "07 July 1993" MIDAS
- .SH NAME
- gomidas \- Resume a MIDAS session.
- .SH SYNOPSIS
-@@ -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 @@
- .\" Copyright (c) 1989 European Southern Observatory.
- .\" All rights reserved.
- .\"
--.TH helpmidas 1L "07 July 1993" MIDAS
-+.TH helpmidas 1 "07 July 1993" MIDAS
- .SH NAME
- helpmidas \- Standalone GUI help for MIDAS.
- .SH SYNOPSIS
-@@ -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 @@
- .\" Copyright (c) 1989 European Southern Observatory.
- .\" All rights reserved.
- .\"
--.TH inmidas 1L "11 November 1994" MIDAS
-+.TH inmidas 1 "11 November 1994" MIDAS
- .SH NAME
- inmidas \- MIDAS start-up procedure for users.
- .SH SYNOPSIS
-@@ -145,4 +145,4 @@ Set to PARALLEL or NOPARALLEL.
- .IP "\fBMID_WORK\fp"
- Startup directory for MIDAS.
- .SH SEE ALSO
--.IR gomidas(1L)
-+.IR gomidas(1)
diff --git a/debian/patches/fix_mdb_put.patch b/debian/patches/fix_mdb_put.patch
deleted file mode 100644
index 86e135c..0000000
--- a/debian/patches/fix_mdb_put.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 @@ retstat = 0;
-
- ps = myptr->desc;
- pc = kwd->desc;
--for (i=0; i<MXMDN; i++) *ps++ = *pc++;
-+strncpy(ps, pc, MXMDN);
-
- myptr->type = kwd->type;
- myptr->idx = kwd->idx;
diff --git a/debian/patches/fix_rarthm_for.patch b/debian/patches/fix_rarthm_for.patch
deleted file mode 100644
index 4c03459..0000000
--- a/debian/patches/fix_rarthm_for.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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
- #2 0x4038ec in main prim/general/src/rarthm.f:456
- #3 0x7fed23b91b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
- #4 0x403c42 (prim/exec/rarthm.exe+0x403c42)
-
-Address 0x7fffe7377ec4 is located in stack of thread T0 at offset 1316 in frame
- #0 0x40512f in rarthm prim/general/src/rarthm.f:1
-
- This frame has 57 object(s):
- [32, 36) 'uni'
- [...]
- [1184, 1188) 'rownoa'
- [1248, 1252) 'rownob'
- [1312, 1316) 'rowsiz' <== Memory access at offset 1316 overflows this variable
- [1376, 1380) 'stat'
- [1440, 1448) 'consta'
- [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 @@ 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,
-- + ROWSIZ,ROWSIZ,ROWSIZ)
-+ + NPIXA,NPIXB,NPIXC)
- ELSE
- CALL FN2FFW(OPERA(1:5),MADRID(APNTR),MADRID(BPNTR),
- + MADRID(PNTRW),APIX,BPIX,CPIX,
-- + ROWSIZ,ROWSIZ,ROWSIZ)
-+ + NPIXA,NPIXB,NPIXC)
- ENDIF
- C
- C put resulting row back into relevant ATOM
diff --git a/debian/patches/fix_selechar_c.patch b/debian/patches/fix_selechar_c.patch
deleted file mode 100644
index cf2e4cb..0000000
--- a/debian/patches/fix_selechar_c.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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
- #2 0x42a0a3 in charfun prim/table/libsrc/selechar.c:250
- #3 0x4154f5 in level5 prim/table/libsrc/tbcomsel.c:797
- #4 0x41572a in level4 prim/table/libsrc/tbcomsel.c:720
- #5 0x415c57 in level3 prim/table/libsrc/tbcomsel.c:765
- #6 0x415d1d in level2 prim/table/libsrc/tbcomsel.c:677
- #7 0x41610e in level1 prim/table/libsrc/tbcomsel.c:636
- #8 0x4165b0 in level0 prim/table/libsrc/tbcomsel.c:595
- #9 0x41415d in level00 prim/table/libsrc/tbcomsel.c:555
- #10 0x4179ff in tbl_comp prim/table/libsrc/tbcomsel.c:204
- #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 @@ 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]]);
-- SCFMAP(imnoc[ibuf[6]],F_X_MODE,1,items,&act,&cdata[ibuf[6]]);
-+ SCFMAP(imnoc[ibuf[6]],F_X_MODE,1,items+1,&act,&cdata[ibuf[6]]);
- }
- if (nochar == 0) {
- for (i=0, k=0; i<items; i+=nchar,k++) {
diff --git a/debian/patches/fix_x11_include_path.patch b/debian/patches/fix_x11_include_path.patch
deleted file mode 100644
index 7c8a79c..0000000
--- a/debian/patches/fix_x11_include_path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 @@ then
- x11incl="found"
- else
- ed_moptions delete X11INC >/dev/null
-- x11inclpth='/usr/openwin/include /usr/include/X11R6 /usr/include/X11R5 /usr/X11R6/include /usr/X11R6/include/X11 /usr/X11R5/include /usr/local/include /include /usr/X/include /opt/X-local/include'
-+ x11inclpth='/usr/include/X11 /usr/include/X11R6 /usr/include/X11R5 /usr/X11R6/include /usr/X11R6/include/X11 /usr/X11R5/include /usr/local/include /include /usr/X/include /opt/X-local/include'
- for dir in $x11inclpth
- do
- if [ ! -d $dir ]; then
diff --git a/debian/patches/nonlinux.patch b/debian/patches/nonlinux.patch
deleted file mode 100644
index 2ffb112..0000000
--- a/debian/patches/nonlinux.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 @@ cp $MID_WORK/.inmidas $MID_WORK/.inmidas.$tt
- #
- os=`uname`
- case "$os" in
-- "SunOS"|"Linux")
-+ SunOS|Linux|GNU|GNU/*)
- 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 @@ else
- write/keyw in_b MID_WORK:veriall_{out_b(1:{inputi})}.{inputc}
- endif
- endif
-+write/keyw in_b MID_WORK:veriall_debian.{inputc}
- open/file {in_b} write fc
- if fc(1) .lt. 0 then
- write/out Could not create file: "MID_WORK:veriall_{out_b}.{inputc} ..."
diff --git a/debian/patches/output_to_stdout.patch b/debian/patches/output_to_stdout.patch
index 010683b..bd24c38 100644
--- a/debian/patches/output_to_stdout.patch
+++ b/debian/patches/output_to_stdout.patch
@@ -4,11 +4,8 @@ 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(-)
+ install/unix/install3 | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/install/unix/install3 b/install/unix/install3
index ef2a415..1cc0b4e 100755
@@ -43,42 +40,3 @@ index ef2a415..1cc0b4e 100755
- 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 @@
-
- include ../local/default.mk
-
--DEV_NULL = >/dev/null 2>&1
-+DEV_NULL =
-
- 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 @@
- include ../../local/default.mk
-
- DEV_NULL= >/dev/null 2>&1
--# DEV_NULL=
-+DEV_NULL=
-
- 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 @@
-
- include ../../local/default.mk
-
--DEV_NULL= >/dev/null 2>&1
-+DEV_NULL=
-
- M = ../exec
-
diff --git a/debian/patches/propagate_cflags.patch b/debian/patches/propagate_cflags.patch
deleted file mode 100644
index 08b5b7c..0000000
--- a/debian/patches/propagate_cflags.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-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 @@ ed_moptions delete E_OPT >/dev/null
- ed_moptions delete C_OPT >/dev/null
- ed_moptions delete INSTALL_FLAG >/dev/null
-
--ed_moptions add "C_OPT=-O $X_OPT" >/dev/null
-+ed_moptions add "C_OPT=$X_OPT" >/dev/null
- ed_moptions add "K_OPT= $X_OPT" >/dev/null
- ed_moptions add "INSTALL_FLAG=auto" >/dev/null
-
-@@ -331,12 +331,13 @@ if [ $? = 4 ]; then
- # 64 bit compiler
- else
- echo installing Midas on a 64 bit system
-- MACH="-m64"
-+ MACH=" "
- EO="-Z"
- fi
-
- ed_moptions add "F77=gfortran $MACH" >/dev/null
--ed_moptions add "LD77_CMD=gfortran $MACH" >/dev/null
-+ed_moptions add "LD77_CMD=gfortran $MACH $LDFLAGS" >/dev/null
-+ed_moptions add "LDCC=gcc $LDFLAGS" >/dev/null
- ed_moptions add "E_OPT= $EO" >/dev/null
-
-
-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 @@ include ../../local/default.mk
- C_OPT = $(K_OPT)
-
- CFLAGS += $(C_OPT) $(DEBUG) $(SH_OPT) $(SYS) -I$(INC)
-+FFLAGS += $(SH_OPT)
-
- LIB = $(LIBDIR)/libftoc.a
-
-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)
-
- LIB = $(LIBDIR)/libplot.a
-
-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)
-
- HEADT = $(INC)/tblsys.h $(INC)/tbldef.h $(INC)/tblerr.h
-
diff --git a/debian/patches/series b/debian/patches/series
index ebacf71..fae2e12 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,17 +1 @@
-propagate_cflags.patch
output_to_stdout.patch
-debian_setup.patch
-nonlinux.patch
-fix_cleanmidas.patch
-dont_strip_during_build.patch
-fix_x11_include_path.patch
-syskeys.patch
-system_readline.patch
-fix_manpages.patch
-dont_compile_sp_pty.patch
-fix_fitswdm_c.patch
-fix_rarthm_for.patch
-fix_mdb_put.patch
-fix_fitswdb.patch
-fix_selechar_c.patch
-fix_madrid.patch
diff --git a/debian/patches/syskeys.patch b/debian/patches/syskeys.patch
deleted file mode 100644
index 1f7122d..0000000
--- a/debian/patches/syskeys.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 @@ 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
--Vax/VMS $EDIT 32
-+PC/Linux $vi
-+C Vax/VMS $EDIT 32
- C Sun/Solaris $vi 32
- C HP/UX $vi 32
- C PC/Linux $vi 32
-@@ -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
--$dbx
-+$gdb
- ?
- ?
- C
diff --git a/debian/patches/system_readline.patch b/debian/patches/system_readline.patch
deleted file mode 100644
index cdc298b..0000000
--- a/debian/patches/system_readline.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-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 @@ if (make testncurs.exe) >/dev/null 2>&1
- then
- echo "OK."
- ed_moptions replace "EDITSWITCH=-DEdit_dummy" >/dev/null
-- ed_moptions replace "EDITLIBS=-lzreadline -lncurses" >/dev/null
-+ ed_moptions replace "EDITLIBS=-lreadline" >/dev/null
- else
- echo "Not found."
- echo "*** WARNING: You'll not be able to edit Midas commands in the monitor."
-@@ -596,7 +596,7 @@ else
-
- if [ $answ = "c" -o $answ = "C" ]; then
- ed_moptions replace "EDITSWITCH=-DNO_READLINE" >/dev/null
-- ed_moptions replace "EDITLIBS=-lzreadline" >/dev/null
-+ ed_moptions replace "EDITLIBS=-lreadline" >/dev/null
- 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 @@ if (make testncurs.exe) >/dev/null 2>&1
- then
- echo "OK."
- ed_moptions replace "EDITSWITCH=-DEdit_dummy" >/dev/null
-- ed_moptions replace "EDITLIBS=-lzreadline -lncurses" >/dev/null
-+ ed_moptions replace "EDITLIBS=-lreadline -lncurses" >/dev/null
- else
- echo "Not found."
- echo "*** WARNING: You'll not be able to edit Midas commands in the monitor."
-@@ -595,7 +595,7 @@ else
-
- if [ $answ = "c" -o $answ = "C" ]; then
- ed_moptions replace "EDITSWITCH=-DNO_READLINE" >/dev/null
-- ed_moptions replace "EDITLIBS=-lzreadline" >/dev/null
-+ ed_moptions replace "EDITLIBS=-lreadline" >/dev/null
- 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 @@ static char blank = {' '};
- #include <osxdef.h> /* MIDAS osx definitions */
- #include <midback.h> /* Context extructure */
-
-+typedef int Function ();
-+typedef char **CPPFunction ();
-+
- extern int is_a_tty; /* Is this a terminal, (yes=1) set in prepa.c */
-
- void using_history();
-@@ -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");
-- rl_refresh_line();
-+ rl_refresh_line(0,0);
- return 0;
- }
- fscanf(fd,(const char *) "%d\n",&xhelp_pid);
-@@ -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");
-- rl_refresh_line();
-+ rl_refresh_line(0,0);
- return 0;
- }
- }
--
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