GNU bug report logs - #42881
[PATCH] gnu: libmicrohttpd: Update to 0.9.71.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 42881 in the body.
You can then email your comments to 42881 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Michael Rohleder <mike <at> rohleder.de>
To: guix-patches <at> gnu.org
Cc: Michael Rohleder <mike <at> rohleder.de>
Subject: [PATCH] gnu: libmicrohttpd: Update to 0.9.71.
Date: Sun, 16 Aug 2020 04:08:53 +0200

* gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.71.
---
 gnu/packages/gnunet.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index d572d868ef..f321e624af 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -157,14 +157,14 @@ tool to extract metadata from a file and print the results.")
 (define-public libmicrohttpd
   (package
    (name "libmicrohttpd")
-   (version "0.9.70")
+   (version "0.9.71")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
                                 version ".tar.gz"))
             (sha256
              (base32
-              "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h"))))
+              "10mii4mifmfs3v7kgciqml7f0fj7ljp0sngrx64pnwmgbzl4bx78"))))
    (build-system gnu-build-system)
    (inputs
     `(("curl" ,curl)
-- 
2.28.0

Message #10 received at 42881-done <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Michael Rohleder <mike <at> rohleder.de>
Cc: 42881-done <at> debbugs.gnu.org
Subject: Re: [bug#42881] [PATCH] gnu: libmicrohttpd: Update to 0.9.71.
Date: Sun, 16 Aug 2020 09:49:07 +0200

> * gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.71.

Pushed, thanks,

Mathieu

Message #13 received at 42881 <at> debbugs.gnu.org (full text, mbox):

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Michael Rohleder <mike <at> rohleder.de>
Cc: 42881 <at> debbugs.gnu.org
Subject: Re: [bug#42881] [PATCH] gnu: libmicrohttpd: Update to 0.9.71.
Date: Sun, 16 Aug 2020 11:26:43 +0200

[Message part 1 (text/plain, inline)]

Mornin' Michael,

Michael Rohleder 写道：
> * gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.71.

This ‘patch’ release breaks dependents like ola & drawpile:

[Message part 2 (text/plain, inline)]

common/http/HTTPServer.cpp:221:76: error: invalid conversion from 
‘int (*)(void*, MHD_ValueKind, const char*, const char*)’ to 
‘MHD_KeyValueIterator {aka MHD_Result (*)(void*, MHD_ValueKind, 
const char*, const char*)}’ [-fperm>
  MHD_get_connection_values(m_connection, MHD_HEADER_KIND, 
  AddHeaders, this);
                                                                           ^
In file included from ./include/ola/http/HTTPServer.h:42:0,
                from common/http/HTTPServer.cpp:29:
/gnu/store/7pljqj4p04i8rb1zzlkcrx5jx2hc6yzv-libmicrohttpd-0.9.71/include/microhttpd.h:2697:1: 
note:   initializing argument 3 of ‘int 
MHD_get_connection_values(MHD_Connection*, MHD_ValueKind, 
MHD_KeyValueIterator, void*)’
MHD_get_connection_values (struct MHD_Connection *connection,
^~~~~~~~~~~~~~~~~~~~~~~~~

[Message part 3 (text/plain, inline)]

Could you take a look?

Kind regards,

T G-R

[signature.asc (application/pgp-signature, inline)]

Message #16 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Tobias Geerinckx-Rice via Guix-patches <guix-patches <at> gnu.org>
Cc: 42881 <at> debbugs.gnu.org, Michael Rohleder <mike <at> rohleder.de>
Subject: Re: [bug#42881] [PATCH] gnu: libmicrohttpd: Update to 0.9.71.
Date: Sun, 16 Aug 2020 12:19:41 +0200

[Message part 1 (text/plain, inline)]

Tobias Geerinckx-Rice via Guix-patches via 写道：
> Michael Rohleder 写道：
>> * gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.71.
>
> This ‘patch’ release breaks dependents like ola & drawpile:

I've updated OLA on master to a git snapshot that builds with this 
version.

Kind regards,

T G-R

[signature.asc (application/pgp-signature, inline)]

Message #22 received at 42881 <at> debbugs.gnu.org (full text, mbox):

From: Michael Rohleder <mike <at> rohleder.de>
To: Tobias Geerinckx-Rice <me <at> tobias.gr>
Cc: 42881 <at> debbugs.gnu.org
Subject: Re: [bug#42881] [PATCH] gnu: libmicrohttpd: Update to 0.9.71.
Date: Sun, 16 Aug 2020 23:42:51 +0200

[Message part 1 (text/plain, inline)]

Hey nckx,

Tobias Geerinckx-Rice 写道:
>> * gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.71.
> This ‘patch’ release breaks dependents like ola & drawpile:

uhm yes. I tested only some dependents like faust, wget2 and gnunet.
Thank you for patchig ola.

Please find this patch for drawpile:

[0001-gnu-drawpile-Build-with-libmicrohttpd-0.9.71.patch (text/x-patch, inline)]

From f75982a23ccbf2089ac413e82888c584101e9525 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike <at> rohleder.de>
Date: Sun, 16 Aug 2020 23:13:57 +0200
Subject: [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71.

* gnu/packages/graphics.scm (drawpile)[arguments]: Add patch phase.
---
 gnu/packages/graphics.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index c7fefbd57d..a5d6a8cad8 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1450,7 +1450,21 @@ Automated palette selection is supported.")
                 "08w8vad8pw4a8kkshys1kd2kjvzpj62klxxxp904rx0qazw5hl80"))))
     (build-system qt-build-system)
     (arguments
-     '(#:configure-flags (list "-DTESTS=ON" "-DTOOLS=ON" "-DKIS_TABLET=ON")))
+     '(#:configure-flags (list "-DTESTS=ON" "-DTOOLS=ON" "-DKIS_TABLET=ON")
+       #:phases
+       (modify-phases %standard-phases
+         ;; libmicrohttpd>=0.9.71 changed some results from int to MHD_Result.
+         (add-after 'unpack 'patch
+           (lambda _
+             (substitute* "src/thinsrv/webadmin/qmhttp.cpp"
+               (("^int assign_to_hash") "MHD_Result assign_to_hash")
+               (("^int access_policy") "MHD_Result access_policy")
+               (("^int iterate_post") "MHD_Result iterate_post")
+               (("^int request_handler") "MHD_Result request_handler")
+               (("int ret;") "MHD_Result ret;")
+               (("ret = MHD_queue_basic_auth_fail_response")
+                "ret = (MHD_Result) MHD_queue_basic_auth_fail_response"))
+             #t)))))
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)))
-- 
2.28.0

[Message part 3 (text/plain, inline)]

-- 
Wer ununterbrochen vorwaertsmarschiert, steht die haelfte seines
Lebens auf einem Bein.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.