Request 2884 (accepted)

roundcubemail.spec Changed

@@ -48,26 +48,24 @@
 %global logdir /var/log/roundcubemail
 %global tmpdir /var/lib/roundcubemail
 
-%global rc_version 1.5
-%global plugin_version 3.5.11
-%global skin_version 0.5.0
+%global rc_version 1.4.11.20
+%global plugin_version 3.5.9
 #%%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}}
-%global basedir %{name}-%{rc_version}%{?dash_rel_suffix}
 
 Name:           roundcubemail
-Version: 1.5.8.5
+Version:        %{rc_version}
 
-Release:        4%{?dot_rel_suffix}%{?dist}
+Release:        1%{?dot_rel_suffix}%{?dist}
 
-Summary:        Roundcube Webmail is a browser-based multilingual IMAP client
+Summary:        Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group:          Applications/System
 License:        GPLv2
 URL:            http://www.roundcube.net
 
-Source0:        roundcubemail-%{rc_version}.tar.gz
+Source0:        roundcubemail-%{version}%{?dash_rel_suffix}.tar.gz
 
 Source20:       roundcubemail.conf
 Source21:       roundcubemail.logrotate
@@ -80,31 +78,56 @@
 Source105:      plesk.kolab_chat.inc.php
 Source106:      plesk.kolab_folders.inc.php
 Source107:      plesk.libkolab.inc.php
-Source108:      plesk.acl.inc.php
-Source109:      plesk.tasklist.inc.php
 
 Source200:      2017111400.sql
 
 Patch201:       default-configuration.patch
 Patch202:       roundcubemail-1.4-beta86-plugin-enigma-homedir.patch
-Patch203:       0001-On-mysql-5.6-191-bytes-length-is-the-best-we-can-do-.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.5
+Requires:       php >= 5.3
 Recommends:     mod_php_any
 %else
 Requires:       webserver
-%if 0%{?plesk} > 0 && 0%{?rhel} == 7
-# On Plesk we can afford to build with an incompatible php version because we have the plesk supplied php versions
-Requires:       php-common
-Requires:       plesk-php74
-%else
-Requires:       php-common >= 5.5
-%endif
+Requires:       php-common >= 5.3
 %endif
 
 %if 0%{?rhel} > 7 ||0%{?fedora}
@@ -117,115 +140,23 @@
 Requires:       php-mbstring
 Requires:       php-pear >= 1.9.0
 Requires:       php-xml
-Requires:       php-intl
-%if 0%{?rhel} > 7
-Requires:       php-json
-%if 0%{?plesk} < 1
-Requires:       php-ldap
-%endif
-%endif
-
-%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
 
-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_delegation <= %{plugin_version}
-Obsoletes:      %{name}-plugin-kolab_delegation-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}
+#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
 
 Provides: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides: %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -238,7 +169,6 @@
 Provides: %{name}-plugin-kolab_activesync = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
 Provides: %{name}-plugin-kolab_addressbook = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
 Provides: %{name}-plugin-kolab_config = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
-Provides: %{name}-plugin-kolab_delegation = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
 Provides: %{name}-plugin-kolab_files = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
 Provides: %{name}-plugin-kolab_folders = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
 Provides: %{name}-plugin-kolab_notes = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
@@ -250,42 +180,27 @@
 Provides: %{name}-plugin-libkolab = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
 Provides: %{name}-plugin-acl = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
 Provides: %{name}-plugin-archive = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
-Provides: %{name}-plugin-attachment_reminder = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
-Provides: %{name}-plugin-emoticons = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
-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}
 Provides: %{name}-plugin-markasjunk = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
 Provides: %{name}-plugin-newmail_notifier = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
 Provides: %{name}-plugin-password = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
-Provides: %{name}-plugin-redundant_attachments = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
 Provides: %{name}-plugin-zipdownload = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
 Provides: %{name}-plugin-contextmenu = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
 
-Provides: %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: %{name}-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%if 0%{?plesk} > 0
-Provides: %{name}(skin-plesk) = %{?epoch:%{epoch}:}%{skin_version}-%{release}
-Provides: %{name}-skin-plesk = %{?epoch:%{epoch}:}%{skin_version}-%{release}
-Provides: %{name}-skin-plesk-larry = %{?epoch:%{epoch}:}%{skin_version}-%{release}
-Provides: %{name}(skin-plesk-larry) = %{?epoch:%{epoch}:}%{skin_version}-%{release}
-Provides: %{name}(skin-plesk-larry-assets) = %{?epoch:%{epoch}:}%{skin_version}-%{release}
-%else
-Provides: %{name}-skin-kolab = %{?epoch:%{epoch}:}%{skin_version}-%{release}
+%if 0%{?plesk}
+Provides: %{name}-skin-plesk = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
+Provides: %{name}-skin-plesk-larry = %{?epoch:%{epoch}:}%{plugin_version}-%{release}
 %endif
 
 %description
 Roundcube Webmail for Kolab
 
 %prep
-%setup -q -c "%{basedir}"
+%setup -q -c "%{name}-%{version}%{?dash_rel_suffix}"
 
-pushd %{basedir}
+pushd %{name}-%{version}%{?dash_rel_suffix}
 
 cp -vf "%{SOURCE200}" SQL/mysql/
 rm -rvf SQL/mysql/2016081200.sql
@@ -296,20 +211,16 @@
     rm -rvf ${dir}
 done
 
-%if 0%{?plesk} > 0
+%if 0%{?plesk}
 cp -vf %{SOURCE100} config/config.inc.php.sample
 cp -vf %{SOURCE101} plugins/managesieve/config.inc.php.dist
 cp -vf %{SOURCE102} plugins/password/config.inc.php.dist
 cp -vf %{SOURCE103} plugins/calendar/config.inc.php.dist
 cp -vf %{SOURCE104} plugins/kolab_addressbook/config.inc.php.dist
-cp -vf %{SOURCE105} plugins/kolab_chat/config.inc.php.dist
+#TODO?
+#cp -vf %{SOURCE105} plugins/kolab_chat/config.inc.php.dist
 cp -vf %{SOURCE106} plugins/kolab_folders/config.inc.php.dist
 cp -vf %{SOURCE107} plugins/libkolab/config.inc.php.dist
-cp -vf %{SOURCE108} plugins/acl/config.inc.php.dist
-cp -vf %{SOURCE109} plugins/tasklist/config.inc.php.dist
-rm -rvf skins/kolab/ plugins/libkolab/skins/kolab/ public_html/assets/skins/kolab/
-%else
-rm -rvf skins/plesk/ plugins/libkolab/skins/plesk/ public_html/assets/skins/plesk/
 %endif
 
 #FIXME doesn't apply?
@@ -318,10 +229,6 @@
 %patch202 -p1
 %endif
 
-%if 0%{?plesk} > 0 && 0%{?rhel} == 7
-%patch203 -p1
-%endif
-
 # Remove the results of patching when there's an incidental offset
 find . -type f -name "*.orig" | while read file; do
     rm -rvf ${file}
@@ -351,9 +258,9 @@
 rm -rf plugins/password/helpers/chpass-wrapper.py
 popd
 
-cp -a %{basedir}/{CHANGELOG.md,LICENSE,README.md} .
+cp -a %{name}-%{version}%{?dash_rel_suffix}/{CHANGELOG,LICENSE,README.md} .
 
-rm -rf %{basedir}/plugins/jqueryui/themes/redmond
+rm -rf %{name}-%{version}%{?dash_rel_suffix}/plugins/jqueryui/themes/redmond
 
 
 %build
@@ -369,10 +276,9 @@
     %{buildroot}%{confdir} \
     %{buildroot}%{datadir}/public_html \
     %{buildroot}%{logdir} \
-    %{buildroot}%{tmpdir}/plugins \
-    %{buildroot}%{tmpdir}/plugins/enigma
+    %{buildroot}%{tmpdir}/plugins
 
-pushd %{basedir}
+pushd %{name}-%{version}%{?dash_rel_suffix}
 
 %if 0%{?plesk} < 1
 %{__install} -pm 644 %SOURCE20 %{buildroot}%{_ap_sysconfdir}/conf.d
@@ -409,10 +315,55 @@
 %{__cp} -a program/include/ %{buildroot}%{datadir}/program/include/
 %{__cp} -a program/lib/ %{buildroot}%{datadir}/program/lib/
 %{__cp} -a program/localization/ %{buildroot}%{datadir}/program/localization/
-%{__cp} -a program/actions/ %{buildroot}%{datadir}/program/actions/
+%{__cp} -a program/steps/ %{buildroot}%{datadir}/program/steps/
 %{__install} -pm 644 public_html/index.php %{buildroot}%{datadir}/public_html/index.php
 popd
 
+##
+## Exclude the following external libraries
+##
+#
+## php-pear-Auth-SASL
+#%{__rm} -rf %{buildroot}/%{datadir}/program/lib/Auth/SASL/ \
+#    %{buildroot}/%{datadir}/program/lib/Auth/SASL.php
+#
+## php-pear-Net-LDAP3
+#%{__rm} -rf %{buildroot}/%{datadir}/program/lib/Net/LDAP3/ \
+#    %{buildroot}/%{datadir}/program/lib/Net/LDAP3.php
+#
+## php-pear-Net-IDNA2
+#%{__rm} -rf %{buildroot}/%{datadir}/program/lib/Net/IDNA2/ \
+#    %{buildroot}/%{datadir}/program/lib/Net/IDNA2.php
+#
+## php-pear-Net-SMTP
+#%{__rm} -rf %{buildroot}/%{datadir}/program/lib/Net/SMTP.php
+#
+## php-pear-Net-Socket
+#%{__rm} -rf %{buildroot}/%{datadir}/program/lib/Net/Socket.php
+#
+## php-pear-Mail
+#%{__rm} -rf %{buildroot}/%{datadir}/program/lib/Mail/
+#
+## php-pear-MDB2
+#%{__rm} -rf %{buildroot}/%{datadir}/program/lib/MDB2/ \
+#    %{buildroot}/%{datadir}/program/lib/MDB2.php
+#
+## php-pear
+#%{__rm} -rf %{buildroot}/%{datadir}/program/lib/PEAR.php \
+#    %{buildroot}/%{datadir}/program/lib/PEAR5.php
+#
+## Remove any empty directory we might be left with
+#find %{buildroot}/%{datadir} -type d -empty -delete
+
+#%{__install} -d \
+#    %{buildroot}%{plugindir} \
+#    %{buildroot}%{datadir}/skins
+
+#%if 0%{?rhel} > 5 || 0%{?fedora} > 13
+## php-pear-Net-Sieve
+#%{__rm} -rf %{buildroot}/%{plugindir}/managesieve/lib/Net
+#%endif
+#
 if  -d "%{buildroot}%{datadir}/public_html/" ; then
     asset_path="%{buildroot}%{datadir}/public_html/assets"
 else
@@ -421,8 +372,8 @@
 
 %{__mkdir_p} ${asset_path}
 
-orig_dir="%{basedir}"
-asset_dir="%{basedir}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
+orig_dir="%{name}-%{version}%{?dash_rel_suffix}"
+asset_dir="%{name}-%{version}%{?dash_rel_suffix}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
 
 # Remove the skins and installer directories from ${orig_dir}
 #TODO?
@@ -481,20 +432,14 @@
     fi
 done
 
-# Symlink for elastic images
-pushd %{buildroot}%{datadir}/skins/elastic
-%{__rm} -rvf images
-ln -s ../../public_html/assets/skins/elastic/images images
-popd
-
 # Provide the rpm state directory
 %{__mkdir_p} %{buildroot}/%{_localstatedir}/lib/rpm-state/roundcubemail/
 
 
-%check
-pushd %{basedir}/tests
-phpunit --debug || :
-popd
+#%check
+#pushd %{name}-%{version}%{?dash_rel_suffix}/tests
+#phpunit --debug || :
+#popd
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -508,22 +453,6 @@
     %{__rm} -rf %{plugindir}/enigma/home >/dev/null 2>&1 || :
 fi
 
-%pretrans -p <lua>
--- Required because directory is replaced with symlink per
--- https://docs.fedoraproject.org/en-US/packaging-guidelines/Directory_Replacement/
-path = "/usr/share/roundcubemail/skins/elastic/images"
-st = posix.stat(path)
-if st and st.type == "directory" then
-  status = os.rename(path, path .. ".rpmmoved")
-  if not status then
-    suffix = 0
-    while not status do
-      suffix = suffix + 1
-      status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
-    end
-    os.rename(path, path .. ".rpmmoved")
-  end
-end
 
 %posttrans
 # replace default des string in config file for better security
@@ -561,45 +490,41 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
-
-if  -f "/usr/lib/systemd/system/php-fpm.service" ; then
-    /bin/systemctl reload php-fpm.service || :
-fi
-
-%if 0%{?plesk} > 0 && 0%{?rhel} == 7
-php="/opt/plesk/php/7.4/bin/php"
 # Process all sql updates (requires the php-mysqlnd package for the pdo driver for the system php)
-${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
-    --dir %{_datadir}/doc/roundcubemail-%{version}/SQL/ \
-    --package roundcube || :
-%else
-php="/usr/bin/php"
-${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
+php %{_datadir}/roundcubemail/bin/updatedb.sh \
     --dir %{_datadir}/doc/roundcubemail/SQL/ \
-    --package roundcube || :
-%endif
-
-${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
-    --dir %{_datadir}/roundcubemail/plugins/libkolab/SQL/ \
-    --package libkolab || :
-
-${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
-    --dir %{_datadir}/roundcubemail/plugins/calendar/drivers/kolab/SQL/ \
-    --package calendar-kolab || :
+    --package roundcube || : \
+    >/dev/null 2>&1
+
+for plugin in $(find /usr/share/roundcubemail/plugins -mindepth 1 -maxdepth 1 -type d | sort); do
+    if  ! -z "$(find ${plugin} -type d -name SQL)" ; then
+        for dir in $(find /usr/share/roundcubemail/plugins/$(basename ${plugin})/ -type d -name SQL); do
+            # Skip plugins with multiple drivers and no kolab driver
+            if  ! -z "$(echo $dir | grep driver)" ; then
+                if  -z "$(echo $dir | grep kolab)" ; then
+                    continue
+                fi
+            fi
+
+            php %{_datadir}/roundcubemail/bin/updatedb.sh \
+                --dir $dir \
+                --package $(basename ${plugin}) \
+                >/dev/null 2>&1 || :
+        done
+    fi
+done
 
 exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc %{basedir}/LICENSE
-%doc %{basedir}/UPGRADING
-%doc %{basedir}/SQL
+%doc %{name}-%{version}%{?dash_rel_suffix}/LICENSE
+%doc %{name}-%{version}%{?dash_rel_suffix}/UPGRADING
+%doc %{name}-%{version}%{?dash_rel_suffix}/SQL
 
 %{_datadir}/%{name}/
 %{_sharedstatedir}/%{name}/
 
-%ghost %{_datadir}/%{name}/skins/elastic/images.rpmmoved
-
 %attr(0640,root,root) %{_var}/log/%{name}/
 
 %defattr(-,root,root,-)
@@ -620,25 +545,10 @@
 %attr(0770,root,%{httpd_group}) %dir %{logdir}
 %attr(0770,root,%{httpd_group}) %dir %{tmpdir}
 %attr(0770,root,%{httpd_group}) %dir %{tmpdir}/plugins
-%attr(0770,root,%{httpd_group}) %dir %{tmpdir}/plugins/enigma
 %dir %{_localstatedir}/lib/rpm-state/
 %dir %{_localstatedir}/lib/rpm-state/roundcubemail/
 
 %changelog
-* Wed Aug 3 2022 Christian Mollekopf <mollekopf@apheleia-it.ch> - 1.5.3-1
-- Roundcube 1.5.3
-- WOAT support
-- PROXY protocol support
-
-* Wed Apr 20 2022 Christian Mollekopf <mollekopf@apheleia-it.ch> - 1.5.2-1
-- Roundcube 1.5.2
-
-* Mon Mar  7 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 1.4.13-2
-- Support passwordless keys
-
-* Tue Nov 30 2021 Christian Mollekopf <mollekopf@apheleia-it.ch> - 1.4.11.20-2
-- Selfcontained build
-
 * Wed Sep  1 2021 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 1.4.11.20-1
 - Check in release 1.4.11.20

0001-On-mysql-5.6-191-bytes-length-is-the-best-we-can-do-.patch Deleted

@@ -1,66 +0,0 @@
-From 1afa0ac29bb2478ca527c68cc72825d11121c922 Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <mollekopf@apheleia-it.ch>
-Date: Mon, 20 Mar 2023 10:54:43 +0100
-Subject: PATCH On mysql 5.6 191 bytes length is the best we can do with
- utf8mb4
-
-https://stackoverflow.com/questions/1814532/mysql-error-1071-specified-key-was-too-long-max-key-length-is-767-bytes
-
-These changes are only required on centos 7
----
- SQL/mysql/2020020101.sql | 16 +++++++++-------
- SQL/mysql/2020091000.sql |  4 ++--
- 2 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/SQL/mysql/2020020101.sql b/SQL/mysql/2020020101.sql
-index 0a0402ba5..ec9620e93 100644
---- a/SQL/mysql/2020020101.sql
-+++ b/SQL/mysql/2020020101.sql
-@@ -26,6 +26,15 @@ ALTER TABLE `searches` ROW_FORMAT=DYNAMIC;
- ALTER TABLE `filestore` ROW_FORMAT=DYNAMIC;
- ALTER TABLE `system` ROW_FORMAT=DYNAMIC;
- 
-+
-+ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL;
-+ALTER TABLE `cache` CHANGE `cache_key` `cache_key` varchar(128) BINARY NOT NULL;
-+ALTER TABLE `cache_shared` CHANGE `cache_key` `cache_key` varchar(191) BINARY NOT NULL;
-+ALTER TABLE `cache_index` CHANGE `mailbox` `mailbox` varchar(191) BINARY NOT NULL;
-+ALTER TABLE `cache_thread` CHANGE `mailbox` `mailbox` varchar(191) BINARY NOT NULL;
-+ALTER TABLE `cache_messages` CHANGE `mailbox` `mailbox` varchar(191) BINARY NOT NULL;
-+
-+
- ALTER TABLE `session` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
- ALTER TABLE `users` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
- ALTER TABLE `cache` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-@@ -41,13 +50,6 @@ ALTER TABLE `searches` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_
- ALTER TABLE `filestore` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
- ALTER TABLE `system` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
- 
--ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL;
--ALTER TABLE `cache` CHANGE `cache_key` `cache_key` varchar(128) BINARY NOT NULL;
--ALTER TABLE `cache_shared` CHANGE `cache_key` `cache_key` varchar(255) BINARY NOT NULL;
--ALTER TABLE `cache_index` CHANGE `mailbox` `mailbox` varchar(255) BINARY NOT NULL;
--ALTER TABLE `cache_thread` CHANGE `mailbox` `mailbox` varchar(255) BINARY NOT NULL;
--ALTER TABLE `cache_messages` CHANGE `mailbox` `mailbox` varchar(255) BINARY NOT NULL;
--
- ALTER TABLE `cache`
-   ADD CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
- ALTER TABLE `cache_index`
-diff --git a/SQL/mysql/2020091000.sql b/SQL/mysql/2020091000.sql
-index aa098e35d..fd5698c35 100644
---- a/SQL/mysql/2020091000.sql
-+++ b/SQL/mysql/2020091000.sql
-@@ -1,8 +1,8 @@
- CREATE TABLE `collected_addresses` (
-  `address_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
-- `name` varchar(255) NOT NULL DEFAULT '',
-- `email` varchar(255) NOT NULL,
-+ `name` varchar(191) NOT NULL DEFAULT '',
-+ `email` varchar(191) NOT NULL,
-  `user_id` int(10) UNSIGNED NOT NULL,
-  `type` int(10) UNSIGNED NOT NULL,
-  PRIMARY KEY(`address_id`),
--- 
-2.39.2
-

Dockerfile Deleted

Makefile Deleted

buildroundcubemailtarball.config Deleted

buildroundcubemailtarball.sh Changed

@@ -1,13 +1,12 @@
 #!/bin/bash
 
 set -e
-set -x
 
-VERSION=1.5
-GIT_REF=dev/kolab-$VERSION
-PLUGINS_GIT_REF=master
+VERSION=1.4.11.20
 NAME=roundcubemail-$VERSION
-source buildroundcubemailtarball.config
+PLESK_SKIN="roundcubemail-skin-plesk-0.4.0"
+LESSC=~/node_modules/less/bin/lessc
+
 
 ROOT_DIR=$(pwd)
 
@@ -23,9 +22,6 @@
     "config": {
         "platform": {
             "php": "7.2.24"
-        },
-        "allow-plugins": {
-            "roundcube/plugin-installer": true
         }
     },
     "repositories": 
@@ -45,13 +41,6 @@
         },
         {
             "type": "path",
-            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/kolab_auth",
-            "options": {
-                "symlink": false
-            }
-        },
-        {
-            "type": "path",
             "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/kolab_config",
             "options": {
                 "symlink": false
@@ -59,13 +48,6 @@
         },
         {
             "type": "path",
-            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/kolab_delegation",
-            "options": {
-                "symlink": false
-            }
-        },
-        {
-            "type": "path",
             "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/kolab_files",
             "options": {
                 "symlink": false
@@ -142,94 +124,46 @@
             }
         },
         {
-            "type": "path",
-            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/kolab_2fa",
-            "options": {
-                "symlink": false
-            }
-        },
-        {
-            "type": "path",
-            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/logon_page",
-            "options": {
-                "symlink": false
-            }
-        },
-        {
-            "type": "path",
-            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/nextcloud_link",
-            "options": {
-                "symlink": false
-            }
-        },
-        {
-            "type": "path",
-            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/kolab_sso",
-            "options": {
-                "symlink": false
-            }
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git"
-        },
-        {
             "type": "composer",
             "url": "https://plugins.roundcube.net"
         }
     ,
     "require": {
-        "php": ">=7.2.0",
-        "caxy/php-htmldiff": "0.1.9",
+        "php": ">=5.4.0 <8",
         "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/http_request2": "~2.5.0",
-        "pear/net_smtp": "~1.10.0",
+        "pear/http_request2": "~2.3.0",
+        "pear/net_smtp": "~1.8.1",
         "pear/crypt_gpg": "~1.6.3",
-        "pear/net_sieve": "~1.4.5",
+        "pear/net_sieve": "~1.4.3",
         "roundcube/plugin-installer": "~0.2.0",
-        "roundcube/rtf-html-php": "~2.1",
-        "masterminds/html5": "~2.7.0",
+        "masterminds/html5": "~2.5.0",
         "endroid/qr-code": "~1.6.5",
-        "guzzlehttp/guzzle": "^6.5.5",
-        "kolab/calendar": "~3.5.11",
+        "kolab/calendar": "~3.5.9",
         "kolab/kolab_activesync": "~3.5.6",
         "kolab/kolab_addressbook": "~3.5.6",
-        "kolab/kolab_auth": "~3.5.6",
-        "kolab/kolab_chat": "~3.5.2",
         "kolab/kolab_config": "~3.4.0",
-        "kolab/kolab_delegation": "~3.5.11",
         "kolab/kolab_files": "~3.5.2",
         "kolab/kolab_folders": "~3.5.2",
         "kolab/kolab_notes": "~3.5.5",
         "kolab/kolab_tags": "~3.5.2",
-        "kolab/net_ldap3": "dev-master",
         "kolab/odfviewer": "~3.4.0",
         "kolab/pdfviewer": "~3.4.0",
-        "kolab/tasklist": "~3.5.10",
-        "kolab/kolab_2fa": "~3.5.11",
-        "kolab/kolab_sso": "~3.5.4",
-        "kolab/logon_page": "~3.4.2",
-        "kolab/nextcloud_link": "~1.0",
+        "kolab/tasklist": "~3.5.9",
         "johndoh/contextmenu": "~3.2.1",
-        "zf1/zend-json": "~1.12.11",
         "zf1/zend-log": "~1.12.11",
         "zf1/zend-controller": "~1.12.11",
-        "sabre/vobject" : "~4.5.1",
-        "sabre/dav" : "~4.0",
-        "sabre/http" : "~5.0",
-        "smarty/smarty" : "~3.1.7",
-        "monolog/monolog": "1.2.*",
-        "desarrolla2/cache":  "dev-master"
+        "sabre/dav" : "~2.1.6",
+        "smarty/smarty" : "~3.1.7"
+
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36 || ^5.7.21",
-        "phpstan/phpstan": "^1.4",
-        "squizlabs/php_codesniffer": "^3.6",
-        "phpcompatibility/php-compatibility": "^9.3"
+        "phpunit/phpunit": "^4.8.36 || ^5.7.21"
     },
     "suggest": {
+        "kolab/net_ldap3": "~1.1.1 required for connecting to LDAP",
         "mkopinsky/zxcvbn-php": "^4.4.2 required for Zxcvbn password strength driver"
     }
 }
@@ -237,193 +171,85 @@
 
 rm -f $NAME.tar.gz
  -d "$NAME"  && rm -rf "$NAME"
-git clone --branch dev/kolab-1.5 https://git.kolab.org/source/roundcubemail.git $NAME
-pushd $NAME
-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-skin-chameleon  && rm -rf roundcubemail-skin-chameleon
-git clone ssh://git.kolab.org/diffusion/RSC/roundcubemail-skin-chameleon.git roundcubemail-skin-chameleon
- -d roundcubemail-skin-chameleon-assets  && rm -rf roundcubemail-skin-chameleon-assets
-git clone ssh://git@git.kolab.org/diffusion/RSCA/roundcubemail-skin-chameleon-assets.git roundcubemail-skin-chameleon-assets
+git clone --branch release-1.4 https://github.com/roundcube/roundcubemail.git $NAME
 
  -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
-pushd roundcubemail-plugins-kolab-latest
-git reset --hard $PLUGINS_GIT_REF
-popd
 
 # Run composer and other install processes
 mv composer.json $NAME/composer.json
 pushd $NAME
-# Avoid running the roundcubemail plugin installer (we're not installing on this system)
 composer install
+ # composer dump autoload?
 bin/install-jsdeps.sh
 
-# Install build deps
-npm install less less-plugin-clean-css --save-dev
-LESSC="$(pwd)/node_modules/less/bin/lessc"
-
 # May require an "npm install less" and "npm install less-plugin-clean-css"
 pushd skins/elastic
 $LESSC -x styles/styles.less > styles/styles.css
 $LESSC -x styles/print.less > styles/print.css
 $LESSC -x styles/embed.less > styles/embed.css
 popd
-
 $LESSC --clean-css="--s1 --advanced" --rewrite-urls=all plugins/libkolab/skins/elastic/libkolab.less > plugins/libkolab/skins/elastic/libkolab.min.css
 
 bin/updatecss.sh --dir skins/elastic
 
 popd
 
-# Install skins
-for skin in "${SKINS@}"; do
-    if  -d "roundcubemail-skin-elastic/$skin" ; then
-        cp -r "roundcubemail-skin-elastic/$skin" $NAME/skins/
-    fi
-    if  -d "roundcubemail-skin-chameleon-assets/skins/$skin" ; then
-        cp -r "roundcubemail-skin-chameleon/skins/chameleon" "$NAME/skins/$skin"
-        cp -r "roundcubemail-skin-chameleon-assets/skins/$skin/." "$NAME/skins/$skin"
-    fi
-done
-
-pushd $NAME
-
-# This is for chameleon skins (just now-larry atm)
-for skin in $(ls -1d skins/* | grep -E '(now-larry)'); do
-    skin=$(basename $skin)
-
-    pushd skins/$skin
-    $LESSC -x styles.less > styles.css
-    $LESSC -x colors.less > colors.css
-    popd
-    bin/updatecss.sh --dir skins/$skin
-done
 
-# This is for all elastic skins
-for skin in $(ls -1d skins/* | grep -vE '(classic|elastic|larry|now-larry)'); do
-    skin=$(basename $skin)
+# Install the plesk skin
+ -d $PLESK_SKIN  && rm -rf $PLESK_SKIN
+tar xzf "$ROOT_DIR/$PLESK_SKIN.tar.gz"
 
-    # Copy elastic skin over $skin (but don't overwrite what already existis)
-    find \
-        ./skins/elastic/ \
-        ./plugins/libkolab/skins/elastic/ \
-        -type f | sort | while read file; do
-        target_dir=$(dirname ${file} | sed -e 's|%{datadir}|.|g' -e 's|./public_html/assets/|./|g' -e 's|./public_html/assets/plugins/libkolab/|./|g' -e "s/elastic/$skin/g")
-        file_name=$(basename ${file})
-        echo "Target: $target_dir, file $file_name"
-        if  ! -d ${target_dir} ; then
-            mkdir -p ${target_dir}
-        fi
-        if  ! -f "${target_dir}/${file_name}" ; then
-            cp -av "${file}" "${target_dir}"
-        fi
-    done
+cp -r $PLESK_SKIN/plesk $NAME/skins/
 
-    # Replace elastic references, but don't change the depends value in meta.json
-    sed -i -e "s/\"elastic\"/\"$skin\"/g" \
-        $(find skins/$skin/ plugins/libkolab/skins/$skin/ -type f -not -name "meta.json")
-
-    pushd skins/$skin
-    $LESSC -x styles/styles.less > styles/styles.css
-    $LESSC -x styles/print.less > styles/print.css
-    $LESSC -x styles/embed.less > styles/embed.css
-    popd
-    $LESSC --clean-css="--s1 --advanced" --rewrite-urls=all plugins/libkolab/skins/$skin/libkolab.less > plugins/libkolab/skins/$skin/libkolab.min.css
-
-    #find . | sort
-
-    # Compile and compress the CSS
-    #for file in `find . -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" -o -name "libkolab.less"`; do
-    #    %{_bindir}/lessc --relative-urls ${file} > $(dirname ${file})/$(basename ${file} .less).css
-    #
-    #    sed -i \
-    #        -e "s|../../../skins/plesk/images/contactpic.png|../../../../skins/plesk/images/contactpic.png|" \
-    #        -e "s|../../../skins/plesk/images/watermark.jpg|../../../../skins/plesk/images/watermark.jpg|" \
-    #        $(dirname ${file})/$(basename ${file} .less).css
-    #
-    #    cat $(dirname ${file})/$(basename ${file} .less).css
-    #done
+pushd $NAME
 
-    bin/updatecss.sh --dir skins/$skin
+# Copy elastic skin over plesk skin (but don't overwrite what already existis)
+find \
+    ./skins/elastic/ \
+    ./plugins/libkolab/skins/elastic/ \
+    -type f | sort | while read file; do
+    target_dir=$(dirname ${file} | sed -e 's|%{datadir}|.|g' -e 's|./public_html/assets/|./|g' -e 's|./public_html/assets/plugins/libkolab/|./|g' -e 's/elastic/plesk/g')
+    file_name=$(basename ${file})
+    echo "Target: $target_dir, file $file_name"
+    if  ! -d ${target_dir} ; then
+        mkdir -p ${target_dir}
+    fi
+    if  ! -f "${target_dir}/${file_name}" ; then
+        cp -av "${file}" "${target_dir}"
+    fi
 done
 
-# Cleanup
-npm uninstall --save-dev less less-plugin-clean-css
+# Replace elastic references, but don't change the depends value in meta.json
+sed -i -e 's/"elastic"/"plesk"/g' \
+    $(find skins/plesk/ plugins/libkolab/skins/plesk/ -type f -not -name "meta.json")
 
+pushd skins/plesk
+$LESSC -x styles/styles.less > styles/styles.css
+$LESSC -x styles/print.less > styles/print.css
+$LESSC -x styles/embed.less > styles/embed.css
 popd
+$LESSC --clean-css="--s1 --advanced" --rewrite-urls=all plugins/libkolab/skins/plesk/libkolab.less > plugins/libkolab/skins/plesk/libkolab.min.css
 
-# Uncomment to run phpstan
-# pushd $NAME
-
-# cat << EOF > ./phpstan.neon
-# includes:
-# parameters:
-#     level: 0
-#     parallel:
-#         processTimeout: 300.0
-#     ignoreErrors:
-#         - '#Access to an undefined property#'
-#     excludePaths:
-#         analyse:
-#             - program/
-#             - skins/
-#     paths:
-#         - program/include/
-#         - program/lib/
-#         - program/lib/Roundcube/
-#         - plugins/libkolab
-# EOF
+#find . | sort
 
-# php -dmemory_limit=500M vendor/bin/phpstan analyse
 
-# popd
+# Compile and compress the CSS
+#for file in `find . -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" -o -name "libkolab.less"`; do
+#    %{_bindir}/lessc --relative-urls ${file} > $(dirname ${file})/$(basename ${file} .less).css
+#
+#    sed -i \
+#        -e "s|../../../skins/plesk/images/contactpic.png|../../../../skins/plesk/images/contactpic.png|" \
+#        -e "s|../../../skins/plesk/images/watermark.jpg|../../../../skins/plesk/images/watermark.jpg|" \
+#        $(dirname ${file})/$(basename ${file} .less).css
+#
+#    cat $(dirname ${file})/$(basename ${file} .less).css
+#done
 
-#  -d chwala  && rm -rf chwala
-# git clone --branch master ssh://git@git.kolab.org/diffusion/C/chwala.git chwala
-# pushd chwala
-# mkdir -p lib/ext
-# ln -s ../../../$NAME/program/lib/Roundcube lib/ext/Roundcube
-# ln -s ../../../../$NAME/plugins lib/drivers/kolab/plugins
-# ln -s ../$NAME/vendor vendor
-# php -dmemory_limit=500M vendor/bin/phpstan analyse
-# popd
+bin/updatecss.sh --dir skins/plesk
 
-#  -d irony  && rm -rf irony
-# git clone --branch master ssh://git@git.kolab.org/diffusion/rI/iRony.git irony
-# pushd irony
-# ln -s ../chwala/lib FileAPI
-# ln -s ../$NAME/program/lib/Roundcube Roundcube
-# ln -s ../$NAME/plugins plugins
-# ln -s ../$NAME/vendor vendor
-# php -dmemory_limit=500M vendor/bin/phpstan analyse
-# popd
-
-#  -d syncroton  && rm -rf syncroton
-# git clone --branch master ssh://git@git.kolab.org/diffusion/S/syncroton.git syncroton
-# pushd syncroton
-# mkdir -p lib/ext
-# ln -s ../../../$NAME/program/lib/Roundcube lib/ext/Roundcube
-# ln -s ../../$NAME/plugins lib/plugins
-# ln -s ../$NAME/vendor vendor
-# cat << EOF > ./phpstan.neon
-# includes:
-# parameters:
-#     level: 0
-#     parallel:
-#         processTimeout: 300.0
-#     ignoreErrors:
-#         - '#Function console not found#'
-#     paths:
-#         - lib/
-# EOF
-# php -dmemory_limit=500M vendor/bin/phpstan analyse
-# popd
+popd
 
-tar --exclude="$NAME/.git" -czf "$ROOT_DIR/$NAME.tar.gz" $NAME
+tar czf "$ROOT_DIR/$NAME.tar.gz" $NAME
 
 cd "$PWD"

debian.changelog Changed

@@ -1,65 +1,3 @@
-roundcubemail (1.5.8.5-1~kolab1) unstable; urgency=low
-
-  * New tarball
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Mon, 5 August 2023 11:11:11 +0200
-
-roundcubemail (1.5.6.3-1~kolab2) unstable; urgency=low
-
-  * Add conflict with old roundcubemail-plugin-kolab-2fa and
-    roundcubemail-plugins-kolab packages
-  * Fix `prerm` script
-
- -- Christoph Erhardt <kolab@sicherha.de>  Wed, 03 Jan 2024 14:57:51 +0100
-
-roundcubemail (1.5.6.3-1~kolab1) unstable; urgency=low
-
-  * New tarball
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Tue, 21 March 2023 11:11:11 +0200
-
-roundcubemail (1.5.3-1~kolab2) unstable; urgency=low
-
-  * New tarball
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Fri, 24 Feb 2023 11:11:11 +0200
-
-roundcubemail (1.5.3-0~kolab2) unstable; urgency=low
-
-  * Add conflict with old roundcubemail-plugin-kolab-delegation package
-
- -- Christoph Erhardt <kolab@sicherha.de>  Tue, 20 Sep 2022 21:06:16 +0200
-
-roundcubemail (1.5.3-0~kolab1) unstable; urgency=low
-
-  * RC 1.5.3 with WOAT and PROXY patches
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Wed,  3 Aug 2022 11:11:11 +0200
-
-roundcubemail (1.5.2-0~kolab4) unstable; urgency=low
-
-  * Fix upgrade path on Debian
-
- -- Christoph Erhardt <kolab@sicherha.de>  Sun, 12 Jun 2022 21:51:19 +0200
-
-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
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Mon,  7 Mar 2022 11:11:11 +0200
-
-roundcubemail (1.4.13-0~kolab1) unstable; urgency=low
-
-  * Check in 1.4.13
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Fri, 14 Jan 2022 11:11:11 +0200
-
 roundcubemail (1.4.11.20-0~kolab1) unstable; urgency=low
 
   * Check in 1.4.11.20

debian.control Changed

@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
 Uploaders: Paul Klos <kolab@klos2day.nl>
-Build-Depends: debhelper (>= 8), psa | bash
+Build-Depends: composer, cssmin, node-uglify, debhelper (>= 8), node-less (>= 1.7.0), psa | bash
 Homepage: http://www.roundcube.net/
 Standards-Version: 3.9.3
 Vcs-Git: git://git.kolabsys.com/git/apt/roundcubemail/
@@ -11,30 +11,55 @@
 
 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-mdb2 (>= 2.5.0),
-            php-bindings-libkolab,
-            php-bindings-libkolabxml,
-            php,
-            php-cli,
-            php-gd,
-            php-intl,
-            php-ldap,
-            php-mysql,
-            php-pspell,
+            php-net-smtp,
+            php-net-socket,
+            php-net-sieve,
+            php-sabre-vobject-3 (>= 3.4.5),
+            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}
-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-2fa, roundcubemail-plugin-kolab-activesync, roundcubemail-plugin-kolab-addressbook, roundcubemail-plugin-kolab-auth, roundcubemail-plugin-kolab-chat, roundcubemail-plugin-kolab-config, roundcubemail-plugin-kolab-delegation, roundcubemail-plugin-kolab-files, roundcubemail-plugin-kolab-folders, roundcubemail-plugin-kolab-notes, roundcubemail-plugin-kolab-tags, roundcubemail-plugin-libcalendaring, roundcubemail-plugin-libkolab, roundcubemail-plugins-kolab, 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-kolab, 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-2fa, roundcubemail-plugin-kolab-activesync, roundcubemail-plugin-kolab-addressbook, roundcubemail-plugin-kolab-auth, roundcubemail-plugin-kolab-chat, roundcubemail-plugin-kolab-config, roundcubemail-plugin-kolab-delegation, roundcubemail-plugin-kolab-files, roundcubemail-plugin-kolab-folders, roundcubemail-plugin-kolab-notes, roundcubemail-plugin-kolab-tags, roundcubemail-plugin-libcalendaring, roundcubemail-plugin-libkolab, roundcubemail-plugins-kolab, 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-kolab, 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-2fa (= 3.1.12), roundcubemail-plugin-kolab-activesync (= 3.1.12), roundcubemail-plugin-kolab-addressbook (= 3.1.12), roundcubemail-plugin-kolab-auth (= 3.1.12), roundcubemail-plugin-kolab-chat (= 3.1.12), roundcubemail-plugin-kolab-config (= 3.1.12), roundcubemail-plugin-kolab-delegation (= 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-plugins-kolab (= 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-kolab, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry
-Description: skinnable AJAX based webmail solution for IMAP servers
+Description: Core framework package for Roundcube
  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.

debian.rules Changed

@@ -2,8 +2,6 @@
 
 DH_VERBOSE=1
 
-DESTDIR = $(CURDIR)/debian/roundcubemail
-
 %:
 	dh $@
 
@@ -11,14 +9,65 @@
 	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/
 
-    # echo "Asset loc $(CURDIR)/public_html/assets/"
+	# 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
 
-	# All assets
-	for file in $$(find $(CURDIR) -type f \
-			-name "*.css" -o \
-			-name "*.js" -o \
+	# 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 \
 			-name "*.eot" -o \
 			-name "*.gif" -o \
 			-name "*.ico" -o \
@@ -37,67 +86,73 @@
 			-name "*.woff2" \
 		); do \
 		asset_loc=$$(dirname $$(echo $${file} | sed \
-				-e "s|$(CURDIR)|$(CURDIR)/public_html/assets/|g" \
-				-e "s|$(CURDIR)|$(CURDIR)/public_html/assets/|g" \
-				-e "s|$(CURDIR)|$(CURDIR)/public_html/assets/|g") ; \
+				-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 -avf $${file} $${asset_loc}/$$(basename $${file}); \
 	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/
+	# 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
 
 	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.links ; \
-			echo "config/$${plugin}.inc.php etc/roundcubemail/" >> debian/roundcubemail.install ; \
+			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 ; \
 		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.install ; \
+			echo "public_html/assets/plugins/$${plugin} usr/share/roundcubemail/public_html/assets/plugins" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
 		fi ; \
-		echo "usr/share/roundcubemail/plugins/$${plugin}" >> debian/roundcubemail.dirs ; \
-		echo "plugins/$${plugin} usr/share/roundcubemail/plugins/" >> debian/roundcubemail.install ; \
+		echo "usr/share/roundcubemail/plugins/$${plugin}" >> debian/roundcubemail-plugin-$${pkgname}.dirs ; \
+		echo "plugins/$${plugin} usr/share/roundcubemail/plugins/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
 		if  -d "$(CURDIR)/plugins/$${plugin}/lib/Roundcube" ; then \
-			echo "usr/share/roundcubemail/plugins/$${plugin}/lib" >> debian/roundcubemail.dirs ; \
-			echo "plugins/$${plugin}/lib/Roundcube usr/share/roundcubemail/plugins/$${plugin}/lib/" >> debian/roundcubemail.install ; \
+			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 ; \
 		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 \
 		cp -v ../SOURCES/plesk.config.inc.php config/config.inc.php ; \
 		cp -v ../SOURCES/plesk.managesieve.inc.php config/managesieve.inc.php ; \
 		cp -v ../SOURCES/plesk.password.inc.php config/password.inc.php ; \
-		cp -v ../SOURCES/plesk.calendar.inc.php config/calendar.inc.php ; \
-		cp -v ../SOURCES/plesk.kolab_addressbook.inc.php config/kolab_addressbook.inc.php ; \
-		cp -v ../SOURCES/plesk.kolab_chat.inc.php config/kolab_chat.inc.php ; \
-		cp -v ../SOURCES/plesk.kolab_folders.inc.php config/kolab_folders.inc.php ; \
-		cp -v ../SOURCES/plesk.libkolab.inc.php config/libkolab.inc.php ; \
-		cp -v ../SOURCES/plesk.acl.inc.php config/acl.inc.php ; \
-		cp -v ../SOURCES/plesk.tasklist.inc.php config/tasklist.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/etc/apache2/sites-available ; \
-		install -pm 644 $(CURDIR)/debian/conf/roundcubemail.conf $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available/roundcubemail.conf ; \
+		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 ; \
 	fi
 
 	dh_install

debian.series Changed

debian.tar.gz/roundcubemail-core.dirs Changed

debian.tar.gz/roundcubemail-core.docs Added

debian.tar.gz/roundcubemail-core.install Added

debian.tar.gz/roundcubemail-core.links Changed

debian.tar.gz/roundcubemail-core.postinst Added

@@ -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-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
+

debian.tar.gz/roundcubemail-core.postrm Changed

debian.tar.gz/roundcubemail-core.preinst Changed

debian.tar.gz/roundcubemail-core.prerm Added

debian.tar.gz/roundcubemail.docs Changed

debian.tar.gz/roundcubemail.install Deleted

debian.tar.gz/roundcubemail.postinst Deleted

@@ -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/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
-

debian.tar.gz/roundcubemail.prerm Deleted

plesk.acl.inc.php Deleted

@@ -1,33 +0,0 @@
-<?php
-
-// Default look of access rights table
-// In advanced mode all access rights are displayed separately
-// In simple mode access rights are grouped into four groups: read, write, delete, full 
-$config'acl_advanced_mode' = false;
-
-// LDAP addressbook that would be searched for user names autocomplete.
-// That should be an array referring to the $config'ldap_public' array key
-// or complete addressbook configuration array.
-$config'acl_users_source' = '';
-
-// The LDAP attribute which will be used as ACL user identifier
-$config'acl_users_field' = 'mail';
-
-// The LDAP search filter will be &'d with search queries
-$config'acl_users_filter' = '';
-
-// Enable LDAP groups in user autocompletion.
-// Note: LDAP addressbook defined in acl_users_source must include groups config
-$config'acl_groups' = false;
-
-// Prefix added to the group name to build IMAP ACL identifier
-$config'acl_group_prefix' = 'group:';
-
-// The LDAP attribute (or field name) which will be used as ACL group identifier
-$config'acl_group_field' = 'name';
-
-// Include the following 'special' access control subjects in the ACL dialog;
-// Defaults to array('anyone', 'anonymous') (not when set to an empty array)
-// Example: array('anyone') to exclude 'anonymous'.
-// Set to an empty array to exclude all special aci subjects.
-$config'acl_specials' = 'anyone', 'anonymous';

plesk.calendar.inc.php Changed

plesk.config.inc.php Changed

@@ -1,7 +1,7 @@
 <?php
     include_once("/usr/share/psa-roundcube/config/config.inc.php");
 
-    $components = explode('.', $_SERVER"HTTP_HOST" ?? "");
+    $components = explode('.', $_SERVER"HTTP_HOST");
 
     if (count($components) > 2) {
         array_shift($components);
@@ -9,7 +9,7 @@
 
     $domain = implode('.', $components);
 
-    $config'session_domain' = $_SERVER"HTTP_HOST" ?? "";
+    $config'session_domain' = $_SERVER"HTTP_HOST";
     $config'username_domain' = $domain;
 
     $config'support_url' = "https://www.plesk.com/support/";
@@ -23,7 +23,7 @@
     $config'smtp_port' = 25;
     $config'smtp_user' = '%u';
     $config'smtp_pass' = '%p';
-    $config'smtp_helo_host' = $_SERVER"HTTP_HOST" ?? "";
+    $config'smtp_helo_host' = $_SERVER"HTTP_HOST";
 
     $config'use_secure_urls' = true;
     $config'force_https' = true;
@@ -87,11 +87,10 @@
     $config'refresh_interval' = 300;
     $config'check_all_folders' = false;
     $config'dont_override' = Array(
-        'check_all_folders',
-        'refresh_interval',
-        'skin',
-        'acl_advanced_mode'
-    );
+            'check_all_folders',
+            'refresh_interval',
+            'skin'
+        );
 
     $config'message_sort_col' = 'date';
     $config'default_list_mode' = 'threads';
@@ -196,28 +195,28 @@
 
     @include('/etc/roundcubemail/kolab_syncroton.inc.php');
 
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/'. basename(__FILE__))) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/'. basename(__FILE__));
+    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/'. basename(__FILE__))) {
+        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/'. basename(__FILE__));
     }
 
     // Additional options for Plesk Premium Email - Free
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/freemium.inc.php')) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/freemium.inc.php');
+    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/freemium.inc.php')) {
+        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/freemium.inc.php');
     }
 
     // Integration between Plesk Premium Email and Collabora Online extensions
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/collabora.inc.php')) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/collabora.inc.php');
+    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/collabora.inc.php')) {
+        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/collabora.inc.php');
     }
 
     // Integration between Plesk Premium Email and Mattermost extensions
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/mattermost.inc.php')) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/mattermost.inc.php');
+    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/mattermost.inc.php')) {
+        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/mattermost.inc.php');
     }
 
     // Integration between Plesk Premium Email and Seafile extensions
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/seafile.inc.php')) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. ($_SERVER'HTTP_HOST' ?? "") .'/seafile.inc.php');
+    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/seafile.inc.php')) {
+        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/seafile.inc.php');
     }
 
     @include('/etc/roundcubemail/licensing.inc.php');

plesk.kolab_addressbook.inc.php Changed

plesk.kolab_chat.inc.php Changed

plesk.libkolab.inc.php Changed

plesk.managesieve.inc.php Changed

plesk.tasklist.inc.php Deleted

release.sh Deleted

roundcubemail-1.5.tar.gz -> roundcubemail-1.4.11.20.tar.gz Changed

roundcubemail-skin-plesk-0.4.0.tar.gz Added

roundcubemail.dsc Changed

Overview

Request 2884 (accepted)

Request History