Tue Oct 22 11:05:37 2019 UTC ()
Pullup ticket #6072 - requested by nia
textproc/aspell: security fix

Revisions pulled up:
- textproc/aspell/Makefile                                      1.74
- textproc/aspell/PLIST                                         1.18
- textproc/aspell/distinfo                                      1.31
- textproc/aspell/options.mk                                    deleted

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sat Oct 19 10:43:28 UTC 2019

   Modified Files:
   	pkgsrc/textproc/aspell: Makefile PLIST distinfo
   Removed Files:
   	pkgsrc/textproc/aspell: options.mk

   Log Message:
   aspell: Update to 0.68.8

   Please note that this version has the potential to break some applications
   that use null-terminated UCS-2 and UCS-4 encoded strings in order to fix a
   potentially unbounded buffer over-read.  Very few applications do this
   however.  For additional information please see "Upgrading from Aspell 0.60.7"
   in the manual.
   (http://aspell.net/man-html/Upgrading-from-Aspell-0_002e60_002e7.html)

   Major changes from 0.60.7 to 0.68.8:

       * Prevent a potentially unbounded buffer over-read by no longer
         supporting null-terminated UCS-2 and UCS-4 encoded strings with the
         original C API.

       * Ensure that possible typos are listed before other suggestions when
         typo analysis is used.  Also fix a bug so that suggestions that
         split a word using a space or hyphen are not always first.

       * Add Markdown filter.

       * Add new 'wordlists' option, which is a list of UTF-8 files that
         contain additional words to accept.

       * Add new 'camel-case' option, which enables support for checking
         camelCase words.

       * Sort personal and replacement dictionaries.

       * Change 'ultra' suggestion mode to only find words that are within
         one-edit distance or have the same soundslike.

   Other changes from 0.60.7:

       * Implement the 'aspell filter' command.
       * Fix a bug in 'AspellDocumentChecker' that prevented it from working
         with UCS-2 and UCS-4 encoded strings.
       * Remove unused 'sug-edit-dist' option.
       * 'AspellDocumentChecker' now expects the document a line at a time
         in order to work with the new Markdown filter.  If the document is
         split on white space characters instead, nothing will break, but
         new filters such as the Markdown filter may give incorrect results.
       * The 'clean' option and command will no longer split a word.
       * Various documentation improvements.
       * Removal of several outdated appendices that don't really belong in
         the main manual.  Parts that are still relevent may eventually be
         moved elsewhere, but for now they are available online at
         <http://aspell.net/0.60.7/man-html/>.
       * Fix various crashes and other problems found by Google's OSS-Fuzz.


(bsiegert)
diff -r1.73 -r1.73.2.1 pkgsrc/textproc/aspell/Makefile
diff -r1.17 -r1.17.2.1 pkgsrc/textproc/aspell/PLIST
diff -r1.30 -r1.30.2.1 pkgsrc/textproc/aspell/distinfo
diff -r1.1 -r0 pkgsrc/textproc/aspell/options.mk
cvs diff -r1.73 -r1.73.2.1 pkgsrc/textproc/aspell/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/aspell/Makefile 2019/09/15 06:53:36 1.73
+++ pkgsrc/textproc/aspell/Makefile 2019/10/22 11:05:37 1.73.2.1
@@ -1,56 +1,56 @@ @@ -1,56 +1,56 @@
1# $NetBSD: Makefile,v 1.73 2019/09/15 06:53:36 maya Exp $ 1# $NetBSD: Makefile,v 1.73.2.1 2019/10/22 11:05:37 bsiegert Exp $
2# 
3 2
4DISTNAME= aspell-0.60.7 3DISTNAME= aspell-0.60.8
5CATEGORIES= textproc 4CATEGORIES= textproc
6MASTER_SITES= ${MASTER_SITE_GNU:=aspell/} 5MASTER_SITES= ${MASTER_SITE_GNU:=aspell/}
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://aspell.net/ 8HOMEPAGE= http://aspell.net/
10COMMENT= Spell checker with good multi-language support 9COMMENT= Spell checker with good multi-language support
11LICENSE= gnu-lgpl-v2.1 10LICENSE= gnu-lgpl-v2.1
12 11
13CONFLICTS= libpspell-[0-9]* 12CONFLICTS= libpspell-[0-9]*
14 13
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16USE_FEATURES= snprintf vsnprintf 15USE_FEATURES= snprintf vsnprintf
17USE_TOOLS+= gmake 16USE_TOOLS+= gmake
 17USE_TOOLS+= msgfmt msgmerge xgettext
18# for bin/aspell-import 18# for bin/aspell-import
19USE_TOOLS+= perl:run 19USE_TOOLS+= perl:run
20USE_LIBTOOL= yes 20USE_LIBTOOL= yes
21USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
22USE_NCURSES= yes 22USE_NCURSES= yes
23USE_PKGLOCALEDIR= yes 23USE_PKGLOCALEDIR= yes
24INFO_FILES= yes 24INFO_FILES= yes
25 25
26CONFIGURE_ARGS+= --enable-doc-dir=${PREFIX}/share/doc/aspell 26CONFIGURE_ARGS+= --enable-doc-dir=${PREFIX}/share/doc/aspell
27CONFIGURE_ARGS+= --enable-curses=${CURSES_TYPE} 27CONFIGURE_ARGS+= --enable-curses=${CURSES_TYPE}
28CONFIGURE_ARGS+= --enable-pkgdatadir=${PREFIX}/share/aspell 28CONFIGURE_ARGS+= --enable-pkgdatadir=${PREFIX}/share/aspell
29CONFIGURE_ARGS+= --enable-dict-dir=${PREFIX}/lib/aspell 29CONFIGURE_ARGS+= --enable-dict-dir=${PREFIX}/lib/aspell
 30# https://github.com/GNUAspell/aspell/issues/336
 31CONFIGURE_ARGS+= --enable-compile-in-filters
30CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes 32CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes
31 33
32.include "../../mk/bsd.prefs.mk" 34.include "../../mk/bsd.prefs.mk"
33 35
34# aspell does not work with curses in NetBSD <= 8.0. 36# aspell does not work with curses in NetBSD <= 8.0.
35.if !empty(MACHINE_PLATFORM:MNetBSD-8.0*) || \ 37.if !empty(MACHINE_PLATFORM:MNetBSD-8.0*) || \
36 !empty(MACHINE_PLATFORM:MNetBSD-[0-7].*) 38 !empty(MACHINE_PLATFORM:MNetBSD-[0-7].*)
37USE_CURSES= ncurses 39USE_CURSES= ncurses
38.endif 40.endif
39 41
40.if !empty(MACHINE_PLATFORM:MIRIX-5*) 42.if !empty(MACHINE_PLATFORM:MIRIX-5*)
41CPPFLAGS+= -DDECLARE_VSNPRINTF -DDECLARE_SNPRINTF 43CPPFLAGS+= -DDECLARE_VSNPRINTF -DDECLARE_SNPRINTF
42# IRIX 5 has an older implementation of signal() 44# IRIX 5 has an older implementation of signal()
43CPPFLAGS+= -DHAVE_OLD_SIGNAL 45CPPFLAGS+= -DHAVE_OLD_SIGNAL
44.endif 46.endif
45 47
46.include "options.mk" 
47 
48REPLACE_PERL= scripts/aspell-import 48REPLACE_PERL= scripts/aspell-import
49 49
50NOT_FOR_COMPILER= xlc 50NOT_FOR_COMPILER= xlc
51 51
52LIBS.SunOS+= -lm 52LIBS.SunOS+= -lm
53 53
54.include "../../devel/gettext-lib/buildlink3.mk" 54.include "../../devel/gettext-lib/buildlink3.mk"
55.include "../../mk/curses.buildlink3.mk" 55.include "../../mk/curses.buildlink3.mk"
56.include "../../mk/bsd.pkg.mk" 56.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.17.2.1 pkgsrc/textproc/aspell/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/aspell/PLIST 2019/09/15 06:53:36 1.17
+++ pkgsrc/textproc/aspell/PLIST 2019/10/22 11:05:37 1.17.2.1
@@ -1,74 +1,66 @@ @@ -1,74 +1,66 @@
1@comment $NetBSD: PLIST,v 1.17 2019/09/15 06:53:36 maya Exp $ 1@comment $NetBSD: PLIST,v 1.17.2.1 2019/10/22 11:05:37 bsiegert Exp $
2bin/aspell 2bin/aspell
3bin/aspell-import 3bin/aspell-import
4bin/precat 4bin/precat
5bin/preunzip 5bin/preunzip
6bin/prezip 6bin/prezip
7bin/prezip-bin 7bin/prezip-bin
8bin/pspell-config 8bin/pspell-config
9bin/run-with-aspell 9bin/run-with-aspell
10bin/word-list-compress 10bin/word-list-compress
11include/aspell.h 11include/aspell.h
12include/pspell/pspell.h 12include/pspell/pspell.h
13info/aspell-dev.info 13info/aspell-dev.info
14info/aspell.info 14info/aspell.info
15lib/aspell/ccpp.amf 15lib/aspell/ccpp.amf
16lib/aspell/comment.amf 16lib/aspell/comment.amf
17${PLIST.filters}lib/aspell/context-filter.la 
18${PLIST.filters}lib/aspell/email-filter.la 
19lib/aspell/email.amf 17lib/aspell/email.amf
20lib/aspell/html.amf 18lib/aspell/html.amf
 19lib/aspell/markdown.amf
21lib/aspell/none.amf 20lib/aspell/none.amf
22${PLIST.filters}lib/aspell/nroff-filter.la 
23lib/aspell/nroff.amf 21lib/aspell/nroff.amf
24lib/aspell/perl.amf 22lib/aspell/perl.amf
25${PLIST.filters}lib/aspell/sgml-filter.la 
26lib/aspell/sgml.amf 23lib/aspell/sgml.amf
27${PLIST.filters}lib/aspell/tex-filter.la 
28lib/aspell/tex.amf 24lib/aspell/tex.amf
29${PLIST.filters}lib/aspell/texinfo-filter.la 
30lib/aspell/texinfo.amf 25lib/aspell/texinfo.amf
31lib/aspell/url.amf 26lib/aspell/url.amf
32lib/libaspell.la 27lib/libaspell.la
33lib/libpspell.la 28lib/libpspell.la
34man/man1/aspell-import.1 29man/man1/aspell-import.1
35man/man1/aspell.1 30man/man1/aspell.1
36man/man1/prezip-bin.1 31man/man1/prezip-bin.1
37man/man1/pspell-config.1 32man/man1/pspell-config.1
38man/man1/run-with-aspell.1 33man/man1/run-with-aspell.1
39man/man1/word-list-compress.1 34man/man1/word-list-compress.1
40${PLIST.filters}share/aspell/context-filter.info 
41share/aspell/cp1250.cmap 35share/aspell/cp1250.cmap
42share/aspell/cp1250.cset 36share/aspell/cp1250.cset
43share/aspell/cp1251.cmap 37share/aspell/cp1251.cmap
44share/aspell/cp1251.cset 38share/aspell/cp1251.cset
45share/aspell/cp1252.cmap 39share/aspell/cp1252.cmap
46share/aspell/cp1252.cset 40share/aspell/cp1252.cset
47share/aspell/cp1253.cmap 41share/aspell/cp1253.cmap
48share/aspell/cp1253.cset 42share/aspell/cp1253.cset
49share/aspell/cp1254.cmap 43share/aspell/cp1254.cmap
50share/aspell/cp1254.cset 44share/aspell/cp1254.cset
51share/aspell/cp1255.cmap 45share/aspell/cp1255.cmap
52share/aspell/cp1255.cset 46share/aspell/cp1255.cset
53share/aspell/cp1256.cmap 47share/aspell/cp1256.cmap
54share/aspell/cp1256.cset 48share/aspell/cp1256.cset
55share/aspell/cp1257.cmap 49share/aspell/cp1257.cmap
56share/aspell/cp1257.cset 50share/aspell/cp1257.cset
57share/aspell/cp1258.cmap 51share/aspell/cp1258.cmap
58share/aspell/cp1258.cset 52share/aspell/cp1258.cset
59share/aspell/dvorak.kbd 53share/aspell/dvorak.kbd
60${PLIST.filters}share/aspell/email-filter.info 
61${PLIST.filters}share/aspell/html-filter.info 
62share/aspell/iso-8859-1.cmap 54share/aspell/iso-8859-1.cmap
63share/aspell/iso-8859-1.cset 55share/aspell/iso-8859-1.cset
64share/aspell/iso-8859-10.cmap 56share/aspell/iso-8859-10.cmap
65share/aspell/iso-8859-10.cset 57share/aspell/iso-8859-10.cset
66share/aspell/iso-8859-11.cmap 58share/aspell/iso-8859-11.cmap
67share/aspell/iso-8859-11.cset 59share/aspell/iso-8859-11.cset
68share/aspell/iso-8859-13.cmap 60share/aspell/iso-8859-13.cmap
69share/aspell/iso-8859-13.cset 61share/aspell/iso-8859-13.cset
70share/aspell/iso-8859-14.cmap 62share/aspell/iso-8859-14.cmap
71share/aspell/iso-8859-14.cset 63share/aspell/iso-8859-14.cset
72share/aspell/iso-8859-15.cmap 64share/aspell/iso-8859-15.cmap
73share/aspell/iso-8859-15.cset 65share/aspell/iso-8859-15.cset
74share/aspell/iso-8859-16.cmap 66share/aspell/iso-8859-16.cmap
@@ -84,33 +76,29 @@ share/aspell/iso-8859-5.cset @@ -84,33 +76,29 @@ share/aspell/iso-8859-5.cset
84share/aspell/iso-8859-6.cmap 76share/aspell/iso-8859-6.cmap
85share/aspell/iso-8859-6.cset 77share/aspell/iso-8859-6.cset
86share/aspell/iso-8859-7.cmap 78share/aspell/iso-8859-7.cmap
87share/aspell/iso-8859-7.cset 79share/aspell/iso-8859-7.cset
88share/aspell/iso-8859-8.cmap 80share/aspell/iso-8859-8.cmap
89share/aspell/iso-8859-8.cset 81share/aspell/iso-8859-8.cset
90share/aspell/iso-8859-9.cmap 82share/aspell/iso-8859-9.cmap
91share/aspell/iso-8859-9.cset 83share/aspell/iso-8859-9.cset
92share/aspell/ispell 84share/aspell/ispell
93share/aspell/koi8-r.cmap 85share/aspell/koi8-r.cmap
94share/aspell/koi8-r.cset 86share/aspell/koi8-r.cset
95share/aspell/koi8-u.cmap 87share/aspell/koi8-u.cmap
96share/aspell/koi8-u.cset 88share/aspell/koi8-u.cset
97${PLIST.filters}share/aspell/nroff-filter.info 
98${PLIST.filters}share/aspell/sgml-filter.info 
99share/aspell/spell 89share/aspell/spell
100share/aspell/split.kbd 90share/aspell/split.kbd
101share/aspell/standard.kbd 91share/aspell/standard.kbd
102${PLIST.filters}share/aspell/tex-filter.info 
103${PLIST.filters}share/aspell/texinfo-filter.info 
104share/locale/ast/LC_MESSAGES/aspell.mo 92share/locale/ast/LC_MESSAGES/aspell.mo
105share/locale/be/LC_MESSAGES/aspell.mo 93share/locale/be/LC_MESSAGES/aspell.mo
106share/locale/ca/LC_MESSAGES/aspell.mo 94share/locale/ca/LC_MESSAGES/aspell.mo
107share/locale/cs/LC_MESSAGES/aspell.mo 95share/locale/cs/LC_MESSAGES/aspell.mo
108share/locale/da/LC_MESSAGES/aspell.mo 96share/locale/da/LC_MESSAGES/aspell.mo
109share/locale/de/LC_MESSAGES/aspell.mo 97share/locale/de/LC_MESSAGES/aspell.mo
110share/locale/en_GB/LC_MESSAGES/aspell.mo 98share/locale/en_GB/LC_MESSAGES/aspell.mo
111share/locale/eo/LC_MESSAGES/aspell.mo 99share/locale/eo/LC_MESSAGES/aspell.mo
112share/locale/es/LC_MESSAGES/aspell.mo 100share/locale/es/LC_MESSAGES/aspell.mo
113share/locale/fi/LC_MESSAGES/aspell.mo 101share/locale/fi/LC_MESSAGES/aspell.mo
114share/locale/fr/LC_MESSAGES/aspell.mo 102share/locale/fr/LC_MESSAGES/aspell.mo
115share/locale/fur/LC_MESSAGES/aspell.mo 103share/locale/fur/LC_MESSAGES/aspell.mo
116share/locale/ga/LC_MESSAGES/aspell.mo 104share/locale/ga/LC_MESSAGES/aspell.mo
cvs diff -r1.30 -r1.30.2.1 pkgsrc/textproc/aspell/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/aspell/distinfo 2019/09/15 06:53:36 1.30
+++ pkgsrc/textproc/aspell/distinfo 2019/10/22 11:05:37 1.30.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.30 2019/09/15 06:53:36 maya Exp $ 1$NetBSD: distinfo,v 1.30.2.1 2019/10/22 11:05:37 bsiegert Exp $
2 2
3SHA1 (aspell-0.60.7.tar.gz) = 80ef99a68e7e672f0eb06fac844387494e594948 3SHA1 (aspell-0.60.8.tar.gz) = ae554df297aee676b4d16f261fa5c60e285478f6
4RMD160 (aspell-0.60.7.tar.gz) = 9463ce8f8f5db73e403cc8ee4ea9f4c66fb1ed25 4RMD160 (aspell-0.60.8.tar.gz) = 331a10149aa4efe9b6798137d6a56a0a44fcf570
5SHA512 (aspell-0.60.7.tar.gz) = 6f5fcd1c29164ee18f205594b66f382b51d19b17686293a931ca92c1442d3f7228627ca7d604d860551d0d367ac34dfb2ae34170a844f51e84e390fb1edc4535 5SHA512 (aspell-0.60.8.tar.gz) = 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29
6Size (aspell-0.60.7.tar.gz) = 2071890 bytes 6Size (aspell-0.60.8.tar.gz) = 3486448 bytes
7SHA1 (patch-ab) = 615a676128dab7d79e697f56330c8aaa6c901d3f 7SHA1 (patch-ab) = 615a676128dab7d79e697f56330c8aaa6c901d3f
8SHA1 (patch-ac) = e748877b22ca116454155d3659c16efaf02e7963 8SHA1 (patch-ac) = e748877b22ca116454155d3659c16efaf02e7963
9SHA1 (patch-ad) = 5e525ed1e91b3271567f4255729e94159be86f58 9SHA1 (patch-ad) = 5e525ed1e91b3271567f4255729e94159be86f58
10SHA1 (patch-ae) = d35f3544f44464a36685903ade3cdeb59c5fd836 10SHA1 (patch-ae) = d35f3544f44464a36685903ade3cdeb59c5fd836
11SHA1 (patch-af) = b34d98280c83f270f86ad3cf0f31e48688f53138 11SHA1 (patch-af) = b34d98280c83f270f86ad3cf0f31e48688f53138
12SHA1 (patch-ag) = 5aabf8d9a9a28db9dee073bdfcd62fbc3e2f38c0 12SHA1 (patch-ag) = 5aabf8d9a9a28db9dee073bdfcd62fbc3e2f38c0
13SHA1 (patch-ai) = 4fbb25e3f09aa97bdcb12f325ef615e5a6f9f626 13SHA1 (patch-ai) = 4fbb25e3f09aa97bdcb12f325ef615e5a6f9f626
14SHA1 (patch-an) = 687cf83ad9be083da0a53e7a7b5cbaefe88f63a5 14SHA1 (patch-an) = 687cf83ad9be083da0a53e7a7b5cbaefe88f63a5
15SHA1 (patch-interfaces_cc_aspell.h) = f824d0bb1e3c55faaf6ecae10b44169d91b41517 15SHA1 (patch-interfaces_cc_aspell.h) = f824d0bb1e3c55faaf6ecae10b44169d91b41517
16SHA1 (patch-prog_aspell.cpp) = 9bc6537cd0b9040fef56be202f0c5f6ab64fdf85 16SHA1 (patch-prog_aspell.cpp) = 9bc6537cd0b9040fef56be202f0c5f6ab64fdf85
17SHA1 (patch-prog_checker__string.hpp) = b070e776a0998f17e4ff30cd004179585f70f3df 17SHA1 (patch-prog_checker__string.hpp) = b070e776a0998f17e4ff30cd004179585f70f3df
File Deleted: pkgsrc/textproc/aspell/Attic/options.mk