From 68ebca8a151ac5ac141f96c5151caa6c4fd2c6ba Mon Sep 17 00:00:00 2001 From: Michael Kroes Date: Sun, 30 Apr 2017 13:24:36 +0200 Subject: [PATCH 1/2] Update Z-Push to 2.3.6 (#1166) --- CHANGELOG.md | 2 +- setup/zpush.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41541f7d..44cd1b3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ In Development Mail: * The default theme for Roundcube was changed to the nicer Larry theme. -* Exchange/ActiveSync support has been replaced with z-push 2.3.5 from z-push.org (rather than z-push-contrib). +* Exchange/ActiveSync support has been replaced with z-push 2.3.6 from z-push.org (rather than z-push-contrib). ownCloud (now Nextcloud): diff --git a/setup/zpush.sh b/setup/zpush.sh index cbe2f7bd..0a9e3998 100755 --- a/setup/zpush.sh +++ b/setup/zpush.sh @@ -22,8 +22,8 @@ apt_install \ php5enmod imap # Copy Z-Push into place. -TARGETHASH=3ce78c23e02198bffe80c983ce247350c27590bd -VERSION=2.3.5 +TARGETHASH=131229a8feda09782dfd06449adce3d5a219183f +VERSION=2.3.6 needs_update=0 #NODOC if [ ! -f /usr/local/lib/z-push/version ]; then needs_update=1 #NODOC From d2b720431945175000671dbae750d5eed7b6b3fe Mon Sep 17 00:00:00 2001 From: Michael Kroes Date: Sun, 30 Apr 2017 14:58:00 +0200 Subject: [PATCH 2/2] Add support for adding a custom "CAA" DNS record (#1155) --- management/dns_update.py | 2 +- management/templates/custom-dns.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/management/dns_update.py b/management/dns_update.py index 6c16add1..b3764f7f 100755 --- a/management/dns_update.py +++ b/management/dns_update.py @@ -767,7 +767,7 @@ def set_custom_dns_record(qname, rtype, value, action, env): v = ipaddress.ip_address(value) # raises a ValueError if there's a problem if rtype == "A" and not isinstance(v, ipaddress.IPv4Address): raise ValueError("That's an IPv6 address.") if rtype == "AAAA" and not isinstance(v, ipaddress.IPv6Address): raise ValueError("That's an IPv4 address.") - elif rtype in ("CNAME", "TXT", "SRV", "MX", "SSHFP"): + elif rtype in ("CNAME", "TXT", "SRV", "MX", "SSHFP", "CAA"): # anything goes pass else: diff --git a/management/templates/custom-dns.html b/management/templates/custom-dns.html index ec010001..ac530cd2 100644 --- a/management/templates/custom-dns.html +++ b/management/templates/custom-dns.html @@ -33,6 +33,7 @@