The previous security patch included in gentoo for aspell was apparently incorrect. It counted the words rather than characters. This revision fixes that. This was brought to our attention by by Ludwig Nussel <ludwig.nussel@suse.de>

5 files changed, 175 insertions, 5 deletions

diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog
index 88ea57f494a0..a98bb4fb083e 100644
--- a/app-text/aspell/ChangeLog
+++ b/app-text/aspell/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/aspell
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.50 2004/07/30 21:09:05 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.51 2004/08/15 19:35:56 solar Exp $
+
+*aspell-0.50.5-r3 (15 Aug 2004)
+
+  15 Aug 2004; <solar@gentoo.org> aspell-0.50.5-r3.ebuild,
+  files/aspell-0.50.5-charcount.patch:
+  The previous security patch included in gentoo for aspell was apparently
+  incorrect. It counted the words rather than characters. This revision fixes
+  that. This was brought to our attention by by Ludwig Nussel
+  <ludwig.nussel@suse.de>
 
   30 Jul 2004; Anders Rune Jensen <arj@gentoo.org> aspell-0.50.5-r2.ebuild:
   Bugfix for aspell --mode=email by Alex Efros. Very good work! (#48865).
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index c3cc3d6e6d5b..94f65552e3e5 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -1,8 +1,11 @@
-MD5 c6c7bb2b4950bf7e9af89ce5ba8b1886 ChangeLog 8801
 MD5 aa27f7dd2cccb4862944b51f8884d07c aspell-0.50.5-r2.ebuild 1995
+MD5 bd81a2edc492c316a91504828344a1fb aspell-0.50.5-r3.ebuild 2024
+MD5 5f60d10eaae149b594ad8662d2baad92 ChangeLog 9176
 MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162
 MD5 4fa550930c5e5fb38177ac9f77619891 files/01-gcc3.3-assert.patch 309
-MD5 f956a4b48687a0823d0d5d7608b567e9 files/02-gcc3.3-constcast.patch 453
-MD5 02560c627d075d243720f1067bf45bcf files/aspell-buffer-fix.patch 1556
-MD5 1b5d84b6b88a3dfe388ad2e4b1f48155 files/digest-aspell-0.50.5-r2 66
 MD5 ec7c300a1661ae94b55736f74a045bab files/aspell-quotechar-fix.patch 473
+MD5 1b5d84b6b88a3dfe388ad2e4b1f48155 files/digest-aspell-0.50.5-r2 66
+MD5 1b5d84b6b88a3dfe388ad2e4b1f48155 files/digest-aspell-0.50.5-r3 66
+MD5 02560c627d075d243720f1067bf45bcf files/aspell-buffer-fix.patch 1556
+MD5 3b16724f78f28fb254ea58d8bdf2a272 files/aspell-0.50.5-charcount.patch 2241
+MD5 f956a4b48687a0823d0d5d7608b567e9 files/02-gcc3.3-constcast.patch 453
diff --git a/app-text/aspell/aspell-0.50.5-r3.ebuild b/app-text/aspell/aspell-0.50.5-r3.ebuild
new file mode 100644
index 000000000000..80dc8e479f26
--- /dev/null
+++ b/app-text/aspell/aspell-0.50.5-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.50.5-r3.ebuild,v 1.1 2004/08/15 19:35:56 solar Exp $
+
+inherit libtool eutils flag-o-matic
+
+DESCRIPTION="A spell checker replacement for ispell"
+HOMEPAGE="http://aspell.net/"
+SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390"
+IUSE="gpm"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	gpm? ( sys-libs/gpm )"
+
+pkg_setup() {
+	if [ ${ARCH} = "ppc" ] ; then
+		CXXFLAGS="-O2 -fsigned-char"
+		CFLAGS=${CXXFLAGS}
+	fi
+	use gpm && LDFLAGS="${LDFLAGS} -lgpm"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.50.5-charcount.patch
+	epatch ${FILESDIR}/${PN}-quotechar-fix.patch
+}
+
+src_compile() {
+	filter-flags -fno-rtti
+	elibtoolize --reverse-deps
+
+	econf \
+		--disable-static \
+		--sysconfdir=/etc/aspell \
+		--enable-docdir=/usr/share/doc/${PF} || die
+
+	emake || die
+}
+
+src_install() {
+	dodoc README* TODO
+
+	make DESTDIR=${D} install || die
+	mv ${D}/usr/share/doc/${PF}/man-html ${D}/usr/share/doc/${PF}/html
+	mv ${D}/usr/share/doc/${PF}/man-text ${D}/usr/share/doc/${PF}/text
+
+	# install ispell/aspell compatibility scripts
+	exeinto /usr/bin
+	newexe scripts/ispell ispell-aspell
+	newexe scripts/spell spell-aspell
+
+	cd examples
+	make clean || die
+	docinto examples
+	dodoc ${S}/examples/*
+
+}
+
+pkg_postinst() {
+	einfo "You will need to install a dictionary now.  Please choose an"
+	einfo "aspell-<LANG> dictionary from the app-dicts category"
+	einfo "After installing an aspell dictionary for your language(s),"
+	einfo "You may use the aspell-import utility to import your personal"
+	einfo "dictionaries from ispell, pspell and the older aspell"
+
+	ewarn ""
+	ewarn "Please re-emerge ALL your aspell-LANG dictionaries"
+	ewarn ""
+	for TICKER in 1 2 3 4 5; do
+		# Double beep here.
+		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+		echo -ne "\a" ; sleep 1
+	done
+}
diff --git a/app-text/aspell/files/aspell-0.50.5-charcount.patch b/app-text/aspell/files/aspell-0.50.5-charcount.patch
new file mode 100644
index 000000000000..9a11dd93de50
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.50.5-charcount.patch
@@ -0,0 +1,77 @@
+diff -Nrup aspell-0.50.5.orig/prog/compress.c aspell-0.50.5/prog/compress.c
+--- aspell-0.50.5.orig/prog/compress.c	2002-08-31 14:51:11.000000000 -0400
++++ aspell-0.50.5/prog/compress.c	2004-08-15 15:07:26.000000000 -0400
+@@ -28,24 +28,27 @@
+ 
+ #endif
+ 
++#define BUFSIZE 256
++
+ void usage () 
+ {
+   fputs("Compresses or uncompresses sorted word lists.\n"     , stderr);
+   fputs("For best result the locale should be set to C\n"    , stderr);
+   fputs("before sorting by setting the environmental\n"       , stderr);
+   fputs("variable LANG to \"C\" before sorting.\n"            , stderr);
+-  fputs("Copyright 2001 by Kevin Atkinson.\n"  , stderr);
++  fputs("Copyright 2001-2004 by Kevin Atkinson.\n"  , stderr);
+   fputs("Usage: word-list-compress c[ompress]|d[ecompress]\n" , stderr);
+ }
+ 
+-static int get_word(FILE * in, char * w) 
++static int get_word(FILE * in, char * w, size_t bufsize) 
+ {
+   int c;
+   while (c = getc(in), c != EOF && c <= 32);
+   if (c == EOF) return 0;
+   do {
+     *w++ = (char)(c);
+-  } while (c = getc(in), c != EOF && c > 32);
++  --bufsize;
++  } while (c = getc(in), c != EOF && c > 32 && bufsize > 1);
+   *w = '\0';
+   ungetc(c, in);
+   if (c == EOF) return 0;
+@@ -61,15 +64,15 @@ int main (int argc, const char *argv[]) 
+     
+   } else if (argv[1][0] == 'c') {
+ 
+-    char s1[256];
+-    char s2[256];
++    char s1[BUFSIZE];
++    char s2[BUFSIZE];
+     char * prev = s2;
+     char * cur = s1;
+     *prev = '\0';
+ 
+     SETBIN (stdout);
+ 
+-    while (get_word(stdin, cur)) {
++    while (get_word(stdin, cur, BUFSIZE)) {
+       int i = 0;
+       /* get the length of the prefix */
+       while (prev[i] != '\0' && cur[i] != '\0' && prev[i] == cur[i])
+@@ -99,9 +102,10 @@ int main (int argc, const char *argv[]) 
+     while (i != -1 ) {
+       if (i == 0)
+ 	i = getc(stdin);
+-      --i;  
+-      while ((c = getc(stdin)) > 32)
++      --i;
++      while ((c = getc(stdin)) > 32 && i < BUFSIZE)
+ 	cur[i++] = (char)c;
++      if (i >= BUFSIZE) goto error;
+       cur[i] = '\0';
+       fputs(cur, stdout);
+       putc('\n', stdout);
+@@ -109,6 +113,10 @@ int main (int argc, const char *argv[]) 
+     }
+     return 0;
+ 
++error:
++   fputs("ERROR: Corrupt Input.\n", stderr);
++   return 2;
++
+   } else {
+ 
+     usage();
diff --git a/app-text/aspell/files/digest-aspell-0.50.5-r3 b/app-text/aspell/files/digest-aspell-0.50.5-r3
new file mode 100644
index 000000000000..d497ea8286ff
--- /dev/null
+++ b/app-text/aspell/files/digest-aspell-0.50.5-r3
@@ -0,0 +1 @@
+MD5 14403d2ea5ded5d3fc9bb259bf65aab5 aspell-0.50.5.tar.gz 1016586