From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 5/6] glib: Fix compiling with GCC 9 Date: Sat, 04 Jan 2020 16:49:15 +0000 Message-ID: <20200104164916.12051-5-michael.tremer@ipfire.org> In-Reply-To: <20200104164916.12051-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5188811190042575246==" List-Id: --===============5188811190042575246== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- 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-fi= xes-1.patch cd $(DIR_APP) && ./configure --prefix=3D/usr --sysconfdir=3D/etc \ --with-pcre=3Dsystem 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 +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=3DUTF-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=3Dformat-overflow=3D] + 1302 | debug_print ("SERVER: WaitingForBegin, read '%s'", + line); + | + +gdbusmessage.c: In function =E2=80=98g_dbus_message_to_blob=E2=80=99: +gdbusmessage.c:2730:30: error: =E2=80=98%s=E2=80=99 directive argument is nu= ll [-Werror=3Dformat-overflow=3D] + 2730 | tupled_signature_str =3D g_strdup_printf ("(%s)", signature_st= r); + | +--- + 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 =3D=3D NULL) + goto out; ++ debug_print ("SERVER: WaitingForBegin, read '%s'", line); + if (g_strcmp0 (line, "BEGIN") =3D=3D 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 !=3D NULL) + { + gchar *tupled_signature_str; +- tupled_signature_str =3D g_strdup_printf ("(%s)", signature_str); + if (signature =3D=3D NULL) + { + g_set_error (error, +@@ -2739,10 +2738,10 @@ g_dbus_message_to_blob (GDBusMessage *messa= ge, + G_IO_ERROR_INVALID_ARGUMENT, + _("Message body has signature =E2=80=9C%s=E2=80=9D b= ut 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)) !=3D 0) ++ tupled_signature_str =3D g_strdup_printf ("(%s)", signature_str); ++ if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (messa= ge->body)) !=3D 0) + { + g_set_error (error, + G_IO_ERROR, +--=20 +2.22.0 + --=20 2.20.1 --===============5188811190042575246==--