control: tags 692453 patch control: tags 720839 patch control: severyty 720839 important
Hi, Here is my patch for thses bugs. I am changing severity since this is security concern. Please also fix gnome-settings-daemon too. I think with new ibus, we are getting ready for ibus 1.5 migration. Now http://bugs.debian.org/715568 is solved by the first patch. GNOME 3.8 as it should be is here. Osamu
>From 08e6b5b7751eeeb899480046528c6c192b747f30 Mon Sep 17 00:00:00 2001 From: Osamu Aoki <[email protected]> Date: Fri, 30 Aug 2013 22:29:06 +0900 Subject: [PATCH 1/3] handle_null_country_code This skips the following part if country_code == NULL. (On Debian around 2013 Summer, error happend as below) This also skips it if lang_code == NULL. (Just in case this situation happens on some system.) == Error seen when gnome-control-center is run from console == (gnome-control-center:29342): GnomeDesktop-WARNING **: locale 'eo_(null).utf8' isn't valid (gnome-control-center:29342): GnomeDesktop-WARNING **: locale 'eo_(null).utf8' isn't valid (gnome-control-center:29342): GnomeDesktop-WARNING **: locale 'eo_(null).utf8' isn't valid (gnome-control-center:29342): GnomeDesktop-CRITICAL **: gnome_get_country_from_code: assertion 'code != NULL' failed Crash! --- debian/patches/10_handle_null_country_code.patch | 15 +++++++++++++++ debian/patches/series | 1 + 2 files changed, 16 insertions(+) create mode 100644 debian/patches/10_handle_null_country_code.patch diff --git a/debian/patches/10_handle_null_country_code.patch b/debian/patches/10_handle_null_country_code.patch new file mode 100644 index 0000000..63fab3e --- /dev/null +++ b/debian/patches/10_handle_null_country_code.patch @@ -0,0 +1,15 @@ +--- a/panels/region/cc-input-chooser.c ++++ b/panels/region/cc-input-chooser.c +@@ -1034,6 +1034,12 @@ + if (!gnome_parse_locale (*locale, &lang_code, &country_code, NULL, NULL)) + continue; + ++ if ((!lang_code) || (!country_code)) ++ { ++ g_free (country_code); ++ g_free (lang_code); ++ continue; ++ } + simple_locale = g_strdup_printf ("%s_%s.utf8", lang_code, country_code); + if (g_hash_table_contains (priv->locales, simple_locale)) + { diff --git a/debian/patches/series b/debian/patches/series index 7ac0896..03333e6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 01_menu_category.patch 06_handle_passwd_with_ldap.patch +10_handle_null_country_code.patch -- 1.8.4
>From 4af18fdc775cc9af8fda6783b9ad83690ceca697 Mon Sep 17 00:00:00 2001 From: Osamu Aoki <[email protected]> Date: Fri, 30 Aug 2013 23:08:39 +0900 Subject: [PATCH 2/3] disable libsocialweb Remove security concern following FC19 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720839 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 7813ffc..2eadc6c 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed include /usr/share/dpkg/buildflags.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-update-mimedb \ - --with-libsocialweb + --with-libsocialweb=no DEB_DH_MAKESHLIBS_ARGS_gnome-control-center = --no-act -- 1.8.4
