Date: Mon, 21 Oct 2013 00:49:46 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331076 - in head/mail/squirrelmail: . files Message-ID: <201310210049.r9L0nksQ092151@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Oct 21 00:49:45 2013 New Revision: 331076 URL: http://svnweb.freebsd.org/changeset/ports/331076 Log: It has been 2.5 years since the last SquirrelMail release. In this time, there have been many fixes added to the source tree, including the PHP 5.4 and 5.5 fixes, requests for which have become the bane of my maintainer existence. The SM team is hard at work on the next version, but at this time it is unclear whether the next version will ever see a full release. As a result, this port will begin following hand-picked SVN snapshots. So, the port officially accepts PHP 5.4 and 5.5, though if you encounter weird errors please DTRT and report it to the SM developers and then downgrade your PHP to 5.3. The other major thing here is that the default location for user preferences and attachments is being changed. Previously we used /var/spool/squirrelmail which is really not in-line with FreeBSD's hier(7). Now we use paths under $PREFIX, respectively $PREFIX/www/squirrelmail/data and .../attach. You can either copy /var/spool/squirrelmail/pref/* into $PREFIX/www/squirrelmail/data, and /var/.../attach/* into $PREFIX/.../attach, and then run $PREFIX/www/squirrelmail/configure, or you can do nothing in which case that's totally fine too and your installation won't break or anything. Note that best practice, as recommended by the SM installation notes and common sense, would suggest moving your user data files to someplace outside of the $PREFIX/www/squirrelmail. Deleted: head/mail/squirrelmail/files/patch-class__deliver__Deliver.class.php head/mail/squirrelmail/files/patch-config-config_default.php head/mail/squirrelmail/files/patch-plugins-mail_fetch-functions.php head/mail/squirrelmail/files/patch-plugins-message_details-message_details_bottom.php head/mail/squirrelmail/files/pkg-deinstall.in head/mail/squirrelmail/files/pkg-install.in Modified: head/mail/squirrelmail/Makefile head/mail/squirrelmail/distinfo head/mail/squirrelmail/files/pkg-message.in head/mail/squirrelmail/pkg-plist Modified: head/mail/squirrelmail/Makefile ============================================================================== --- head/mail/squirrelmail/Makefile Mon Oct 21 00:39:20 2013 (r331075) +++ head/mail/squirrelmail/Makefile Mon Oct 21 00:49:45 2013 (r331076) @@ -2,34 +2,33 @@ # $FreeBSD$ PORTNAME= squirrelmail -PORTVERSION= 1.4.22 -PORTREVISION= 3 +PORTVERSION= 20131020 CATEGORIES= mail www -MASTER_SITES= SF/${PORTNAME}/stable/${PORTVERSION} -DISTNAME= ${PORTNAME}-webmail-${PORTVERSION} +MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= adamw +DISTNAME= ${PORTNAME}-${PORTVERSION}_0200-SVN.stable DIST_SUBDIR= ${PORTNAME} MAINTAINER= adamw@FreeBSD.org COMMENT= A webmail system which accesses mail over IMAP +# This snapshot tarball contains php 5.4 and 5.5 compatibility +# patches, but the only guaranteed compatibility is with php 5.3. +# If you encounter problems, downgrade to php 5.3. + USE_PHP= session mhash gettext mbstring pcre openssl xml WANT_PHP_WEB= yes -### Folks, please stop removing the following line and asking me why -### squirrelmail doesn't work. I know the canned error says that SM -### is incompatible with php 5, but it is just php-5.4 that it is -### incompatible with. Install lang/php53 and it will work. -### This will be fixed if/when the SM team releases the next version. -IGNORE_WITH_PHP=5 # known incompatibilities with php-5.4, use 5.3 for now -DEFAULT_PHP_VER=53 USE_BZIP2= yes USES= gettext +WRKSRC= ${WRKDIR}/${PORTNAME}.stable/${PORTNAME} + OPTIONS_DEFINE= DATABASE LDAP DATABASE_DESC= PEAR database support (must also intall a driver) # if you were using WITHOUT_WWWDIR, use SQUIRRELDIR=${PREFIX}/${PORTNAME} -SQUIRRELDIR?= ${PREFIX}/www/${PORTNAME} +SQUIRRELDIR?= ${WWWDIR} SMUSER?= ${WWWOWN} SMGROUP?= ${WWWGRP} @@ -37,10 +36,11 @@ USERS= ${SMUSER} GROUPS= ${SMGROUP} PLIST_SUB= PORTVERSION=${PORTVERSION} \ - SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}" + FULLPATH="${SQUIRRELDIR}" \ + SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}" \ -SUB_FILES= pkg-message pkg-install pkg-deinstall -SUB_LIST= SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP} +SUB_FILES= pkg-message +SUB_LIST= SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP} CONFLICTS= squirreloutlook-[0-9]* @@ -64,9 +64,11 @@ post-patch: ${WRKSRC}/plugins/squirrelspell/sqspell_config.php @${REINPLACE_CMD} -e 's|/usr/bin/fortune|/usr/games/fortune|g' \ ${WRKSRC}/plugins/fortune/fortune_functions.php + @${REINPLACE_CMD} -e 's|/var/local/squirrelmail|${SQUIRRELDIR}|g' \ + ${WRKSRC}/config/conf.pl ${WRKSRC}/config/config_default.php ${WRKSRC}/doc/INSTALL -# Rearrange the documentation do-build: +# Rearrange the documentation @${MV} ${WRKSRC}/themes/README.themes ${WRKSRC}/doc/ @cd ${WRKSRC} ; for f in `${FIND} plugins -name "README*" -or \ -name INSTALL -or -name CHANGES -or -name HISTORY`; \ @@ -79,8 +81,12 @@ do-build: ${MV} plugins/squirrelspell/doc/* doc/plugins/squirrelspell ; \ ${RM} -f doc/plugins/squirrelspell/index.php ; \ ${RM} -rf plugins/squirrelspell/doc + @${ECHO} "left_refresh=300" >> ${WRKSRC}/data/default_pref @${MV} ${WRKSRC}/config/config_local.php ${WRKSRC}/config/config_local.php.sample + @${MV} ${WRKSRC}/data/default_pref ${WRKSRC}/data/default_pref-dist + @${MKDIR} ${WRKSRC}/attach + @${CP} -p ${WRKSRC}/data/.htaccess ${WRKSRC}/attach/.htaccess pre-install: @${FIND} ${WRKSRC} -name '*.orig' -delete @@ -92,15 +98,13 @@ do-install: ${MKDIR} ${STAGEDIR}${SQUIRRELDIR} ${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${SQUIRRELDIR} ${INSTALL_SCRIPT} ${WRKSRC}/configure ${STAGEDIR}${SQUIRRELDIR} -.for DIR in class config data functions help images include locale plugins po src themes +.for DIR in attach class config data functions help images include locale plugins po src themes cd ${WRKSRC} && ${FIND} ${DIR} | ${CPIO} -pdmu --quiet ${STAGEDIR}${SQUIRRELDIR} .endfor ${CHOWN} -R ${SMUSER}:${SMGROUP} ${STAGEDIR}${SQUIRRELDIR}/data + ${CHMOD} 733 ${STAGEDIR}${SQUIRRELDIR}/attach ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${FIND} . | ${CPIO} -pdmu --quiet ${STAGEDIR}${DOCSDIR} -post-install: - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include <bsd.port.mk> Modified: head/mail/squirrelmail/distinfo ============================================================================== --- head/mail/squirrelmail/distinfo Mon Oct 21 00:39:20 2013 (r331075) +++ head/mail/squirrelmail/distinfo Mon Oct 21 00:49:45 2013 (r331076) @@ -1,2 +1,2 @@ -SHA256 (squirrelmail/squirrelmail-webmail-1.4.22.tar.bz2) = 2231578d0f9abeae52bc4e461a6773d78762f20a27e1e2fbebc1a11ccd1af877 -SIZE (squirrelmail/squirrelmail-webmail-1.4.22.tar.bz2) = 531360 +SHA256 (squirrelmail/squirrelmail-20131020_0200-SVN.stable.tar.bz2) = bec67ca3b0dd6f5435fa9fd7fe0cfe0f6662abfefce7589ebb484f0dc9ac5a60 +SIZE (squirrelmail/squirrelmail-20131020_0200-SVN.stable.tar.bz2) = 541979 Modified: head/mail/squirrelmail/files/pkg-message.in ============================================================================== --- head/mail/squirrelmail/files/pkg-message.in Mon Oct 21 00:39:20 2013 (r331075) +++ head/mail/squirrelmail/files/pkg-message.in Mon Oct 21 00:49:45 2013 (r331076) @@ -1,20 +1,18 @@ +To activate SquirrelMail, you must complete the following steps: -You now need to add an alias to apache's httpd.conf pointing to -%%SQUIRRELDIR%% in order to access SquirrelMail from -your web browser, or create a VirtualHost with DocumentRoot set to -that directory. +1) Set up a VirtualHost or an alias in httpd.conf that points to + %%SQUIRRELDIR%% -For SquirrelMail to work properly you will need to make sure the -following option is set in your php.ini file: -file_uploads = On +2) Make sure the following is set in your php.ini: + file_uploads = On -If you have problems with SquirrelMail saying "you must login" after -you just have, the following php.ini option may help: -session.auto_start = 1 +3) If you have trouble logging in, add the following to your php.ini: + session.auto_start = 1 -In order to do your administrative configuration you need to -cd %%SQUIRRELDIR%% && ./configure -SquirrelMail will not work until this has been done. After this -step is complete, and the config.php is created, plugin ports will -properly auto activate. +4) Configure your installation. + SQUIRRELMAIL WILL NOT WORK UNTIL THIS HAS BEEN DONE. + cd %%SQUIRRELDIR%% && ./configure +5) It is best practice to change the data/user preference directory + (under General Options) to somewhere outside of + %%SQUIRRELDIR%%. Modified: head/mail/squirrelmail/pkg-plist ============================================================================== --- head/mail/squirrelmail/pkg-plist Mon Oct 21 00:39:20 2013 (r331075) +++ head/mail/squirrelmail/pkg-plist Mon Oct 21 00:49:45 2013 (r331076) @@ -1,4 +1,5 @@ etc/periodic/daily/111.clean-squirrelmail +%%SQUIRRELDIR%%/attach/.htaccess %%SQUIRRELDIR%%/class/.htaccess %%SQUIRRELDIR%%/class/deliver/Deliver.class.php %%SQUIRRELDIR%%/class/deliver/Deliver_IMAP.class.php @@ -22,12 +23,14 @@ etc/periodic/daily/111.clean-squirrelmai %%SQUIRRELDIR%%/config/.htaccess %%SQUIRRELDIR%%/config/conf.pl %%SQUIRRELDIR%%/config/config_default.php -@unexec if cmp -s %D%/www/squirrelmail/config/config_local.php %D%/www/squirrelmail/config/config_local.php.sample; then rm -f %D%/www/squirrelmail/config/config_local.php; fi +@unexec if cmp -s %D/www/squirrelmail/config/config_local.php %D/www/squirrelmail/config/config_local.php.sample; then rm -f %D/www/squirrelmail/config/config_local.php; fi %%SQUIRRELDIR%%/config/config_local.php.sample %%SQUIRRELDIR%%/config/index.php %%SQUIRRELDIR%%/configure %%SQUIRRELDIR%%/data/.htaccess -%%SQUIRRELDIR%%/data/default_pref +@unexec if cmp -s %D/www/squirrelmail/data/default_pref-dist %D/www/squirrelmail/data/default_pref; then rm -f %D/www/squirrelmail/data/default_pref; fi +%%SQUIRRELDIR%%/data/default_pref-dist +@exec if [ ! -f %D/www/squirrelmail/data/default_pref ]; then cp -p %D/%F %B/default_pref; fi %%SQUIRRELDIR%%/data/index.php %%SQUIRRELDIR%%/functions/.htaccess %%SQUIRRELDIR%%/functions/abook_database.php @@ -368,6 +371,8 @@ etc/periodic/daily/111.clean-squirrelmai %%SQUIRRELDIR%%/themes/simple_green_theme.php %%SQUIRRELDIR%%/themes/simple_purple.php %%SQUIRRELDIR%%/themes/slashdot_theme.php +%%SQUIRRELDIR%%/themes/solarized_dark.php +%%SQUIRRELDIR%%/themes/solarized_light.php %%SQUIRRELDIR%%/themes/spice_of_life.php %%SQUIRRELDIR%%/themes/spice_of_life_dark.php %%SQUIRRELDIR%%/themes/spice_of_life_lite.php @@ -441,6 +446,7 @@ etc/periodic/daily/111.clean-squirrelmai %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.20.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.20RC1.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.21.txt +%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.22.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.3.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.3a.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.4.txt @@ -457,6 +463,7 @@ etc/periodic/daily/111.clean-squirrelmai @dirrm %%SQUIRRELDIR%%/themes/css @dirrm %%SQUIRRELDIR%%/themes @dirrm %%SQUIRRELDIR%%/src +@dirrmtry %%SQUIRRELDIR%%/pref @dirrm %%SQUIRRELDIR%%/po @dirrm %%SQUIRRELDIR%%/plugins/translate @dirrm %%SQUIRRELDIR%%/plugins/test @@ -495,6 +502,7 @@ etc/periodic/daily/111.clean-squirrelmai @dirrm %%SQUIRRELDIR%%/class/helper @dirrm %%SQUIRRELDIR%%/class/deliver @dirrm %%SQUIRRELDIR%%/class +@dirrmtry %%SQUIRRELDIR%%/attach @dirrmtry %%SQUIRRELDIR%% @dirrmtry etc/periodic/daily @dirrmtry etc/periodic
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310210049.r9L0nksQ092151>