Skip site navigation (1)Skip section navigation (2)
Date:      Sun,  5 Jan 2003 01:11:00 +0100 (CET)
From:      Thierry Thomas <thierry@pompo.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        security-officer@FreeBSD.org
Subject:   ports/46769: devel/chora: upgrade to 1.2.
Message-ID:  <20030105001100.830F678B7@graf.pompo.net>

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

>Number:         46769
>Category:       ports
>Synopsis:       devel/chora: upgrade to 1.2.
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 04 16:20:01 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Sun Dec 29 12:46:07 CET 2002 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386


	
>Description:
	Upgrade to Chora 1.2.

	This release closes some cross-site scripting vulnerabilities.

	The full list of changes can be viewed here:
	<URL:http://cvs.horde.org/co.php/chora/docs/CHANGES?r=1.45.2.22>.

	The port now  includes a pkg-deinstall to preserve the modified
	configuration files (requested by many); however, this back-up will
	only be active for the next update!

>How-To-Repeat:
	N/A.

>Fix:
	Please apply the following patch.

        New file: devel/chora/pkg-deinstall (chmod u+x).


diff -urN devel/chora.orig/Makefile devel/chora/Makefile
--- devel/chora.orig/Makefile	Wed Jun 26 21:38:17 2002
+++ devel/chora/Makefile	Sun Jan  5 00:56:52 2003
@@ -6,11 +6,14 @@
 #
 
 PORTNAME=	chora
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.2
 CATEGORIES=	devel www
-MASTER_SITES=	ftp://ftp.horde.org/pub/chora/tarballs/%SUBDIR%/
-MASTER_SITE_SUBDIR=	. old
+MASTER_SITES=	ftp://ftp.horde.org/pub/chora/				\
+		ftp://ftp.au.horde.org/pub/horde/chora/			\
+		ftp://ftp.es.horde.org/pub/chora/			\
+		ftp://ftp.it.horde.org/pub/mirror/horde.org/chora/	\
+		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/chora/	\
+		ftp://ftp.pt.horde.org/pub/horde-ftp/chora/
 
 MAINTAINER=	thierry@pompo.net
 
diff -urN devel/chora.orig/distinfo devel/chora/distinfo
--- devel/chora.orig/distinfo	Tue Jun 18 20:27:59 2002
+++ devel/chora/distinfo	Sat Jan  4 23:50:36 2003
@@ -1 +1 @@
-MD5 (chora-1.1.tar.gz) = fffcdc04a6440ec42bdc62de79941a4a
+MD5 (chora-1.2.tar.gz) = 27438aa6319c408d93c52e1b25536f95
diff -urN devel/chora.orig/pkg-deinstall devel/chora/pkg-deinstall
--- devel/chora.orig/pkg-deinstall	Thu Jan  1 01:00:00 1970
+++ devel/chora/pkg-deinstall	Thu Dec 26 16:48:55 2002
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Backup Chora config files, if needed.
+
+if [ x$2 != xDEINSTALL ]; then
+    exit
+fi
+
+if [ -z "${PACKAGE_BUILDING}" ]; then
+  for cf in `ls ${PKG_PREFIX}/www/horde/chora/config/*php ${PKG_PREFIX}/www/horde/chora/config/*txt`; do
+    diff -bBqw $cf $cf.dist >/dev/null 2>&1
+    case $? in
+      0)  # original config file, will be deleted by pkg-plist
+          ;;
+      1)  # config file has been updated, must be backuped
+          cp -p $cf $cf.previous
+          echo "===> Backing-up..."
+          echo "--->   $cf has been saved ***"
+          echo "--->      as $cf.previous ***"
+          ;;
+      *)  # not found?
+          ;;
+    esac
+  done
+fi
diff -urN devel/chora.orig/pkg-plist devel/chora/pkg-plist
--- devel/chora.orig/pkg-plist	Tue Jun 18 20:27:59 2002
+++ devel/chora/pkg-plist	Sat Jan  4 23:53:22 2003
@@ -52,20 +52,25 @@
 %%CHORADIR%%/locale/.htaccess
 %%CHORADIR%%/locale/cs_CZ/LC_MESSAGES/chora.mo
 %%CHORADIR%%/locale/de_DE/LC_MESSAGES/chora.mo
+%%CHORADIR%%/locale/en_US/help.xml
 %%CHORADIR%%/locale/es_ES/LC_MESSAGES/chora.mo
+%%CHORADIR%%/locale/fi_FI/LC_MESSAGES/chora.mo
 %%CHORADIR%%/locale/fr_FR/LC_MESSAGES/chora.mo
 %%CHORADIR%%/locale/nb_NO/LC_MESSAGES/chora.mo
 %%CHORADIR%%/locale/nl_NL/LC_MESSAGES/chora.mo
 %%CHORADIR%%/locale/pl_PL/LC_MESSAGES/chora.mo
 %%CHORADIR%%/locale/pt_BR/LC_MESSAGES/chora.mo
 %%CHORADIR%%/locale/sv_SE/LC_MESSAGES/chora.mo
+%%CHORADIR%%/menu.php
 %%CHORADIR%%/po/.htaccess
 %%CHORADIR%%/po/Makefile
 %%CHORADIR%%/po/README
+%%CHORADIR%%/po/chora.pot
 %%CHORADIR%%/po/cs_CZ.po
 %%CHORADIR%%/po/de_DE.po
 %%CHORADIR%%/po/es_ES.po
 %%CHORADIR%%/po/extract.pl
+%%CHORADIR%%/po/fi_FI.po
 %%CHORADIR%%/po/fr_FR.po
 %%CHORADIR%%/po/nb_NO.po
 %%CHORADIR%%/po/nl_NL.po
@@ -74,6 +79,8 @@
 %%CHORADIR%%/po/shtool
 %%CHORADIR%%/po/sv_SE.po
 %%CHORADIR%%/po/xgettext.sh
+%%CHORADIR%%/prefs.php
+%%CHORADIR%%/status.php
 %%CHORADIR%%/templates/.htaccess
 %%CHORADIR%%/templates/annotate/footer.inc
 %%CHORADIR%%/templates/annotate/header.inc
@@ -96,6 +103,7 @@
 %%CHORADIR%%/templates/directory/footer.inc
 %%CHORADIR%%/templates/directory/header.inc
 %%CHORADIR%%/templates/error_page.inc
+%%CHORADIR%%/templates/headerbar.inc
 %%CHORADIR%%/templates/history/blank.inc
 %%CHORADIR%%/templates/history/branch_cell.inc
 %%CHORADIR%%/templates/history/footer.inc
@@ -108,6 +116,7 @@
 %%CHORADIR%%/templates/log/header.inc
 %%CHORADIR%%/templates/log/request.inc
 %%CHORADIR%%/templates/log/rev.inc
+%%CHORADIR%%/templates/menu/menu.inc
 etc/horde/httpd.conf.chora
 %%PORTDOCS%%@dirrm share/doc/chora
 @dirrm %%CHORADIR%%/config
@@ -121,8 +130,11 @@
 @dirrm %%CHORADIR%%/locale/cs_CZ
 @dirrm %%CHORADIR%%/locale/de_DE/LC_MESSAGES
 @dirrm %%CHORADIR%%/locale/de_DE
+@dirrm %%CHORADIR%%/locale/en_US
 @dirrm %%CHORADIR%%/locale/es_ES/LC_MESSAGES
 @dirrm %%CHORADIR%%/locale/es_ES
+@dirrm %%CHORADIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%CHORADIR%%/locale/fi_FI
 @dirrm %%CHORADIR%%/locale/fr_FR/LC_MESSAGES
 @dirrm %%CHORADIR%%/locale/fr_FR
 @dirrm %%CHORADIR%%/locale/nb_NO/LC_MESSAGES
@@ -145,6 +157,7 @@
 @dirrm %%CHORADIR%%/templates/history
 @dirrm %%CHORADIR%%/templates/index
 @dirrm %%CHORADIR%%/templates/log
+@dirrm %%CHORADIR%%/templates/menu
 @dirrm %%CHORADIR%%/templates
 @dirrm %%CHORADIR%%
 @unexec if cmp -s %D/www/horde/config/mime_drivers.php %D/www/horde/config/mime_drivers.php.afterChora; then rm -f %D/www/horde/config/mime_drivers.php.afterChora; mv %D/www/horde/config/mime_drivers.php.beforeChora %D/www/horde/config/mime_drivers.php; fi
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




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