diff -Nru iraf-fitsutil-2018.07.06/debian/changelog iraf-fitsutil-2018.07.06/debian/changelog --- iraf-fitsutil-2018.07.06/debian/changelog 2019-08-04 05:50:23.000000000 +0000 +++ iraf-fitsutil-2018.07.06/debian/changelog 2019-09-06 07:27:30.000000000 +0000 @@ -1,14 +1,11 @@ -iraf-fitsutil (2018.07.06-3build2) eoan; urgency=medium +iraf-fitsutil (2018.07.06-4) unstable; urgency=low - * No-change rebuild against libcfitsio8 + * Add gitlab-ci.yml for salsa + * Push Standardss-Version to 4.4.0. No changes needed. + * Push compat to 12. Remove d/compat + * Add missing tm_isdst initialization (Closes: #939523) - -- Steve Langasek Sun, 04 Aug 2019 05:50:23 +0000 - -iraf-fitsutil (2018.07.06-3build1) disco; urgency=medium - - * No-change rebuild against libcfitsio7 - - -- Steve Langasek Wed, 14 Nov 2018 00:38:49 +0000 + -- Ole Streicher Fri, 06 Sep 2019 09:27:30 +0200 iraf-fitsutil (2018.07.06-3) unstable; urgency=low diff -Nru iraf-fitsutil-2018.07.06/debian/compat iraf-fitsutil-2018.07.06/debian/compat --- iraf-fitsutil-2018.07.06/debian/compat 2018-07-13 07:32:13.000000000 +0000 +++ iraf-fitsutil-2018.07.06/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru iraf-fitsutil-2018.07.06/debian/control iraf-fitsutil-2018.07.06/debian/control --- iraf-fitsutil-2018.07.06/debian/control 2018-11-14 00:38:48.000000000 +0000 +++ iraf-fitsutil-2018.07.06/debian/control 2019-09-06 07:25:52.000000000 +0000 @@ -1,12 +1,11 @@ Source: iraf-fitsutil -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Astro Team +Maintainer: Debian Astro Team Uploaders: Ole Streicher Section: science Priority: optional -Build-Depends: debhelper (>= 11), +Build-Depends: debhelper-compat (= 12), iraf-dev -Standards-Version: 4.2.0 +Standards-Version: 4.4.0 Vcs-Browser: https://salsa.debian.org/debian-astro-team/iraf-fitsutil Vcs-Git: https://salsa.debian.org/debian-astro-team/iraf-fitsutil.git diff -Nru iraf-fitsutil-2018.07.06/debian/gitlab-ci.yml iraf-fitsutil-2018.07.06/debian/gitlab-ci.yml --- iraf-fitsutil-2018.07.06/debian/gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ iraf-fitsutil-2018.07.06/debian/gitlab-ci.yml 2019-09-06 07:25:52.000000000 +0000 @@ -0,0 +1,8 @@ + +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +variables: + RELEASE: 'unstable' + \ No newline at end of file diff -Nru iraf-fitsutil-2018.07.06/debian/patches/Add-missing-tm_isdst-initialization.patch iraf-fitsutil-2018.07.06/debian/patches/Add-missing-tm_isdst-initialization.patch --- iraf-fitsutil-2018.07.06/debian/patches/Add-missing-tm_isdst-initialization.patch 1970-01-01 00:00:00.000000000 +0000 +++ iraf-fitsutil-2018.07.06/debian/patches/Add-missing-tm_isdst-initialization.patch 2019-09-06 07:27:30.000000000 +0000 @@ -0,0 +1,64 @@ +From: Aurelien Jarno +Date: Thu, 5 Sep 2019 23:06:05 +0200 +Subject: Add missing tm_isdst initialization + +As discussed in bug#939048, the autopkgtest from iraf-fitsutil fail in a +strange way when run with glibc 2.29 instead of glibc 2.28: + +| cl> fitsutil +| This is the initial release of the IRAF FITSUTIL package +| to include support for FITS tile compression via 'fpack'. +| Please send comments and questions to seaman@noao.edu. +| +| cl> copy dev$pix.pix pix.pix +| cl> copy dev$pix.imh pix.imh +| cl> fgwrite "pix.pix pix.imh" pix.fits verb- +| cl> mkdir out +| cl> cd out +| cl> fgread ../pix.fits "" "" verb- +| cl> sum32 * +| ERROR: No write permission on file (String_File) +| "directory (img, long+) | scan (junk, junk, filsiz)" +| line 42: fitsutil$src/sum32.cl +| called as: `sum32 (input=*)' +| called as: `cl ()' +| "clbye()" +| line 41: fitsutil$fitsutil.cl +| called as: `fitsutil ()' +| called as: `cl ()' +| Error while reading login.cl file - may need to rebuild with mkiraf +| Fatal startup error. CL dies. + +This happens because the error checking in mktime() have been improved +in case a non-valid date is provided in the tm struct. More precisely +in fgread.c, it should be noted that strptime does NOT setup the +tm_isdst of tm struct, which is instead getting a random value from the +stack. For this field 0 means no DST, positive value means DST and +negative values means that the value should be computed by mktime(). + +In the iraf-fitsutil, tm_isdst is not known from the file so it should +be set to -1, just like it's done in the POSIX.1-2018 strptime example: + +https://pubs.opengroup.org/onlinepubs/9699919799/ + +Therefore the following patch fixes the issue. + +Closes: #939523 +--- + src/fgread.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/fgread.c b/src/fgread.c +index cb849e8..42042bb 100644 +--- a/src/fgread.c ++++ b/src/fgread.c +@@ -469,6 +469,9 @@ char *type; /* Extension type */ + + s = kwdb_GetValue (kwdb, "FG_MTIME"); + ++ /* Not set by strptime(); tells mktime() to determine whether daylight ++ * saving time is in effect */ ++ tm.tm_isdst = -1; + strptime (s, "%Y-%m-%dT%T",&tm); + fh->mtime = mktime(&tm) - get_timezone(); + diff -Nru iraf-fitsutil-2018.07.06/debian/patches/series iraf-fitsutil-2018.07.06/debian/patches/series --- iraf-fitsutil-2018.07.06/debian/patches/series 2018-08-20 10:49:42.000000000 +0000 +++ iraf-fitsutil-2018.07.06/debian/patches/series 2019-09-06 07:27:30.000000000 +0000 @@ -3,3 +3,4 @@ Propagate-CFLAGS-etc.patch Fix-slines-handling-in-fgwrite.c.patch Include-used-standard-header.patch +Add-missing-tm_isdst-initialization.patch