Date: Wed, 05 Dec 2007 06:18:29 +0000 From: Simon Dick <simond@irrelevant.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Thomas Abthorpe <tabthorpe@FreeBSD.org> Subject: ports/118441: Maintainer port update: mail/squirrelmail Message-ID: <E1IznaX-0004Y8-Oi@amd64.irrelevant.org> Resent-Message-ID: <200712050650.lB56o1rQ092834@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118441
>Category: ports
>Synopsis: Maintainer port update: mail/squirrelmail
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 05 06:50:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Simon Dick
>Release: FreeBSD 6.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD amd64.irrelevant.org 6.2-RELEASE FreeBSD 6.2-RELEASE #1: Mon Jan 15 14:08:24 GMT 2007 root@amd64.irrelevant.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Update SquirrelMail to 1.4.12
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/mail/squirrelmail/Makefile squirrelmail/Makefile
--- /usr/ports/mail/squirrelmail/Makefile Tue Oct 23 14:10:09 2007
+++ squirrelmail/Makefile Wed Dec 5 06:07:28 2007
@@ -6,7 +6,7 @@
#
PORTNAME= squirrelmail
-PORTVERSION= 1.4.11
+PORTVERSION= 1.4.12
CATEGORIES= mail www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff -ruN /usr/ports/mail/squirrelmail/Makefile~ squirrelmail/Makefile~
--- /usr/ports/mail/squirrelmail/Makefile~ Thu Jan 1 01:00:00 1970
+++ squirrelmail/Makefile~ Tue Oct 23 14:10:09 2007
@@ -0,0 +1,112 @@
+# New ports collection makefile for: squirrelmail
+# Date created: 27 December 2001
+# Whom: Simon Dick <simond@irrelevant.org>
+#
+# $FreeBSD: ports/mail/squirrelmail/Makefile,v 1.48 2007/10/23 13:10:09 miwi Exp $
+#
+
+PORTNAME= squirrelmail
+PORTVERSION= 1.4.11
+CATEGORIES= mail www
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= ${PORTNAME}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ all_locales-1.4.9-20070106${EXTRACT_SUFX}
+DIST_SUBDIR= ${PORTNAME}
+
+MAINTAINER= simond@irrelevant.org
+COMMENT= A webmail system which accesses mail over IMAP
+
+USE_PHP= session mhash gettext mbstring pcre openssl xml
+WANT_PHP_WEB= yes
+
+USE_BZIP2= yes
+USE_GETTEXT= yes
+
+.ifdef WITH_DATABASE
+RUN_DEPENDS+= ${PREFIX}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
+.endif
+
+.ifdef WITH_LDAP
+USE_PHP+= ldap
+.endif
+
+.ifndef WITHOUT_WWWDIR
+SQUIRRELDIR?= ${PREFIX}/www/${PORTNAME}
+.else
+SQUIRRELDIR?= ${PREFIX}/${PORTNAME}
+.endif
+
+PLIST_SUB= PORTVERSION=${PORTVERSION} \
+ SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}"
+
+SUB_FILES= pkg-message pkg-install pkg-deinstall
+SUB_LIST= SQUIRRELDIR=${SQUIRRELDIR}
+
+PORTDOCS= *
+
+pre-everything::
+ @${ECHO_CMD} "SquirrelMail is installed into ${SQUIRRELDIR}"
+ @${ECHO_CMD} "To use the old location ${PREFIX}/${PORTNAME} define"
+ @${ECHO_CMD} "WITHOUT_WWWDIR when patching or installing"
+ @${ECHO_CMD}
+ @${ECHO_CMD} "Use WITH_LDAP to ensure PHP LDAP support is installed"
+ @${ECHO_CMD} "Use WITH_DATABASE to ensure PEAR framework for database support is installed"
+ @${ECHO_CMD} " (note that this does not install the database specific PEAR support, e.g. MySQL)"
+ @${ECHO_CMD}
+
+post-patch:
+.ifndef PATCH_DEBUG
+ @${RM} -f ${WRKSRC}/config/config_default.php.orig ${WRKSRC}/functions/global.php.orig ${WRKSRC}/src/compose.php.orig ${WRKSRC}/src/addrbook_search_html.php.orig
+.endif
+ @${REINPLACE_CMD} -e 's|ispell|${LOCALBASE}/bin/ispell|g' \
+ ${WRKSRC}/plugins/squirrelspell/sqspell_config.php
+ @${RM} ${WRKSRC}/plugins/squirrelspell/sqspell_config.php.bak
+
+# Rearrange the documentation
+do-build:
+.for file in AUTHORS ChangeLog COPYING INSTALL README UPGRADE
+ @${MV} ${WRKSRC}/${file} ${WRKSRC}/doc/
+.endfor
+ @${MV} ${WRKSRC}/ReleaseNotes ${WRKSRC}/doc/ReleaseNotes-${PORTVERSION}.txt
+ @${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`; \
+ do \
+ ${MKDIR} doc/`dirname $$f` ; \
+ ${MV} $$f doc/`dirname $$f` ; \
+ done; \
+ ${MV} doc/plugins/squirrelspell/doc/README doc/plugins/squirrelspell ; \
+ ${RM} -rf doc/plugins/squirrelspell/doc ; \
+ ${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
+ @${CP} -r ${WRKSRC}/../locale ${WRKSRC}
+ @${CP} -r ${WRKSRC}/../images ${WRKSRC}
+ @${CP} -r ${WRKSRC}/../help ${WRKSRC}
+
+pre-install:
+ @${ECHO} "Your umask should be lax while installing this. Like, 022 or something."
+ @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+
+do-install:
+ ${MKDIR} ${PREFIX}/etc/periodic/daily
+ ${INSTALL_SCRIPT} ${FILESDIR}/111.clean-squirrelmail ${PREFIX}/etc/periodic/daily
+ ${MKDIR} ${SQUIRRELDIR}
+ @${CP} -pv ${WRKSRC}/index.php ${SQUIRRELDIR}
+ @${CP} -pv ${WRKSRC}/configure ${SQUIRRELDIR}
+.for DIR in class config data functions help images include locale plugins po src themes
+ @${CP} -rpv ${WRKSRC}/${DIR} ${SQUIRRELDIR}
+.endfor
+ ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/data
+.if !defined(NOPORTDOCS)
+ ${MKDIR} ${DOCSDIR}
+ @${CP} -Rv ${WRKSRC}/doc/* ${DOCSDIR}
+.endif
+
+post-install:
+ @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ @${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff -ruN /usr/ports/mail/squirrelmail/distinfo squirrelmail/distinfo
--- /usr/ports/mail/squirrelmail/distinfo Tue Oct 23 14:10:09 2007
+++ squirrelmail/distinfo Wed Dec 5 06:07:40 2007
@@ -1,6 +1,6 @@
-MD5 (squirrelmail/squirrelmail-1.4.11.tar.bz2) = 486fb27a6ab306088603163160dbc8ca
-SHA256 (squirrelmail/squirrelmail-1.4.11.tar.bz2) = 7c187933dd76fd0a13544851b17db12a9875f5d5eb2e2d6d16528b442fc20bb6
-SIZE (squirrelmail/squirrelmail-1.4.11.tar.bz2) = 496370
+MD5 (squirrelmail/squirrelmail-1.4.12.tar.bz2) = ea5e750797628c9f0f247009f8ae0e14
+SHA256 (squirrelmail/squirrelmail-1.4.12.tar.bz2) = 752ef4ddccbae34df23b1dc9b2b05795f79b3d78422127cd75afd8cb033b379a
+SIZE (squirrelmail/squirrelmail-1.4.12.tar.bz2) = 496632
MD5 (squirrelmail/all_locales-1.4.9-20070106.tar.bz2) = eaa0e8835b8d7d451500aad907c22e24
SHA256 (squirrelmail/all_locales-1.4.9-20070106.tar.bz2) = 04ad3e37042deb8c5668946c3364cd53d9c30b2486f24deee4d71c05fa584423
SIZE (squirrelmail/all_locales-1.4.9-20070106.tar.bz2) = 2699569
diff -ruN /usr/ports/mail/squirrelmail/files/patch-1.4.11_compose_attachments squirrelmail/files/patch-1.4.11_compose_attachments
--- /usr/ports/mail/squirrelmail/files/patch-1.4.11_compose_attachments Tue Oct 23 14:10:09 2007
+++ squirrelmail/files/patch-1.4.11_compose_attachments Thu Jan 1 01:00:00 1970
@@ -1,215 +0,0 @@
-Index: src/compose.php
-===================================================================
---- src/compose.php (revision 12656)
-+++ src/compose.php (working copy)
-@@ -319,9 +319,6 @@
- if (!empty($attachments))
- $attachments = unserialize($attachments);
-
-- // Not used any more, but left for posterity
-- //$compose_messages = unserialize($restoremessages);
-- //sqsession_register($compose_messages,'compose_messages');
- sqsession_register($composesession,'composesession');
-
- if (isset($send)) {
-@@ -357,20 +354,13 @@
- $composesession = $session;
- sqsession_register($composesession,'composesession');
- }
--if (!isset($compose_messages)) {
-- $compose_messages = array();
--}
--if (empty($compose_messages[$session])) {
-+if (!empty($compose_messages[$session])) {
-+ $composeMessage = $compose_messages[$session];
-+} else {
- $composeMessage = new Message();
- $rfc822_header = new Rfc822Header();
- $composeMessage->rfc822_header = $rfc822_header;
- $composeMessage->reply_rfc822_header = '';
-- $compose_messages[$session] = $composeMessage;
--
-- // Not used any more, but left for posterity
-- //sqsession_register($compose_messages,'compose_messages');
--} else {
-- $composeMessage=$compose_messages[$session];
- }
-
- // re-add attachments that were already in this message
-@@ -392,14 +382,10 @@
- * of language interface.
- */
- set_my_charset();
-- $composeMessage = $compose_messages[$session];
- if (! deliverMessage($composeMessage, true)) {
- showInputForm($session);
- exit();
- } else {
-- // Not used any more, but left for posterity
-- //unset($compose_messages[$session]);
-- //sqsession_register($compose_messages,'compose_messages');
- $draft_message = _("Draft Email Saved");
- /* If this is a resumed draft, then delete the original */
- if(isset($delete_draft)) {
-@@ -490,17 +476,12 @@
- }
- $body = $newBody;
-
-- $composeMessage=$compose_messages[$session];
--
- $Result = deliverMessage($composeMessage);
- do_hook('compose_send_after', $Result, $composeMessage);
- if (! $Result) {
- showInputForm($session);
- exit();
- }
-- // Not used any more, but left for posterity
-- //unset($compose_messages[$session]);
-- //sqsession_register($compose_messages,'compose_messages');
-
- /* if it is resumed draft, delete draft message */
- if ( isset($delete_draft)) {
-@@ -604,7 +585,6 @@
- }
-
- if (isset($delete) && is_array($delete)) {
-- $composeMessage = $compose_messages[$session];
- foreach($delete as $index) {
- if (!empty($composeMessage->entities) && isset($composeMessage->entities[$index])) {
- $composeMessage->entities[$index]->purgeAttachments();
-@@ -616,9 +596,6 @@
- $new_entities[] = $entity;
- }
- $composeMessage->entities = $new_entities;
-- $compose_messages[$session] = $composeMessage;
-- // Not used any more, but left for posterity
-- //sqsession_register($compose_messages, 'compose_messages');
- }
- showInputForm($session);
- } else {
-@@ -675,7 +652,7 @@
- function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') {
- global $editor_size, $default_use_priority, $body, $idents,
- $use_signature, $composesession, $data_dir, $username,
-- $username, $key, $imapServerAddress, $imapPort, $compose_messages,
-+ $username, $key, $imapServerAddress, $imapPort,
- $composeMessage, $body_quote;
- global $languages, $squirrelmail_language, $default_charset;
-
-@@ -896,9 +873,6 @@
- default:
- break;
- }
-- $compose_messages[$session] = $composeMessage;
-- // Not used any more, but left for posterity
-- //sqsession_register($compose_messages, 'compose_messages');
- session_write_close();
- sqimap_logout($imapConnection);
- }
-@@ -1016,7 +990,7 @@
- $username, $data_dir, $identity, $idents, $draft_id, $delete_draft,
- $mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win,
- $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action,
-- $username, $compose_messages, $composesession, $default_charset,
-+ $username, $composesession, $default_charset, $composeMessage,
- $javascript_on;
-
- if ($javascript_on)
-@@ -1024,7 +998,6 @@
- else
- $onfocus = '';
-
-- $composeMessage = $compose_messages[$session];
- if ($values) {
- $send_to = $values['send_to'];
- $send_to_cc = $values['send_to_cc'];
-@@ -1294,8 +1267,6 @@
- store the complete ComposeMessages array in a hidden input value
- so we can restore them in case of a session timeout.
- */
-- // Not used any more, but left for posterity
-- //echo addHidden('restoremessages', serialize($compose_messages)).
- echo addHidden('composesession', $composesession).
- addHidden('querystring', $queryString).
- (!empty($attach_array) ?
-@@ -1397,7 +1368,7 @@
- /* True if FAILURE */
- function saveAttachedFiles($session) {
- global $_FILES, $attachment_dir, $username,
-- $data_dir, $compose_messages;
-+ $data_dir, $composeMessage;
-
- /* get out of here if no file was attached at all */
- if (! is_uploaded_file($_FILES['attachfile']['tmp_name']) ) {
-@@ -1419,13 +1390,9 @@
- return true;
- }
- }
-- $message = $compose_messages[$session];
- $type = strtolower($_FILES['attachfile']['type']);
- $name = $_FILES['attachfile']['name'];
-- $message->initAttachment($type, $name, $localfilename);
-- $compose_messages[$session] = $message;
-- // Not used any more, but left for posterity
-- //sqsession_register($compose_messages , 'compose_messages');
-+ $composeMessage->initAttachment($type, $name, $localfilename);
- }
-
- /* parse values like 8M and 2k into bytes */
-Index: src/addrbook_search_html.php
-===================================================================
---- src/addrbook_search_html.php (revision 12705)
-+++ src/addrbook_search_html.php (working copy)
-@@ -48,7 +48,7 @@
- */
- function addr_insert_hidden() {
- global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox,
-- $mailprio, $request_mdn, $request_dr, $identity, $session;
-+ $mailprio, $request_mdn, $request_dr, $identity, $session, $composeMessage;
-
- if (substr($body, 0, 1) == "\r") {
- echo addHidden('body', "\n".$body);
-@@ -56,6 +56,9 @@
- echo addHidden('body', $body);
- }
-
-+ if (is_object($composeMessage) && $composeMessage->entities)
-+ echo addHidden('attachments', serialize($composeMessage->entities));
-+
- echo addHidden('session', $session).
- addHidden('subject', $subject).
- addHidden('send_to', $send_to).
-@@ -198,11 +201,11 @@
-
-
- /* Search form */
--echo '<center>' .
-+echo addForm($PHP_SELF.'?html_addr_search=true', 'post', 'f').
-+ '<center>' .
- html_tag( 'table', '', 'center', '', 'border="0"' ) .
- html_tag( 'tr' ) .
- html_tag( 'td', '', 'left', '', 'nowrap valign="middle"' ) . "\n" .
-- addForm($PHP_SELF.'?html_addr_search=true', 'post', 'f').
- "\n<center>\n" .
- ' <nobr><strong>' . _("Search for") . "</strong>\n";
- addr_insert_hidden();
-@@ -232,9 +235,8 @@
- echo '<input type="submit" value="' . _("Search") . '" />' .
- ' | <input type="submit" value="' . _("List all") .
- '" name="listall" />' . "\n" .
-- '</form></center></td></tr></table>' . "\n";
--addr_insert_hidden();
--echo '</center>';
-+ '</center></td></tr></table>' . "\n";
-+echo '</center></form>';
- do_hook('addrbook_html_search_below');
- /* End search form */
-
-@@ -270,6 +272,7 @@
- usort($res,'alistcmp');
- addr_display_result($res, true);
- }
-+ echo '</body></html>';
- exit;
- }
- else {
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1IznaX-0004Y8-Oi>