diff --git a/roundcubemail-1.1-beta-config_dir.patch b/roundcubemail-1.1-beta-config_dir.patch deleted file mode 100644 index 2669091..0000000 --- a/roundcubemail-1.1-beta-config_dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur roundcubemail-1.4.0.orig/program/include/iniset.php roundcubemail-1.4.0/program/include/iniset.php ---- roundcubemail-1.4.0.orig/program/include/iniset.php 2019-11-09 21:13:25.000000000 +0100 -+++ roundcubemail-1.4.0/program/include/iniset.php 2019-11-10 10:56:06.217671159 +0100 -@@ -28,7 +28,7 @@ - } - - if (!defined('RCMAIL_CONFIG_DIR')) { -- define('RCMAIL_CONFIG_DIR', getenv('ROUNDCUBE_CONFIG_DIR') ?: (INSTALL_PATH . 'config')); -+ define('RCMAIL_CONFIG_DIR', getenv('ROUNDCUBE_CONFIG_DIR') ?: '/etc/roundcubemail'); - } - - if (!defined('RCUBE_LOCALIZATION_DIR')) { -[1]+ Done geany roundcubemail-1.4.0/program/include/iniset.php:30 diff --git a/roundcubemail-1.4.1-complete.tar.gz b/roundcubemail-1.4.1-complete.tar.gz deleted file mode 100644 index 4f89a29..0000000 --- a/roundcubemail-1.4.1-complete.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:640423d21e1aa733ddea7462f156e194b051f086a3f2a70430e0aa2c9b09b44a -size 6998687 diff --git a/roundcubemail-1.4.1-complete.tar.gz.asc b/roundcubemail-1.4.1-complete.tar.gz.asc deleted file mode 100644 index 7cf92b9..0000000 --- a/roundcubemail-1.4.1-complete.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJHBAABCAAxFiEEiXDjemmK93XYfVkNwpRqlgnNVrQFAl3VJwATHGRldnNAcm91 -bmRjdWJlLm5ldAAKCRDClGqWCc1WtDH+D/0XCVACLIjn2i307NjQbCCJ4lyFu2ZN -tOq0hd2BwYh9DWySV4ilwaY8GfPgvITtNDQd8YKTpXkQPGyLD0Eligbz/zIuUpTZ -hUEm3HwJ1eukzLderXpnmnO2rHUuuYg/STDiAOym0Gozt6UAjitB/BAoB+aDwhGx -I8KWiKU1bHoPsO6gtB0BUjpLYIEOHeGvZrnASieG42F6wfd1JT2kn3Tfc61VywcE -tTs9fx+l4SL12cy2juXTUCXGy1aZX83vUi6ftaGf36NpmSEDA1d4X4IIjPkxgyMh -WEAMD4eymcntpe20LcnJzmTtVHcE5J0/TOLBXBvtIi3bfu1s9fJKWSHi2GPmcmxH -+gDRmmvkHUCc1bMQNGcJtnq7vA8D1euHFtyi+BmC8fbqhidhUw+qSftFD+Zji5VB -mz6nTvmmuFXexkcxb20P1gsBGytHSQo+/yXyzGkdWVGr/Jzn0X/AvCC83yuNhRzL -OmERqz41HEESWuueE199XR9viOAEQ+Y64/7aAChlydb5LVcVk3zbl58IzY7bSQZk -v7ptPq8VQ4opsKHlhbUC78PyWLD1VO2eKpoLxrKiD/X6ujZN++neA+5/+T9I6SaE -IDtTK9UyVoG18eHDH2sUJevJ1gvWWXJuZsaB89FK/Qp8Rx5+Dnofr64/vS3bQTvq -D+KnIVHKHwfMBg== -=g+eh ------END PGP SIGNATURE----- diff --git a/roundcubemail-1.4.2-complete.tar.gz b/roundcubemail-1.4.2-complete.tar.gz new file mode 100644 index 0000000..efc3e9f --- /dev/null +++ b/roundcubemail-1.4.2-complete.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c83a746c3ab561ab51df5729627d33bba3520c5d59ee03762739b4e8ad9b0f69 +size 7006013 diff --git a/roundcubemail-1.4.2-complete.tar.gz.asc b/roundcubemail-1.4.2-complete.tar.gz.asc new file mode 100644 index 0000000..fdf7543 --- /dev/null +++ b/roundcubemail-1.4.2-complete.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJHBAABCAAxFiEEiXDjemmK93XYfVkNwpRqlgnNVrQFAl4M/j4THGRldnNAcm91 +bmRjdWJlLm5ldAAKCRDClGqWCc1WtM2rEADTGO5UjfLWt0ZUfHpNSsU9be8evK4R +3qIrRt66GotahjhwayGTmmQt6Nq7He003r0ev5yMFFQt7iWOIM+1ncOeZ1R2CgH4 +ot8s0CaknBTfJ3Uv4kQ5bgt87ppanucpHKhmAtWSp3XFLfEuXGMxEBjm+9/72lLG +3myqmKggwYFZ9yEDztg52B8+BvLgRDgZr9omsgWMENLqPYszMKvUt/+iftvNa4hB +1OKlBaCXScSLRuYTewYMCJXLJktAnl1GCBJ2Q8h/as68ABGcp69ysnwBEaBFDetZ +I88qB8aIfkzULigkfwC1tDnply8a8NFur6FRz0gMGy/Bczl1VK0fT+dGKFChT0U4 +uPSviAeRd2exsea87U+Ho+NBbAhwJadG3fG164OUQC0l4dVOtQqppW1giKXu+IYt +hLbSJxUS8b0EHBO/sWk4IycbgaRD19oiD4kY4DW1m7yZrc7HjCzfrNDNhQVo4GKY +aIyPPwTJCtdMj8NoGRz72e0dh/wH4Y4eK45xVPyrPdkcKXcAAkYGEv3WLlqZoXiq +CAXUO/ecG1sVMA2Tm+9NhM4sNVk6o1FKvSlVGMeIT4vpFE6Fus5h8WX6x1SaVuXg +39ZifOIjtx0FZBaYeqWywzCDIogpfFZxSb1MvyGN1rJiztO3iLXq23acDJXF8RkL +WYv9t/hqgojcpQ== +=VAwb +-----END PGP SIGNATURE----- diff --git a/roundcubemail-1.4.2-config_dir.patch b/roundcubemail-1.4.2-config_dir.patch new file mode 100644 index 0000000..47fa6ae --- /dev/null +++ b/roundcubemail-1.4.2-config_dir.patch @@ -0,0 +1,13 @@ +Index: roundcubemail-1.4.2/program/include/iniset.php +=================================================================== +--- roundcubemail-1.4.2.orig/program/include/iniset.php ++++ roundcubemail-1.4.2/program/include/iniset.php +@@ -28,7 +28,7 @@ if (!defined('INSTALL_PATH')) { + } + + if (!defined('RCMAIL_CONFIG_DIR')) { +- define('RCMAIL_CONFIG_DIR', getenv('ROUNDCUBE_CONFIG_DIR') ?: (INSTALL_PATH . 'config')); ++ define('RCMAIL_CONFIG_DIR', getenv('ROUNDCUBE_CONFIG_DIR') ?: '/etc/roundcubemail'); + } + + if (!defined('RCUBE_LOCALIZATION_DIR')) { diff --git a/roundcubemail.changes b/roundcubemail.changes index 42e8a0b..e588fa2 100644 --- a/roundcubemail.changes +++ b/roundcubemail.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Thu Jan 2 19:43:40 UTC 2020 - Lars Vogdt + +- update to 1.4.2: + * Plugin API: Make actionbefore, before, actionafter and after + events working with plugin actions (#7106) + * Managesieve: Replace "Filter disabled" with "Filter enabled" (#7028) + * Managesieve: Fix so modifier type select wasn't hidden after hiding + modifier select on header change + * Managesieve: Fix filter selection after removing a first filter (#7079) + * Markasjunk: Fix marking more than one message as spam/ham with + email_learn driver (#7121) + * Password: Fix kpasswd and smb drivers' double-escaping bug (#7092) + * Enigma: Add script to import keys from filesystem to the db + storage (for multihost) + * Installer: Fix DB Write test on SQLite database + ("database is locked" error) (#7064) + * Installer: Fix so SQLite DSN with a relative path to the database + file works in Installer + * Elastic: Fix contrast of warning toasts (#7058) + * Elastic: Simple search in pretty selects (#7072) + * Elastic: Fix hidden list widget on mobile/tablet when selecting + folder while search menu is open (#7120) + * Fix so type attribute on script tags is not used on HTML5 pages (#6975) + * Fix unread count after purge on a folder that is not currently selected (#7051) + * Fix bug where Enter key didn't work on messages list in "List" layout (#7052) + * Fix bug where deleting a saved search in addressbook caused + display issue on sources/groups list (#7061) + * Fix bug where a new saved search added after removing all searches + wasn't added to the list (#7061) + * Fix bug where a new contact group added after removing all groups + from addressbook wasn't added to the list + * Fix so install-jsdeps.sh removes Bootstrap's sourceMappingURL (#7035) + * Fix so use of Ctrl+A does not scroll the list (#7020) + * Fix/remove useless keyup event handler on username input in logon form (#6970) + * Fix bug where cancelling switching from HTML to plain text didn't + set the flag properly (#7077) + * Fix bug where HTML reply could add an empty line with extra indentation + above the original message (#7088) + * Fix matching multiple X-Forwarded-For addresses with 'proxy_whitelist' (#7107) + * Fix so displayed maximum attachment size depends also on 'max_message_size' (#7105) + * Fix bug where 'skins_allowed' option didn't enforce user skin + preference (#7080) + * Fix so contact's organization field accepts up to 128 characters + (it was 50) + * Fix bug where listing tables in PostgreSQL database with db_prefix + didn't work (#7093) + * Fix bug where 'text' attribute on body tag was ignored when + displaying HTML message (#7109) + * Fix bug where next message wasn't displayed after delete in List mode (#7096) + * Fix so number of contacts in a group is not limited to 200 when + redirecting to mail composer from Contacts (#6972) + * Fix malformed characters in HTML message with charset meta tag + not in head (#7116) +- renamed patches: + - roundcubemail-1.1-beta-config_dir.patch + + roundcubemail-1.4.2-config_dir.patch + ------------------------------------------------------------------- Mon Dec 16 09:48:52 UTC 2019 - Lars Vogdt diff --git a/roundcubemail.spec b/roundcubemail.spec index 7676427..57dbd67 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -1,7 +1,7 @@ # # spec file for package roundcubemail # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %define roundcubeconfigpath %{_sysconfdir}/%{name} %define php_major_version %(php -r "echo PHP_MAJOR_VERSION;") Name: roundcubemail -Version: 1.4.1 +Version: 1.4.2 Release: 0 Summary: A browser-based multilingual IMAP client License: GPL-3.0-or-later AND GPL-2.0-only AND BSD-3-Clause @@ -37,7 +37,7 @@ Source6: https://roundcube.net/download/pubkey.asc#/%{name}.keyring Source7: https://github.com/roundcube/roundcubemail/releases/download/%{version}/%{name}-%{version}-complete.tar.gz.asc Source8: robots.txt # PATCH-FIX-OPENSUSE roundcubemail-1.1-beta-config_dir.patch -- use the general config directory /etc -Patch0: %{name}-1.1-beta-config_dir.patch +Patch0: %{name}-%{version}-config_dir.patch BuildRequires: apache2-devel BuildRequires: pcre-devel BuildRequires: php @@ -244,7 +244,7 @@ sed -i "s/rcmail-\!24ByteDESkey\*Str/`makedesstr`/" %{roundcubeconfigpath}/defau # Update ? if [ ${1:-0} -eq 1 ]; then if [ -x %{_sbindir}/a2enmod ]; then - # enable apache required apache modules + # enable required apache modules %if 0%{?suse_version} > 01500 if ! grep -q php %{_sysconfdir}/sysconfig/apache2 1>&2 2>/dev/null; then %{_sbindir}/a2enmod -q php7 || %{_sbindir}/a2enmod php7