head 1.9; access; symbols OPENPKG_E1_MP_HEAD:1.9 OPENPKG_E1_MP:1.9 OPENPKG_E1_MP_2_STABLE:1.8 OPENPKG_E1_FP:1.8 OPENPKG_2_STABLE_MP:1.8 OPENPKG_2_STABLE_20061018:1.8 OPENPKG_2_STABLE_20060622:1.8 OPENPKG_2_STABLE:1.8.0.2 OPENPKG_2_STABLE_BP:1.8 OPENPKG_2_5_RELEASE:1.7 OPENPKG_2_5_SOLID:1.7.0.6 OPENPKG_2_5_SOLID_BP:1.7 OPENPKG_2_4_RELEASE:1.7 OPENPKG_2_4_SOLID:1.7.0.4 OPENPKG_2_4_SOLID_BP:1.7 OPENPKG_CW_FP:1.7 OPENPKG_2_3_RELEASE:1.7 OPENPKG_2_3_SOLID:1.7.0.2 OPENPKG_2_3_SOLID_BP:1.7 OPENPKG_2_2_RELEASE:1.5 OPENPKG_2_2_SOLID:1.5.0.2 OPENPKG_2_2_SOLID_BP:1.5 OPENPKG_2_1_RELEASE:1.3 OPENPKG_2_1_SOLID:1.3.0.4 OPENPKG_2_1_SOLID_BP:1.3 OPENPKG_2_0_RELEASE:1.3 OPENPKG_2_0_SOLID:1.3.0.2 OPENPKG_2_0_SOLID_BP:1.3 OPENPKG_1_3_RELEASE:1.1.2.1 OPENPKG_1_3_SOLID:1.1.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.1.2.1 OPENPKG_1_STABLE:1.1.0.2 OPENPKG_1_STABLE_MP:1.1; locks; strict; comment @# @; 1.9 date 2006.12.19.21.14.20; author rse; state Exp; branches; next 1.8; commitid EJ8I3ZgqPfp25bZr; 1.8 date 2006.06.14.19.32.20; author rse; state Exp; branches; next 1.7; commitid OqYYnGujDrcHy0Br; 1.7 date 2005.02.09.16.24.52; author rse; state Exp; branches; next 1.6; 1.6 date 2004.11.08.12.53.06; author tho; state Exp; branches; next 1.5; 1.5 date 2004.10.01.20.47.03; author rse; state Exp; branches; next 1.4; 1.4 date 2004.08.27.20.15.44; author rse; state Exp; branches; next 1.3; 1.3 date 2004.02.12.07.25.01; author rse; state Exp; branches 1.3.2.1 1.3.4.1; next 1.2; 1.2 date 2003.10.02.18.51.37; author rse; state Exp; branches; next 1.1; 1.1 date 2003.07.24.08.55.53; author mlelstv; state Exp; branches 1.1.2.1; next ; 1.3.2.1 date 2004.09.15.13.32.32; author rse; state Exp; branches; next ; 1.3.4.1 date 2004.09.15.13.31.43; author rse; state Exp; branches; next ; 1.1.2.1 date 2003.07.24.20.43.51; author rse; state Exp; branches; next ; desc @@ 1.9 log @upgrading package: aspell 0.60.4 -> 0.60.5 @ text @Index: Makefile.in --- Makefile.in.orig 2006-12-19 12:03:37 +0100 +++ Makefile.in 2006-12-19 22:07:38 +0100 @@@@ -475,7 +475,7 @@@@ top_srcdir = @@top_srcdir@@ AUTOMAKE_OPTIONS = foreign subdir-objects SUBDIRS = . po manual -DIST_SUBDIRS = ${SUBDIRS} examples myspell lib5 +DIST_SUBDIRS = ${SUBDIRS} myspell lib5 filterdir = ${pkglibdir} optdir = ${pkgdatadir} Index: aspell6-de-20030222-1/configure --- aspell6-de-20030222-1/configure.orig 2004-11-04 03:46:10 +0100 +++ aspell6-de-20030222-1/configure 2006-12-19 22:07:38 +0100 @@@@ -66,9 +66,9 @@@@ #echo $ASPELL if test x = "x$ASPELL" - then ASPELL=aspell; fi + then ASPELL=`which aspell`; fi if test x = "x$PREZIP" - then PREZIP=prezip-bin; fi + then PREZIP=`which prezip-bin`; fi #echo $ASPELL echo $ECHO_N "Finding Dictionary file location ... $ECHO_C" @@@@ -79,9 +79,9 @@@@ datadir=`$ASPELL dump config data-dir` echo $datadir -echo "ASPELL = `which $ASPELL`" > Makefile +echo "ASPELL = $ASPELL" > Makefile echo "ASPELL_FLAGS = $ASPELL_FLAGS" >> Makefile -echo "PREZIP = `which $PREZIP`" >> Makefile +echo "PREZIP = $PREZIP" >> Makefile echo "DESTDIR = $DESTDIR" >> Makefile echo "dictdir = $dictdir" >> Makefile echo "datadir = $datadir" >> Makefile Index: aspell6-de-alt-2.1-1/configure --- aspell6-de-alt-2.1-1/configure.orig 2004-11-04 03:48:55 +0100 +++ aspell6-de-alt-2.1-1/configure 2006-12-19 22:07:38 +0100 @@@@ -66,9 +66,9 @@@@ #echo $ASPELL if test x = "x$ASPELL" - then ASPELL=aspell; fi + then ASPELL=`which aspell`; fi if test x = "x$PREZIP" - then PREZIP=prezip-bin; fi + then PREZIP=`which prezip-bin`; fi #echo $ASPELL echo $ECHO_N "Finding Dictionary file location ... $ECHO_C" @@@@ -79,9 +79,9 @@@@ datadir=`$ASPELL dump config data-dir` echo $datadir -echo "ASPELL = `which $ASPELL`" > Makefile +echo "ASPELL = $ASPELL" > Makefile echo "ASPELL_FLAGS = $ASPELL_FLAGS" >> Makefile -echo "PREZIP = `which $PREZIP`" >> Makefile +echo "PREZIP = $PREZIP" >> Makefile echo "DESTDIR = $DESTDIR" >> Makefile echo "dictdir = $dictdir" >> Makefile echo "datadir = $datadir" >> Makefile Index: aspell6-en-6.0-0/configure --- aspell6-en-6.0-0/configure.orig 2004-08-10 11:01:33 +0200 +++ aspell6-en-6.0-0/configure 2006-12-19 22:07:38 +0100 @@@@ -66,9 +66,9 @@@@ #echo $ASPELL if test x = "x$ASPELL" - then ASPELL=aspell; fi + then ASPELL=`which aspell`; fi if test x = "x$PREZIP" - then PREZIP=prezip-bin; fi + then PREZIP=`which prezip-bin`; fi #echo $ASPELL echo $ECHO_N "Finding Dictionary file location ... $ECHO_C" @@@@ -79,9 +79,9 @@@@ datadir=`$ASPELL dump config data-dir` echo $datadir -echo "ASPELL = `which $ASPELL`" > Makefile +echo "ASPELL = $ASPELL" > Makefile echo "ASPELL_FLAGS = $ASPELL_FLAGS" >> Makefile -echo "PREZIP = `which $PREZIP`" >> Makefile +echo "PREZIP = $PREZIP" >> Makefile echo "DESTDIR = $DESTDIR" >> Makefile echo "dictdir = $dictdir" >> Makefile echo "datadir = $datadir" >> Makefile @ 1.8 log @fix building under stricter C++ of GCC 4.1 @ text @d2 4 a5 4 --- Makefile.in.orig 2005-10-19 11:14:24 +0200 +++ Makefile.in 2006-06-14 21:25:36 +0200 @@@@ -447,7 +447,7 @@@@ target_vendor = @@target_vendor@@ d12 1 a12 1 localedir = ${datadir}/locale d15 1 a15 1 +++ aspell6-de-20030222-1/configure 2006-06-14 21:25:36 +0200 d42 1 a42 1 +++ aspell6-de-alt-2.1-1/configure 2006-06-14 21:25:36 +0200 d69 1 a69 1 +++ aspell6-en-6.0-0/configure 2006-06-14 21:25:36 +0200 a93 12 Index: modules/filter/nroff.cpp --- modules/filter/nroff.cpp.orig 2005-02-20 22:49:18 +0100 +++ modules/filter/nroff.cpp 2006-06-14 21:27:10 +0200 @@@@ -73,7 +73,7 @@@@ return false; } - bool NroffFilter::process_char (FilterChar::Chr c); + bool process_char (FilterChar::Chr c); public: @ 1.7 log @fix determination of tool paths. Submitted by Bill Campbell. @ text @d2 3 a4 3 --- Makefile.in.orig 2004-08-23 03:22:41 +0200 +++ Makefile.in 2004-08-27 21:46:22 +0200 @@@@ -425,7 +425,7 @@@@ d13 3 a15 3 diff -uNr ../aspell-0.60.2.orig/aspell6-de-20030222-1/configure ./aspell6-de-20030222-1/configure --- ../aspell-0.60.2.orig/aspell6-de-20030222-1/configure 2004-11-03 18:46:10.000000000 -0800 +++ ./aspell6-de-20030222-1/configure 2005-01-27 17:28:10.000000000 -0800 d40 3 a42 3 diff -uNr ../aspell-0.60.2.orig/aspell6-de-alt-2.1-1/configure ./aspell6-de-alt-2.1-1/configure --- ../aspell-0.60.2.orig/aspell6-de-alt-2.1-1/configure 2004-11-03 18:48:55.000000000 -0800 +++ ./aspell6-de-alt-2.1-1/configure 2005-01-27 17:28:54.000000000 -0800 d67 3 a69 3 diff -uNr ../aspell-0.60.2.orig/aspell6-en-6.0-0/configure ./aspell6-en-6.0-0/configure --- ../aspell-0.60.2.orig/aspell6-en-6.0-0/configure 2004-08-10 02:01:33.000000000 -0700 +++ ./aspell6-en-6.0-0/configure 2005-01-27 17:29:27.000000000 -0800 d94 12 @ 1.6 log @upgrading package: aspell 0.60 -> 0.60.1 @ text @d13 81 @ 1.5 log @try to fix pthread problems under NetBSD @ text @a12 13 Index: common/lock.hpp --- common/lock.hpp.orig 2004-06-02 14:53:33 +0200 +++ common/lock.hpp 2004-10-01 22:45:51 +0200 @@@@ -16,7 +16,9 @@@@ #define DISTRIBNET_LOCK__HPP #include "settings.h" +#ifdef USE_POSIX_MUTEX #include +#endif namespace acommon { @ 1.4 log @upgrade to new version; simplify packaging; fix Perl module linkage @ text @d13 13 @ 1.3 log @upgrading package: aspell 0.50.4.1 -> 0.50.5 @ text @a0 12 Index: prog/checker_string.cpp --- prog/checker_string.cpp.orig 2003-06-05 19:35:02.000000000 +0200 +++ prog/checker_string.cpp 2003-10-02 20:33:05.000000000 +0200 @@@@ -12,6 +12,8 @@@@ #include "copy_ptr-t.hpp" #include "asc_ctype.hpp" +#include + static int get_line(FILE * in, CharVector & d) { d.resize(0); d2 11 a12 11 --- Makefile.in.orig 2004-02-11 02:05:49.000000000 +0100 +++ Makefile.in 2004-02-12 08:19:53.000000000 +0100 @@@@ -171,7 +171,7 @@@@ sysconfdir = @@sysconfdir@@ target_alias = @@target_alias@@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = auto common modules lib examples prog data scripts interfaces manual +SUBDIRS = auto common modules lib prog data scripts interfaces manual EXTRA_DIST = README suncc/* win32/* all: all-recursive @ 1.3.2.1 log @Security Fixes (OpenPKG-SA-2004.042-aspell; CAN-2004-0548) @ text @a23 2 ----------------------------------------------------------------------------- a24 88 Security Fixes (OpenPKG-SA-2004.042-aspell; CAN-2004-0548) Index: modules/filter/email.cpp --- modules/filter/email.cpp.orig 2002-08-21 01:47:28 +0200 +++ modules/filter/email.cpp 2004-09-15 15:14:33 +0200 @@@@ -33,7 +33,8 @@@@ memset(data, 0, sizeof(bool)*256); return no_err; } - bool have(char c) { + bool have(FilterChar::Chr c) { + if (c > 255) return false; return data[static_cast(c)]; } QuoteChars() {clear();} Index: prog/compress.c --- prog/compress.c.orig 2002-08-31 20:51:11 +0200 +++ prog/compress.c 2004-09-15 15:14:47 +0200 @@@@ -28,6 +28,8 @@@@ #endif +#define BUFSIZE 256 + void usage () { fputs("Compresses or uncompresses sorted word lists.\n" , stderr); @@@@ -38,14 +40,15 @@@@ 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 @@@@ } 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 @@@@ while (i != -1 ) { if (i == 0) i = getc(stdin); - --i; - while ((c = getc(stdin)) > 32) + --i; if (i < 0) goto error; + 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 @@@@ } return 0; +error: + fputs("ERROR: Corrupt Input.\n", stderr); + return 2; + } else { usage(); @ 1.3.4.1 log @Security Fixes (OpenPKG-SA-2004.042-aspell; CAN-2004-0548) @ text @a23 2 ----------------------------------------------------------------------------- a24 88 Security Fixes (OpenPKG-SA-2004.042-aspell; CAN-2004-0548) Index: modules/filter/email.cpp --- modules/filter/email.cpp.orig 2002-08-21 01:47:28 +0200 +++ modules/filter/email.cpp 2004-09-15 15:14:33 +0200 @@@@ -33,7 +33,8 @@@@ memset(data, 0, sizeof(bool)*256); return no_err; } - bool have(char c) { + bool have(FilterChar::Chr c) { + if (c > 255) return false; return data[static_cast(c)]; } QuoteChars() {clear();} Index: prog/compress.c --- prog/compress.c.orig 2002-08-31 20:51:11 +0200 +++ prog/compress.c 2004-09-15 15:14:47 +0200 @@@@ -28,6 +28,8 @@@@ #endif +#define BUFSIZE 256 + void usage () { fputs("Compresses or uncompresses sorted word lists.\n" , stderr); @@@@ -38,14 +40,15 @@@@ 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 @@@@ } 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 @@@@ while (i != -1 ) { if (i == 0) i = getc(stdin); - --i; - while ((c = getc(stdin)) > 32) + --i; if (i < 0) goto error; + 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 @@@@ } return 0; +error: + fputs("ERROR: Corrupt Input.\n", stderr); + return 2; + } else { usage(); @ 1.2 log @upgrading package: aspell 0.50.3 -> 0.50.4 @ text @d14 5 a18 4 --- Makefile.in.orig 2003-09-14 08:56:27.000000000 +0200 +++ Makefile.in 2003-10-02 20:48:25.000000000 +0200 @@@@ -139,7 +139,7 @@@@ a19 1 d22 2 a24 2 EXTRA_DIST = README subdir = . @ 1.1 log @add missing include @ text @d1 4 a4 3 --- aspell-0.50.3/prog/checker_string.cpp.dist 2003-07-24 10:41:03.000000000 +0200 +++ aspell-0.50.3/prog/checker_string.cpp 2003-07-24 10:41:11.000000000 +0200 @@@@ -10,6 +10,8 @@@@ d13 12 @ 1.1.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class BASE only] @ text @@