Attachment #53886 for bug #81520

View | Details | Raw Unified | Return to bug 81520
Collapse All | Expand All

Lines 6-15 Link Here

(-)fswiki/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= fswiki	8	PORTNAME= fswiki
9	PORTVERSION= 3.5.6	9	PORTVERSION= 3.5.8
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
12	MASTER_SITE_SUBDIR= fswiki/10997	12	MASTER_SITE_SUBDIR= fswiki/14798
13	DISTNAME= wiki${PORTVERSION:S\|.\|_\|g}	13	DISTNAME= wiki${PORTVERSION:S\|.\|_\|g}
14		14
15	MAINTAINER= kuriyama@FreeBSD.org	15	MAINTAINER= kuriyama@FreeBSD.org

Lines 1-2 Link Here

(-)fswiki/distinfo (-2 / +2 lines)
1	MD5 (wiki3_5_6.zip) = eb457832bba33342338813ec9d57b708	1	MD5 (wiki3_5_8.zip) = e20274ca6b34f4d055cfc58aca834650
2	SIZE (wiki3_5_6.zip) = 890151	2	SIZE (wiki3_5_8.zip) = 876214

Lines 1-20 Link Here

(-)fswiki/files/patch-CGI2.pm (-20 lines)
1	--- lib/CGI2.pm.orig Sun Aug 22 13:49:49 2004
2	+++ lib/CGI2.pm Mon Nov 8 12:55:21 2004
3	@@ -30,7 +30,7 @@
4	my $dir = $wiki->config('session_dir');
5	my $limit = $wiki->config('session_limit');
6
7	- opendir(SESSION_DIR,$dir) or die $!;
8	+ opendir(SESSION_DIR,$dir) or die "$!: $dir";
9	my $timeout = time() - (60 * $limit);
10	while(my $entry = readdir(SESSION_DIR)){
11	if($entry =~ /^cgisess_/){
12	@@ -54,7 +54,7 @@
13	# ¥»¥Ã¥·¥ç¥ó³«»Ï¥Õ¥é¥°¤¬Î©¤Ã¤Æ¤ª¤é¤º¡¢Cookie¤Ë¥»¥Ã¥·¥ç¥óID¤¬
14	# Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ï¥»¥Ã¥·¥ç¥ó¤òÀ¸À®¤·¤Ê¤¤
15	if(!defined($self->{session_cache})){
16	- if($start!=1 && $self->cookie(-name=>'CGISESSID') eq ""){
17	+ if((not defined $start or $start!=1) && $self->cookie(-name=>'CGISESSID') eq ""){
18	return undef;
19	}
20	my $dir = $wiki->config('session_dir');




--- 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";
 	}
 	




--- 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;

Return to bug 81520

Lines 1-17 Link Here

(-)fswiki/files/patch-DefaultStorage.pm (-17 lines)
1	--- lib/Wiki/DefaultStorage.pm.orig Sun Aug 22 13:49:52 2004
2	+++ lib/Wiki/DefaultStorage.pm Mon Nov 8 12:56:44 2004
3	@@ -324,12 +324,12 @@
4	my $page = shift;
5	my $path = shift;
6
7	- if(defined($self->{exists_cache}->{"$path:$page"})){
8	+ if($self->{exists_cache} and defined($self->{exists_cache}->{"$path:$page"})){
9	return $self->{exists_cache}->{"$path:$page"};
10	}
11
12	my $dir = $self->{wiki}->config('data_dir');
13	- if($path ne ""){
14	+ if(defined $path and $path ne ""){
15	$dir = "$dir/$path";
16	}
17

Lines 1-20 Link Here

(-)fswiki/files/patch-Wiki.pm (-20 lines)
1	--- lib/Wiki.pm.orig Sun Aug 22 13:49:50 2004
2	+++ lib/Wiki.pm Mon Nov 8 12:56:01 2004
3	@@ -41,7 +41,7 @@
4	# ÀßÄê¤òÆÉ¤ß¹þ¤ß
5	my $setupfile = shift \|\| 'setup.dat';
6	$self->{"config"} = &Util::load_config_hash(undef,$setupfile);
7	- die "setup file ${setupfile} not found" if scalar(%{$self->{"config"}}) == 0;
8	+ die "setup file ${setupfile} not found" if (keys %{$self->{"config"}} == 0);
9	$self->{"config"}->{"plugin_dir"} = "." unless exists($self->{"config"}->{"plugin_dir"});
10	$self->{"config"}->{"frontpage"} = "FrontPage" unless exists($self->{"config"}->{"frontpage"});
11	unshift(@INC, $self->{"config"}->{"plugin_dir"});
12	@@ -1444,7 +1444,7 @@
13	sub farm_is_enable {
14	my $self = shift;
15	my $farm_config = &Util::load_config_hash($self,$self->config('farmconf_file'));
16	- if($farm_config->{usefarm}==1){
17	+ if(defined $farm_config->{usefarm} and $farm_config->{usefarm}==1){
18	return 1;
19	} else {
20	return 0;