diff options
author | taca <taca@pkgsrc.org> | 2002-09-04 12:52:24 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2002-09-04 12:52:24 +0000 |
commit | 6ac8514131d5d60abef2653adc72f570190e792e (patch) | |
tree | 773cfcac6016f0d8fa03e772b20c678d3f0adb02 /textproc | |
parent | 67744deaf8c7804e7912d2f5ef5ebe46fe5fca18 (diff) | |
download | pkgsrc-6ac8514131d5d60abef2653adc72f570190e792e.tar.gz |
Update namazu package to 2.0.12.
It fixes some Cross Site Scripting security problem.
2002-09-03 NOKUBI Takatsugu <knok@daionet.gr.jp>
* Namazu: Version 2.0.12 released.
* nmz/util.c (nmz_warn_printf): Fixed potential XSS issue.
* tests/namazu-cgi-8: Added an another XSS checking.
(Reported by HANAI Akira, thank you)
2002-09-02 NOKUBI Takatsugu <knok@daionet.gr.jp>
* Namazu: Version 2.0.11 released.
* tests/*: Added log markings.
(Commited by proxy for Makoto Fujiwara.)
2002-08-28 NOKUBI Takatsugu <knok@daionet.gr.jp>
* configure.in: Bumped version number to 2.0.11pre4.
* NEWS: updated.
2002-08-26 Hajime BABA <baba@plain.isas.ac.jp>
* filter/msword.pl: Fixed warnings of undefined variables.
* filter/postscript.pl: Fixed redirection problem (sorry...)
2002-08-23 NOKUBI Takatsugu <knok@daionet.gr.jp>
* configure.in: Bumped version number to 2.0.11pre3.
2002-08-19 Ryuji Abe <rug@namazu.org>
* NEWS: Use `cross-site scripting' instead of `CSS'.
2002-08-10 Hajime BABA <baba@plain.isas.ac.jp>
* (somewhere)/.cvsignore: Newly added.
2002-08-10 Hajime BABA <baba@plain.isas.ac.jp>
* filter/postscript.pl: Adapted to ps2text 0.4.1.
2002-08-06 NOKUBI Takatsugu <knok@daionet.gr.jp>
* filter/mhonarc.pl: Adapted to MHonARC 2.x.
(contributed by Earl Hood, thank you!)
2002-08-01 NOKUBI Takatsugu <knok@daionet.gr.jp>
* configure.in: Bumped version number to 2.0.11pre2.
2002-07-31 NOKUBI Takatsugu <knok@daionet.gr.jp>
* filter/excel.pl (filter_xl): Adapted to xlhtml 0.5.x.
2002-07-29 NOKUBI Takatsugu <knok@daionet.gr.jp>
* filter/pdf.pl (filter): Fixed overriding $$cont by pdfinfo.
2002-07-26 Hajime BABA <baba@plain.isas.ac.jp>
* filter/pdf.pl: Fixed wrong redirection of stdout.
2002-07-26 Hajime BABA <baba@plain.isas.ac.jp>
* nmz/util.c: Fixed the following warnings:
'initialization discards qualifiers from pointer target type'
2002-07-25 Hajime BABA <baba@plain.isas.ac.jp>
* filter/pdf.pl: Fixed the problem in [n-d-j:02587],
and of the stdout redirection.
2002-07-25 Yoshinori TAKESAKO <takesako@namazu.org>
* configure.in (AC_OUTPUT): Add contrib/Makefile.
2002-07-25 Ryuji Abe <rug@namazu.org>
* doc/en/manual.html: Update location of xlhtml web site.
* doc/ja/manual.html: Likewise.
2002-07-25 Yoshinori TAKESAKO <takesako@namazu.org>
* configure.in: Bumped version number to to 2.0.11pre1.
2002-07-24 Hajime BABA <baba@plain.isas.ac.jp>
* filter/win32/ole{msword|powerpoint}.pl: use strict, and sample code.
2002-07-24 Hajime BABA <baba@plain.isas.ac.jp>
* filter/pdf.pl: Added a routine which gets the author and the title.
2002-07-11 NOKUBI Takatsugu <knok@daionet.gr.jp>
* template/NMZ.*.de: Added.
(Contributed by Gerald Pfeifer, thank you!)
2002-07-05 NOKUBI Takatsugu <knok@daionet.gr.jp>
* template/NMZ.head: Fixed some typos.
(Reported by Gerald Pfeifer, thank you!)
2002-06-17 Yoshinori TAKESAKO <takesako@namazu.org>
* scripts/mknmz.in (make_phrase_hash, wordcount_sub): Fixed
the bug that limits of WORD_LENG_MAX did not work as expected.
2002-06-17 NOKUBI Takatsugu <knok@daionet.gr.jp>
* filter/html.pl: Applied scrpit code exclusory patch.
(http://www.namazu.org/ml/namazu-devel-ja/msg02091.html
contributed by HAJIME Baba.)
2002-06-13 NOKUBI Takatsugu <knok@daionet.gr.jp>
* scripts/mknmz.in (append_index): Fixed to remain keyword numbers
in NMZ.head* when some target files are deleted.
* doc/ja/manual.html: Added description about xpdf Language
Support Packages.
2002-06-06 NOKUBI Takatsugu <knok@daionet.gr.jp>
* src/cgi.c (validate_idxname): Fixed relative path problem.
(Reported by TAKAGI Hiromitsu, thanks)
2002-04-26 Ryuji Abe <rug@namazu.org>
* Makefile.am (SUBDIRS): Add contrib.
(DIST_SUBDIRS): Likewise.
* contrib/ChangeLog: New File.
2002-04-09 NOKUBI Takatsugu <knok@daionet.gr.jp>
* filter/postscript.pl (filter): Fixed excessive argument on
ps2ascii, closes: bugs-en#15.
2002-04-01 Yoshinori TAKESAKO <takesako@namazu.org>
* scripts/mknmz.in (load_document): Delete NMZ.win32.tmp file
when this file exists at the time of a copy.
Thanks to tsubouchi (namazu-bugs-ja#131).
2002-03-29 Ryuji Abe <rug@namazu.org>
* configure.in (LTVERSION): Set 6:0:3.
2002-03-29 NOKUBI Takatsugu <knok@daionet.gr.jp>
* tests/namazu-cgi-8: Removed checking of "result" CGI value.
2002-03-27 Yoshinori TAKESAKO <takesako@namazu.org>
* filter/win32/oleexcel.pl (filter):
It was got to work also by MS Excel 2002 (MS Office XP).
2002-03-27 Yoshinori TAKESAKO <takesako@namazu.org>
* filter/win32/oleexcel.pl:
Fixed the bug which Win32 OLE filter doesn't create index
by MS Excel 2002. (namazu-win32-users-ja#01204)
(Reported by yonezawa, thanks.)
* filter/win32/ole{msword,excel,powerpoint}.pl:
Fixed the defined $weight variable doubly.
2002-03-26 NOKUBI Takatsugu <knok@daionet.gr.jp>
* nmz/libnamazu.{c,h}: Added nmz_{set,is}_output_warn_to_file().
* nmz/util.c (nmz_warn_printf): Changed to check loggingmode and
output_warn_to_file.
* nmz/var.c: Added NMZ.warnlog member.
* src/namazu-cgi.c(main): Added calling
nmz_set_output_warn_to_file().
2002-03-25 NOKUBI Takatsugu <knok@daionet.gr.jp>
* filter/{deb,rpm}.pl: Fixed escape special shell characters handling
for security.
(Reported by Luc, thanks)
2002-03-18 Yoshinori TAKESAKO <takesako@namazu.org>
* filter/win32/ole{msword,taro,rtf,excel,powerpoint}.pl:
Fixed the bug which OLE filter doesn't create index of title
and keywords of property. (namazu-bugs-ja#86,#120)
(Patch contributed by Shohei TAKASHIRO, thanks)
2002-03-15 NOKUBI Takatsugu <knok@daionet.gr.jp>
* filter/compress.pl: Removed SIGPIPE trapping routine
because it was changed to care in mknmz.
* scripts/mknmz.in (trapintr): Added SIGPIPE trapping routine
(closes: namazu-bugs-en#19).
* filter/pdf.pl (status()): Added version check to adopt
xpdf 1.00.
2002-03-13 NOKUBI Takatsugu <knok@daionet.gr.jp>
* src/output.c (print_hlist): Fixed excessive deletion of
HTML tags (namazu-devel-ja#02406).
(Reported by Seiji Yamashita, thanks.)
(unhtml_buffer): Splitted a new function from
fputs_without_html_tag().
2002-03-06 NOKUBI Takatsugu <knok@daionet.gr.jp>
* filter/compress.pl (filter): Added trapping sigpipe (bugs-ja#111).
(Patch contributed by Hiroki Nakai, thanks)
* src/form.c (handle_tag): Fixed no output probrem on
large NMZ.head file (bugs-ja#111).
(Patch contributed by Hiroki Nakai, thanks)
2002-02-25 NOKUBI Takatsugu <knok@daionet.gr.jp>
* filter/html.pl (remove_comments): Added a new function.
(Patch contributed by Hamatani, Chihiro, thanks)
2002-02-22 NOKUBI Takatsugu <knok@daionet.gr.jp>
* nmz/libnamazu.h (MAXPATH): Changed to same value as BUFSIZE.
It fix the probrem that namazu/namazu.cgi didn't work
when changing BUFSIZE to over 1024.
2002-02-19 NOKUBI Takatsugu <knok@daionet.gr.jp>
* tests/namazu-10: Fixed the contents of MSG variable.
* src/cgi.c (get_query_string): Fixed invalid content-type
output error message.
* scripts/mailutime.in (main): Added MHonArc file support.
2002-02-13 NOKUBI Takatsugu <knok@daionet.gr.jp>
* scripts/mknmz.in (parse_options): Changed to call
load_filtermodules() after parsing index_lang option.
* filter/man.pl (status()): s/LAN/LANG/
2002-02-12 NOKUBI Takatsugu <knok@daionet.gr.jp>
* filter/man.pl: Added $langenv variable for japanized groff.
http://search.namazu.org/ml/namazu-devel-ja/msg02332.html
2002-02-04 Makoto Fujiwara <makoto@.ki.nu>
* scripts/mknmz.in: Message is changed related to TEXT_SIZE_MAX skipping:
http://www.namazu.org/ml/namazu-devel-ja/msg02312.html
* po/{es,fr,ja,ja_JP.SJIS}.po: Ditto.
2002-02-04 Ryuji Abe <rug@namazu.org>
* nmz/regex.c: Also includes support.h.
2002-02-03 Ryuji Abe <rug@namazu.org>
* src/form.c: Includes support.h again.
* THANKS: Thanks Seiya Nishizawa for namazu-bugs-ja#89.
2002-01-24 NOKUBI Takatsugu <knok@daionet.gr.jp>
* scripts/mknmz.in: Changed to take effect --exclude option on
html named link (--html-split).
2002-01-18 NOKUBI Takatsugu <knok@daionet.gr.jp>
* nmz/regex.c: Applied Admin/regex-ruby-alloca.path.
* nmz/util.[ch] (nmz_scan_*) : Adopted type of function argument
for nmz/regex.c.
* nmz/regex.c: Applied silencing some warnings patch.
(Contributed by Takahiro Kambe, thanks.)
* nmz/regex*: Imported latest source from Ruby 1.6.6.
* lib/getopt*: Imported latest sources from GNU gengetopt-2.5.
2002-01-17 NOKUBI Takatsugu <knok@daionet.gr.jp>
* lib/getopt.c: Changed to include string.h for using strcmp().
(Contributed by Takahiro Kambe, thanks.)
2002-01-16 NOKUBI Takatsugu <knok@daionet.gr.jp>
* doc/ja/tutorial.html: Fixed invalid relative path.
(Reported by yokoi, thanks.)
2002-01-12 Ryuji Abe <rug@namazu.org>
* configure.in: If the platform is MinGW, do not check functions
str(n)casecmp and (v)snprintf. Also __vsnprintf checking is
removed.
* nmz/support.h [Solaris 2.5]: Abandoned to use __vsnprintf
because of binary compatibility issue.
[WIN32]: Use str(n)icmp instead of str(n)casecmp.
* ChangeLog: Fixed typo again :-) (s/probrem/problem/g)
2002-01-11 NOKUBI Takatsugu <knok@daionet.gr.jp>
* tests/namazu-12: Added a new test.
* nmz/util.c (nmz_pathcat): Added null termination to prevent
segfault.
* src/namazu-cmd.c (main): Fixed buffer overflow.
(Reported by KF, thanks)
* src/namazu.c: Ditto.
* src/namazu.h: Added a notice about customizing CGI_QUERY_MAX value.
(KF <dotslash@snosoft.com> was noticed me the problem, thanks)
2002-01-10 NOKUBI Takatsugu <knok@daionet.gr.jp>
* filter/powerpoint.pl: Adopted to new convert programs.
(Contributed by Takahiro Kambe and Kaz SHiMZ, thanks)
* filter/excel.pl: Ditto.
* filter/msword.pl: Ditto.
2002-01-04 Ryuji Abe <rug@namazu.org>
* configure.in: Revert to use AM_PROG_LIBTOOL. (workaround
for earlier version of automake.)
2001-12-28 NOKUBI Takatsugu <knok@daionet.gr.jp>
* doc/ja/manual.html: s!/usr/local/etc/mknmz/!/usr/local/etc/namazu/!
(reported by NIHIRA Takuma, thanks.)
* doc/en/manual.html: Ditto.
2001-12-27 NOKUBI Takatsugu <knok@daionet.gr.jp>
* tests/Makefile.am: Added 2 tests.
(contributed by Tietew, thanks.)
Diffstat (limited to 'textproc')
-rw-r--r-- | textproc/namazu2/Makefile | 9 | ||||
-rw-r--r-- | textproc/namazu2/PLIST | 12 | ||||
-rw-r--r-- | textproc/namazu2/distinfo | 15 | ||||
-rw-r--r-- | textproc/namazu2/patches/patch-af | 34 | ||||
-rw-r--r-- | textproc/namazu2/patches/patch-ag | 183 | ||||
-rw-r--r-- | textproc/namazu2/patches/patch-ah | 29 | ||||
-rw-r--r-- | textproc/namazu2/patches/patch-ai | 15 | ||||
-rw-r--r-- | textproc/namazu2/patches/patch-am | 40 | ||||
-rw-r--r-- | textproc/namazu2/patches/patch-an | 69 | ||||
-rw-r--r-- | textproc/namazu2/patches/patch-ao | 40 |
10 files changed, 19 insertions, 427 deletions
diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile index 67d7b901d18..694e9c2d67a 100644 --- a/textproc/namazu2/Makefile +++ b/textproc/namazu2/Makefile @@ -1,12 +1,15 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/04 12:52:24 taca Exp $ # FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp -DISTNAME= namazu-2.0.10 -PKGREVISION= 2 +DISTNAME= namazu-2.0.12 CATEGORIES= japanese textproc www MASTER_SITES= ftp://ftp.namazu.org/namazu/stable/ \ http://www.namazu.org/stable/ +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= namazu-2.0.12-de.diff +PATCH_DIST_STRIP= -p1 + MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.namazu.org/index.html.en COMMENT= Full-text search system intended for easy use diff --git a/textproc/namazu2/PLIST b/textproc/namazu2/PLIST index a53cb630cc1..de24c96f514 100644 --- a/textproc/namazu2/PLIST +++ b/textproc/namazu2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/09/04 12:52:24 taca Exp $ bin/adnmz bin/bnamazu bin/gcnmz @@ -34,8 +34,8 @@ include/namazu/wakati.h lib/libnmz.a lib/libnmz.la lib/libnmz.so -lib/libnmz.so.5 -lib/libnmz.so.5.0 +lib/libnmz.so.6 +lib/libnmz.so.6.0 @exec ${MKDIR} %D/libdata/namazu 2>/dev/null|| /usr/bin/true @exec ${MKDIR} %D/libdata/namazu/index 2>/dev/null || /usr/bin/true @dirrm libdata/namazu/index @@ -60,8 +60,8 @@ share/namazu/doc/ja/tutorial.html share/namazu/doc/namazu.css @dirrm share/namazu/doc share/namazu/etc/AUTHORS -share/namazu/etc/CREDITS share/namazu/etc/COPYING +share/namazu/etc/CREDITS share/namazu/etc/ChangeLog share/namazu/etc/ChangeLog.1 share/namazu/etc/HACKING @@ -116,18 +116,22 @@ share/namazu/template/NMZ.body.es share/namazu/template/NMZ.body.fr share/namazu/template/NMZ.body.ja share/namazu/template/NMZ.foot +share/namazu/template/NMZ.foot.de share/namazu/template/NMZ.foot.es share/namazu/template/NMZ.foot.fr share/namazu/template/NMZ.foot.ja share/namazu/template/NMZ.head +share/namazu/template/NMZ.head.de share/namazu/template/NMZ.head.es share/namazu/template/NMZ.head.fr share/namazu/template/NMZ.head.ja share/namazu/template/NMZ.result.normal +share/namazu/template/NMZ.result.normal.de share/namazu/template/NMZ.result.normal.es share/namazu/template/NMZ.result.normal.fr share/namazu/template/NMZ.result.normal.ja share/namazu/template/NMZ.result.short +share/namazu/template/NMZ.result.short.de share/namazu/template/NMZ.result.short.es share/namazu/template/NMZ.result.short.fr share/namazu/template/NMZ.result.short.ja diff --git a/textproc/namazu2/distinfo b/textproc/namazu2/distinfo index a31e16ffef9..40b995a3ebe 100644 --- a/textproc/namazu2/distinfo +++ b/textproc/namazu2/distinfo @@ -1,14 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $ +$NetBSD: distinfo,v 1.2 2002/09/04 12:52:25 taca Exp $ -SHA1 (namazu-2.0.10.tar.gz) = 43a7f32ff0d86b4e65dfa9fa6c1ad90a0636a8a8 -Size (namazu-2.0.10.tar.gz) = 833838 bytes +SHA1 (namazu-2.0.12.tar.gz) = ef9ad4bb38150c1857b036e8302de9fdb7049309 +Size (namazu-2.0.12.tar.gz) = 870307 bytes +SHA1 (namazu-2.0.12-de.diff) = b0a1c825454bd45cc4d9c6baa7efa09e9d8fd547 +Size (namazu-2.0.12-de.diff) = 6801 bytes SHA1 (patch-aa) = 336a7f68842d4a9ca29ce085ccded45fe0b1392f SHA1 (patch-ab) = c5baa6b5555c4fee0215980ca8df3880fa93390f -SHA1 (patch-af) = a5a4c913980e163813f06749445c980eb4644737 -SHA1 (patch-ag) = 626af603170bca527cedc4d27e07e1c07259a701 -SHA1 (patch-ah) = e38d7efb8e1e8a6e80e96fe84f9c180ec8a7fbb4 -SHA1 (patch-ai) = 49d685ddd93207f984813e05a21da60fe1862bef SHA1 (patch-al) = f05436ec713ae1bcb01dd7b1a9a7a598018e9dd7 -SHA1 (patch-am) = abce3739aa99e9ee19bf4b56f961c33cc33004be -SHA1 (patch-an) = fa073b9baef46cd31348d048816f8592a8b35f20 -SHA1 (patch-ao) = 16070a6b7f9b50e2e14d3256d6bab44c9ea52aca diff --git a/textproc/namazu2/patches/patch-af b/textproc/namazu2/patches/patch-af deleted file mode 100644 index ce6dd07f3e9..00000000000 --- a/textproc/namazu2/patches/patch-af +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $ - ---- lib/getopt.c.orig Mon Oct 11 13:25:11 1999 -+++ lib/getopt.c -@@ -71,10 +71,11 @@ - - #ifdef VMS - #include <unixlib.h> -+#endif -+ - #if HAVE_STRING_H - 0 - #include <string.h> - #endif --#endif - - #if defined (WIN32) && !defined (__CYGWIN32__) - /* It's not Unix, really. See? Capital letters. */ -@@ -695,7 +696,7 @@ - optarg = nameend + 1; - else - { -- if (opterr) -+ if (opterr) { - if (argv[optind - 1][1] == '-') - /* --option */ - fprintf (stderr, -@@ -706,6 +707,7 @@ - fprintf (stderr, - _("%s: option `%c%s' doesn't allow an argument\n"), - argv[0], argv[optind - 1][0], pfound->name); -+ } - - nextchar += strlen (nextchar); - diff --git a/textproc/namazu2/patches/patch-ag b/textproc/namazu2/patches/patch-ag deleted file mode 100644 index 60bedf47bf7..00000000000 --- a/textproc/namazu2/patches/patch-ag +++ /dev/null @@ -1,183 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $ - ---- nmz/regex.c.orig Sat Sep 1 18:40:52 2001 -+++ nmz/regex.c -@@ -71,6 +71,12 @@ - void free _((void*)); - #endif - -+#ifdef HAVE_STRING_H -+# include <string.h> -+#else -+# include <strings.h> -+#endif -+ - /* #define NO_ALLOCA */ /* try it out for now */ - #ifndef NO_ALLOCA - /* Make alloca work the best possible way. */ -@@ -99,12 +105,6 @@ - # endif - #endif /* __GNUC__ */ - --#ifdef HAVE_STRING_H --# include <string.h> --#else --# include <strings.h> --#endif -- - #define RE_ALLOCATE alloca - #ifdef C_ALLOCA - #define FREE_VARIABLES() alloca(0) -@@ -153,7 +153,9 @@ - static void insert_jump _((int, char*, char*, char*)); - static void store_jump_n _((char*, int, char*, unsigned)); - static void insert_jump_n _((int, char*, char*, char*, unsigned)); -+#if 0 - static void insert_op _((int, char*, char*)); -+#endif - static void insert_op_2 _((int, char*, char*, int, int)); - static int memcmp_translate _((unsigned char*, unsigned char*, int)); - -@@ -175,9 +177,7 @@ - - #undef P - --#ifdef RUBY - #include "util.h" --#endif - - static void - init_syntax_once() -@@ -358,7 +358,7 @@ - wordbeg, /* Succeeds if at word beginning. */ - wordend, /* Succeeds if at word end. */ - wordbound, /* Succeeds if at a word boundary. */ -- notwordbound,/* Succeeds if not at a word boundary. */ -+ notwordbound /* Succeeds if not at a word boundary. */ - }; - - -@@ -409,6 +409,7 @@ - long syntax; - { - /* obsolete */ -+ return 0; - } - - -@@ -442,7 +443,7 @@ - int n = mbclen(c) - 1; \ - c &= (1<<(BYTEWIDTH-2-n)) - 1; \ - while (n--) { \ -- c = c << 6 | *p++ & ((1<<6)-1); \ -+ c = (c << 6) | (*p++ & ((1<<6)-1)); \ - } \ - } \ - else { \ -@@ -483,23 +484,28 @@ - { - if (current_mbctype == MBCTYPE_UTF8) { - if (c < 0x80) -- printf("%c", c); -+ printf("%c", (int)c); - else if (c <= 0x7ff) -- printf("%c%c", utf8_firstbyte(c), c&0x3f); -+ printf("%c%c", (int)utf8_firstbyte(c), (int)(c & 0x3f)); - else if (c <= 0xffff) -- printf("%c%c%c", utf8_firstbyte(c), (c>>6)&0x3f, c&0x3f); -+ printf("%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 6) & 0x3f), -+ (int)(c & 0x3f)); - else if (c <= 0x1fffff) -- printf("%c%c%c%c", utf8_firstbyte(c), (c>>12)&0x3f, (c>>6)&0x3f, c&0x3f); -+ printf("%c%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 12) & 0x3f), -+ (int)((c >> 6) & 0x3f), (int)(c & 0x3f)); - else if (c <= 0x3ffffff) -- printf("%c%c%c%c%c", utf8_firstbyte(c), (c>>18)&0x3f, (c>>12)&0x3f, (c>>6)&0x3f, c&0x3f); -+ printf("%c%c%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 18) & 0x3f), -+ (int)((c >> 12) & 0x3f), (int)((c >> 6) & 0x3f), (int)(c & 0x3f)); - else if (c <= 0x7fffffff) -- printf("%c%c%c%c%c%c", utf8_firstbyte(c), (c>>24)&0x3f, (c>>18)&0x3f, (c>>12)&0x3f, (c>>6)&0x3f, c&0x3f); -+ printf("%c%c%c%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 24) & 0x3f), -+ (int)((c >> 18) & 0x3f), (int)((c >> 12) & 0x3f), -+ (int)((c >> 6) & 0x3f), (int)(c & 0x3f)); - } - else if (c < 0xff) { -- printf("\\%o", c); -+ printf("\\%o", (int)c); - } - else { -- printf("%c%c", c>>BYTEWIDTH, c&0xff); -+ printf("%c%c", (int)(c >> BYTEWIDTH), (int)(c &0xff)); - } - } - -@@ -700,6 +706,7 @@ - return 0; - } - -+#if 0 - static void - print_partial_compiled_pattern(start, end) - unsigned char *start; -@@ -949,6 +956,7 @@ - - print_partial_compiled_pattern (buffer, buffer + bufp->used); - } -+#endif - - static char* - calculate_must_string(start, end) -@@ -1118,7 +1126,7 @@ - register const char *p = pattern; - const char *nextp; - const char *pend = pattern + size; -- register unsigned int c, c1; -+ register unsigned int c, c1 = 0; - const char *p0; - int numlen; - -@@ -1412,8 +1420,8 @@ - case 'W': - for (c = 0; c < (1 << BYTEWIDTH); c++) { - if (SYNTAX(c) != Sword && -- (current_mbctype && !re_mbctab[c] || -- !current_mbctype && SYNTAX(c) != Sword2)) -+ ((current_mbctype && !re_mbctab[c]) || -+ (!current_mbctype && SYNTAX(c) != Sword2))) - SET_LIST_BIT(c); - } - last = -1; -@@ -2241,6 +2249,8 @@ - case dummy_failure_jump: - bufp->options |= RE_OPTIMIZE_ANCHOR; - break; -+ default: -+ break; - } - } - else if (*laststart == charset || *laststart == charset_not) { -@@ -2409,6 +2419,7 @@ - } - - -+#if 0 - /* Open up space at location THERE, and insert operation OP. - CURRENT_END gives the end of the storage in use, so - we know how much data to copy up. -@@ -2428,7 +2439,7 @@ - - there[0] = (char)op; - } -- -+#endif - - /* Open up space at location THERE, and insert operation OP followed by - NUM_1 and NUM_2. CURRENT_END gives the end of the storage in use, so -@@ -4095,7 +4106,6 @@ - p1 = p; - /* If failed to a backwards jump that's part of a repetition - loop, need to pop this failure point and use the next one. */ -- pop_loop: - switch ((enum regexpcode)*p1) { - case jump_n: - case finalize_push_n: diff --git a/textproc/namazu2/patches/patch-ah b/textproc/namazu2/patches/patch-ah deleted file mode 100644 index fc7dd6efb43..00000000000 --- a/textproc/namazu2/patches/patch-ah +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $ - ---- nmz/util.c.orig Sun Sep 2 16:13:37 2001 -+++ nmz/util.c -@@ -102,9 +102,9 @@ - */ - - unsigned long --nmz_scan_oct(char *start, int len, int *retlen) -+nmz_scan_oct(const char *start, int len, int *retlen) - { -- register char *s = start; -+ register const char *s = start; - register unsigned long retval = 0; - - while (len-- && *s >= '0' && *s <= '7') { -@@ -117,10 +117,10 @@ - } - - unsigned long --nmz_scan_hex(char *start, int len, int *retlen) -+nmz_scan_hex(const char *start, int len, int *retlen) - { - static char hexdigit[] = "0123456789abcdef0123456789ABCDEFx"; -- register char *s = start; -+ register const char *s = start; - register unsigned long retval = 0; - char *tmp; - diff --git a/textproc/namazu2/patches/patch-ai b/textproc/namazu2/patches/patch-ai deleted file mode 100644 index f02c7aa182e..00000000000 --- a/textproc/namazu2/patches/patch-ai +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $ - ---- nmz/util.h.orig Mon Jul 9 16:30:37 2001 -+++ nmz/util.h -@@ -14,8 +14,8 @@ - #define nmz_iseuc_kana1st(c) ((uchar)(c) == 0x8e) - #define nmz_iseuc_hojo1st(c) ((uchar)(c) == 0x8f) - --extern unsigned long nmz_scan_oct ( char *start, int len, int *retlen ); --extern unsigned long nmz_scan_hex ( char *start, int len, int *retlen ); -+extern unsigned long nmz_scan_oct (const char *start, int len, int *retlen ); -+extern unsigned long nmz_scan_hex (const char *start, int len, int *retlen ); - extern void * nmz_xmalloc ( unsigned long size ); - extern void * nmz_xrealloc ( void *ptr, unsigned long size ); - extern void nmz_tr ( char *str, const char *lstr, const char *rstr ); diff --git a/textproc/namazu2/patches/patch-am b/textproc/namazu2/patches/patch-am deleted file mode 100644 index 3dc65d4463c..00000000000 --- a/textproc/namazu2/patches/patch-am +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-am,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $ - ---- filter/excel.pl.orig Fri Dec 15 14:37:41 2000 -+++ filter/excel.pl -@@ -26,6 +26,7 @@ - - package excel; - use strict; -+use File::Basename; - use File::Copy; - require 'util.pl'; - require 'gfilter.pl'; -@@ -33,15 +34,17 @@ - - my $xlconvpath = undef; - my $utfconvpath = undef; -+my $convname = undef; - - sub mediatype() { - return ('application/excel'); - } - - sub status() { -- $xlconvpath = util::checkcmd('xlHtml'); -+ $xlconvpath = util::checkcmd('xlhtml') || util::checkcmd('xlHtml'); - # return 'no' unless defined $xlconvpath; - if (defined $xlconvpath) { -+ $convname = basename($xlconvpath); - if (!util::islang("ja")) { - return 'yes'; - } else { -@@ -83,7 +86,7 @@ - = @_; - my $err = undef; - -- if (util::checkcmd('xlHtml')) { -+ if ($convname =~ /xlhtml/i) { - $err = filter_xl($orig_cfile, $cont, $weighted_str, $headings, $fields); - } else { - $err = filter_doccat($orig_cfile, $cont, $weighted_str, $headings, $fields); diff --git a/textproc/namazu2/patches/patch-an b/textproc/namazu2/patches/patch-an deleted file mode 100644 index 582e0e65386..00000000000 --- a/textproc/namazu2/patches/patch-an +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-an,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $ - ---- filter/msword.pl.orig Fri Jul 13 10:14:26 2001 -+++ filter/msword.pl -@@ -25,6 +25,7 @@ - - package msword; - use strict; -+use File::Basename; - use File::Copy; - require 'util.pl'; - require 'gfilter.pl'; -@@ -33,6 +34,7 @@ - my $wordconvpath = undef; - my $utfconvpath = undef; - my $wvversionpath = undef; -+my $wordconvname = undef; - - sub mediatype() { - return ('application/msword'); -@@ -80,7 +82,10 @@ - = @_; - my $err = undef; - -- if (util::checkcmd('wvHtml')) { -+ if (not defined $wordconvname) { -+ $wordconvname = basename($wordconvpath); -+ } -+ if ($wordconvname =~ /wvhtml/i) { - $err = filter_wv($orig_cfile, $cont, $weighted_str, $headings, $fields); - } else { - $err = filter_doccat($orig_cfile, $cont, $weighted_str, $headings, $fields); -@@ -95,7 +100,7 @@ - - my $tmpfile = util::tmpnam('NMZ.word'); - my $tmpfile2 = util::tmpnam('NMZ.word2'); -- -+ my ($ofile, $tpath, $options, $version); - - if (util::islang("ja")) { - } -@@ -107,8 +112,17 @@ - print $fh $$cont; - } - -+ $version = `$wordconvpath --version 2>/dev/null`; -+ chomp $version; -+ if ($version ne "" and $version !~ /usage/i and $version ge "0.7") { -+ ($ofile, $tpath) = fileparse($tmpfile2); -+ $options = "--targetdir=$tpath"; -+ } else { -+ $ofile = $tmpfile2; -+ } -+ - if (!util::islang("ja")) { -- system("$wordconvpath $tmpfile $tmpfile2"); -+ system("$wordconvpath $options $tmpfile $ofile"); - } else { - my $version = "unknown"; - my $supported = undef; -@@ -125,7 +139,7 @@ - } - } - return _("Unsupported format: ") . $version unless $supported; -- system("$wordconvpath $tmpfile $tmpfile2"); -+ system("$wordconvpath $options $tmpfile $ofile"); - system("$utfconvpath -Iu8 -Oej $tmpfile2 > $tmpfile"); - unlink($tmpfile2); - rename($tmpfile, $tmpfile2); diff --git a/textproc/namazu2/patches/patch-ao b/textproc/namazu2/patches/patch-ao deleted file mode 100644 index 8679af32687..00000000000 --- a/textproc/namazu2/patches/patch-ao +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ao,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $ - ---- filter/powerpoint.pl.orig Tue Dec 26 13:59:01 2000 -+++ filter/powerpoint.pl -@@ -25,6 +25,7 @@ - - package powerpoint; - use strict; -+use File::Basename; - use File::Copy; - require 'util.pl'; - require 'gfilter.pl'; -@@ -32,15 +33,17 @@ - - my $pptconvpath = undef; - my $utfconvpath = undef; -+my $pptconvname = undef; - - sub mediatype() { - return ('application/powerpoint'); - } - - sub status() { -- $pptconvpath = util::checkcmd('pptHtml'); -+ $pptconvpath = util::checkcmd('ppthtml') || util::checkcmd('pptHtml'); - # return 'no' unless defined $pptconvpath - if (defined $pptconvpath) { -+ $pptconvname = basename($pptconvpath); - if (!util::islang("ja")) { - return 'yes'; - } else { -@@ -82,7 +85,7 @@ - = @_; - my $err = undef; - -- if (util::checkcmd('pptHtml')) { -+ if ($pptconvname =~ /ppthtml/i) { - $err = filter_ppt($orig_cfile, $cont, $weighted_str, $headings, $fields); - } else { - $err = filter_doccat($orig_cfile, $cont, $weighted_str, $headings, $fields); |