[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/wcstools/files/

[Michael Palimaka]

commit:     d59f08766272e1c8488f8b361a1254ffbc8669a2
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Aug 16 12:23:03 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 15:10:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d59f0876

sci-astronomy/wcstools: remove unsued patches

 .../files/wcstools-3.9.2-RASortStars.patch         | 14 -----
 ...cstools-3.9.2-additional_pointer_increase.patch | 14 -----
 .../files/wcstools-3.9.2-compiler_warnings.patch   | 13 ----
 .../files/wcstools-3.9.2-ctype_copy_to_wcs.patch   | 19 ------
 .../wcstools/files/wcstools-3.9.2-mayhem.patch     | 69 ----------------------
 .../wcstools-3.9.2-off-by-one-allocation.patch     | 15 -----
 .../wcstools/files/wcstools-3.9.2-spelling.patch   | 69 ----------------------
 .../wcstools/files/wcstools-3.9.2-sprintf.patch    | 36 -----------
 .../wcstools/files/wcstools-3.9.2-use_abort.patch  | 14 -----
 .../files/wcstools-3.9.2-wcsinit_crash.patch       | 20 -------
 10 files changed, 283 deletions(-)

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-RASortStars.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-RASortStars.patch
deleted file mode 100644
index 27a912f5a90..00000000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-RASortStars.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <olebole@××××××.org>
-Description: Fix uninitialized value for haspm in RASortStars()
- This fixes a crash with 'imstar -s'.
---- a/libwcs/sortstar.c
-+++ b/libwcs/sortstar.c
-@@ -417,6 +417,8 @@
- 	hasnum = 1;
-     if (spra != NULL && spdec != NULL)
- 	haspm = 1;
-+    else
-+	haspm = 0;
-     if (sx != NULL && sy != NULL)
- 	hasxy = 1;
-     else

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-additional_pointer_increase.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-additional_pointer_increase.patch
deleted file mode 100644
index 7d61f8159b2..00000000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-additional_pointer_increase.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <olebole@××××××.org>
-Description: Fix duplicate pointer increase
- Otherwise, xborder1 may be zero, causing an illegal memory access later.
---- a/libwcs/findstar.c
-+++ b/libwcs/findstar.c
-@@ -212,7 +212,7 @@
- 	tx1 = trimsec + 1;
- 	tx2 = strchr (trimsec, ':');
- 	*tx2 = (char) 0;
--	xborder1 = atoi (tx1+1);
-+	xborder1 = atoi (tx1);
- 	tx2 = tx2 + 1;
- 	tx3 = strchr (tx2, ',');
- 	*tx3 = (char) 0;

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-compiler_warnings.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-compiler_warnings.patch
deleted file mode 100644
index 57bb8cb9932..00000000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-compiler_warnings.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <debian@×××××××××.cx>
-Description: Fix some compiler warnings.
---- a/imcat.c
-+++ b/imcat.c
-@@ -1778,7 +1778,7 @@
- 		if (refcat == UCAC2 || refcat == UCAC3 || refcat == UCAC4) {
- 		    nim = gc[i] / 1000;
- 		    nct = gc[i] % 1000;
--		    sprintf (temp, "  ni  nc", nim, nct);
-+		    sprintf (temp, "  ni%i  nc%i", nim, nct);
- 		    strcat (headline, temp);
- 		    }
- 		else if (gcset)

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-ctype_copy_to_wcs.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-ctype_copy_to_wcs.patch
deleted file mode 100644
index 63a47300e92..00000000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-ctype_copy_to_wcs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Ole Streicher <olebole@××××××.org>
-Description: Fix an off-by-one problem with strcpy
- Sometimes a string is copied with the length of 8 into an char array with a
- length of 8, as found in wcs.c, line 392: wcs->ptype is char[8], and ctype1
- may be "DEC--TAN". This will cause an overwriting of the next entry, or if
- this is protected (as in Debian) it will cause a crash.
---- a/libwcs/wcs.c
-+++ b/libwcs/wcs.c
-@@ -388,8 +388,8 @@
-     if (!strncmp (ctype1, "LONG",4))
- 	strncpy (ctype1, "XLON",4);
- 
--    strcpy (wcs->ctype[0], ctype1);
--    strcpy (wcs->ptype, ctype1);
-+    strncpy (wcs->ctype[0], ctype1, 16);
-+    strncpy (wcs->ptype, ctype1, 8);
- 
-     /* Linear coordinates */
-     if (!strncmp (ctype1,"LINEAR",6)) {

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-mayhem.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-mayhem.patch
deleted file mode 100644
index 694c0720ab9..00000000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-mayhem.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Author: Ole Streicher <debian@×××××××××.cx>
-Description: Fix several bugs that appear in during the mayhem tests.
-Bug: http://bugs.debian.org/715682
-Bug: http://bugs.debian.org/715755
-Bug: http://bugs.debian.org/715905
-Bug: http://bugs.debian.org/715956
-Bug: http://bugs.debian.org/715957
---- a/getfits.c
-+++ b/getfits.c
-@@ -108,6 +108,7 @@
- 		usage ("Right ascension given but no declination");
- 	    else {
- 		strcpy (rastr, *av);
-+		ac--;
- 		strcpy (decstr, *++av);
- 		ra0 = str2ra (rastr);
- 		dec0 = str2dec (decstr);
---- a/getpix.c
-+++ b/getpix.c
-@@ -83,6 +83,7 @@
-     char *crange;       /* Column range string */
-     char *rstr;
-     char *dstr = NULL;
-+    char rastr[32], decstr[32];
-     char *cstr;
-     int systemp;
-     int i;
---- a/bincat.c
-+++ b/bincat.c
-@@ -156,7 +156,7 @@
- 	    if (ac < 3)
- 		usage((char)0, "3 arguments needed for center coordinate");
- 	    else {
--		strcpy (rastr, *++av);
-+		strcpy (rastr, *av);
- 		ac--;
- 		strcpy (decstr, *++av);
- 		setcenter (rastr, decstr);
---- a/cphead.c
-+++ b/cphead.c
-@@ -137,7 +137,7 @@
- 		    break;
- 	
- 		case 'w': /* Copy entire WCS */
--		    nkwd1 = 87;
-+		    nkwd1 = 236;
- 		    if (nkwd + nkwd1 > maxnkwd) {
- 			maxnkwd = nkwd + nkwd1 + 32;
- 			kwdnew = (char **) calloc (maxnkwd, sizeof (void *));
-@@ -148,7 +148,7 @@
- 			free (kwd);
- 			kwd = kwdnew;
- 			}
--		    for (ikwd = nkwd; i < nkwd+nkwd1; i++) {
-+		    for (ikwd = nkwd; ikwd < nkwd+nkwd1+32; ikwd++) {
- 			kwd[ikwd] = (char *) calloc (32, 1);
- 			}
- 		    strcpy (kwd[nkwd], "RA");
---- a/filext.c
-+++ b/filext.c
-@@ -80,7 +80,7 @@
- 		    ext = ext + 1;
- 		}
- 	    }
--	printf ("%s\n", ext);
-+	printf ("%s\n", (ext)?ext:"");
- 	}
- 
-     return (0);

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-off-by-one-allocation.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-off-by-one-allocation.patch
deleted file mode 100644
index 4a9ee8041c8..00000000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-off-by-one-allocation.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Ole Streicher <olebole@××××××.org>
-Description: Fix an off-by-one memory allocation problem
- in fitsfile.c, line 331, there is no space for a final '\0' byte
- allocated. However, there is one expected in ksearch() (hget.c, line 1203).
---- a/libwcs/fitsfile.c
-+++ b/libwcs/fitsfile.c
-@@ -328,7 +328,7 @@
- 		nbprim = nrec * FITSBLOCK;
- 		headend = ksearch (header,"END");
- 		lprim = headend + 80 - header;
--		pheader = (char *) calloc ((unsigned int) nbprim, 1);
-+		pheader = (char *) calloc ((unsigned int) nbprim+1, 1);
- 		for (i = 0; i < lprim; i++)
- 		    pheader[i] = header[i];
- 		for (i = lprim; i < nbprim; i++)

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-spelling.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-spelling.patch
deleted file mode 100644
index 7c666c1277b..00000000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-spelling.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Author: Ole Streicher <debian@×××××××××.cx>
-Description: Spellfixes to make lintian happy
---- a/libwcs/fitsfile.c
-+++ b/libwcs/fitsfile.c
-@@ -1583,7 +1583,7 @@
- 	if (!access (filename, 0)) {
- 	    fd = open (filename, O_WRONLY);
- 	    if (fd < 3) {
--		snprintf (fitserrmsg,79, "FITSWIMAGE:  file %s not writeable\n", filename);
-+		snprintf (fitserrmsg,79, "FITSWIMAGE:  file %s not writable\n", filename);
- 		return (0);
- 		}
- 	    }
-@@ -1622,7 +1622,7 @@
- 	if (!access (filename, 0)) {
- 	    fd = open (filename, O_WRONLY);
- 	    if (fd < 3) {
--		snprintf (fitserrmsg,79, "FITSWEXT:  file %s not writeable\n",
-+		snprintf (fitserrmsg,79, "FITSWEXT:  file %s not writable\n",
- 			 filename);
- 		return (0);
- 		}
-@@ -1884,7 +1884,7 @@
-     if (!access (filename, 0)) {
- 	fdout = open (filename, O_WRONLY);
- 	if (fdout < 3) {
--	    snprintf (fitserrmsg,79, "FITSCIMAGE:  file %s not writeable\n", filename);
-+	    snprintf (fitserrmsg,79, "FITSCIMAGE:  file %s not writable\n", filename);
- 	    return (0);
- 	    }
- 	}
-@@ -1970,7 +1970,7 @@
-     if (!access (filename, 0)) {
- 	fd = open (filename, O_WRONLY);
- 	if (fd < 3) {
--	    snprintf (fitserrmsg, 79, "FITSWHEAD:  file %s not writeable\n", filename);
-+	    snprintf (fitserrmsg, 79, "FITSWHEAD:  file %s not writable\n", filename);
- 	    return (0);
- 	    }
- 	}
-@@ -2072,7 +2072,7 @@
-     if (ext != NULL)
- 	*ext = cext;
-     if (fd < 3) {
--	snprintf (fitserrmsg, 79, "FITSWEXHEAD:  file %s not writeable\n", filename);
-+	snprintf (fitserrmsg, 79, "FITSWEXHEAD:  file %s not writable\n", filename);
- 	return (-1);
- 	}
- 
---- a/libwcs/imhfile.c
-+++ b/libwcs/imhfile.c
-@@ -896,7 +896,7 @@
-     if (!access (hdrname, 0)) {
- 	fd = open (hdrname, O_WRONLY);
- 	if (fd < 3) {
--	    fprintf (stderr, "IRAFWIMAGE:  file %s not writeable\n", hdrname);
-+	    fprintf (stderr, "IRAFWIMAGE:  file %s not writable\n", hdrname);
- 	    return (0);
- 	    }
- 	}
-@@ -993,7 +993,7 @@
-     if (!access (pixname, 0)) {
- 	fd = open (pixname, O_WRONLY);
- 	if (fd < 3) {
--	    fprintf (stderr, "IRAFWIMAGE:  file %s not writeable\n", pixname);
-+	    fprintf (stderr, "IRAFWIMAGE:  file %s not writable\n", pixname);
- 	    return (0);
- 	    }
- 	}

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-sprintf.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-sprintf.patch
deleted file mode 100644
index 4ec5993cb5f..00000000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-sprintf.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Author: Ole Streicher <olebole@××××××.net>
-Description: Fix overlappong buffers in sprintf
- In sprintf, overlapping buffers lead to undefined behaviour.
- This causes different results on Debian and Ubuntu.
---- a/imstar.c
-+++ b/imstar.c
-@@ -818,7 +818,7 @@
- 	    sprintf (headline, "%7.2f %7.2f %6.2f  %d",
- 		    sx[i],sy[i],smag[i],sp[i]);
- 	    if (iswcs (wcs))
--		sprintf (headline, "%s %s %s", headline, rastr, decstr);
-+		sprintf (headline + strlen(headline), " %s %s", rastr, decstr);
- 	    if (wfile)
- 		fprintf (fd, "%s\n", headline);
- 	    else
-@@ -827,14 +827,14 @@
- 	else {
- 	    sprintf (headline, "%3d %s %s %6.2f", i+1,rastr,decstr,smag[i]);
- 	    if (wcs->nxpix < 100.0 && wcs->nypix > 100.0)
--		sprintf (headline, "%s  %5.2f %5.2f %d",
--		headline, sx[i],sy[i], sp[i]);
-+		sprintf (headline + strlen(headline), "  %5.2f %5.2f %d",
-+		sx[i],sy[i], sp[i]);
- 	    else if (wcs->nxpix < 1000.0 && wcs->nypix < 1000.0)
--		sprintf (headline, "%s  %6.2f %6.2f %d",
--		headline, sx[i],sy[i], sp[i]);
-+		sprintf (headline + strlen(headline), "  %6.2f %6.2f %d",
-+		sx[i],sy[i], sp[i]);
- 	    else
--		sprintf (headline, "%s  %7.2f %7.2f %d",
--		headline, sx[i],sy[i], sp[i]);
-+		sprintf (headline + strlen(headline), "  %7.2f %7.2f %d",
-+		sx[i],sy[i], sp[i]);
- 	    if (wfile)
- 		fprintf (fd, "%s\n", headline);
- 	    else

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-use_abort.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-use_abort.patch
deleted file mode 100644
index 4ebc20609b6..00000000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-use_abort.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <debian@×××××××××.cx>
-Description: If a unrecoverable error occurred, abort() instead of exit()
- to allow the user for tracing the problem.
---- a/libwcs/poly.c
-+++ b/libwcs/poly.c
-@@ -43,7 +43,7 @@
- void	qerror(char *msg1, char *msg2)
-   {
-   fprintf(stderr, "\n> %s%s\n\n",msg1,msg2);
--  exit(-1);
-+  abort();
-   }
- 
- 

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-wcsinit_crash.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-wcsinit_crash.patch
deleted file mode 100644
index f8de3da5ad0..00000000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-wcsinit_crash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Ole Streicher <olebole@××××××.net>
-Description: Increase c*type and ptype field string lengths
- This is needed to allow C1TYPE='RA---TAN-SIP'
-Bug: https://bugs.launchpad.net/ubuntu/+source/saods9/+bug/1458333
---- a/libwcs/wcsinit.c
-+++ b/libwcs/wcsinit.c
-@@ -399,11 +399,11 @@
- 	}
- 
-     /* World coordinate system reference coordinate information */
--    if (hgetsc (hstring, "CTYPE1", &mchar, 16, ctype1)) {
-+    if (hgetsc (hstring, "CTYPE1", &mchar, 9, ctype1)) {
- 
- 	/* Read second coordinate type */
- 	strcpy (ctype2, ctype1);
--	if (!hgetsc (hstring, "CTYPE2", &mchar, 16, ctype2))
-+	if (!hgetsc (hstring, "CTYPE2", &mchar, 9, ctype2))
- 	    twod = 0;
- 	else
- 	    twod = 1;