[libbio-scf-perl] 01/04: Add patch 0001-Fix-overflowing-casts-from-pointer-to-integer.patch.

gregor herrmann gregoa at debian.org
Sun Dec 11 16:41:57 UTC 2016


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

gregoa pushed a commit to branch master
in repository libbio-scf-perl.

commit 32fefbc45861aaac1f26e7dc2b6b67118e09abb8
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Dec 11 17:32:25 2016 +0100

    Add patch 0001-Fix-overflowing-casts-from-pointer-to-integer.patch.
    
    Thanks: Niko Tyni for coming up with the patch.
    Closes: #846731, #775434
---
 ...overflowing-casts-from-pointer-to-integer.patch | 120 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 2 files changed, 121 insertions(+)

diff --git a/debian/patches/0001-Fix-overflowing-casts-from-pointer-to-integer.patch b/debian/patches/0001-Fix-overflowing-casts-from-pointer-to-integer.patch
new file mode 100644
index 0000000..10ff5a5
--- /dev/null
+++ b/debian/patches/0001-Fix-overflowing-casts-from-pointer-to-integer.patch
@@ -0,0 +1,120 @@
+From 5e57fc339478e5204d0465b63ff5a5e927a565ad Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni at debian.org>
+Date: Wed, 7 Dec 2016 00:02:25 +0200
+Subject: [PATCH] Fix overflowing casts from pointer to integer
+
+This fixes test failures on 64-bit platforms using memory addresses over
+2**32, like those where Perl is built as PIE (position independent
+executable).
+
+Bug-Debian: https://bugs.debian.org/846731
+Forwarded: https://rt.cpan.org/Ticket/Display.html?id=119205
+Bug: https://rt.cpan.org/Ticket/Display.html?id=119205
+
+---
+ SCF.xs | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/SCF.xs b/SCF.xs
+index a55879b..10a88bd 100644
+--- a/SCF.xs
++++ b/SCF.xs
+@@ -54,7 +54,7 @@ char *file_name
+ 	/* Reading SCF file, into internal structure */
+ 	if ( (scf_data = read_scf(file_name)) == NULL )
+ 		croak("get_scf_pointer(...) : failed on read_scf(%s)\n", file_name);
+-	ret_val = newSViv((int)scf_data);
++	ret_val = newSViv(PTR2IV(scf_data));
+ 	RETVAL = ret_val;
+ 	OUTPUT:
+ 	RETVAL
+@@ -77,20 +77,20 @@ FILE *file_handle
+ 	        croak("get_scf_fpointer(...) : failed on mfreopen(...)\n");
+ 	if ( (scf_data = mfread_scf(mf)) == NULL )
+ 		croak("get_scf_fpointer(...) : failed on fread_scf(...)\n");
+-	ret_val = newSViv((int)scf_data);
++	ret_val = newSViv(PTR2IV(scf_data));
+ 	RETVAL = ret_val;
+ 	OUTPUT:
+ 	RETVAL
+ 
+ void
+ scf_free(scf_pointer)
+-int scf_pointer
++long scf_pointer
+ CODE:
+ 	scf_deallocate((Scf *)scf_pointer);
+ 
+ SV *
+ get_comments(scf_pointer)
+-int scf_pointer
++long scf_pointer
+ 	CODE:
+ 	Scf *scf_data = (Scf *)scf_pointer;
+ 	SV *ret_val;
+@@ -102,7 +102,7 @@ int scf_pointer
+ 
+ void
+ set_comments(scf_pointer, comments)
+-int scf_pointer
++long scf_pointer
+ char *comments
+ 	CODE:
+ 	Scf *scf_data = (Scf *)scf_pointer;
+@@ -115,7 +115,7 @@ char *comments
+ 
+ SV * 
+ scf_write(scf_pointer, file_name)
+-int scf_pointer
++long scf_pointer
+ char *file_name
+ 	CODE:
+ 	Scf *scf_data = (Scf *)scf_pointer;
+@@ -129,7 +129,7 @@ char *file_name
+ 	
+ SV * 
+ scf_fwrite(scf_pointer, file_handle)
+-int scf_pointer
++long scf_pointer
+ FILE *file_handle
+ 	CODE:
+         mFILE *mf;
+@@ -152,7 +152,7 @@ FILE *file_handle
+ 
+ SV *
+ get_from_header(scf_pointer, what)
+-int scf_pointer
++long scf_pointer
+ int what
+ 	CODE:
+ 	/* what = { 0 samples, 1 bases, 2 version, 3 sample size, 4 code_set } */
+@@ -176,7 +176,7 @@ int what
+ 
+ SV *
+ get_at(scf_pointer, index, what)
+-int scf_pointer
++long scf_pointer
+ int index
+ int what
+ 	CODE:
+@@ -234,7 +234,7 @@ int what
+ 
+ void 
+ set_base_at(scf_pointer, index, what, value)
+-int scf_pointer
++long scf_pointer
+ int index
+ int what
+ char value
+@@ -247,7 +247,7 @@ char value
+ 
+ void
+ set_at(scf_pointer, index, what, value)
+-int scf_pointer
++long scf_pointer
+ int index
+ int what
+ unsigned int value
+-- 
+2.10.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 5299247..e04d34a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 spelling.patch
+0001-Fix-overflowing-casts-from-pointer-to-integer.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libbio-scf-perl.git



More information about the Pkg-perl-cvs-commits mailing list