Hello community, here is the log from the commit of package gconf2 for openSUSE:Factory checked in at Wed Apr 28 22:25:51 CEST 2010. -------- --- GNOME/gconf2/gconf2.changes 2010-03-30 20:01:04.000000000 +0200 +++ gconf2/gconf2.changes 2010-04-26 14:49:53.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Apr 23 10:49:50 UTC 2010 - lzwang@novell.com + +- bnc#598867: Add gconf2-crash.patch to fix crasher with corrupted + ~/.gconfd/saved_state ... + +------------------------------------------------------------------- +Thu Apr 8 20:20:38 CEST 2010 - vuntz@opensuse.org + +- Provide a %gconf_schemas_requires macro that is similar to + %gconf_schemas_prereq, but doesn't use the deprecated PreReq. +- We keep the old macro to enable a slow migration. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gconf2-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2.spec ++++++ --- /var/tmp/diff_new_pack.b9x9Kz/_old 2010-04-28 22:22:41.000000000 +0200 +++ /var/tmp/diff_new_pack.b9x9Kz/_new 2010-04-28 22:22:41.000000000 +0200 @@ -33,7 +33,7 @@ License: GPLv2+ ; LGPLv2.1+ Group: System/GUI/GNOME Version: 2.28.1 -Release: 1 +Release: 2 Summary: GNOME Configuration Database System Source: ftp://ftp.gnome.org/pub/gnome/sources/GConf/2.20/%{_name}-%{version}.tar.bz2 # Generic tool, not upstreamed: @@ -49,6 +49,8 @@ Patch4: gconf2-sabayon.patch # PATCH-FIX-OPENSUSE gconf2-pk-default-path.patch vuntz@novell.com -- Use the right gconf path for the defaults in the pk helper Patch5: gconf2-pk-default-path.patch +# PATCH-FIX-UPSTREAM gconf2-crash.patch bnc#598867 mmeeks@novell.com -- Fix crasher with corrupted ~/.gconfd/saved_state +Patch6: gconf2-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -113,6 +115,7 @@ %patch3 %patch4 %patch5 -p1 +%patch6 -p1 cp -a %{S:1} %{S:2} . %build ++++++ gconf2-crash.patch ++++++ diff --git a/gconf/gconfd.c b/gconf/gconfd.c index 38a8423..66c18ff 100644 --- a/gconf/gconfd.c +++ b/gconf/gconfd.c @@ -2233,7 +2233,7 @@ read_line (FILE *f) } len = strlen (buf); - if (buf[len - 1] == '\n') + if (len > 0 && buf[len - 1] == '\n') buf[--len] = '\0'; if (retval == NULL) ++++++ macros.gconf2 ++++++ --- /var/tmp/diff_new_pack.b9x9Kz/_old 2010-04-28 22:22:42.000000000 +0200 +++ /var/tmp/diff_new_pack.b9x9Kz/_new 2010-04-28 22:22:42.000000000 +0200 @@ -7,7 +7,8 @@ # Usage: # # Preamble: -# %gconf_schemas_prereq +# %gconf_schemas_requires +# (note: %gconf_schemas_prereq works, but is deprecated) # # %install # ... @@ -44,6 +45,12 @@ # %files -f %{name}.lst # +%gconf_schemas_requires \ +Requires(pre): /usr/bin/gconftool-2 coreutils diffutils \ +Requires(preun): /usr/bin/gconftool-2 coreutils diffutils \ +Requires(posttrans): /usr/bin/gconftool-2 coreutils diffutils + +# This macro is deprecated. Use %gconf_schemas_requires instead. %gconf_schemas_prereq PreReq: /usr/bin/gconftool-2 coreutils diffutils %end_gconf_schemas() \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org