[PATCH] gnu: libmicrohttpd: Update to 0.9.71.

  • Done
  • quality assurance status badge
Details
3 participants
  • Tobias Geerinckx-Rice
  • Michael Rohleder
  • Mathieu Othacehe
Owner
unassigned
Submitted by
Michael Rohleder
Severity
normal

Debbugs page

Michael Rohleder wrote 5 years ago
(address . guix-patches@gnu.org)(name . Michael Rohleder)(address . mike@rohleder.de)
20200816020853.22735-1-mike@rohleder.de
* gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.71.
---
gnu/packages/gnunet.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
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
Mathieu Othacehe wrote 5 years ago
(name . Michael Rohleder)(address . mike@rohleder.de)(address . 42881-done@debbugs.gnu.org)
87y2mfyqrw.fsf@gnu.org
Toggle quote (2 lines)
> * gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.71.

Pushed, thanks,

Mathieu
Closed
Tobias Geerinckx-Rice wrote 5 years ago
(name . Michael Rohleder)(address . mike@rohleder.de)(address . 42881@debbugs.gnu.org)
87o8nblz58.fsf@nckx
Mornin' Michael,

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

This ‘patch’ release breaks dependents like ola & drawpile:
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,
^~~~~~~~~~~~~~~~~~~~~~~~~
Could you take a look?

Kind regards,

T G-R
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCXzj70wAKCRANsP+IT1Vt
eZikAP9Bl8eh5sejurFUHd1t8qf2/X3TdYpJ1SUIt4uEGheorAD/eULycpDmJau2
fwrkWX6z/VKNmHyB/oZFpzMsu6W4QQs=
=B/R1
-----END PGP SIGNATURE-----

Tobias Geerinckx-Rice wrote 5 years ago
(name . Tobias Geerinckx-Rice via Guix-patches)(address . guix-patches@gnu.org)
87lfienb9e.fsf@nckx
Tobias Geerinckx-Rice via Guix-patches via 写道：
Toggle quote (5 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCXzkIPQAKCRANsP+IT1Vt
edhnAQD1OqXdpjj+FBzSXTgK6HXuYiuo5ExUtHTSKySZgHIeaAEA2f78JGlavl7H
N8EHiiW/38OlWCNtTRbYw/afF6KDiwo=
=ovCA
-----END PGP SIGNATURE-----

Michael Rohleder wrote 5 years ago
(name . Tobias Geerinckx-Rice)(address . me@tobias.gr)(address . 42881@debbugs.gnu.org)
87d03qnu78.fsf@rohleder.de
Hey nckx,

Tobias Geerinckx-Rice 写道:
Toggle quote (3 lines)
>> * 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:
From f75982a23ccbf2089ac413e82888c584101e9525 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@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(-)

Toggle diff (29 lines)
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
--
Wer ununterbrochen vorwaertsmarschiert, steht die haelfte seines
Lebens auf einem Bein.
-----BEGIN PGP SIGNATURE-----

iQEyBAEBCAAdFiEEdV4t5dDVhcUueCgwfHr/vv7yyyUFAl85qFwACgkQfHr/vv7y
yyWXJwf4oWuVc8nhohwnVOL716eqhn8PYStBtPT/baJ4ddNVFJjmW6TyLrw54BuV
dBHzaK+HE8k0lWBCQV0FAEgGiUWQhVFuCQBfzrebRF7IAWL7uUNi+WEC20AHpDZX
MqYz4Y4hAfFKokvitkc9+/vuxb7Q3t4KWAJnU2J70aceytT8xO28NhQwRCC1vjB0
/HiUWLMkj1p9QLxa8tpnS4H2Vj5zmG9qF2alwHg4hn1vZt9L+ULHVzsII6OFCrEA
tbjeO7OrHdXGs0pUkXNQsBQyPhqK4LDA/GvOSMf90FPsSzpVXhtOoL+U0h5THgUn
r3AeLlpBNphomHjm4jC/7Xi0iEPX
=Js5s
-----END PGP SIGNATURE-----

?
Your comment

This issue is archived.

To comment on this conversation send an email to 42881@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 42881
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help