From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Feb 6 14:40:13 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 177AF16A420 for ; Mon, 6 Feb 2006 14:40:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F1C743D46 for ; Mon, 6 Feb 2006 14:40:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k16EeCXi003203 for ; Mon, 6 Feb 2006 14:40:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k16EeCge003202; Mon, 6 Feb 2006 14:40:12 GMT (envelope-from gnats) Resent-Date: Mon, 6 Feb 2006 14:40:12 GMT Resent-Message-Id: <200602061440.k16EeCge003202@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Simon Dick Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F9AE16A420 for ; Mon, 6 Feb 2006 14:38:33 +0000 (GMT) (envelope-from simond@www.irrelevant.org) Received: from www.irrelevant.org (dsl82-163-99-116.as15444.net [82.163.99.116]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CB5043D46 for ; Mon, 6 Feb 2006 14:38:30 +0000 (GMT) (envelope-from simond@www.irrelevant.org) Received: from simond by www.irrelevant.org with local (Exim 4.60 (FreeBSD)) (envelope-from ) id 1F67Vc-0005c2-7j for FreeBSD-gnats-submit@freebsd.org; Mon, 06 Feb 2006 14:38:28 +0000 Message-Id: Date: Mon, 06 Feb 2006 14:38:28 +0000 From: Simon Dick Sender: Simon Dick To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/92892: Maintainer port update: mail/squirrelmail X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Simon Dick List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 14:40:13 -0000 >Number: 92892 >Category: ports >Synopsis: Maintainer port update: mail/squirrelmail >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Feb 06 14:40:11 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Simon Dick >Release: FreeBSD 6.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD amd64.irrelevant.org 6.0-RELEASE FreeBSD 6.0-RELEASE #1: Fri Nov 4 13:51:05 GMT 2005 root@amd64.irrelevant.org:/usr/obj/usr/src/sys/HOME amd64 >Description: Update squirrelmail 1.4.5 to work with php5 versions >How-To-Repeat: >Fix: diff -ruN /usr/ports/mail/squirrelmail/Makefile squirrelmail/Makefile --- /usr/ports/mail/squirrelmail/Makefile Tue Nov 29 22:25:27 2005 +++ squirrelmail/Makefile Mon Feb 6 14:13:21 2006 @@ -7,7 +7,7 @@ PORTNAME= squirrelmail PORTVERSION?= 1.4.5 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= squirrelmail @@ -69,7 +69,10 @@ ${WRKSRC}/src/search.php.orig \ ${WRKSRC}/class/mime/Rfc822Header.class.php.orig \ ${WRKSRC}/functions/imap_messages.php.orig \ - ${WRKSRC}/plugins/listcommands/setup.php.orig + ${WRKSRC}/plugins/listcommands/setup.php.orig \ + ${WRKSRC}/class/mime/Message.class.php.orig \ + ${WRKSRC}/class/deliver/Deliver.class.php.orig \ + ${WRKSRC}/functions/imap_general.php.orig .endif @${SED} -e "s;%%SQUIRRELDIR%%;${SQUIRRELDIR};g" \ ${MASTERDIR}/pkg-install > ${PKGINSTALL} diff -ruN /usr/ports/mail/squirrelmail/files/patch-class-deliver-Deliver.class.php squirrelmail/files/patch-class-deliver-Deliver.class.php --- /usr/ports/mail/squirrelmail/files/patch-class-deliver-Deliver.class.php Thu Jan 1 01:00:00 1970 +++ squirrelmail/files/patch-class-deliver-Deliver.class.php Mon Feb 6 14:02:22 2006 @@ -0,0 +1,24 @@ +diff -u -r1.18.2.22 -r1.18.2.23 +--- class/deliver/Deliver.class.php 2005/06/03 19:51:11 1.18.2.22 ++++ class/deliver/Deliver.class.php 2005/07/20 09:00:08 1.18.2.23 +@@ -8,7 +8,7 @@ + * This contains all the functions needed to send messages through + * a delivery backend. + * +- * $Id: Deliver.class.php,v 1.18.2.22 2005/06/03 19:51:11 pdontthink Exp $ ++ * $Id: Deliver.class.php,v 1.18.2.23 2005/07/20 09:00:08 tokul Exp $ + * + * @author Marc Groot Koerkamp + * @package squirrelmail +@@ -447,7 +447,10 @@ + + /* Insert the rest of the header fields */ + $header[] = 'Message-ID: '. $message_id . $rn; +- if ($reply_rfc822_header->message_id) { ++ if (is_object($reply_rfc822_header) && ++ isset($reply_rfc822_header->message_id) && ++ $reply_rfc822_header->message_id) { ++ //if ($reply_rfc822_header->message_id) { + $rep_message_id = $reply_rfc822_header->message_id; + // $this->strip_crlf($message_id); + $header[] = 'In-Reply-To: '.$rep_message_id . $rn; diff -ruN /usr/ports/mail/squirrelmail/files/patch-class-mime-Message.class.php squirrelmail/files/patch-class-mime-Message.class.php --- /usr/ports/mail/squirrelmail/files/patch-class-mime-Message.class.php Thu Jan 1 01:00:00 1970 +++ squirrelmail/files/patch-class-mime-Message.class.php Mon Feb 6 14:02:22 2006 @@ -0,0 +1,57 @@ +diff -u -r1.17.2.8 -r1.17.2.10 +--- class/mime/Message.class.php 2004/12/27 15:03:42 1.17.2.8 ++++ class/mime/Message.class.php 2005/07/21 15:41:05 1.17.2.10 +@@ -8,7 +8,7 @@ + * + This contains functions needed to handle mime messages. + * +- * $Id: Message.class.php,v 1.17.2.8 2004/12/27 15:03:42 kink Exp $ ++ * $Id: Message.class.php,v 1.17.2.10 2005/07/21 15:41:05 tokul Exp $ + */ + + class Message { +@@ -673,9 +673,9 @@ + } + } else { /* Treat as multipart/mixed */ + foreach ($this->entities as $ent) { +- if((strtolower($ent->header->disposition->name) != 'attachment') && +- (!isset($ent->header->parameters['filename'])) && +- (!isset($ent->header->parameters['name'])) && ++ if(!(is_object($ent->header->disposition) && strtolower($ent->header->disposition->name) == 'attachment') && ++ (!isset($ent->header->parameters['filename'])) && ++ (!isset($ent->header->parameters['name'])) && + (($ent->type0 != 'message') && ($ent->type1 != 'rfc822'))) { + $entity = $ent->findDisplayEntity($entity, $alt_order, $strict); + $found = true; +@@ -688,9 +688,10 @@ + foreach ($alt_order as $alt) { + if( ($alt == $type) && isset($this->entity_id) ) { + if ((count($this->entities) == 0) && +- (!isset($ent->header->parameters['filename'])) && +- (!isset($ent->header->parameters['name'])) && +- (strtolower($this->header->disposition->name) != 'attachment')) { ++ (!isset($this->header->parameters['filename'])) && ++ (!isset($this->header->parameters['name'])) && ++ (isset($this->header->disposition) && is_object($this->header->disposition) && ++ strtolower($this->header->disposition->name) != 'attachment')) { + $entity[] = $this->entity_id; + $found = true; + } +@@ -699,7 +700,7 @@ + } + if(!$found) { + foreach ($this->entities as $ent) { +- if((strtolower($ent->header->disposition->name) != 'attachment') && ++ if(!(is_object($ent->header->disposition) && strtolower($ent->header->disposition->name) == 'attachment') && + (($ent->type0 != 'message') && ($ent->type1 != 'rfc822'))) { + $entity = $ent->findDisplayEntity($entity, $alt_order, $strict); + $found = true; +@@ -711,7 +712,7 @@ + in_array($this->type1, array('plain', 'html', 'message')) && + isset($this->entity_id)) { + if (count($this->entities) == 0) { +- if (strtolower($this->header->disposition->name) != 'attachment') { ++ if (!is_object($this->header->disposition) || strtolower($this->header->disposition->name) != 'attachment') { + $entity[] = $this->entity_id; + } + } diff -ruN /usr/ports/mail/squirrelmail/files/patch-functions-imap_general.php squirrelmail/files/patch-functions-imap_general.php --- /usr/ports/mail/squirrelmail/files/patch-functions-imap_general.php Thu Jan 1 01:00:00 1970 +++ squirrelmail/files/patch-functions-imap_general.php Mon Feb 6 14:09:26 2006 @@ -0,0 +1,21 @@ +diff -u -r1.140.2.29 -r1.140.2.30 +--- functions/imap_general.php 2005/05/20 10:37:34 1.140.2.29 ++++ functions/imap_general.php 2005/11/27 08:32:37 1.140.2.30 +@@ -8,7 +8,7 @@ + * + * This implements all functions that do general IMAP functions. + * +- * @version $Id: imap_general.php,v 1.140.2.29 2005/05/20 10:37:34 kink Exp $ ++ * @version $Id: imap_general.php,v 1.140.2.30 2005/11/27 08:32:37 tokul Exp $ + * @package squirrelmail + * @subpackage imap + */ +@@ -888,7 +888,7 @@ + * Saves a message to a given folder -- used for saving sent messages + */ + function sqimap_append ($imap_stream, $sent_folder, $length) { +- fputs ($imap_stream, sqimap_session_id() . " APPEND \"$sent_folder\" (\\Seen) \{$length}\r\n"); ++ fputs ($imap_stream, sqimap_session_id() . " APPEND \"$sent_folder\" (\\Seen) {".$length."}\r\n"); + $tmp = fgets ($imap_stream, 1024); + sqimap_append_checkresponse($tmp, $sent_folder); + } >Release-Note: >Audit-Trail: >Unformatted: