!58 [sync] PR-57: Update to 0.60.8.1 and refix CVE-2019-25051

From: @openeuler-sync-bot 
Reviewed-by: @wk333 
Signed-off-by: @wk333

CVE-2019-17544.patch

@@ -1,49 +0,0 @@
-From 80fa26c74279fced8d778351cff19d1d8f44fe4e Mon Sep 17 00:00:00 2001
-From: Kevin Atkinson <kevina@gnu.org>
-Date: Sun, 4 Aug 2019 04:20:29 -0400
-Subject: [PATCH] Fix various bugs found by OSS-Fuze.
-
----
- common/config.cpp    | 2 +-
- common/file_util.cpp | 1 +
- common/getdata.cpp   | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/common/config.cpp b/common/config.cpp
-index 017e741..e117d3c 100644
---- a/common/config.cpp
-+++ b/common/config.cpp
-@@ -763,7 +763,7 @@ namespace acommon {
-       }
-       res.append(':');
-     }
--    if (res.back() == ':') res.pop_back();
-+    if (!res.empty() && res.back() == ':') res.pop_back();
-   }
- 
-   struct ListAddHelper : public AddableContainer 
-diff --git a/common/file_util.cpp b/common/file_util.cpp
-index 8515832..56ea501 100644
---- a/common/file_util.cpp
-+++ b/common/file_util.cpp
-@@ -181,6 +181,7 @@ namespace acommon {
-     while ( (dir = els.next()) != 0 ) 
-     {
-       path = dir;
-+      if (path.empty()) continue;
-       if (path.back() != '/') path += '/';
-       unsigned dir_len = path.size();
-       path += filename;
-diff --git a/common/getdata.cpp b/common/getdata.cpp
-index 7e822c9..1b04823 100644
---- a/common/getdata.cpp
-+++ b/common/getdata.cpp
-@@ -64,7 +64,7 @@ namespace acommon {
-   char * unescape(char * dest, const char * src)
-   {
-     while (*src) {
--      if (*src == '\\') {
-+      if (*src == '\\' && src[1]) {
- 	++src;
- 	switch (*src) {
- 	case 'n': *dest = '\n'; break;

aspell-0.60.3-install_info.patch

@@ -1,30 +0,0 @@
-diff -up aspell-0.60.6.1/manual/Makefile.in.iinfo aspell-0.60.6.1/manual/Makefile.in
---- aspell-0.60.6.1/manual/Makefile.in.iinfo	2011-07-04 10:58:49.000000000 +0200
-+++ aspell-0.60.6.1/manual/Makefile.in	2011-08-15 16:29:40.999718535 +0200
-@@ -607,16 +607,16 @@ install-info-am: $(INFO_DEPS)
- 	    else : ; fi; \
- 	  done; \
- 	done
--	@$(POST_INSTALL)
--	@if (install-info --version && \
--	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
--	  list='$(INFO_DEPS)'; \
--	  for file in $$list; do \
--	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
--	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
--	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
--	  done; \
--	else : ; fi
-+#	@$(POST_INSTALL)
-+#	@if (install-info --version && \
-+#	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-+#	  list='$(INFO_DEPS)'; \
-+#	  for file in $$list; do \
-+#	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-+#	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
-+#	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
-+#	  done; \
-+#	else : ; fi
- install-man: install-man1
- 
- install-pdf: install-pdf-am

aspell-0.60.5-fileconflict.patch

@@ -1,70 +0,0 @@
-diff -up aspell-0.60.6.1/configure.fc aspell-0.60.6.1/configure
---- aspell-0.60.6.1/configure.fc	2011-07-04 10:58:50.000000000 +0200
-+++ aspell-0.60.6.1/configure	2011-08-16 11:28:58.626771599 +0200
-@@ -839,6 +839,7 @@ MAINTAINER_MODE_FALSE
- MAINT
- pkgdocdir
- pkgdatadir
-+pkgdatadir2
- pkglibdir
- CXX
- CXXFLAGS
-@@ -2634,18 +2635,21 @@ pkgdatadir=undef
- # Check whether --enable-pkgdatadir was given.
- if test "${enable_pkgdatadir+set}" = set; then
-   enableval=$enable_pkgdatadir; pkgdatadir=$enable_pkgdatadir
-+  pkgdatadir2=$enable_pkgdatadir
- fi
- 
- 
- # Check whether --enable-pkgdata-dir was given.
- if test "${enable_pkgdata_dir+set}" = set; then
-   enableval=$enable_pkgdata_dir; pkgdatadir=$enable_dict_dir
-+  pkgdatadir2=$enable_dict_dir
- fi
- 
- 
- if test "$pkgdatadir" = "undef"
- then
-   pkgdatadir=\${libdir}/aspell-0.60
-+  pkgdatadir2=${exec_prefix}/lib/aspell-0.60:${exec_prefix}/lib64/aspell-0.60
- fi
- 
- 
-@@ -20119,6 +20123,7 @@ MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_F
- MAINT!$MAINT$ac_delim
- pkgdocdir!$pkgdocdir$ac_delim
- pkgdatadir!$pkgdatadir$ac_delim
-+pkgdatadir2!$pkgdatadir2$ac_delim
- pkglibdir!$pkglibdir$ac_delim
- CXX!$CXX$ac_delim
- CXXFLAGS!$CXXFLAGS$ac_delim
-@@ -20142,7 +20147,7 @@ ac_ct_CC!$ac_ct_CC$ac_delim
- CCDEPMODE!$CCDEPMODE$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -up aspell-0.60.6.1/Makefile.in.fc aspell-0.60.6.1/Makefile.in
---- aspell-0.60.6.1/Makefile.in.fc	2011-07-04 10:58:49.000000000 +0200
-+++ aspell-0.60.6.1/Makefile.in	2011-08-16 11:20:09.030887258 +0200
-@@ -344,6 +344,7 @@ distcleancheck_listfiles = find . -type 
- 
- # These are needed due to a bug in Automake
- pkgdatadir = @pkgdatadir@
-+pkgdatadir2 = @pkgdatadir2@
- pkglibdir = @pkglibdir@
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -1932,7 +1933,7 @@ gen/dirs.h: gen/mk-dirs_h.pl
- 	cd gen; perl mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir}  ${sysconfdir} >  dirs.h
- 
- scripts/run-with-aspell: scripts/run-with-aspell.create
--	sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir} > scripts/run-with-aspell
-+	sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir2} > scripts/run-with-aspell
- 	chmod 755 scripts/run-with-aspell
- @PSPELL_COMPATIBILITY_TRUE@scripts/pspell-config: scripts/mkconfig
- @PSPELL_COMPATIBILITY_TRUE@	sh ${srcdir}/scripts/mkconfig ${VERSION} ${datadir} ${pkgdatadir}

aspell-0.60.6-mp.patch

@@ -1,44 +0,0 @@
-diff -up aspell-0.60.6/manual/aspell.1.pom aspell-0.60.6/manual/aspell.1
---- aspell-0.60.6/manual/aspell.1.pom	2006-12-19 11:55:08.000000000 +0100
-+++ aspell-0.60.6/manual/aspell.1	2010-08-17 09:42:14.000000000 +0200
-@@ -328,7 +328,6 @@ are also allowed.  The \fI/etc/aspell.co
- how to set these options and the Aspell Manual has more detailed info.
- .SH SEE ALSO
- .PP
--.BR aspell\-import (1),
- .BR prezip\-bin (1),
- .BR run\-with\-aspell (1),
- .BR word\-list\-compress (1)
-diff -up aspell-0.60.6/manual/prezip-bin.1.pom aspell-0.60.6/manual/prezip-bin.1
---- aspell-0.60.6/manual/prezip-bin.1.pom	2005-10-21 14:18:23.000000000 +0200
-+++ aspell-0.60.6/manual/prezip-bin.1	2010-08-17 09:42:21.000000000 +0200
-@@ -99,7 +99,6 @@ the output file is not complete.
- .SH SEE ALSO
- .PP
- .BR aspell (1),
--.BR aspell\-import (1),
- .BR run\-with\-aspell (1),
- .BR word\-list\-compress (1)
- .PP
-diff -up aspell-0.60.6/manual/run-with-aspell.1.pom aspell-0.60.6/manual/run-with-aspell.1
---- aspell-0.60.6/manual/run-with-aspell.1.pom	2004-03-05 05:05:02.000000000 +0100
-+++ aspell-0.60.6/manual/run-with-aspell.1	2010-08-17 09:42:28.000000000 +0200
-@@ -28,7 +28,6 @@ such as ispell's own scripts.
- .SH SEE ALSO
- .PP
- .BR aspell (1),
--.BR aspell\-import (1),
- .BR word\-list\-compress (1)
- .PP
- Aspell is fully documented in its Texinfo manual.  See the
-diff -up aspell-0.60.6/manual/word-list-compress.1.pom aspell-0.60.6/manual/word-list-compress.1
---- aspell-0.60.6/manual/word-list-compress.1.pom	2005-10-21 14:18:23.000000000 +0200
-+++ aspell-0.60.6/manual/word-list-compress.1	2010-08-17 09:42:35.000000000 +0200
-@@ -80,7 +80,6 @@ be written to.
- .SH SEE ALSO
- .PP
- .BR aspell (1),
--.BR aspell\-import (1),
- .BR prezip\-bin (1),
- .BR run\-with\-aspell (1)
- .PP

aspell-0.60.6-zero.patch

@@ -1,11 +0,0 @@
-diff -up aspell-0.60.6/common/convert.cpp.zero aspell-0.60.6/common/convert.cpp
---- aspell-0.60.6/common/convert.cpp.zero	2007-12-03 07:55:45.000000000 +0100
-+++ aspell-0.60.6/common/convert.cpp	2008-09-01 12:04:39.000000000 +0200
-@@ -813,6 +813,7 @@ namespace acommon {
-   {
-     ToUniLookup lookup;
-     void decode(const char * in, int size, FilterCharVector & out) const {
-+      if (size == 0) return; // if size == 0 then while loop cause SIGSEGV
-       const char * stop = in + size; // this is OK even if size == -1
-       while (*in && in != stop) {
-         out.append(from_utf8(in, stop));

aspell-0.60.6.1-dump-personal-abort.patch

@@ -1,13 +0,0 @@
-diff -upr aspell-0.60.6.1.orig/prog/aspell.cpp aspell-0.60.6.1/prog/aspell.cpp
---- aspell-0.60.6.1.orig/prog/aspell.cpp	2011-07-04 11:13:58.000000000 +0200
-+++ aspell-0.60.6.1/prog/aspell.cpp	2012-07-19 15:16:43.204799622 +0200
-@@ -1570,7 +1570,8 @@ void personal () {
- 
-     Config * config = options;
-     Dictionary * per = new_default_writable_dict();
--    per->load(config->retrieve("personal-path"), *config);
-+    PosibErr<void> pe = per->load(config->retrieve("personal-path"), *config);
-+    if (pe.has_err()) {print_error(pe.get_err()->mesg); exit(1);}
-     StackPtr<WordEntryEnumeration> els(per->detailed_elements());
-     StackPtr<Convert> conv(setup_conv(per->lang(), config));
- 

aspell-0.60.6.1-fix-back-on-empty-vector.patch

@@ -1,38 +0,0 @@
-From c6755a399e8a31cbee5129dde5124f9c54a47ab6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
-Date: Wed, 4 Apr 2018 14:58:03 +0200
-Subject: [PATCH] Do not call back() on an empty vector
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Calling std::vector::back() on an empty container is undefined.
-Avoid doing that, simply return pointer to the beginning in case
-the vector is empty.
-
-Signed-off-by: Nikola Forró <nforro@redhat.com>
----
- common/vector.hpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/common/vector.hpp b/common/vector.hpp
-index 782e4b0..cb344bd 100644
---- a/common/vector.hpp
-+++ b/common/vector.hpp
-@@ -36,13 +36,13 @@ namespace acommon
-     }
-     T * data() {return &*this->begin();}
-     T * data(int pos) {return &*this->begin() + pos;}
--    T * data_end() {return &this->back()+1;}
-+    T * data_end() {return this->empty() ? &*this->begin() : &this->back()+1;}
- 
-     T * pbegin() {return &*this->begin();}
--    T * pend()   {return &this->back()+1;}
-+    T * pend()   {return this->empty() ? &*this->begin() : &this->back()+1;}
- 
-     const T * pbegin() const {return &*this->begin();}
--    const T * pend()   const {return &this->back()+1;}
-+    const T * pend()   const {return this->empty() ? &*this->begin() : &this->back()+1;}
- 
-     template <typename U>
-     U * datap() { 

aspell-0.60.6.1-gcc7-fixes.patch

@@ -1,34 +0,0 @@
-commit 8089fa02122fed0a6394eba14bbedcb1d18e2384
-Author: Kevin Atkinson <kevina@gnu.org>
-Date:   Thu Dec 29 00:50:31 2016 -0500
-
-    Compile Fixes for GCC 7.
-    
-    Closes #519.
-
-diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp
-index a979539..19ab63c 100644
---- a/modules/filter/tex.cpp
-+++ b/modules/filter/tex.cpp
-@@ -174,7 +174,7 @@ namespace {
- 
-     if (c == '{') {
- 
--      if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0')
-+      if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0')
- 	push_command(Parm);
- 
-       top.in_what = Parm;
-diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp
-index db54f3d..89ee09d 100644
---- a/prog/check_funs.cpp
-+++ b/prog/check_funs.cpp
-@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word, int width) {
-     }
-   }
-   if (i == width-1) {
--    if (word == '\0')
-+    if (*word == '\0')
-       put(out,' ');
-     else if (word[len] == '\0')
-       put(out, word, len);

aspell-0.60.8-pspell_conf.patch

@@ -1,50 +1,21 @@
-diff -up aspell-0.60.6.1/configure.mlib aspell-0.60.6.1/configure
---- aspell-0.60.6.1/configure.mlib	2011-08-16 11:40:48.000000000 +0200
-+++ aspell-0.60.6.1/configure	2011-08-16 11:41:44.013663519 +0200
-@@ -18989,7 +18989,7 @@ rm -f core conftest.err conftest.$ac_obj
- #                                                                 #
- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
- 
--ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile"
-+ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile aspell.pc scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile"
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -19985,7 +19985,7 @@ do
-     "modules/filter/Makefile") CONFIG_FILES="$CONFIG_FILES modules/filter/Makefile" ;;
-     "myspell/Makefile") CONFIG_FILES="$CONFIG_FILES myspell/Makefile" ;;
-     "lib5/Makefile") CONFIG_FILES="$CONFIG_FILES lib5/Makefile" ;;
--
-+    "aspell.pc" ) CONFIG_FILES="$CONFIG_FILES aspell.pc" ;;
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-diff -up aspell-0.60.6.1/Makefile.in.mlib aspell-0.60.6.1/Makefile.in
---- aspell-0.60.6.1/Makefile.in.mlib	2011-08-16 11:20:09.000000000 +0200
-+++ aspell-0.60.6.1/Makefile.in	2011-08-16 11:46:30.643236786 +0200
-@@ -816,6 +816,8 @@ clean-filterLTLIBRARIES:
- 	done
+diff --git a/Makefile.in b/Makefile.in
+index e5d2b1a..bc53e34 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1019,6 +1019,8 @@ clean-filterLTLIBRARIES:
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-+	mkdir -p $(libdir)/pkgconfig; \
-+	cp aspell.pc $(libdir)/pkgconfig/aspell.pc; \
- 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
++	mkdir -p $(DESTDIR)$(libdir)/pkgconfig; \
++	cp aspell.pc $(DESTDIR)$(libdir)/pkgconfig/aspell.pc; \
+ 	list2=; for p in $$list; do \
  	  if test -f $$p; then \
-diff -up aspell-0.60.6.1/scripts/mkconfig.mlib aspell-0.60.6.1/scripts/mkconfig
---- aspell-0.60.6.1/scripts/mkconfig.mlib	2004-01-03 13:06:24.000000000 +0100
-+++ aspell-0.60.6.1/scripts/mkconfig	2011-08-16 11:42:46.810519200 +0200
-@@ -15,7 +15,7 @@ case \$1 in
-   echo "$2"
-   ;;
- --pkgdatadir | pkgdatadir)
--  echo "$3"
-+  pkg-config aspell --variable=pkgdatadir
-   ;;
- *)
-   echo "usage: pspell-config version|datadir|pkgdatadir"
---- /dev/null	2007-01-02 09:09:01.616000852 +0100
-+++ aspell-0.60.6.1/aspell.pc.in	2007-01-02 14:59:04.000000000 +0100
+ 	    list2="$$list2 $$p"; \
+diff --git a/aspell.pc.in b/aspell.pc.in
+new file mode 100644
+index 0000000..13da044
+--- /dev/null
++++ b/aspell.pc.in
 @@ -0,0 +1,12 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -58,3 +29,37 @@ diff -up aspell-0.60.6.1/scripts/mkconfig.mlib aspell-0.60.6.1/scripts/mkconfig
 +Requires: 
 +Libs: -L${libdir} -laspell
 +Cflags: -I${includedir}
+diff --git a/configure b/configure
+index 8a6e697..995a3df 100755
+--- a/configure
++++ b/configure
+@@ -18732,7 +18732,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ #                                                                 #
+ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+ 
+-ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile"
++ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile aspell.pc scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -19887,6 +19887,7 @@ do
+     "modules/filter/Makefile") CONFIG_FILES="$CONFIG_FILES modules/filter/Makefile" ;;
+     "myspell/Makefile") CONFIG_FILES="$CONFIG_FILES myspell/Makefile" ;;
+     "lib5/Makefile") CONFIG_FILES="$CONFIG_FILES lib5/Makefile" ;;
++    "aspell.pc") CONFIG_FILES="$CONFIG_FILES aspell.pc" ;;
+ 
+   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+   esac
+diff --git a/scripts/mkconfig b/scripts/mkconfig
+index 608e3f7..f15f31c 100755
+--- a/scripts/mkconfig
++++ b/scripts/mkconfig
+@@ -15,7 +15,7 @@ case \$1 in
+   echo "$2"
+   ;;
+ --pkgdatadir | pkgdatadir)
+-  echo "$3"
++  pkg-config aspell --variable=pkgdatadir
+   ;;
+ *)
+   echo "usage: pspell-config version|datadir|pkgdatadir"

aspell.spec

@@ -1,44 +1,38 @@
-Name:          aspell
-Version:       0.60.6.1
-Release:       27
-Summary:       Spell checker
-Epoch:         12
-License:       LGPLv2+ and LGPLv2 and GPLv2+ and BSD
-URL:           http://aspell.net/
-Source:        http://mirrors.ustc.edu.cn/gnu/aspell/aspell-%{version}.tar.gz
+Summary: Spell checker
+Name: aspell
+Version: 0.60.8.1
+Release: 1
+Epoch: 12
+License: LGPL-2.0-or-later AND LGPL-2.1-only AND GPL-2.0-or-later AND BSD-2-Clause
+URL: http://aspell.net/
+Source: https://github.com/GNUAspell/aspell/archive/rel-{version}/aspell-rel-%{version}.tar.gz
 
-Patch0000:     aspell-0.60.3-install_info.patch
-Patch0001:     aspell-0.60.5-fileconflict.patch
-Patch0002:     aspell-0.60.5-pspell_conf.patch
-Patch0003:     aspell-0.60.6-zero.patch
-Patch0004:     aspell-0.60.6-mp.patch
-Patch0005:     aspell-0.60.6.1-dump-personal-abort.patch
-Patch0006:     aspell-0.60.6.1-aarch64.patch
-Patch0007:     aspell-0.60.6.1-gcc7-fixes.patch
-Patch0008:     aspell-0.60.6.1-fix-back-on-empty-vector.patch
-Patch0009:     CVE-2019-17544.patch
+Patch1: aspell-0.60.8-pspell_conf.patch
 
-BuildRequires: chrpath gettext ncurses-devel pkgconfig perl-interpreter gcc-c++
+BuildRequires: gcc-c++
+BuildRequires: chrpath, gettext, ncurses-devel, pkgconfig, perl-interpreter
+BuildRequires: make, gettext-devel, libtool,  texinfo
 
 %description
-GNU Aspell is a spell checker intended to replace Ispell.
-It can be used as a library and spell checker. Its main
-feature is that it provides much better suggestions than
-other inspectors, including Ispell and Microsoft Word.
-It also has many other technical enhancements to Ispell,
-such as the use of shared memory to store dictionaries,
-and intelligent processing of personal dictionaries when
-multiple Aspell processes are opened at one time.
+GNU Aspell is a spell checker designed to eventually replace Ispell. It can
+either be used as a library or as an independent spell checker. Its main
+feature is that it does a much better job of coming up with possible
+suggestions than just about any other spell checker out there for the
+English language, including Ispell and Microsoft Word. It also has many
+other technical enhancements over Ispell such as using shared memory for
+dictionaries and intelligently handling personal dictionaries when more
+than one Aspell process is open at once.
 
 %package devel
-Summary:      Libraries and header files for Aspell development
-Requires:     %{name} = %{epoch}:%{version}-%{release}
-Requires:     pkgconfig
+Summary: Libraries and header files for Aspell development
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 The aspell-devel package includes libraries
 and header files needed for Aspell development.
 
+
 %package help
 Summary:  Introduce how to use aspell
 
@@ -46,9 +40,9 @@ Summary:  Introduce how to use aspell
 User's Manual for aspell
 
 %prep
-%autosetup -n %{name}-%{version} -p1
-iconv -f iso-8859-2 -t utf-8 < manual/aspell.info > manual/aspell.info.aux
-mv manual/aspell.info.aux manual/aspell.info
+%setup -q -n aspell-rel-%{version}
+./autogen
+%patch1 -p1 -b .mlib
 
 %build
 %configure --disable-rpath
@@ -59,25 +53,39 @@ chmod 644 examples/aspell-import
 cp manual/aspell-import.1 examples/aspell-import.1
 
 %install
-%makeinstall
+%make_install
 
-install -d ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60
 
-mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/{ispell,spell} ${RPM_BUILD_ROOT}%{_bindir}
+mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/ispell ${RPM_BUILD_ROOT}%{_bindir}
+mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/spell ${RPM_BUILD_ROOT}%{_bindir}
 
-for path in nroff-filter.so sgml-filter.so context-filter.so email-filter.so tex-filter.so texinfo-filter.so;
-do
-        chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//$path;
-done
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//nroff-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//sgml-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//context-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//email-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//tex-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//texinfo-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//markdown-filter.so
 chrpath --delete ${RPM_BUILD_ROOT}%{_bindir}/aspell
 chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/libpspell.so.*
 
-rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man1/aspell-import.1
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/libaspell.la
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspell.la
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/*-filter.la
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/aspell-import
+rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/aspell-import.1
+rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 %find_lang %{name}
 
+
+%check
+make check
+
+
 %files -f %{name}.lang
-%doc COPYING examples/aspell-import examples/aspell-import.1
+%doc TODO COPYING examples/aspell-import examples/aspell-import.1
 %dir %{_libdir}/aspell-0.60
 %{_bindir}/a*
 %{_bindir}/ispell
@@ -93,6 +101,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man1/aspell-import.1
 %exclude %{_libdir}/aspell-0.60/*-filter.la
 %exclude %{_bindir}/aspell-import
 
+
 %files devel
 %dir %{_includedir}/pspell
 %{_bindir}/pspell-config
@@ -102,8 +111,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man1/aspell-import.1
 %{_libdir}/pkgconfig/*
 %{_infodir}/aspell-dev.*
 
+
 %files help
-%doc README TODO
+%doc  TODO
 %{_mandir}/man1/aspell.1.*
 %{_mandir}/man1/run-with-aspell.1*
 %{_mandir}/man1/word-list-compress.1*
@@ -111,6 +121,21 @@ rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man1/aspell-import.1
 %{_mandir}/man1/pspell-config.1*
 
 %changelog
+* Mon Mar 18 2024 wangkai <13474090681@163.com> - 12:0.60.8.1-1
+- Update to 0.60.8.1 and refix CVE-2019-25051
+
+* Sun Nov 6 2022 huyab<1229981468@qq.com> - 12:0.60.8-1
+- update version to 0.60.8-1
+
+* Thu Jul 28 2022 wuzx<wuzx1226@qq.com> - 12:0.60.6.1-30
+- add sw64 patch
+
+* Tue Sep 28 2021 yaoxin<yaoxin30@huawei.com> - 12:0.60.6.1-29
+- fix CVE-2019-20433
+
+* Thu Sep 23 2021 liwu<liwu13@huawei.com> - 12:0.60.6.1-28
+- fix CVE-2019-25051
+
 * Thu Jul 27 2021 houyingchao<houyingchao@huawei.com> - 12:0.60.6.1-27
 - fix CVE-2019-17544
 

aspell.yaml

@@ -1,4 +1,5 @@
 version_control: git
 src_repo: https://git.savannah.gnu.org/git/aspell.git
 tag_prefix: "rel-"
-seperator: "."
+separator: "."
+