From patchwork Wed Dec 27 10:01:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1880501 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T0RyW1dBfz1ydd for ; Wed, 27 Dec 2023 21:02:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id BDF0C81E65; Wed, 27 Dec 2023 10:02:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org BDF0C81E65 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YdODpS-Wdy40; Wed, 27 Dec 2023 10:02:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 836CC81E77; Wed, 27 Dec 2023 10:02:22 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 836CC81E77 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id EB9921BF263 for ; Wed, 27 Dec 2023 10:02:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id C469560BF7 for ; Wed, 27 Dec 2023 10:02:11 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org C469560BF7 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sxx4WshsfFsc for ; Wed, 27 Dec 2023 10:02:10 +0000 (UTC) Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by smtp3.osuosl.org (Postfix) with ESMTPS id 505D660B06 for ; Wed, 27 Dec 2023 10:02:10 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 505D660B06 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3367601a301so4975710f8f.2 for ; Wed, 27 Dec 2023 02:02:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703671327; x=1704276127; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Qi3iPXxJAQVKzuVJAsG/MkAUVoYTohNUESx+0FpuT+Y=; b=LrbwHtkNKuiIYTODg/wP4Er6/BeeqVSwbEHKheje5+w4ez50ZoTARbfx3ypPILoM7I o2dKuLx81IIhlSXPkQ3Qr4APiya6Vw1vyI5p+NI0gSWFDyeaqd4zOBs0sbdP4vKNxdVH XxzvfFFIuA33J8JBRGLmDXeMgSFFYjviEhEDANhn+Lvb+Kv+xnYPYC7jGMnGw/NjERZo 6ktO6CQ0TV6jN/sua8iE30lDKd6hp7e/blyvmAKB0HVWa4B77aA3UTMNoRu+KI/4w2gx CUAC9175asL5vEjammaP2M/Y7ijQmWyLl2pWi6B8mLa3gz0i9qZGQUQZIoin8rqv7X/k jtAw== X-Gm-Message-State: AOJu0YyxnvQpo8EIn+t8Iss5Aifbay8shsgt0Ga/AvhzTEM22vS0fyVR ndblpK6+l4KHvmUJ+90uNr/BIXK8WUM= X-Google-Smtp-Source: AGHT+IExo6weKDhaQE4rKvJ9m42Ig7Blrmntx3K3xtq+pBOJaZyNiQwV8UPytKbfjl5h8i637+jjZA== X-Received: by 2002:adf:f8cc:0:b0:336:5ec5:b2ef with SMTP id f12-20020adff8cc000000b003365ec5b2efmr3304998wrq.149.1703671327409; Wed, 27 Dec 2023 02:02:07 -0800 (PST) Received: from kali.home (lfbn-ren-1-787-165.w83-197.abo.wanadoo.fr. [83.197.114.165]) by smtp.gmail.com with ESMTPSA id bl13-20020adfe24d000000b003365fcc1846sm14423547wrb.52.2023.12.27.02.02.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 02:02:07 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 27 Dec 2023 11:01:58 +0100 Message-ID: <20231227100158.124316-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231227100158.124316-1-fontaine.fabrice@gmail.com> References: <20231227100158.124316-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703671327; x=1704276127; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Qi3iPXxJAQVKzuVJAsG/MkAUVoYTohNUESx+0FpuT+Y=; b=LZiUysKvqREYi3dt0SotcOde5N8xAearqfk5uEhqUcn4mjrRrA14cmlH39pPBue1JB MEifOXAGjzJpgMB7yDox6UFH8Rb6MIeY0ToC2j4QD86z90X/UEKQIGEOP/t8zklmLG1Q P+ExP7ibakP9xWHV00A4OANCzYKyawVmFyW6FGqkDLLmmHwN/4ZtRWc4CGVBpjH7LG8Z l2Tt7VQYcKDvdBpeNz9o39MCwIgVeJNnqCww9titv6ukhueG1T1fnG6Cpi2SC5YvUEZq Y+wN2oVb9YfKgPa5gYKoZOIt8ya2HxoiI3Zxel7l/TFdGsEK3xT5tJFlkGptKzeh2ojm IHlA== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=LZiUysKv Subject: [Buildroot] [PATCH 2/2] package/gupnp: bump to version 1.6.6 X-BeenThere: buildroot@buildroot.org 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: Fabrice Fontaine , Rahul Bedarkar Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" - Drop patches (already in version) - Add patch to fix build with libxml2 2.12 https://gitlab.gnome.org/GNOME/gupnp/-/blob/gupnp-1.6.6/NEWS Signed-off-by: Fabrice Fontaine --- .../0001-all-Drop-xmlRecoverMemory.patch | 113 ------------------ ...ix-compatibility-with-libxml2-2-12-x.patch | 84 +++++++++++++ ...properly-spell-provide-in-wrap-files.patch | 30 ----- package/gupnp/gupnp.hash | 4 +- package/gupnp/gupnp.mk | 4 +- 5 files changed, 88 insertions(+), 147 deletions(-) delete mode 100644 package/gupnp/0001-all-Drop-xmlRecoverMemory.patch create mode 100644 package/gupnp/0001-all-Fix-compatibility-with-libxml2-2-12-x.patch delete mode 100644 package/gupnp/0002-build-properly-spell-provide-in-wrap-files.patch diff --git a/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch b/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch deleted file mode 100644 index 46e09c267e..0000000000 --- a/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch +++ /dev/null @@ -1,113 +0,0 @@ -From c3d084736cca81dd4ec05f7e4b634050eb6e8525 Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Thu, 4 May 2023 19:14:29 +0200 -Subject: [PATCH] all: Drop xmlRecoverMemory - -use xmlReadMemory, also use NONET flat - -Upstream: https://gitlab.gnome.org/GNOME/gupnp/-/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d - -Signed-off-by: Bernd Kuhls -[Bernd: backported to branch gupnp-1.4] ---- - libgupnp/gupnp-control-point.c | 7 +++++-- - libgupnp/gupnp-service-info.c | 8 ++++++-- - libgupnp/gupnp-service-proxy-action.c | 7 +++++-- - libgupnp/gupnp-service-proxy.c | 7 +++++-- - libgupnp/gupnp-service.c | 7 +++++-- - 5 files changed, 26 insertions(+), 10 deletions(-) - -diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c -index deb4b42..17c485a 100644 ---- a/libgupnp/gupnp-control-point.c -+++ b/libgupnp/gupnp-control-point.c -@@ -613,8 +613,11 @@ got_description_url (SoupSession *session, - xmlDoc *xml_doc; - - /* Parse response */ -- xml_doc = xmlRecoverMemory (msg->response_body->data, -- msg->response_body->length); -+ xml_doc = xmlReadMemory (msg->response_body->data, -+ msg->response_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - if (xml_doc) { - doc = gupnp_xml_doc_new (xml_doc); - -diff --git a/libgupnp/gupnp-service-info.c b/libgupnp/gupnp-service-info.c -index 9a9f4de..1c7489e 100644 ---- a/libgupnp/gupnp-service-info.c -+++ b/libgupnp/gupnp-service-info.c -@@ -592,8 +592,12 @@ got_scpd_url (G_GNUC_UNUSED SoupSession *session, - if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { - xmlDoc *scpd; - -- scpd = xmlRecoverMemory (msg->response_body->data, -- msg->response_body->length); -+ scpd = xmlReadMemory (msg->response_body->data, -+ msg->response_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); -+ - if (scpd) { - introspection = gupnp_service_introspection_new (scpd); - -diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c -index f089152..079219f 100644 ---- a/libgupnp/gupnp-service-proxy-action.c -+++ b/libgupnp/gupnp-service-proxy-action.c -@@ -87,8 +87,11 @@ check_action_response (G_GNUC_UNUSED GUPnPServiceProxy *proxy, - } - - /* Parse response */ -- response = xmlRecoverMemory (action->msg->response_body->data, -- action->msg->response_body->length); -+ response = xmlReadMemory (action->msg->response_body->data, -+ action->msg->response_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - - if (!response) { - if (action->msg->status_code == SOUP_STATUS_OK) { -diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c -index 5dd1bfc..eed9882 100644 ---- a/libgupnp/gupnp-service-proxy.c -+++ b/libgupnp/gupnp-service-proxy.c -@@ -1561,8 +1561,11 @@ server_handler (G_GNUC_UNUSED SoupServer *soup_server, - } - - /* Parse the actual XML message content */ -- doc = xmlRecoverMemory (msg->request_body->data, -- msg->request_body->length); -+ doc = xmlReadMemory (msg->request_body->data, -+ msg->request_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - if (doc == NULL) { - /* Failed */ - g_warning ("Failed to parse NOTIFY message body"); -diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c -index 2794ebc..e82daaa 100644 ---- a/libgupnp/gupnp-service.c -+++ b/libgupnp/gupnp-service.c -@@ -1002,8 +1002,11 @@ control_server_handler (SoupServer *server, - *end = '\0'; - - /* Parse action_node */ -- doc = xmlRecoverMemory (msg->request_body->data, -- msg->request_body->length); -+ doc = xmlReadMemory (msg->request_body->data, -+ msg->request_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - if (doc == NULL) { - soup_message_set_status (msg, SOUP_STATUS_BAD_REQUEST); - --- -2.39.2 - diff --git a/package/gupnp/0001-all-Fix-compatibility-with-libxml2-2-12-x.patch b/package/gupnp/0001-all-Fix-compatibility-with-libxml2-2-12-x.patch new file mode 100644 index 0000000000..14f696ca80 --- /dev/null +++ b/package/gupnp/0001-all-Fix-compatibility-with-libxml2-2-12-x.patch @@ -0,0 +1,84 @@ +From 00514fb62ebd341803fa44e26a6482a8c25dbd34 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sat, 25 Nov 2023 17:56:02 +0100 +Subject: [PATCH] all: Fix compatibility with libxml2 2.12.x + +Upstream: https://gitlab.gnome.org/GNOME/gupnp/-/commit/00514fb62ebd341803fa44e26a6482a8c25dbd34 +Signed-off-by: Fabrice Fontaine +--- + libgupnp/gupnp-control-point.c | 2 ++ + libgupnp/gupnp-service-proxy-action.c | 2 ++ + libgupnp/gupnp-service-proxy.c | 2 ++ + libgupnp/gupnp-xml-doc.c | 3 +++ + libgupnp/xml-util.h | 2 ++ + 5 files changed, 11 insertions(+) + +diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c +index d4b44721..4374f726 100644 +--- a/libgupnp/gupnp-control-point.c ++++ b/libgupnp/gupnp-control-point.c +@@ -27,6 +27,8 @@ + #include + #include + ++#include ++ + #include "gupnp-control-point.h" + #include "gupnp-context-private.h" + #include "gupnp-resource-factory-private.h" +diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c +index b241d86c..6ea241ad 100644 +--- a/libgupnp/gupnp-service-proxy-action.c ++++ b/libgupnp/gupnp-service-proxy-action.c +@@ -9,6 +9,8 @@ + + #include + ++#include ++ + #include "gupnp-error.h" + #include "gupnp-service-proxy.h" + #include "gvalue-util.h" +diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c +index adba5ab0..3f1a4454 100644 +--- a/libgupnp/gupnp-service-proxy.c ++++ b/libgupnp/gupnp-service-proxy.c +@@ -16,6 +16,8 @@ + #include + #include + ++#include ++ + #include "gena-protocol.h" + #include "gupnp-context-private.h" + #include "gupnp-error-private.h" +diff --git a/libgupnp/gupnp-xml-doc.c b/libgupnp/gupnp-xml-doc.c +index 627f1a28..66f9b3dd 100644 +--- a/libgupnp/gupnp-xml-doc.c ++++ b/libgupnp/gupnp-xml-doc.c +@@ -15,6 +15,9 @@ + #include + #include + #include ++ ++#include ++ + #include "gupnp-xml-doc.h" + #include "gupnp-error.h" + +diff --git a/libgupnp/xml-util.h b/libgupnp/xml-util.h +index a02eb3d4..d0dcaeba 100644 +--- a/libgupnp/xml-util.h ++++ b/libgupnp/xml-util.h +@@ -10,6 +10,8 @@ + #define GUPNP_XML_UTIL_H + + #include ++#include ++ + #include + #include + +-- +GitLab + diff --git a/package/gupnp/0002-build-properly-spell-provide-in-wrap-files.patch b/package/gupnp/0002-build-properly-spell-provide-in-wrap-files.patch deleted file mode 100644 index 0632469a98..0000000000 --- a/package/gupnp/0002-build-properly-spell-provide-in-wrap-files.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 884639bd29323cbb8fbd36bc69d08097a2ae2cd1 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Sun, 9 Jul 2023 03:30:47 +0000 -Subject: [PATCH] build: properly spell [provide] in *.wrap files - -meson.build:1:0: ERROR: Unexpected "[provides]" section, did you mean "[provide]"? - -Upstream: https://gitlab.gnome.org/GNOME/gupnp/-/commit/884639bd29323cbb8fbd36bc69d08097a2ae2cd1 - -Signed-off-by: Bernd Kuhls -[Bernd: backported to branch gupnp-1.4] ---- - subprojects/gssdp-1.6.wrap | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/subprojects/gssdp-1.6.wrap b/subprojects/gssdp-1.6.wrap -index b0b6504..8adc1a2 100644 ---- a/subprojects/gssdp-1.2.wrap -+++ b/subprojects/gssdp-1.2.wrap -@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git - revision = gssdp-1.4 - depth = 1 - --[provides] -+[provide] - dependency_name = gssdp-1.2 - --- -GitLab - diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index 823dbd7927..b8a3fa082e 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.gnome.org/sources/gupnp/1.4/gupnp-1.4.3.sha256sum: -sha256 14eda777934da2df743d072489933bd9811332b7b5bf41626b8032efb28b33ba gupnp-1.4.3.tar.xz +# Hash from: https://download.gnome.org/sources/gupnp/1.6/gupnp-1.6.6.sha256sum: +sha256 c9dc50e8c78b3792d1b0e6c5c5f52c93e9345d3dae2891e311a993a574f5a04f gupnp-1.6.6.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index f41f26d2dd..cfcc114189 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -4,8 +4,8 @@ # ################################################################################ -GUPNP_VERSION_MAJOR = 1.4 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).3 +GUPNP_VERSION_MAJOR = 1.6 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).6 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = https://download.gnome.org/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.1+