From patchwork Sun Jul 5 11:15:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1323019 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B05hy4FfDz9sDX for ; Sun, 5 Jul 2020 21:15:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4FF3B886A7; Sun, 5 Jul 2020 11:15:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0luaoF9vJ-fS; Sun, 5 Jul 2020 11:15:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E3D20886A0; Sun, 5 Jul 2020 11:15:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 892201BF401 for ; Sun, 5 Jul 2020 11:15:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 843FB87E25 for ; Sun, 5 Jul 2020 11:15:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dzH3vgj8dQa7 for ; Sun, 5 Jul 2020 11:15:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout12.t-online.de (mailout12.t-online.de [194.25.134.22]) by whitealder.osuosl.org (Postfix) with ESMTPS id DB10586B19 for ; Sun, 5 Jul 2020 11:15:17 +0000 (UTC) Received: from fwd25.aul.t-online.de (fwd25.aul.t-online.de [172.20.26.130]) by mailout12.t-online.de (Postfix) with SMTP id 3F15E41A25AE; Sun, 5 Jul 2020 13:15:15 +0200 (CEST) Received: from fli4l.lan.fli4l (VUk0swZlZh2kAxkhwsdgT2QyXsjt6JGDAuR2xe1OwJeqOweVB3HcUha5MZdyk0LQcI@[79.214.205.138]) by fwd25.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1js2c6-13txiK0; Sun, 5 Jul 2020 13:15:14 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:42514) by fli4l.lan.fli4l with esmtp (Exim 4.92.3) (envelope-from ) id 1js2c5-0000cy-4z; Sun, 05 Jul 2020 13:15:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 5 Jul 2020 13:15:13 +0200 Message-Id: <20200705111513.1298364-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-ID: VUk0swZlZh2kAxkhwsdgT2QyXsjt6JGDAuR2xe1OwJeqOweVB3HcUha5MZdyk0LQcI X-TOI-EXPURGATEID: 150726::1593947714-00015F3A-A654A3E2/0/0 CLEAN NORMAL X-TOI-MSGID: 36a4afb9-a132-4430-b4e3-1d53d51787fa Subject: [Buildroot] [PATCH 1/1] package/systemd: fix build with libmicrohttpd 0.9.71 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E . MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Bernd Kuhls --- This patch belongs to series http://patchwork.ozlabs.org/project/buildroot/list/?series=187620 ...-Fix-build-with-libmicrohttpd-0.9.71.patch | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 package/systemd/0001-Fix-build-with-libmicrohttpd-0.9.71.patch diff --git a/package/systemd/0001-Fix-build-with-libmicrohttpd-0.9.71.patch b/package/systemd/0001-Fix-build-with-libmicrohttpd-0.9.71.patch new file mode 100644 index 0000000000..7c1cfe939b --- /dev/null +++ b/package/systemd/0001-Fix-build-with-libmicrohttpd-0.9.71.patch @@ -0,0 +1,71 @@ +From d17eabb1052e7c8c432331a7a782845e36164f01 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 30 Jun 2020 09:56:10 +0200 +Subject: [PATCH] =?UTF-8?q?Fix=20build=20with=20=C2=B5httpd=200.9.71?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The return type of callbacks was changed from int to an enum. + +Signed-off-by: Bernd Kuhls +[downloaded from upstream commit + https://github.com/systemd/systemd/commit/d17eabb1052e7c8c432331a7a782845e36164f01] +--- + src/journal-remote/journal-gatewayd.c | 4 ++-- + src/journal-remote/journal-remote-main.c | 2 +- + src/journal-remote/microhttpd-util.h | 6 ++++++ + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c +index 5177e0d1577..3ab7c98b0b5 100644 +--- a/src/journal-remote/journal-gatewayd.c ++++ b/src/journal-remote/journal-gatewayd.c +@@ -349,7 +349,7 @@ static int request_parse_range( + return 0; + } + +-static int request_parse_arguments_iterator( ++static mhd_result request_parse_arguments_iterator( + void *cls, + enum MHD_ValueKind kind, + const char *key, +@@ -796,7 +796,7 @@ static int request_handler_machine( + return MHD_queue_response(connection, MHD_HTTP_OK, response); + } + +-static int request_handler( ++static mhd_result request_handler( + void *cls, + struct MHD_Connection *connection, + const char *url, +diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c +index 69a111afead..f82d188a8c6 100644 +--- a/src/journal-remote/journal-remote-main.c ++++ b/src/journal-remote/journal-remote-main.c +@@ -253,7 +253,7 @@ static int process_http_upload( + return mhd_respond(connection, MHD_HTTP_ACCEPTED, "OK."); + }; + +-static int request_handler( ++static mhd_result request_handler( + void *cls, + struct MHD_Connection *connection, + const char *url, +diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h +index d90c6bbd4f1..4ca9a5c4f16 100644 +--- a/src/journal-remote/microhttpd-util.h ++++ b/src/journal-remote/microhttpd-util.h +@@ -47,6 +47,12 @@ + # define MHD_create_response_from_fd_at_offset64 MHD_create_response_from_fd_at_offset + #endif + ++#if MHD_VERSION >= 0x00097002 ++# define mhd_result enum MHD_Result ++#else ++# define mhd_result int ++#endif ++ + void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_(2, 0); + + /* respond_oom() must be usable with return, hence this form. */