From 4f74e525f2c2dd999441591b04809c5b38eb66d7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 13 Jul 2019 15:32:36 +0200 Subject: [PATCH 1/2] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index bf86d38..12e94d4 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,6 @@ Z-Push is an Exchange ActiveSync fronted written in php which lets you synchroni * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/z-push%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/z-push/) * Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/z-push%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/z-push/) - ## Links * Report a bug: https://github.com/YunoHost-Apps/z-push_ynh/issues @@ -45,7 +44,6 @@ Z-Push is an Exchange ActiveSync fronted written in php which lets you synchroni Developers info ---------------- -**Only if you want to use a testing branch for coding, instead of merging directly into master.** Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/z-push_ynh/tree/testing). To try the testing branch, please proceed like that. From 52ce03da19d5bccae1bb2078911db7914586c554 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 18 Oct 2019 23:16:44 +0200 Subject: [PATCH 2/2] Upgrade to 2.5.1 --- README.md | 4 ++-- conf/app.src | 4 ++-- conf/backend/config-imap.php | 9 ++++++--- conf/config.php | 8 +++++++- manifest.json | 2 +- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 12e94d4..72fc890 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.5.0 +**Shipped version:** 2.5.1 ## 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.5.0 final +- [x] Use of version 2.5.1 final ## Documentation diff --git a/conf/app.src b/conf/app.src index 8f6dc57..d2ee625 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Z-Hub/Z-Push/archive/2.5.0.tar.gz -SOURCE_SUM=64a56959d8bd8eaacee929cf0c08d356e18e7cd3c5f6490c4c55e68dba1be860 +SOURCE_URL=https://github.com/Z-Hub/Z-Push/archive/2.5.1.tar.gz +SOURCE_SUM=cba4cf6599a008c4b1e3467f710cee366d131960435ec688001f27edd92ebd16 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/backend/config-imap.php b/conf/backend/config-imap.php index 57a724e..ab9e2a3 100644 --- a/conf/backend/config-imap.php +++ b/conf/backend/config-imap.php @@ -123,7 +123,6 @@ define('IMAP_EXCLUDED_FOLDERS', ''); // 'sql' - the username will be the result of a sql query. REMEMBER TO INSTALL PHP-PDO AND PHP-DATABASE // 'ldap' - the username will be the result of a ldap query. REMEMBER TO INSTALL PHP-LDAP!! // '@mydomain.com' - the username is used and the given string will be appended -//define('IMAP_DEFAULTFROM', '@DOMAINTOCHANGE'); define('IMAP_DEFAULTFROM', ''); // DSN: formatted PDO connection string @@ -203,11 +202,10 @@ global $imap_smtp_params; // IMPORTANT: To use SSL you must use PHP 5.1 or later, install openssl libs and use ssl:// within the host variable // IMPORTANT: To use SSL with PHP 5.6 you should set verify_peer, verify_peer_name and allow_self_signed //$imap_smtp_params = array('host' => 'ssl://localhost', 'port' => 465, 'auth' => true, 'username' => 'imap_username', 'password' => 'imap_password'); +// If you want to use STARTTLS when the server is supporting it, you just need to enable authentication on a non SSL host variable. $imap_smtp_params = array('host' => 'tcp://__IMAP_SERVER__', 'port' => 587, 'auth' => true, 'username' => 'imap_username', 'password' => 'imap_password', 'localhost' => '__IMAP_SERVER__', 'verify_peer' => false, 'verify_peer_name' => false, 'allow_self_signed' => true); - - // If you are using IMAP_SMTP_METHOD = mail or sendmail and your sent messages are not correctly displayed you can change this to "\n". // BUT, it doesn't comply with RFC 2822 and will break if using smtp method define('MAIL_MIMEPART_CRLF', "\r\n"); @@ -220,3 +218,8 @@ define('SYSTEM_MIME_TYPES_MAPPING', '/etc/mime.types'); // Use BackendCalDAV for Meetings. You cannot hope to get that functionality working without a caldav backend. define('IMAP_MEETING_USE_CALDAV', __FLAGTOCHANGE__); + +// If your IMAP server allows authenticating via GSSAPI, php-imap will not fall back properly to other authentication +// methods and you will be unable to log in. Uncomment the following line to disable that authentication method. +// Multiple methods can be specified as a comma-separated string. +// define('IMAP_DISABLE_AUTHENTICATOR', 'GSSAPI'); diff --git a/conf/config.php b/conf/config.php index 7fd5db8..5c77825 100644 --- a/conf/config.php +++ b/conf/config.php @@ -74,6 +74,12 @@ * using the memcache provider for multi-host environments. * When another implementation should be used, the class can be set here explicitly. * If empty Z-Push will try to use available providers. + + * Possible values: + * IpcSharedMemoryProvider - default. Requires z-push-ipc-sharedmemory package. + * IpcMemcachedProvider - requires z-push-ipc-memcached package. It is necessary to set up + * memcached server before (it won't be installed by z-push-ipc-memcached). + * IpcWincacheProvider - for windows systems. */ define('IPC_PROVIDER', ''); @@ -103,7 +109,7 @@ * LOGAUTHFAIL is logged to the LOGBACKEND. */ define('LOGBACKEND', 'filelog'); - define('LOGLEVEL', LOGLEVEL_INFO); + define('LOGLEVEL', LOGLEVEL_WBXML); define('LOGAUTHFAIL', false); // To save e.g. WBXML data only for selected users, add the usernames to the array diff --git a/manifest.json b/manifest.json index 0c6c643..7eb8320 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~ynh1", + "version": "2.5.1~ynh1", "url": "https://z-push.org", "license": "AGPL-3.0-or-later", "maintainer": {