Github messages for voidlinux
 help / color / mirror / Atom feed
From: digitalagedragon <digitalagedragon@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] libmicrohttpd: update to 0.9.73
Date: Tue, 04 May 2021 17:52:57 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30676@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1891 bytes --]

There is a new pull request by digitalagedragon against master on the void-packages repository

https://github.com/digitalagedragon/void-packages libmicrohttpd
https://github.com/void-linux/void-packages/pull/30676

libmicrohttpd: update to 0.9.73
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

This has been in the pipeline for 6 months or so. `libmicrohttpd` 0.9.71 broke some existing C++ code, and by now most of the packages that depend on it have integrated to the new API. I've made sure every package that depends on `libmicrohttpd` compiles against 0.9.73.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30676.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libmicrohttpd-30676.patch --]
[-- Type: text/x-diff, Size: 10539 bytes --]

From 157044a35e9a6eca953900e02815ade0495cbc63 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Tue, 4 May 2021 08:41:33 -0700
Subject: [PATCH 1/3] libmicrohttpd: update to 0.9.73

This update breaks some C++ implementations (see
https://github.com/kismetwireless/kismet/issues/281 and
https://github.com/void-linux/void-packages/commit/05ed2cb76ba90544e9910e5dbbcabd19d97a1a99). I've
checked all the packages that depend on libmicrohttpd; all but two
(psensor and retroshare) build against libmicrohttpd >= 0.9.71 by now,
and those two are easy enough to patch.

The relevant change is just switching some API return types from `int`
to an enum with the same values, so there isn't any concern about ABI
compatibility with the change (and in fact it's only a warning on a C
compiler).
---
 srcpkgs/libmicrohttpd/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libmicrohttpd/template b/srcpkgs/libmicrohttpd/template
index fa988788d76d..f6f1e0824fc5 100644
--- a/srcpkgs/libmicrohttpd/template
+++ b/srcpkgs/libmicrohttpd/template
@@ -1,8 +1,7 @@
 # Template file for 'libmicrohttpd'
 pkgname=libmicrohttpd
-version=0.9.70
-reverts="0.9.71_1"
-revision=2
+version=0.9.73
+revision=1
 build_style=gnu-configure
 makedepends="libgcrypt-devel gnutls-devel libcurl-devel"
 short_desc="Library embedding HTTP server functionality"
@@ -10,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gnu.org/software/libmicrohttpd/"
 distfiles="${GNU_SITE}/libmicrohttpd/${pkgname}-${version}.tar.gz"
-checksum=90d0a3d396f96f9bc41eb0f7e8187796049285fabef82604acd4879590977307
+checksum=a37b2f1b88fd1bfe74109586be463a434d34e773530fc2a74364cfcf734c032e
 
 LDFLAGS=" -lgnutls"
 

From 18e71b6461bceeac0269dd284ebc248b6b113bf4 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Tue, 4 May 2021 08:45:41 -0700
Subject: [PATCH 2/3] psensor: patch for compatibility with libmicrohttpd >=
 0.9.71

---
 srcpkgs/psensor/patches/mhd_result_enum.patch | 11 +++++++++++
 srcpkgs/psensor/template                      |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/psensor/patches/mhd_result_enum.patch

diff --git a/srcpkgs/psensor/patches/mhd_result_enum.patch b/srcpkgs/psensor/patches/mhd_result_enum.patch
new file mode 100644
index 000000000000..133716066a07
--- /dev/null
+++ b/srcpkgs/psensor/patches/mhd_result_enum.patch
@@ -0,0 +1,11 @@
+--- src/server/server.c.orig    2021-05-03 14:22:41.152648985 -0700
++++ src/server/server.c 2021-05-03 14:23:00.865645454 -0700
+@@ -306,7 +306,7 @@
+                                               MHD_RESPMEM_MUST_FREE);
+ }
+
+-static int cbk_http_request(void *cls,
++static enum MHD_Result cbk_http_request(void *cls,
+                            struct MHD_Connection *connection,
+                            const char *url,
+                            const char *method,
diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template
index 67e810091579..b705541ed639 100644
--- a/srcpkgs/psensor/template
+++ b/srcpkgs/psensor/template
@@ -1,8 +1,9 @@
 # Template file for 'psensor'
 pkgname=psensor
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-configure
+disable_parallel_build=1
 hostmakedepends="pkg-config help2man glib-devel"
 makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel libsensors-devel libatasmart-devel libcurl-devel libnotify-devel libappindicator-devel libmicrohttpd-devel"
 depends="lm_sensors"

From 6af33461718066e33d0a06a9a6ce6b5fbfa95419 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Tue, 4 May 2021 08:47:12 -0700
Subject: [PATCH 3/3] retroshare: patch for compatibility with libmicrohttpd >=
 0.9.71

---
 .../retroshare/patches/mhd_result_enum.patch  | 96 +++++++++++++++++++
 srcpkgs/retroshare/template                   |  2 +-
 2 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/retroshare/patches/mhd_result_enum.patch

diff --git a/srcpkgs/retroshare/patches/mhd_result_enum.patch b/srcpkgs/retroshare/patches/mhd_result_enum.patch
new file mode 100644
index 000000000000..0da034802b7e
--- /dev/null
+++ b/srcpkgs/retroshare/patches/mhd_result_enum.patch
@@ -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;
diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 870bad191a35..e65594a4b16e 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -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"

             reply	other threads:[~2021-05-04 15:52 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-04 15:52 digitalagedragon [this message]
2021-05-04 15:54 ` [PR PATCH] [Updated] " digitalagedragon
2021-05-04 15:55 ` digitalagedragon
2021-05-04 16:50 ` ericonr
2021-05-04 18:49 ` [PR PATCH] [Updated] " digitalagedragon
2021-05-04 20:49 ` digitalagedragon
2021-05-04 20:51 ` digitalagedragon
2021-05-04 20:52 ` digitalagedragon
2021-05-25 17:40 ` digitalagedragon
2021-05-25 17:48 ` digitalagedragon
2021-05-25 17:53 ` digitalagedragon
2021-05-31 14:12 ` ericonr
2021-06-08  3:52 ` ericonr
2021-06-08  3:52 ` [PR PATCH] [Closed]: " ericonr

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30676@inbox.vuxu.org \
    --to=digitalagedragon@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).