Hardening fix was applied 1.2.7 =====
- Fix build with -Wformat-security=error - Bump required GLib version to 2.66 - Fix some introspection annotations - Add missing varargs functions to vapi - Revert fix from 1.2.5 which causes managed control points to live too long Signed-off-by: Andreas Müller <[email protected]> --- ...x-build-with-hardened-security-flags.patch | 61 ------------------- .../recipes-connectivity/gupnp/gupnp_1.2.6.bb | 10 --- .../recipes-connectivity/gupnp/gupnp_1.2.7.bb | 7 +++ 3 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.7.bb diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch deleted file mode 100644 index ef0c945d0..000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 6eba07bd195e0a1199a0fc62d7cc31ec376bc3dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> -Date: Mon, 31 May 2021 17:44:29 +0200 -Subject: [PATCH] Fix build with hardened security flags -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| ../gupnp-1.2.6/examples/get-volume.c: In function 'on_introspection': -| ../gupnp-1.2.6/examples/get-volume.c:53:17: error: format not a string literal and no format arguments [-Werror=format-security] -| 53 | g_critical (error->message); -| | ^~~~~~~~~~ -| ../gupnp-1.2.6/examples/get-volume.c:114:17: error: format not a string literal and no format arguments [-Werror=format-security] -| 114 | g_critical (error->message); -| | ^~~~~~~~~~ -| ../gupnp-1.2.6/examples/get-volume.c: In function 'main': -| ../gupnp-1.2.6/examples/get-volume.c:150:17: error: format not a string literal and no format arguments [-Werror=format-security] -| 150 | g_error (error->message); -| | ^~~~~~~ - -Signed-off-by: Andreas Müller <[email protected]> - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/17] ---- - examples/get-volume.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/examples/get-volume.c b/examples/get-volume.c -index 4601014..923581c 100644 ---- a/examples/get-volume.c -+++ b/examples/get-volume.c -@@ -50,7 +50,7 @@ on_introspection (GObject *object, GAsyncResult *res, gpointer user_data) - &error); - - if (error != NULL) { -- g_critical (error->message); -+ g_critical ("%s", error->message); - g_clear_error (&error); - } - -@@ -111,7 +111,7 @@ on_introspection (GObject *object, GAsyncResult *res, gpointer user_data) - g_list_free (out_names); - - if (error != NULL) { -- g_critical (error->message); -+ g_critical ("%s", error->message); - g_clear_error (&error); - } else { - g_print ("Current volume: %s\n", -@@ -147,7 +147,7 @@ int main(int argc, char *argv[]) - GUPnPContext *context = gupnp_context_new ("wlp3s0", 0, &error); - - if (error != NULL) { -- g_error (error->message); -+ g_error ("%s", error->message); - } - - GUPnPControlPoint *cp = gupnp_control_point_new (context, CONTENT_DIR); --- -2.31.1 - diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb deleted file mode 100644 index 294c361db..000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb +++ /dev/null @@ -1,10 +0,0 @@ -require gupnp.inc - -SRC_URI = " \ - ${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz \ - file://0001-Fix-build-with-hardened-security-flags.patch \ -" -SRC_URI[sha256sum] = "00b20f1e478a72deac92c34723693a2ac55789ed1e4bb4eed99eb4d62092aafd" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.7.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.7.bb new file mode 100644 index 000000000..7ad594f02 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.7.bb @@ -0,0 +1,7 @@ +require gupnp.inc + +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "8441276f1afd0176e6f595026a3a507eed1809abfa04026bad3f21622b3523ec" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" -- 2.31.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#91816): https://lists.openembedded.org/g/openembedded-devel/message/91816 Mute This Topic: https://lists.openembedded.org/mt/83415050/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
