From 08a3e3ec9b77076b43e7ba69830e5301061241e2 Mon Sep 17 00:00:00 2001
From: mlan <mlan@circuit-factory.com>
Date: Mon, 26 Apr 2021 09:24:39 +0200
Subject: [PATCH] - [docker](Dockerfile) Now use ubuntu:20.04 as base image. -
 [docker](Makefile) Don't set BLD_ARG in Makefile. -
 [kopano](src/kopano/plugin/movetopublicldap.py) Need explicitly to set
 `allow_no_value=True` due to update in `configparser.3.8.py`. - [demo](demo)
 Update to `mta-apk_list` target.

---
 CHANGELOG.md                           |  7 +++++++
 Dockerfile                             |  2 +-
 Makefile                               |  2 +-
 ROADMAP.md                             |  4 ++++
 demo/Makefile                          | 10 ++++++----
 src/kopano/plugin/movetopublicldap.cfg |  2 +-
 src/kopano/plugin/movetopublicldap.py  |  2 +-
 7 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f13df5..565ea33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 1.3.0
+
+- [docker](Dockerfile) Now use ubuntu:20.04 as base image.
+- [docker](Makefile) Don't set BLD_ARG in Makefile.
+- [kopano](src/kopano/plugin/movetopublicldap.py) Need explicitly to set `allow_no_value=True` due to update in `configparser.3.8.py`.
+- [demo](demo) Update to `mta-apk_list` target.
+
 # 1.2.9
 
 - [kopano](src/kopano) Bug in kopano-dagent out-of-office now fixed.
diff --git a/Dockerfile b/Dockerfile
index 34ba7c7..9152f08 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # build arguments, amd64 is the default
 #
 ARG	DIST=ubuntu
-ARG	REL=18.04
+ARG	REL=20.04
 ARG	ARCH
 
 FROM	${ARCH:+$ARCH/}$DIST:$REL AS base
diff --git a/Makefile b/Makefile
index 0fcbc28..5ab7317 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 
 -include    *.mk
 
-BLD_ARG  ?= --build-arg DIST=ubuntu --build-arg REL=18.04
+#BLD_ARG  ?= --build-arg DIST=ubuntu --build-arg REL=20.04
 BLD_REPO ?= mlan/kopano
 BLD_VER  ?= latest
 BLD_TGT  ?= full
diff --git a/ROADMAP.md b/ROADMAP.md
index 0754588..182ea68 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,5 +1,9 @@
 # Road map
 
+## Logs
+
+kopano-spamd and kopano-search does not use syslog. Try to fix.
+
 ## kDAV
 
 Consider integrating support for kDAV which provides CalDAV and CardDAV.
diff --git a/demo/Makefile b/demo/Makefile
index 9e6e57f..f359bce 100644
--- a/demo/Makefile
+++ b/demo/Makefile
@@ -100,8 +100,7 @@ $(addsuffix -diff,$(SRV_LIST)):
 wait_%:
 	sleep $*
 
-web:
-	$(call webb_cmd,http://$(APP_FQDN))
+web: app-web
 
 auth-init: wait_3 auth-mod_conf auth-add_schema auth-add_data
 
@@ -294,7 +293,7 @@ mta-razor:
 	docker-compose exec mta run amavis_register_razor
 
 mta-apk_list:
-	docker-compose exec mta /bin/sh -c 'for pkg in $$(apk info 2>/dev/null); do printf "%9s  %s\n" $$(apk info -s $$pkg 2>/dev/null | sed -n "2{p;q}") $$pkg; done | sort'
+	docker-compose exec mta /bin/sh -c 'for pkg in $$(apk info 2>/dev/null); do printf "%9s %3s %s\n" $$(apk info -s $$pkg 2>/dev/null | sed -n "2{p;q}") $$pkg; done | sort | sort -k 2,2'
 
 mta-quarantine_list:
 	docker-compose exec mta amavis-ls
@@ -307,7 +306,7 @@ mta-clamdtop:
 
 mta-tools:
 	docker-compose exec mta apk --no-cache --update add \
-	nano less lsof htop openldap-clients bind-tools iputils strace
+	nano less lsof htop openldap-clients bind-tools iputils strace iproute2
 
 mta-htop: mta-tools
 	docker-compose exec mta htop
@@ -393,6 +392,9 @@ app-test_icals:
 app-test_tls:
 	$(TSSL_CMD) $(APP_FQDN):993 || true
 
+app-web:
+	$(call webb_cmd,http://$(APP_FQDN))
+
 app-test_oof1:
 	docker-compose exec app kopano-oof -u $(AD_USR_CN) -m 1 -t "Dunno when I return"
 
diff --git a/src/kopano/plugin/movetopublicldap.cfg b/src/kopano/plugin/movetopublicldap.cfg
index 1e16b3a..3c2d370 100644
--- a/src/kopano/plugin/movetopublicldap.cfg
+++ b/src/kopano/plugin/movetopublicldap.cfg
@@ -9,7 +9,7 @@
 #
 # The plugin reads two coniguration files.
 # First it looks for parameters in '/etc/kopano/ldap.cfg' allowing
-# common conifuration parameters to be kep tin on place.
+# common conifuration parameters to be kept in on place.
 # Second it reads '/etc/kopano/movetopublicldap.cfg'
 #
 
diff --git a/src/kopano/plugin/movetopublicldap.py b/src/kopano/plugin/movetopublicldap.py
index c589a50..31c0a57 100644
--- a/src/kopano/plugin/movetopublicldap.py
+++ b/src/kopano/plugin/movetopublicldap.py
@@ -48,7 +48,7 @@ class KConfigParser(ZConfigParser):
 	Change type addition. """
 	def __init__(self, configfile, defaultconfig={}):
 		self.config = configparser.ConfigParser(defaults=defaultconfig,
-			delimiters=('='), comment_prefixes=('#', '!'))
+			delimiters=('='), comment_prefixes=('#', '!'), allow_no_value=True)
 		self.readZConfig(configfile)
 
 class MoveToPublic(IMapiDAgentPlugin):