X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id A772EDC8214 for ; Wed, 6 Apr 2016 18:55:24 +0000 (UTC) Received: from mx.mauras.ch (mx.mauras.ch [163.172.199.81]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 6A3F6DC02A0 for ; Wed, 6 Apr 2016 18:55:24 +0000 (UTC) Received: from [109.203.48.198] (helo=tiptop.internal) by mx.mauras.ch with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_2) (envelope-from ) id 1ansbq-0005MP-Db for alpine-aports@lists.alpinelinux.org; Wed, 06 Apr 2016 20:55:22 +0200 Date: Wed, 6 Apr 2016 20:55:16 +0200 From: Olivier Mauras To: alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] [PATCH] main/dovecot: Integrate pigeonhole plugin 0.4.13 as a subpackage Message-Id: <20160406205516.0820fe51ecfd84f65232cc8c@mauras.ch> In-Reply-To: References: <20160404025625.10d9cac7f8cb0e308f09041e@mauras.ch> <20160404092538.04145344@vostro.util.wtbts.net> X-Mailer: Sylpheed 3.4.3 (GTK+ 2.24.28; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Wed__6_Apr_2016_20_55_16_+0200_X+c9+DJAagoZARpA" X-Authenticated-Sender: olivier@mauras.ch X-Virus-Scanned: ClamAV using ClamSMTP --Signature=_Wed__6_Apr_2016_20_55_16_+0200_X+c9+DJAagoZARpA Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Sieve support in dovecot requires the pigeonhole plugin. The plugin requires to be rebuilded each time dovecot minor version changes, so having it as a subpackage will make it easier. --- main/dovecot/APKBUILD | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD index 2ba4986..95602a5 100644 --- a/main/dovecot/APKBUILD +++ b/main/dovecot/APKBUILD @@ -4,7 +4,8 @@ # Maintainer: Natanael Copa pkgname=3Ddovecot pkgver=3D2.2.22 -pkgrel=3D0 +pigeonholever=3D0.4.13 +pkgrel=3D1 pkgdesc=3D"IMAP and POP3 server" url=3D"http://www.dovecot.org/" arch=3D"all" @@ -17,9 +18,10 @@ makedepends=3D"libcap-dev zlib-dev openssl-dev bzip2-dev= postgresql-dev install=3D"dovecot.pre-install dovecot.post-install" subpackages=3D"$pkgname-doc $pkgname-dev $pkgname-sql $pkgname-pgsql $pkgname-mysql $pkgname-sqlite - $pkgname-gssapi $pkgname-ldap + $pkgname-gssapi $pkgname-ldap $pkgname-pigeonhole " source=3D"http://www.dovecot.org/releases/${pkgver%.*}/$pkgname-$pkgver.ta= r.gz + http://pigeonhole.dovecot.org/releases/2.2/$pkgname-2.2-pigeonhole-$pigeo= nholever.tar.gz hide-dl-errors.patch dovecot.logrotate dovecot.initd @@ -27,6 +29,7 @@ source=3D"http://www.dovecot.org/releases/${pkgver%.*}/$p= kgname-$pkgver.tar.gz options=3D"libtool" =20 _builddir=3D"$srcdir"/$pkgname-$pkgver +_builddirpigeonhole=3D"$srcdir"/$pkgname-2.2-pigeonhole-$pigeonholever =20 prepare() { cd "$_builddir" @@ -58,6 +61,21 @@ build() { --with-rundir=3D/run/dovecot \ || return 1 make || return 1 + + # Build pigeonhole plugin + cd "$_builddirpigeonhole" + ./configure \ + --build=3D$CBUILD \ + --host=3D$CHOST \ + --prefix=3D/usr \ + --localstatedir=3D/var \ + --sysconfdir=3D/etc \ + --mandir=3D/usr/share/man \ + --infodir=3D/usr/share/info \ + --with-dovecot=3D"$_builddir" \ + --disable-static \ + || return 1 + make || return 1 } =20 package() { @@ -86,6 +104,15 @@ package() { 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 + + + # Installing pigeonhole plugin + cd "$_builddirpigeonhole" + make install DESTDIR=3D"$pkgdir" || return 1 + + # Moving config in the correct place + mv "$pkgdir"/usr/share/doc/dovecot/example-config/conf.d/* \ + "$pkgdir"/etc/dovecot/conf.d || return 1 } =20 _mv() { @@ -105,6 +132,14 @@ dev() { "$subpkgdir"/usr/lib/dovecot/ } =20 +pigeonhole() { + pkgdesc=3D"Sieve plugin for dovecot" + depends=3D"$pkgname" + _mv $(cd "$pkgdir" && find usr -name '*sieve*') + _mv $(cd "$pkgdir" && find usr -name '*pigeonhole*') + _mv $(cd "$pkgdir" && find etc/dovecot -name '*sieve*') +} + pgsql() { pkgdesc=3D"postgresql driver for dovecot" depends=3D"$pkgname-sql" @@ -144,14 +179,17 @@ sql() { } =20 md5sums=3D"bc8057bd5bdfa0f8e80e2fef1082a241 dovecot-2.2.22.tar.gz +5009b133096724aa2cb7fe1056d88125 dovecot-2.2-pigeonhole-0.4.13.tar.gz 49f7a03284cc657857fe2ae22b8c82a0 hide-dl-errors.patch 1a88280b65efb6cb7f70bc5a88bf264c dovecot.logrotate ddd77573827e0662be21303fb795eef3 dovecot.initd" sha256sums=3D"c7a9db3c4ae9d9b4da920d2c82669700a0d407934501b405f37f89cc0b70= 6ec7 dovecot-2.2.22.tar.gz +7fd187b8393a5048b302f90ad84adc7bf6e73bf79fd8d22a1c1aaa71f836a910 dovecot-= 2.2-pigeonhole-0.4.13.tar.gz d6accdd6e271647c01ab8fa0a9491ee822486484961e2d5c252bf70e816d2bfa hide-dl-= errors.patch 2ac04bb7b5c503cd87ba044482e651dbe5c9d84a4268891fb2aa9ba26e62f833 dovecot.= logrotate 3f74548051297cedc7f8d203f1d1d9dc904fe89004b54b52921d2050520daa6f dovecot.= initd" sha512sums=3D"ea02ae491e90c0b9de7c7320901c8f7235193303fb194805564582d30e63= 0002f21f7195e5c5b99ff3ea1fadf95ddd43c2f7bb4d24067e0e5f40a66e9eb90012 dovec= ot-2.2.22.tar.gz +4e25a406b888fd8cbc9a4f4f7a7364f10ab47e932550970cede34c964d50a6fe697c4b6d61= cc83846b97901368ac63d1e22aa4d1d2002f24540766c5fbbebbf5 dovecot-2.2-pigeonh= ole-0.4.13.tar.gz 1e9a1f2990019236546c7be581a4d6d0b430110d27a00bc3298f5c154ef9a4aadefa193d02= a017912f826d771058fd5c6ef6cb454e14f0d15749fa8f3a68c64a hide-dl-errors.patch 58756fa06a063777ef7c4d1e67b63adbde5462264e14bd7a3187a318f498fff21ac2a8d53b= b216f56fef4588206e14112da79542b6dfdf503988786f27bb6544 dovecot.logrotate d7f67991e11979da91162eb64a0b924655d0ac155d97bcc42a40c758003d60b7c096945544= e6b321aa8ecb3416fe17b14b5898f1dba5e5a4b3e4c9c21295c8cb dovecot.initd" --=20 2.7.4 Here's the patch including requested modifications. --Signature=_Wed__6_Apr_2016_20_55_16_+0200_X+c9+DJAagoZARpA Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXBVuUAAoJEJXQwVHPrdN8MsYQALAfXTSN5Q8VWndqQbOhvm5X 1Hq0vtSUhXlk4kNsIxU/cqzgniYfuwyhIGs6Do+szJHSeeOi+QSuJsi/L8pEKUWg 1tQzvJU022Y3L4QmXX9bALyfNwoNnyY+bTO+N6fXQbx8BIXPL+MeNKMCik4neV9D WnBbiYIcnWZMlcWkCIy6X57ImLtR1aClWV9o+pTkcfCTDKJeLSdqbStrtrYwjiiB 9rLpd/2ZHW6vmDUsd08O+S+yC34FPQuYcMMHOTDlFVfxjbKhcOGSMLSjCnG1eb36 igeCc503c53iME+CXJv08giHW1wp8SiUBYc2Spctl+SrX6UHEcQkzxFBp47mM/H8 +PWT/cU+GCC1PpcmhX9zKgTLaI04k79BsJrggxkAZF49qR/MnSrua1AF3l86zzAF 3Nowmt7YaF2yPKy1dP/Yg+eXQAXm1WvjqGslAu9RrkzDlcPG3zIPu9nhbFGgDxk7 KZ//s5UD8Na7s6KJNI03Izb006XHvfQYtGWuuYlTqPS/Y0x84EA1nkmMQsnyX3dy cah6rL7n/BMWdDq1pzzGnZdusFSVB57Kbd88ZWKosDxYbPQ/GUHvpC2BAfBiwk/P XEMoayvUraALcnmFjrT9NY/6jpDahSzVbZSa/0OWEIPpe1KMw7TvmT/qGObOzfZQ o6XUp8cT5Sb4ncdFw0Zc =+4lG -----END PGP SIGNATURE----- --Signature=_Wed__6_Apr_2016_20_55_16_+0200_X+c9+DJAagoZARpA-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---