From a7d7a9adbd7fd725e8bcf55d0a37e0e336344a5d Mon Sep 17 00:00:00 2001 From: Bernard `Guyzmo` Pratz Date: Fri, 8 Jan 2016 16:43:09 +0000 Subject: [PATCH 1/2] Fixing issue making it impossible to send mail from Z-Push * added IMAP_SMTP_METHOD to z_push/backend_imap * reverting that line accidentally deleted in commit 5055ef * cf pull request GH-580 that commit is part of Signed-off-by: Bernard `Guyzmo` Pratz --- conf/zpush/backend_imap.php | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/zpush/backend_imap.php b/conf/zpush/backend_imap.php index a3238fc0..3f69f53e 100644 --- a/conf/zpush/backend_imap.php +++ b/conf/zpush/backend_imap.php @@ -41,6 +41,7 @@ define('IMAP_FROM_LDAP_QUERY', '(mail=#username@#domain)'); define('IMAP_FROM_LDAP_FIELDS', serialize(array('givenname', 'sn', 'mail'))); define('IMAP_FROM_LDAP_FROM', '#givenname #sn <#mail>'); +define('IMAP_SMTP_METHOD', 'sendmail'); global $imap_smtp_params; $imap_smtp_params = array('host' => 'ssl://localhost', 'port' => 587, 'auth' => true, 'username' => 'imap_username', 'password' => 'imap_password'); From 72bfc0915c08171b56c3418f225882a40efb2967 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Sat, 9 Jan 2016 08:44:51 -0500 Subject: [PATCH 2/2] v0.15a (January 9, 2016) Sending mail through Exchange/ActiveSync (Z-Push) had been broken since v0.14. This is now fixed. --- CHANGELOG.md | 7 +++++++ README.md | 4 ++-- setup/bootstrap.sh | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f95e164e..91df37cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ CHANGELOG ========= +v0.15a (January 9, 2016) +------------------------ + +Mail: + +* Sending mail through Exchange/ActiveSync (Z-Push) had been broken since v0.14. This is now fixed. + v0.15 (January 1, 2016) ----------------------- diff --git a/README.md b/README.md index b8658a48..1436a341 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ by me: $ curl -s https://keybase.io/joshdata/key.asc | gpg --import gpg: key C10BDD81: public key "Joshua Tauberer " imported - $ git verify-tag v0.15 + $ git verify-tag v0.15a gpg: Signature made ..... using RSA key ID C10BDD81 gpg: Good signature from "Joshua Tauberer " gpg: WARNING: This key is not certified with a trusted signature! @@ -72,7 +72,7 @@ and on my [personal homepage](https://razor.occams.info/). (Of course, if this r Checkout the tag corresponding to the most recent release: - $ git checkout v0.15 + $ git checkout v0.15a Begin the installation. diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh index a3ed350c..a1cdf408 100644 --- a/setup/bootstrap.sh +++ b/setup/bootstrap.sh @@ -7,7 +7,7 @@ ######################################################### if [ -z "$TAG" ]; then - TAG=v0.15 + TAG=v0.15a fi # Are we running as root?