openkylin
/
cfitsio
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

format patches

This commit is contained in:
openKylinBot 2022-05-14 03:24:03 +08:00
parent 44971d932d
commit 79b2480207
8 changed files with 106 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
debian/patches/01-LDFLAGS.diff vendored
View File

@ -1,6 +1,17 @@
--- cfitsio-3.390.orig/configure.in
+++ cfitsio-3.390/configure.in
@@ -173,7 +173,7 @@ if test "x$EXT" != xcygwin && test "x$EX
From: Debian Astronomy Maintainers
<debian-astro-maintainers@lists.alioth.debian.org>
Date: Sat, 14 May 2022 03:24:02 +0800
Subject: LDFLAGS
---
configure.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.in b/configure.in
index 69cabc1..3df213b 100644
--- a/configure.in
+++ b/configure.in
@@ -185,7 +185,7 @@ if test "x$EXT" != xcygwin && test "x$EXT" != xdarwin && test "x$EXT" != xlnx &&
fi
fi
AC_PROG_CC

18
debian/patches/02-system-cfortran.patch vendored
View File

@ -1,5 +1,15 @@
Use system cfortran header.
From: Debian Astronomy Maintainers
<debian-astro-maintainers@lists.alioth.debian.org>
Date: Sat, 14 May 2022 03:24:02 +0800
Subject: system-cfortran
Use system cfortran header.
---
f77_wrap.h | 60 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/f77_wrap.h b/f77_wrap.h
index 8b00493..d54c35d 100644
--- a/f77_wrap.h
+++ b/f77_wrap.h
@@ -1,6 +1,6 @@
@ -70,7 +80,7 @@ Use system cfortran header.
free(B[0]), \
free(B);
@@ -169,10 +169,10 @@ static char *f2cstrv2(char *fstr, char*
@@ -169,10 +169,10 @@ static char *f2cstrv2(char *fstr, char* cstr, int felem_len, int celem_len,
#undef BYTE_cfSTR
#undef BYTEV_cfSTR
@ -85,7 +95,7 @@ Use system cfortran header.
#define BYTE_cfSEP(T,B) INT_cfSEP(T,B)
#define BYTEV_cfSEP(T,B) INT_cfSEP(T,B)
#define BYTE_cfH(S,U,B) STRING_cfH(S,U,B)
@@ -211,11 +211,11 @@ static char *f2cstrv2(char *fstr, char*
@@ -211,11 +211,11 @@ static char *f2cstrv2(char *fstr, char* cstr, int felem_len, int celem_len,
#undef LOGICALV_cfSTR
#undef LOGICALV_cfT
@ -102,7 +112,7 @@ Use system cfortran header.
#define LOGICALV_cfH(S,U,B)
static char *F2CcopyLogVect(long size, int *A)
@@ -268,20 +268,20 @@ extern fitsfile *gFitsFiles[]; /*
@@ -268,20 +268,20 @@ extern fitsfile *gFitsFiles[]; /* by Fortran unit numbers */
memchr(A,'\0',D) ? A : TTSTR(A,B,D)
#define FCALLSCFUN0(T0,CN,UN,LN) \

15
debian/patches/03-off_t.diff vendored
View File

@ -1,6 +1,17 @@
From: Debian Astronomy Maintainers
<debian-astro-maintainers@lists.alioth.debian.org>
Date: Sat, 14 May 2022 03:24:02 +0800
Subject: off_t
---
fitsio.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fitsio.h b/fitsio.h
index 1d5a583..9c96551 100644
--- a/fitsio.h
+++ b/fitsio.h
@@ -69,7 +69,7 @@
@@ -69,7 +69,7 @@ SERVICES PROVIDED HEREUNDER."
# define _MIPS_SZLONG 64
#endif
@ -9,7 +20,7 @@
# include <sys/types.h> /* apparently needed on debian linux systems */
#endif /* to define off_t */
@@ -83,10 +83,10 @@
@@ -83,10 +83,10 @@ SERVICES PROVIDED HEREUNDER."
/* on whether _LARGEFILE_SOURCE is defined in sys/feature_tests.h */
/* (at least on Solaris platforms using cc) */

11
debian/patches/04-pkgconfig-private.patch vendored
View File

@ -1,10 +1,17 @@
From: Debian Astronomy Maintainers
<debian-astro-maintainers@lists.alioth.debian.org>
Date: Sat, 14 May 2022 03:24:02 +0800
Subject: pkgconfig-private
---
cfitsio.pc.in | 4 ++--
cfitsio.pc.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cfitsio.pc.in b/cfitsio.pc.in
index f0a5aa4..66e446e 100644
--- a/cfitsio.pc.in
+++ b/cfitsio.pc.in
@@ -7,6 +7,6 @@
@@ -7,6 +7,6 @@ Name: cfitsio
Description: FITS File Subroutine Library
URL: https://heasarc.gsfc.nasa.gov/fitsio/
Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@

23
debian/patches/05-system-zlib.patch vendored
View File

@ -1,12 +1,19 @@
From: Debian Astronomy Maintainers
<debian-astro-maintainers@lists.alioth.debian.org>
Date: Sat, 14 May 2022 03:24:02 +0800
Subject: system-zlib
---
Makefile.in | 6 ++----
cfitsio.pc.in | 2 +-
zlib/zcompress.c | 2 +-
Makefile.in | 6 ++----
cfitsio.pc.in | 2 +-
zlib/zcompress.c | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 2ee3f74..27c1daa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -68,9 +68,7 @@
@@ -68,9 +68,7 @@ CORE_SOURCES = buffers.c cfileio.c checksum.c drvrfile.c drvrmem.c \
pliocomp.c fits_hcompress.c fits_hdecompress.c \
simplerng.c @GSIFTP_SRC@
@ -17,7 +24,7 @@
SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
@@ -103,7 +101,7 @@
@@ -103,7 +101,7 @@ lib${PACKAGE}.a: ${OBJECTS}
shared: lib${PACKAGE}${SHLIB_SUFFIX}
lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
@ -26,15 +33,19 @@
@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
diff --git a/cfitsio.pc.in b/cfitsio.pc.in
index 66e446e..693dafc 100644
--- a/cfitsio.pc.in
+++ b/cfitsio.pc.in
@@ -8,5 +8,5 @@
@@ -8,5 +8,5 @@ Description: FITS File Subroutine Library
URL: https://heasarc.gsfc.nasa.gov/fitsio/
Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@
Libs: -L${libdir} -lcfitsio -lpthread
-Libs.private: -lm @LIBS@
+Libs.private: -lm -lz @LIBS@
Cflags: -I${includedir}
diff --git a/zlib/zcompress.c b/zlib/zcompress.c
index d425aec..440e70c 100644
--- a/zlib/zcompress.c
+++ b/zlib/zcompress.c
@@ -3,7 +3,7 @@

11
debian/patches/06-riscv64.diff vendored
View File

@ -1,3 +1,14 @@
From: Debian Astronomy Maintainers
<debian-astro-maintainers@lists.alioth.debian.org>
Date: Sat, 14 May 2022 03:24:03 +0800
Subject: riscv64
---
fitsio2.h | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/fitsio2.h b/fitsio2.h
index d6b750f..1e94632 100644
--- a/fitsio2.h
+++ b/fitsio2.h
@@ -137,6 +137,20 @@ extern int Fitsio_Pthread_Status;

17
debian/patches/08-hurd.diff vendored
View File

@ -1,6 +1,17 @@
--- cfitsio-3.370.orig/configure.in
+++ cfitsio-3.370/configure.in
@@ -130,6 +130,11 @@ case $host in
From: Debian Astronomy Maintainers
<debian-astro-maintainers@lists.alioth.debian.org>
Date: Sat, 14 May 2022 03:24:03 +0800
Subject: hurd
---
configure.in | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/configure.in b/configure.in
index 3df213b..2ad367e 100644
--- a/configure.in
+++ b/configure.in
@@ -142,6 +142,11 @@ case $host in
ARCH="linux"
EXT="lnx"
;;

17
debian/patches/09-drvnet-format-security.diff vendored
View File

@ -1,6 +1,17 @@
--- cfitsio-3.470.orig/drvrnet.c
+++ cfitsio-3.470/drvrnet.c
@@ -1257,9 +1257,7 @@ int curlProgressCallback(void *clientp,
From: Debian Astronomy Maintainers
<debian-astro-maintainers@lists.alioth.debian.org>
Date: Sat, 14 May 2022 03:24:03 +0800
Subject: drvnet-format-security
---
drvrnet.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drvrnet.c b/drvrnet.c
index be0c9f7..30c0743 100644
--- a/drvrnet.c
+++ b/drvrnet.c
@@ -1257,9 +1257,7 @@ int curlProgressCallback(void *clientp, double dltotal, double dlnow,
urlname = (char *)clientp;
if (urlname)
{