Sender: =?UTF-8?Q?Timo_Ter=C3=A4s?= <timo.teras@gmail.com>
Date: Mon, 4 Apr 2016 09:25:38 +0300
From: Timo Teras <timo.teras@iki.fi>
To: Olivier Mauras <olivier@mauras.ch>
Cc: alpine-aports@lists.alpinelinux.org
Subject: Re: [alpine-aports] [PATCH] main/dovecot: Integrate pigeonhole
 plugin 0.4.13 as a subpackage
Message-ID: <20160404092538.04145344@vostro.util.wtbts.net>
In-Reply-To: <20160404025625.10d9cac7f8cb0e308f09041e@mauras.ch>
References: <20160404025625.10d9cac7f8cb0e308f09041e@mauras.ch>
Precedence: list
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/DQWAGwkPN=pwEHanG=Lr7l_"; protocol="application/pgp-signature"

--Sig_/DQWAGwkPN=pwEHanG=Lr7l_
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

On Mon, 4 Apr 2016 02:56:25 +0200
Olivier Mauras <olivier@mauras.ch> wrote:

> 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 | 50
> ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48
> insertions(+), 2 deletions(-)
>=20
> diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
> index 2ba4986..c6c0392 100644
> --- a/main/dovecot/APKBUILD
> +++ b/main/dovecot/APKBUILD
> @@ -4,7 +4,8 @@
>  # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
>  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.=
tar.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%.*}/$pkgname-$pkgver.t=
ar.gz
> options=3D"libtool"=20
>  _builddir=3D"$srcdir"/$pkgname-$pkgver
> +_builddirpigeonhole=3D"$srcdir"/$pkgname-2.2-pigeonhole-$pigeonholever
> =20
>  prepare() {
>  	cd "$_builddir"
> @@ -105,6 +108,46 @@ dev() {
>  		"$subpkgdir"/usr/lib/dovecot/
>  }
> =20
> +pigeonhole() {
> +	pkgdesc=3D"Sieve plugin for dovecot"
> +	depends=3D"$pkgname"
> +
> +	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

The build stage should go to build().

> +	make install DESTDIR=3D"$pkgdir" || return 1

And this to package().

One reason for these is that some functions are run under fakeroot and
some not. And that then the automatic split for -doc works (see below).
And it also helps developers if they are running these stages
individually.

Otherwise it looks good to me. I'd also like to hear if dovecot
maintainer has any comments on doing this?

> +
> +	# Moving stuff before running _mv
> +	mv "$pkgdir"/usr/share/doc/dovecot/example-config/conf.d/* \
> +		"$pkgdir"/etc/dovecot/conf.d \
> +	|| return 1
> +
> +	# We keep includes, man and doc in main package
> +	_mv $(cd "$pkgdir" && find usr -name '*sieve*' -prune \
> +		-a -not -regex ".*/include/.*" \
> +		-a -not -regex ".*/man/.*" \
> +		-a -not -regex ".*/doc/.*" \
> +		) || return 1
> +	_mv $(cd "$pkgdir" && find usr -name '*pigeonhole*' \
> +		-a -not -regex ".*/include/.*" \
> +		-a -not -regex ".*/man/.*" \
> +		) || return 1
> +	_mv $(cd "$pkgdir" && find etc/dovecot -name '*sieve*') ||
> return 1 +
> +	# Compress man pages
> +	find "$pkgdir"/usr/share/man/ -name "*.1" -o -name "*.7" |
> xargs gzip -9 +}
> +

The man pages should go to -doc. Then they are also compressed
manually. Another reason to use build() and package() correctly.

>  pgsql() {
>  	pkgdesc=3D"postgresql driver for dovecot"
>  	depends=3D"$pkgname-sql"
> @@ -144,14 +187,17 @@ sql() {
>  }

--Sig_/DQWAGwkPN=pwEHanG=Lr7l_
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAEBCAAGBQJXAgjiAAoJEEZwDoxij6HO0KgH/jUbC8FcXxu8eQVKgnNxLOm1
c9r+BU29BOjcRFbd+9cCSYKMbxjwSxTPB74ZQoPZ7ziXwv7Yq4kHLOvOkbFHisLO
ZvAjzk9WrL3VAbSJ/L+BLVPJlU9fxsihbYYzBQ1VXrkmBHxACt+U7V/nUFDF1U1J
Kpm4RGoVMX6hNPKmhco/I/jvmpBZDQokSBg+Ey5FN1N5kwAPOcC9Z0HCovCnT0D0
Yh2xyFzVG58wRkEG/MFSDalZTdS5z7LcmijEgYguySCPOXhLvChHfYAFFxcbLzSG
ZC9hW1cforv8nu9/3/WF8H5Ldo3dmqSocXntwbMd04BG/gS8Ey/99NHMluML6H0=
=MBqQ
-----END PGP SIGNATURE-----

--Sig_/DQWAGwkPN=pwEHanG=Lr7l_--


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---