diff --git a/roundcubemail-0.9.1_config-dir.patch b/roundcubemail-0.9.1_config-dir.patch deleted file mode 100644 index 77ce2b9..0000000 --- a/roundcubemail-0.9.1_config-dir.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/installer/index.php b/installer/index.php -index 0e80b1c..0123a70 100644 ---- a/installer/index.php -+++ b/installer/index.php -@@ -41,7 +41,7 @@ ini_set('display_errors', 1); - - define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/'); - define('RCUBE_INSTALL_PATH', INSTALL_PATH); --define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/'); -+define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/'); - - $include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; - $include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR; -diff --git a/program/include/iniset.php b/program/include/iniset.php -index ca17640..b6da3a6 100644 ---- a/program/include/iniset.php -+++ b/program/include/iniset.php -@@ -29,7 +29,7 @@ if (!defined('INSTALL_PATH')) { - } - - if (!defined('RCMAIL_CONFIG_DIR')) { -- define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); -+ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail/'); - } - - if (!defined('RCUBE_LOCALIZATION_DIR')) { diff --git a/roundcubemail-1.0.5-dep.tar.gz b/roundcubemail-1.0.5-dep.tar.gz deleted file mode 100644 index 89a6d03..0000000 --- a/roundcubemail-1.0.5-dep.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a38fa8399e57687f5c26fdb3f77a10eb1af2c30144cacabea4cf7ba79f720b1 -size 3756253 diff --git a/roundcubemail-1.1-beta-config_dir.patch b/roundcubemail-1.1-beta-config_dir.patch new file mode 100644 index 0000000..9a3b5a5 --- /dev/null +++ b/roundcubemail-1.1-beta-config_dir.patch @@ -0,0 +1,24 @@ +diff -Ppru roundcubemail-1.1-beta-dep.orig/installer/index.php roundcubemail-1.1-beta-dep/installer/index.php +--- roundcubemail-1.1-beta-dep.orig/installer/index.php 2014-11-10 20:54:51.000000000 +0100 ++++ roundcubemail-1.1-beta-dep/installer/index.php 2015-01-02 19:49:03.914591933 +0100 +@@ -41,7 +41,7 @@ ini_set('display_errors', 1); + + define('INSTALL_PATH', realpath(__DIR__ . '/../').'/'); + define('RCUBE_INSTALL_PATH', INSTALL_PATH); +-define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/'); ++define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/'); + + $include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; + $include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR; +diff -Ppru roundcubemail-1.1-beta-dep.orig/program/include/iniset.php roundcubemail-1.1-beta-dep/program/include/iniset.php +--- roundcubemail-1.1-beta-dep.orig/program/include/iniset.php 2014-11-10 20:54:51.000000000 +0100 ++++ roundcubemail-1.1-beta-dep/program/include/iniset.php 2015-01-02 19:50:06.909427933 +0100 +@@ -29,7 +29,7 @@ if (!defined('INSTALL_PATH')) { + } + + if (!defined('RCMAIL_CONFIG_DIR')) { +- define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); ++ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); + } + + if (!defined('RCUBE_LOCALIZATION_DIR')) { diff --git a/roundcubemail-1.1.0.tar.gz b/roundcubemail-1.1.0.tar.gz new file mode 100644 index 0000000..483a19d --- /dev/null +++ b/roundcubemail-1.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94b0d31b6bc18b9021f34831ba924e84c9fbf41ca41b194d59ad5d68a250ddbf +size 3181473 diff --git a/roundcubemail-httpd.conf b/roundcubemail-httpd.conf index 8ed8a94..0ad8008 100644 --- a/roundcubemail-httpd.conf +++ b/roundcubemail-httpd.conf @@ -66,6 +66,7 @@ AddType text/x-component .htc # security rules RewriteRule .git - [F] RewriteRule ^/?(README(.md)?|INSTALL|LICENSE|SQL|bin|CHANGELOG)$ - [F] + RewriteRule ^(?!installer|[a-f0-9]{16})(\.?[^\.]+)$ - [F] diff --git a/roundcubemail.changes b/roundcubemail.changes index c67d4ad..f7b8d89 100644 --- a/roundcubemail.changes +++ b/roundcubemail.changes @@ -1,6 +1,137 @@ +------------------------------------------------------------------- +Tue Feb 10 12:27:59 UTC 2015 - aj@ajaissle.de + +- Update to 1.1.0 + + New features: + - Allow searching across multiple folders + - Improved support for screen readers and assistive technology using + WCAG 2.0 andWAI ARIA standards + - Update to TinyMCE 4.1 to support images in HTML signatures (copy & paste) + - Added namespace filter and folder searching in folder manager + - New config option to disable UI elements/actions + - Stronger password encryption using OpenSSL + - Support for the IMAP SPECIAL-USE extension + - Support for Oracle as database backend + - Manage 3rd party libs with Composer + - Secure URLs [1] (disabled by default) + + Changelog: + Make SMTP error log more verbose - include server response and error code + Fix download options menu (added by zipdownload plugin) in classic skin (#1490228) + Fix blocked.gif image usage with assets_dir set + Fix bug where max_group_members was ignored when adding a new contact (#1490214) + Hide MDN and DSN options in compose if disabled by admin (#1490221) + Fix checks based on window.ActiveXObject in IE > 10 + Fix XSS issue in style attribute handling (#1490227) + Fix bug where Drafts list wasn't updated on draft-save action in new window (#1490225) + Fix so "set as default" option is hidden if identities_level > 1 (#1490226) + Fix bug where search was reset after returning from compose visited for reply + Fix javascript error in "IE 8.0/Tablet PC" browser (#1490210) + Fix bug where Reply-To address was ignored on reply to messages sent by self (#1490233) + Fix bug where empty fieldmap config entries caused empty results of ldap search (#1490229) + Fix bug where drafts list wasn't refreshed after draft message was sent from another window (#1490238) + Fix keyboard navigation and css in datepicker widget across many Firefox versions + Fix false warning when opening attached text/plain files (#1490241) + Fix bug where signature could have been inserted twice after plain-to-html switch (#1490239) + Fix security issue in DBMail driver of password plugin (#1490261) + Enable FollowSymLinks? option in .htaccess file which is required by rewrite rules (#1490255) + Fix so JSON.parse() errors on localStorage items are ignored (#1490249) + +[1] http://trac.roundcube.net/wiki/Howto_Config/Secure_URLs + +------------------------------------------------------------------- +Sun Feb 1 12:37:13 UTC 2015 - aj@ajaissle.de + +- Update to 1.1-rc (1.0.95) + Update jQuery to version 2.1.3 + Improve system security by using optional special URL with security token - use_secure_urls + Allow to define separate server/path for image/js/css files - assets_url/assets_dir + Sync vendor folder if exists in source package (#1490145) + Avoid useless reloading list when resetting search with active filter (#1490057) + Fix invalid folder selection if clicked while busy (#1490158) + Fix import of multiple contact email addresses from Outlook-csv format (#1490169) + Fix drag-n-drop to folders expanded while dragging (#1490157) + Fix import of multiple contact groups from Google-csv format (#1490159) + Fix import of contacts with multiple email addresses from Google-csv format (#1490178) + Fix bugs where CSRF attacks were still possible on some requests + Fix some rcube_utils::anytodatetime() corner cases with timezone mismatches (#1490163) + Improve move-to and contact-export button in classic skin (#1490166) + Fix wrong icon for download button in classic skin + Fix bug where sent message was saved in Sent folder even if disabled by user (#1490208) + +- Update to 1.1-beta (1.0.90) + Fix skin path handling in plugin context (#1488967) + Prevent memory exhaustion on image resizing with GD on Windows (#1489937) + Add plugin hook for database table name lookups as requested in #1489837 + Added Oracle database support + Support contacts import in GMail CSV format + Added namespace filter in Folder Manager + Added folder searching in Folder Manager + Fix restoring draft messages from localStorage if editor mode differs (#1490016) + Added config option/user preference to disable saving messages in localStorage (#1489979) + Added config option 'imap_log_session' to enable Roundcube <-> IMAP session ID logging + Added config option 'log_session_id' to control the length of the session identifier in logs + Implemented 'storage_connected' API hook after successful IMAP login (#1490025) + Integrate Net_LDAP3 and rcube_ldap_generic classes + Add option (disabled_actions) to disable UI elements/actions (#1489638) + Support password encryption using openssl extension (#1489989) + Create/rename groups in UI dialogs (#1489951) + Added 'contact_search_name' option to define autocompletion entry format + Display quota information for current folder not INBOX only (#1487993) + Support images in HTML signatures (#1488676) + Display full quota information in popup (#1485769, #1486604) + Mail compose: Selecting contact inserts recipient to previously focused input - to/cc/bcc accordingly (#1489684) + Close "no subject" prompt with Enter key (#1489580) + Password: Add option to force new users to change their password (#1486884) + Improve support for screen readers and assistive technology using WCAG 2.0 and WAI ARIA standards + Enable basic keyboard navigation throughout the UI (#1487845) + Select/scroll to previously selected message when returning from message page (#1489023) + Display a warning if popup window was blocked (#1489618) + Remove (was: ...) from message subject on reply (#1489375) + Update to TinyMCE 4.1 (#1489057) + Enable autolink plugin in TinyMCE (#1488845) + Support image operations with Imagick extension (#1489734) + Support upload progress with session.upload_progress and PECL uploadprogress module (#1488702) + Make identity name field optional (#1489510) + Utility script to remove user records from the local database + Plugin API: Added message_saved hook (#1489752) + Plugin API: Added imap_search_before hook + Support messages import from zip archives + Zipdownload: Added mbox format support (#1486069) + Drop support for IE6, move IE7/IE8 support to legacy_browser plugin + Update to jQuery-2.1.1 + Search across multiple folders (#1485234) + Improve UI integration of ACL settings + Drop support for PHP < 5.3.7 + Set In-Reply-To and References for forwarded messages (#1489593) + Removed redundant default_folders config option (#1489737) + Implemented IMAP SPECIAL-USE extension support [RFC6154] (#1487830) + Optimize some framed pages content for better performance (#1489792) + Improve text messages display and conversion to HTML (#1488937) + Don't remove links when html signature is converted to text (#1489621) + Fix page title when using search filter (#1490023) + Fix mbox files import + Fix some character sets detection (#1490135) + Fix so attachment charset is set in headers of forward/draft message (#1490109) + Fix bug where wrong charset could be used for text attachment preview page (#1490106) + Fix setting flags on servers with no PERMANENTFLAGS response (#1490087) + Fix regression in SHAA password generation in ldap driver of password plugin (#1490094) + Fix displaying of HTML messages with absolutely positioned elements in Larry skin (#1490103) + Fix font style display issue in HTML messages with styled elements (#1490101) + Fix download of attachments that are part of TNEF message (#1490091) + Fix handling of uuencoded messages if messages_cache is enabled (#1490108) + Fix handling of base64-encoded attachments with extra spaces (#1490111) + Fix handling of UNKNOWN-CTE response, try do decode content client-side (#1490046) + Fix bug where creating subfolders in shared folders wasn't possible without ACL extension (#1490113) + Fix reply scrolling issue with text mode and start message below the quote (#1490114) + Fix possible issues in skin/skin_path config handling (#1490125) + +- Rebased roundcubemail-0.9.1_config-dir.patch as roundcubemail-1.1-beta-config_dir.patch + ------------------------------------------------------------------- Sun Feb 1 12:33:22 UTC 2015 - aj@ajaissle.de - + - Update to 1.0.5 Fix bug where some valid text in a message was handled as uuencoded attachment Fix wrong icon for download button in classic skin @@ -12,6 +143,7 @@ Sun Feb 1 12:33:22 UTC 2015 - aj@ajaissle.de Fix bug where search was reset after returning from compose visited for reply Fix javascript error in "IE 8.0/Tablet PC" browser (#1490210) Fix bug where empty fieldmap config entries caused empty results of ldap search (#1490229) +- Update to 1.1-rc (1.0.95) ------------------------------------------------------------------- Thu Dec 18 17:28:40 UTC 2014 - aj@ajaissle.de diff --git a/roundcubemail.logrotate b/roundcubemail.logrotate index 402aefa..1ddd73b 100644 --- a/roundcubemail.logrotate +++ b/roundcubemail.logrotate @@ -3,5 +3,6 @@ compress notifempty size 30k + su wwwrun www create 0660 wwwrun www -} \ No newline at end of file +} diff --git a/roundcubemail.spec b/roundcubemail.spec index c932b09..03ba1ac 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -17,21 +17,20 @@ Name: roundcubemail -Version: 1.0.5 +Version: 1.1.0 Release: 0 Summary: A modern browser-based multilingual IMAP client License: GPL-3.0+ and GPL-2.0 and BSD-3-Clause Group: Productivity/Networking/Email/Clients Url: http://www.roundcube.net/ -Source0: %{name}-%{version}-dep.tar.gz +Source0: %{name}-%{version}.tar.gz Source1: %{name}-rpmlintrc Source2: %{name}-httpd.conf Source4: README.openSUSE Source5: %{name}.logrotate -Source100: %{name}-rpmlintrc -# PATCH-FIX-OPENSUSE roundcubemail-0.9.1_config-dir.patch -- use the general config directory /etc -Patch0: %{name}-0.9.1_config-dir.patch +# PATCH-FIX-OPENSUSE roundcubemail-1.1-beta-config_dir.patch -- use the general config directory /etc +Patch0: %{name}-1.1-beta-config_dir.patch BuildArch: noarch BuildRequires: apache2-devel @@ -87,7 +86,7 @@ The user interface is fully skinnable using XHTML and CSS 2. %prep -%setup -q -n %{name}-%{version}-dep +%setup -q %patch0 -p1 cp %{SOURCE4} . @@ -102,7 +101,7 @@ find . -name ".htaccess" -delete # remove shebang from chpass-wrapper sed -i '1d' plugins/password/helpers/chpass-wrapper.py # remove INSTALL doc -%{__rm} INSTALL +%{__rm} INSTALL Dockerfile %build