shishi-debian changelog rules patches/64bigendi...

[Simon Josefsson]

CVSROOT:        /sources/shishi
Module name:    shishi-debian
Changes by:     Simon Josefsson <jas>   12/08/01 21:59:02

Modified files:
        .              : changelog rules 
Added files:
        patches        : 64bigendian-ftbfs.diff 

Log message:
        Apply Aurelien's FTBFS patch. (closes: #670316)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/changelog?cvsroot=shishi&r1=1.135&r2=1.136
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/rules?cvsroot=shishi&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/patches/64bigendian-ftbfs.diff?cvsroot=shishi&rev=1.1

Patches:
Index: changelog
===================================================================
RCS file: /sources/shishi/shishi-debian/changelog,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- changelog   12 Mar 2012 19:37:31 -0000      1.135
+++ changelog   1 Aug 2012 21:59:01 -0000       1.136
@@ -1,3 +1,9 @@
+shishi (1.0.1-2) unstable; urgency=low
+
+  * Apply Aurelien's FTBFS patch. (closes: #670316)
+
+ -- Simon Josefsson <address@hidden>  Wed, 01 Aug 2012 23:55:05 +0200
+
 shishi (1.0.1-1) unstable; urgency=low
 
   * New upstream version.

Index: rules
===================================================================
RCS file: /sources/shishi/shishi-debian/rules,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- rules       22 Mar 2011 14:09:29 -0000      1.23
+++ rules       1 Aug 2012 21:59:01 -0000       1.24
@@ -4,6 +4,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_DH_MAKESHLIBS_ARGS_libshishi0 = -V'libshishi0 (>= $(DEB_UPSTREAM_VERSION))'
 DEB_DH_MAKESHLIBS_ARGS_libshisa0 = -V'libshisa0 (>= $(DEB_UPSTREAM_VERSION))'

Index: patches/64bigendian-ftbfs.diff
===================================================================
RCS file: patches/64bigendian-ftbfs.diff
diff -N patches/64bigendian-ftbfs.diff
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/64bigendian-ftbfs.diff      1 Aug 2012 21:59:02 -0000       1.1
@@ -0,0 +1,25 @@
+--- shishi-1.0.1.orig/db/file.c
++++ shishi-1.0.1/db/file.c
+@@ -435,7 +435,7 @@ read_key (Shisa * dbh,
+ 
+   memset (&tmpkey, 0, sizeof (tmpkey));
+ 
+-  rc = fscanf (fh, "%u %u %u %u %u %u", &tmpkey.etype, &tmpkey.keylen,
++  rc = fscanf (fh, "%u %zu %zu %zu %u %u", &tmpkey.etype, &tmpkey.keylen,
+              &tmpkey.saltlen, &tmpkey.str2keyparamlen, &passwdlen,
+              &tmpkey.priority);
+   if (rc != 5 && rc != 6)
+--- shishi-1.0.1.orig/lib/asn1.c
++++ shishi-1.0.1/lib/asn1.c
+@@ -124,8 +124,10 @@ shishi_asn1_read_inline (Shishi * handle
+                        const char *field, char *data, size_t * datalen)
+ {
+   int rc;
++  int tmp = (int) *datalen;
+ 
+-  rc = asn1_read_value (node, field, (unsigned char *) data, (int *) datalen);
++  rc = asn1_read_value (node, field, (unsigned char *) data, &tmp);
++  *datalen = tmp;
+   if (rc != ASN1_SUCCESS)
+     {
+       shishi_error_set (handle, asn1_strerror (rc));