[eso-midas] 04/06: Remove patches that are applied upstream now
Ole Streicher
olebole at moszumanska.debian.org
Fri May 22 10:48:29 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository eso-midas.
commit 38f0831e22ea1b51ab97a72f5349fc2f0e46690b
Author: Ole Streicher <olebole at debian.org>
Date: Fri May 22 09:09:55 2015 +0200
Remove patches that are applied upstream now
---
debian/patches/fix_cextrco_c.patch | 42 ---------
debian/patches/fix_dio.patch | 101 ---------------------
debian/patches/fix_esoext_i8flag.patch | 38 --------
debian/patches/fix_filepath_c.patch | 13 ---
debian/patches/fix_ftoc.patch | 49 ----------
debian/patches/fix_ftoc2.patch | 41 ---------
debian/patches/fix_library_search_path.patch | 13 ---
debian/patches/fix_md5_c.patch | 13 ---
debian/patches/fix_mid_rdldb.patch | 37 --------
debian/patches/fix_midfct_c.patch | 16 ----
debian/patches/fix_modgcur_c.patch | 18 ----
debian/patches/fix_mutil_h.patch | 13 ---
debian/patches/fix_off_by_one_definitions.patch | 45 ----------
debian/patches/fix_scc_c.patch | 16 ----
debian/patches/fix_scfclo.patch | 109 -----------------------
debian/patches/fix_statis_for.patch | 42 ---------
debian/patches/fix_tbmerge_c.patch | 35 --------
debian/patches/fix_thelp_c.patch | 14 ---
debian/patches/fix_txdisplay_c.patch | 13 ---
debian/patches/fix_unknown_type.patch | 28 ------
debian/patches/remove_path_from_testscript.patch | 17 ----
debian/patches/remove_pointer_conversion.patch | 27 ------
debian/patches/remove_sys_errlist.patch | 45 ----------
debian/patches/resolve_conflictig_macro.patch | 91 -------------------
debian/patches/series | 24 -----
25 files changed, 900 deletions(-)
diff --git a/debian/patches/fix_cextrco_c.patch b/debian/patches/fix_cextrco_c.patch
deleted file mode 100644
index f853787..0000000
--- a/debian/patches/fix_cextrco_c.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix stack error if no "]" was there
- CGN_INDEXC() returns -1 if the search string was not found which needs
- to be tested.
- .
- This fixes the following -fsanitizer=address error:
- .
- ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fff67b0d89f at pc 0x46b47c bp 0x7fff6
- WRITE of size 1 at 0x7fff67b0d89f thread T0
- #0 0x46b47b in Convcoo prim/general/libsrc/cextrco.c:593
- #1 0x41ed32 in PIXEL_ACCESS monit/prepc3.c:583
- #2 0x45ff47 in IMMEDIATE monit/prepc4.c:816
- #3 0x45136e in prepx monit/prepx.c:605
- #4 0x404e39 in main monit/prepa.c:168
- #5 0x7f9147501b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
- #6 0x406874 (monit/prepa.exe+0x406874)
- .
- Address 0x7fff67b0d89f is located in stack of thread T0 at offset 351 in frame
- #0 0x46b14f in Convcoo prim/general/libsrc/cextrco.c:547
- .
- This frame has 6 object(s):
- [32, 36) 'iav'
- [96, 100) 'uni'
- [160, 164) 'nulo'
- [224, 256) 'dd1'
- [288, 320) 'dd2'
- [352, 432) 'subst' <== Memory access at offset 351 underflows this variable
-
---- a/prim/general/libsrc/cextrco.c
-+++ b/prim/general/libsrc/cextrco.c
-@@ -590,7 +590,10 @@
- if (bracket > 0)
- {
- k = CGN_INDEXC(subst,']');
-- subst[k] = '\0';
-+ if (k >= 0)
-+ {
-+ subst[k] = '\0';
-+ }
- }
- else
- {
diff --git a/debian/patches/fix_dio.patch b/debian/patches/fix_dio.patch
deleted file mode 100644
index 4a067d5..0000000
--- a/debian/patches/fix_dio.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Replace memcpy by strncpy in libsrc/st/scdx.c
- This is needed since the "Help" string there is often less than 71 bytes long,
- and unconditionally copying overflows the "hkb" buffer during read. This leads
- to crashes like this:
- .
- ERROR: AddressSanitizer: unknown-crash on address 0x7fff8d2bbfc3 at pc 0x7f4b7c4a7252 bp 0x7fff8d2bb3a0 sp 0x7fff8d2bb398
- READ of size 71 at 0x7fff8d2bbfc3 thread T0
- #0 0x7f4b7c4a7251 in memcpy /usr/include/x86_64-linux-gnu/bits/string3.h:51
- #1 0x7f4b7c4a7251 in xSCDHWD libsrc/st/scdx.c:263
- #2 0x7f4b7c426355 in fitsckw prim/dio/libsrc/fitsckw.c:844
- #3 0x7f4b7c43cee4 in fitsrhd prim/dio/libsrc/fitsrhd.c:258
- #4 0x401d78 in main prim/dio/src/infile.c:223
- #5 0x7f4b7bd53b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
- #6 0x4024e2 (prim/exec/infile.exe+0x4024e2)
- .
- Address 0x7fff8d2bbfc3 is located in stack of thread T0 at offset 1939 in frame
- #0 0x7f4b7c43b4af in fitsrhd prim/dio/libsrc/fitsrhd.c:98
- .
- This frame has 24 object(s):
- [32, 36) 'm'
- [96, 100) 'i'
- [160, 164) 'n'
- [224, 228) 'nz'
- [288, 292) 'mfd'
- [352, 356) 'mfdt'
- [416, 420) 'istat'
- [480, 484) 'dflag'
- [544, 552) 'unit'
- [608, 616) 'pc'
- [672, 680) 'dx'
- [736, 744) 'dy'
- [800, 816) 'ff'
- [864, 880) 'rotang'
- [928, 980) 'na'
- [1024, 1080) 'fdd'
- [1120, 1176) 'fda'
- [1216, 1272) 'fdb'
- [1312, 1368) 'fdc'
- [1408, 2008) 'kw' <== Memory access at offset 1939 partially overflows this variable
- [2048, 2088) 'outnam'
- [2144, 2184) 'helptext'
- [2240, 2320) 'line'
- [2368, 2488) 'ccunit'
-
---- a/libsrc/st/scdx.c
-+++ b/libsrc/st/scdx.c
-@@ -157,7 +157,7 @@
- {
- if (htext[0] != '\0')
- {
-- (void) memcpy(help,htext,(size_t)71);
-+ (void) strncpy(help,htext,(size_t)71);
- help[71] = '\0';
- }
- }
-@@ -260,7 +260,7 @@
- {
- if (htext[0] != '\0')
- {
-- (void) memcpy(help,htext,(size_t)71);
-+ (void) strncpy(help,htext,(size_t)71);
- help[71] = '\0';
- }
- }
-@@ -332,7 +332,7 @@
- {
- if (htext[0] != '\0')
- {
-- (void) memcpy(help,htext,(size_t)71);
-+ (void) strncpy(help,htext,(size_t)71);
- help[71] = '\0';
- }
- }
-@@ -404,7 +404,7 @@
- {
- if (htext[0] != '\0')
- {
-- (void) memcpy(help,htext,(size_t)71);
-+ (void) strncpy(help,htext,(size_t)71);
- help[71] = '\0';
- }
- }
-@@ -471,7 +471,7 @@
- {
- if (htext[0] != '\0')
- {
-- (void) memcpy(help,htext,(size_t)71);
-+ (void) strncpy(help,htext,(size_t)71);
- help[71] = '\0';
- }
- }
-@@ -538,7 +538,7 @@
- {
- if (htext[0] != '\0')
- {
-- (void) memcpy(help,htext,(size_t)71);
-+ (void) strncpy(help,htext,(size_t)71);
- help[71] = '\0';
- }
- }
diff --git a/debian/patches/fix_esoext_i8flag.patch b/debian/patches/fix_esoext_i8flag.patch
deleted file mode 100644
index d5f6063..0000000
--- a/debian/patches/fix_esoext_i8flag.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Make sure klaus is zero-terminated
- Also, it seems that for the normal case, the copy process was just one byte
- too small.
- .
- This shall fix the following crash (on 32-bit architectures; tested on i386).
- The crash seems to appear before a warning like the following is printed:
- .
- esoext-warning: MADRID with missing pointer (1)
- > MADRID(1)=123456
- .
- ERROR: AddressSanitizer: stack-buffer-overflow on address 0xffa14138 at pc 0x8050b68 bp 0xffa140b8 sp 0xffa140a
- READ of size 1 at 0xffa14138 thread T0
- #0 0x8050b67 in CGN_INDEXC system/ext/putline.c:125
- #1 0x8050b67 in put_line system/ext/putline.c:326
- #2 0x80495b8 in main system/ext/esoext.c:268
- #3 0xf70c1722 in __libc_start_main (/lib/i386-linux-gnu/libc.so.6+0x19722)
- #4 0x804a34f (system/exec/esoext.exe+0x804a34f)
- .
- Address 0xffa14138 is located in stack of thread T0 at offset 56 in frame
- #0 0x804fc5f in put_line system/ext/putline.c:239
- .
- This frame has 2 object(s):
- [32, 56) 'klaus' <== Memory access at offset 56 overflows this variable
- [96, 1417) 'ulli'
-
---- a/system/ext/putline.c
-+++ b/system/ext/putline.c
-@@ -315,7 +315,8 @@
- while ((n = CGN_INDEXS(ipntr,"MADRID")) > -1)
- {
- if (strncmp(ipntr,"COMMON",6) == 0) break;
-- (void) CGN_UPCOPY(klaus,ipntr+n+7,20);
-+ (void) CGN_UPCOPY(klaus,ipntr+n+7,21);
-+ klaus[21] = '\0'; /* make sure that klaus is zero-terminated */
- i = CGN_INDEXC(klaus,')');
- if (i < 1)
- {
diff --git a/debian/patches/fix_filepath_c.patch b/debian/patches/fix_filepath_c.patch
deleted file mode 100644
index f904031..0000000
--- a/debian/patches/fix_filepath_c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix wrong empty if statement
---- a/gui/GraphLib/libsrc/uimxR5/src/filepath.c
-+++ b/gui/GraphLib/libsrc/uimxR5/src/filepath.c
-@@ -438,7 +438,7 @@
- endc= *end;
- *end= '\0';
-
-- if(*pntr != '\0');
-+ if(*pntr != '\0')
- dappend(rtrn, getenv(pntr));
-
- *end= endc;
diff --git a/debian/patches/fix_ftoc.patch b/debian/patches/fix_ftoc.patch
deleted file mode 100644
index 9be4c91..0000000
--- a/debian/patches/fix_ftoc.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix off-by-one Fortran/C string problem
- In Fortran, S2 is a constant-length string; it does *not* reserve an
- additional byte for '\0'. Since the C routine wants to add a trailing '\0',
- we need to increase the length by one.
- .
- This fixes the following address sanitizer error:
- .
- ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fffb5cf5151 at pc 0x402824 bp 0x7fff
- WRITE of size 1 at 0x7fffb5cf5151 thread T0
- #0 0x402823 in ttt2_ system/good-ftoc/ftoc_generic.c:268
- #1 0x401b27 in fgenec system/good-ftoc/for_generic.f:44
- #2 0x400e31 in main system/good-ftoc/for_generic.f:75
- #3 0x7f126c177b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
- #4 0x400ea2 (system/exec/ftoc_generic.exe+0x400ea2)
- .
- Address 0x7fffb5cf5151 is located in stack of thread T0 at offset 513 in frame
- #0 0x400f8f in fgenec system/good-ftoc/for_generic.f:1
- .
- This frame has 6 object(s):
- [32, 36) 'ff'
- [96, 100) 'ls1'
- [160, 164) 'ls2'
- [224, 228) 'numb'
- [288, 297) 's1'
- [352, 513) 's2' <== Memory access at offset 513 overflows this variable
-
---- a/system/ftoc-new/for_generic.for
-+++ b/system/ftoc-new/for_generic.for
-@@ -49,7 +49,7 @@
- C
- INTEGER NUMB, LS1, LS2, MADRID(3)
- C
-- CHARACTER*161 S2
-+ CHARACTER*162 S2
- CHARACTER*9 S1
- C
- REAL FF
---- a/system/ftoc-new/ftoc_generic.fc
-+++ b/system/ftoc-new/ftoc_generic.fc
-@@ -251,7 +251,7 @@
- n = lenloc2;
- }
-
--*(adrptr+n) = '\0';
-+*(adrptr+n-1) = '\0';
- printf("C: in TTT2, string = %s|\n",adrptr);
-
- return 0;
diff --git a/debian/patches/fix_ftoc2.patch b/debian/patches/fix_ftoc2.patch
deleted file mode 100644
index 5aa5c1a..0000000
--- a/debian/patches/fix_ftoc2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix another off-by-one access in ftoc
- Again, we need to take care that we do not overwrite a trailing '\0' at the
- end of an F77 string. This fixes this crash:
- .
- ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7ffffc79ef90 at pc 0x7f3776f6a568 bp 0x7ffffc79d480 sp 0x7ffffc79d458
- READ of size 87 at 0x7ffffc79ef90 thread T0
- .
- #0 0x7f3776f6a567 in strlen (/usr/lib/x86_64-linux-gnu/libasan.so.1+0x31567)
- #1 0x7f37769b798e in sti1_ libsrc/ftoc/sti.c:109
- #2 0x7f37769f1fc4 in stiget_ libsrc/ftoc/ysti.f:13
- #3 0x40b543 in smooth prim/display/src/smooth.f:599
- #4 0x40558c in main prim/display/src/smooth.f:1056
- #5 0x7f3775ad7b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
- #6 0x405ba2 (prim/exec/smooth.exe+0x405ba2)
-
-Address 0x7ffffc79ef90 is located in stack of thread T0 at offset 5616 in frame
- #0 0x40669f in smooth prim/display/src/smooth.f:1
-
- This frame has 81 object(s):
- [32, 36) 'idum'
- [...]
- [5344, 5404) 'framec'
- [5440, 5500) 'table'
- [5536, 5616) 'cbuf' <== Memory access at offset 5616 overflows this variable
-
---- a/libsrc/ftoc-new/sti.fc
-+++ b/libsrc/ftoc-new/sti.fc
-@@ -101,10 +101,10 @@
- *pntr = -diff;
-
- n = (int) strlen(ptr2);
--if ((n > 0) && (n < m1)) *(ptr2+n) = ' ';
-+if ((n > 0) && (n < m1-1)) *(ptr2+n) = ' ';
-
- n = (int) strlen(ptr3);
--if ((n > 0) && (n < m2)) *(ptr3+n) = ' ';
-+if ((n > 0) && (n < m2-1)) *(ptr3+n) = ' ';
-
- return 0;
- }
diff --git a/debian/patches/fix_library_search_path.patch b/debian/patches/fix_library_search_path.patch
deleted file mode 100644
index 8ab5d12..0000000
--- a/debian/patches/fix_library_search_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Add the library search path to shared lib creation command
---- a/lib/makefile
-+++ b/lib/makefile
-@@ -82,7 +82,7 @@
- $(AR) $(AR_OPT) $(LIBGMIDAS) *.o
- rm -f __*
- $(RANLIB) $(LIBGMIDAS)
-- $(SH_CMD) -o $(LIBGMIDAS_SH) *.o -L -lmidas $(DEV_NULL)
-+ $(SH_CMD) -o $(LIBGMIDAS_SH) *.o -L$(LIBDIR) $(SLIB) -lmidas $(DEV_NULL)
- rm -f *.o
-
- clean:
diff --git a/debian/patches/fix_md5_c.patch b/debian/patches/fix_md5_c.patch
deleted file mode 100644
index cb34a19..0000000
--- a/debian/patches/fix_md5_c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Correct size for memset() call
---- a/prim/general/libsrc/md5.c
-+++ b/prim/general/libsrc/md5.c
-@@ -325,7 +325,7 @@
- MD5Transform(ctx->buf, (word32 *) ctx->in);
- byteReverse((unsigned char *) ctx->buf, 4);
- memmove(digest, ctx->buf, 16);
-- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
-+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
- }
-
- /* The four core functions - F1 is optimized somewhat */
diff --git a/debian/patches/fix_mid_rdldb.patch b/debian/patches/fix_mid_rdldb.patch
deleted file mode 100644
index 810ae00..0000000
--- a/debian/patches/fix_mid_rdldb.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: More off-by-one copies...
- Fixes
- .
- ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fff04e7fcc8 at pc 0x7fb863cdddb5 bp 0x7fff04e7e980 sp 0x7fff04e7e978
- WRITE of size 4 at 0x7fff04e7fcc8 thread T0
- #0 0x7fb863cdddb4 in MID_RDLDB libsrc/st/midldb.c:590
- #1 0x7fb863cc257a in MID_RDSCRI libsrc/st/middsca.c:506
- #2 0x7fb863d01aa3 in SCDRDD libsrc/st/scd.c:280
- #3 0x7fb863d281ce in std4_ libsrc/ftoc/std.c:140
- #4 0x7fb863d6474c in stdrdd_ libsrc/ftoc/ystd.f:54
- #5 0x406608 in necidn stdred/echelle/src/neciden.f:113
- #6 0x401c8c in main stdred/echelle/src/neciden.f:173
- #7 0x7fb862e4ab44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
- #8 0x401d52 (stdred/exec/neciden.exe+0x401d52)
- .
- Address 0x7fff04e7fcc8 is located in stack of thread T0 at offset 2920 in frame
- #0 0x405dcf in necidn stdred/echelle/src/neciden.f:1
- .
- This frame has 43 object(s):
- [32, 36) 'error'
- [...]
- [2464, 2480) 'avrms'
- [2528, 2920) 'ainit' <== Memory access at offset 2920 overflows this variable
- [2976, 3036) 'table'
-
---- a/stdred/echelle/src/neciden.for
-+++ b/stdred/echelle/src/neciden.for
-@@ -108,7 +108,7 @@
- COMMON /POLY/ A,A1,IA,ABSORD
- C******************************************************************************
- C
-- DOUBLE PRECISION AINIT(DEGMAX*DEGMAX)
-+ DOUBLE PRECISION AINIT(DEGMAX*DEGMAX+1)
- DOUBLE PRECISION AVRMS(2)
- INTEGER LOOP1,LOOP2,IPOS,MODEG
-
diff --git a/debian/patches/fix_midfct_c.patch b/debian/patches/fix_midfct_c.patch
deleted file mode 100644
index c0e1800..0000000
--- a/debian/patches/fix_midfct_c.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix the use of getcwd in midfct.c
- In case of error, getcwd returns NULL, and the content of the buffer
- is undefined.
---- a/libsrc/st/midfct.c
-+++ b/libsrc/st/midfct.c
-@@ -148,8 +148,7 @@
- { /* we have a FITS file with a dir. */
- char curdir[1024];
-
-- (void) getcwd(curdir,(size_t)1024);
-- if (curdir[0] != '\0')
-+ if (getcwd(curdir,(size_t)1024) != NULL)
- {
- char *dirc, *dirnam;
-
diff --git a/debian/patches/fix_modgcur_c.patch b/debian/patches/fix_modgcur_c.patch
deleted file mode 100644
index eafcca6..0000000
--- a/debian/patches/fix_modgcur_c.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix off-by-one length definition of "ident"
- Otherwise, the line
- .
- ident[74] = '\0';
- .
- (few lines below the definition) may cause a segfault.
---- a/prim/plot/src/modgcur.c
-+++ b/prim/plot/src/modgcur.c
-@@ -83,7 +83,7 @@
-
- double start[DIMMAX], step[DIMMAX];
-
--char bin[5], name[62], ident[74], cunit[66], input[73], buff[81], *label[4];
-+char bin[5], name[62], ident[75], cunit[66], input[73], buff[81], *label[4];
- char *cpntr, *pntr;
-
- /*
diff --git a/debian/patches/fix_mutil_h.patch b/debian/patches/fix_mutil_h.patch
deleted file mode 100644
index f93abd8..0000000
--- a/debian/patches/fix_mutil_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix the prototype of heap_copy
---- a/incl/mutil.h
-+++ b/incl/mutil.h
-@@ -68,7 +68,7 @@
- extern void heap_copy
- (
- #ifdef __STDC__
-- int, float [];
-+ int, float [], float[]
- #endif
- );
-
diff --git a/debian/patches/fix_off_by_one_definitions.patch b/debian/patches/fix_off_by_one_definitions.patch
deleted file mode 100644
index f3ec9f0..0000000
--- a/debian/patches/fix_off_by_one_definitions.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix some definitions which are one byte too short
- stdred/do/libsrc/ostcrea.c and gui/XDo/src/applic.c have "char []"
- defined one element too short. This will fail in lines 188 resp.
- 362ff./672ff. of these files: F.e. ostrea.c has
- .
- char *line,cpos[4]; // (line 130)
- ...
- else strcpy(cext,".bdf"); // (line 188)
- .
- (applic.c is similar)
- .
- In these cases, the trailing '\0' char does not fit into the reserved
- char length. Increasing them by one will solve this.
---- a/stdred/do/libsrc/ostcrea.c
-+++ b/stdred/do/libsrc/ostcrea.c
-@@ -94,7 +94,7 @@
- double otimetomjd();
- int listtype,no,tidtemp,colfile,nenttemp,lname;
- int kuni;
--char cext[4];
-+char cext[5];
- char finame[128],diname[128];
-
- /*
---- a/gui/XDo/src/applic.c
-+++ b/gui/XDo/src/applic.c
-@@ -307,7 +307,7 @@
- extern swidget myerror;
- extern int tidost;
- int i,col,len,fin,colnew,ncol,dummy,index;
--char label[TBL_LABLEN+1],op[2],crit[256];
-+char label[TBL_LABLEN+1],op[3],crit[256];
- char mymess[60];
- index = strscans(descr,":#");
- if (!descr[index]) {
-@@ -670,7 +670,7 @@
- {
- extern int tidcomm;
- int col,pid,val;
--char cval[1];
-+char cval[2];
- TCTINI("TAB_COMM",F_TRANS,F_O_MODE,3,1,&tidcomm);
- TCCINI(tidcomm,D_I4_FORMAT,1,"I6"," ","PID",&col);
- TCCINI(tidcomm,D_C_FORMAT,60,"A20"," ","OST",&col);
diff --git a/debian/patches/fix_scc_c.patch b/debian/patches/fix_scc_c.patch
deleted file mode 100644
index 63ec8ec..0000000
--- a/debian/patches/fix_scc_c.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Turn bad assignments "=" into correct comparisons "=="
---- a/libsrc/st/scc.c
-+++ b/libsrc/st/scc.c
-@@ -242,9 +242,9 @@
- stat = MID_CCRE(catfile,type,catdsc,&mycno);
- if (stat != ERR_NORMAL)
- {
-- if (stat = ERR_INPINV)
-+ if (stat == ERR_INPINV)
- SCTPUT("(ERR) SCCCRE: - INPINV");
-- else if (stat = ERR_CATBAD)
-+ else if (stat == ERR_CATBAD)
- SCTPUT("(ERR) SCCCRE: - CATBAD");
- else
- SCTPUT("(ERR) SCCCRE: - CATOVF");
diff --git a/debian/patches/fix_scfclo.patch b/debian/patches/fix_scfclo.patch
deleted file mode 100644
index 6d4c236..0000000
--- a/debian/patches/fix_scfclo.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Dont try to remove file name if the file name has zero length.
- This fixes
- .
- ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fff33427aac at pc 0x7f20d8d70449 bp 0x7fff33427800 sp 0x7fff334277f8
-WRITE of size 1 at 0x7fff33427aac thread T0
- #0 0x7f20d8d70448 in SCFCLO libsrc/st/scfb.c:461
- #1 0x7f20d8dab088 in TCTCLO libsrc/tbl/tct.c:414
- #2 0x7f20d8d2638c in MID_fitsin libsrc/st/midfctb.c:573
- #3 0x7f20d8d21784 in MID_ACCFITS libsrc/st/midfct.c:193
- #4 0x7f20d8d6f816 in SCFOPN libsrc/st/scfb.c:133
- #5 0x7f20d8d8266f in stf1_ libsrc/ftoc/stf.c:79
- #6 0x7f20d8dbdcb9 in stfopn_ libsrc/ftoc/ystf.f:6
- #7 0x407d7a in statis prim/display/src/statis.f:202
- #8 0x40549c in main prim/display/src/statis.f:1056
- #9 0x7f20d7ea3b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
- #10 0x405a92 (prim/exec/statis.exe+0x405a92)
- .
- Address 0x7fff33427aac is located in stack of thread T0 at offset 604 in frame
- #0 0x7f20d8d6fabf in SCFCLO libsrc/st/scfb.c:325
- .
- This frame has 10 object(s):
- [32, 36) 'mm'
- [96, 100) 'e_c'
- [160, 164) 'e_d'
- [224, 228) 'e_l'
- [288, 292) 'n0'
- [352, 356) 'n1'
- [416, 424) 'ldbp'
- [480, 568) 'cbuf'
- [608, 768) 'origname' <== Memory access at offset 604 underflows this variable
- [800, 1000) 'temp'
-
---- a/libsrc/st/scfa.c
-+++ b/libsrc/st/scfa.c
-@@ -438,9 +438,14 @@
- {
- if (fctpntr->FILTYP > 0) /* for FITS files */
- {
-- (void) strcpy(origname,fctpntr->NAME+4);
-- i = fctpntr->O_NAMLEN - 4; /* we removed leading "FITZ" */
-- origname[i] = '\0';
-+ if (fctpntr->O_NAMLEN == 0)
-+ (void) strcpy(origname,fctpntr->NAME);
-+ else /* internal FITS file */
-+ {
-+ (void) strcpy(origname,fctpntr->NAME+4);
-+ i = fctpntr->O_NAMLEN - 4; /* we removed leading "FITZ" */
-+ origname[i] = '\0';
-+ }
- ptr = origname;
- }
- else
---- a/libsrc/st/scfb.c
-+++ b/libsrc/st/scfb.c
-@@ -292,9 +292,14 @@
- char *datpntr, origname[FCT_NAME_LEN];
-
- datpntr = fctpntr->BDADDR[0];
-- (void) strcpy(origname,fctpntr->NAME+4);
-- mm = fctpntr->O_NAMLEN - 4; /* we just removed leading "FITZ" */
-- origname[mm] = '\0';
-+ if (fctpntr->O_NAMLEN == 0)
-+ (void) strcpy(origname,fctpntr->NAME);
-+ else /* internal FITS file */
-+ {
-+ (void) strcpy(origname,fctpntr->NAME+4);
-+ mm = fctpntr->O_NAMLEN - 4; /* we just removed leading "FITZ" */
-+ origname[mm] = '\0';
-+ }
- status = MID_fitsin(2,origname,-1,"",datpntr,imno,&i);
- status = TCTFIX(*imno); /* write table control descriptors */
- fctpntr->ACCESS = 'I'; /* reset */
-@@ -456,9 +461,14 @@
-
- if (fctpntr->FILTYP > 0)
- {
-- (void) strcpy(origname,fctpntr->NAME+4);
-- i = fctpntr->O_NAMLEN - 4; /* we removed leading "FITZ" */
-- origname[i] = '\0';
-+ if (fctpntr->O_NAMLEN == 0)
-+ (void) strcpy(origname,fctpntr->NAME);
-+ else /* internal FITS file */
-+ {
-+ (void) strcpy(origname,fctpntr->NAME+4);
-+ i = fctpntr->O_NAMLEN - 4; /* we removed leading "FITZ" */
-+ origname[i] = '\0';
-+ }
- nampntr = origname;
- }
- else
-@@ -850,9 +860,14 @@
- char origname[FCT_NAME_LEN];
-
- dum[0] = '\0';
-- (void) strcpy(origname,fctpntr->NAME+4);
-- mm = fctpntr->O_NAMLEN - 4; /* we just removed leading "FITZ" */
-- origname[mm] = '\0';
-+ if (fctpntr->O_NAMLEN == 0)
-+ (void) strcpy(origname,fctpntr->NAME);
-+ else /* internal FITS file */
-+ {
-+ (void) strcpy(origname,fctpntr->NAME+4);
-+ mm = fctpntr->O_NAMLEN - 4; /* we just removed leading "FITZ" */
-+ origname[mm] = '\0';
-+ }
- mm = imno; /* get data as real */
- status = MID_fitsin(2,origname,-1,dum,mypntr,&mm,&i);
- /*
diff --git a/debian/patches/fix_statis_for.patch b/debian/patches/fix_statis_for.patch
deleted file mode 100644
index 2a97fc2..0000000
--- a/debian/patches/fix_statis_for.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix string length in statis.for
- The string length of 'tcol2ima.bdf ' is wrongly given as 20, while it is 12.
- This produces the crash shown below.
- .
- As a drive-by, also the call of STK9 in ystk.for has one parameter too much.
- .
- ERROR: AddressSanitizer: global-buffer-overflow on address 0x00000047956f at pc 0x7f1243851841 bp 0x7fff7a50f48
- READ of size 1 at 0x00000047956f thread T0
- #0 0x7f1243851840 in SCKWRC libsrc/st/sckb.c:130
- #1 0x7f124385caee in stk9_ libsrc/ftoc/stk.c:262
- #2 0x7f1243896935 in stkwrc_ libsrc/ftoc/ystk.f:108
- #3 0x40c7ac in statis prim/display/src/statis.f:195
- #4 0x40549c in main prim/display/src/statis.f:1056
- #5 0x7f124297bb44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
- #6 0x405a92 (prim/exec/statis.exe+0x405a92)
- .
- 0x00000047956f is located 49 bytes to the left of global variable '*.LC48' from 'statis.f' (0x4795a0) of size 5
- 0x00000047956f is located 0 bytes to the right of global variable '*.LC47' from 'statis.f' (0x479560) of size 15
-
---- a/libsrc/ftoc-new/ystk.for
-+++ b/libsrc/ftoc-new/ystk.for
-@@ -224,7 +224,7 @@
- CALL STSTR(1,KEY) !STRIPPED_STRING
- CALL STLOC(1,0,VALUES) !untouched CHAR_LOC
- C
-- CALL STK9(NOELM,FELEM,MAXVALS,ACTVALS,STATUS)
-+ CALL STK9(NOELM,FELEM,MAXVALS,STATUS)
-
- C
- RETURN
---- a/prim/display/src/statis.for
-+++ b/prim/display/src/statis.for
-@@ -216,7 +216,7 @@
- + CALL STETER(31,'bad table column no....')
- ENDIF
- C !store tmp name in OUT_B
-- CALL STKWRC('OUT_B',1,'tcol2ima.bdf ',1,20,UNI,STAT)
-+ CALL STKWRC('OUT_B',1,'tcol2ima.bdf ',1,15,UNI,STAT)
- CALL TCOLIM(ORFILE,OUTPUT(1:16),ICOLNM(1),STAT)
- IF (STAT.NE.0) CALL STETER(32,
- + 'problems creating temp. image from table column...')
diff --git a/debian/patches/fix_tbmerge_c.patch b/debian/patches/fix_tbmerge_c.patch
deleted file mode 100644
index c920f9f..0000000
--- a/debian/patches/fix_tbmerge_c.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix copy loop termination in prim/table/libsrc/tbmerge.c
- The loop that was fixed looks somehow weird, however: they seem to have
- no (resp. not a really useful) effect; no idea what their intention is.
- .
- This crash appeared on i386, but not on x86_64:
- .
- ERROR: AddressSanitizer: stack-buffer-overflow on address 0xffba392d at pc 0x80657a2 bp 0xffba2e98 sp 0xffba2e8c
- READ of size 1 at 0xffba392d thread T0
- #0 0x80657a1 in tbl_merge prim/table/libsrc/tbmerge.c:266
- #1 0x804bfec in tk_cexec prim/edit/libsrc/tkeys.c:204
- #2 0x804b54b in main prim/table/src/tdatatbl.c:107
- #3 0xf6f64722 in __libc_start_main (/lib/i386-linux-gnu/libc.so.6+0x19722)
- #4 0x804b93f (prim/exec/tdatatbl.exe+0x804b93f)
- .
- Address 0xffba392d is located in stack of thread T0 at offset 2621 in frame
- #0 0x806446f in tbl_merge prim/table/libsrc/tbmerge.c:68
-
- This frame has 32 object(s):
- [32, 36) 'kuni'
- [...]
- [2336, 2416) 'texto'
- [2464, 2621) 'linesel' <== Memory access at offset 2621 overflows this variable
-
---- a/prim/table/libsrc/tbmerge.c
-+++ b/prim/table/libsrc/tbmerge.c
-@@ -261,7 +261,7 @@
- while (len>80)
- {
- ii = 0;
-- while (linesel[ii])
-+ while (linesel[ii+80])
- {
- linesel[ii] = linesel[ii+80];
- ii++;
diff --git a/debian/patches/fix_thelp_c.patch b/debian/patches/fix_thelp_c.patch
deleted file mode 100644
index 6e59a04..0000000
--- a/debian/patches/fix_thelp_c.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix call of MergeHelp()
- The closing parenthesis was on the wrong place.
---- a/prim/tw3/libsrc/thelp.c
-+++ b/prim/tw3/libsrc/thelp.c
-@@ -1432,7 +1432,7 @@
-
- if_not((load_file(filename))) FINISH;
-
-- if ((p = MergeHelp((PIECE *)(b->buf)), &loaded_file)) {
-+ if ((p = MergeHelp((PIECE *)(b->buf), &loaded_file))) {
- help->date = oshtime(); /* Be sure no Bad Index Error */
- BUF_Clear(b);
- BUF_AppendItem(b, PIECE, p);
diff --git a/debian/patches/fix_txdisplay_c.patch b/debian/patches/fix_txdisplay_c.patch
deleted file mode 100644
index 12211a2..0000000
--- a/debian/patches/fix_txdisplay_c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Correct type of str array
---- a/prim/tw3/libsrc/txdisplay.c
-+++ b/prim/tw3/libsrc/txdisplay.c
-@@ -526,7 +526,7 @@
- .RETURNS OK / NOK
- .REMARKS Important actions as \03action\04
- ---*/
-- char *str; /* IN: String to display */
-+ char **str; /* IN: String to display */
- int clear_option; /* IN: Option to clear Window before display */
- {
- int status, i;
diff --git a/debian/patches/fix_unknown_type.patch b/debian/patches/fix_unknown_type.patch
deleted file mode 100644
index f4cb377..0000000
--- a/debian/patches/fix_unknown_type.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix unknown type name in stdred/mos/libsrc/misc.c
- Compiling stdred/mos/libsrc/misc.c results in an error because of
- unknown type name 'off_t' in incl/proto_os.h. This can be fixed by
- #include <sys/types.h>.
- .
- Also, system/machine/computer.c uses exit() but does not include the
- appropriate header. This is fixed by #include <stdlib.h>
---- a/incl/proto_os.h
-+++ b/incl/proto_os.h
-@@ -18,6 +18,7 @@
-
- /* to avoid generic complains for strlen() */
- #include <string.h>
-+#include <sys/types.h>
-
- #ifdef __cplusplus
- extern "C" {
---- a/system/machine/computer.c
-+++ b/system/machine/computer.c
-@@ -63,6 +63,7 @@
-
- #include <stdio.h>
- #include <signal.h>
-+#include <stdlib.h>
-
- #ifndef NO_FLOAT_H
- #include <float.h>
diff --git a/debian/patches/remove_path_from_testscript.patch b/debian/patches/remove_path_from_testscript.patch
deleted file mode 100644
index 33fbada..0000000
--- a/debian/patches/remove_path_from_testscript.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Remove MIDAS path from kcompare.prg call
- This is needed if one wants to run the tests when they are not installed
- in the MIDASHOME directory, as f.e. in the Debian CI.
---- a/test/prim/verify14.prg
-+++ b/test/prim/verify14.prg
-@@ -373,8 +373,8 @@
- in_a = m$symbol("MIDASHOME") ! use keyword for safety
- in_b = m$symbol("MIDVERS")
- !
--write/out > create/comm select @@ {in_a}/{in_b}/test/prim/kcompare.prg
--create/comm select @@ {in_a}/{in_b}/test/prim/kcompare.prg
-+write/out > create/comm select @@ kcompare.prg
-+create/comm select @@ kcompare.prg
- write/out > show/com select
- show/com select
- write/out > show/code select
diff --git a/debian/patches/remove_pointer_conversion.patch b/debian/patches/remove_pointer_conversion.patch
deleted file mode 100644
index 5a31d2f..0000000
--- a/debian/patches/remove_pointer_conversion.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Remove conversion from pointer to int
- stdred/mos/libsrc/misc.c, line 46 converts a pointer into an integer and
- compares the result with 0. This is not portable and may fail if the
- pointer has a larger size than the integer, and all bits that fit into
- the integer are zero (rare case, but may happen). One can just remove
- the conversion (and compare with NULL).
---- a/stdred/mos/libsrc/misc.c
-+++ b/stdred/mos/libsrc/misc.c
-@@ -25,6 +25,8 @@
- #endif
- #include <gl_defs.h>
-
-+extern char *strstrs();
-+
- /* check for the existence of 'file' with the extension 'ext' (incl. dot) */
- #ifdef __STDC__
- int file_exists( char *file, char *ext )
-@@ -43,7 +45,7 @@
- break;
- }
-
-- if ( (int) strstrs(file, ext) == 0 )
-+ if ( strstrs(file, ext) == NULL )
- sprintf( fileext, "%s%s", file, ext );
- else
- strcpy( fileext, file );
diff --git a/debian/patches/remove_sys_errlist.patch b/debian/patches/remove_sys_errlist.patch
deleted file mode 100644
index 6249cd0..0000000
--- a/debian/patches/remove_sys_errlist.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Replace use of sys_errlist by strerror()
- sys_errlist is deprecated, and the definition here conflicted to the
- header in kfreebsd and Hurd. Hurd does not have sys_errlist at all.
---- a/gui/GraphLib/libsrc/uimxR5/src/sp_utils.c
-+++ b/gui/GraphLib/libsrc/uimxR5/src/sp_utils.c
-@@ -22,6 +22,7 @@
-
- /*--- include files ---*/
- #include <unistd.h>
-+#include <string.h>
-
- #include "uxproto.h"
- #include "version.h"
-@@ -190,15 +191,7 @@
- {
- int error;
-
--#if defined(__Darwin__)
- extern int errno;
--#else
--extern int errno, sys_nerr;
--#endif
--
--#if !defined(__linux__) && !defined(__Darwin__) && !defined(Cygwin)
--extern char *sys_errlist[];
--#endif
-
- char buffer[BUFSIZ];
-
-@@ -213,12 +206,8 @@
- (void) strcat(buffer, ": ");
- }
- }
-- if(error > 0 && error < sys_nerr) {
-- (void) strcat(buffer, sys_errlist[errno]);
-- (void) strcat(buffer, "\n");
-- } else {
-- (void) strcat(buffer, CGETS( MS_MISC_SYS_ERR, DS_MS_MISC_SYS_ERR));
-- }
-+ (void) strcat(buffer, strerror(errno));
-+ (void) strcat(buffer, "\n");
- UxStandardError(buffer);
- }
-
diff --git a/debian/patches/resolve_conflictig_macro.patch b/debian/patches/resolve_conflictig_macro.patch
deleted file mode 100644
index 879f38c..0000000
--- a/debian/patches/resolve_conflictig_macro.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Remove abs() macro
- compiling stdred/feros/libsrc/wavecal.c results in an error because of
- a conflicting definition of abs() in stdred/feros/incl/u_const.h.
- Removing the relevant #define statement resolves this.
---- a/stdred/feros/incl/u_const.h
-+++ b/stdred/feros/incl/u_const.h
-@@ -110,7 +110,6 @@
-
- #define min(X, Y) (((X) < (Y)) ? (X) : (Y)) /* Minimum von X,Y */
- #define max(X, Y) (((X) > (Y)) ? (X) : (Y)) /* Maximum von X,Y */
--#define abs(X) (((X) >= 0) ? (X) : -(X)) /* Absolutbetrag von X */
- #define sign(X, Y) (((Y) < 0) ? -abs(X) : abs(X)) /* Vorzeichen von */
- /* Y mal abs(X) */
- #define sqr(X) ((X) * (X)) /* Quadrat von X */
---- a/prim/dio/libsrc/fitsrhd.c
-+++ b/prim/dio/libsrc/fitsrhd.c
-@@ -532,8 +532,8 @@
- */
-
- else if ( (dtype == D_I2_FORMAT) &&
-- (abs(bfdef->bzero-32768.0) < eps) &&
-- (abs(bfdef->bscale-1.0) < eps) )
-+ (fabs(bfdef->bzero-32768.0) < eps) &&
-+ (fabs(bfdef->bscale-1.0) < eps) )
- {
- xtype = D_UI2_FORMAT;
- bfdef->bitpix = -16;
---- a/stdred/feros/libsrc/glsp.c
-+++ b/stdred/feros/libsrc/glsp.c
-@@ -19,6 +19,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <math.h>
-
- /* FEROS specific includes */
-
-@@ -630,13 +631,13 @@
- und strenge Regularitaet ueberprueft
- */
- ud1[n] = ud2[n] = ud2[n - 1] = 0.0;
--def_reg = abs (md[1]) + abs (ud1[1]) + abs (ud2[1]);
-+def_reg = fabs (md[1]) + fabs (ud1[1]) + fabs (ud2[1]);
- if (def_reg == 0.0)
- return (1);
- def_reg = 1. / def_reg;
- if (md[1] < 0.0)
- return (-1);
--if (abs (md[1]) * def_reg <= MACH4_EPS)
-+if (fabs (md[1]) * def_reg <= MACH4_EPS)
- return (1);
- /*
- Zerlegung der Matrix bei gleichzeitiger Ueberpruefung
-@@ -646,14 +647,14 @@
- ud1[1] /= md[1];
- h_var_2 = ud2[1];
- ud2[1] /= md[1];
--def_reg = abs (h_var_1) + abs (md[2]) + abs (ud1[2]) + abs (ud2[2]);
-+def_reg = fabs (h_var_1) + fabs (md[2]) + fabs (ud1[2]) + fabs (ud2[2]);
- if (def_reg == 0.0)
- return (1);
- def_reg = 1. / def_reg;
- md[2] -= h_var_1 * ud1[1];
- if (md[2] < 0.0)
- return (-1);
--if (abs (md[2]) <= MACH4_EPS)
-+if (fabs (md[2]) <= MACH4_EPS)
- return (1);
-
- h_var_1 = ud1[2];
-@@ -662,8 +663,8 @@
- ud2[2] /= md[2];
- for (i = 3; i <= n; ++i)
- {
-- def_reg = abs (h_var_2) + abs (h_var_1) + abs (md[i])
-- + abs (ud1[i]) + abs (ud2[i]);
-+ def_reg = fabs (h_var_2) + fabs (h_var_1) + fabs (md[i])
-+ + fabs (ud1[i]) + fabs (ud2[i]);
- if (def_reg == 0.0)
- return (1);
- def_reg = 1. / def_reg;
-@@ -671,7 +672,7 @@
- md[i] -= (md[i - 1] * sqr (ud1[i - 1]) + h_var_2 * ud2[i - 2]);
- if (md[i] < 0.0)
- return (-1);
-- if (abs (md[i] * def_reg) <= MACH4_EPS)
-+ if (fabs (md[i] * def_reg) <= MACH4_EPS)
- return (1);
- if (i < n)
- {
diff --git a/debian/patches/series b/debian/patches/series
index f9345ab..78af426 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,39 +4,15 @@ debian_setup.patch
nonlinux.patch
fix_cleanmidas.patch
dont_strip_during_build.patch
-fix_library_search_path.patch
fix_x11_include_path.patch
syskeys.patch
system_readline.patch
fix_manpages.patch
-remove_sys_errlist.patch
dont_compile_sp_pty.patch
-fix_unknown_type.patch
-resolve_conflictig_macro.patch
-fix_off_by_one_definitions.patch
-remove_pointer_conversion.patch
fix_fitswdm_c.patch
-fix_midfct_c.patch
fix_esoext_c.patch
-fix_filepath_c.patch
-fix_mutil_h.patch
-fix_scc_c.patch
-fix_cextrco_c.patch
-fix_ftoc.patch
-fix_md5_c.patch
-fix_txdisplay_c.patch
-fix_modgcur_c.patch
-fix_thelp_c.patch
qsort.patch
-fix_dio.patch
-fix_ftoc2.patch
fix_rarthm_for.patch
fix_mdb_put.patch
fix_fitswdb.patch
-fix_scfclo.patch
-fix_mid_rdldb.patch
-fix_statis_for.patch
fix_selechar_c.patch
-fix_esoext_i8flag.patch
-fix_tbmerge_c.patch
-remove_path_from_testscript.patch
--
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-science-commits
mailing list