The build path calculation may be refined to accommodate flexible build with attached patch.
The two attached patches for format string should fix compile error and improve security. (Debian uses -Werror=format-security and these were needed for compile. Considering how these strings are generated, risk is practically zero but compiler is noisy and making them quiet is easy.) Osamu PS: Is the web mail is the only way for this ML? -- -- You received this message because you are subscribed to the Google Groups "ibus-devel" group. iBus project web page: http://code.google.com/p/ibus/ iBus dev group: http://groups.google.com/group/ibus-devel?hl=en --- You received this message because you are subscribed to the Google Groups "ibus-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
From: IME Packaging Team <[email protected]> Date: Tue, 12 Feb 2013 02:37:11 +0800 Subject: proper-gtk-plugin-path.patch --- configure | 6 ++++-- configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) --- a/configure +++ b/configure @@ -16314,7 +16314,8 @@ if test x"$enable_gtk2" = x"yes"; then # check for gdk2 gtk2_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` - GTK2_IM_MODULEDIR="$libdir"/gtk-2.0/$gtk2_binary_version/immodules + gtk2_libdir=`$PKG_CONFIG --variable=libdir gtk+-2.0` + GTK2_IM_MODULEDIR="$gtk2_libdir"/gtk-2.0/$gtk2_binary_version/immodules pkg_failed=no @@ -16542,7 +16543,8 @@ fi gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0` - GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules + gtk3_libdir=`$PKG_CONFIG --variable=libdir gtk+-3.0` + GTK3_IM_MODULEDIR="$gtk3_libdir"/gtk-3.0/$gtk3_binary_version/immodules pkg_failed=no --- a/configure.ac +++ b/configure.ac @@ -207,7 +207,8 @@ if test x"$enable_gtk2" = x"yes"; then # check for gdk2 gtk2_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` - GTK2_IM_MODULEDIR="$libdir"/gtk-2.0/$gtk2_binary_version/immodules + gtk2_libdir=`$PKG_CONFIG --variable=libdir gtk+-2.0` + GTK2_IM_MODULEDIR="$gtk2_libdir"/gtk-2.0/$gtk2_binary_version/immodules PKG_CHECK_MODULES(GDK2, [ gdk-2.0 @@ -223,7 +224,8 @@ ]) gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0` - GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules + gtk3_libdir=`$PKG_CONFIG --variable=libdir gtk+-3.0` + GTK3_IM_MODULEDIR="$gtk3_libdir"/gtk-3.0/$gtk3_binary_version/immodules PKG_CHECK_MODULES(GDK3, [ gdk-3.0
Description: Fix format security error The old code does the formatting itself and then passes the result to a parameter expecting a format string This patch lets the called function do the formatting eliminating the format security error, simplifying the code and avoiding an unnessacery copy. Author: Peter Michael Green <[email protected]> --- a/src/ibusfactory.c +++ b/src/ibusfactory.c @@ -287,12 +287,11 @@ g_free (object_path); } else { - gchar *error_message = g_strdup_printf ("Can not fond engine %s", engine_name); g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, - error_message); - g_free (error_message); + "Can not fond engine %s", + engine_name); } return; }
Description: Fix format not a string literal and no format arguments Author: Osamu Aoki <[email protected]> --- a/bus/ibusimpl.c +++ b/bus/ibusimpl.c @@ -963,7 +963,7 @@ if (variant == NULL) { g_dbus_method_invocation_return_error ( invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, - error->message); + "%s", error->message); g_error_free (error); } else { const gchar *path = g_variant_get_string (variant, NULL); @@ -1357,7 +1357,7 @@ g_dbus_method_invocation_return_error ( invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, - error->message); + "%s", error->message); g_error_free (error); } else { GVariant *retval = g_variant_get_variant (variant);
