From bcd1bbebfa8d9f810bcc532a652869d1a443ec30c3167a5fdcc1bd7722691c6e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 10 Aug 2009 22:09:23 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aspell?expand=0&rev=13 --- aspell-iterator-after-erase.patch | 19 ++++ aspell.changes | 5 + aspell.spec | 179 +----------------------------- 3 files changed, 28 insertions(+), 175 deletions(-) create mode 100644 aspell-iterator-after-erase.patch diff --git a/aspell-iterator-after-erase.patch b/aspell-iterator-after-erase.patch new file mode 100644 index 0000000..05fb3df --- /dev/null +++ b/aspell-iterator-after-erase.patch @@ -0,0 +1,19 @@ +--- lib/new_fmode.cpp ++++ lib/new_fmode.cpp +@@ -277,10 +277,13 @@ + } + + void FilterMode::MagicString::remExtension(const String & ext) { +- for ( Vector::iterator it = fileExtensions.begin() ; +- it != fileExtensions.end() ; it++ ) { ++ Vector::iterator it = fileExtensions.begin(); ++ while (it != fileExtensions.end()) { + if ( *it == ext ) { +- fileExtensions.erase(it); ++ it = fileExtensions.erase(it); ++ } ++ else { ++ it++; + } + } + } diff --git a/aspell.changes b/aspell.changes index e1d2ee8..a82a63a 100644 --- a/aspell.changes +++ b/aspell.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 20 15:19:24 CEST 2009 - pgajdos@suse.cz + +- fixed invalid iterator [bnc#523345] + ------------------------------------------------------------------- Wed Dec 10 12:34:56 CET 2008 - olh@suse.de diff --git a/aspell.spec b/aspell.spec index 5de1994..8881b71 100644 --- a/aspell.spec +++ b/aspell.spec @@ -1,7 +1,7 @@ # # spec file for package aspell (Version 0.60.6) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -33,16 +33,15 @@ Obsoletes: aspell-64bit %endif # Version: 0.60.6 -Release: 26 +Release: 27 Summary: A Free and Open Source Spell Checker Url: http://aspell.net/ Source: aspell-%{version}.tar.bz2 Patch1: aspell-strict-aliasing.patch -#Patch2: aspell-duplicate_name.patch Patch3: aspell-quotes.patch Patch4: aspell-epmty_file.patch -#Patch5: aspell-gcc4_3.patch Patch6: aspell-make-static-filters.patch +Patch7: aspell-iterator-after-erase.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Suggests: aspell-ispell @@ -108,6 +107,7 @@ dictionaries when more than one Aspell process is open at once. %patch3 %patch4 %patch6 +%patch7 %build #%{suse_update_config} @@ -194,174 +194,3 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/ispell %changelog -* Wed Dec 10 2008 olh@suse.de -- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade - (bnc#437293) -* Thu Nov 20 2008 pgajdos@suse.cz -- fixed wrong static filter handling [bnc#441008] -* Thu Oct 30 2008 olh@suse.de -- obsolete old -XXbit packages (bnc#437293) -* Tue Sep 09 2008 pgajdos@suse.cz -- created aspell-ispell subpackage [bnc#165023] -* Fri Jul 25 2008 lmichnovic@suse.cz -- update to version 0.60.6 - * bugfix release -- obsoletes *duplicate_name.patch, *gcc4_3.patch -* Thu Apr 10 2008 ro@suse.de -- added baselibs.conf file to build xxbit packages - for multilib support -* Fri Oct 26 2007 nadvornik@suse.cz -- fixed to compile with gcc 4.3 (gcc4_3.patch) -* Wed Aug 22 2007 lmichnovic@suse.cz -- defining ncurses_wide library for configure to enable wide - UTF-8 characters [#266153] -* Thu Aug 16 2007 lmichnovic@suse.cz -- fixed SIGSEV when checking empty file(epmty_file.patch) [#266130] -- using parallel build -* Thu Aug 16 2007 lmichnovic@suse.cz -- changed dict- and data-dir back to /usr/{%%lib} because dictionary - files depends on endian. -- fixed command execution in script "run-with-aspell" (quotes.patch) -* Wed Aug 15 2007 lmichnovic@suse.cz -- using lang macro -- not using obsoleted %%run_ldconfig macro -- defining dict- and data-dir to arch independent directory which - allow made dictionaries noarch and save 30 MB on BiArch media -* Sat Mar 31 2007 rguenther@suse.de -- add ncurses-devel BuildRequires. -* Sat Mar 31 2007 aj@suse.de -- Cleanup BuildRequires. -* Thu Jan 11 2007 lmichnovic@suse.cz -- gettextize is needed before autoreconf -* Thu Jan 11 2007 lmichnovic@suse.cz -- update to version 0.60.5 - * Compile fix for gcc 4.1 (obsoletes gcc-warning.patch) - * Updated to Gettext 0.16.1, Libtool 1.5.22, Automake 1.10, - Autoconf 2.61 - * Documentation improvements, including an updated `man' page. - * Complain if more than one file is specified when checking - files using the `aspell check' command, rather than ignoring - the other files. - * Large number of bug fixes. -* Tue Sep 05 2006 pnemec@suse.cz -- changed Requires to aspell-en to Recommends -* Wed Aug 02 2006 pnemec@suse.cz -- fixed wrong parametr name in header file [#175555] -* Fri Jun 30 2006 pnemec@suse.cz -- updated to 0.60.4 - primary a bug fix release -* Mon Mar 20 2006 pnemec@suse.cz -- removed virtual package dependency -- added aspell-en to Requires #158675 -* Tue Feb 21 2006 aj@suse.de -- Fix Require for devel package. -* Tue Feb 07 2006 pnemec@suse.cz -- fixed virtual package name -* Fri Feb 03 2006 pnemec@suse.cz -- added virtual package aspell_dictionary to Requires -* Thu Jan 26 2006 sbrabec@suse.cz -- Added %%install_info_prereq. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Mon Jan 02 2006 pnemec@suse.cz -- fixed gcc strict aliasing warnings -* Tue Oct 04 2005 pnemec@suse.cz -- fixed gcc warning and aspell-devel requires -* Wed Jun 29 2005 ltinkl@suse.cz -- update to 0.60.3 -* Tue Mar 15 2005 ltinkl@suse.cz -- update to 0.60.2 which fixes some critical bugs (munch-list, better - support for non-English languages) -* Tue Nov 30 2004 ro@suse.de -- fix file list -* Mon Nov 29 2004 ro@suse.de -- fix libdir usage -* Mon Nov 29 2004 ltinkl@suse.cz -- update to 0.60.1.1 -* Fri Nov 26 2004 ltinkl@suse.cz -- updated to 0.60 -- correctly install info pages -- package the HTML manuals -* Fri Aug 13 2004 lnussel@suse.de -- apply corrected patch for #42197 -* Thu Jun 24 2004 ltinkl@suse.cz -- fix #42197 -* Mon Feb 16 2004 ltinkl@suse.cz -- update to 0.50.5 -* Sat Jan 10 2004 adrian@suse.de -- add %%run_ldconfig -* Thu Oct 23 2003 ltinkl@suse.cz -- update to latest stable version (0.50.4.1) -- throw away unused patch -* Wed Jul 23 2003 ltinkl@suse.cz -- updated sources to 0.50.3 -- package ChangeLog instead of empty TODO -- removed unused patch -* Wed May 21 2003 pmladek@suse.cz -- fixed installation of documentation that rpm does not complain - about unpacked files -* Tue Feb 25 2003 kukuk@suse.de -- Include assert.h -* Fri Jan 31 2003 pmladek@suse.cz -- fixed to link the libraries with -lstdc++ -* Wed Nov 20 2002 pmladek@suse.cz -- fixed invalid declaration which breaks building with gcc-3.3 -- used x-devel-packages in neededforbuild instead of the obsolete xf86 -* Fri Nov 01 2002 pmladek@suse.cz -- updated to version 0.50.2: - * merged with pspell - * changed way to handle dictionaries - * added aspell-import script to convert old dictionaries - * pspell ABI is now part of aspell except that the name of everything has - changed due to the renaming of pspell to aspell - * provided pspell backward compatibility header file - * the name of the language-tag option has changed to lang - * backward compatible the language-tag option will still work - * english dictionaries are built from separate package - * see more details in /usr/share/doc/packages/aspell/README -- removed obsolete config files -- removed obsolete patches for automake, gcc3.x and x86_64 -- fixed list of documentation to install -- fixed to compile example with gcc -- fixed problem with locking on nfs -* Fri Aug 30 2002 pmladek@suse.cz -- fixed dependency of the devel subpackage on the main package (used %%version) -* Wed May 29 2002 meissner@suse.de -- The hashing code did not halt in some hash bucket size cases - which were reached due to slightly different floating point - handling in x86_64. - Now using integer arithmetic. -* Mon Apr 15 2002 pmladek@suse.cz -- fixed to compile with gcc-3.1 -* Thu Jan 10 2002 pmladek@suse.cz -- used macro %%{_libdir} to fix for lib64 -* Fri Dec 14 2001 pmladek@suse.cz -- updated to version .33.7.1: - * Minor manual fixes - * compile fix for gcc 3.0 and Solaris -- added the patch aspell-.33-fix2.diff from sourceforge -- removed obsolete axp patch -- fixed file list -* Thu Oct 18 2001 pmladek@suse.cz -- moved spell to /usr/bin (default path) -- added spell to Provides -- added aspell-en to Requires because of spell -* Thu Oct 04 2001 schwab@suse.de -- Fix for automake 1.5. -- Avoid macro in Version tag. -* Mon Aug 27 2001 pmladek@suse.cz -- fixed to compile on axp: - * fixed declaration of friend classes -* Fri Aug 17 2001 pmladek@suse.cz -- fixed file list -- added ed and dialog to neededforbuild through tetex -* Thu Aug 16 2001 pmladek@suse.cz -- updated to version 0.33.7 -- fixed documentation -* Tue Jun 26 2001 schwab@suse.de -- Remove -I$(includedir). -* Mon Jun 11 2001 ro@suse.de -- libtoolize to build -* Wed May 30 2001 pmladek@suse.cz -- package created -- added start script and configurations for each spelling and jargon