[wcstools] 01/02: Revert crash fix, and replace with workaround

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository wcstools.

commit 626878322d7c0d4c1b11cbeb33731496b1e082fd
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Jun 1 17:18:36 2015 +0200

    Revert crash fix, and replace with workaround
---
 debian/changelog                       |  1 +
 debian/patches/fix_wcsinit_crash.patch | 35 ++++++++++++++++------------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5740ec4..ab2a6b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 wcstools (3.9.2-3) UNRELEASED; urgency=low
 
   * Run CI test during package build as well
+  * Revert last fix (not working), and replace with workaround
 
  -- Ole Streicher <olebole at debian.org>  Mon, 01 Jun 2015 16:20:25 +0200
 
diff --git a/debian/patches/fix_wcsinit_crash.patch b/debian/patches/fix_wcsinit_crash.patch
index c3a3316..f8de3da 100644
--- a/debian/patches/fix_wcsinit_crash.patch
+++ b/debian/patches/fix_wcsinit_crash.patch
@@ -2,22 +2,19 @@ Author: Ole Streicher <olebole at debian.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
---- wcstools.orig/libwcs/wcs.h
-+++ wcstools/libwcs/wcs.h
-@@ -119,12 +119,12 @@ struct WorldCoor {
-   int		linmode;	/* 0=system only, 1=units, 2=system+units */
-   int		detector;	/* Instrument detector number */
-   char		instrument[32];	/* Instrument name */
--  char		ctype[9][9];	/* Values of CTYPEn keywords */
--  char		c1type[9];	/*  1st coordinate type code:
-+  char		ctype[9][16];	/* Values of CTYPEn keywords */
-+  char		c1type[16];	/*  1st coordinate type code:
- 					RA--, GLON, ELON */
--  char		c2type[9];	/*  2nd coordinate type code:
-+  char		c2type[16];	/*  2nd coordinate type code:
- 					DEC-, GLAT, ELAT */
--  char		ptype[9];	/*  projection type code:
-+  char		ptype[16];	/*  projection type code:
- 				    SIN, TAN, ARC, NCP, GLS, MER, AIT, etc */
-   char		units[9][32];	/* Units if LINEAR */
-   char		radecsys[32];	/* Reference frame: FK4, FK4-NO-E, FK5, GAPPT*/
+--- 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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/wcstools.git