[pkgsrc/trunk]: pkgsrc/mail/squirrelmail Fix "Fatal error: Only variables can...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/10ab39510f9a
branches:  trunk
changeset: 499350:10ab39510f9a
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Tue Sep 20 13:19:05 2005 +0000

description:
Fix "Fatal error: Only variables can be passed by reference" in
several files that occurs with PHP 5.0.5 by applying the small
"squirrelmail-stable.diff" from the SourceForge page about the bug:

http://sourceforge.net/tracker/index.php?func=detail&aid=1237160&group_id=311&atid=423679

Problem reported by Nathan Arthur in private mail. Fix OK'd by martti@.

diffstat:

 mail/squirrelmail/Makefile         |   4 ++--
 mail/squirrelmail/distinfo         |   7 ++++++-
 mail/squirrelmail/patches/patch-ab |  16 ++++++++++++++++
 mail/squirrelmail/patches/patch-ac |  23 +++++++++++++++++++++++
 mail/squirrelmail/patches/patch-ad |  16 ++++++++++++++++
 mail/squirrelmail/patches/patch-ae |  32 ++++++++++++++++++++++++++++++++
 mail/squirrelmail/patches/patch-af |  17 +++++++++++++++++
 7 files changed, 112 insertions(+), 3 deletions(-)

diffs (153 lines):

diff -r 6103a9a157bb -r 10ab39510f9a mail/squirrelmail/Makefile
--- a/mail/squirrelmail/Makefile        Tue Sep 20 12:53:40 2005 +0000
+++ b/mail/squirrelmail/Makefile        Tue Sep 20 13:19:05 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2005/07/18 07:04:27 martti Exp $
+# $NetBSD: Makefile,v 1.57 2005/09/20 13:19:05 schmonz Exp $
 
 DISTNAME=      squirrelmail-1.4.5
-#PKGREVISION=  1
+PKGREVISION=   1
 CATEGORIES=    mail www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 6103a9a157bb -r 10ab39510f9a mail/squirrelmail/distinfo
--- a/mail/squirrelmail/distinfo        Tue Sep 20 12:53:40 2005 +0000
+++ b/mail/squirrelmail/distinfo        Tue Sep 20 13:19:05 2005 +0000
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.26 2005/07/18 07:04:27 martti Exp $
+$NetBSD: distinfo,v 1.27 2005/09/20 13:19:05 schmonz Exp $
 
 SHA1 (squirrelmail-1.4.5.tar.bz2) = 48c93dd99b72b73a3ea48311152bcbc40af5cabb
 RMD160 (squirrelmail-1.4.5.tar.bz2) = 6f748e483ea1c3c94eeb849ce11a3afd90c499a0
 Size (squirrelmail-1.4.5.tar.bz2) = 480226 bytes
 SHA1 (patch-aa) = cafc171ab1de5e2e1e83caff39f3bfb810fe2ab5
+SHA1 (patch-ab) = c101e77938a3c2c6cf62b62a79a63125d44dda32
+SHA1 (patch-ac) = 7d3c742e8694fb051ada1d11d1624b199d61cf5b
+SHA1 (patch-ad) = 1db2f3d91e059a26ba41e638b7fba134fb7fa1ca
+SHA1 (patch-ae) = 45578c696d9e0ff48928e81228982e5d40c86919
+SHA1 (patch-af) = 96bb58143a83b6bbeb5477fdcd470895ccae202b
diff -r 6103a9a157bb -r 10ab39510f9a mail/squirrelmail/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/squirrelmail/patches/patch-ab        Tue Sep 20 13:19:05 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.10 2005/09/20 13:19:05 schmonz Exp $
+
+--- class/mime/Rfc822Header.class.php.orig     2005-02-06 19:33:29.000000000 -0500
++++ class/mime/Rfc822Header.class.php
+@@ -505,8 +505,9 @@ class Rfc822Header {
+      * functions/imap_messages. I'm not sure if it's ok here to call
+      * that function?
+      */
+-    function parsePriority($value) {
+-        $value = strtolower(array_shift(split('/\w/',trim($value))));
++    function parsePriority($sValue) {
++      $aValue = split('/\w/',trim($sValue));
++        $value = strtolower(array_shift($aValue));
+         if ( is_numeric($value) ) {
+             return $value;
+         }
diff -r 6103a9a157bb -r 10ab39510f9a mail/squirrelmail/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/squirrelmail/patches/patch-ac        Tue Sep 20 13:19:05 2005 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.1 2005/09/20 13:19:05 schmonz Exp $
+
+--- functions/imap_messages.php.orig   2005-04-16 13:45:38.000000000 -0400
++++ functions/imap_messages.php
+@@ -476,8 +476,9 @@ function parseArray($read,&$i) {
+  * NOTE: this is actually a duplicate from the function in
+  * class/mime/Rfc822Header.php.
+  */
+-function parsePriority($value) {
+-    $value = strtolower(array_shift(split('/\w/',trim($value))));
++function parsePriority($sValue) {
++    $aValue=split('/\w/',trim($sValue));
++    $value = strtolower(array_shift($aValue));
+     if ( is_numeric($value) ) {
+         return $value;
+     }
+@@ -915,4 +916,4 @@ function sqimap_get_small_header($imap_s
+     return $res[0];
+ }
+ 
+-?>
+\ No newline at end of file
++?>
diff -r 6103a9a157bb -r 10ab39510f9a mail/squirrelmail/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/squirrelmail/patches/patch-ad        Tue Sep 20 13:19:05 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2005/09/20 13:19:05 schmonz Exp $
+
+--- plugins/listcommands/setup.php.orig        2005-02-28 05:20:12.000000000 -0500
++++ plugins/listcommands/setup.php
+@@ -51,8 +51,9 @@ function plugin_listcommands_menu() {
+         }
+ 
+         /* proto = {mailto,href} */
+-      $proto = array_shift(array_keys($actions));
+-      $act   = array_shift($actions);
++      $aActionKeys = array_keys($actions);
++      $proto = array_shift($aActionKeys);
++      $act   = array_shift($aActionKeys);
+ 
+         if ($proto == 'mailto') {
+ 
diff -r 6103a9a157bb -r 10ab39510f9a mail/squirrelmail/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/squirrelmail/patches/patch-ae        Tue Sep 20 13:19:05 2005 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-ae,v 1.1 2005/09/20 13:19:05 schmonz Exp $
+
+--- src/configtest.php.orig    2005-05-20 14:43:39.000000000 -0400
++++ src/configtest.php
+@@ -314,7 +314,7 @@ if (function_exists('recode')) {
+ echo "$IND iconv - ";
+ if (function_exists('iconv')) {
+     echo "Iconv functions are available.<br />\n";
+-} elseif ($use_php_iconv) {
++} elseif (isset($use_php_iconv) && $use_php_iconv) {
+     echo "Iconv functions are unavailable.<br />\n";
+     do_err('Your configuration requires iconv support, but iconv support is missing.');
+ } else {
+@@ -365,7 +365,8 @@ if(!empty($addrbook_dsn) || !empty($pref
+         }
+ 
+         foreach($dsns as $type => $dsn) {
+-            $dbtype = array_shift(explode(':', $dsn));
++            $aDsn = explode(':', $dsn);
++            $dbtype = array_shift($aDsn);
+             if(isset($db_functions[$dbtype]) && function_exists($db_functions[$dbtype])) {
+                 echo "$IND$dbtype database support present.<br />\n";
+ 
+@@ -380,7 +381,7 @@ if(!empty($addrbook_dsn) || !empty($pref
+                 echo "$IND$type database connect successful.<br />\n";
+ 
+             } else {
+-                do_err($db.' database support not present!');
++                do_err($dbtype.' database support not present!');
+             }
+         }
+     } else {
diff -r 6103a9a157bb -r 10ab39510f9a mail/squirrelmail/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/squirrelmail/patches/patch-af        Tue Sep 20 13:19:05 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.1 2005/09/20 13:19:05 schmonz Exp $
+
+--- src/search.php.orig        2005-06-22 03:05:59.000000000 -0400
++++ src/search.php
+@@ -297,7 +297,11 @@ echo html_tag( 'table',
+ /*  update the recent and saved searches from the pref files  */
+ $attributes = get_recent($username, $data_dir);
+ $saved_attributes = get_saved($username, $data_dir);
+-$saved_count = count($saved_attributes['saved_what']);
++if (isset($saved_attributes['saved_what'])) {
++    $saved_count = count($saved_attributes['saved_what']);
++} else {
++    $saved_count = 0;
++}
+ $count_all = 0;
+ 
+ /* Saved Search Table */