Package: release.debian.org
Severity: normal
Please unblock ykclient 2.8-2. Debdiff attached.
--
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are
diff -u ykclient-2.8/debian/rules ykclient-2.8/debian/rules
--- ykclient-2.8/debian/rules
+++ ykclient-2.8/debian/rules
@@ -20 +20,2 @@
-#override_dh_auto_test:
+override_dh_auto_test:
+ dh_auto_test -- CFLAGS="-DTEST_WITHOUT_INTERNET"
diff -u ykclient-2.8/debian/changelog ykclient-2.8/debian/changelog
--- ykclient-2.8/debian/changelog
+++ ykclient-2.8/debian/changelog
@@ -1,3 +1,12 @@
+ykclient (2.8-2) unstable; urgency=low
+
+ * Fix FTBFS on signed-char architectures. Thanks to Jakub Wilk for the
+ patch. Closes: #694804.
+ * Apply patch from Ubuntu to disable network for tests. Thanks to
+ Michael Terry for the patch. Closes: #682873
+
+ -- Tollef Fog Heen <tfh...@debian.org> Fri, 21 Dec 2012 19:48:28 +0100
+
ykclient (2.8-1) unstable; urgency=low
* New upstream release
only in patch2:
unchanged:
--- ykclient-2.8.orig/b64/cdecode.c
+++ ykclient-2.8/b64/cdecode.c
@@ -9,10 +9,11 @@
int base64_decode_value(char value_in)
{
- static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
+ static const signed char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
static const char decoding_size = sizeof(decoding);
+ if (value_in < 43) return -1;
value_in -= 43;
- if (value_in < 0 || value_in > decoding_size) return -1;
+ if (value_in > decoding_size) return -1;
return decoding[(int)value_in];
}
@@ -26,7 +27,7 @@
{
const char* codechar = code_in;
char* plainchar = plaintext_out;
- char fragment;
+ int fragment;
*plainchar = state_in->plainchar;
@@ -42,7 +43,7 @@
state_in->plainchar = *plainchar;
return plainchar - plaintext_out;
}
- fragment = (char)base64_decode_value(*codechar++);
+ fragment = base64_decode_value(*codechar++);
} while (fragment < 0);
*plainchar = (fragment & 0x03f) << 2;
case step_b:
@@ -53,7 +54,7 @@
state_in->plainchar = *plainchar;
return plainchar - plaintext_out;
}
- fragment = (char)base64_decode_value(*codechar++);
+ fragment = base64_decode_value(*codechar++);
} while (fragment < 0);
*plainchar++ |= (fragment & 0x030) >> 4;
*plainchar = (fragment & 0x00f) << 4;
@@ -65,7 +66,7 @@
state_in->plainchar = *plainchar;
return plainchar - plaintext_out;
}
- fragment = (char)base64_decode_value(*codechar++);
+ fragment = base64_decode_value(*codechar++);
} while (fragment < 0);
*plainchar++ |= (fragment & 0x03c) >> 2;
*plainchar = (fragment & 0x003) << 6;
@@ -77,7 +78,7 @@
state_in->plainchar = *plainchar;
return plainchar - plaintext_out;
}
- fragment = (char)base64_decode_value(*codechar++);
+ fragment = base64_decode_value(*codechar++);
} while (fragment < 0);
*plainchar++ |= (fragment & 0x03f);
}
