From 8d660902e9572ba209304b1e65b199f3066b93da Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 13 Jun 2019 23:55:16 +0200 Subject: [PATCH 1/4] Update pull_request_template.md --- pull_request_template.md | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pull_request_template.md b/pull_request_template.md index b0904e0..b199919 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,13 +11,8 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation +## Package_check results --- -- [ ] **Code review** -- [ ] **Approval (LGTM)** -*Code review and approval have to be from a member of @YunoHost/apps group* -- **CI succeeded** : -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/z-push_ynh%20-BRANCH-/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/z-push_ynh%20-BRANCH-/) -*Please replace '-BRANCH-' in this link by the name of the branch used.* -*If the PR is from a forked repository. Please provide public results from package_check.* -When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. +*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* + +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/z-push_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/z-push_ynh%20PR-NUM-%20(USERNAME)/) From 0bc3bbf51bd48b7dbdf024d428a9edc08d12b055 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 14 Jun 2019 23:59:48 +0200 Subject: [PATCH 2/4] Upgrade to 2.5.0 --- README.md | 4 ++-- conf/app.src | 4 ++-- conf/config.php | 45 ++++++++++++++++++++++++++++++++++----------- manifest.json | 2 +- 4 files changed, 39 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 39b38ec..bf86d38 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Z-Push is an Exchange ActiveSync fronted written in php which lets you synchronize emails (imap/smtp backend) and calendar/contacts (carddav and caldav backend) -**Shipped version:** 2.4.5 +**Shipped version:** 2.5.0 ## Current status - [x] Z-push for Yunohost supports IMAP sync and Carddav/Caldav sync if Baikal or Nextcloud is installed @@ -20,7 +20,7 @@ Z-Push is an Exchange ActiveSync fronted written in php which lets you synchroni - [x] The current imap backend configuration seems able to handle email addresses different from login (for example login : john and email john.doe@domain.tld instead of john@domain.tld) - Further testing required ! - [x] The sources are based on http://download.z-push.org/final/ - [x] Autodiscover implemented -- [x] Use of version 2.4.5 final +- [x] Use of version 2.5.0 final ## Documentation diff --git a/conf/app.src b/conf/app.src index 5986e31..8f6dc57 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Z-Hub/Z-Push/archive/2.4.5.tar.gz -SOURCE_SUM=ed588da3d4a213bcef3688f928fc250a34684b919aa1a08979e4114a16788b24 +SOURCE_URL=https://github.com/Z-Hub/Z-Push/archive/2.5.0.tar.gz +SOURCE_SUM=64a56959d8bd8eaacee929cf0c08d356e18e7cd3c5f6490c4c55e68dba1be860 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/config.php b/conf/config.php index 47bb77e..7fd5db8 100644 --- a/conf/config.php +++ b/conf/config.php @@ -35,8 +35,12 @@ // Try to set unlimited timeout define('SCRIPT_TIMEOUT', 0); - // When accessing through a proxy, the "X-Forwarded-For" header contains the original remote IP - define('USE_X_FORWARDED_FOR_HEADER', false); + // Use a custom header to determinate the remote IP of a client. + // By default, the server provided REMOTE_ADDR is used. If the header here set + // is available, the provided value will be used, else REMOTE_ADDR is maintained. + // set to false to disable this behaviour. + // common values: 'HTTP_X_FORWARDED_FOR', 'HTTP_X_REAL_IP' (casing is ignored) + define('USE_CUSTOM_REMOTE_IP_HEADER', false); // When using client certificates, we can check if the login sent matches the owner of the certificate. // This setting specifies the owner parameter in the certificate to look at. @@ -252,7 +256,7 @@ // point. You can add DeviceType strings to the categories. // In general longer timeouts are better, because more data can be streamed at once. define('SYNC_TIMEOUT_MEDIUM_DEVICETYPES', "SAMSUNGGTI"); - define('SYNC_TIMEOUT_LONG_DEVICETYPES', "iPod, iPad, iPhone, WP, WindowsOutlook"); + define('SYNC_TIMEOUT_LONG_DEVICETYPES', "iPod, iPad, iPhone, WP, WindowsOutlook, WindowsMail"); // Time in seconds the device should wait whenever the service is unavailable, // e.g. when a backend service is unavailable. @@ -292,21 +296,29 @@ * For more information, see: https://wiki.z-hub.io/x/z4Aa */ // Global Address Book functionality - define('KOE_CAPABILITY_GAB', false); + define('KOE_CAPABILITY_GAB', true); // Synchronize mail flags from the server to Outlook/KOE - define('KOE_CAPABILITY_RECEIVEFLAGS', false); + define('KOE_CAPABILITY_RECEIVEFLAGS', true); // Encode flags when sending from Outlook/KOE - define('KOE_CAPABILITY_SENDFLAGS', false); + define('KOE_CAPABILITY_SENDFLAGS', true); // Out-of-office support - define('KOE_CAPABILITY_OOF', false); + define('KOE_CAPABILITY_OOF', true); // Out-of-office support with start & end times (superseeds KOE_CAPABILITY_OOF) - define('KOE_CAPABILITY_OOFTIMES', false); + define('KOE_CAPABILITY_OOFTIMES', true); // Notes support - define('KOE_CAPABILITY_NOTES', false); + define('KOE_CAPABILITY_NOTES', true); // Shared folder support - define('KOE_CAPABILITY_SHAREDFOLDER', false); + define('KOE_CAPABILITY_SHAREDFOLDER', true); // Send-As support for Outlook/KOE and mobiles - define('KOE_CAPABILITY_SENDAS', false); + define('KOE_CAPABILITY_SENDAS', true); + // Secondary Contact folders (own and shared) + define('KOE_CAPABILITY_SECONDARYCONTACTS', true); + // Copy WebApp signature into KOE + define('KOE_CAPABILITY_SIGNATURES', true); + // Delivery receipt requests + define('KOE_CAPABILITY_RECEIPTS', true); + // Impersonate other users + define('KOE_CAPABILITY_IMPERSONATE', true); // To synchronize the GAB KOE, the GAB store and folderid need to be specified. // Use the gab-sync script to generate this data. The name needs to @@ -337,6 +349,16 @@ * SYNC_FOLDER_TYPE_USER_TASK * SYNC_FOLDER_TYPE_USER_MAIL * SYNC_FOLDER_TYPE_USER_NOTE + * flags: sets additional options on the shared folder. Supported are: + * DeviceManager::FLD_FLAGS_NONE + * No flags configured, default flag to be set + * DeviceManager::FLD_FLAGS_SENDASOWNER + * When replying in this folder, automatically do Send-As + * DeviceManager::FLD_FLAGS_CALENDARREMINDERS + * If set, Outlook shows reminders for these shares with KOE + * DeviceManager::FLD_FLAGS_NOREADONLYNOTIFY + * If set, Z-Push won't send notification emails for changes + * if the folder is read-only * * Additional notes: * - on Kopano systems use backend/kopano/listfolders.php script to get a list @@ -364,6 +386,7 @@ 'folderid' => "", 'name' => "Public Contacts", 'type' => SYNC_FOLDER_TYPE_USER_CONTACT, + 'flags' => DeviceManager::FLD_FLAGS_NONE, ), */ ); diff --git a/manifest.json b/manifest.json index be22574..21df57e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Z-Push is an ActiveSync frontend that helps you synchronize emails, calendar and contacts", "fr": "Z-Push est un frontend ActiveSync qui permet de synchroniser emails, calendrier et contacts" }, - "version": "2.4.5~ynh2", + "version": "2.5.0~ynh2", "url": "https://z-push.org", "license": "AGPL-3.0-or-later", "maintainer": { From 6a9a0e73f1ca04345707858206c188075eb5a025 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 16 Jun 2019 16:17:50 +0200 Subject: [PATCH 3/4] Update check_process --- check_process | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/check_process b/check_process index c554a1c..7256b07 100644 --- a/check_process +++ b/check_process @@ -14,20 +14,13 @@ upgrade=1 from_commit=bdac42b709cd2bc663a68422f69ac6bfd43a1ce5 backup_restore=1 multi_instance=1 - incorrect_path=0 + # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. + # incorrect_path=1 port_already_use=0 change_url=0 ;;; Levels - Level 1=auto - Level 2=auto - Level 3=auto - Level 4=0 + # If the level 5 (Package linter) is forced to 1. Please add justifications here. Level 5=auto - Level 6=auto - Level 7=auto - Level 8=0 - Level 9=0 - Level 10=0 ;;; Options Email=yalh@yahoo.com Notification=all From 1e6d0b14af1836cf32ed6f7b2c49e0698bcb178b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 17 Jun 2019 21:23:00 +0200 Subject: [PATCH 4/4] update version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 21df57e..0c6c643 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Z-Push is an ActiveSync frontend that helps you synchronize emails, calendar and contacts", "fr": "Z-Push est un frontend ActiveSync qui permet de synchroniser emails, calendrier et contacts" }, - "version": "2.5.0~ynh2", + "version": "2.5.0~ynh1", "url": "https://z-push.org", "license": "AGPL-3.0-or-later", "maintainer": {