diff --git a/glib-1.2.10-format.patch b/glib-1.2.10-format.patch new file mode 100644 index 0000000..e481253 --- /dev/null +++ b/glib-1.2.10-format.patch @@ -0,0 +1,29 @@ +--- grel.c ++++ grel.c +@@ -413,7 +413,7 @@ g_relation_print_one (gpointer tuple_key + } + + g_string_append (gstring, "]"); +- g_log (g_log_domain_glib, G_LOG_LEVEL_INFO, gstring->str); ++ g_log (g_log_domain_glib, G_LOG_LEVEL_INFO, "%s", gstring->str); + g_string_free (gstring, TRUE); + } + +--- testglib.c ++++ testglib.c +@@ -277,6 +277,9 @@ my_traverse (gpointer key, + return FALSE; + } + ++/* This program explicitly tests for a NULL format string */ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic warning "-Wformat-security" + int + main (int argc, + char *argv[]) +@@ -918,4 +921,5 @@ main (int argc, + + return 0; + } ++#pragma GCC diagnostic pop + diff --git a/glib.spec b/glib.spec index b4ccc83..d1be056 100644 --- a/glib.spec +++ b/glib.spec @@ -2,7 +2,7 @@ Summary: A library of handy utility functions Name: glib Epoch: 1 Version: 1.2.10 -Release: 40%{?dist} +Release: 41%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org/ @@ -21,6 +21,8 @@ Patch5: glib-1.2.10-multilib.patch Patch6: glib-1.2.10-unused-dep.patch # Avoid having to run autotools at build time Patch7: glib-1.2.10-autotools.patch +# Use format strings properly +Patch8: glib-1.2.10-format.patch %description @@ -49,6 +51,7 @@ Requires: pkgconfig %patch5 -p1 -b .multilib %patch6 -p1 -b .unused-dep %patch7 -b .autotools +%patch8 -b .format # The original config.{guess,sub} do not work on x86_64, aarch64 etc. # @@ -109,6 +112,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/* %changelog +* Thu Nov 21 2013 Paul Howarth - 1:1.2.10-41 +- Use format strings properly + * Sat Aug 03 2013 Fedora Release Engineering - 1:1.2.10-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild