@@ -48,8 +48,9 @@

 %global logdir /var/log/roundcubemail

 %global tmpdir /var/lib/roundcubemail

-%global rc_version 1.4.13

-%global plugin_version 3.5.9

+%global rc_version 1.5.2

+%global plugin_version 3.5.11

+%global skin_version 0.5.0

 #%%global rc_rel_suffix rc2.12

 %global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}}

 %global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}

@@ -57,9 +58,9 @@

 Name:           roundcubemail

 Version:        %{rc_version}

-Release:        2%{?dot_rel_suffix}%{?dist}

+Release:        1%{?dot_rel_suffix}%{?dist}

-Summary:        Round Cube Webmail is a browser-based multilingual IMAP client

+Summary:        Roundcube Webmail is a browser-based multilingual IMAP client

 Group:          Applications/System

 License:        GPLv2

@@ -83,45 +84,10 @@

 Patch201:       default-configuration.patch

 Patch202:       roundcubemail-1.4-beta86-plugin-enigma-homedir.patch

-Patch203:       0001-Enigma-Optional-support-for-passwordless-keys-7265.patch

-

-#TODO ?

-#Patch0000:      roundcubemail-plugins-kolab-3.4-kolab-files-manticore-api.patch

 BuildArch:      noarch

 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)

-#%if 0%{?plesk} < 1

-#BuildRequires:  php-gd

-#BuildRequires:  php-mbstring

-#BuildRequires:  php-pdo

-#BuildRequires:  php-pear >= 1.9.0

-#BuildRequires:  php-phpunit-PHPUnit

-#BuildRequires:  php-phpunit-PHPUnit-Selenium

-#BuildRequires:  php-xml

-#

-#BuildRequires:  php-pear(Auth_SASL)

-#BuildRequires:  php-pear(DB)

-#BuildRequires:  php-pear(Mail_Mime)

-#BuildRequires:  php-pear(Mail_mimeDecode)

-#BuildRequires:  php-pear(MDB2) >= 2.5.0

-#BuildRequires:  php-pear(MDB2_Driver_mysqli)

-#BuildRequires:  php-pear(Net_IDNA2)

-#BuildRequires:  php-pear(Net_LDAP2)

-#BuildRequires:  php-kolab-net-ldap3

-#BuildRequires:  php-pear(Net_Sieve)

-#BuildRequires:  php-pear(Net_SMTP)

-#BuildRequires:  php-pear(Net_Socket)

-#%endif

-

-# Archive and Zipdownload plugins required through

-# being listed in config.inc.php.sample.

-#Requires:       %{name}(plugin-acl) = %{?epoch:%{epoch}:}%{version}-%{release}

-#Requires:       %{name}(plugin-archive) = %{?epoch:%{epoch}:}%{version}-%{release}

-#Requires:       %{name}(plugin-password) = %{?epoch:%{epoch}:}%{version}-%{release}

-#Requires:       %{name}(plugin-managesieve) = %{?epoch:%{epoch}:}%{version}-%{release}

-#Requires:       %{name}(plugin-zipdownload) = %{?epoch:%{epoch}:}%{version}-%{release}

-

 %if 0%{?suse_version}

 Requires:       http_daemon

 Requires:       php >= 5.3

@@ -141,23 +107,106 @@

 Requires:       php-mbstring

 Requires:       php-pear >= 1.9.0

 Requires:       php-xml

+

+%if 0%{?rhel} <= 7

+#FIXME keep using mysqlnd, but somehow upgrade and remove the existing roundcube packages

+Requires:       php-mysql

+%else

 Requires:       php-mysqlnd

+%endif

-#Requires:       php-pear(Auth_SASL)

-#Requires:       php-pear(DB)

-#Requires:       php-pear(Mail_Mime)

-#Requires:       php-pear(Mail_mimeDecode)

-#Requires:       php-pear(MDB2) >= 2.5.0

-#Requires:       php-pear(MDB2_Driver_mysqli)

-#Requires:       php-pear(Net_IDNA2)

-#Requires:       php-pear(Net_Sieve)

-#Requires:       php-pear(Net_SMTP)

-#Requires:       php-pear(Net_Socket)

-

-#%if 0%{?plesk} < 1

-#Requires:       php-pear(Net_LDAP2)

-#Requires:       php-kolab-net-ldap3

-#%endif

+Obsoletes:      %{name}-core < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-core-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-acl < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-acl-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-acl-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-acl-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-acl-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-acl-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-archive < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-archive-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-calendar <= %{plugin_version}

+Obsoletes:      %{name}-plugin-calendar-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-calendar-skin-elastic <= %{plugin_version}

+Obsoletes:      %{name}-plugin-calendar-skin-elastic-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-contextmenu <= %{plugin_version}

+Obsoletes:      %{name}-plugin-filesystem_attachments < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-filesystem_attachments-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-jqueryui < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-jqueryui-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-jqueryui-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-jqueryui-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-jqueryui-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-jqueryui-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-kolab_activesync <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_activesync-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_activesync-skin-elastic <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_activesync-skin-elastic-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_addressbook <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_addressbook-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_addressbook-skin-elastic <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_addressbook-skin-elastic-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_chat <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_chat-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_chat-skin-elastic <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_chat-skin-elastic-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_config <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_config-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_files <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_files-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_files-skin-elastic <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_files-skin-elastic-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_folders <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_folders-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_notes <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_notes-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_notes-skin-elastic <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_notes-skin-elastic-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_tags <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_tags-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_tags-skin-elastic <= %{plugin_version}

+Obsoletes:      %{name}-plugin-kolab_tags-skin-elastic-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-libcalendaring <= %{plugin_version}

+Obsoletes:      %{name}-plugin-libcalendaring-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-libkolab <= %{plugin_version}

+Obsoletes:      %{name}-plugin-libkolab-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-libkolab-skin-elastic <= %{plugin_version}

+Obsoletes:      %{name}-plugin-libkolab-skin-elastic-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-managesieve < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-managesieve-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-managesieve-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-managesieve-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-managesieve-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-managesieve-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-markasjunk < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-markasjunk-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-markasjunk-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-markasjunk-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-newmail_notifier < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-newmail_notifier-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-odfviewer <= %{plugin_version}

+Obsoletes:      %{name}-plugin-odfviewer-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-password < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-password-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-pdfviewer <= %{plugin_version}

+Obsoletes:      %{name}-plugin-pdfviewer-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-tasklist <= %{plugin_version}

+Obsoletes:      %{name}-plugin-tasklist-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-tasklist-skin-elastic <= %{plugin_version}

+Obsoletes:      %{name}-plugin-tasklist-skin-elastic-assets <= %{plugin_version}

+Obsoletes:      %{name}-plugin-zipdownload < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-zipdownload-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-zipdownload-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-plugin-zipdownload-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}

+Obsoletes:      %{name}-skin-plesk <= %{skin_version}

+Obsoletes:      %{name}-skin-plesk-assets <= %{skin_version}

+Obsoletes:      %{name}-skin-plesk-core <= %{skin_version}

+Obsoletes:      %{name}-skin-plesk-larry-assets <= %{skin_version}

+Obsoletes:      %{name}-skin-plesk-larry-core <= %{skin_version}

 Provides: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}

 Provides: %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}

@@ -186,6 +235,7 @@

 Provides: %{name}-plugin-enigma = %{?epoch:%{epoch}:}%{plugin_version}-%{release}

 Provides: %{name}-plugin-hide_blockquote = %{?epoch:%{epoch}:}%{plugin_version}-%{release}

 Provides: %{name}-plugin-jqueryui = %{?epoch:%{epoch}:}%{plugin_version}-%{release}

+Provides: %{name}(plugin-jqueryui) = %{?epoch:%{epoch}:}%{version}-%{release}

 Provides: %{name}-plugin-kolab_chat = %{?epoch:%{epoch}:}%{plugin_version}-%{release}

 Provides: %{name}-plugin-logon_page = %{?epoch:%{epoch}:}%{plugin_version}-%{release}

 Provides: %{name}-plugin-managesieve = %{?epoch:%{epoch}:}%{plugin_version}-%{release}

​

@@ -1,49 +0,0 @@

-From 3e4a37339e6a4f356f26a47d981ca86a763e4bba Mon Sep 17 00:00:00 2001

-From: Aleksander Machniak <alec@alec.pl>

-Date: Tue, 25 May 2021 15:37:57 +0200

-Subject: [PATCH] Enigma: Optional support for passwordless keys (#7265)

-

----

- plugins/enigma/config.inc.php.dist   | 3 +++

- plugins/enigma/lib/enigma_engine.php | 4 ++--

- 2 files changed, 5 insertions(+), 2 deletions(-)

-

-diff --git a/plugins/enigma/config.inc.php.dist b/plugins/enigma/config.inc.php.dist

-index fc620587e..c0c635f3c 100644

---- a/plugins/enigma/config.inc.php.dist

-+++ b/plugins/enigma/config.inc.php.dist

-@@ -65,6 +65,9 @@ $config['enigma_attach_pubkey'] = false;

- // When set to 0 passwords will be stored for the whole session.

- $config['enigma_password_time'] = 5;

- 

-+// Enable support for private keys without passwords.

-+$config['enigma_passwordless'] = false;

-+

- // With this option you can lock composing options

- // of the plugin forcing the user to use configured settings.

- // The array accepts: 'sign', 'encrypt', 'pubkey'.

-diff --git a/plugins/enigma/lib/enigma_engine.php b/plugins/enigma/lib/enigma_engine.php

-index 4dbb464a5..650a0960c 100644

---- a/plugins/enigma/lib/enigma_engine.php

-+++ b/plugins/enigma/lib/enigma_engine.php

-@@ -147,7 +147,7 @@ class enigma_engine

-         $passwords = $this->get_passwords();

-         $pass      = $passwords[$key->id];

- 

--        if ($pass === null) {

-+        if ($pass === null && !$this->rc->config->get('enigma_passwordless')) {

-             // ask for password

-             $error = array('missing' => array($key->id => $key->name));

-             return new enigma_error(enigma_error::BADPASS, '', $error);

-@@ -249,7 +249,7 @@ class enigma_engine

-             $passwords = $this->get_passwords();

-             $sign_pass = $passwords[$sign_key->id];

- 

--            if ($sign_pass === null) {

-+            if ($sign_pass === null && !$this->rc->config->get('enigma_passwordless')) {

-                 // ask for password

-                 $error = array('missing' => array($sign_key->id => $sign_key->name));

-                 return new enigma_error(enigma_error::BADPASS, '', $error);

--- 

-2.31.1

-

​

@@ -2,9 +2,10 @@

 set -e

-VERSION=1.4.13

-GIT_REF=1.4.13

+VERSION=1.5.2

+GIT_REF=1.5.2

 NAME=roundcubemail-$VERSION

+SKINS=(kolab plesk)

 if [ -x "/usr/local/bin/lessc" ]; then

     LESSC=/usr/local/bin/lessc

@@ -173,7 +174,6 @@

         "zf1/zend-controller": "~1.12.11",

         "sabre/dav" : "~2.1.6",

         "smarty/smarty" : "~3.1.7"

-

     },

     "require-dev": {

         "phpunit/phpunit": "^4.8.36 || ^5.7.21"

@@ -191,6 +191,9 @@

 git reset --hard $GIT_REF

 popd

+[ -d roundcubemail-skin-elastic ] && rm -rf roundcubemail-skin-elastic

+git clone --branch master ssh://git@git.kolab.org/source/roundcubemail-skin-elastic.git roundcubemail-skin-elastic

+

 [ -d roundcubemail-plugins-kolab-latest ] && rm -rf roundcubemail-plugins-kolab-latest

 git clone --branch master ssh://git@git.kolab.org/diffusion/RPK/roundcubemail-plugins-kolab.git roundcubemail-plugins-kolab-latest

@@ -214,14 +217,8 @@

 popd

 # Install skins

-for tar in $(ls -1 $ROOT_DIR/*skin*.tar.gz 2>/dev/null); do

-    if [ -d "$(basename $tar .tar.gz)" ]; then

-        rm -rf $(basename $tar .tar.gz)

-    fi

-

-    tar zxf $tar

-

-    cp -r $(basename $tar .tar.gz)/* $NAME/skins/.

+for skin in "${SKINS[@]}"; do

+    cp -r "roundcubemail-skin-elastic/$skin" $NAME/skins/

 done

 pushd $NAME

​

@@ -1,3 +1,9 @@

+roundcubemail (1.5.2-0~kolab3) unstable; urgency=low

+

+  * Roundcubemail 1.5.2

+

+ -- Christian Mollekopf <mollekopf@kolabsys.com>  Mon,  7 Mar 2022 11:11:11 +0200

+

 roundcubemail (1.4.13-0~kolab2) unstable; urgency=low

   * Support passwordless keys

​

@@ -3,7 +3,7 @@

 Priority: extra

 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>

 Uploaders: Paul Klos <kolab@klos2day.nl>

-Build-Depends: composer, cssmin, node-uglify, debhelper (>= 8), node-less (>= 1.7.0), psa | bash

+Build-Depends: debhelper (>= 8), psa | bash

 Homepage: http://www.roundcube.net/

 Standards-Version: 3.9.3

 Vcs-Git: git://git.kolabsys.com/git/apt/roundcubemail/

@@ -11,55 +11,31 @@

 Package: roundcubemail

 Architecture: all

-Depends:    php-net-ldap3,

-            roundcubemail-core,

-            ${misc:Depends}

-Replaces: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins

-Conflicts: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins

-Provides: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins

-Description: skinnable AJAX based webmail solution for IMAP servers

- RoundCube Webmail is a browser-based multilingual IMAP client with an

- application-like user interface. It provides full functionality

- expected from an e-mail client, including MIME support, address book,

- folder manipulation and message filters.

- .

- The user interface is fully skinnable using XHTML and CSS 2.

-

-Package: roundcubemail-core

-Architecture: all

 Depends:    apache2 | httpd,

             libmagic1,

             php-auth-sasl,

-            php-mail-mime (>= 1.8.0),

+            php-mail-mime (>= 1.8.5),

             php-mdb2 (>= 2.5.0),

-            php-net-smtp,

-            php-net-socket,

-            php-net-sieve,

-            php-sabre-vobject-3 (>= 3.4.5),

+            php-bindings-libkolab,

+            php-bindings-libkolabxml,

             php | php5,

             php-cli | php5-cli,

             php-gd | php5-gd,

             php-intl | php5-intl,

             php-ldap | php5-ldap,

             php-pspell | php5-pspell,

-            roundcubemail-plugin-acl,

-            roundcubemail-plugin-archive,

-            roundcubemail-plugin-filesystem-attachments,

-            roundcubemail-plugin-jqueryui,

-            roundcubemail-plugin-newmail-notifier,

-            roundcubemail-plugin-password,

-            roundcubemail-plugin-redundant-attachments,

-            roundcubemail-plugin-zipdownload,

-            roundcubemail-plugin-managesieve,

             ucf,

             ${misc:Depends}

-Description: Core framework package for Roundcube

+Replaces: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins, roundcubemail-core, roundcubemail-plugin-acl, roundcubemail-plugin-archive, roundcubemail-plugin-calendar, roundcubemail-plugin-contextmenu, roundcubemail-plugin-filesystem-attachments, roundcubemail-plugin-jqueryui, roundcubemail-plugin-kolab-activesync, roundcubemail-plugin-kolab-addressbook, roundcubemail-plugin-kolab-chat, roundcubemail-plugin-kolab-config, roundcubemail-plugin-kolab-files, roundcubemail-plugin-kolab-folders, roundcubemail-plugin-kolab-notes, roundcubemail-plugin-kolab-tags, roundcubemail-plugin-libcalendaring, roundcubemail-plugin-libkolab, roundcubemail-plugin-managesieve, roundcubemail-plugin-markasjunk, roundcubemail-plugin-newmail-notifier, roundcubemail-plugin-odfviewer, roundcubemail-plugin-password, roundcubemail-plugin-pdfviewer, roundcubemail-plugin-redundant-attachments, roundcubemail-plugin-tasklist, roundcubemail-plugin-zipdownload, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry

+Conflicts: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins, roundcubemail-core, roundcubemail-plugin-acl, roundcubemail-plugin-archive, roundcubemail-plugin-calendar, roundcubemail-plugin-contextmenu, roundcubemail-plugin-filesystem-attachments, roundcubemail-plugin-jqueryui, roundcubemail-plugin-kolab-activesync, roundcubemail-plugin-kolab-addressbook, roundcubemail-plugin-kolab-chat, roundcubemail-plugin-kolab-config, roundcubemail-plugin-kolab-files, roundcubemail-plugin-kolab-folders, roundcubemail-plugin-kolab-notes, roundcubemail-plugin-kolab-tags, roundcubemail-plugin-libcalendaring, roundcubemail-plugin-libkolab, roundcubemail-plugin-managesieve, roundcubemail-plugin-markasjunk, roundcubemail-plugin-newmail-notifier, roundcubemail-plugin-odfviewer, roundcubemail-plugin-password, roundcubemail-plugin-pdfviewer, roundcubemail-plugin-redundant-attachments, roundcubemail-plugin-tasklist, roundcubemail-plugin-zipdownload, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry

+Provides: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins, roundcubemail-core (= 1.5), roundcubemail-plugin-acl, roundcubemail-plugin-archive, roundcubemail-plugin-calendar, roundcubemail-plugin-contextmenu, roundcubemail-plugin-filesystem-attachments, roundcubemail-plugin-jqueryui (= 3.1.12), roundcubemail-plugin-kolab-activesync (= 3.1.12), roundcubemail-plugin-kolab-addressbook (= 3.1.12), roundcubemail-plugin-kolab-chat (= 3.1.12), roundcubemail-plugin-kolab-config (= 3.1.12), roundcubemail-plugin-kolab-files (= 3.1.12), roundcubemail-plugin-kolab-folders (= 3.1.12), roundcubemail-plugin-kolab-notes (= 3.1.12), roundcubemail-plugin-kolab-tags (= 3.1.12), roundcubemail-plugin-libcalendaring (= 3.1.12), roundcubemail-plugin-libkolab (= 3.1.12), roundcubemail-plugin-managesieve, roundcubemail-plugin-markasjunk, roundcubemail-plugin-newmail-notifier, roundcubemail-plugin-odfviewer, roundcubemail-plugin-password, roundcubemail-plugin-pdfviewer, roundcubemail-plugin-redundant-attachments, roundcubemail-plugin-tasklist, roundcubemail-plugin-zipdownload, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry

+Description: skinnable AJAX based webmail solution for IMAP servers

  RoundCube Webmail is a browser-based multilingual IMAP client with an

  application-like user interface. It provides full functionality

  expected from an e-mail client, including MIME support, address book,

  folder manipulation and message filters.

  .

  The user interface is fully skinnable using XHTML and CSS 2.

- .

- This package provides the core code for roundcube. You should install

- it along with one of the roundcube database metapackages.

+

+

+

​

@@ -2,6 +2,8 @@

 DH_VERBOSE=1

+DESTDIR = $(CURDIR)/debian/roundcubemail

+

 %:

    dh $@

@@ -9,65 +11,14 @@

    echo $(CURDIR)

    find debian/ -type f | sort

-   mkdir -p $(CURDIR)/debian/home/.composer/

-   echo '{}' > $(CURDIR)/debian/home/.composer/composer.json

-   patch -p1 < debian/patches/add-composer-autoloader.diff || :

-   if [ -x "$$(which composer.sh 2>/dev/null)" ]; then \

-       HOME=$(CURDIR)/debian/home/ composer.sh -vvv dumpautoload --optimize ; \

-   else \

-       HOME=$(CURDIR)/debian/home/ composer -vvv dumpautoload --optimize ; \

-   fi

-   sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_psr4.php

-   sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_namespaces.php

-   sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_classmap.php

-   sed -i -e "s|__DIR__ . '/../..' . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_static.php || true

-

    rm -rvf temp/js_cache/ tests/

-   # Parse .less

-   lessc -x ./skins/elastic/styles/styles.less > ./skins/elastic/styles/styles.css

-   lessc -x ./skins/elastic/styles/print.less > ./skins/elastic/styles/print.css

-   lessc -x ./skins/elastic/styles/embed.less > ./skins/elastic/styles/embed.css

+    # echo "Asset loc $(CURDIR)/public_html/assets/"

-   # Compress the CSS

-   for file in `find $(CURDIR)/ -type f -name "*.css" | grep -v /public_html/assets/`; do \

-       asset_loc=$$(dirname $$(echo $${file} | sed \

-               -e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \

-               -e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \

-               -e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \

-           ) ; \

-       mkdir -p $${asset_loc} ; \

-       echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \

-       cat $${file} | cssmin > $${asset_loc}/$$(basename $${file}) || \

-           cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \

-   done

-

-   # Compress the JS, but not the already minified

-   for file in `find $(CURDIR)/ -type f -name "*.js" ! -name "*.min.js" | grep -v /public_html/assets/`; do \

-       asset_loc=$$(dirname $$(echo $${file} | sed \

-               -e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \

-               -e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \

-               -e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \

-           ) ; \

-       mkdir -p $${asset_loc} ; \

-       echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \

-       uglifyjs $${file} > $${asset_loc}/$$(basename $${file}) || \

-           cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \

-   done

-

-   # The already minied JS can just be copied over to the assets location

-   for file in `find $(CURDIR)/ -type f -name "*.min.js" | grep -v /public_html/assets/`; do \

-       asset_loc=$$(dirname $$(echo $${file} | sed \

-               -e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \

-               -e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \

-               -e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \

-           ) ; \

-       mkdir -p $${asset_loc} ; \

-       cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \

-   done

-

-   # Other assets

-   for file in $$(find $(CURDIR)/plugins/ $(CURDIR)/program/ $(CURDIR)/skins/ -type f \

+   # All assets

+   for file in $$(find $(CURDIR) -type f \

+           -name "*.css" -o \

+           -name "*.js" -o \

            -name "*.eot" -o \

            -name "*.gif" -o \

            -name "*.ico" -o \

@@ -86,53 +37,41 @@

            -name "*.woff2" \

        ); do \

        asset_loc=$$(dirname $$(echo $${file} | sed \

-               -e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \

-               -e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \

-               -e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \

+               -e "s|$(CURDIR)|$(CURDIR)/public_html/assets/|g" \

+               -e "s|$(CURDIR)|$(CURDIR)/public_html/assets/|g" \

+               -e "s|$(CURDIR)|$(CURDIR)/public_html/assets/|g") ; \

            ) ; \

        mkdir -p $${asset_loc} ; \

        cp -avf $${file} $${asset_loc}/$$(basename $${file}); \

    done

-   # The watermark.html is an asset, too

-   for skin in classic elastic larry; do \

-       if [ -f "$(CURDIR)/skins/$${skin}/watermark.html" ]; then \

-           cp -av $(CURDIR)/skins/$${skin}/watermark.html \

-               $(CURDIR)/public_html/assets/skins/$${skin}/watermark.html ; \

-       fi ; \

-   done

+

+   install -d $(CURDIR)/public_html/assets/program/

+   install -d $(CURDIR)/public_html/assets/program/js

+   install -d $(CURDIR)/public_html/assets/program/resources

+   cp -LR $(CURDIR)/public_html/program/js $(CURDIR)/public_html/assets/program/

+   cp -LR $(CURDIR)/public_html/program/resources $(CURDIR)/public_html/assets/program/

    for plugin in `find $(CURDIR)/plugins/ -type d -mindepth 1 -maxdepth 1 -exec basename {} \;) | sort -u`; do \

-       pkgname=$$(echo $${plugin} | sed -e 's/_/-/g') ; \

-       if [ -f "$(CURDIR)/debian/roundcubemail-plugin-$${pkgname}.install" ]; then \

-           continue ; \

-       fi ; \

        if [ -f "$(CURDIR)/plugins/$${plugin}/config.inc.php.dist" ]; then \

            mv $(CURDIR)/plugins/$${plugin}/config.inc.php.dist $(CURDIR)/config/$${plugin}.inc.php ; \

-           echo "etc/roundcubemail/$${plugin}.inc.php usr/share/roundcubemail/plugins/$${plugin}/config.inc.php" >> debian/roundcubemail-plugin-$${pkgname}.links ; \

-           echo "config/$${plugin}.inc.php etc/roundcubemail/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \

+           echo "etc/roundcubemail/$${plugin}.inc.php usr/share/roundcubemail/plugins/$${plugin}/config.inc.php" >> debian/roundcubemail.links ; \

+           echo "config/$${plugin}.inc.php etc/roundcubemail/" >> debian/roundcubemail.install ; \

        fi ; \

        if [ -d "$(CURDIR)/public_html/assets/plugins/$${plugin}" ]; then \

-           echo "public_html/assets/plugins/$${plugin} usr/share/roundcubemail/public_html/assets/plugins" >> debian/roundcubemail-plugin-$${pkgname}.install ; \

+           echo "public_html/assets/plugins/$${plugin} usr/share/roundcubemail/public_html/assets/plugins" >> debian/roundcubemail.install ; \

        fi ; \

-       echo "usr/share/roundcubemail/plugins/$${plugin}" >> debian/roundcubemail-plugin-$${pkgname}.dirs ; \

-       echo "plugins/$${plugin} usr/share/roundcubemail/plugins/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \

+       echo "usr/share/roundcubemail/plugins/$${plugin}" >> debian/roundcubemail.dirs ; \

+       echo "plugins/$${plugin} usr/share/roundcubemail/plugins/" >> debian/roundcubemail.install ; \

        if [ -d "$(CURDIR)/plugins/$${plugin}/lib/Roundcube" ]; then \

-           echo "usr/share/roundcubemail/plugins/$${plugin}/lib" >> debian/roundcubemail-plugin-$${pkgname}.dirs ; \

-           echo "plugins/$${plugin}/lib/Roundcube usr/share/roundcubemail/plugins/$${plugin}/lib/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \

+           echo "usr/share/roundcubemail/plugins/$${plugin}/lib" >> debian/roundcubemail.dirs ; \

+           echo "plugins/$${plugin}/lib/Roundcube usr/share/roundcubemail/plugins/$${plugin}/lib/" >> debian/roundcubemail.install ; \

        fi ; \

-       echo "" >> debian/control ; \

-       echo "Package: roundcubemail-plugin-$${pkgname}" >> debian/control ; \

-       echo "Architecture: all" >> debian/control ; \

-       echo "Depends: roundcubemail-core" >> debian/control ; \

-       echo "Breaks: roundcubemail (<< 1:1.2.4)" >> debian/control ; \

-       echo "Replaces: roundcubemail (<< 1:1.2.4)" >> debian/control ; \

-       echo "Description: $${plugin} plugin for Roundcube" >> debian/control ; \

-       echo "" >> debian/control ; \

-       sed -i -e "/Files:/ i\

- roundcubemail-plugin-$${plugin} deb web extra" debian/control ; \

    done

+   cp -a ${CURDIR}/public_html/plugins/ $(CURDIR)/public_html/assets/plugins/

+   cp -a ${CURDIR}/public_html/skins/ $(CURDIR)/public_html/assets/skins/

+

    cp -v ../SOURCES/2017111400.sql SQL/mysql/

    if [ -f "/etc/plesk-release" ]; then \

@@ -140,19 +79,18 @@

        cp -v ../SOURCES/plesk.managesieve.inc.php config/managesieve.inc.php ; \

        cp -v ../SOURCES/plesk.password.inc.php config/password.inc.php ; \

        sed -i -e 's/www-data adm/roundcube_sysuser roundcube_sysgroup/g' debian/logrotate ; \

-       echo "misc:Depends:roundcubemail-skin-plesk" >> debian/roundcubemail-core.substvars ; \

    else \

        find config/ -type f | sort ; \

        if [ -f "config/config.inc.php.sample" ]; then \

            mv config/config.inc.php.sample config/config.inc.php ; \

        fi ; \

-       echo "misc:Depends:roundcubemail-skin-chameleon | roundcubemail-skin-kolab | roundcubemail-skin-enterprise" >> debian/roundcubemail-core.substvars ; \

    fi

+

 override_dh_install:

    if [ ! -f "/etc/plesk-release" ]; then \

-       mkdir -p $(CURDIR)/debian/roundcubemail-core/etc/apache2/sites-available ; \

-       install -pm 644 $(CURDIR)/debian/conf/roundcubemail.conf $(CURDIR)/debian/roundcubemail-core/etc/apache2/sites-available/roundcubemail.conf ; \

+       mkdir -p $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available ; \

+       install -pm 644 $(CURDIR)/debian/conf/roundcubemail.conf $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available/roundcubemail.conf ; \

    fi

    dh_install

​

@@ -1,3 +1,2 @@

-default-configuration.patch -p1

+#default-configuration.patch -p1

 roundcubemail-1.4-beta86-plugin-enigma-homedir.patch -p1

-0001-Enigma-Optional-support-for-passwordless-keys-7265.patch -p1

​

@@ -1,1 +0,0 @@

-SQL/

​

@@ -1,11 +0,0 @@

-bin usr/share/roundcubemail

-config/config.inc.php etc/roundcubemail

-config/defaults.inc.php etc/roundcubemail

-config/mimetypes.php etc/roundcubemail

-index.php usr/share/roundcubemail

-program usr/share/roundcubemail

-public_html/assets/program usr/share/roundcubemail/public_html/assets

-public_html/assets/skins usr/share/roundcubemail/public_html/assets

-public_html/index.php usr/share/roundcubemail/public_html

-skins usr/share/roundcubemail

-vendor usr/share/roundcubemail

​

@@ -1,62 +0,0 @@

-#!/bin/sh

-

-#EXTRA#

-#DEBHELPER#

-

-set -e

-

-fixperms() {

-    # Necessary because update_database() below will otherwise create console.log with the wrong permissions later on.

-    touch /var/log/roundcubemail/console.log

-    touch /var/log/roundcubemail/errors.log

-

-    group=$(getent group roundcube_sysgroup >/dev/null 2>&1 && echo "roundcube_sysgroup" || echo "adm")

-    user=$(getent passwd roundcube_sysuser >/dev/null 2>&1 && echo "roundcube_sysuser" || echo "www-data")

-    chown -R ${user}:${group} /var/log/roundcubemail

-

-    group=$(getent group roundcube_sysgroup >/dev/null 2>&1 && echo "roundcube_sysgroup" || echo "www-data")

-    chown -R ${user}:${group} /var/lib/roundcubemail

-    chown -R root:${group} /etc/roundcubemail

-

-    chmod 750 \

-        /var/lib/roundcubemail \

-        /var/log/roundcubemail

-

-    find /etc/roundcubemail -type d -exec chmod u+rwx,g+rx,g-w,o-rwx {} \;

-    find /etc/roundcubemail -type f -exec chmod u+rw,u-x,g+r,g-wx,o-rwx {} \;

-}

-

-reload_apache()

-{

-    if apache2ctl configtest 2>/dev/null; then

-        invoke-rc.d apache2 $1 || true

-    else

-        echo "Your apache2 configuration is broken, so we're not restarting it for you."

-    fi

-}

-

-update_database() {

-    /usr/share/roundcubemail/bin/updatedb.sh \

-        --dir /usr/share/doc/roundcubemail-core/SQL/ \

-        --package roundcube \

-        >/dev/null 2>&1 || :

-}

-

-case "$1" in

-    configure)

-        fixperms

-        update_database

-        a2enmod rewrite

-

-        sed -i "s/rcmail-\!24ByteDESkey\*Str/`head -c 200 /dev/urandom | tr -dc _A-Z-a-z-0-9 | head -c24`/" \

-            /etc/roundcubemail/defaults.inc.php || : &> /dev/null

-

-        if [ -e "/etc/apache2/sites-available/roundcubemail.conf" -a ! -e "/etc/apache2/sites-enabled/roundcubemail.conf" ]; then

-            a2ensite roundcubemail.conf

-        fi

-        reload_apache reload

-    ;;

-esac

-

-exit 0

-

​

(renamed from roundcubemail-core.dirs)

​

@@ -1,1 +1,1 @@

-README.md

+SQL/

​

@@ -0,0 +1,12 @@

+bin usr/share/roundcubemail

+config/config.inc.php etc/roundcubemail

+config/defaults.inc.php etc/roundcubemail

+config/mimetypes.php etc/roundcubemail

+index.php usr/share/roundcubemail

+program usr/share/roundcubemail

+public_html/assets/program usr/share/roundcubemail/public_html/assets

+public_html/assets/skins usr/share/roundcubemail/public_html/assets

+public_html/assets/plugins usr/share/roundcubemail/public_html/assets

+public_html/index.php usr/share/roundcubemail/public_html

+skins usr/share/roundcubemail

+vendor usr/share/roundcubemail

​

(renamed from roundcubemail-core.links)

​

@@ -0,0 +1,62 @@

+#!/bin/sh

+

+#EXTRA#

+#DEBHELPER#

+

+set -e

+

+fixperms() {

+    # Necessary because update_database() below will otherwise create console.log with the wrong permissions later on.

+    touch /var/log/roundcubemail/console.log

+    touch /var/log/roundcubemail/errors.log

+

+    group=$(getent group roundcube_sysgroup >/dev/null 2>&1 && echo "roundcube_sysgroup" || echo "adm")

+    user=$(getent passwd roundcube_sysuser >/dev/null 2>&1 && echo "roundcube_sysuser" || echo "www-data")

+    chown -R ${user}:${group} /var/log/roundcubemail

+

+    group=$(getent group roundcube_sysgroup >/dev/null 2>&1 && echo "roundcube_sysgroup" || echo "www-data")

+    chown -R ${user}:${group} /var/lib/roundcubemail

+    chown -R root:${group} /etc/roundcubemail

+

+    chmod 750 \

+        /var/lib/roundcubemail \

+        /var/log/roundcubemail

+

+    find /etc/roundcubemail -type d -exec chmod u+rwx,g+rx,g-w,o-rwx {} \;

+    find /etc/roundcubemail -type f -exec chmod u+rw,u-x,g+r,g-wx,o-rwx {} \;

+}

+

+reload_apache()

+{

+    if apache2ctl configtest 2>/dev/null; then

+        invoke-rc.d apache2 $1 || true

+    else

+        echo "Your apache2 configuration is broken, so we're not restarting it for you."

+    fi

+}

+

+update_database() {

+    /usr/share/roundcubemail/bin/updatedb.sh \

+        --dir /usr/share/doc/roundcubemail/SQL/ \

+        --package roundcube \

+        >/dev/null 2>&1 || :

+}

+

+case "$1" in

+    configure)

+        fixperms

+        update_database

+        a2enmod rewrite

+

+        sed -i "s/rcmail-\!24ByteDESkey\*Str/`head -c 200 /dev/urandom | tr -dc _A-Z-a-z-0-9 | head -c24`/" \

+            /etc/roundcubemail/defaults.inc.php || : &> /dev/null

+

+        if [ -e "/etc/apache2/sites-available/roundcubemail.conf" -a ! -e "/etc/apache2/sites-enabled/roundcubemail.conf" ]; then

+            a2ensite roundcubemail.conf

+        fi

+        reload_apache reload

+    ;;

+esac

+

+exit 0

+

​

(renamed from roundcubemail-core.postrm)

​

(renamed from roundcubemail-core.preinst)

​

(renamed from roundcubemail-core.prerm)

​

@@ -2,17 +2,16 @@

 Source: roundcubemail

 Binary: roundcubemail

 Architecture: all

-Version: 1:1.4.13-0~kolab2

+Version: 1:1.5.2-0~kolab3

 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>

 Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>

 Homepage: http://www.roundcube.net/

 Standards-Version: 3.9.3

 Vcs-Browser: http://git.kolabsys.com/apt/roundcubemail/

 Vcs-Git: git://git.kolabsys.com/git/apt/roundcubemail/

-Build-Depends: composer, cssmin, node-uglify, debhelper (>= 8), node-less (>= 1.7.0), psa | bash

+Build-Depends: debhelper (>= 8), psa | bash

 Package-List:

  roundcubemail deb web extra

- roundcubemail-core deb web extra

 Files:

- 00000000000000000000000000000000 0 roundcubemail-1.4.13.tar.gz

+ 00000000000000000000000000000000 0 roundcubemail-1.5.2.tar.gz

  00000000000000000000000000000000 0 debian.tar.gz

​