Pullup tickets 939, 941 - requested by Martti Kuparinen

various squirrelmail bug and compatibility fixes

Revisions pulled up:
- pkgsrc/mail/squirrelmail/Makefile		1.58, 1.59, 1.61, 1.62
- pkgsrc/mail/squirrelmail/distinfo		1.28, 1.29
- pkgsrc/mail/squirrelmail/patches/patch-ag	1.1
- pkgsrc/mail/squirrelmail/patches/patch-ah	1.1
- pkgsrc/mail/ja-squirrelmail/Makefile		1.16, 1.17, 1.19, 1.20
- pkgsrc/mail/ja-squirrelmail/distinfo		1.7, 1.8
- pkgsrc/mail/ja-squirrelmail/patches/patch-aa	1.3
- pkgsrc/mail/ja-squirrelmail/patches/patch-ab	1.1
- pkgsrc/mail/ja-squirrelmail/patches/patch-ac	1.1
- pkgsrc/mail/ja-squirrelmail/patches/patch-ad	1.1
- pkgsrc/mail/ja-squirrelmail/patches/patch-ae	1.1
- pkgsrc/mail/ja-squirrelmail/patches/patch-af	1.1
- pkgsrc/mail/ja-squirrelmail/patches/patch-ag	1.1
- pkgsrc/mail/ja-squirrelmail/patches/patch-ah	1.1

   Module Name:		pkgsrc
   Committed By:	martti
   Date:		Mon Dec  5 09:18:44 UTC 2005

   Modified Files:
   	pkgsrc/mail/squirrelmail: Makefile distinfo
   Added Files:
   	pkgsrc/mail/squirrelmail/patches: patch-ag

   Log Message:
   Updated squirrelmail to 1.4.5nb2

   - avoid corrupted attachment downloads (pkg/32175).
---
   Module Name:		pkgsrc
   Committed By:	martti
   Date:		Mon Dec  5 09:28:44 UTC 2005

   Modified Files:
   	pkgsrc/mail/ja-squirrelmail: Makefile distinfo
   	pkgsrc/mail/ja-squirrelmail/patches: patch-aa
   Added Files:
   	pkgsrc/mail/ja-squirrelmail/patches: patch-ab patch-ac patch-ad
   	    patch-ae patch-af patch-ag

   Log Message:
   Updated mail/ja-squirrelmail to 1.4.5nb2

   - sync with pkgsrc/mail/squirrelmail
---
   Module Name:		pkgsrc
   Committed By:	martti
   Date:		Mon Dec  5 20:13:38 UTC 2005

   Modified Files:
    	pkgsrc/mail/squirrelmail: Makefile distinfo
   Added Files:
    	pkgsrc/mail/squirrelmail/patches: patch-ah

   Log Message:
   Make this work with PHP 5.1.1
---
   Module Name:		pkgsrc
   Committed By:	martti
   Date:		Mon Dec  5 20:14:35 UTC 2005

   Modified Files:
    	pkgsrc/mail/ja-squirrelmail: Makefile distinfo
   Added Files:
    	pkgsrc/mail/ja-squirrelmail/patches: patch-ah

   Log Message:
   Make this work with PHP 5.1.1
---
   Module Name:		pkgsrc
   Committed By:	martti
   Date:		Fri Dec  9 06:42:46 UTC 2005

   Modified Files:
   	pkgsrc/mail/ja-squirrelmail: Makefile
   	pkgsrc/mail/squirrelmail: Makefile

   Log Message:
   - remove all .orig* files. Noted by Lubomir Sedlacik.
   - use post-patch instead of pre-configure
---
   Module Name:		pkgsrc
   Committed By:	martti
   Date:		Fri Dec  9 10:18:11 UTC 2005

   Modified Files:
   	pkgsrc/mail/ja-squirrelmail: Makefile
   	pkgsrc/mail/squirrelmail: Makefile

   Log Message:
   Use pre-configure instead of post-patch so it's easier to (re)create
   patches.

14 files changed, 181 insertions, 17 deletions

diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index f8c4b907e62..393524f10e9 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/07/18 07:04:24 martti Exp $
+# $NetBSD: Makefile,v 1.15.2.1 2005/12/09 16:20:16 salo Exp $
 
 DISTNAME=	squirrelmail-1.4.5
 PKGNAME=	ja-${DISTNAME}
-#PKGREVISION=	1
+PKGREVISION=	3
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
@@ -60,9 +60,8 @@ pre-configure:
 		${MV} -f $${file}.fixed $${file};			\
 	done;								\
 	cd ${WRKSRC};							\
-	${FIND} . \( -name "*.orig" -o -name ".cvsignore" \) -print	\
+	${FIND} . \( -name "*.orig*" -o -name ".cvsignore" \) -print	\
 		| ${XARGS} ${RM} -f
-	${FIND} . -name "*.orig_dist" -print | ${XARGS} ${RM} -f
 
 pre-install:
 	@${SED}	${FILES_SUBST_SED} ${FILESDIR}/squirrelmail.conf.dist	\
diff --git a/mail/ja-squirrelmail/distinfo b/mail/ja-squirrelmail/distinfo
index e71b4ad5f4e..501f09cf82f 100644
--- a/mail/ja-squirrelmail/distinfo
+++ b/mail/ja-squirrelmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/07/18 07:04:24 martti Exp $
+$NetBSD: distinfo,v 1.6.2.1 2005/12/09 16:20:16 salo Exp $
 
 SHA1 (squirrelmail-1.4.5.tar.bz2) = 48c93dd99b72b73a3ea48311152bcbc40af5cabb
 RMD160 (squirrelmail-1.4.5.tar.bz2) = 6f748e483ea1c3c94eeb849ce11a3afd90c499a0
@@ -6,4 +6,11 @@ Size (squirrelmail-1.4.5.tar.bz2) = 480226 bytes
 SHA1 (squirrelmail-1.4.5-ja-20050714-patch.gz) = 6773c2c8122025ea1470393a53d4e8ba6e22038c
 RMD160 (squirrelmail-1.4.5-ja-20050714-patch.gz) = 5b855c3c8031d11d5ef32360790b2c2c6c4147fe
 Size (squirrelmail-1.4.5-ja-20050714-patch.gz) = 7542 bytes
-SHA1 (patch-aa) = 9e66fdf7697379cc66266b7aa0c599db68750284
+SHA1 (patch-aa) = c96e85a28464c414bef744f9d1398fc9dd49549a
+SHA1 (patch-ab) = c101e77938a3c2c6cf62b62a79a63125d44dda32
+SHA1 (patch-ac) = 7d3c742e8694fb051ada1d11d1624b199d61cf5b
+SHA1 (patch-ad) = 1db2f3d91e059a26ba41e638b7fba134fb7fa1ca
+SHA1 (patch-ae) = 45578c696d9e0ff48928e81228982e5d40c86919
+SHA1 (patch-af) = 96bb58143a83b6bbeb5477fdcd470895ccae202b
+SHA1 (patch-ag) = a9cd5b779468ca7f1361c72207bbb550cd9748e3
+SHA1 (patch-ah) = 073dfa9544b8dd9ec91c4a8cba5e5b6c710e284f
diff --git a/mail/ja-squirrelmail/patches/patch-aa b/mail/ja-squirrelmail/patches/patch-aa
index 5ee7159d493..64b87cb3186 100644
--- a/mail/ja-squirrelmail/patches/patch-aa
+++ b/mail/ja-squirrelmail/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/07/07 09:01:08 martti Exp $
+$NetBSD: patch-aa,v 1.2.2.1 2005/12/09 16:20:16 salo Exp $
 
---- config/config_default.php.orig	2004-12-24 09:55:39.000000000 -0600
-+++ config/config_default.php
-@@ -373,7 +373,7 @@ $default_sub_of_inbox = true;
+--- config/config_default.php.orig	2005-05-22 11:30:34.000000000 +0300
++++ config/config_default.php	2005-12-05 09:24:45.000000000 +0200
+@@ -392,7 +392,7 @@
   * false. (Cyrus works fine whether it's true OR false).
   * @global bool $show_contain_subfolders_option
   */
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2005/07/07 09:01:08 martti Exp $
  
  /**
   * These next two options set the defaults for the way that the
-@@ -418,7 +418,7 @@ $noselect_fix_enable = false;
+@@ -437,7 +437,7 @@
   *   $data_dir = SM_PATH . 'data/';
   * @global string $data_dir
   */
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 2005/07/07 09:01:08 martti Exp $
  
  /**
   * Attachments directory
-@@ -436,7 +436,7 @@ $data_dir = SM_PATH . 'data/';
+@@ -455,7 +455,7 @@
   *    + It should probably be another directory than data_dir.
   * @global string $attachment_dir
   */
diff --git a/mail/ja-squirrelmail/patches/patch-ab b/mail/ja-squirrelmail/patches/patch-ab
new file mode 100644
index 00000000000..31b1aa0143b
--- /dev/null
+++ b/mail/ja-squirrelmail/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1.2.2 2005/12/09 16:20:16 salo 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 --git a/mail/ja-squirrelmail/patches/patch-ac b/mail/ja-squirrelmail/patches/patch-ac
new file mode 100644
index 00000000000..8a17d5b090a
--- /dev/null
+++ b/mail/ja-squirrelmail/patches/patch-ac
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.1.2.2 2005/12/09 16:20:16 salo 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 --git a/mail/ja-squirrelmail/patches/patch-ad b/mail/ja-squirrelmail/patches/patch-ad
new file mode 100644
index 00000000000..11f3bfb07ad
--- /dev/null
+++ b/mail/ja-squirrelmail/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1.2.2 2005/12/09 16:20:16 salo 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 --git a/mail/ja-squirrelmail/patches/patch-ae b/mail/ja-squirrelmail/patches/patch-ae
new file mode 100644
index 00000000000..e75ae6b85b8
--- /dev/null
+++ b/mail/ja-squirrelmail/patches/patch-ae
@@ -0,0 +1,32 @@
+$NetBSD: patch-ae,v 1.1.2.2 2005/12/09 16:20:16 salo 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 --git a/mail/ja-squirrelmail/patches/patch-af b/mail/ja-squirrelmail/patches/patch-af
new file mode 100644
index 00000000000..f7540019594
--- /dev/null
+++ b/mail/ja-squirrelmail/patches/patch-af
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.1.2.2 2005/12/09 16:20:16 salo 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 */
diff --git a/mail/ja-squirrelmail/patches/patch-ag b/mail/ja-squirrelmail/patches/patch-ag
new file mode 100644
index 00000000000..5a8a3990b61
--- /dev/null
+++ b/mail/ja-squirrelmail/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1.2.2 2005/12/09 16:20:16 salo Exp $
+
+--- src/download.php.orig	2004-12-27 17:03:59.000000000 +0200
++++ src/download.php	2005-12-05 11:08:51.000000000 +0200
+@@ -55,7 +55,7 @@
+ }
+ $subject = $message->rfc822_header->subject;
+ if ($ent_id) {
+-    $message = &$message->getEntity($ent_id);
++    $message = $message->getEntity($ent_id);
+     $header = $message->header;
+ 
+     if ($message->rfc822_header) {
diff --git a/mail/ja-squirrelmail/patches/patch-ah b/mail/ja-squirrelmail/patches/patch-ah
new file mode 100644
index 00000000000..09d8d61c64e
--- /dev/null
+++ b/mail/ja-squirrelmail/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.2.2 2005/12/09 16:20:16 salo Exp $
+
+--- functions/imap_general.php.orig	2005-05-20 13:37:34.000000000 +0300
++++ functions/imap_general.php	2005-12-05 22:08:12.000000000 +0200
+@@ -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);
+ }
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index edcb9a6fdca..b34a80ccd55 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2005/09/20 13:19:05 schmonz Exp $
+# $NetBSD: Makefile,v 1.57.2.1 2005/12/09 16:20:16 salo Exp $
 
 DISTNAME=	squirrelmail-1.4.5
-PKGREVISION=	1
+PKGREVISION=	3
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
@@ -45,7 +45,7 @@ OWN_DIRS+=		${SMDIR} ${SMDIR}/config
 OWN_DIRS_PERMS=		${ATTACHMENTS_DIR} ${ROOT_USER} ${APACHE_GROUP} 730
 OWN_DIRS_PERMS+=	${USER_PREFS_DIR} ${APACHE_USER} ${APACHE_GROUP} 755
 
-post-patch:
+pre-configure:
 	cd ${WRKSRC};							\
 	for file in config/config_default.php; do			\
 		${SED}	-e "s|@ATTACHMENTS_DIR@|${ATTACHMENTS_DIR}|g"	\
@@ -54,7 +54,7 @@ post-patch:
 		${MV} -f $${file}.fixed $${file};			\
 	done;								\
 	cd ${WRKSRC};							\
-	${FIND} . \( -name "*.orig" -o -name ".cvsignore" \) -print	\
+	${FIND} . \( -name "*.orig*" -o -name ".cvsignore" \) -print	\
 		| ${XARGS} ${RM} -f
 
 pre-install:
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index 09e13117275..38d21a10290 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2005/09/20 13:19:05 schmonz Exp $
+$NetBSD: distinfo,v 1.27.2.1 2005/12/09 16:20:16 salo Exp $
 
 SHA1 (squirrelmail-1.4.5.tar.bz2) = 48c93dd99b72b73a3ea48311152bcbc40af5cabb
 RMD160 (squirrelmail-1.4.5.tar.bz2) = 6f748e483ea1c3c94eeb849ce11a3afd90c499a0
@@ -9,3 +9,5 @@ SHA1 (patch-ac) = 7d3c742e8694fb051ada1d11d1624b199d61cf5b
 SHA1 (patch-ad) = 1db2f3d91e059a26ba41e638b7fba134fb7fa1ca
 SHA1 (patch-ae) = 45578c696d9e0ff48928e81228982e5d40c86919
 SHA1 (patch-af) = 96bb58143a83b6bbeb5477fdcd470895ccae202b
+SHA1 (patch-ag) = a9cd5b779468ca7f1361c72207bbb550cd9748e3
+SHA1 (patch-ah) = 073dfa9544b8dd9ec91c4a8cba5e5b6c710e284f
diff --git a/mail/squirrelmail/patches/patch-ag b/mail/squirrelmail/patches/patch-ag
new file mode 100644
index 00000000000..5a8a3990b61
--- /dev/null
+++ b/mail/squirrelmail/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1.2.2 2005/12/09 16:20:16 salo Exp $
+
+--- src/download.php.orig	2004-12-27 17:03:59.000000000 +0200
++++ src/download.php	2005-12-05 11:08:51.000000000 +0200
+@@ -55,7 +55,7 @@
+ }
+ $subject = $message->rfc822_header->subject;
+ if ($ent_id) {
+-    $message = &$message->getEntity($ent_id);
++    $message = $message->getEntity($ent_id);
+     $header = $message->header;
+ 
+     if ($message->rfc822_header) {
diff --git a/mail/squirrelmail/patches/patch-ah b/mail/squirrelmail/patches/patch-ah
new file mode 100644
index 00000000000..09d8d61c64e
--- /dev/null
+++ b/mail/squirrelmail/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.2.2 2005/12/09 16:20:16 salo Exp $
+
+--- functions/imap_general.php.orig	2005-05-20 13:37:34.000000000 +0300
++++ functions/imap_general.php	2005-12-05 22:08:12.000000000 +0200
+@@ -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);
+ }