Hi,

This is the patch used to fix this bug and #710643 in sid as
1.5.1.is.1.4.2-2 .

Osamu
diff -Nru ibus-1.5.1.is.1.4.2/debian/changelog ibus-1.5.1.is.1.4.2/debian/changelog
--- ibus-1.5.1.is.1.4.2/debian/changelog	2013-06-16 22:59:35.000000000 +0900
+++ ibus-1.5.1.is.1.4.2/debian/changelog	2013-06-16 22:29:46.000000000 +0900
@@ -1,3 +1,16 @@
+ibus (1.5.1.is.1.4.2-2) unstable; urgency=low
+
+  [ Peter Michael Green ]
+  * Fix format security error by passing format string and parameter directly
+    to g_dbus_method_invocation_return_error rather than formatting the string
+    ourselves and passing that to the function. Closes: #710643
+
+  [ Osamu Aoki ]
+  * Fix ibus-setup breakage by setting all related packages to use
+   --libexec=/usr/lib/ibus.  Closes: #712149
+
+ -- Osamu Aoki <os...@debian.org>  Sun, 16 Jun 2013 22:29:37 +0900
+
 ibus (1.5.1.is.1.4.2-1) unstable; urgency=low
 
   * Revert to 1.4.2.
diff -Nru ibus-1.5.1.is.1.4.2/debian/ibus.install ibus-1.5.1.is.1.4.2/debian/ibus.install
--- ibus-1.5.1.is.1.4.2/debian/ibus.install	2013-06-16 22:59:35.000000000 +0900
+++ ibus-1.5.1.is.1.4.2/debian/ibus.install	2013-06-16 22:26:15.000000000 +0900
@@ -1,6 +1,6 @@
 etc/gconf/schemas/*
 usr/bin/*
-usr/lib/*/ibus/*
+usr/lib/ibus/*
 usr/share/applications/*
 usr/share/ibus/*
 usr/share/icons/*
diff -Nru ibus-1.5.1.is.1.4.2/debian/patches/fix-format-security-error.patch ibus-1.5.1.is.1.4.2/debian/patches/fix-format-security-error.patch
--- ibus-1.5.1.is.1.4.2/debian/patches/fix-format-security-error.patch	1970-01-01 09:00:00.000000000 +0900
+++ ibus-1.5.1.is.1.4.2/debian/patches/fix-format-security-error.patch	2013-06-16 22:20:17.000000000 +0900
@@ -0,0 +1,24 @@
+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 <plugw...@debian.org>
+
+--- ibus-1.5.1.is.1.4.2.orig/src/ibusfactory.c
++++ ibus-1.5.1.is.1.4.2/src/ibusfactory.c
+@@ -287,12 +287,11 @@ ibus_factory_service_method_call (IBusSe
+             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;
+     }
diff -Nru ibus-1.5.1.is.1.4.2/debian/patches/ibus-530711-preload-sys.patch ibus-1.5.1.is.1.4.2/debian/patches/ibus-530711-preload-sys.patch
--- ibus-1.5.1.is.1.4.2/debian/patches/ibus-530711-preload-sys.patch	2013-06-16 22:59:35.000000000 +0900
+++ ibus-1.5.1.is.1.4.2/debian/patches/ibus-530711-preload-sys.patch	2013-06-16 22:18:15.000000000 +0900
@@ -661,7 +661,7 @@
      def __init_bus(self):
          try:
              self.__bus = ibus.Bus()
-@@ -506,7 +561,11 @@
+@@ -509,7 +564,11 @@
          self.__config.set_value("general", "use_global_engine", value)
  
      def __config_value_changed_cb(self, bus, section, name, value):
diff -Nru ibus-1.5.1.is.1.4.2/debian/patches/series ibus-1.5.1.is.1.4.2/debian/patches/series
--- ibus-1.5.1.is.1.4.2/debian/patches/series	2013-06-16 22:59:35.000000000 +0900
+++ ibus-1.5.1.is.1.4.2/debian/patches/series	2013-06-16 22:20:17.000000000 +0900
@@ -1,2 +1,3 @@
 proper-gtk-plugin-path.patch
 ibus-530711-preload-sys.patch
+fix-format-security-error.patch
diff -Nru ibus-1.5.1.is.1.4.2/debian/rules ibus-1.5.1.is.1.4.2/debian/rules
--- ibus-1.5.1.is.1.4.2/debian/rules	2013-06-16 22:59:35.000000000 +0900
+++ ibus-1.5.1.is.1.4.2/debian/rules	2013-06-16 22:26:04.000000000 +0900
@@ -15,7 +15,7 @@
 		--disable-gtk-doc \
 		--enable-introspection \
 		--enable-surrounding-text \
-		--libexec=/usr/lib/$(DEB_BUILD_MULTIARCH)/ibus
+		--libexec=/usr/lib/ibus
 
 override_dh_makeshlibs:
 	dh_makeshlibs -Nibus-gtk -Nibus-gtk3

Reply via email to