diff options
37 files changed, 157 insertions, 123 deletions
diff --git a/composer.json b/composer.json index d032a5e..96ec220 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "roundcube/roundcubemail", "description": "The Roundcube Webmail suite", - "license": "GPL-3.0+", + "license": "GPL-3.0-or-later", "repositories": [ { "type": "composer", @@ -9,23 +9,23 @@ } ], "require": { - "php": ">=5.4.0", + "php": ">=5.5.0", "pear/pear-core-minimal": "~1.10.1", "pear/auth_sasl": "~1.1.0", - "pear/net_idna2": "~0.2.0", "pear/mail_mime": "~1.10.0", - "pear/net_smtp": "~1.8.1", + "pear/net_smtp": "~1.9.0", "pear/crypt_gpg": "~1.6.3", "pear/net_sieve": "~1.4.3", "roundcube/plugin-installer": "~0.2.0", - "masterminds/html5": "~2.5.0", + "masterminds/html5": "~2.7.0", "endroid/qr-code": "~1.6.5", + "guzzlehttp/guzzle": "^6.5.5", "kolab/net_ldap3": "~1.1.1" }, "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^5.7.21" + "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6 || ^7" }, "suggest": { - "mkopinsky/zxcvbn-php": "^4.4.2 required for Zxcvbn password strength driver" + "bjeavons/zxcvbn-php": "^1.0 required for Zxcvbn password strength driver" } } diff --git a/plugins/acl/composer.json b/plugins/acl/composer.json index 7b80e4e..1583435 100644 --- a/plugins/acl/composer.json +++ b/plugins/acl/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/acl", "type": "roundcube-plugin", "description": "IMAP Folders Access Control Lists Management (RFC4314, RFC2086).", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.8", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/additional_message_headers/composer.json b/plugins/additional_message_headers/composer.json index 6a58736..4f0f15c 100644 --- a/plugins/additional_message_headers/composer.json +++ b/plugins/additional_message_headers/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/additional_message_headers", "type": "roundcube-plugin", "description": "Very simple plugin which will add additional headers to or remove them from outgoing messages.", - "license": "GPLv2", + "license": "GPL-3.0-or-later", "version": "1.2.1", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/archive/composer.json b/plugins/archive/composer.json index ca53d9e..4cb752a 100644 --- a/plugins/archive/composer.json +++ b/plugins/archive/composer.json @@ -2,8 +2,8 @@ "name": "roundcube/archive", "type": "roundcube-plugin", "description": "This adds a button to move the selected messages to an archive folder. The folder (and the optional structure of subfolders) can be selected in the settings panel.", - "license": "GPLv3+", - "version": "3.4", + "license": "GPL-3.0-or-later", + "version": "3.5", "authors": [ { "name": "Thomas Bruederli", @@ -23,7 +23,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/attachment_reminder/composer.json b/plugins/attachment_reminder/composer.json index 11e9ffb..f512411 100644 --- a/plugins/attachment_reminder/composer.json +++ b/plugins/attachment_reminder/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/attachment_reminder", "type": "roundcube-plugin", "description": "This Roundcube plugin reminds the user to attach a file if the composed message text indicates that there should be any.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.1", "authors": [ { @@ -23,7 +23,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/autologon/composer.json b/plugins/autologon/composer.json index 371559a..2b058ce 100644 --- a/plugins/autologon/composer.json +++ b/plugins/autologon/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/autologon", "type": "roundcube-plugin", "description": "Sample plugin to try out some hooks", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.0", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/database_attachments/composer.json b/plugins/database_attachments/composer.json index 09914dc..841e844 100644 --- a/plugins/database_attachments/composer.json +++ b/plugins/database_attachments/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/database_attachments", "type": "roundcube-plugin", "description": "This plugin which provides database backed storage for temporary attachment file handling. The primary advantage of this plugin is its compatibility with round-robin dns multi-server Roundcube installations.", - "license": "GPLv2", + "license": "GPL-3.0-or-later", "version": "1.2", "authors": [ { @@ -23,7 +23,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3", "roundcube/filesystem_attachments": ">=1.0.0" } diff --git a/plugins/debug_logger/composer.json b/plugins/debug_logger/composer.json index b47f462..518a08b 100644 --- a/plugins/debug_logger/composer.json +++ b/plugins/debug_logger/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/debug_logger", "type": "roundcube-plugin", "description": "Enhanced logging for debugging purposes. It is not recommened to be enabled on production systems without testing because of the somewhat increased memory, cpu and disk i/o overhead.", - "license": "GPLv2", + "license": "GPL-3.0-or-later", "version": "1.0", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/emoticons/composer.json b/plugins/emoticons/composer.json index 30dd392..2f95f60 100644 --- a/plugins/emoticons/composer.json +++ b/plugins/emoticons/composer.json @@ -2,8 +2,8 @@ "name": "roundcube/emoticons", "type": "roundcube-plugin", "description": "Plugin that adds emoticons support.", - "license": "GPLv3+", - "version": "2.0", + "license": "GPL-3.0-or-later", + "version": "3.0", "authors": [ { "name": "Thomas Bruederli", @@ -23,7 +23,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/enigma/composer.json b/plugins/enigma/composer.json index 369857d..4a6090e 100644 --- a/plugins/enigma/composer.json +++ b/plugins/enigma/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/enigma", "type": "roundcube-plugin", "description": "Server-side PGP Encryption for Roundcube", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "0.8", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": "~0.1.6", "pear/crypt_gpg": "~1.6.3" } diff --git a/plugins/example_addressbook/composer.json b/plugins/example_addressbook/composer.json index d37f0a8..289e25c 100644 --- a/plugins/example_addressbook/composer.json +++ b/plugins/example_addressbook/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/example_addressbook", "type": "roundcube-plugin", "description": "Sample plugin to add a new address book with just a static list of contacts", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.0", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/filesystem_attachments/composer.json b/plugins/filesystem_attachments/composer.json index f0c812e..6dbf360 100644 --- a/plugins/filesystem_attachments/composer.json +++ b/plugins/filesystem_attachments/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/filesystem_attachments", "type": "roundcube-plugin", "description": "This is a core plugin which provides basic, filesystem based attachment temporary file handling. This includes storing attachments of messages currently being composed, writing attachments to disk when drafts with attachments are re-opened and writing attachments to disk for inline display in current html compositions.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.0", "authors": [ { @@ -23,7 +23,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/help/composer.json b/plugins/help/composer.json index 8dee2d9..3038d42 100644 --- a/plugins/help/composer.json +++ b/plugins/help/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/help", "type": "roundcube-plugin", "description": "Plugin adds a new item (Help) in taskbar.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.4", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/hide_blockquote/composer.json b/plugins/hide_blockquote/composer.json index 80fe79b..91fb413 100644 --- a/plugins/hide_blockquote/composer.json +++ b/plugins/hide_blockquote/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/hide_blockquote", "type": "roundcube-plugin", "description": "This allows to hide long blocks of cited text in messages.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.0", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/http_authentication/composer.json b/plugins/http_authentication/composer.json index 48a0ceb..2ff5e3b 100644 --- a/plugins/http_authentication/composer.json +++ b/plugins/http_authentication/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/http_authentication", "type": "roundcube-plugin", "description": "HTTP Basic Authentication", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.5", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/identicon/composer.json b/plugins/identicon/composer.json index 4f3661b..3f3909b 100644 --- a/plugins/identicon/composer.json +++ b/plugins/identicon/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/identicon", "type": "roundcube-plugin", "description": "Displays Github-like identicons for contacts/addresses without photo specified.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "0.1", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "php-gd": "*", "roundcube/plugin-installer": ">=0.1.3" } diff --git a/plugins/identity_select/composer.json b/plugins/identity_select/composer.json index 6b38ede..53e8b01 100644 --- a/plugins/identity_select/composer.json +++ b/plugins/identity_select/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/identity_select", "type": "roundcube-plugin", "description": "On reply to a message user identity selection is based on\n\t\tcontent of standard headers like From, To, Cc and Return-Path.\n\t\tHere you can add header(s) set by your SMTP server (e.g.\n\t\tDelivered-To, Envelope-To, X-Envelope-To, X-RCPT-TO) to make\n\t\tidentity selection more accurate.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.1", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/jqueryui/composer.json b/plugins/jqueryui/composer.json index 088c498..c5cfbd9 100644 --- a/plugins/jqueryui/composer.json +++ b/plugins/jqueryui/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/jqueryui", "type": "roundcube-plugin", "description": "Plugin adds the complete jQuery-UI library including the smoothness theme to Roundcube. This allows other plugins to use jQuery-UI without having to load their own version. The benefit of using one central jQuery-UI is that we wont run into problems of conflicting jQuery libraries being loaded. All plugins that want to use jQuery-UI should use this plugin as a requirement.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.12.0", "authors": [ { @@ -23,7 +23,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/krb_authentication/composer.json b/plugins/krb_authentication/composer.json index a67f544..973a9e8 100644 --- a/plugins/krb_authentication/composer.json +++ b/plugins/krb_authentication/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/krb_authentication", "type": "roundcube-plugin", "description": "Kerberos Authentication", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.2", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/managesieve/composer.json b/plugins/managesieve/composer.json index f2bad8e..74c0db2 100644 --- a/plugins/managesieve/composer.json +++ b/plugins/managesieve/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/managesieve", "type": "roundcube-plugin", "description": "Adds a possibility to manage Sieve scripts (incoming mail filters). It's clickable interface which operates on text scripts and communicates with server using managesieve protocol. Adds Filters tab in Settings.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "9.3", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3", "pear/net_sieve": "~1.4.4" } diff --git a/plugins/markasjunk/composer.json b/plugins/markasjunk/composer.json index e52ee67..2b2a5bb 100644 --- a/plugins/markasjunk/composer.json +++ b/plugins/markasjunk/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/markasjunk", "type": "roundcube-plugin", "description": "Adds buttons to mark messages as Junk/Non-Junk with moving to the Junk folder and Spam/Ham learning.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "2.0", "authors": [ { @@ -23,7 +23,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/new_user_dialog/composer.json b/plugins/new_user_dialog/composer.json index b29924a..8195d0c 100644 --- a/plugins/new_user_dialog/composer.json +++ b/plugins/new_user_dialog/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/new_user_dialog", "type": "roundcube-plugin", "description": "When a new user is created, this plugin checks the default identity and sets a session flag in case it is incomplete. An overlay box will appear on the screen until the user has reviewed/completed his identity.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "2.4", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/new_user_identity/composer.json b/plugins/new_user_identity/composer.json index 249db6a..15aed34 100644 --- a/plugins/new_user_identity/composer.json +++ b/plugins/new_user_identity/composer.json @@ -2,8 +2,8 @@ "name": "roundcube/new_user_identity", "type": "roundcube-plugin", "description": "Populates a new user's default identity from LDAP on their first visit.", - "license": "GPLv3+", - "version": "1.1", + "license": "GPL-3.0-or-later", + "version": "1.2", "authors": [ { "name": "Aleksander Machniak", @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/newmail_notifier/composer.json b/plugins/newmail_notifier/composer.json index 210cef0..a5ffa7e 100644 --- a/plugins/newmail_notifier/composer.json +++ b/plugins/newmail_notifier/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/newmail_notifier", "type": "roundcube-plugin", "description": "Supports three methods of notification: 1. Basic - focus browser window and change favicon 2. Sound - play wav file 3. Desktop - display desktop notification (using HTML5 Notification API feature).", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "0.8", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/password/composer.json b/plugins/password/composer.json index 1e7fb6f..87ff8af 100644 --- a/plugins/password/composer.json +++ b/plugins/password/composer.json @@ -2,8 +2,8 @@ "name": "roundcube/password", "type": "roundcube-plugin", "description": "Password Change for Roundcube. Plugin adds a possibility to change user password using many methods (drivers) via Settings/Password tab.", - "license": "GPLv3+", - "version": "5.1", + "license": "GPL-3.0-or-later", + "version": "5.3", "authors": [ { "name": "Aleksander Machniak", @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/reconnect/composer.json b/plugins/reconnect/composer.json new file mode 100644 index 0000000..2b7649b --- /dev/null +++ b/plugins/reconnect/composer.json @@ -0,0 +1,23 @@ +{ + "name": "reconnect", + "type": "roundcube-plugin", + "description": "Reconnects to server for several attempts.", + "license": "GPL-3.0-or-later", + "version": "0.1", + "authors": [ + { + "name": "Sandro Knauß", + "email": "hefee@debian.org" + } + ], + "repositories": [ + { + "type": "composer", + "url": "https://plugins.roundcube.net" + } + ], + "require": { + "php": ">=5.4.0", + "roundcube/plugin-installer": ">=0.1.3" + } +} diff --git a/plugins/redundant_attachments/composer.json b/plugins/redundant_attachments/composer.json index 557cf34..710076e 100644 --- a/plugins/redundant_attachments/composer.json +++ b/plugins/redundant_attachments/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/redundant_attachments", "type": "roundcube-plugin", "description": "This plugin provides a redundant storage for temporary uploaded attachment files. They are stored in both the database backend as well as on the local file system. It provides also memcache store as a fallback.", - "license": "GPLv2", + "license": "GPL-3.0-or-later", "version": "1.2", "authors": [ { @@ -23,7 +23,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3", "roundcube/filesystem_attachments": ">=1.0.0" } diff --git a/plugins/show_additional_headers/composer.json b/plugins/show_additional_headers/composer.json index 8b05ce3..45daeb9 100644 --- a/plugins/show_additional_headers/composer.json +++ b/plugins/show_additional_headers/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/show_additional_headers", "type": "roundcube-plugin", "description": "Proof-of-concept plugin which will fetch additional headers and display them in the message view.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "2.0", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/squirrelmail_usercopy/composer.json b/plugins/squirrelmail_usercopy/composer.json index f91f43d..a9342f1 100644 --- a/plugins/squirrelmail_usercopy/composer.json +++ b/plugins/squirrelmail_usercopy/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/squirrelmail_usercopy", "type": "roundcube-plugin", "description": "Copy a new users identity and settings from a nearby Squirrelmail installation", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.6", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/subscriptions_option/composer.json b/plugins/subscriptions_option/composer.json index 5823f04..47d024e 100644 --- a/plugins/subscriptions_option/composer.json +++ b/plugins/subscriptions_option/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/subscriptions_option", "type": "roundcube-plugin", "description": "A plugin which can enable or disable the use of imap subscriptions. It includes a toggle on the settings page under \"Server Settings\". The preference can also be locked.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.4", "authors": [ { @@ -23,7 +23,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/userinfo/composer.json b/plugins/userinfo/composer.json index 3c4573b..8672cea 100644 --- a/plugins/userinfo/composer.json +++ b/plugins/userinfo/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/userinfo", "type": "roundcube-plugin", "description": "Sample plugin that adds a new tab to the settings section to display some information about the current user.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.2", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/vcard_attachments/composer.json b/plugins/vcard_attachments/composer.json index b43d2ca..8cc8aa9 100644 --- a/plugins/vcard_attachments/composer.json +++ b/plugins/vcard_attachments/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/vcard_attachments", "type": "roundcube-plugin", "description": "Detects vCard attachments and allows to add them to address book. Also allows to attach vCards of your contacts to composed messages", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "4.1", "authors": [ { @@ -23,7 +23,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/virtuser_file/composer.json b/plugins/virtuser_file/composer.json index 178a256..8b1b240 100644 --- a/plugins/virtuser_file/composer.json +++ b/plugins/virtuser_file/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/virtuser_file", "type": "roundcube-plugin", "description": "Plugin adds possibility to resolve user email/login according to lookup tables in files.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.0", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/virtuser_query/composer.json b/plugins/virtuser_query/composer.json index e42ad89..4a2f1d3 100644 --- a/plugins/virtuser_query/composer.json +++ b/plugins/virtuser_query/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/virtuser_query", "type": "roundcube-plugin", "description": "Plugin adds possibility to resolve user email/login according to lookup tables in SQL database.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "2.0", "authors": [ { @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/zipdownload/composer.json b/plugins/zipdownload/composer.json index ac7a661..bd56cfb 100644 --- a/plugins/zipdownload/composer.json +++ b/plugins/zipdownload/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/zipdownload", "type": "roundcube-plugin", "description": "Adds an option to download all attachments to a message in one zip file, when a message has multiple attachments. Also allows the download of a selection of messages in one zip file. Supports mbox and maildir format.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "3.4", "authors": [ { @@ -23,7 +23,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.4.0", "roundcube/plugin-installer": ">=0.1.3", "ext-zip": "*" } diff --git a/roundcubemail-1.4-confpath.patch b/roundcubemail-1.5-confpath.patch index 5b53a8c..3ed0639 100644 --- a/roundcubemail-1.4-confpath.patch +++ b/roundcubemail-1.5-confpath.patch @@ -1,21 +1,21 @@ diff -up ./config/defaults.inc.php.rpm ./config/defaults.inc.php ---- ./config/defaults.inc.php.rpm 2019-09-16 21:57:38.000000000 +0200 -+++ ./config/defaults.inc.php 2019-09-17 06:50:40.861838220 +0200 -@@ -413,11 +413,11 @@ $config['user_aliases'] = false; +--- ./config/defaults.inc.php.rpm 2021-02-25 20:37:25.000000000 +0100 ++++ ./config/defaults.inc.php 2021-04-22 10:52:01.854393745 +0200 +@@ -517,11 +517,11 @@ $config['user_aliases'] = false; // use this folder to store log files // must be writeable for the user who runs PHP process (Apache user if mod_php is being used) // This is used by the 'file' log driver. -$config['log_dir'] = RCUBE_INSTALL_PATH . 'logs/'; +$config['log_dir'] = '/var/log/roundcubemail/'; - // use this folder to store temp files + // Location of temporary saved files such as attachments and cache files // must be writeable for the user who runs PHP process (Apache user if mod_php is being used) -$config['temp_dir'] = RCUBE_INSTALL_PATH . 'temp/'; +$config['temp_dir'] = '/var/lib/roundcubemail/temp/'; // expire files in temp_dir after 48 hours // possible units: s, m, h, d, w -@@ -637,7 +637,7 @@ $config['mime_magic'] = null; +@@ -751,7 +751,7 @@ $config['mime_magic'] = null; // This is used to derive mime-types from the filename extension or vice versa. // Such a file is usually part of the apache webserver. If you don't find a file named mime.types on your system, // download it from http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types @@ -24,7 +24,7 @@ diff -up ./config/defaults.inc.php.rpm ./config/defaults.inc.php // path to imagemagick identify binary (if not set we'll use Imagick or GD extensions) $config['im_identify_path'] = null; -@@ -1264,3 +1264,7 @@ $config['message_show_email'] = false; +@@ -1417,3 +1417,7 @@ $config['message_show_email'] = false; // 0 - Reply-All always // 1 - Reply-List if mailing list is detected $config['reply_all_mode'] = 0; @@ -33,8 +33,8 @@ diff -up ./config/defaults.inc.php.rpm ./config/defaults.inc.php +// Must be writeable by PHP process, and not in the web server document root +$config['enigma_pgp_homedir'] = '/var/lib/roundcubemail/enigma'; diff -up ./plugins/enigma/config.inc.php.dist.rpm ./plugins/enigma/config.inc.php.dist ---- ./plugins/enigma/config.inc.php.dist.rpm 2019-09-16 21:57:38.000000000 +0200 -+++ ./plugins/enigma/config.inc.php.dist 2019-09-17 06:50:40.861838220 +0200 +--- ./plugins/enigma/config.inc.php.dist.rpm 2021-02-25 20:37:25.000000000 +0100 ++++ ./plugins/enigma/config.inc.php.dist 2021-04-22 10:49:25.686954741 +0200 @@ -12,10 +12,6 @@ $config['enigma_smime_driver'] = 'phpssl // Enables logging of enigma operations (including Crypt_GPG debug info) $config['enigma_debug'] = false; @@ -47,8 +47,8 @@ diff -up ./plugins/enigma/config.inc.php.dist.rpm ./plugins/enigma/config.inc.ph // This is also a way to force gpg2 use if there are both 1.x and 2.x on the system. $config['enigma_pgp_binary'] = ''; diff -up ./program/include/iniset.php.rpm ./program/include/iniset.php ---- ./program/include/iniset.php.rpm 2019-09-16 21:57:39.000000000 +0200 -+++ ./program/include/iniset.php 2019-09-17 06:53:23.289881898 +0200 +--- ./program/include/iniset.php.rpm 2021-02-25 20:37:26.000000000 +0100 ++++ ./program/include/iniset.php 2021-04-22 10:53:09.427158482 +0200 @@ -28,7 +28,7 @@ if (!defined('INSTALL_PATH')) { } @@ -65,11 +65,11 @@ diff -up ./program/include/iniset.php.rpm ./program/include/iniset.php -define('RCUBE_CONFIG_DIR', RCMAIL_CONFIG_DIR.'/'); +define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/'); - - // RC include folders MUST be included FIRST to avoid other + // Show basic error message on fatal PHP error + register_shutdown_function('rcmail_fatal_error'); diff -up ./program/lib/Roundcube/bootstrap.php.rpm ./program/lib/Roundcube/bootstrap.php ---- ./program/lib/Roundcube/bootstrap.php.rpm 2019-09-16 21:57:39.000000000 +0200 -+++ ./program/lib/Roundcube/bootstrap.php 2019-09-17 06:50:40.861838220 +0200 +--- ./program/lib/Roundcube/bootstrap.php.rpm 2021-02-25 20:37:26.000000000 +0100 ++++ ./program/lib/Roundcube/bootstrap.php 2021-04-22 10:49:25.686954741 +0200 @@ -71,7 +71,7 @@ if (!defined('RCUBE_INSTALL_PATH')) { } diff --git a/roundcubemail.spec b/roundcubemail.spec index 395646a..5ac3bd6 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -17,8 +17,8 @@ %else %global with_phpfpm 0 %endif -%global upstream_version 1.4.10 -#global upstream_prever rc2 +%global upstream_version 1.5 +%global upstream_prever beta %global roundcubedir %{_datadir}/roundcubemail %global _logdir /var/log @@ -48,7 +48,7 @@ Source2: roundcubemail.logrotate Source4: roundcubemail-README-rpm.txt # Non-upstreamable: Adjusts config path to Fedora policy -Patch1: roundcubemail-1.4-confpath.patch +Patch1: roundcubemail-1.5-confpath.patch BuildArch: noarch @@ -56,9 +56,8 @@ BuildArch: noarch BuildRequires: php-cli BuildRequires: php-pear(PEAR) >= 1.10.1 BuildRequires: php-pear(Auth_SASL) >= 1.1.0 -BuildRequires: php-pear(Net_IDNA2) >= 0.2.0 BuildRequires: php-pear(Mail_Mime) >= 1.10.0 -BuildRequires: php-pear(Net_SMTP) >= 1.8.1 +BuildRequires: php-pear(Net_SMTP) >= 1.9.0 BuildRequires: php-pear(Crypt_GPG) >= 1.6.0 BuildRequires: php-pear(Net_Sieve) >= 1.4.3 BuildRequires: php-pear(Net_LDAP2) >= 2.2.0 @@ -67,13 +66,16 @@ BuildRequires: php-composer(fedora/autoloader) # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(endroid/qrcode) >= 1.6.5 with php-composer(endroid/qrcode) < 2) -BuildRequires: (php-composer(masterminds/html5) >= 2.5.0 with php-composer(masterminds/html5) < 3) -# remirepo:6 +BuildRequires: (php-composer(masterminds/html5) >= 2.7.0 with php-composer(masterminds/html5) < 3) +BuildRequires: (php-composer(guzzlehttp/guzzle) >= 6.5.5 with php-composer(guzzlehttp/guzzle) < 7) +# remirepo:8 %else -BuildRequires: php-composer(endroid/qrcode) < 2 -BuildRequires: php-composer(endroid/qrcode) >= 1.6.5 -BuildRequires: php-composer(masterminds/html5) < 3 -BuildRequires: php-composer(masterminds/html5) >= 2.5.0 +BuildRequires: php-endroid-qrcode < 2 +BuildRequires: php-endroid-qrcode >= 1.6.5 +BuildRequires: php-masterminds-html5 < 3 +BuildRequires: php-masterminds-html5 >= 2.7.0 +BuildRequires: php-guzzlehttp-guzzle6 < 7 +BuildRequires: php-guzzlehttp-guzzle6 >= 6.5.5 %endif %if %{with_phpfpm} @@ -107,24 +109,23 @@ Requires: php-sockets Requires: php-spl Requires: php-xml # From composer.json-dist, require -# "php": ">=5.4.0", +# "php": ">=5.5.0", # "pear/pear-core-minimal": "~1.10.1", # "pear/auth_sasl": "~1.1.0", -# "pear/net_idna2": "~0.2.0", # "pear/mail_mime": "~1.10.0", -# "pear/net_smtp": "~1.8.1", +# "pear/net_smtp": "~1.9.0", # "pear/crypt_gpg": "~1.6.0", # "pear/net_sieve": "~1.4.3", # "roundcube/plugin-installer": "~0.1.6", -# "masterminds/html5": "~2.5.0", +# "masterminds/html5": "~2.7.0", # "endroid/qrcode": "~1.6.5" +# "guzzlehttp/guzzle": "^6.5.5", # "kolab/net_ldap3": "~1.1.1" # not available and doesn't make sense roundcube/plugin-installer Requires: php-pear(PEAR) >= 1.10.1 Requires: php-pear(Auth_SASL) >= 1.1.0 -Requires: php-pear(Net_IDNA2) >= 0.2.0 Requires: php-pear(Mail_Mime) >= 1.10.0 -Requires: php-pear(Net_SMTP) >= 1.8.1 +Requires: php-pear(Net_SMTP) >= 1.9.0 Requires: php-pear(Crypt_GPG) >= 1.6.0 Requires: php-pear(Net_Sieve) >= 1.4.3 Requires: php-pear(Net_LDAP2) >= 2.2.0 @@ -132,16 +133,19 @@ Requires: php-composer(kolab/net_ldap3) >= 1.1.1 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(endroid/qrcode) >= 1.6.5 with php-composer(endroid/qrcode) < 2) -Requires: (php-composer(masterminds/html5) >= 2.5.0 with php-composer(masterminds/html5) < 3) +Requires: (php-composer(masterminds/html5) >= 2.7.0 with php-composer(masterminds/html5) < 3) +Requires: (php-composer(guzzlehttp/guzzle) >= 6.5.5 with php-composer(guzzlehttp/guzzle) < 7) # From composer.json-dist, "suggest": { -# "mkopinsky/zxcvbn-php": "^4.4.2 required for Zxcvbn password strength driver" -Suggests: (php-composer(mkopinsky/zxcvbn-php) >= 4.4.2 with php-composer(mkopinsky/zxcvbn-php) < 5) -# remirepo:6 +# "bjeavons/zxcvbn-php": "^1.0 required for Zxcvbn password strength driver" +Suggests: (php-composer(bjeavons/zxcvbn-php) >= 1.0 with php-composer(bjeavons/zxcvbn-php) < 5) +# remirepo:8 %else -Requires: php-composer(endroid/qrcode) < 2 -Requires: php-composer(endroid/qrcode) >= 1.6.5 -Requires: php-composer(masterminds/html5) < 3 -Requires: php-composer(masterminds/html5) >= 2.5.0 +Requires: php-endroid-qrcode < 2 +Requires: php-endroid-qrcode >= 1.6.5 +Requires: php-masterminds-html5 < 3 +Requires: php-masterminds-html5 >= 2.7.0 +Requires: php-guzzlehttp-guzzle6 < 7 +Requires: php-guzzlehttp-guzzle6 >= 6.5.5 %endif # mailcap for /etc/mime.types Requires: mailcap @@ -200,7 +204,7 @@ CSS 2. # fix permissions and remove any .htaccess files find . -type f -print | xargs chmod a-x -find . -name \.htaccess -print | xargs rm -f +find . -name \.htaccess -delete -print # drop file from patch find . -type f -name '*.orig' -o -name '*.rpm' -exec rm {} \; -print @@ -223,6 +227,7 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; # Composer components \Fedora\Autoloader\Dependencies::required([ '%{_datadir}/php/Endroid/QrCode/autoload.php', + '%{_datadir}/php/GuzzleHttp6/autoload.php', '%{_datadir}/php/Masterminds/HTML5/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ @@ -250,11 +255,6 @@ install -Dpm 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/nginx/default.d/%{name} mkdir -p %{buildroot}%{_sysconfdir}/roundcubemail install -pDm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/roundcubemail -%if 0%{?rhel} == 5 || 0%{?rhel} == 6 -: Remove "su" option from logrotate configuration file - requires logrotate 3.8+ -sed -e '/su /d' -i %{buildroot}%{_sysconfdir}/logrotate.d/roundcubemail -%endif - # Log files mkdir -p %{buildroot}/var/log/roundcubemail # Temp files @@ -295,7 +295,7 @@ rm %{buildroot}%{roundcubedir}/composer.json-dist : Check our autoloader for needed classes php -r ' require "%{buildroot}%{roundcubedir}/vendor/autoload.php"; -$cl = [ "Auth_SASL", "Crypt_GPG", "Mail_mime", "Net_IDNA2", "Net_LDAP2", "Masterminds\\HTML5", +$cl = [ "Auth_SASL", "Crypt_GPG", "Mail_mime", "Net_LDAP2", "Masterminds\\HTML5", "GuzzleHttp\\Client", "Net_LDAP3", "Net_Sieve", "Net_SMTP", "PEAR" , "Endroid\\QrCode\\QrCode" ]; $ret = 0; foreach ($cl as $c) { @@ -349,6 +349,17 @@ fi %changelog +* Thu Apr 22 2021 Remi Collet <remi@remirepo.net> - 1.5~beta-1 +- update to 1.5-beta +- drop dependency on pear/net_idna2 +- raise dependency on pear/net_smtp 1.9 +- raise dependency on masterminds/html5 2.7 +- add dependency on guzzlehttp/guzzle +- switc from mkopinsky/zxcvbn-php to bjeavons/zxcvbn-php + +* Tue Feb 9 2021 Remi Collet <remi@remirepo.net> - 1.4.11-1 +- update to 1.4.11 + * Mon Dec 28 2020 Remi Collet <remi@remirepo.net> - 1.4.10-1 - update to 1.4.10 |