Control: tags 964592 + patch Control: tags 964592 + pending
Dear maintainer,
I'm sponsoring an NMU prepared by Baptiste Beauplat for libjson-rpc-cpp
(versioned as 0.7.0-1.1) and uploaded it to DELAYED/2.
Please feel free to tell me if I should delay it longer.
Regards.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
More about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for libjson-rpc-cpp-0.7.0 libjson-rpc-cpp-0.7.0
changelog | 8 +
control | 4
patches/0002-Fix-FTBFS-with-libmicrohttpd-0.9.71.patch | 77 +++++++++++++++++
patches/series | 1
4 files changed, 88 insertions(+), 2 deletions(-)
diff -Nru libjson-rpc-cpp-0.7.0/debian/changelog libjson-rpc-cpp-0.7.0/debian/changelog
--- libjson-rpc-cpp-0.7.0/debian/changelog 2016-08-16 10:20:11.000000000 +0200
+++ libjson-rpc-cpp-0.7.0/debian/changelog 2020-10-08 22:45:52.000000000 +0200
@@ -1,3 +1,11 @@
+libjson-rpc-cpp (0.7.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with libmicrohttpd 0.9.71 (Closes: #964592)
+ * debian/control: Requires libmicrohttpd-dev (>= 0.9.71)
+
+ -- Baptiste Beauplat <lykn...@cilg.org> Thu, 08 Oct 2020 22:45:52 +0200
+
libjson-rpc-cpp (0.7.0-1) unstable; urgency=medium
* Imported Upstream version 0.7.0
diff -Nru libjson-rpc-cpp-0.7.0/debian/control libjson-rpc-cpp-0.7.0/debian/control
--- libjson-rpc-cpp-0.7.0/debian/control 2016-08-16 10:20:11.000000000 +0200
+++ libjson-rpc-cpp-0.7.0/debian/control 2020-10-08 22:45:52.000000000 +0200
@@ -7,7 +7,7 @@
libargtable2-dev,
libcurl4-openssl-dev | libcurl4-nss-dev,
libjsoncpp-dev,
- libmicrohttpd-dev
+ libmicrohttpd-dev (>= 0.9.71)
Standards-Version: 3.9.8.0
Section: libs
Homepage: https://github.com/cinemast/libjson-rpc-cpp
@@ -200,7 +200,7 @@
libjsonrpccpp-common0 (= ${binary:Version}),
libjsonrpccpp-server0 (= ${binary:Version}),
libjsonrpccpp-stub0 (= ${binary:Version}),
- libmicrohttpd-dev,
+ libmicrohttpd-dev (>= 0.9.71),
${misc:Depends}
Description: development files for JSON-RPC C++ framework
This package provides all required developer resources like header-files
diff -Nru libjson-rpc-cpp-0.7.0/debian/patches/0002-Fix-FTBFS-with-libmicrohttpd-0.9.71.patch libjson-rpc-cpp-0.7.0/debian/patches/0002-Fix-FTBFS-with-libmicrohttpd-0.9.71.patch
--- libjson-rpc-cpp-0.7.0/debian/patches/0002-Fix-FTBFS-with-libmicrohttpd-0.9.71.patch 1970-01-01 01:00:00.000000000 +0100
+++ libjson-rpc-cpp-0.7.0/debian/patches/0002-Fix-FTBFS-with-libmicrohttpd-0.9.71.patch 2020-10-08 22:45:52.000000000 +0200
@@ -0,0 +1,77 @@
+From: Baptiste Beauplat <lykn...@cilg.org>
+Date: Thu, 8 Oct 2020 22:44:11 +0200
+Subject: Fix FTBFS with libmicrohttpd 0.9.71
+
+Closes: #964592
+Bug: https://github.com/cinemast/libjson-rpc-cpp/issues/298
+---
+ src/jsonrpccpp/server/connectors/httpserver.cpp | 2 +-
+ src/jsonrpccpp/server/connectors/httpserver.h | 2 +-
+ src/test/testhttpserver.cpp | 4 ++--
+ src/test/testhttpserver.h | 4 ++--
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/jsonrpccpp/server/connectors/httpserver.cpp b/src/jsonrpccpp/server/connectors/httpserver.cpp
+index 40d3c5e..d1bad41 100644
+--- a/src/jsonrpccpp/server/connectors/httpserver.cpp
++++ b/src/jsonrpccpp/server/connectors/httpserver.cpp
+@@ -119,7 +119,7 @@ void HttpServer::SetUrlHandler(const string &url, IClientConnectionHandler *hand
+ this->SetHandler(NULL);
+ }
+
+-int HttpServer::callback(void *cls, MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls)
++MHD_Result HttpServer::callback(void *cls, MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls)
+ {
+ (void)version;
+ if (*con_cls == NULL)
+diff --git a/src/jsonrpccpp/server/connectors/httpserver.h b/src/jsonrpccpp/server/connectors/httpserver.h
+index 075962c..0f66423 100644
+--- a/src/jsonrpccpp/server/connectors/httpserver.h
++++ b/src/jsonrpccpp/server/connectors/httpserver.h
+@@ -71,7 +71,7 @@ namespace jsonrpc
+
+ std::map<std::string, IClientConnectionHandler*> urlhandler;
+
+- static int callback(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls);
++ static MHD_Result callback(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls);
+
+ IClientConnectionHandler* GetHandler(const std::string &url);
+
+diff --git a/src/test/testhttpserver.cpp b/src/test/testhttpserver.cpp
+index 7e240a6..c31440a 100644
+--- a/src/test/testhttpserver.cpp
++++ b/src/test/testhttpserver.cpp
+@@ -47,7 +47,7 @@ std::string TestHttpServer::GetHeader(const std::string &key)
+ return "";
+ }
+
+-int TestHttpServer::callback(void *cls, MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls)
++MHD_Result TestHttpServer::callback(void *cls, MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls)
+ {
+ (void)upload_data;
+ (void)upload_data_size;
+@@ -73,7 +73,7 @@ int TestHttpServer::callback(void *cls, MHD_Connection *connection, const char *
+ return MHD_YES;
+ }
+
+-int TestHttpServer::header_iterator(void *cls, MHD_ValueKind kind, const char *key, const char *value)
++MHD_Result TestHttpServer::header_iterator(void *cls, MHD_ValueKind kind, const char *key, const char *value)
+ {
+ (void)kind;
+ TestHttpServer* _this = static_cast<TestHttpServer*>(cls);
+diff --git a/src/test/testhttpserver.h b/src/test/testhttpserver.h
+index 5521e11..9545aee 100644
+--- a/src/test/testhttpserver.h
++++ b/src/test/testhttpserver.h
+@@ -36,9 +36,9 @@ namespace jsonrpc {
+ std::map<std::string,std::string> headers;
+ std::string response;
+
+- static int callback(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls);
++ static MHD_Result callback(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls);
+
+- static int header_iterator (void *cls, enum MHD_ValueKind kind, const char *key, const char *value);
++ static MHD_Result header_iterator (void *cls, enum MHD_ValueKind kind, const char *key, const char *value);
+ };
+
+ } // namespace jsonrpc
diff -Nru libjson-rpc-cpp-0.7.0/debian/patches/series libjson-rpc-cpp-0.7.0/debian/patches/series
--- libjson-rpc-cpp-0.7.0/debian/patches/series 2016-08-16 10:20:11.000000000 +0200
+++ libjson-rpc-cpp-0.7.0/debian/patches/series 2020-10-08 22:45:52.000000000 +0200
@@ -1 +1,2 @@
0001-Fix-spelling-mistakes.patch
+0002-Fix-FTBFS-with-libmicrohttpd-0.9.71.patch
signature.asc
Description: PGP signature
