Add patch use-EIO-instead-of-EREMOTEIO.patch,
authorgregor herrmann <gregoa@debian.org>
Fri, 28 Jun 2013 10:54:24 +0000 (12:54 +0200)
committergregor herrmann <gregoa@debian.org>
Fri, 28 Jun 2013 10:54:24 +0000 (12:54 +0200)
taken from upstream git.

Closes: #714335

debian/patches/series
debian/patches/use-EIO-instead-of-EREMOTEIO.patch [new file with mode: 0644]

index 678270d..08f0fd1 100644 (file)
@@ -1,3 +1,4 @@
 manpage-debian.patch
 json-c.patch
 spelling.patch
+use-EIO-instead-of-EREMOTEIO.patch
diff --git a/debian/patches/use-EIO-instead-of-EREMOTEIO.patch b/debian/patches/use-EIO-instead-of-EREMOTEIO.patch
new file mode 100644 (file)
index 0000000..c7540e5
--- /dev/null
@@ -0,0 +1,66 @@
+Origin: upstream git, https://github.com/gregkh/bti
+Bug-Debian: http://bugs.debian.org/714335
+Reviewed-by: gregor herrmann <gregoa@debian.org>
+Last-Update: 2013-06-28
+
+From 7dc7db4f2b52a02f9fd960e0980b33082f65883c Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 27 Jun 2013 20:13:09 -0700
+Subject: [PATCH] use -EIO instead of -EREMOTEIO
+
+The BSDs don't have EREMOTEIO, and all we really care about is an error
+occurred, so use one that all systems should have.
+---
+ bti.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/bti.c b/bti.c
+index 3138e02..f8cc151 100644
+--- a/bti.c
++++ b/bti.c
+@@ -685,7 +685,7 @@ static int parse_response_json(char *document, struct session *session)
+                               results.code, results.message);
+               fprintf(stderr, "error condition detected: %d = %s\n",
+                       results.code, results.message);
+-              return -EREMOTEIO;
++              return -EIO;
+       }
+       return 0;
+ }
+@@ -727,13 +727,13 @@ static int parse_response_xml(char *document, struct session *session)
+                               "response.xml", NULL,
+                               XML_PARSE_NOERROR);
+       if (doc == NULL)
+-              return -EREMOTEIO;
++              return -EIO;
+       current = xmlDocGetRootElement(doc);
+       if (current == NULL) {
+               fprintf(stderr, "empty document\n");
+               xmlFreeDoc(doc);
+-              return -EREMOTEIO;
++              return -EIO;
+       }
+       if (xmlStrcmp(current->name, (const xmlChar *) "status")) {
+@@ -742,7 +742,7 @@ static int parse_response_xml(char *document, struct session *session)
+                               && xmlStrcmp(current->name, (const xmlChar *) "errors")) {
+                               fprintf(stderr, "unexpected document type\n");
+                               xmlFreeDoc(doc);
+-                              return -EREMOTEIO;
++                              return -EIO;
+                       } else {
+                               xmlChar *text=NULL;
+                               while (current != NULL) {
+@@ -764,7 +764,7 @@ static int parse_response_xml(char *document, struct session *session)
+                                       fprintf(stderr, "unknown error condition\n");
+                               xmlFreeDoc(doc);
+-                              return -EREMOTEIO;
++                              return -EIO;
+                       }
+               }
+       }
+-- 
+1.8.1.6
+