From 4d96cad223aa969bf100485e770a5fe229ba2df1 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 27 Nov 2001 14:46:22 +0000 Subject: Update namazu2 package to 2.0.8. Overview of Changes in Namazu 2.0.8 - Nov 27, 2001 * Fix cross-site scripting vulnerability. --- japanese/namazu2/MESSAGE | 8 +------- japanese/namazu2/Makefile | 4 ++-- japanese/namazu2/PLIST | 4 ++-- japanese/namazu2/distinfo | 9 +++------ japanese/namazu2/patches/patch-ac | 13 ------------- japanese/namazu2/patches/patch-aj | 39 --------------------------------------- japanese/namazu2/patches/patch-ak | 14 -------------- 7 files changed, 8 insertions(+), 83 deletions(-) delete mode 100644 japanese/namazu2/patches/patch-ac delete mode 100644 japanese/namazu2/patches/patch-aj delete mode 100644 japanese/namazu2/patches/patch-ak (limited to 'japanese') diff --git a/japanese/namazu2/MESSAGE b/japanese/namazu2/MESSAGE index 433feb65816..c882bfcfbfd 100644 --- a/japanese/namazu2/MESSAGE +++ b/japanese/namazu2/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2001/11/11 06:17:28 hubertf Exp $ +$NetBSD: MESSAGE,v 1.3 2001/11/27 14:46:22 taca Exp $ *WARNING*: @@ -18,10 +18,4 @@ $NetBSD: MESSAGE,v 1.2 2001/11/11 06:17:28 hubertf Exp $ On NetBSD current (1.6 or later), you don't need to set "PERL_BADLANG" but "LC_LANG" environment. -This package includes some bug fixes after namazu 2.0.7 release. Here -is referenced URLs and modified files in source tree. - -http://www.namazu.org/ml/namazu-users-ja/msg02073.html pl/util.pl -http://www.namazu.org/ml/namazu-devel-ja/msg02024.html pl/htmlsplit.pl -http://www.namazu.org/ml/namazu-devel-ja/msg02030.html scripts/mknmz.in =========================================================================== diff --git a/japanese/namazu2/Makefile b/japanese/namazu2/Makefile index 169b3377884..69f953c56db 100644 --- a/japanese/namazu2/Makefile +++ b/japanese/namazu2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:15 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/11/27 14:46:22 taca Exp $ # FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp -DISTNAME= namazu-2.0.7 +DISTNAME= namazu-2.0.8 CATEGORIES= japanese textproc www MASTER_SITES= ftp://ftp.namazu.org/namazu/stable/ \ http://www.namazu.org/stable/ diff --git a/japanese/namazu2/PLIST b/japanese/namazu2/PLIST index e6b8900b16b..4cb5816b47f 100644 --- a/japanese/namazu2/PLIST +++ b/japanese/namazu2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:27 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/11/27 14:46:22 taca Exp $ bin/adnmz bin/bnamazu bin/gcnmz @@ -81,7 +81,6 @@ share/namazu/filter/compress.pl share/namazu/filter/deb.pl share/namazu/filter/dvi.pl share/namazu/filter/excel.pl -share/namazu/filter/gfilter.pl share/namazu/filter/gzip.pl share/namazu/filter/hdml.pl share/namazu/filter/hnf.pl @@ -103,6 +102,7 @@ share/namazu/namazurc.example share/namazu/pl/codeconv.pl share/namazu/pl/conf.pl share/namazu/pl/gettext.pl +share/namazu/pl/gfilter.pl share/namazu/pl/htmlsplit.pl share/namazu/pl/nmzidx.pl share/namazu/pl/seed.pl diff --git a/japanese/namazu2/distinfo b/japanese/namazu2/distinfo index e847c41b6cd..50ed116b0e2 100644 --- a/japanese/namazu2/distinfo +++ b/japanese/namazu2/distinfo @@ -1,14 +1,11 @@ -$NetBSD: distinfo,v 1.5 2001/09/24 03:56:01 taca Exp $ +$NetBSD: distinfo,v 1.6 2001/11/27 14:46:22 taca Exp $ -SHA1 (namazu-2.0.7.tar.gz) = da0113f61d2b46f3b65973fda8718acaad1725d4 -Size (namazu-2.0.7.tar.gz) = 829183 bytes +SHA1 (namazu-2.0.8.tar.gz) = d6aadaca11db140271b1b824b5ab0069f7325ef8 +Size (namazu-2.0.8.tar.gz) = 830884 bytes SHA1 (patch-aa) = 336a7f68842d4a9ca29ce085ccded45fe0b1392f SHA1 (patch-ab) = 92e64af4b94f88ddea605d5b21064f33fff00798 -SHA1 (patch-ac) = 2de6a77047141c6f9ac36180bfcc7f261e7b16df SHA1 (patch-af) = a5a4c913980e163813f06749445c980eb4644737 SHA1 (patch-ag) = 626af603170bca527cedc4d27e07e1c07259a701 SHA1 (patch-ah) = e38d7efb8e1e8a6e80e96fe84f9c180ec8a7fbb4 SHA1 (patch-ai) = 49d685ddd93207f984813e05a21da60fe1862bef -SHA1 (patch-aj) = f628f63fcac7902e9b8027ec310120ddd936e00a -SHA1 (patch-ak) = 3ffd48066fb4b689dc535ea2c48da28dccf1b881 SHA1 (patch-al) = 6f7317274461c254843f0a53b9f34c1bf54147ad diff --git a/japanese/namazu2/patches/patch-ac b/japanese/namazu2/patches/patch-ac deleted file mode 100644 index 505f834184f..00000000000 --- a/japanese/namazu2/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2001/09/24 03:56:02 taca Exp $ - ---- filter/mhonarc.pl.orig Tue Feb 29 13:25:33 2000 -+++ filter/mhonarc.pl -@@ -105,7 +105,7 @@ - $$contref =~ s//\n/; - - # Handle a field consists of two or more lines. -- $$contref =~ s!^(
  • )(.*?)(
    • $)!$1 . lftospace($2) . $3!gems; -+ $$contref =~ s!^(
  • )(.*?)(
    • $)!$1 . lftospace($2) . $3!gemsi; - - # For plugging spaces before headers - $$contref =~ s/^
  • //gim; diff --git a/japanese/namazu2/patches/patch-aj b/japanese/namazu2/patches/patch-aj deleted file mode 100644 index 4d7ed524201..00000000000 --- a/japanese/namazu2/patches/patch-aj +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2001/09/24 03:56:02 taca Exp $ - ---- pl/htmlsplit.pl.orig Wed Jan 10 17:42:52 2001 -+++ pl/htmlsplit.pl -@@ -72,15 +72,16 @@ - - my $id = 0; - # $cont =~ s/(]*href=(["']))#(.+?)(\2[^>]*>)/$1$3.html$4/gi; #' -+ $cont =~ s#(]*\s+)name=(["'])\2([^>]*>(.*?))#$1$4#sgi; - $cont =~ s { -- \G(.+?) # 1 -- ()?\s* # 2, 3 -- ]*\s+name=([a-zA-Z0-9-\.]+| # 4, -- (["']).+?\5)[^>]*>(.*?) # 5,6 -- \s*()? # 7 -- } { -- write_partial_file($1, $4, $6, $id++, $mtime, \%info) -- }sgexi; -+ \G(.+?) # 1 -+ ()?\s* # 2, 3 -+ ]*\s+name=([a-zA-Z0-9-\.]+| # 4, -+ (["']).+?\5)[^>]*>(.*?) # 5,6 -+ \s*()? # 7 -+ } { -+ write_partial_file($1, $4, $6, $id++, $mtime, \%info) -+ }sgexi; - write_partial_file($cont, "", "", $id, $mtime, \%info); - - return @{$info{'names'}}; -@@ -130,6 +131,9 @@ - my $orig_title = $info_ref->{'title'}; - my $prev_name = $info_ref->{'name'}; - my $prev_anchored = $info_ref->{'anchored'}; -+ -+ $prev_name =~ s#\n\r##sg; -+ $prev_name =~ s#\n##sg; - - html::remove_html_elements(\$prev_anchored); - $prev_anchored =~ s/^\s+//; diff --git a/japanese/namazu2/patches/patch-ak b/japanese/namazu2/patches/patch-ak deleted file mode 100644 index 50aa5079a11..00000000000 --- a/japanese/namazu2/patches/patch-ak +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2001/09/24 03:56:02 taca Exp $ - ---- pl/util.pl.orig Mon Aug 20 22:32:20 2001 -+++ pl/util.pl -@@ -145,7 +145,8 @@ - return ''; - } - } else { -- $fh = efopen($arg) || return 0; # in case file is removed after find_file -+ $fh = fopen($arg) || return 0; # in case file is removed after find_file -+ # 2.0.7 had problem - } - my $size = -s $fh; - return $size; -- cgit v1.2.3