main/dovecot: upgrade to 2.3.1

3 files changed, 17 insertions, 51 deletions

diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 16a8f6ed26..e5c3961557 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -3,16 +3,15 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
-pkgver=2.2.34
-_pkgvermajor=2.2
-pkgrel=3
-_pigeonholever=0.4.21
-_pluginextdataver=39
+pkgver=2.3.1
+_pkgvermajor=2.3
+pkgrel=0
+_pigeonholever=0.5.1
 _pigeonholevermajor=${_pigeonholever%.*}
 pkgdesc="IMAP and POP3 server"
-url="http://www.dovecot.org/"
+url="https://www.dovecot.org/"
 arch="all"
-options="!check"
+options="libtool"
 license="LGPL-2.0-or-later"
 depends="libressl"
 pkgusers="dovecot dovenull"
@@ -21,26 +20,21 @@ makedepends="libcap-dev zlib-dev libressl-dev bzip2-dev postgresql-dev
 	mariadb-connector-c-dev sqlite-dev heimdal-dev openldap-dev linux-headers autoconf
 	automake libtool expat-dev clucene-dev"
 install="dovecot.pre-install dovecot.post-install"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-pigeonhole-plugin-extdata:_sieve_extdata
+subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc
 	$pkgname-pigeonhole-plugin-ldap:_sieve_ldap $pkgname-pigeonhole-plugin:_sieve $pkgname-sql
 	$pkgname-pgsql $pkgname-mysql $pkgname-sqlite $pkgname-gssapi $pkgname-ldap
 	$pkgname-fts-solr:_fts_solr $pkgname-fts-lucene:_fts_lucene
 	"
-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
+source="https://www.dovecot.org/releases/$_pkgvermajor/$pkgname-$pkgver.tar.gz
+	https://pigeonhole.dovecot.org/releases/$_pkgvermajor/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever.tar.gz
 	skip-iconv-check.patch
 	dovecot.logrotate
 	dovecot.initd
-	extdata.conf
 	"
-options="libtool"
-builddir="$srcdir/$pkgname-$pkgver"
 _builddirpigeonhole="$srcdir/$pkgname-${_pkgvermajor}-pigeonhole-$_pigeonholever"
-_builddirpluginextdata="$srcdir/pigeonhole-${_pigeonholevermajor/./-}-sieve-extdata-$_pluginextdataver"
 
 # secfixes:
-#   2.2.34-r0:
+#   2.3.1-r0:
 #     - CVE-2017-15130
 #     - CVE-2017-14461
 #     - CVE-2017-15132
@@ -80,14 +74,6 @@ build() {
 		--with-dovecot="$builddir" \
 		--with-ldap=plugin
 	make
-
-	# Build the extdata plugin
-	cd "$_builddirpluginextdata"
-	./autogen.sh
-	_configure \
-		--with-dovecot="$builddir" \
-		--with-pigeonhole="$_builddirpigeonhole"
-	make
 }
 
 check() {
@@ -95,7 +81,6 @@ check() {
 	make check
 }
 
-
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
@@ -128,10 +113,6 @@ package() {
 	cd "$_builddirpigeonhole"
 	make install DESTDIR="$pkgdir"
 
-	# Installing extdata plugin
-	cd "$_builddirpluginextdata"
-	make install DESTDIR="$pkgdir"
-
 	# Moving config in the correct place
 	mv "$pkgdir"/usr/share/doc/dovecot/example-config/conf.d/* \
 		"$pkgdir"/etc/dovecot/conf.d
@@ -172,14 +153,6 @@ _sieve_ldap() {
 	mkdir -p "$subpkgdir"
 }
 
-_sieve_extdata() {
-	pkgdesc="Pigeonhole Sieve Extdata Plugin"
-	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() {
 	pkgdesc="postgresql driver for dovecot"
 	depends="$pkgname-sql"
@@ -229,10 +202,9 @@ _fts_lucene() {
 	depends="$pkgname"
 	_mv $(cd "$pkgdir" && find usr -name '*fts*lucene*')
 }
-sha512sums="9f08a7116a08a08495aa0e7b4cb6b11a924ea61006970487946e338bc79bba7fd7619c345cbf278a74de285d548af04fc66eaaee508185b8b9d7335cf5612055  dovecot-2.2.34.tar.gz
-4751f449ede1b05173c706b414ebf9f7f670ff78589ce6f0b687c32c9abe6dae8b3064ed1b20e893d9ec0147b0139ce479e1d74ebe94747c33f2d8ca177912de  dovecot-2.2-pigeonhole-0.4.21.tar.gz
-832a80264fb9bd3021c4e192eb7594c203100783df547aff35acf4dc4d8de5eddfd676fcc5a07a0691d9bb6eb884c9497a692b72a2af5bf9e9bb7a2d3f38923e  39.tar.gz
-09bae967d35b9e5d7d91c81337e1bf5e5aba3abb7b0ab06427f1a0d6f9bb5b2f2e39306cfe45d80488110fc0414e3e2515c0265286c1584d80f8af366d1568a9  skip-iconv-check.patch
+
+sha512sums="fe664ab771145f2390fef45839ff2756e36731c61e571dfa6975014f9cea43144e2aca0acf1a83b1dac55ad50042d0fa170b83570aa411228557861ada410b79  dovecot-2.3.1.tar.gz
+5d65c3c9f3131c4e82287d054bd8b963d7c56c3e0677d7384881cf109ca82080d6222f672d8f973447d98be823a4df5bf43760d4ba87b76447d13abab30130c4  dovecot-2.3-pigeonhole-0.5.1.tar.gz
+fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a  skip-iconv-check.patch
 9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0  dovecot.logrotate
-d2758a22e5b3d1d1be867fd237466a1b5fe7ecd4355fdc51fa9e5ceab48a862f8a5d83992d2ae17a3e0b2c611ff92d0de833d7e1c5f00c6f4bfb94403dbda8e4  dovecot.initd
-7aa66cbd2a520d863fc8ff2ec48520c6fe4629ec345545b362e16c3072843f5315c6e12513ed86200d66b7c55e17f5bb21c7a12d86721968a9e03cc595dc5bcd  extdata.conf"
+d2758a22e5b3d1d1be867fd237466a1b5fe7ecd4355fdc51fa9e5ceab48a862f8a5d83992d2ae17a3e0b2c611ff92d0de833d7e1c5f00c6f4bfb94403dbda8e4  dovecot.initd"
diff --git a/main/dovecot/extdata.conf b/main/dovecot/extdata.conf
deleted file mode 100644
index 0cc7a3a8bc..0000000000
--- a/main/dovecot/extdata.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#plugin {
-#  sieve_plugins = sieve_extdata
-#  sieve_extdata_dict_uri = file:/etc/dovecot/sieve-extdata.dict
-#}
diff --git a/main/dovecot/skip-iconv-check.patch b/main/dovecot/skip-iconv-check.patch
index 0b8ad39bdc..bb1002c844 100644
--- a/main/dovecot/skip-iconv-check.patch
+++ b/main/dovecot/skip-iconv-check.patch
@@ -1,9 +1,7 @@
-diff --git a/src/lib-charset/test-charset.c b/src/lib-charset/test-charset.c
-index 68632e1..36fd092 100644
 --- a/src/lib-charset/test-charset.c
 +++ b/src/lib-charset/test-charset.c
-@@ -159,7 +159,7 @@ int main(void)
- 	static void (*test_functions[])(void) = {
+@@ -159,7 +159,7 @@
+ 	static void (*const test_functions[])(void) = {
  		test_charset_is_utf8,
  		test_charset_utf8,
 -#ifdef HAVE_ICONV