ports/105480: Port update: www/campsite 2.6.1 -> 2.6.2

[Ondra Koutek]

>Number:         105480
>Category:       ports
>Synopsis:       Port update: www/campsite 2.6.1 -> 2.6.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 13 15:30:09 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Ondra Koutek
>Release:        FreeBSD 6.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD s1.mediaturtle.com 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #21: Sun Oct 1 21:26:39 CEST 2006 root at s1.mediaturtle.com:/usr/obj/usr/src/sys/S1 i386


	
>Description:
	Port update: www/campsite 2.6.1-> 2.6.2 - bugfixies
>How-To-Repeat:
	
>Fix:

	

--- campsite.diff begins here ---
diff -ruN campsite.orig/Makefile campsite/Makefile
--- campsite.orig/Makefile	Mon Aug 28 12:32:47 2006
+++ campsite/Makefile	Sun Nov 12 10:11:33 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	campsite
-PORTVERSION=	2.6.1
+PORTVERSION=	2.6.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -ruN campsite.orig/distinfo campsite/distinfo
--- campsite.orig/distinfo	Mon Aug 28 12:32:47 2006
+++ campsite/distinfo	Sun Nov 12 10:12:54 2006
@@ -1,3 +1,3 @@
-MD5 (campsite-2.6.1.tar.gz) = 78235fcf34d3d2be58d3f03b80af298d
-SHA256 (campsite-2.6.1.tar.gz) = 0aa4bc8a217176cabe0919d3d1d3c9109f378204f1b1fbf9dbfcbce6e8b437a2
-SIZE (campsite-2.6.1.tar.gz) = 4412045
+MD5 (campsite-2.6.2.tar.gz) = 0112a951a8bf5938371d66c34a098b58
+SHA256 (campsite-2.6.2.tar.gz) = 43b192bebe9ee3a8c2b18e224020f4806586c90baeef84bf365539d30baf6fa4
+SIZE (campsite-2.6.2.tar.gz) = 4414833
diff -ruN campsite.orig/files/patch-campsite-remove-instance.php campsite/files/patch-campsite-remove-instance.php
--- campsite.orig/files/patch-campsite-remove-instance.php	Mon Jul 24 01:31:47 2006
+++ campsite/files/patch-campsite-remove-instance.php	Thu Jan  1 00:00:00 1970
@@ -1,24 +0,0 @@
---- implementation/utils/campsite-remove-instance.php.orig	Wed Jul 12 21:49:26 2006
-+++ implementation/utils/campsite-remove-instance.php	Thu Jul 13 09:17:11 2006
-@@ -10,6 +10,11 @@
- $arg3 = isset($GLOBALS['argv'][3]) ? trim($GLOBALS['argv'][3]) : "";
- $no_backup = $arg3 == '--no_backup';
- 
-+// include install_conf.php file
-+require_once("$etc_dir/install_conf.php");
-+require_once($Campsite['BIN_DIR'] . "/cli_script_lib.php");
-+
-+
- if ($etc_dir == "") {
- 	die("Please supply the configuration directory as the first argument.\n");
- }
-@@ -21,9 +26,6 @@
- 	exit(1);
- }
- 
--// include install_conf.php file
--require_once("$etc_dir/install_conf.php");
--require_once($Campsite['BIN_DIR'] . "/cli_script_lib.php");
- 
- if (!$no_backup) {
- 	// backup instance
diff -ruN campsite.orig/pkg-plist campsite/pkg-plist
--- campsite.orig/pkg-plist	Mon Aug 28 12:32:47 2006
+++ campsite/pkg-plist	Sun Nov 12 12:20:03 2006
@@ -39,6 +39,9 @@
 campsite/instance/database/upgrade/2.5.x/upgrade_user_perms.php
 campsite/instance/database/upgrade/2.6.0/data-required.sql
 campsite/instance/database/upgrade/2.6.0/tables.sql
+campsite/instance/database/upgrade/2.6.1/data-required.sql
+campsite/instance/database/upgrade/2.6.1/tables.sql
+campsite/instance/database/upgrade/2.6.1/upgrade_phorum_users.php
 campsite/sbin/campsite_autopublish
 campsite/sbin/campsite_autopublish.php
 campsite/sbin/campsite_config
@@ -68,6 +71,7 @@
 campsite/www-common/html/classes/DbObjectArray.php
 campsite/www-common/html/classes/DynMenuItem.php
 campsite/www-common/html/classes/Event.php
+campsite/www-common/html/classes/FileTextSearch.php
 campsite/www-common/html/classes/IPAccess.php
 campsite/www-common/html/classes/Image.php
 campsite/www-common/html/classes/ImageSearch.php
@@ -396,6 +400,7 @@
 campsite/www-common/html/include/captcha/fonts/local.conf
 campsite/www-common/html/include/captcha/image.php
 campsite/www-common/html/include/captcha/php-captcha.inc.php
+campsite/www-common/html/include/crypto/rc4Encrypt.php
 campsite/www-common/html/include/pear/Archive/Tar.php
 campsite/www-common/html/include/pear/Console/Getopt.php
 campsite/www-common/html/include/pear/File.php
@@ -1002,6 +1007,7 @@
 campsite/www-common/html/javascript/SyntaxHighlighter/shBrushXml.js
 campsite/www-common/html/javascript/SyntaxHighlighter/shCore.js
 campsite/www-common/html/javascript/campsite.js
+campsite/www-common/html/javascript/crypt.js
 campsite/www-common/html/javascript/fValidate/fValidate.basic.js
 campsite/www-common/html/javascript/fValidate/fValidate.config.js
 campsite/www-common/html/javascript/fValidate/fValidate.controls.js
@@ -2754,6 +2760,7 @@
 @dirrm campsite/www-common/html/include/pear/Console
 @dirrm campsite/www-common/html/include/pear/Archive
 @dirrm campsite/www-common/html/include/pear
+ at dirrm campsite/www-common/html/include/crypto
 @dirrm campsite/www-common/html/include/captcha/fonts
 @dirrm campsite/www-common/html/include/captcha
 @dirrm campsite/www-common/html/include/adodb/xsl
@@ -2779,6 +2786,7 @@
 @dirrm campsite/www-common
 @dirrm campsite/www
 @dirrm campsite/sbin
+ at dirrm campsite/instance/database/upgrade/2.6.1
 @dirrm campsite/instance/database/upgrade/2.6.0
 @dirrm campsite/instance/database/upgrade/2.5.x
 @dirrm campsite/instance/database/upgrade/2.4.x
--- campsite.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:
 Reply-To: Ondra Koutek <koutek at o-k.cz> 
 Cc: 
 X-send-pr-version: 3.113
 X-GNATS-Notify: