Import of pkgsrc-2016Q3

This commit is contained in:
2016-11-18 22:39:22 +01:00
committed by sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
@@ -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"),
@@ -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;
}
/**