From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 5/6] glib: Fix compiling with GCC 9
Date: Sat, 04 Jan 2020 16:49:15 +0000 [thread overview]
Message-ID: <20200104164916.12051-5-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20200104164916.12051-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 4066 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/glib | 1 +
src/patches/glib-2.54.3-compile-fixes-1.patch | 71 +++++++++++++++++++
2 files changed, 72 insertions(+)
create mode 100644 src/patches/glib-2.54.3-compile-fixes-1.patch
diff --git a/lfs/glib b/lfs/glib
index eb284dd56..662caab90 100644
--- a/lfs/glib
+++ b/lfs/glib
@@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
$(UPDATE_AUTOMAKE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glib-2.54.3-compile-fixes-1.patch
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
--with-pcre=system
cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/src/patches/glib-2.54.3-compile-fixes-1.patch b/src/patches/glib-2.54.3-compile-fixes-1.patch
new file mode 100644
index 000000000..ecf30ded5
--- /dev/null
+++ b/src/patches/glib-2.54.3-compile-fixes-1.patch
@@ -0,0 +1,71 @@
+From 566e1d61a500267c7849ad0b2552feec9c9a29a6 Mon Sep 17 00:00:00 2001
+From: Ernestas Kulik <ekulik(a)redhat.com>
+Date: Tue, 29 Jan 2019 09:50:46 +0100
+Subject: [PATCH] gdbus: Avoid printing null strings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This mostly affects the 2.56 branch, but, given that GCC 9 is being
+stricter about passing null string pointers to printf-like functions, it
+might make sense to proactively fix such calls.
+
+gdbusauth.c: In function '_g_dbus_auth_run_server':
+gdbusauth.c:1302:11: error: '%s' directive argument is null
+[-Werror=format-overflow=]
+ 1302 | debug_print ("SERVER: WaitingForBegin, read '%s'",
+ line);
+ |
+
+gdbusmessage.c: In function ‘g_dbus_message_to_blob’:
+gdbusmessage.c:2730:30: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
+ 2730 | tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
+ |
+---
+ gio/gdbusauth.c | 2 +-
+ gio/gdbusmessage.c | 5 ++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c
+index 1f8ea8057..752ec23fc 100644
+--- a/gio/gdbusauth.c
++++ b/gio/gdbusauth.c
+@@ -1272,9 +1272,9 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
+ &line_length,
+ cancellable,
+ error);
+- debug_print ("SERVER: WaitingForBegin, read '%s'", line);
+ if (line == NULL)
+ goto out;
++ debug_print ("SERVER: WaitingForBegin, read '%s'", line);
+ if (g_strcmp0 (line, "BEGIN") == 0)
+ {
+ /* YAY, done! */
+diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
+index 3221b925d..3a1a1f9e9 100644
+--- a/gio/gdbusmessage.c
++++ b/gio/gdbusmessage.c
+@@ -2731,7 +2731,6 @@ g_dbus_message_to_blob (GDBusMessage *message,
+ if (message->body != NULL)
+ {
+ gchar *tupled_signature_str;
+- tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
+ if (signature == NULL)
+ {
+ g_set_error (error,
+@@ -2739,10 +2738,10 @@ g_dbus_message_to_blob (GDBusMessage *message,
+ G_IO_ERROR_INVALID_ARGUMENT,
+ _("Message body has signature “%s” but there is no signature header"),
+ signature_str);
+- g_free (tupled_signature_str);
+ goto out;
+ }
+- else if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0)
++ tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
++ if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0)
+ {
+ g_set_error (error,
+ G_IO_ERROR,
+--
+2.22.0
+
--
2.20.1
next prev parent reply other threads:[~2020-01-04 16:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-04 16:49 [PATCH 1/6] mpfr: Update to 4.0.2 Michael Tremer
2020-01-04 16:49 ` [PATCH 2/6] mpc: Update to 1.1.0 Michael Tremer
2020-01-04 16:49 ` [PATCH 3/6] mdadm: Update to 4.1 Michael Tremer
2020-01-04 16:49 ` [PATCH 4/6] efivar: Update to 37 Michael Tremer
2020-01-04 16:49 ` Michael Tremer [this message]
2020-01-04 16:49 ` [PATCH 6/6] openvmtools: Update to 11.0.0 Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200104164916.12051-5-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox