jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

retroshare: patch for libmicrohttpd >=0.9.71

Browse source
This commit is contained in:
Morgan Thomas 2021-05-04 08:47:12 -07:00 committed by Érico Nogueira
parent a6f4c6166b
commit bdd8730b20
2 changed files with 97 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
srcpkgs/retroshare/patches/mhd_result_enum.patch Normal file
View file

@ -0,0 +1,96 @@
--- libresapi/src/api/ApiServerMHD.cpp.orig 2021-05-04 08:25:21.960601037 -0700
+++ libresapi/src/api/ApiServerMHD.cpp 2021-05-04 08:26:27.071424663 -0700
@@ -113,7 +113,7 @@
// return MHD_NO to terminate connection
// return MHD_YES otherwise
// this function will get called by MHD until a response was queued
- virtual int handleRequest( struct MHD_Connection *connection,
+ virtual enum MHD_Result handleRequest( struct MHD_Connection *connection,
const char *url, const char *method, const char *version,
const char *upload_data, size_t *upload_data_size) = 0;
};
@@ -125,7 +125,7 @@
MHDUploadHandler(ApiServer* s): mState(BEGIN), mApiServer(s){}
virtual ~MHDUploadHandler(){}
// return MHD_NO or MHD_YES
- virtual int handleRequest( struct MHD_Connection *connection,
+ virtual enum MHD_Result handleRequest( struct MHD_Connection *connection,
const char */*url*/, const char *method, const char */*version*/,
const char *upload_data, size_t *upload_data_size)
{
@@ -184,7 +184,7 @@
MHDApiHandler(ApiServer* s): mState(BEGIN), mApiServer(s){}
virtual ~MHDApiHandler(){}
// return MHD_NO or MHD_YES
- virtual int handleRequest( struct MHD_Connection *connection,
+ virtual enum MHD_Result handleRequest( struct MHD_Connection *connection,
const char *url, const char *method, const char */*version*/,
const char *upload_data, size_t *upload_data_size)
{
@@ -265,7 +265,7 @@
uint64_t mSize;
// return MHD_NO or MHD_YES
- virtual int handleRequest( struct MHD_Connection *connection,
+ virtual enum MHD_Result handleRequest( struct MHD_Connection *connection,
const char *url, const char */*method*/, const char */*version*/,
const char */*upload_data*/, size_t */*upload_data_size*/)
{
@@ -327,7 +327,7 @@
#endif // ENABLE_FILESTREAMER
// MHD will call this for each element of the http header
-static int _extract_host_header_it_cb(void *cls,
+static enum MHD_Result _extract_host_header_it_cb(void *cls,
enum MHD_ValueKind kind,
const char *key,
const char *value)
@@ -522,12 +522,12 @@
mDaemon = 0;
}
-int ApiServerMHD::static_acceptPolicyCallback(void *cls, const sockaddr *addr, socklen_t addrlen)
+enum MHD_Result ApiServerMHD::static_acceptPolicyCallback(void *cls, const sockaddr *addr, socklen_t addrlen)
{
return ((ApiServerMHD*)cls)->acceptPolicyCallback(addr, addrlen);
}
-int ApiServerMHD::static_accessHandlerCallback(void* cls, struct MHD_Connection * connection,
+enum MHD_Result ApiServerMHD::static_accessHandlerCallback(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)
@@ -543,13 +543,13 @@
}
-int ApiServerMHD::acceptPolicyCallback(const sockaddr* /*addr*/, socklen_t /*addrlen*/)
+enum MHD_Result ApiServerMHD::acceptPolicyCallback(const sockaddr* /*addr*/, socklen_t /*addrlen*/)
{
// accept all connetions
return MHD_YES;
}
-int ApiServerMHD::accessHandlerCallback(MHD_Connection *connection,
+enum MHD_Result ApiServerMHD::accessHandlerCallback(MHD_Connection *connection,
const char *url, const char *method, const char *version,
const char *upload_data, size_t *upload_data_size,
void **con_cls)
--- libresapi/src/api/ApiServerMHD.h.orig 2021-05-04 08:25:24.368594515 -0700
+++ libresapi/src/api/ApiServerMHD.h 2021-05-04 08:25:25.942590251 -0700
@@ -58,11 +58,11 @@
private:
// static callbacks for libmicrohttpd, they call the members below
- static int static_acceptPolicyCallback(void* cls, const struct sockaddr * addr, socklen_t addrlen);
- static int static_accessHandlerCallback(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 enum MHD_Result static_acceptPolicyCallback(void* cls, const struct sockaddr * addr, socklen_t addrlen);
+ static enum MHD_Result static_accessHandlerCallback(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 void static_requestCompletedCallback(void *cls, struct MHD_Connection* connection, void **con_cls, enum MHD_RequestTerminationCode toe);
- int acceptPolicyCallback(const struct sockaddr * addr, socklen_t addrlen);
- int accessHandlerCallback(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);
+ enum MHD_Result acceptPolicyCallback(const struct sockaddr * addr, socklen_t addrlen);
+ enum MHD_Result accessHandlerCallback(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);
void requestCompletedCallback(struct MHD_Connection *connection, void **con_cls, MHD_RequestTerminationCode toe);
bool mConfigOk;
std::string mRootDir;

2
srcpkgs/retroshare/template
View file

@ -1,7 +1,7 @@
# Template file for 'retroshare'
pkgname=retroshare
version=0.6.5
revision=5
revision=6
wrksrc="RetroShare-${version}"
build_style=qmake
configure_args="RS_UPNP_LIB=miniupnpc"