Hello community, here is the log from the commit of package recode for openSUSE:Factory checked in at Mon Jan 3 10:42:58 CET 2011. -------- --- recode/recode.changes 2010-10-31 19:04:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/recode/recode.changes 2010-12-30 16:49:55.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Dec 30 15:28:46 UTC 2010 - vcizek@novell.com + +- fix for segfault bnc#503437 +- see comment in the patch file + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- recode-3.6-segfault.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ recode.spec ++++++ --- /var/tmp/diff_new_pack.T6TQGb/_old 2011-01-03 10:42:15.000000000 +0100 +++ /var/tmp/diff_new_pack.T6TQGb/_new 2011-01-03 10:42:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package recode (Version 3.6) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ %endif # Version: 3.6 -Release: 645 +Release: 646 Summary: Character Set Converter Url: http://recode.progiciels-bpi.ca/ Source: ftp://ftp.gnu.org/pub/gnu/recode/recode-%{version}.tar.bz2 @@ -41,6 +41,7 @@ Patch4: recode-gcc43.patch Patch5: recode-%{version}-memleak.patch Patch6: recode-3.6-fix-flex-m4.patch +Patch7: recode-3.6-segfault.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq @@ -82,6 +83,7 @@ %patch4 %patch5 -p1 %patch6 -p1 +%patch7 -p0 cp -v %{S:1} i18n/cs.po rm m4/{lcmessage.m4,libtool.m4} rm acinclude.m4 ++++++ recode-3.6-segfault.patch ++++++ # Recode segfaulted on C files (bnc#503437) # Eg. file containing just a single apostrophe ('), or openinig C comment (/*) # This is a simple workaround. diff -u -r recode-3.6/src/main.c recode-fajn/src/main.c --- src/main.c.orig 2000-12-06 20:44:59.000000000 +0100 +++ src/main.c 2010-12-30 16:07:03.973840778 +0100 @@ -951,17 +951,26 @@ success = false; if (verbose_flag) { - fprintf (stderr, _(" failed: %s in step `%s..%s'\n"), + if (task->error_at_step) + fprintf (stderr, _(" failed: %s in step `%s..%s'\n"), task_perror (task), task->error_at_step->before->name, task->error_at_step->after->name); + else + fprintf (stderr, _(" failed: Unknown error\n")); + fflush (stderr); } else if (!quiet_flag) - error (0, 0, _("%s failed: %s in step `%s..%s'"), + { + if (task->error_at_step) + error (0, 0, _("%s failed: %s in step `%s..%s'"), input_name, task_perror (task), task->error_at_step->before->name, task->error_at_step->after->name); + else + error (0, 0, _("%s failed: Unknown error"), input_name); + } unlink (output_name); } @@ -981,10 +990,15 @@ { success = false; if (!quiet_flag) - error (0, 0, _("%s in step `%s..%s'"), + { + if (task->error_at_step) + error (0, 0, _("%s in step `%s..%s'"), task_perror (task), task->error_at_step->before->name, task->error_at_step->after->name); + else + error (0, 0, _("Unknown error")); + } } } } Only in recode-fajn/src: tags ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org