From 5097244db5b667b171daebf878a0d42531b7dc4c Mon Sep 17 00:00:00 2001 From: Yalh Date: Mon, 28 Jan 2019 04:07:33 +0100 Subject: [PATCH 1/7] update to 1.38 + readme additional informations --- README.md | 28 +++++++++++++++++++++++++++- check_process | 1 - conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7bebd8d..bccc505 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,17 @@ Roundcube for YunoHost ---------------------- +[![Integration level](https://dash.yunohost.org/integration/roundcube.svg)](https://dash.yunohost.org/appci/app/roundcube) +[![Install roundcube with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=roundcube) + +> *This package allow you to install roundcube quickly and simply on a YunoHost server. +If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* + +## Overview [Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with an application-like user interface. -**Shipped version:** 1.3.6 +**Shipped version:** 1.3.8 ![](https://roundcube.net/images/screens/mailview.jpg) @@ -76,7 +83,26 @@ steps as needed. You can also download the plugin and put it under the `plugins/` directory. In this case, do not forget to change ownerships of this folder to `roundcube`. +## YunoHost specific features + +#### Multi-users support + +Are LDAP and HTTP auth supported? +Can the app be used by multiple users? + +#### Supported architectures + +* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/roundcube%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/roundcube/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/roundcube%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/roundcube/) +* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/roundcube%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/roundcube/) + +## Limitations + +* No known limitations. + + ## Links + * Report a bug: https://github.com/YunoHost-Apps/roundcube_ynh/issues * Roundcube website: https://roundcube.net/ * YunoHost website: https://yunohost.org/ diff --git a/check_process b/check_process index 7992dff..bac5b8d 100644 --- a/check_process +++ b/check_process @@ -12,7 +12,6 @@ setup_private=0 setup_public=0 upgrade=1 - upgrade=1 from_commit=8d0acb6953a4c4c2206985c7d9881c5b7b637ebd backup_restore=1 multi_instance=1 incorrect_path=1 diff --git a/conf/app.src b/conf/app.src index d264dc7..02c0974 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.3.6/roundcubemail-1.3.6.tar.gz -SOURCE_SUM=5796670080c9c3c4071eecc70ddcb6b5df98d8a241a73e8a687fd536a9410c7a +SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.3.8/roundcubemail-1.3.8.tar.gz +SOURCE_SUM=93314f125033d8ce2755198367c45bdd2f4cfee5d7688f913877beeb6c532858 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index ea3211f..9deb5fb 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "url": "https://roundcube.net/", "license": "GPL-3", - "version": "1.3.6~ynh1", + "version": "1.3.8~ynh1", "maintainer": { "name": "YunoHost Contributors", "email": "apps@yunohost.org" From e2227de021b65461df7794db3820f2501c7ba2fd Mon Sep 17 00:00:00 2001 From: Yalh Date: Mon, 28 Jan 2019 04:10:27 +0100 Subject: [PATCH 2/7] Fix Build status svg --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bccc505..33c41e9 100644 --- a/README.md +++ b/README.md @@ -92,9 +92,9 @@ Can the app be used by multiple users? #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/roundcube%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/roundcube/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/roundcube%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/roundcube/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/roundcube%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/roundcube/) +* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/roundcube%20%28Official%29.svg)](https://ci-apps.yunohost.org/ci/apps/roundcube/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/roundcube%20%28Official%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/roundcube/) +* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/roundcube%20%28Official%29.svg)](https://ci-stretch.nohost.me/ci/apps/roundcube/) ## Limitations From d55969c64e19fa588b39e18753f9caa35b4e2b8c Mon Sep 17 00:00:00 2001 From: Yalh Date: Mon, 28 Jan 2019 04:17:58 +0100 Subject: [PATCH 3/7] Upgrade cardav version --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 959dc15..cf6b55e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,7 +15,7 @@ fi # Plugins version contextmenu_version=2.3 automatic_addressbook_version=v0.4.3 -carddav_version=2.0.4 +carddav_version=3.0.3 # ============================================================================= # COMMON ROUNDCUBE FUNCTIONS From b435b69aa351105e8ad0dfc83c118eb2c166e667 Mon Sep 17 00:00:00 2001 From: Yalh Date: Mon, 28 Jan 2019 04:54:35 +0100 Subject: [PATCH 4/7] Fix serveral errors from package_linter not [YEP-2.4] compliant --- scripts/backup | 25 ++++++++++++------------- scripts/restore | 25 ++++++++++++------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/scripts/backup b/scripts/backup index 4deae33..10f2b20 100644 --- a/scripts/backup +++ b/scripts/backup @@ -2,25 +2,24 @@ #================================================= # GENERIC START -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit on command errors and treat access to unset variables as an error -set -eu - #================================================= # IMPORT GENERIC HELPERS #================================================= -if [ ! -e _common.sh ]; then - # Get the _common.sh file if it's not in the current directory - cp ../settings/scripts/_common.sh ./_common.sh - chmod a+rx _common.sh -fi -source _common.sh +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers +#================================================= +# MANAGE SCRIPT FAILURE +#================================================= + +ynh_clean_setup () { + ### Remove this function if there's nothing to clean before calling the remove script. + true +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # LOAD SETTINGS #================================================= diff --git a/scripts/restore b/scripts/restore index db99773..cc76381 100644 --- a/scripts/restore +++ b/scripts/restore @@ -2,25 +2,24 @@ #================================================= # GENERIC START -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit on command errors and treat access to unset variables as an error -set -eu - #================================================= # IMPORT GENERIC HELPERS #================================================= -if [ ! -e _common.sh ]; then - # Get the _common.sh file if it's not in the current directory - cp ../settings/scripts/_common.sh ./_common.sh - chmod a+rx _common.sh -fi -source _common.sh +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers +#================================================= +# MANAGE SCRIPT FAILURE +#================================================= + +ynh_clean_setup () { + #### Remove this function if there's nothing to clean before calling the remove script. + true +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # LOAD SETTINGS #================================================= From 040196ab083cc0c152574a414707ef398827f2c0 Mon Sep 17 00:00:00 2001 From: Yalh Date: Mon, 28 Jan 2019 04:58:51 +0100 Subject: [PATCH 5/7] Fix licence informations --- README.md | 6 +++++- manifest.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 33c41e9..129dc25 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Roundcube for YunoHost +# Roundcube for YunoHost ---------------------- [![Integration level](https://dash.yunohost.org/integration/roundcube.svg)](https://dash.yunohost.org/appci/app/roundcube) @@ -15,6 +15,10 @@ an application-like user interface. ![](https://roundcube.net/images/screens/mailview.jpg) +## Licence + +LICENCE: GPL-3.0-only + ## Features In addition to Roundcube core features, the following are made available with diff --git a/manifest.json b/manifest.json index 9deb5fb..d61d19a 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,7 @@ "fr": "Webmail Open Source" }, "url": "https://roundcube.net/", - "license": "GPL-3", + "license": "GPL-3.0-only", "version": "1.3.8~ynh1", "maintainer": { "name": "YunoHost Contributors", From f307b4cc25ab25b8d8cadd72b96ea318ba507da2 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 28 Feb 2019 00:17:18 +0100 Subject: [PATCH 6/7] roll back to test an upgrade --- check_process | 1 + 1 file changed, 1 insertion(+) diff --git a/check_process b/check_process index bac5b8d..04fdec0 100644 --- a/check_process +++ b/check_process @@ -12,6 +12,7 @@ setup_private=0 setup_public=0 upgrade=1 + upgrade=1 from_commit=8d0acb6953a4c4c2206985c7d9881c5b7b637ebd backup_restore=1 multi_instance=1 incorrect_path=1 From f20c0493b4d0c0614364bee54ab2eba1224d3da5 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Wed, 6 Mar 2019 08:51:13 +0100 Subject: [PATCH 7/7] Slight README reorganization + screenshot URL fix --- README.md | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 129dc25..4c705cb 100644 --- a/README.md +++ b/README.md @@ -13,28 +13,12 @@ an application-like user interface. **Shipped version:** 1.3.8 -![](https://roundcube.net/images/screens/mailview.jpg) +![](https://roundcube.net/images/screens/mailbox.png) ## Licence LICENCE: GPL-3.0-only -## Features - -In addition to Roundcube core features, the following are made available with -this package: - - * Integrate with YunoHost users and SSO - i.e. logout button, YunoHost users - search - * Synchronize your email aliases as identities in Roundcube - * Install the [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu) - and [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook) - plugins by default - * Allow to install the [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav) - (address book) synchronization plugin at the installation - note that if - you have installed ownCloud or Baïkal, it will automatically add the - corresponding and existing address book. - ## Extend and tweak ### Configuration @@ -89,11 +73,21 @@ case, do not forget to change ownerships of this folder to `roundcube`. ## YunoHost specific features +In addition to Roundcube core features, the following are made available with +this package: + + * Synchronize your email aliases as identities in Roundcube + * Install the [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu) + and [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook) + plugins by default + * Allow to install the [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav) + (address book) synchronization plugin at the installation - note that if + you have installed ownCloud or Baïkal, it will automatically add the + corresponding and existing address book. + #### Multi-users support - -Are LDAP and HTTP auth supported? -Can the app be used by multiple users? - +* Integrate with YunoHost users and SSO - i.e. logout button, YunoHost users + search #### Supported architectures * x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/roundcube%20%28Official%29.svg)](https://ci-apps.yunohost.org/ci/apps/roundcube/)