r70622 - in /trunk/libauthen-sasl-cyrus-perl/debian: changelog patches/series patches/strlen-size

rra at users.alioth.debian.org rra at users.alioth.debian.org
Sun Mar 6 05:39:03 UTC 2011


Author: rra
Date: Sun Mar  6 05:38:50 2011
New Revision: 70622

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=70622
Log:
* Modify some type declarations in the XS code to ensure that data types
  match the size that Perl expects on 64-bit platforms.

Added:
    trunk/libauthen-sasl-cyrus-perl/debian/patches/strlen-size
Modified:
    trunk/libauthen-sasl-cyrus-perl/debian/changelog
    trunk/libauthen-sasl-cyrus-perl/debian/patches/series

Modified: trunk/libauthen-sasl-cyrus-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-sasl-cyrus-perl/debian/changelog?rev=70622&op=diff
==============================================================================
--- trunk/libauthen-sasl-cyrus-perl/debian/changelog (original)
+++ trunk/libauthen-sasl-cyrus-perl/debian/changelog Sun Mar  6 05:38:50 2011
@@ -1,3 +1,10 @@
+libauthen-sasl-cyrus-perl (0.13-server-7) UNRELEASED; urgency=low
+
+  * Modify some type declarations in the XS code to ensure that data types
+    match the size that Perl expects on 64-bit platforms.
+
+ -- Russ Allbery <rra at debian.org>  Sat, 05 Mar 2011 21:38:17 -0800
+
 libauthen-sasl-cyrus-perl (0.13-server-6) unstable; urgency=low
 
   * Change the internal module version to 0.13.1 as a Debian-specific

Modified: trunk/libauthen-sasl-cyrus-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-sasl-cyrus-perl/debian/patches/series?rev=70622&op=diff
==============================================================================
--- trunk/libauthen-sasl-cyrus-perl/debian/patches/series (original)
+++ trunk/libauthen-sasl-cyrus-perl/debian/patches/series Sun Mar  6 05:38:50 2011
@@ -3,3 +3,4 @@
 numeric-version
 generate-man-pages
 fix-pod-errors
+strlen-size

Added: trunk/libauthen-sasl-cyrus-perl/debian/patches/strlen-size
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-sasl-cyrus-perl/debian/patches/strlen-size?rev=70622&op=file
==============================================================================
--- trunk/libauthen-sasl-cyrus-perl/debian/patches/strlen-size (added)
+++ trunk/libauthen-sasl-cyrus-perl/debian/patches/strlen-size Sun Mar  6 05:38:50 2011
@@ -1,0 +1,71 @@
+Author: Russ Allbery <rra at debian.org>
+Description: Fix type mismatches on 64-bit platforms
+
+Change the data types used in the XS code for the module to ensure data
+types match Perl's expectations on 64-bit platforms.
+
+--- libauthen-sasl-cyrus-perl.orig/Cyrus.xs
++++ libauthen-sasl-cyrus-perl/Cyrus.xs
+@@ -195,7 +195,7 @@
+ 	This function executes the perl sub/code and returns the result
+ 	and its length.
+ */
+-int PerlCallbackSub (struct _perlcontext *cp, char **result, unsigned *len, AV *args)
++int PerlCallbackSub (struct _perlcontext *cp, char **result, Size_t *len, AV *args)
+ {
+ 	int rc = SASL_OK;
+ 
+@@ -937,7 +937,7 @@
+ {
+ 	char *key;
+ 	int count=0,i;
+-	long l;
++	I32 l;
+ #ifndef SASL2
+ 	// Missing SASL1 canonuser workaround
+ 	int canon=-1,auth=-1;
+@@ -1306,7 +1306,7 @@
+ 	const char *instring;
+ 	PREINIT:
+ 		int rc;
+-		unsigned outlen,inlen;
++		Size_t outlen,inlen;
+ #ifdef SASL2
+ 		const char *outstring = NULL;
+ #else
+@@ -1402,7 +1402,7 @@
+ 		const char *error=NULL;
+ #endif
+ 		int rc;
+-		unsigned int inlen, outlen=0;
++		Size_t inlen, outlen=0;
+ 	PPCODE:
+ 		if (sasl->error_code != SASL_CONTINUE)
+ 			XSRETURN_UNDEF;
+@@ -1454,7 +1454,7 @@
+     char *outstring=NULL;
+ #endif
+     int rc;
+-    unsigned int inlen, outlen=0;
++    Size_t int inlen, outlen=0;
+ 
+     if (sasl->error_code != SASL_CONTINUE)
+       XSRETURN_UNDEF;
+@@ -1624,7 +1624,7 @@
+     char *outstring=NULL;
+ #endif
+     int rc;
+-	unsigned int inlen, outlen=0;
++	Size_t int inlen, outlen=0;
+ 	if (sasl->error_code)
+ 		XSRETURN_UNDEF;
+ 
+@@ -1652,7 +1652,7 @@
+     char *outstring=NULL;
+ #endif
+     int rc;
+-    unsigned int inlen, outlen=0;
++    Size_t inlen, outlen=0;
+ 
+     if (sasl->error_code)
+        XSRETURN_UNDEF;




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