From 35088a7cac907d03718b4b4b5b7429e107be3e77 Mon Sep 17 00:00:00 2001 From: Michael Kroes Date: Sun, 25 Oct 2015 07:25:24 -0400 Subject: [PATCH 1/5] Update Z-Push version to 80cbe53de4ab8dd598d1f2af6f0a23fa396c529a --- setup/zpush.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/zpush.sh b/setup/zpush.sh index 1acc0897..e4848e4b 100755 --- a/setup/zpush.sh +++ b/setup/zpush.sh @@ -22,7 +22,7 @@ apt_install \ php5enmod imap # Copy Z-Push into place. -TARGETHASH=d0cd5a47c53afac5c3b287006dc8a48a1c4ffcd5 +TARGETHASH=80cbe53de4ab8dd598d1f2af6f0a23fa396c529a needs_update=0 #NODOC if [ ! -f /usr/local/lib/z-push/version ]; then needs_update=1 #NODOC From 5055ef060dee908f5e98ad55fe5c380675a465c9 Mon Sep 17 00:00:00 2001 From: Michael Kroes Date: Sun, 25 Oct 2015 08:22:03 -0400 Subject: [PATCH 2/5] Change configuration options for new version of z-push --- conf/zpush/backend_caldav.php | 6 ++++-- conf/zpush/backend_imap.php | 31 +++++++++++++++++++++++++++---- setup/zpush.sh | 1 + 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/conf/zpush/backend_caldav.php b/conf/zpush/backend_caldav.php index da1c2c3e..0d24bdce 100644 --- a/conf/zpush/backend_caldav.php +++ b/conf/zpush/backend_caldav.php @@ -5,10 +5,12 @@ * Descr : CalDAV backend configuration file ************************************************/ -define('CALDAV_SERVER', 'https://localhost'); +define('CALDAV_PROTOCOL', 'https'); +define('CALDAV_SERVER', 'localhost'); define('CALDAV_PORT', '443'); define('CALDAV_PATH', '/caldav/calendars/%u/'); -define('CALDAV_PERSONAL', ''); +define('CALDAV_PERSONAL', 'PRINCIPAL'); define('CALDAV_SUPPORTS_SYNC', true); +define('CALDAV_MAX_SYNC_PERIOD', 2147483647); ?> diff --git a/conf/zpush/backend_imap.php b/conf/zpush/backend_imap.php index 45594092..ecff7ada 100644 --- a/conf/zpush/backend_imap.php +++ b/conf/zpush/backend_imap.php @@ -10,6 +10,29 @@ define('IMAP_PORT', 993); define('IMAP_OPTIONS', '/ssl/norsh/novalidate-cert'); define('IMAP_DEFAULTFROM', ''); +// for new commit +define('SYSTEM_MIME_TYPES_MAPPING', '/etc/mime.types'); +define('IMAP_AUTOSEEN_ON_DELETE', false); + +define('IMAP_FOLDER_CONFIGURED', true); +// Folder prefix is the common part in your names (3, 4) +define('IMAP_FOLDER_PREFIX', ''); +// Inbox will have the preffix preppend (3 & 4 to true) +define('IMAP_FOLDER_PREFIX_IN_INBOX', false); +// Inbox folder name (case doesn't matter) - (empty in 4) +define('IMAP_FOLDER_INBOX', 'INBOX'); +// Sent folder name (case doesn't matter) +define('IMAP_FOLDER_SENT', 'SENT'); +// Draft folder name (case doesn't matter) +define('IMAP_FOLDER_DRAFT', 'DRAFTS'); +// Trash folder name (case doesn't matter) +define('IMAP_FOLDER_TRASH', 'TRASH'); +// Spam folder name (case doesn't matter). Only showed as special by iOS devices +define('IMAP_FOLDER_SPAM', 'SPAM'); +// Archive folder name (case doesn't matter). Only showed as special by iOS devices +define('IMAP_FOLDER_ARCHIVE', 'ARCHIVE'); + + // not used define('IMAP_FROM_SQL_DSN', ''); define('IMAP_FROM_SQL_USER', ''); @@ -29,10 +52,10 @@ define('IMAP_FROM_LDAP_FROM', '#givenname #sn <#mail>'); // copy outgoing mail to this folder. If not set z-push will try the default folders -define('IMAP_SENTFOLDER', ''); -define('IMAP_INLINE_FORWARD', true); -define('IMAP_EXCLUDED_FOLDERS', ''); -define('IMAP_SMTP_METHOD', 'sendmail'); +// define('IMAP_SENTFOLDER', ''); +// define('IMAP_INLINE_FORWARD', true); +// define('IMAP_EXCLUDED_FOLDERS', ''); +// 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'); diff --git a/setup/zpush.sh b/setup/zpush.sh index e4848e4b..cdeccef4 100755 --- a/setup/zpush.sh +++ b/setup/zpush.sh @@ -42,6 +42,7 @@ fi sed -i "s^define('TIMEZONE', .*^define('TIMEZONE', '$(cat /etc/timezone)');^" /usr/local/lib/z-push/config.php sed -i "s/define('BACKEND_PROVIDER', .*/define('BACKEND_PROVIDER', 'BackendCombined');/" /usr/local/lib/z-push/config.php sed -i "s/define('USE_FULLEMAIL_FOR_LOGIN', .*/define('USE_FULLEMAIL_FOR_LOGIN', true);/" /usr/local/lib/z-push/config.php +sed -i "s/define('LOG_MEMORY_PROFILER', .*/define('LOG_MEMORY_PROFILER', false);/" /usr/local/lib/z-push/config.php # Configure BACKEND rm -f /usr/local/lib/z-push/backend/combined/config.php From 4db82d3d09692893925900fd4aa82853a5b2fc27 Mon Sep 17 00:00:00 2001 From: Michael Kroes Date: Sun, 25 Oct 2015 13:19:22 -0400 Subject: [PATCH 3/5] Caldav doesnt support sync tokens --- conf/zpush/backend_caldav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/zpush/backend_caldav.php b/conf/zpush/backend_caldav.php index 0d24bdce..7bddded9 100644 --- a/conf/zpush/backend_caldav.php +++ b/conf/zpush/backend_caldav.php @@ -10,7 +10,7 @@ define('CALDAV_SERVER', 'localhost'); define('CALDAV_PORT', '443'); define('CALDAV_PATH', '/caldav/calendars/%u/'); define('CALDAV_PERSONAL', 'PRINCIPAL'); -define('CALDAV_SUPPORTS_SYNC', true); +define('CALDAV_SUPPORTS_SYNC', false); define('CALDAV_MAX_SYNC_PERIOD', 2147483647); ?> From 914cf6865182b9f77d227c9ab1023188278d6129 Mon Sep 17 00:00:00 2001 From: Michael Kroes Date: Sun, 25 Oct 2015 13:26:38 -0400 Subject: [PATCH 4/5] Remove default comments from imap config --- conf/zpush/backend_imap.php | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/conf/zpush/backend_imap.php b/conf/zpush/backend_imap.php index ecff7ada..877e7cd8 100644 --- a/conf/zpush/backend_imap.php +++ b/conf/zpush/backend_imap.php @@ -10,26 +10,16 @@ define('IMAP_PORT', 993); define('IMAP_OPTIONS', '/ssl/norsh/novalidate-cert'); define('IMAP_DEFAULTFROM', ''); -// for new commit define('SYSTEM_MIME_TYPES_MAPPING', '/etc/mime.types'); define('IMAP_AUTOSEEN_ON_DELETE', false); - define('IMAP_FOLDER_CONFIGURED', true); -// Folder prefix is the common part in your names (3, 4) define('IMAP_FOLDER_PREFIX', ''); -// Inbox will have the preffix preppend (3 & 4 to true) define('IMAP_FOLDER_PREFIX_IN_INBOX', false); -// Inbox folder name (case doesn't matter) - (empty in 4) define('IMAP_FOLDER_INBOX', 'INBOX'); -// Sent folder name (case doesn't matter) define('IMAP_FOLDER_SENT', 'SENT'); -// Draft folder name (case doesn't matter) define('IMAP_FOLDER_DRAFT', 'DRAFTS'); -// Trash folder name (case doesn't matter) define('IMAP_FOLDER_TRASH', 'TRASH'); -// Spam folder name (case doesn't matter). Only showed as special by iOS devices define('IMAP_FOLDER_SPAM', 'SPAM'); -// Archive folder name (case doesn't matter). Only showed as special by iOS devices define('IMAP_FOLDER_ARCHIVE', 'ARCHIVE'); @@ -51,12 +41,6 @@ define('IMAP_FROM_LDAP_FIELDS', serialize(array('givenname', 'sn', 'mail'))); define('IMAP_FROM_LDAP_FROM', '#givenname #sn <#mail>'); -// copy outgoing mail to this folder. If not set z-push will try the default folders -// define('IMAP_SENTFOLDER', ''); -// define('IMAP_INLINE_FORWARD', true); -// define('IMAP_EXCLUDED_FOLDERS', ''); -// 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 24f1dbc0bb24d1dca2d40e060effc7ac12169c39 Mon Sep 17 00:00:00 2001 From: Michael Kroes Date: Tue, 27 Oct 2015 16:42:58 -0400 Subject: [PATCH 5/5] PHP version has a bug that needs a workaround in z-push --- setup/zpush.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/zpush.sh b/setup/zpush.sh index cdeccef4..7ecfa0c6 100755 --- a/setup/zpush.sh +++ b/setup/zpush.sh @@ -43,6 +43,7 @@ sed -i "s^define('TIMEZONE', .*^define('TIMEZONE', '$(cat /etc/timezone)');^" /u sed -i "s/define('BACKEND_PROVIDER', .*/define('BACKEND_PROVIDER', 'BackendCombined');/" /usr/local/lib/z-push/config.php sed -i "s/define('USE_FULLEMAIL_FOR_LOGIN', .*/define('USE_FULLEMAIL_FOR_LOGIN', true);/" /usr/local/lib/z-push/config.php sed -i "s/define('LOG_MEMORY_PROFILER', .*/define('LOG_MEMORY_PROFILER', false);/" /usr/local/lib/z-push/config.php +sed -i "s/define('BUG68532FIXED', .*/define('BUG68532FIXED', false);/" /usr/local/lib/z-push/config.php # Configure BACKEND rm -f /usr/local/lib/z-push/backend/combined/config.php