fix for the patch, only stable is the -r2 which forces the new fixed patched

9 files changed, 59 insertions, 149 deletions

diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog
index 6b50ba80c047..9d2d7c77e88a 100644
--- a/app-text/aspell/ChangeLog
+++ b/app-text/aspell/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/aspell
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.44 2004/06/10 16:13:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.45 2004/06/16 17:33:41 seemant Exp $
+
+*aspell-0.50.5-r2 (16 Jun 2004)
+
+  16 Jun 2004; Seemant Kulleen <seemant@gentoo.org>
+  files/aspell-buffer-fix.patch, -aspell-0.50.5-r1.ebuild,
+  +aspell-0.50.5-r2.ebuild, -aspell-0.50.5.ebuild:
+  Fix the buffer patch for the truncated dictionaries issue reported in bug
+  #53801 by Tom Wesley <tom.wesley@ntlworld.com>. Adam Bregenzer
+  <adam@bregenzer.net> posted a patch to the patch there, so big-up to him.
+  Removed crusty 50.5 versions, and -r2 straight to stable for everyone
 
   10 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> aspell-0.50.5-r1.ebuild:
   Stable on alpha, bug #53389.
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 45074391a93c..6f9979ea8dd1 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -1,11 +1,9 @@
-MD5 7da455f49e6d65bf05bfffa917156f90 aspell-0.50.5.ebuild 1601
-MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162
+MD5 de4dffd84b482bcebf1f339cb6419078 aspell-0.50.5-r2.ebuild 1695
 MD5 18093407abb990118dc90124dcbe3201 aspell-0.50.4.1.ebuild 1523
 MD5 f7fb5fc4bfca91c99839fd9c86d5ad82 ChangeLog 7848
-MD5 de4dffd84b482bcebf1f339cb6419078 aspell-0.50.5-r1.ebuild 1695
-MD5 1b5d84b6b88a3dfe388ad2e4b1f48155 files/digest-aspell-0.50.5-r1 66
-MD5 49ee9111cd812ddb089fc5592780ac13 files/aspell-buffer-fix.patch 1094
-MD5 4fa550930c5e5fb38177ac9f77619891 files/01-gcc3.3-assert.patch 309
+MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162
 MD5 9d6c4f620a419b9ef08ddaf327adff75 files/digest-aspell-0.50.4.1 67
+MD5 4fa550930c5e5fb38177ac9f77619891 files/01-gcc3.3-assert.patch 309
+MD5 1b5d84b6b88a3dfe388ad2e4b1f48155 files/digest-aspell-0.50.5-r2 66
+MD5 02560c627d075d243720f1067bf45bcf files/aspell-buffer-fix.patch 1556
 MD5 f956a4b48687a0823d0d5d7608b567e9 files/02-gcc3.3-constcast.patch 453
-MD5 1b5d84b6b88a3dfe388ad2e4b1f48155 files/digest-aspell-0.50.5 66
diff --git a/app-text/aspell/aspell-0.50.4.1.ebuild b/app-text/aspell/aspell-0.50.4.1.ebuild
deleted file mode 100644
index e5f513748241..000000000000
--- a/app-text/aspell/aspell-0.50.4.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.50.4.1.ebuild,v 1.8 2004/05/07 22:22:59 ciaranm Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-SRC_URI="http://aspell.net/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc sparc ~alpha ~mips ~hppa -amd64 ia64"
-IUSE="gpm"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	gpm? ( sys-libs/gpm )"
-
-src_compile() {
-	if [ "${ARCH}" == "ppc" ] ; then
-		export CXXFLAGS="-O2 -fsigned-char"
-		export CFLAGS="${CXXFLAGS}"
-	fi
-	use gpm && append-ldflags -lgpm
-	epatch ${FILESDIR}/01-gcc3.3-assert.patch
-
-	elibtoolize --reverse-deps
-
-	econf \
-		--disable-static \
-		--sysconfdir=/etc/aspell \
-		--enable-docdir=/usr/share/doc/${PF} || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	cd ${D}/usr/share/doc/${P}
-	dohtml -r man-html
-	rm -rf man-html
-	docinto text
-	dodoc man-text
-	rm -rf man-text
-	cd ${S}
-
-	dodoc README* TODO
-
-	cd examples
-	make clean || die
-	cd ${S}
-
-	docinto examples
-	dodoc 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"
-}
diff --git a/app-text/aspell/aspell-0.50.5-r1.ebuild b/app-text/aspell/aspell-0.50.5-r2.ebuild
index 8fe366f3e3d3..cbf0b8754910 100644
--- a/app-text/aspell/aspell-0.50.5-r1.ebuild
+++ b/app-text/aspell/aspell-0.50.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.50.5-r1.ebuild,v 1.7 2004/06/10 16:13:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.50.5-r2.ebuild,v 1.1 2004/06/16 17:33:41 seemant Exp $
 
 inherit libtool eutils
 
@@ -66,4 +66,13 @@ pkg_postinst() {
 	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/aspell-0.50.5.ebuild b/app-text/aspell/aspell-0.50.5.ebuild
deleted file mode 100644
index 4fbe8490da8c..000000000000
--- a/app-text/aspell/aspell-0.50.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.50.5.ebuild,v 1.10 2004/06/06 21:31:12 lv Exp $
-
-inherit libtool
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-SRC_URI="http://aspell.net/${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="-lgpm"
-}
-
-src_compile() {
-	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"
-}
diff --git a/app-text/aspell/files/aspell-buffer-fix.patch b/app-text/aspell/files/aspell-buffer-fix.patch
index cf43e7b9d56c..c0b0de6be0e5 100644
--- a/app-text/aspell/files/aspell-buffer-fix.patch
+++ b/app-text/aspell/files/aspell-buffer-fix.patch
@@ -1,33 +1,48 @@
-diff -urN 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 11:51:11.000000000 -0700
-+++ aspell-0.50.5/prog/compress.c	2004-06-09 13:11:46.000000000 -0700
-@@ -28,6 +28,9 @@
+diff -urN aspell-0.50.5/prog/compress.c aspell-0.50.5.new/prog/compress.c
+--- aspell-0.50.5/prog/compress.c	2002-08-31 11:51:11.000000000 -0700
++++ aspell-0.50.5.new/prog/compress.c	2004-06-16 10:14:42.000000000 -0700
+@@ -28,6 +28,11 @@
  
  #endif
  
-+int count;
++#define WORD_BUFF_SIZE 256
++
++int count = 0;
 +
 +
  void usage () 
  {
    fputs("Compresses or uncompresses sorted word lists.\n"     , stderr);
-@@ -47,6 +50,7 @@
+@@ -45,8 +50,9 @@
+   if (c == EOF) return 0;
+   do {
      *w++ = (char)(c);
-   } while (c = getc(in), c != EOF && c > 32);
+-  } while (c = getc(in), c != EOF && c > 32);
++  } while (c = getc(in), c != EOF && c > 32 && count < (WORD_BUFF_SIZE - 1));
    *w = '\0';
 +  count++;
    ungetc(c, in);
    if (c == EOF) return 0;
    else return 1;
-@@ -69,6 +73,7 @@
+@@ -61,14 +67,15 @@
+     
+   } else if (argv[1][0] == 'c') {
+ 
+-    char s1[256];
+-    char s2[256];
++    char s1[WORD_BUFF_SIZE];
++    char s2[WORD_BUFF_SIZE];
+     char * prev = s2;
+     char * cur = s1;
+     *prev = '\0';
  
      SETBIN (stdout);
  
-+	while (count < 256) {
++	while (count < WORD_BUFF_SIZE) {
      while (get_word(stdin, cur)) {
        int i = 0;
        /* get the length of the prefix */
-@@ -85,6 +90,7 @@
+@@ -85,11 +92,12 @@
  	prev = s2; cur = s1;
        }
      }
@@ -35,12 +50,18 @@ diff -urN aspell-0.50.5.orig/prog/compress.c aspell-0.50.5/prog/compress.c
      return 0;
  
    } else if (argv[1][0] == 'd') {
-@@ -100,8 +106,11 @@
+     
+-    char cur[256];
++    char cur[WORD_BUFF_SIZE];
+     int i;
+     int c;
+ 
+@@ -100,8 +108,11 @@
        if (i == 0)
  	i = getc(stdin);
        --i;  
 -      while ((c = getc(stdin)) > 32)
-+      while ((c = getc(stdin)) > 32 && count < 256) {
++      while ((c = getc(stdin)) > 32 && i < (WORD_BUFF_SIZE -1)) {
  	cur[i++] = (char)c;
 +	count++;
 +	}
diff --git a/app-text/aspell/files/digest-aspell-0.50.4.1 b/app-text/aspell/files/digest-aspell-0.50.4.1
deleted file mode 100644
index 004a36b845b7..000000000000
--- a/app-text/aspell/files/digest-aspell-0.50.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1370b8c628b63f79af63589d40fe27ec aspell-0.50.4.1.tar.gz 962279
diff --git a/app-text/aspell/files/digest-aspell-0.50.5-r1 b/app-text/aspell/files/digest-aspell-0.50.5-r1
deleted file mode 100644
index d497ea8286ff..000000000000
--- a/app-text/aspell/files/digest-aspell-0.50.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 14403d2ea5ded5d3fc9bb259bf65aab5 aspell-0.50.5.tar.gz 1016586
diff --git a/app-text/aspell/files/digest-aspell-0.50.5 b/app-text/aspell/files/digest-aspell-0.50.5-r2
index d497ea8286ff..d497ea8286ff 100644
--- a/app-text/aspell/files/digest-aspell-0.50.5
+++ b/app-text/aspell/files/digest-aspell-0.50.5-r2