pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/horde Bump to 3.1.1nb2 to address recent XSS issue...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f7a42c43dfa
branches:  trunk
changeset: 514667:0f7a42c43dfa
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Fri Jun 16 09:23:21 2006 +0000

description:
Bump to 3.1.1nb2 to address recent XSS issue (patches from Horde CVS)

diffstat:

 www/horde/DESCR                 |     8 +-
 www/horde/MESSAGE               |    24 +-
 www/horde/Makefile              |   137 ++-
 www/horde/PLIST                 |  1743 +++++++++++++++++++++++++++++++++-----
 www/horde/distinfo              |    12 +-
 www/horde/files/horde.conf.dist |     3 +-
 www/horde/options.mk            |    31 +
 www/horde/patches/patch-aa      |   110 +--
 www/horde/patches/patch-ab      |    19 +
 www/horde/patches/patch-ac      |    34 +
 10 files changed, 1726 insertions(+), 395 deletions(-)

diffs (truncated from 2391 to 300 lines):

diff -r 112c27a1c32a -r 0f7a42c43dfa www/horde/DESCR
--- a/www/horde/DESCR   Fri Jun 16 09:20:32 2006 +0000
+++ b/www/horde/DESCR   Fri Jun 16 09:23:21 2006 +0000
@@ -1,4 +1,4 @@
-The Horde Application Framework provides classes for dealing with preferences,
-compression, browser detection, connection tracking, MIME, and more.
-This is the previous stable branch of Horde.  A version of Horde using the
-current stable branch is available as www/horde3.
+The Horde Application Framework is a modular, general-purpose web application
+framework written in PHP.  It provides an extensive array of classes that are
+targeted at the common problems and tasks involved in developing modern web
+applications.
diff -r 112c27a1c32a -r 0f7a42c43dfa www/horde/MESSAGE
--- a/www/horde/MESSAGE Fri Jun 16 09:20:32 2006 +0000
+++ b/www/horde/MESSAGE Fri Jun 16 09:23:21 2006 +0000
@@ -1,30 +1,18 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.7 2005/05/15 21:39:07 salo Exp $
+$NetBSD: MESSAGE,v 1.8 2006/06/16 09:23:21 adrianp Exp $
 
 Please refer to the file:
 
        ${PREFIX}/share/doc/horde/INSTALL
 
-to setup Horde to access its database properly.  The short summary is to
-edit:
-
-       ${HORDEDIR}/config/horde.php
-
-to specify the correct backend database, and run the appropriate scripts
-in:
+to setup Horde to access its user preferences store properly.  The short
+summary is to run the appropriate scripts in:
 
        ${HORDEDIR}/scripts/db
 
-to setup the horde database.  You will also need to install the appropriate
-php module, such as databases/php4-mysql or databases/php4-pgsql.  Horde is
-setup by default to access MySQL.  It's recommended that you change the
-password of the 'hordemgr' user used to connect to the horde database.  For
-localhost security, the file
-
-       ${HORDEDIR}/config/horde.php
-
-should be accessible only to the webserver process as it contains the
-horde database password.
+to setup the horde preferences store.  Horde is setup by default to access
+MySQL.  It's recommended that you change the password of the 'horde' user used
+to connect to the horde database.
 
 You will also need to make Horde accessible through your HTTP server.  If
 you are running Apache and ap-php, then you can add the following line
diff -r 112c27a1c32a -r 0f7a42c43dfa www/horde/Makefile
--- a/www/horde/Makefile        Fri Jun 16 09:20:32 2006 +0000
+++ b/www/horde/Makefile        Fri Jun 16 09:23:21 2006 +0000
@@ -1,74 +1,133 @@
-# $NetBSD: Makefile,v 1.44 2006/06/02 18:28:00 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2006/06/16 09:23:21 adrianp Exp $
 
-DISTNAME=      horde-2.2.9
+DISTNAME=      horde-3.1.1
 PKGREVISION=   2
 CATEGORIES=    www
-MASTER_SITES=  ftp://ftp.horde.org/pub/horde/tarballs/
+MASTER_SITES=  http://ftp.horde.org/pub/horde/ \
+               ftp://ftp.horde.org/pub/horde/
 
 MAINTAINER=    adrianp%NetBSD.org@localhost
 HOMEPAGE=      http://www.horde.org/
 COMMENT=       PHP application framework
 
+CONFLICTS+=    horde-2.*
+
 .include "../../lang/php/phpversion.mk"
 
 DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext
+DEPENDS+=      ${PHP_PKG_PREFIX}-mcrypt>=4.3.3:../../security/php-mcrypt
+DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=4.3.3:../../converters/php-iconv
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd
 DEPENDS+=      ${PHP_PKG_PREFIX}-pear-Log-[0-9]*:../../sysutils/pear-Log
+DEPENDS+=      ${PHP_PKG_PREFIX}-pear-Mail_Mime-[0-9]*:../../mail/pear-Mail_Mime
 DEPENDS+=      ${PHP_PKG_PREFIX}-pear-DB-[0-9]*:../../databases/pear-DB
+DEPENDS+=      ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php
+.if ${PKG_PHP_VERSION} == "4"
+DEPENDS+=      ${PHP_PKG_PREFIX}-domxml>=4.3.3:../../textproc/php4-domxml
+.elif ${PKG_PHP_VERSION} == "5"
+DEPENDS+=      ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom
+.endif
+DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=4.3.3:../../archivers/php-zlib
 
-CONFLICTS+=    horde-3.*
+.include "../../mk/bsd.prefs.mk"
 
 DOCDIR=                ${PREFIX}/share/doc/horde
 EGDIR=         ${PREFIX}/share/examples/horde
 HORDEDIR=      ${PREFIX}/share/horde
-
-MESSAGE_SUBST+=        HORDEDIR=${HORDEDIR}
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../lang/php/phpversion.mk"
+PAXDIRS=       js lib locale po scripts services templates themes util admin
+SENDMAIL?=     /usr/sbin/sendmail
 
 PKG_SYSCONFSUBDIR?=    httpd
-PHP_VERSIONS_ACCEPTED= 4
+MESSAGE_SUBST+=                HORDEDIR=${HORDEDIR:Q}
+
+CONF_FILES+=           ${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf
+CONF_FILES_PERMS+=     ${HORDEDIR}/config/conf.php.dist \
+                       ${HORDEDIR}/config/conf.php \
+                       ${APACHE_USER} ${ROOT_GROUP} 0640
+CONF_FILES_PERMS+=     ${HORDEDIR}/config/conf.xml.dist \
+                       ${HORDEDIR}/config/conf.xml \
+                       ${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=     ${HORDEDIR}/config/mime_drivers.php.dist \
+                       ${HORDEDIR}/config/mime_drivers.php \
+                       ${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=     ${HORDEDIR}/config/motd.php.dist \
+                       ${HORDEDIR}/config/motd.php \
+                       ${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=     ${HORDEDIR}/config/nls.php.dist \
+                       ${HORDEDIR}/config/nls.php \
+                       ${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=     ${HORDEDIR}/config/prefs.php.dist \
+                       ${HORDEDIR}/config/prefs.php \
+                       ${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=     ${HORDEDIR}/config/registry.php.dist \
+                       ${HORDEDIR}/config/registry.php \
+                       ${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=     ${HORDEDIR}/config/hooks.php.dist \
+                       ${HORDEDIR}/config/hooks.php \
+                       ${APACHE_USER} ${ROOT_GROUP} 0440
 
-CONF_FILES=    ${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf
-CONF_FILES+=   ${HORDEDIR}/config/horde.php.dist ${HORDEDIR}/config/horde.php
-CONF_FILES+=   ${HORDEDIR}/config/html.php.dist ${HORDEDIR}/config/html.php
-CONF_FILES+=   ${HORDEDIR}/config/lang.php.dist ${HORDEDIR}/config/lang.php
-CONF_FILES+=   ${HORDEDIR}/config/mime_drivers.php.dist ${HORDEDIR}/config/mime_drivers.php
-CONF_FILES+=   ${HORDEDIR}/config/mime_mapping.php.dist ${HORDEDIR}/config/mime_mapping.php
-CONF_FILES+=   ${HORDEDIR}/config/motd.php.dist ${HORDEDIR}/config/motd.php
-CONF_FILES+=   ${HORDEDIR}/config/prefs.php.dist ${HORDEDIR}/config/prefs.php
-CONF_FILES+=   ${HORDEDIR}/config/registry.php.dist ${HORDEDIR}/config/registry.php
+# Empty directories installed by install target
+# that we need to create in the install script
+# to get the same layout from a binary package installation
+REQD_DIRS+=    share/horde/lib/data
+REQD_DIRS+=    share/horde/lib/XML/tests
+REQD_DIRS+=    share/horde/lib/XML/docs/examples
+REQD_DIRS+=    share/horde/lib/XML/docs
+REQD_DIRS+=    share/horde/lib/VFS/tests
+REQD_DIRS+=    share/horde/lib/Text/tests
+REQD_DIRS+=    share/horde/lib/Text/docs/examples
+REQD_DIRS+=    share/horde/lib/Text/docs
+REQD_DIRS+=    share/horde/lib/Horde/tests
+REQD_DIRS+=    share/horde/lib/Horde/docs/examples
+REQD_DIRS+=    share/horde/lib/Horde/docs
+REQD_DIRS+=    share/horde/lib/Horde/Text/tests
+REQD_DIRS+=    share/horde/lib/File/tests
 
-post-patch:
-       cd ${WRKSRC}/scripts;                                           \
-       for FILE in mime_mapping/convert.pl; do         \
-               ${MV} -f $${FILE} $${FILE}.orig;                        \
-               ${SED}  -e "s|/usr/bin/perl|${PERL5}|g"                 \
-                       $${FILE}.orig > $${FILE};                       \
-       done
+SUBST_CLASSES+=                files
+SUBST_STAGE.files=     post-build
+SUBST_FILES.files=     horde.conf.dist config/conf.xml config/conf.xml.dist \
+                       scripts/set_perms.sh
+SUBST_SED.files=       -e "s|@HORDEDIR@|${HORDEDIR}|g"
+SUBST_SED.files+=      -e "s|/usr/lib/sendmail|${SENDMAIL}|g"
+SUBST_SED.files+=      -e "s|/bin/sh|${SH}|g"
+SUBST_MESSAGE.files=   Fixing configuration files.
+
+.include "options.mk"
+.include "../../mk/apache.mk"
 
 do-build:
-       ${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
-       ${FIND} ${WRKSRC} -name .htaccess -exec ${RM} -f {} \;
-       ${FIND} ${WRKSRC}/scripts -name "*.pl" -exec ${CHMOD} +x {} \;
-       ${FIND} ${WRKSRC}/scripts -name "*.sh" -exec ${CHMOD} +x {} \;
-
-pre-install:
-       ${SED}  -e "s|@HORDEDIR@|${HORDEDIR}|g"                         \
-               ${FILESDIR}/horde.conf.dist > ${WRKDIR}/horde.conf.dist
+       ${RM} ${WRKSRC}/lib/Horde/Auth/login.php.orig
+       ${RM} ${WRKSRC}/templates/problem/problem.inc.orig
+       ${CP} ${FILESDIR}/horde.conf.dist ${WRKSRC}/horde.conf.dist
+       ${CP} ${WRKSRC}/config/conf.xml ${WRKSRC}/config/conf.xml.dist
+       ${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f
+       ${CHMOD} 0750 ${WRKSRC}/scripts/set_perms.sh
 
 do-install:
        ${INSTALL_DATA_DIR} ${DOCDIR}
        ${INSTALL_DATA_DIR} ${EGDIR}
        ${INSTALL_DATA_DIR} ${HORDEDIR}
-       cd ${WRKDIR}; ${INSTALL_DATA} horde.conf.dist ${EGDIR}/horde.conf
-       cd ${WRKSRC}; ${INSTALL_DATA} COPYING README docs/* ${DOCDIR}
-       cd ${WRKSRC}; ${CP} -R graphics lib locale po scripts templates util ${HORDEDIR}
        ${INSTALL_DATA_DIR} ${HORDEDIR}/config
-       cd ${WRKSRC}/config; ${INSTALL_DATA} * ${HORDEDIR}/config
-       cd ${WRKSRC}; ${INSTALL_DATA} *.php ${HORDEDIR}
+       ${INSTALL_DATA} ${WRKSRC}/horde.conf.dist ${EGDIR}/horde.conf
+       ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCDIR}
+
+.      for d in ${PAXDIRS}
+               ${INSTALL_DATA_DIR} ${HORDEDIR}/${d}
+.      endfor
+
+.      for d in ${PAXDIRS}
+               @cd ${WRKSRC}/${d} && ${PAX} -rwpam . ${HORDEDIR}/${d}
+.      endfor
+
+       ${INSTALL_DATA} ${WRKSRC}/config/*.dist ${HORDEDIR}/config
+       ${INSTALL_DATA} ${WRKSRC}/*.php ${HORDEDIR}
        ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${HORDEDIR}
        ${FIND} ${HORDEDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
        ${FIND} ${HORDEDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
+       ${CHOWN} ${APACHE_USER}:${SHAREGRP} ${HORDEDIR}/config
+       ${CHMOD} 0750 ${HORDEDIR}/config
 
+.include "../../mk/apachever.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 112c27a1c32a -r 0f7a42c43dfa www/horde/PLIST
--- a/www/horde/PLIST   Fri Jun 16 09:20:32 2006 +0000
+++ b/www/horde/PLIST   Fri Jun 16 09:23:21 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/05/15 21:39:07 salo Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/06/16 09:23:21 adrianp Exp $
 share/doc/horde/CHANGES
 share/doc/horde/CODING_STANDARDS
 share/doc/horde/CONTRIBUTING
@@ -6,216 +6,526 @@
 share/doc/horde/CREDITS
 share/doc/horde/HACKING
 share/doc/horde/INSTALL
+share/doc/horde/PERFORMANCE
 share/doc/horde/README
 share/doc/horde/RELEASE_NOTES
 share/doc/horde/SECURITY
+share/doc/horde/TODO
 share/doc/horde/TRANSLATIONS
+share/doc/horde/UPGRADING
 share/examples/horde/horde.conf
-share/horde/config/horde.php.dist
-share/horde/config/html.php.dist
-share/horde/config/lang.php.dist
+share/horde/admin/cmdshell.php
+share/horde/admin/datatree.php
+share/horde/admin/groups.php
+share/horde/admin/index.php
+share/horde/admin/locale/en_US/help.xml
+share/horde/admin/locale/fi_FI/help.xml
+share/horde/admin/locale/hu_HU/help.xml
+share/horde/admin/perms/addchild.php
+share/horde/admin/perms/delete.php
+share/horde/admin/perms/edit.php
+share/horde/admin/perms/index.php
+share/horde/admin/phpshell.php
+share/horde/admin/sessions.php
+share/horde/admin/setup/config.php
+share/horde/admin/setup/diff.php
+share/horde/admin/setup/index.php
+share/horde/admin/setup/scripts.php
+share/horde/admin/sqlshell.php
+share/horde/admin/templates.php
+share/horde/admin/user.php
+share/horde/config/conf.php.dist
+share/horde/config/conf.xml.dist
+share/horde/config/hooks.php.dist
 share/horde/config/mime_drivers.php.dist
-share/horde/config/mime_mapping.php.dist
 share/horde/config/motd.php.dist
+share/horde/config/nls.php.dist
 share/horde/config/prefs.php.dist
 share/horde/config/registry.php.dist
-share/horde/css.php
-share/horde/graphics/alerts/error.gif
-share/horde/graphics/alerts/message.gif
-share/horde/graphics/alerts/success.gif
-share/horde/graphics/alerts/warning.gif
-share/horde/graphics/data.gif
-share/horde/graphics/favicon.ico
-share/horde/graphics/help.gif
-share/horde/graphics/home.gif
-share/horde/graphics/keyboard.gif
-share/horde/graphics/login.gif
-share/horde/graphics/logout.gif
-share/horde/graphics/mime/audio.gif
-share/horde/graphics/mime/binary.gif
-share/horde/graphics/mime/compressed.gif
-share/horde/graphics/mime/csv.gif
-share/horde/graphics/mime/deb.gif
-share/horde/graphics/mime/encryption.gif
-share/horde/graphics/mime/executable.gif



Home | Main Index | Thread Index | Old Index