main/dovecot: upgrade to 2.2.27

--
add config for sieve-extdata-plugin
some fixes in APKBUILD

4 files changed, 44 insertions, 44 deletions

diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 96f06a609c..0680c60163 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -3,12 +3,12 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
-pkgver=2.2.26.0
+pkgver=2.2.27
 pkgrel=0
-_majorpkgver=${pkgver%.*.*}
 _pigeonholever=0.4.16
-_majorpigeonholever=${_pigeonholever%.*}
 _pluginextdataver=39
+_pkgvermajor=${pkgver%.*}
+_pigeonholevermajor=${_pigeonholever%.*}
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
 arch="all"
@@ -22,30 +22,21 @@ makedepends="libcap-dev zlib-dev libressl-dev bzip2-dev postgresql-dev
 install="dovecot.pre-install dovecot.post-install"
 subpackages="$pkgname-doc $pkgname-dev
 	$pkgname-sql $pkgname-pgsql $pkgname-mysql $pkgname-sqlite
-	$pkgname-gssapi $pkgname-ldap $pkgname-pigeonhole-plugin:_pigeonhole
-	$pkgname-pigeonhole-plugin-extdata:_pluginextdata
+	$pkgname-gssapi $pkgname-ldap $pkgname-pigeonhole-plugin:pigeonhole
+	$pkgname-pigeonhole-plugin-extdata:pigeonhole_extdata
 	"
-source="http://www.dovecot.org/releases/$_majorpkgver/$pkgname-$pkgver.tar.gz
-	http://pigeonhole.dovecot.org/releases/$_majorpkgver/$pkgname-$_majorpkgver-pigeonhole-$_pigeonholever.tar.gz
-	http://hg.rename-it.nl/pigeonhole-0.4-sieve-extdata/archive/$_pluginextdataver.tar.gz
-	hide-dl-errors.patch
+source="http://www.dovecot.org/releases/$_pkgvermajor/$pkgname-$pkgver.tar.gz
+	http://pigeonhole.dovecot.org/releases/$_pkgvermajor/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever.tar.gz
+	http://hg.rename-it.nl/pigeonhole-${_pigeonholevermajor}-sieve-extdata/archive/$_pluginextdataver.tar.gz
 	dovecot.logrotate
 	dovecot.initd
+	extdata.conf
+	libressl.patch
 	"
 options="libtool"
-
 builddir="$srcdir"/$pkgname-$pkgver
-_builddirpigeonhole="$srcdir"/$pkgname-$_majorpkgver-pigeonhole-$_pigeonholever
-_builddirpluginextdata="$srcdir"/pigeonhole-0-4-sieve-extdata-$_pluginextdataver
-
-prepare() {
-	cd "$builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+_builddirpigeonhole="$srcdir"/$pkgname-${_pkgvermajor}-pigeonhole-$_pigeonholever
+_builddirpluginextdata="$srcdir"/pigeonhole-${_pigeonholevermajor/./-}-sieve-extdata-$_pluginextdataver
 
 build() {
 	cd "$builddir"
@@ -157,7 +148,7 @@ dev() {
 		"$subpkgdir"/usr/lib/dovecot/
 }
 
-_pigeonhole() {
+pigeonhole() {
 	pkgdesc="Sieve plugin for dovecot"
 	depends="$pkgname"
 	_mv $(cd "$pkgdir" && find usr -name '*sieve_extprograms*')
@@ -166,10 +157,12 @@ _pigeonhole() {
 	_mv $(cd "$pkgdir" && find etc/dovecot -name '*sieve*')
 }
 
-_pluginextdata() {
+pigeonhole_extdata() {
 	pkgdesc="Pigeonhole Sieve Extdata Plugin"
-	depends="$pkgname"
+	depends="$pkgname-pigeonhole-plugin"
 	_mv $(cd "$pkgdir" && find usr -name '*sieve_extdata*')
+	install -Dm644 "$srcdir"/extdata.conf "$subpkgdir"/etc/dovecot/conf.d/90-sieve-extdata.conf
+	install -Dm644 /dev/null "$subpkgdir"/etc/dovecot/sieve-extdata.dict
 }
 
 pgsql() {
@@ -209,21 +202,24 @@ sql() {
 	_mv $(cd "$pkgdir" && find usr -name '*-sql.*')
 	_mv $(cd "$pkgdir" && find etc/dovecot -name '*-sql.conf*')
 }
-md5sums="85bc42328de41d1eb8d6d3f1db666db8  dovecot-2.2.26.0.tar.gz
+md5sums="20133518f5bc0e64dd07ce55b83df2fb  dovecot-2.2.27.tar.gz
 e03eed707b39cffc4b2a82867de45d9c  dovecot-2.2-pigeonhole-0.4.16.tar.gz
 5d26d326856d00ce04c620b549d58f79  39.tar.gz
-49f7a03284cc657857fe2ae22b8c82a0  hide-dl-errors.patch
 df6d43508a82903a97e3a2a5b8436d3d  dovecot.logrotate
-f0c227ab4e2593f6d410440b82103de1  dovecot.initd"
-sha256sums="f692a1f39de36cd15f6681f7fee5fba2ef3e72b529acbee02b23422e16926f05  dovecot-2.2.26.0.tar.gz
+f0c227ab4e2593f6d410440b82103de1  dovecot.initd
+e085d2bafae8c9d657c4a85a91eb35f6  extdata.conf
+ca86aa10f8f963c7f08c50c12c2dbe45  libressl.patch"
+sha256sums="897f92a87cda4b27b243f8149ce0ba7b7e71a2be8fb7994eb0a025e54cde18e9  dovecot-2.2.27.tar.gz
 8f0b98f18062d6e241eef74ebe16cc167cd246361cbe6657d94f0ecc5d7d3234  dovecot-2.2-pigeonhole-0.4.16.tar.gz
 da70fb0ce0424e9cad2c03834bd826a3685deb5a986ec5b87ae7c525055256d5  39.tar.gz
-d6accdd6e271647c01ab8fa0a9491ee822486484961e2d5c252bf70e816d2bfa  hide-dl-errors.patch
 d0fef8cd8200549877d7594cf458d6b33f05b31f95f1fd9a8368e8471c082735  dovecot.logrotate
-1a3c845c216bb6f9633d27a8c1c0d01b591942c463bddb5ae835f162bd7fb4bf  dovecot.initd"
-sha512sums="7b4c170efd964eabbd9a0166164e53b7964b90fc245bab1c3328bf199c4880288c89811dcfd9833f899057921eefb4451c561f3b3d725df9ea346df8fde82a3d  dovecot-2.2.26.0.tar.gz
+1a3c845c216bb6f9633d27a8c1c0d01b591942c463bddb5ae835f162bd7fb4bf  dovecot.initd
+1e7b6a42f07add59af8a031d24525bdda28a6d904acefa6e4f48b005d07213e6  extdata.conf
+27ce75e878fbea1038417b2629626cb6c96e078e8af97cb76641489448c0e88f  libressl.patch"
+sha512sums="faab441bb2afa1e6de3e6ec6207c92a333773941bbc10c4761483ef6ccc193d3a4983de1acc73325122c22b197ea25c1e54886cccfb6b060ede90936a69b71f2  dovecot-2.2.27.tar.gz
 5f59fb35dbe638f8ddd19c0fd0f3fbd6fec1fa238f3781b94c50a8f7ce72a53ac1381a6f8ad9bcc90df1edfa2b263a6dfba88521578e55ce4b3d840bed022b79  dovecot-2.2-pigeonhole-0.4.16.tar.gz
 832a80264fb9bd3021c4e192eb7594c203100783df547aff35acf4dc4d8de5eddfd676fcc5a07a0691d9bb6eb884c9497a692b72a2af5bf9e9bb7a2d3f38923e  39.tar.gz
-1e9a1f2990019236546c7be581a4d6d0b430110d27a00bc3298f5c154ef9a4aadefa193d02a017912f826d771058fd5c6ef6cb454e14f0d15749fa8f3a68c64a  hide-dl-errors.patch
 9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0  dovecot.logrotate
-6ec75a8396f4d826390e69aa8177593573eaf0e0ab537b2a4720573e04c92ff615f39e1559b48313b2cd2f03704cd977bb594a568ecc5dd22e38926c12f3c48c  dovecot.initd"
+6ec75a8396f4d826390e69aa8177593573eaf0e0ab537b2a4720573e04c92ff615f39e1559b48313b2cd2f03704cd977bb594a568ecc5dd22e38926c12f3c48c  dovecot.initd
+7aa66cbd2a520d863fc8ff2ec48520c6fe4629ec345545b362e16c3072843f5315c6e12513ed86200d66b7c55e17f5bb21c7a12d86721968a9e03cc595dc5bcd  extdata.conf
+c58abae05c69fa01f2547c4a10e1b49a8b04f7311b7f0397eb2be9bd574d711f6a75203c3764b67205fe4000dd018c2e7dfe4a23399e3d8a3e7b2f201b7c745e  libressl.patch"
diff --git a/main/dovecot/extdata.conf b/main/dovecot/extdata.conf
new file mode 100644
index 0000000000..0cc7a3a8bc
--- /dev/null
+++ b/main/dovecot/extdata.conf
@@ -0,0 +1,4 @@
+#plugin {
+#  sieve_plugins = sieve_extdata
+#  sieve_extdata_dict_uri = file:/etc/dovecot/sieve-extdata.dict
+#}
diff --git a/main/dovecot/hide-dl-errors.patch b/main/dovecot/hide-dl-errors.patch
deleted file mode 100644
index ccc1360f93..0000000000
--- a/main/dovecot/hide-dl-errors.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/lib/module-dir.c.orig
-+++ ./src/lib/module-dir.c
-@@ -141,7 +141,7 @@
- 
- static void *quiet_dlopen(const char *path, int flags)
- {
--#ifndef __OpenBSD__
-+#if !defined(__OpenBSD__) && !defined(__UCLIBC__)
- 	return dlopen(path, flags);
- #else
- 	void *handle;
diff --git a/main/dovecot/libressl.patch b/main/dovecot/libressl.patch
new file mode 100644
index 0000000000..02cd08c87b
--- /dev/null
+++ b/main/dovecot/libressl.patch
@@ -0,0 +1,11 @@
+--- a/src/lib-ssl-iostream/dovecot-openssl-common.c
++++ b/src/lib-ssl-iostream/dovecot-openssl-common.c
+@@ -101,7 +101,7 @@
+ 	ERR_remove_thread_state(NULL);
+ #endif
+ 	ERR_free_strings();
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 	OPENSSL_cleanup();
+ #endif
+ 	return FALSE;