diff --git a/gettext-csharp.changes b/gettext-csharp.changes index 02ed7f3..5f1b3c9 100644 --- a/gettext-csharp.changes +++ b/gettext-csharp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 18 10:35:50 CEST 2008 - pth@suse.de + +- Fix segmentation fault in msgmerge (bnc#391372). + ------------------------------------------------------------------- Tue Dec 4 14:43:27 CET 2007 - pth@suse.de diff --git a/gettext-csharp.spec b/gettext-csharp.spec index 232ada6..00ac081 100644 --- a/gettext-csharp.spec +++ b/gettext-csharp.spec @@ -19,7 +19,7 @@ License: LGPL v2.1 or later Group: Development/Tools/Other AutoReqProv: on Version: 0.17 -Release: 50 +Release: 54 Summary: Native Language Support (NLS) for C# PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,6 +37,7 @@ Patch7: gettext-autotools.patch Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch Patch9: gettext-needlessly_init_vars.patch Patch10: gettext-open_missing_mode.patch +Patch11: gettext-typo_to_segfault.patch %description Mono with its 'resgen' program uses a design that Microsoft created and @@ -77,6 +78,7 @@ Authors: %patch8 %patch9 %patch10 +%patch11 pushd gettext-tools/misc tar xfz archive.tar.gz find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g' @@ -131,6 +133,8 @@ rm -rf $RPM_BUILD_ROOT %_libdir/gettext/msgunfmt.net.exe %changelog +* Sun May 18 2008 pth@suse.de +- Fix segmentation fault in msgmerge (bnc#391372). * Tue Dec 04 2007 pth@suse.de - Add patch from upstreams to add the missing mode for the open call. * Fri Nov 23 2007 pth@suse.de diff --git a/gettext-java.changes b/gettext-java.changes index bbe14f8..1018aa7 100644 --- a/gettext-java.changes +++ b/gettext-java.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 18 10:35:50 CEST 2008 - pth@suse.de + +- Fix segmentation fault in msgmerge (bnc#391372). + ------------------------------------------------------------------- Tue Dec 4 14:43:46 CET 2007 - pth@suse.de diff --git a/gettext-java.spec b/gettext-java.spec index f49d7f2..2721dff 100644 --- a/gettext-java.spec +++ b/gettext-java.spec @@ -18,7 +18,7 @@ License: LGPL v2.1 or later Group: Development/Tools/Other AutoReqProv: on Version: 0.17 -Release: 56 +Release: 62 Summary: Java Support for Native Language Support (NLS) PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,6 +36,7 @@ Patch7: gettext-autotools.patch Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch Patch9: gettext-needlessly_init_vars.patch Patch10: gettext-open_missing_mode.patch +Patch11: gettext-typo_to_segfault.patch %description This package includes the tools needed to support message catalogs in @@ -61,6 +62,7 @@ Authors: %patch8 %patch9 %patch10 +%patch11 pushd gettext-tools/misc tar xfz archive.tar.gz find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g' @@ -135,6 +137,8 @@ rm -rf $RPM_BUILD_ROOT %_libdir/gettext/gnu.gettext.GetURL %changelog +* Sun May 18 2008 pth@suse.de +- Fix segmentation fault in msgmerge (bnc#391372). * Tue Dec 04 2007 pth@suse.de - Add patch from upstreams to add the missing mode for the open call. * Fri Nov 23 2007 pth@suse.de diff --git a/gettext-runtime.changes b/gettext-runtime.changes index ff59ffa..b38a5af 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun May 18 10:35:50 CEST 2008 - pth@suse.de + +- Fix segmentation fault in msgmerge (bnc#391372). +- Get rid of %run_ldconfig + ------------------------------------------------------------------- Wed May 7 21:39:56 CEST 2008 - coolo@suse.de diff --git a/gettext-runtime.spec b/gettext-runtime.spec index b03a3c8..236ac19 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -14,7 +14,7 @@ Name: gettext-runtime %define pacname gettext Version: 0.17 -Release: 34 +Release: 38 BuildRequires: gcc-c++ perl-libintl-perl tcl # To get an updated linkdupes.sh (in case there are new dupes), temproarily enable: #BuildRequires: fdupes @@ -41,6 +41,7 @@ Patch7: gettext-autotools.patch Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch Patch9: gettext-needlessly_init_vars.patch Patch10: gettext-open_missing_mode.patch +Patch11: gettext-typo_to_segfault.patch %description This package contains the intl library as well as tools that ease the @@ -93,6 +94,7 @@ Authors: %patch8 %patch9 %patch10 +%patch11 pushd gettext-tools/misc tar xfz archive.tar.gz find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g' @@ -161,11 +163,9 @@ ln -f dgettext.3.gz dcgettext.3.gz %clean rm -rf $RPM_BUILD_ROOT -%post -%run_ldconfig +%post -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %post -n gettext-tools %install_info --info-dir=%{_infodir} %{_infodir}/gettext.info.gz @@ -254,6 +254,9 @@ rm -rf $RPM_BUILD_ROOT %_datadir/aclocal/* %changelog +* Sun May 18 2008 pth@suse.de +- Fix segmentation fault in msgmerge (bnc#391372). +- Get rid of %%run_ldconfig * Wed May 07 2008 coolo@suse.de - provide gettext- too * Tue Apr 29 2008 cthiel@suse.de diff --git a/gettext-typo_to_segfault.patch b/gettext-typo_to_segfault.patch new file mode 100644 index 0000000..b1289fb --- /dev/null +++ b/gettext-typo_to_segfault.patch @@ -0,0 +1,39 @@ +2008-05-16 Bruno Haible + + * gettext-tools/src/msgl-iconv.c (iconvable_prev_msgid): Fix typo. + Reported by Karl Eichwalder + via Philipp Thomas + at . + +*** gettext-tools/src/msgl-iconv.c 7 Oct 2007 19:35:29 -0000 1.23 +--- gettext-tools/src/msgl-iconv.c 16 May 2008 22:32:04 -0000 +*************** +*** 1,5 **** + /* Message list charset and locale charset handling. +! Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc. + Written by Bruno Haible , 2001. + + This program is free software: you can redistribute it and/or modify +--- 1,5 ---- + /* Message list charset and locale charset handling. +! Copyright (C) 2001-2003, 2005-2008 Free Software Foundation, Inc. + Written by Bruno Haible , 2001. + + This program is free software: you can redistribute it and/or modify +*************** +*** 411,417 **** + if (mp->prev_msgid != NULL) + if (!iconvable_string (cd, mp->prev_msgid)) + return false; +! if (mp->msgid_plural != NULL) + if (!iconvable_string (cd, mp->prev_msgid_plural)) + return false; + return true; +--- 411,417 ---- + if (mp->prev_msgid != NULL) + if (!iconvable_string (cd, mp->prev_msgid)) + return false; +! if (mp->prev_msgid_plural != NULL) + if (!iconvable_string (cd, mp->prev_msgid_plural)) + return false; + return true;