Syntax error and PHP 5 compatibility fixes in squirrelmail plugins

From Jean-Jacques Puig

4 files changed, 51 insertions, 3 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 672870226cf..3ebada42fe2 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.128 2016/07/09 06:38:32 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2016/09/27 12:11:11 manu Exp $
 
 DISTNAME=	squirrelmail-webmail-1.4.23pre14523
 PKGNAME=	${DISTNAME:S/-webmail//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index d67104ade6f..04c0644951f 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2015/11/03 23:27:22 agc Exp $
+$NetBSD: distinfo,v 1.65 2016/09/27 12:11:11 manu Exp $
 
 SHA1 (squirrelmail-webmail-1.4.23pre14523.tar.bz2) = bce5a25233d65cb2260770c4513f284d52084383
 RMD160 (squirrelmail-webmail-1.4.23pre14523.tar.bz2) = 774395fe79ffc49d11df01c3e0ad054803e86a2d
@@ -8,3 +8,5 @@ SHA1 (patch-aa) = 4ba7ea0a85308816b9dc77c0af3c927359ed1275
 SHA1 (patch-ab) = 30bf68c730f20e817fbe81d18bc2a95899ee3fd0
 SHA1 (patch-ai) = 1c08904ecf074ff3ba7e6042becc0f0771388b9f
 SHA1 (patch-ca) = d2e41316b8ecd97b49842eff548219e40e9b163a
+SHA1 (patch-plugins_administrator_defines.php) = d06f6a9efb6f096b96fa088f388037a7095357f7
+SHA1 (patch-plugins_gpg_gpg_decrypt_attach.php) = e8c845809cf9bb40758981a1a23be1ee0362cb4a
diff --git a/mail/squirrelmail/patches/patch-plugins_administrator_defines.php b/mail/squirrelmail/patches/patch-plugins_administrator_defines.php
new file mode 100644
index 00000000000..0d22b84b9ff
--- /dev/null
+++ b/mail/squirrelmail/patches/patch-plugins_administrator_defines.php
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_administrator_defines.php,v 1.1 2016/09/27 12:11:11 manu Exp $
+
+Fix syntax error, form Jean-Jacques Puig 
+
+--- plugins/administrator/defines.php.orig
++++ plugins/administrator/defines.php
+@@ -243,6 +243,7 @@
+                  '$edit_identity' => array( 'name' => _("Allow editing of identities"),
+                                             'type' => SMOPT_TYPE_BOOLEAN ),
+                  '$edit_name' => array( 'name' => _("Allow editing of full name"),
++                                            'type' => SMOPT_TYPE_BOOLEAN ),
+                  '$edit_reply_to' => array( 'name' => _("Allow editing of reply-to address"),
+                                         'type' => SMOPT_TYPE_BOOLEAN ),
+                  '$hide_auth_header' => array( 'name' => _("Remove username from headers"),
diff --git a/mail/squirrelmail/patches/patch-plugins_gpg_gpg_decrypt_attach.php b/mail/squirrelmail/patches/patch-plugins_gpg_gpg_decrypt_attach.php
new file mode 100644
index 00000000000..d7ac1047085
--- /dev/null
+++ b/mail/squirrelmail/patches/patch-plugins_gpg_gpg_decrypt_attach.php
@@ -0,0 +1,32 @@
+$NetBSD: patch-plugins_gpg_gpg_decrypt_attach.php,v 1.1 2016/09/27 12:11:11 manu Exp $
+
+PHP 5 compatibility fix, from Jean-Jacques Puig.
+
+--- plugins/gpg/gpg_decrypt_attach.php.orig
++++ plugins/gpg/gpg_decrypt_attach.php
+@@ -181,15 +181,17 @@
+         return $return;
+ }
+ 
+-function scandir($dirstr) {
+-    // php.net/scandir (PHP5)
+-    $files = array();
+-    $fh = opendir($dirstr);
+-    while (false !== ($filename = readdir($fh))) {
+-        array_push($files, $filename);
++if (!function_exists('scandir')) {
++    function scandir($dirstr) {
++        // php.net/scandir (PHP5)
++        $files = array();
++        $fh = opendir($dirstr);
++        while (false !== ($filename = readdir($fh))) {
++            array_push($files, $filename);
++        }
++        closedir($fh);
++        return $files;
+     }
+-    closedir($fh);
+-    return $files;
+ }
+ 
+ /**