Bug#683575: unblock: shishi/1.0.1-2

[Aurelien Jarno]

Package: release.debian.org
Severity: normal
User: address@hidden
Usertags: unblock

shishi fails to build on 64-bit big endian architectures, and that includes
s390x. More info can be found in bug #670316.

Given it's a reverse dependency of inetutils, it's an important package 
if we want people to be able to switch from s390 to s390x with Wheezy so
that s390 can be removed from Jessie (like it was done for arm to armel).

Therefore would it be possible to

   unblock shishi/1.0.1-2

which fixes this FTBFS on s390x? It has been built on all architectures,
and that includes a testsuite. You'll find the debdiff below.

Thanks,
Aurelien


diff -Nru shishi-1.0.1/debian/changelog shishi-1.0.1/debian/changelog
--- shishi-1.0.1/debian/changelog       2012-03-12 20:36:12.000000000 +0100
+++ shishi-1.0.1/debian/changelog       2012-08-01 23:55:26.000000000 +0200
@@ -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.
diff -Nru shishi-1.0.1/debian/patches/64bigendian-ftbfs.diff 
shishi-1.0.1/debian/patches/64bigendian-ftbfs.diff
--- shishi-1.0.1/debian/patches/64bigendian-ftbfs.diff  1970-01-01 
01:00:00.000000000 +0100
+++ shishi-1.0.1/debian/patches/64bigendian-ftbfs.diff  2012-08-01 
23:37:32.000000000 +0200
@@ -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));
diff -Nru shishi-1.0.1/debian/rules shishi-1.0.1/debian/rules
--- shishi-1.0.1/debian/rules   2011-03-22 15:08:18.000000000 +0100
+++ shishi-1.0.1/debian/rules   2012-08-01 23:50:25.000000000 +0200
@@ -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))'

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: s390x

Kernel: Linux 3.2.0-3-s390x (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash