From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 26 16:50:06 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E20516A41C for ; Thu, 26 May 2005 16:50:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DEFE43D1D for ; Thu, 26 May 2005 16:50:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4QGo5ZE019224 for ; Thu, 26 May 2005 16:50:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4QGo5Y7019221; Thu, 26 May 2005 16:50:05 GMT (envelope-from gnats) Resent-Date: Thu, 26 May 2005 16:50:05 GMT Resent-Message-Id: <200505261650.j4QGo5Y7019221@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Toshiya SAITOH Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 37D9916A41C; Thu, 26 May 2005 16:44:43 +0000 (GMT) (envelope-from root@saitoh.nu) Received: from ns.saitoh.nu (18.16.111.219.st.bbexcite.jp [219.111.16.18]) by mx1.FreeBSD.org (Postfix) with ESMTP id D947343D48; Thu, 26 May 2005 16:44:42 +0000 (GMT) (envelope-from root@saitoh.nu) Received: by ns.saitoh.nu (Postfix, from userid 0) id 0F05D116; Fri, 27 May 2005 01:44:41 +0900 (JST) Message-Id: <20050526164441.0F05D116@ns.saitoh.nu> Date: Fri, 27 May 2005 01:44:41 +0900 (JST) From: Toshiya SAITOH To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: kuriyama@FreeBSD.org Subject: ports/81520: Update ports/www/fswiki 3.5.6 -> 3.5.8 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Toshiya SAITOH List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 May 2005 16:50:06 -0000 >Number: 81520 >Category: ports >Synopsis: Update ports/www/fswiki 3.5.6 -> 3.5.8 >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu May 26 16:50:05 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Toshiya SAITOH >Release: FreeBSD 4.11-RELEASE-p9 i386 >Organization: >Environment: System: FreeBSD dmz.saitoh.nu 4.11-RELEASE-p9 FreeBSD 4.11-RELEASE-p9 #4: Fri May 20 05:37:16 JST 2005 toshiya@dmz.saitoh.nu:/usr/obj/usr/src/sys/DMZ i386 >Description: Could you please update fswiki from 3.5.6 to 3.5.8. Current version has security problem. See http://jvn.jp/jp/JVN%23465742E4/index.html >How-To-Repeat: patch >Fix: diff -urN /usr/ports/www/fswiki/Makefile fswiki/Makefile --- /usr/ports/www/fswiki/Makefile Tue Nov 9 00:27:57 2004 +++ fswiki/Makefile Thu May 26 20:13:42 2005 @@ -6,10 +6,10 @@ # PORTNAME= fswiki -PORTVERSION= 3.5.6 +PORTVERSION= 3.5.8 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} -MASTER_SITE_SUBDIR= fswiki/10997 +MASTER_SITE_SUBDIR= fswiki/14798 DISTNAME= wiki${PORTVERSION:S|.|_|g} MAINTAINER= kuriyama@FreeBSD.org diff -urN /usr/ports/www/fswiki/distinfo fswiki/distinfo --- /usr/ports/www/fswiki/distinfo Tue Nov 9 00:27:57 2004 +++ fswiki/distinfo Thu May 26 20:13:45 2005 @@ -1,2 +1,2 @@ -MD5 (wiki3_5_6.zip) = eb457832bba33342338813ec9d57b708 -SIZE (wiki3_5_6.zip) = 890151 +MD5 (wiki3_5_8.zip) = e20274ca6b34f4d055cfc58aca834650 +SIZE (wiki3_5_8.zip) = 876214 diff -urN /usr/ports/www/fswiki/files/patch-CGI2.pm fswiki/files/patch-CGI2.pm --- /usr/ports/www/fswiki/files/patch-CGI2.pm Tue Nov 9 00:27:58 2004 +++ fswiki/files/patch-CGI2.pm Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- lib/CGI2.pm.orig Sun Aug 22 13:49:49 2004 -+++ lib/CGI2.pm Mon Nov 8 12:55:21 2004 -@@ -30,7 +30,7 @@ - my $dir = $wiki->config('session_dir'); - my $limit = $wiki->config('session_limit'); - -- opendir(SESSION_DIR,$dir) or die $!; -+ opendir(SESSION_DIR,$dir) or die "$!: $dir"; - my $timeout = time() - (60 * $limit); - while(my $entry = readdir(SESSION_DIR)){ - if($entry =~ /^cgisess_/){ -@@ -54,7 +54,7 @@ - # セッション開始フラグが立っておらず、CookieにセッションIDが - # 存在しない場合はセッションを生成しない - if(!defined($self->{session_cache})){ -- if($start!=1 && $self->cookie(-name=>'CGISESSID') eq ""){ -+ if((not defined $start or $start!=1) && $self->cookie(-name=>'CGISESSID') eq ""){ - return undef; - } - my $dir = $wiki->config('session_dir'); diff -urN /usr/ports/www/fswiki/files/patch-DefaultStorage.pm fswiki/files/patch-DefaultStorage.pm --- /usr/ports/www/fswiki/files/patch-DefaultStorage.pm Tue Nov 9 00:27:58 2004 +++ fswiki/files/patch-DefaultStorage.pm Thu Jan 1 09:00:00 1970 @@ -1,17 +0,0 @@ ---- lib/Wiki/DefaultStorage.pm.orig Sun Aug 22 13:49:52 2004 -+++ lib/Wiki/DefaultStorage.pm Mon Nov 8 12:56:44 2004 -@@ -324,12 +324,12 @@ - my $page = shift; - my $path = shift; - -- if(defined($self->{exists_cache}->{"$path:$page"})){ -+ if($self->{exists_cache} and defined($self->{exists_cache}->{"$path:$page"})){ - return $self->{exists_cache}->{"$path:$page"}; - } - - my $dir = $self->{wiki}->config('data_dir'); -- if($path ne ""){ -+ if(defined $path and $path ne ""){ - $dir = "$dir/$path"; - } - diff -urN /usr/ports/www/fswiki/files/patch-Wiki.pm fswiki/files/patch-Wiki.pm --- /usr/ports/www/fswiki/files/patch-Wiki.pm Tue Nov 9 00:27:58 2004 +++ fswiki/files/patch-Wiki.pm Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- lib/Wiki.pm.orig Sun Aug 22 13:49:50 2004 -+++ lib/Wiki.pm Mon Nov 8 12:56:01 2004 -@@ -41,7 +41,7 @@ - # 設定を読み込み - my $setupfile = shift || 'setup.dat'; - $self->{"config"} = &Util::load_config_hash(undef,$setupfile); -- die "setup file ${setupfile} not found" if scalar(%{$self->{"config"}}) == 0; -+ die "setup file ${setupfile} not found" if (keys %{$self->{"config"}} == 0); - $self->{"config"}->{"plugin_dir"} = "." unless exists($self->{"config"}->{"plugin_dir"}); - $self->{"config"}->{"frontpage"} = "FrontPage" unless exists($self->{"config"}->{"frontpage"}); - unshift(@INC, $self->{"config"}->{"plugin_dir"}); -@@ -1444,7 +1444,7 @@ - sub farm_is_enable { - my $self = shift; - my $farm_config = &Util::load_config_hash($self,$self->config('farmconf_file')); -- if($farm_config->{usefarm}==1){ -+ if(defined $farm_config->{usefarm} and $farm_config->{usefarm}==1){ - return 1; - } else { - return 0; >Release-Note: >Audit-Trail: >Unformatted: