[Debian-astro-commits] [cpl] 03/03: Adjust debian files for new version
Ole Streicher
olebole at moszumanska.debian.org
Wed Jul 22 11:35:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository cpl.
commit 058264c266a2566d28d4902f849d23cab67dd830
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Jul 22 13:35:23 2015 +0200
Adjust debian files for new version
---
debian/changelog | 6 +++++
debian/patches/fix_cpltable.patch | 38 -----------------------------
debian/patches/series | 1 -
debian/patches/use-std-paths-for-libs.patch | 16 ++++++------
4 files changed, 14 insertions(+), 47 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 76003d8..0fe17dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl (6.6.1-1) UNRELEASED; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <olebole at debian.org> Wed, 22 Jul 2015 13:30:29 +0200
+
cpl (6.6-1) unstable; urgency=low
* Add basic upstream/metadata (no reference yet)
diff --git a/debian/patches/fix_cpltable.patch b/debian/patches/fix_cpltable.patch
deleted file mode 100644
index d84df53..0000000
--- a/debian/patches/fix_cpltable.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix cpl_table crash found with sanitize
- Don't try to process sdata[j] past the terminating '\0' character.
- This fixes the following crash:
- .
- ERROR: AddressSanitizer: global-buffer-overflow on address 0x7fc23ba80ca1 at pc 0x7fc23b96173f bp 0x7fff53ff6e90 sp 0x7fff53ff6e88
- READ of size 1 at 0x7fc23ba80ca1 thread T0
- #0 0x7fc23b96173e in _cpl_table_save_legacy cplcore/cpl_table.c:25999
- #1 0x7fc23b96ad9f in cpl_table_save cplcore/cpl_table.c:31602
- #2 0x41206e in cpl_table_test_main cplcore/tests/cpl_table-test.c:812
- #3 0x404657 in main cplcore/tests/cpl_table-test.c:216
- #4 0x7fc23a499b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
- #5 0x404568 (cplcore/tests/.libs/lt-cpl_table-test+0x404568)
- .
- 0x7fc23ba80ca1 is located 63 bytes to the left of global variable '*.LC54' from 'cpl_table.c' (0x7fc23ba80ce0) of size 7
- '*.LC54' is ascii string '%lld%c'
- 0x7fc23ba80ca1 is located 0 bytes to the right of global variable '*.LC53' from 'cpl_table.c' (0x7fc23ba80ca0) of size 1
- '*.LC53' is ascii string ''
---- a/cplcore/cpl_table.c
-+++ b/cplcore/cpl_table.c
-@@ -25996,7 +25996,7 @@
- for (m = 0, j = 0; j < depth; j++) {
- eccolo = 0;
- for (n = 0; n < field_size; n++, m++) {
-- if (sdata[j][n] == '\0') {
-+ if (!eccolo && (sdata[j][n] == '\0')) {
- eccolo = 1;
- }
- if (eccolo) {
-@@ -29281,7 +29281,7 @@
- for (m = 0, j = 0; j < depth; j++) {
- eccolo = 0;
- for (n = 0; n < field_size; n++, m++) {
-- if (sdata[j][n] == '\0') {
-+ if (!eccolo && (sdata[j][n] == '\0')) {
- eccolo = 1;
- }
- if (eccolo) {
diff --git a/debian/patches/series b/debian/patches/series
index 2be7f9e..d365b07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@ no_compiletime_cpucheck.patch
fix_required_versions.patch
serial-tests
reproducible_build.patch
-fix_cpltable.patch
diff --git a/debian/patches/use-std-paths-for-libs.patch b/debian/patches/use-std-paths-for-libs.patch
index a085aea..5dbe440 100644
--- a/debian/patches/use-std-paths-for-libs.patch
+++ b/debian/patches/use-std-paths-for-libs.patch
@@ -23,7 +23,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
test -n "$CFITSIODIR" && \
cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
-@@ -492,6 +493,7 @@
+@@ -496,6 +497,7 @@
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib64"
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib"
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib32"
@@ -31,16 +31,16 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
test -n "$CPLDIR" && \
cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -604,7 +606,7 @@
+@@ -608,7 +610,7 @@
cpl_wcs_check_version="$1"
- cpl_wcs_check_header="wcslib/wcslib.h"
+ cpl_wcs_check_header="wcslib.h"
- cpl_wcs_check_lib="libwcs.a"
+ cpl_wcs_check_lib="libwcs.so"
cpl_wcs_includes=""
cpl_wcs_libraries=""
-@@ -678,6 +680,7 @@
+@@ -682,6 +684,7 @@
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib64"
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib"
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib32"
@@ -48,7 +48,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
test -n "$WCSDIR" && \
cpl_wcs_libdirs="$WCSDIR/lib64 \
-@@ -836,8 +839,8 @@
+@@ -844,8 +847,8 @@
cpl_fftw_check_version="$1"
cpl_fftw_check_header="fftw3.h"
@@ -59,7 +59,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
cpl_fftw_includes=""
cpl_fftw_libraries=""
-@@ -912,6 +915,7 @@
+@@ -920,6 +923,7 @@
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib64"
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib"
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib32"
@@ -67,7 +67,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
test -n "$FFTWDIR" && \
cpl_fftw_libdirs="$FFTWDIR/lib64 \
-@@ -1250,7 +1254,7 @@
+@@ -1266,7 +1270,7 @@
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl.h"
@@ -76,7 +76,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
cpl_incdirs=""
cpl_libdirs=""
-@@ -1327,6 +1331,7 @@
+@@ -1343,6 +1347,7 @@
cpl_libdirs="$cpl_libdirs /usr/lib64"
cpl_libdirs="$cpl_libdirs /usr/lib"
cpl_libdirs="$cpl_libdirs /usr/lib32"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl.git
More information about the Debian-astro-commits
mailing list