Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Apr 2003 00:39:27 +0200 (CEST)
From:      Thierry Thomas <thierry@pompo.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/51299: www/horde2: upgrading to 2.2.2.
Message-ID:  <20030422223927.25A237681@graf.pompo.net>
Resent-Message-ID: <200304222250.h3MMo6Xl096744@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         51299
>Category:       ports
>Synopsis:       www/horde2: upgrading to 2.2.2.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 22 15:50:06 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.8-RC i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.8-RC FreeBSD 4.8-RC #0: Sat Mar 29 02:08:33 CET 2003 thierry@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386


	
>Description:
	Upgrading to the latest -stable release of Horde.

	Removing a dependency on security/pear-Crypt_CBC. 

	Note: this upgrade will be necessary to upgrade Kronolith to 1.1.

>How-To-Repeat:
	N/A.

>Fix:
	Please apply the following patch:

--- horde2.diff begins here ---
diff -urN www/horde2.orig/Makefile www/horde2/Makefile
--- www/horde2.orig/Makefile	Mon Mar 31 23:34:49 2003
+++ www/horde2/Makefile	Wed Apr 23 00:15:08 2003
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.au.horde.org/pub/horde/			\
@@ -31,8 +30,7 @@
 LIB_DEPENDS+=	mcal.0:${PORTSDIR}/misc/libmcal
 .endif
 # Remark: pear-XML_sql2xml is included, but never used.
-RUN_DEPENDS=	${PHP_LIB}/Crypt/CBC.php:${PORTSDIR}/security/pear-Crypt_CBC	\
-		${PHP_LIB}/Date.php:${PORTSDIR}/devel/pear-Date			\
+RUN_DEPENDS=	${PHP_LIB}/Date.php:${PORTSDIR}/devel/pear-Date			\
 		${PHP_LIB}/HTML/Select.php:${PORTSDIR}/devel/pear-HTML_Select_Common	\
 		${PHP_LIB}/Log.php:${PORTSDIR}/sysutils/pear-Log		\
 		${PHP_LIB}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
@@ -46,7 +44,7 @@
 DOCS=		COPYING README docs/CHANGES docs/CODING_STANDARDS \
 		docs/CONTRIBUTING docs/CREDITS docs/HACKING docs/INSTALL \
 		docs/TRANSLATIONS
-CONFFILE=	html.php lang.php mime_drivers.php mime_mapping.php \
+CONFFILE=	horde.php html.php lang.php mime_drivers.php mime_mapping.php \
 		motd.php prefs.php registry.php
 SUB_DIRS=	config graphics lib locale po scripts templates util
 
diff -urN www/horde2.orig/distinfo www/horde2/distinfo
--- www/horde2.orig/distinfo	Sun Feb 16 14:12:09 2003
+++ www/horde2/distinfo	Tue Apr 22 23:24:40 2003
@@ -1 +1 @@
-MD5 (horde-2.2.1.tar.gz) = 0a1e087f5017524a6b1b3d62204f49bb
+MD5 (horde-2.2.2.tar.gz) = 11be45ccac288584eb1bff0e5ab46a15
diff -urN www/horde2.orig/files/patch-ab www/horde2/files/patch-ab
--- www/horde2.orig/files/patch-ab	Thu Jan 30 14:42:37 2003
+++ www/horde2/files/patch-ab	Tue Apr 22 23:35:46 2003
@@ -1,15 +1,15 @@
---- config/horde.php.dist.orig	Tue Oct 29 22:21:36 2002
-+++ config/horde.php.dist	Thu Jan  9 21:37:31 2003
-@@ -86,7 +86,7 @@
- 
+--- config/horde.php.dist.orig	Tue Apr 22 20:45:22 2003
++++ config/horde.php.dist	Tue Apr 22 23:35:10 2003
+@@ -94,7 +94,7 @@
  // What backend should we use for authenticating users to Horde? Valid
- // options are currently 'imap', 'ldap', 'mcal', 'sql', 'ftp' and 'krb5'.
+ // options are currently 'imap', 'ldap', 'mcal', 'sql', 'ftp', 'smb',
+ // 'krb5' and 'radius'.
 -$conf['auth']['driver'] = '';
 +$conf['auth']['driver'] = 'imap';
  
  // An array holding any parameters that the Auth object will need to
  // function correctly.
-@@ -145,7 +145,7 @@
+@@ -159,7 +159,7 @@
  // (meaning use system defaults and don't save any user preferences),
  // 'session' (preferences only persist during the login), 'ldap',
  // and 'sql'.
@@ -18,7 +18,7 @@
  
  // Any parameters that the preferences driver needs. This includes
  // database or ldap server, username/password to connect with, etc.
-@@ -154,12 +154,12 @@
+@@ -168,12 +168,12 @@
  // This is an example configuration for a MySQL preference backend.
  // The SQL script to setup the preference database is placed in
  // horde/scripts/db/prefs.sql.
@@ -37,7 +37,7 @@
  
  // This is an example configuration for an LDAP preference backend.
  // The schemas needed for ldap are in horde/scripts/ldap.  For more
-@@ -209,7 +209,7 @@
+@@ -223,7 +223,7 @@
  // SMTP authentication can be enabled by setting the 'auth' parameter
  // to true.
  $conf['mailer']['params'] = array();
@@ -46,7 +46,7 @@
  // $conf['mailer']['params'] = array('host' => 'smtp.example.com');
  
  
-@@ -267,3 +267,9 @@
+@@ -328,3 +328,9 @@
  // Should we use DHTML to display a floating menu of Horde appliation
  // links, instead of a frame?
  $conf['menu']['floating_bar'] = false;
diff -urN www/horde2.orig/pkg-plist www/horde2/pkg-plist
--- www/horde2.orig/pkg-plist	Sun Feb 16 14:12:09 2003
+++ www/horde2/pkg-plist	Tue Apr 22 23:49:56 2003
@@ -89,7 +89,9 @@
 %%HORDEDIR%%/lib/Auth/krb5.php
 %%HORDEDIR%%/lib/Auth/ldap.php
 %%HORDEDIR%%/lib/Auth/mcal.php
+%%HORDEDIR%%/lib/Auth/radius.php
 %%HORDEDIR%%/lib/Auth/sql.php
+%%HORDEDIR%%/lib/Auth/smb.php
 %%HORDEDIR%%/lib/Browser.php
 %%HORDEDIR%%/lib/Cache.php
 %%HORDEDIR%%/lib/Cache/file.php
@@ -110,6 +112,7 @@
 %%HORDEDIR%%/lib/Help.php
 %%HORDEDIR%%/lib/Horde.php
 %%HORDEDIR%%/lib/Identity.php
+%%HORDEDIR%%/lib/Image.php
 %%HORDEDIR%%/lib/Lang.php
 %%HORDEDIR%%/lib/MIME.php
 %%HORDEDIR%%/lib/MIME/Magic.php
@@ -168,6 +171,7 @@
 %%HORDEDIR%%/lib/version.php
 %%HORDEDIR%%/locale/.htaccess
 %%HORDEDIR%%/locale/bg_BG/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/ca_ES/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/cs_CZ/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/da_DK/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/de_DE/LC_MESSAGES/horde.mo
@@ -188,6 +192,7 @@
 %%HORDEDIR%%/locale/nb_NO/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/nn_NO/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/pl_PL/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/pl_PL/help.xml
 %%HORDEDIR%%/locale/pt_BR/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/pt_PT/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/ro_RO/LC_MESSAGES/horde.mo
@@ -202,11 +207,13 @@
 %%HORDEDIR%%/login.php
 %%HORDEDIR%%/maintenance.php
 %%HORDEDIR%%/menu.php
+%%HORDEDIR%%/navbar.php
 %%HORDEDIR%%/po/.htaccess
 %%HORDEDIR%%/po/Makefile
 %%HORDEDIR%%/po/README
 %%HORDEDIR%%/po/wintokoi.pl
 %%HORDEDIR%%/po/bg_BG.po
+%%HORDEDIR%%/po/ca_ES.po
 %%HORDEDIR%%/po/cs_CZ.po
 %%HORDEDIR%%/po/da_DK.po
 %%HORDEDIR%%/po/de_DE.po
@@ -258,6 +265,7 @@
 %%HORDEDIR%%/scripts/db/prefs.sql
 %%HORDEDIR%%/scripts/db/sessionhandler.sql
 %%HORDEDIR%%/scripts/db/sessionhandler_sapdb.sql
+%%HORDEDIR%%/scripts/db/vfs.sql
 %%HORDEDIR%%/scripts/horde-rsync.sh
 %%HORDEDIR%%/scripts/ldap/horde.schema
 %%HORDEDIR%%/scripts/mime_mapping/Makefile
@@ -292,6 +300,7 @@
 %%HORDEDIR%%/templates/maintenance/confirm_middle.inc
 %%HORDEDIR%%/templates/maintenance/confirm_top.inc
 %%HORDEDIR%%/templates/maintenance/javascript.inc
+%%HORDEDIR%%/templates/navbar/menu.inc
 %%HORDEDIR%%/templates/prefs/begin.inc
 %%HORDEDIR%%/templates/prefs/checkbox.inc
 %%HORDEDIR%%/templates/prefs/end.inc
@@ -344,6 +353,8 @@
 @dirrm %%HORDEDIR%%/lib
 @dirrm %%HORDEDIR%%/locale/bg_BG/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/bg_BG
+@dirrm %%HORDEDIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/ca_ES
 @dirrm %%HORDEDIR%%/locale/cs_CZ/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/cs_CZ
 @dirrm %%HORDEDIR%%/locale/da_DK/LC_MESSAGES
@@ -415,7 +426,8 @@
 @dirrm %%HORDEDIR%%/templates/index
 @dirrm %%HORDEDIR%%/templates/javascript
 @dirrm %%HORDEDIR%%/templates/login
-@dirrm %%HORDEDIR%%/templates/maintenance/
+@dirrm %%HORDEDIR%%/templates/maintenance
+@dirrm %%HORDEDIR%%/templates/navbar
 @dirrm %%HORDEDIR%%/templates/prefs
 @dirrm %%HORDEDIR%%/templates/problem
 @dirrm %%HORDEDIR%%/templates/wml/login
--- horde2.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030422223927.25A237681>