+++ /dev/null
-Description: adjust to json-c in Debian
-Origin: vendor
-Forwarded: not-needed
-Author: gregor herrmann <gregoa@debian.org>
-Last-Update: 2013-12-08
-Applied: https://github.com/gregkh/bti/commit/97903ba5504223b7177cfe23292d49ae577e1665
-
---- a/bti.c
-+++ b/bti.c
-@@ -32,7 +32,7 @@
- #include <libxml/xmlmemory.h>
- #include <libxml/parser.h>
- #include <libxml/tree.h>
--#include <json/json.h>
-+#include <json-c/json.h>
- #include <pcre.h>
- #include <termios.h>
- #include <dlfcn.h>
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,7 +18,7 @@
- PKG_CHECK_MODULES(LIBPCRE, libpcre)
- PKG_CHECK_MODULES([LIBCURL], [libcurl])
- PKG_CHECK_MODULES([XML], [libxml-2.0])
--PKG_CHECK_MODULES([JSON], [json])
-+PKG_CHECK_MODULES([JSON], [json-c])
-
- AC_SEARCH_LIBS([dlopen], [dl])
-
+++ /dev/null
-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
-