--- Begin Message ---
Package: libiscsi
Severity: minor
Usertags: clang-ftbfs
User: [email protected]
Tag: patch
Hello,
Using the rebuild infrastructure, your package fails to build with clang
(instead of gcc).
Thanks,
Arthur
diff -Naur libiscsi.orig/libiscsi-1.11.0/debian/changelog libiscsi/libiscsi-1.11.0/debian/changelog
--- libiscsi.orig/libiscsi-1.11.0/debian/changelog 2014-07-05 11:24:22.535536087 -0500
+++ libiscsi/libiscsi-1.11.0/debian/changelog 2014-07-05 11:32:48.058692705 -0500
@@ -1,3 +1,15 @@
+libiscsi (1.11.0-5) unstable; urgency=low
+
+ * Fix FTBFS with clang
+ - Fixed "always true" & "empty body" errors in
+ examples/iscsi-dd.c
+ examples/ld_iscsi.c
+ test-tool/iscsi-support.c
+ test-tool/test_preventallow_cold_reset.c
+ utils/iscsi-swp.c
+
+ -- Arthur Marble <[email protected]> Sat, 05 Jul 2014 11:32:48 -0500
+
libiscsi (1.11.0-4) unstable; urgency=medium
* test-tool-0430-cast.diff : fix "cast increases required alignment"
diff -Naur libiscsi.orig/libiscsi-1.11.0/debian/patches/clang-ftbfs.diff libiscsi/libiscsi-1.11.0/debian/patches/clang-ftbfs.diff
--- libiscsi.orig/libiscsi-1.11.0/debian/patches/clang-ftbfs.diff 1969-12-31 18:00:00.000000000 -0600
+++ libiscsi/libiscsi-1.11.0/debian/patches/clang-ftbfs.diff 2014-07-05 11:31:25.285589156 -0500
@@ -0,0 +1,113 @@
+Index: libiscsi-1.11.0/utils/iscsi-swp.c
+===================================================================
+--- libiscsi-1.11.0.orig/utils/iscsi-swp.c
++++ libiscsi-1.11.0/utils/iscsi-swp.c
+@@ -162,12 +162,10 @@ int main(int argc, char *argv[])
+ iscsi_set_session_type(iscsi, ISCSI_SESSION_NORMAL);
+ iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
+
+- if (iscsi_url->user != NULL) {
+- if (iscsi_set_initiator_username_pwd(iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
+- fprintf(stderr, "Failed to set initiator username and password\n");
+- ret = 10;
+- goto finished;
+- }
++ if (iscsi_set_initiator_username_pwd(iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
++ fprintf(stderr, "Failed to set initiator username and password\n");
++ ret = 10;
++ goto finished;
+ }
+
+ if (iscsi_full_connect_sync(iscsi, iscsi_url->portal, iscsi_url->lun) != 0) {
+Index: libiscsi-1.11.0/test-tool/iscsi-support.c
+===================================================================
+--- libiscsi-1.11.0.orig/test-tool/iscsi-support.c
++++ libiscsi-1.11.0/test-tool/iscsi-support.c
+@@ -115,13 +115,11 @@ iscsi_context_login(const char *initiato
+ iscsi_set_session_type(iscsi, ISCSI_SESSION_NORMAL);
+ iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
+
+- if (iscsi_url->user != NULL) {
+- if (iscsi_set_initiator_username_pwd(iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
+- fprintf(stderr, "Failed to set initiator username and password\n");
+- iscsi_destroy_url(iscsi_url);
+- iscsi_destroy_context(iscsi);
+- return NULL;
+- }
++ if (iscsi_set_initiator_username_pwd(iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
++ fprintf(stderr, "Failed to set initiator username and password\n");
++ iscsi_destroy_url(iscsi_url);
++ iscsi_destroy_context(iscsi);
++ return NULL;
+ }
+
+ if (iscsi_full_connect_sync(iscsi, iscsi_url->portal, iscsi_url->lun) != 0) {
+Index: libiscsi-1.11.0/test-tool/test_preventallow_cold_reset.c
+===================================================================
+--- libiscsi-1.11.0.orig/test-tool/test_preventallow_cold_reset.c
++++ libiscsi-1.11.0/test-tool/test_preventallow_cold_reset.c
+@@ -51,7 +51,6 @@ test_preventallow_cold_reset(void)
+ logging(LOG_VERBOSE, "Perform cold reset on target");
+ ret = iscsi_task_mgmt_target_cold_reset_sync(iscsic);
+ logging(LOG_VERBOSE, "Wait until all unit attentions clear");
+- while (testunitready(iscsic, tgt_lun) != 0);
+ CU_ASSERT_EQUAL(ret, 0);
+
+
+Index: libiscsi-1.11.0/examples/iscsi-dd.c
+===================================================================
+--- libiscsi-1.11.0.orig/examples/iscsi-dd.c
++++ libiscsi-1.11.0/examples/iscsi-dd.c
+@@ -207,11 +207,9 @@ int main(int argc, char *argv[])
+ iscsi_set_targetname(client.src_iscsi, iscsi_url->target);
+ iscsi_set_session_type(client.src_iscsi, ISCSI_SESSION_NORMAL);
+ iscsi_set_header_digest(client.src_iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
+- if (iscsi_url->user != NULL) {
+- if (iscsi_set_initiator_username_pwd(client.src_iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
+- fprintf(stderr, "Failed to set initiator username and password\n");
+- exit(10);
+- }
++ if (iscsi_set_initiator_username_pwd(client.src_iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
++ fprintf(stderr, "Failed to set initiator username and password\n");
++ exit(10);
+ }
+ if (iscsi_full_connect_sync(client.src_iscsi, iscsi_url->portal, iscsi_url->lun) != 0) {
+ fprintf(stderr, "Login Failed. %s\n", iscsi_get_error(client.src_iscsi));
+@@ -254,11 +252,9 @@ int main(int argc, char *argv[])
+ iscsi_set_targetname(client.dst_iscsi, iscsi_url->target);
+ iscsi_set_session_type(client.dst_iscsi, ISCSI_SESSION_NORMAL);
+ iscsi_set_header_digest(client.dst_iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
+- if (iscsi_url->user != NULL) {
+- if (iscsi_set_initiator_username_pwd(client.dst_iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
+- fprintf(stderr, "Failed to set initiator username and password\n");
+- exit(10);
+- }
++ if (iscsi_set_initiator_username_pwd(client.dst_iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
++ fprintf(stderr, "Failed to set initiator username and password\n");
++ exit(10);
+ }
+ if (iscsi_full_connect_sync(client.dst_iscsi, iscsi_url->portal, iscsi_url->lun) != 0) {
+ fprintf(stderr, "Login Failed. %s\n", iscsi_get_error(client.dst_iscsi));
+Index: libiscsi-1.11.0/examples/ld_iscsi.c
+===================================================================
+--- libiscsi-1.11.0.orig/examples/ld_iscsi.c
++++ libiscsi-1.11.0/examples/ld_iscsi.c
+@@ -96,13 +96,11 @@ int open(const char *path, int flags, mo
+ iscsi_set_session_type(iscsi, ISCSI_SESSION_NORMAL);
+ iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
+
+- if (iscsi_url->user != NULL) {
+- if (iscsi_set_initiator_username_pwd(iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
+- LD_ISCSI_DPRINTF(0,"Failed to set initiator username and password");
+- iscsi_destroy_context(iscsi);
+- errno = ENOMEM;
+- return -1;
+- }
++ if (iscsi_set_initiator_username_pwd(iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
++ LD_ISCSI_DPRINTF(0,"Failed to set initiator username and password");
++ iscsi_destroy_context(iscsi);
++ errno = ENOMEM;
++ return -1;
+ }
+
+ if (iscsi_full_connect_sync(iscsi, iscsi_url->portal, iscsi_url->lun) != 0) {
diff -Naur libiscsi.orig/libiscsi-1.11.0/debian/patches/series libiscsi/libiscsi-1.11.0/debian/patches/series
--- libiscsi.orig/libiscsi-1.11.0/debian/patches/series 2014-07-05 11:37:01.898350156 -0500
+++ libiscsi/libiscsi-1.11.0/debian/patches/series 2014-07-05 11:24:13.506979569 -0500
@@ -2,3 +2,4 @@
slist.h-undef-SLIST_REMOVE-747263.diff
format-string-int-on-32bit.diff
test-tool-0430-cast.diff
+clang-ftbfs.diff
--- End Message ---
