mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-05 20:36:40 +02:00
main/dovecot: upgrade to 2.2.29.1 and pigeonhole plugin to 0.4.18
Remove fixed-upstream LibreSSL patch for dovecot as it was fixed upstream in commit dovecot/core#b91659702c83b8f144e369ad5fa82724242c210c
This commit is contained in:
Ash Berlin
Jakub Jirutka
parent
2da9ba6b71
commit
1c789a9336
@ -3,11 +3,11 @@
|
||||
# Contributor: Michael Mason <ms13sp@gmail.com>
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=dovecot
|
||||
pkgver=2.2.27
|
||||
pkgrel=2
|
||||
_pigeonholever=0.4.16
|
||||
pkgver=2.2.29.1
|
||||
_pkgvermajor=2.2
|
||||
pkgrel=0
|
||||
_pigeonholever=0.4.18
|
||||
_pluginextdataver=39
|
||||
_pkgvermajor=${pkgver%.*}
|
||||
_pigeonholevermajor=${_pigeonholever%.*}
|
||||
pkgdesc="IMAP and POP3 server"
|
||||
url="http://www.dovecot.org/"
|
||||
@ -31,12 +31,11 @@ source="http://www.dovecot.org/releases/$_pkgvermajor/$pkgname-$pkgver.tar.gz
|
||||
dovecot.logrotate
|
||||
dovecot.initd
|
||||
extdata.conf
|
||||
libressl.patch
|
||||
"
|
||||
options="libtool"
|
||||
builddir="$srcdir"/$pkgname-$pkgver
|
||||
_builddirpigeonhole="$srcdir"/$pkgname-${_pkgvermajor}-pigeonhole-$_pigeonholever
|
||||
_builddirpluginextdata="$srcdir"/pigeonhole-${_pigeonholevermajor/./-}-sieve-extdata-$_pluginextdataver
|
||||
builddir="$srcdir/$pkgname-$pkgver"
|
||||
_builddirpigeonhole="$srcdir/$pkgname-${_pkgvermajor}-pigeonhole-$_pigeonholever"
|
||||
_builddirpluginextdata="$srcdir/pigeonhole-${_pigeonholevermajor/./-}-sieve-extdata-$_pluginextdataver"
|
||||
|
||||
build() {
|
||||
cd "$builddir"
|
||||
@ -56,9 +55,8 @@ build() {
|
||||
--with-pgsql \
|
||||
--with-ssl=openssl \
|
||||
--with-ssldir=/etc/ssl/dovecot \
|
||||
--with-rundir=/run/dovecot \
|
||||
|| return 1
|
||||
make || return 1
|
||||
--with-rundir=/run/dovecot
|
||||
make
|
||||
|
||||
# Build pigeonhole plugin
|
||||
cd "$_builddirpigeonhole"
|
||||
@ -71,13 +69,12 @@ build() {
|
||||
--mandir=/usr/share/man \
|
||||
--infodir=/usr/share/info \
|
||||
--with-dovecot="$builddir" \
|
||||
--disable-static \
|
||||
|| return 1
|
||||
make || return 1
|
||||
--disable-static
|
||||
make
|
||||
|
||||
# Build the extdata plugin
|
||||
cd "$_builddirpluginextdata"
|
||||
./autogen.sh || return 1
|
||||
./autogen.sh
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--localstatedir=/var \
|
||||
@ -85,14 +82,13 @@ build() {
|
||||
--mandir=/usr/share/man \
|
||||
--infodir=/usr/share/info \
|
||||
--with-dovecot="$builddir" \
|
||||
--with-pigeonhole="$_builddirpigeonhole" \
|
||||
|| return 1
|
||||
make || return 1
|
||||
--with-pigeonhole="$_builddirpigeonhole"
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$builddir"
|
||||
make DESTDIR="$pkgdir" install || return 1
|
||||
make DESTDIR="$pkgdir" install
|
||||
|
||||
install -d "$pkgdir"/etc/ssl/dovecot
|
||||
install -Dm755 "$srcdir"/dovecot.initd "$pkgdir"/etc/init.d/dovecot
|
||||
@ -104,31 +100,31 @@ package() {
|
||||
mv "$pkgdir"/usr/share/doc/dovecot/dovecot-openssl.cnf "$pkgdir"/etc/dovecot/
|
||||
mv "$pkgdir"/usr/share/doc/dovecot/example-config/dovecot* \
|
||||
"$pkgdir"/usr/share/doc/dovecot/example-config/conf.d \
|
||||
"$pkgdir"/etc/dovecot/ || return 1
|
||||
"$pkgdir"/etc/dovecot/
|
||||
rm -fr "$pkgdir"/usr/share/doc/dovecot/example-config
|
||||
|
||||
# fix ssl dirs in default config
|
||||
sed -i -e 's,^ssl_cert =.*,ssl_cert = </etc/ssl/dovecot/server.pem,' \
|
||||
-e 's,^ssl_key =.*,ssl_key = </etc/ssl/dovecot/server.key,' \
|
||||
"$pkgdir"/etc/dovecot/conf.d/10-ssl.conf || return 1
|
||||
"$pkgdir"/etc/dovecot/conf.d/10-ssl.conf
|
||||
# set default passdb to passwd and create appropriate 'users' file
|
||||
install -m 640 -o dovecot -g mail /dev/null "$pkgdir"/etc/dovecot/users
|
||||
sed -i -e 's,!include auth-system.conf.ext,!include auth-passwdfile.conf.ext,' \
|
||||
-e 's,#!include auth-passwdfile.conf.ext,#!include auth-system.conf.ext,' \
|
||||
"$pkgdir"/etc/dovecot/conf.d/10-auth.conf || return 1
|
||||
"$pkgdir"/etc/dovecot/conf.d/10-auth.conf
|
||||
|
||||
|
||||
# Installing pigeonhole plugin
|
||||
cd "$_builddirpigeonhole"
|
||||
make install DESTDIR="$pkgdir" || return 1
|
||||
make install DESTDIR="$pkgdir"
|
||||
|
||||
# Installing extdata plugin
|
||||
cd "$_builddirpluginextdata"
|
||||
make install DESTDIR="$pkgdir" || return 1
|
||||
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 || return 1
|
||||
"$pkgdir"/etc/dovecot/conf.d
|
||||
}
|
||||
|
||||
_mv() {
|
||||
@ -202,24 +198,10 @@ sql() {
|
||||
_mv $(cd "$pkgdir" && find usr -name '*-sql.*')
|
||||
_mv $(cd "$pkgdir" && find etc/dovecot -name '*-sql.conf*')
|
||||
}
|
||||
md5sums="20133518f5bc0e64dd07ce55b83df2fb dovecot-2.2.27.tar.gz
|
||||
e03eed707b39cffc4b2a82867de45d9c dovecot-2.2-pigeonhole-0.4.16.tar.gz
|
||||
5d26d326856d00ce04c620b549d58f79 39.tar.gz
|
||||
df6d43508a82903a97e3a2a5b8436d3d dovecot.logrotate
|
||||
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
|
||||
d0fef8cd8200549877d7594cf458d6b33f05b31f95f1fd9a8368e8471c082735 dovecot.logrotate
|
||||
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
|
||||
|
||||
sha512sums="1e5ea6080ebe7dd4afe6fcfe8e98ed6d2ad2735655a18cc96e439dd044ccc3a1a6a80428bc746b4d6250820895d6a62121562e97e4b46c8b1cf88a19443bc111 dovecot-2.2.29.1.tar.gz
|
||||
6f49a6a6435b0e4dcbe29f852ce17c016df2f367f5460301a2a2c6bd5f5ba6260b23bfe1c5e78b91c6041554ee67d1ce14ad3adf219505f692c61681d9e70cc4 dovecot-2.2-pigeonhole-0.4.18.tar.gz
|
||||
832a80264fb9bd3021c4e192eb7594c203100783df547aff35acf4dc4d8de5eddfd676fcc5a07a0691d9bb6eb884c9497a692b72a2af5bf9e9bb7a2d3f38923e 39.tar.gz
|
||||
9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0 dovecot.logrotate
|
||||
6ec75a8396f4d826390e69aa8177593573eaf0e0ab537b2a4720573e04c92ff615f39e1559b48313b2cd2f03704cd977bb594a568ecc5dd22e38926c12f3c48c dovecot.initd
|
||||
7aa66cbd2a520d863fc8ff2ec48520c6fe4629ec345545b362e16c3072843f5315c6e12513ed86200d66b7c55e17f5bb21c7a12d86721968a9e03cc595dc5bcd extdata.conf
|
||||
c58abae05c69fa01f2547c4a10e1b49a8b04f7311b7f0397eb2be9bd574d711f6a75203c3764b67205fe4000dd018c2e7dfe4a23399e3d8a3e7b2f201b7c745e libressl.patch"
|
||||
7aa66cbd2a520d863fc8ff2ec48520c6fe4629ec345545b362e16c3072843f5315c6e12513ed86200d66b7c55e17f5bb21c7a12d86721968a9e03cc595dc5bcd extdata.conf"
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- 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;
|
||||
Loading…
x
Reference in New Issue
Block a user