From a098cb285cd0ee031851f7d80724ffbec7fdcb8169f914aa0660e06fe2c4c367 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Tue, 28 Dec 2021 13:37:17 +0000 Subject: [PATCH 1/3] - use the virtual provides from each PHP module, to allow the installation of roundcubemail with various PHP version. The only problem, we are currently facing is the automatic enablement of the PHP apache module during post-installation. Trying to evaluate the correct PHP module now during post as well, which should eleminate the pre-definition of the required PHP-Version during build completely. See https://build.opensuse.org/request/show/940859 for the initial discussion. OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=157 --- roundcubemail.changes | 13 +++++++++++++ roundcubemail.spec | 43 +++++++++++++++++++++++-------------------- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/roundcubemail.changes b/roundcubemail.changes index f683178..4b0df9c 100644 --- a/roundcubemail.changes +++ b/roundcubemail.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Dec 28 13:25:37 UTC 2021 - Lars Vogdt + +- use the virtual provides from each PHP module, to allow the installation + of roundcubemail with various PHP version. + The only problem, we are currently facing is the automatic + enablement of the PHP apache module during post-installation. + Trying to evaluate the correct PHP module now during post as well, + which should eleminate the pre-definition of the required + PHP-Version during build completely. + See https://build.opensuse.org/request/show/940859 for the initial + discussion. + ------------------------------------------------------------------- Sun Nov 28 20:14:40 UTC 2021 - Michael Ströder diff --git a/roundcubemail.spec b/roundcubemail.spec index 0c0481f..6b29ad3 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -18,7 +18,7 @@ %define roundcubepath %{apache_serverroot}/%{name} %define roundcubeconfigpath %{_sysconfdir}/%{name} -%define php_name %(php -r "print 'php' . PHP_MAJOR_VERSION;") + Name: roundcubemail Version: 1.5.1 Release: 0 @@ -40,17 +40,17 @@ Patch0: %{name}-config_dir.patch BuildRequires: apache-rpm-macros BuildRequires: apache2 BuildRequires: php-cli -Requires: %{php_name}-dom -Requires: %{php_name}-exif -Requires: %{php_name}-gettext -Requires: %{php_name}-iconv -Requires: %{php_name}-intl -Requires: %{php_name}-json -Requires: %{php_name}-mbstring -Requires: %{php_name}-openssl -Requires: apache2-mod_%{php_name} +Requires: php-dom +Requires: php-exif +Requires: php-gettext +Requires: php-iconv +Requires: php-intl +Requires: php-json +Requires: php-mbstring +Requires: php-openssl +Requires(pre): mod_php_any +Requires: mod_php_any ## Requires: for upstream dep package -Requires: %{php_name}-sockets Requires: php-pear-Auth_SASL >= 1.0.6 Requires: php-pear-MDB2_Driver_mysqli Requires: php-pear-Mail_Mime >= 1.10.0 @@ -59,13 +59,14 @@ Requires: php-pear-Net_LDAP2 Requires: php-pear-Net_SMTP >= 1.8.1 Requires: php-pear-Net_Sieve >= 1.4.3 Requires: php-pear-Net_Socket >= 1.0.12 -Requires: (%{php_name}-mysql or %{php_name}-pgsql) -Recommends: %{php_name}-fileinfo -Recommends: %{php_name}-imagick -Recommends: %{php_name}-zip +Requires: php-sockets +Requires: (php-mysql or php-pgsql) +Recommends: php-fileinfo +Recommends: php-imagick +Recommends: php-zip Recommends: logrotate Recommends: php-pear-Crypt_GPG >= 1.6.3 -Suggests: %{php_name}-mysql +Suggests: php-mysql Conflicts: roundcube-framework Provides: roundcube_framework = %{version} BuildArch: noarch @@ -125,8 +126,8 @@ install -d -m 0755 %{buildroot}/%{_sysconfdir}/logrotate.d install %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} # extract roundcube-framework -install -d -m 0755 %{buildroot}/%{_datadir}/%{php_name} -mv program/lib/Roundcube %{buildroot}%{_datadir}/%{php_name}/Roundcube +install -d -m 0755 %{buildroot}/%{_datadir}/php +mv program/lib/Roundcube %{buildroot}%{_datadir}/php/Roundcube # install roundcubemail install -d -m 0755 %{buildroot}/%{roundcubepath} @@ -246,8 +247,9 @@ if [ ${1:-0} -eq 1 ]; then if [ -x %{_sbindir}/a2enmod ]; then # enable required apache modules %if 0%{?suse_version} > 01500 + PHP_MODULE=$(php -r "print 'php' . PHP_MAJOR_VERSION;") if ! grep -q php %{_sysconfdir}/sysconfig/apache2 1>&2 2>/dev/null; then - %{_sbindir}/a2enmod -q %{php_name} || %{_sbindir}/a2enmod %{php_name} + %{_sbindir}/a2enmod -q $PHP_MODULE || %{_sbindir}/a2enmod $PHP_MODULE fi %endif for module in alias brotli deflate expires filter headers rewrite setenvif version ; do @@ -344,7 +346,8 @@ exit 0 %{roundcubepath}/SQL %{roundcubepath}/temp %{roundcubepath}/vendor/ -%{_datadir}/%{php_name}/Roundcube +%dir %{_datadir}/php +%{_datadir}/php/Roundcube %attr(-, wwwrun, root) %{_localstatedir}/log/%{name} %attr(-, wwwrun, root) %{_localstatedir}/lib/%{name} From 0aa29ffb9815b37866b70c471fc07768cce0a2bc52881aa625d8e051aea41f0e Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Tue, 28 Dec 2021 13:38:11 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=158 --- roundcubemail.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roundcubemail.changes b/roundcubemail.changes index 4b0df9c..29d4b6b 100644 --- a/roundcubemail.changes +++ b/roundcubemail.changes @@ -2,9 +2,9 @@ Tue Dec 28 13:25:37 UTC 2021 - Lars Vogdt - use the virtual provides from each PHP module, to allow the installation - of roundcubemail with various PHP version. + of roundcubemail with various PHP versions. The only problem, we are currently facing is the automatic - enablement of the PHP apache module during post-installation. + enablement of the PHP apache module during post-installation: Trying to evaluate the correct PHP module now during post as well, which should eleminate the pre-definition of the required PHP-Version during build completely. From 6ce445f32dd1914e0352094ca1817c7704495ff24701cfb170fa663050616c0d Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Sat, 1 Jan 2022 17:55:25 +0000 Subject: [PATCH 3/3] Accepting request 943309 from home:stroeder:network update to 1.5.2 OBS-URL: https://build.opensuse.org/request/show/943309 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=159 --- roundcubemail-1.5.1-complete.tar.gz | 3 --- roundcubemail-1.5.1-complete.tar.gz.asc | 17 ----------------- roundcubemail-1.5.2-complete.tar.gz | 3 +++ roundcubemail-1.5.2-complete.tar.gz.asc | 17 +++++++++++++++++ roundcubemail.changes | 19 +++++++++++++++++++ roundcubemail.spec | 7 ++++--- 6 files changed, 43 insertions(+), 23 deletions(-) delete mode 100644 roundcubemail-1.5.1-complete.tar.gz delete mode 100644 roundcubemail-1.5.1-complete.tar.gz.asc create mode 100644 roundcubemail-1.5.2-complete.tar.gz create mode 100644 roundcubemail-1.5.2-complete.tar.gz.asc diff --git a/roundcubemail-1.5.1-complete.tar.gz b/roundcubemail-1.5.1-complete.tar.gz deleted file mode 100644 index f331dc6..0000000 --- a/roundcubemail-1.5.1-complete.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:611b0d80227d0b70289c715787b2d85fd15ed915eb56d585c104c24376036e83 -size 7827081 diff --git a/roundcubemail-1.5.1-complete.tar.gz.asc b/roundcubemail-1.5.1-complete.tar.gz.asc deleted file mode 100644 index 9d43aec..0000000 --- a/roundcubemail-1.5.1-complete.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJHBAABCAAxFiEEiXDjemmK93XYfVkNwpRqlgnNVrQFAmGjwXcTHGRldnNAcm91 -bmRjdWJlLm5ldAAKCRDClGqWCc1WtG3PD/90ENdzAWKn8ibxMhyOmZxcGrVxbZ32 -5FCn68mBOHkNThGlwakqa/CKL0MIwoeC1dRx7EzZ89EmoOt9ngKC7MkejbICiCCA -rZdxbceNHPRNqHbkDO0bTC6vhsFh4r3sc9nOMRP9/MDAafE0hHhk4tku1VPrsdnR -01LGcioIV8/ISokOmchTEdelxGhQSxxS5+RUcEG3pt5Yqbha8EUcYPvV3cv39eyw -w/548X+CGWgfsRR1pMjSOXehucuKeVJATsDVWp80oVNKYpUQbyq88rZKUOgbr5MB -m2SoaoN1VZYBY7s5c+54eSAisvhADs2xmEQzoX02bFWfNQQpyTGtTXDJqmYeCCu0 -W39X7UbEXkHcMEjesMg88RtBFg+QkKuLf82QsuTdA4JRLpn7u7KvY/QWMkbFMnRt -KrbOPybzu4f22E7z3xUteC4Y87L7m3kq3EaSPLOwz7ix0gO6+z+EKasnJilLQJJV -CYRBT6/UXj/FQFjb66cW8HupAf1O8EaLVVs2GY4zHeqe4Gkb1gunmdmaDLB/v2+t -TyRiJ2qxIP5u8voZ9jWAalvTT0tf4XzW+VqDuVqAgxhkWYlnwCS6fS6HWY9jP78/ -KXjyt20V4RwnaTxj2uvVtWnZo7KkrzlP3v7BQY5F+Iad/uWz+y2jsKuFg4M31JT8 -c36SWFf5gWZoAQ== -=5lbu ------END PGP SIGNATURE----- diff --git a/roundcubemail-1.5.2-complete.tar.gz b/roundcubemail-1.5.2-complete.tar.gz new file mode 100644 index 0000000..dd2d945 --- /dev/null +++ b/roundcubemail-1.5.2-complete.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f03968381156fe790d858af7e069c5550a8577fb964f96624434895272053838 +size 7852981 diff --git a/roundcubemail-1.5.2-complete.tar.gz.asc b/roundcubemail-1.5.2-complete.tar.gz.asc new file mode 100644 index 0000000..a9673df --- /dev/null +++ b/roundcubemail-1.5.2-complete.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJHBAABCAAxFiEEiXDjemmK93XYfVkNwpRqlgnNVrQFAmHOJFoTHGRldnNAcm91 +bmRjdWJlLm5ldAAKCRDClGqWCc1WtF+tEACSt2OzllRUksjL+O6xLz7IlvD6ahy/ +fEXSVnR10XAVOdYV6gpDQ165Z9dlcRm9p4r1S0zrFG4/XSzsx+Kt081gOeeApKj2 +y615KVP6T3KGCRuYXdDhc5Mzh28kmxrN3dxqY+PJB2/WPjEy+Dxu1wM9myRvc+Ur +QDrvkmwiYhl0axSxXWSL7VlajrpR3XRxkOl4umFSlMd1pG9vZAkxKQXatWZ6Z5E/ +lZtiGl7Ow2HrwP39ZyhVNoWHopqdvMU2ewQDuvz1pktdxGYqI+MRrdIqRyHU83iN +Owz78CrfS5Xom/SsigSUiyPtobQjJr2yu3uwZLHk+LI3PIUZqtaoWtj9teUp+DAW +YLLtRVupTdwD5lG554v+cP9wmlsIWHStlNilp8r2ga3QfEA7v0tCdsyHAIwK30MA +Z9mjWLjHIDNEiid04nGCNwNnICilc69hoi2T4LwEU4AnovSWSko0BCVzL2qp999d +vQw1/Tsjo39wR1CtHxS1Hi09hibaHJRtdVqhaBpF9jG3QwTgLbC/OPRfrs2tRurZ +50ybRtgVl7uLkvUHVW+H5I9FNp1PUDcJMb6YQB0yFArNFR7AWztKyCoeoINxmcsL +gIkdFKAzqmAqjt2KaxT0HQDqK+gU/DMAJEaLiIbslQTFCO5RUCs01d2jayLVII28 +6tFg2tppaxnGCg== +=49DH +-----END PGP SIGNATURE----- diff --git a/roundcubemail.changes b/roundcubemail.changes index 29d4b6b..98c3a85 100644 --- a/roundcubemail.changes +++ b/roundcubemail.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Dec 31 12:03:35 UTC 2021 - Michael Ströder + +- update to 1.5.2 + * OAuth: pass 'id_token' to 'oauth_login' plugin hook (#8214) + * OAuth: fix expiration of short-lived oauth tokens (#8147) + * OAuth: fix relative path to assets if /index.php/foo/bar url is used (#8144) + * OAuth: no auto-redirect on imap login failures (#8370) + * OAuth: refresh access token in 'refresh' plugin hook (#8224) + * Fix so folder search parameters are honored by subscriptions_option plugin (#8312) + * Fix password change with Directadmin driver (#8322, #8329) + * Fix so css files in plugins/jqueryui/themes will be minified too (#8337) + * Fix handling of unicode/special characters in custom From input (#8357) + * Fix some PHP8 compatibility issues (#8363) + * Fix chpass-wrapper.py helper compatibility with Python 3 (#8324) + * Fix scrolling and missing Close button in the Select image dialog in Elastic/mobile (#8367) + * Security: fix cross-site scripting (XSS) via HTML messages with malicious CSS content +- added Suggests: php-sqlite + ------------------------------------------------------------------- Tue Dec 28 13:25:37 UTC 2021 - Lars Vogdt diff --git a/roundcubemail.spec b/roundcubemail.spec index 6b29ad3..e2ab2b2 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -20,7 +20,7 @@ %define roundcubeconfigpath %{_sysconfdir}/%{name} Name: roundcubemail -Version: 1.5.1 +Version: 1.5.2 Release: 0 Summary: A browser-based multilingual IMAP client License: BSD-3-Clause AND GPL-2.0-only AND GPL-3.0-or-later @@ -61,12 +61,13 @@ Requires: php-pear-Net_Sieve >= 1.4.3 Requires: php-pear-Net_Socket >= 1.0.12 Requires: php-sockets Requires: (php-mysql or php-pgsql) +Recommends: logrotate Recommends: php-fileinfo Recommends: php-imagick -Recommends: php-zip -Recommends: logrotate Recommends: php-pear-Crypt_GPG >= 1.6.3 +Recommends: php-zip Suggests: php-mysql +Suggests: php-sqlite Conflicts: roundcube-framework Provides: roundcube_framework = %{version} BuildArch: noarch