Mail archive
alpine-aports

Re: [alpine-aports] [PATCH] main/dovecot: Bugfix upgrade to 2.2.21

From: Timo Teras <timo.teras_at_iki.fi>
Date: Wed, 23 Dec 2015 08:44:39 +0200

Hi,

On Wed, 23 Dec 2015 00:51:25 +0200
Valery Kartel <valery.kartel_at_gmail.com> wrote:

> It's a re-commit of http://patchwork.alpinelinux.org/patch/1232/
> which is accepted but somehow not applied in git ---

Sorry. I was marking done patches that were applied, but not recognized
as such in patchworks. This may have been accidentally set by me.
Sorry, and thank you for the resubmission.

> main/dovecot/APKBUILD | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
> index 16356b2..693da6e 100644
> --- a/main/dovecot/APKBUILD
> +++ b/main/dovecot/APKBUILD
> _at_@ -3,8 +3,8 @@
> # Contributor: Michael Mason <ms13sp_at_gmail.com>
> # Maintainer: Natanael Copa <ncopa_at_alpinelinux.org>
> pkgname=dovecot
> -pkgver=2.2.20
> -pkgrel=1
> +pkgver=2.2.21
> +pkgrel=0
> pkgdesc="IMAP and POP3 server"
> url="http://www.dovecot.org/"
> arch="all"

Could you please merge this with the follow-up changes you sent as
separate patch? This would not even compile as-is since the checksum
updates are in the next patch.

And regarding those:

On Wed, 23 Dec 2015 00:53:20 +0200
Valery Kartel <valery.kartel_at_gmail.com> wrote:

> ---
> main/dovecot/APKBUILD | 29 +++++++++++++++--------------
> 1 file changed, 15 insertions(+), 14 deletions(-)
>
> diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
> index 693da6e..6da5264 100644
> --- a/main/dovecot/APKBUILD
> +++ b/main/dovecot/APKBUILD
> _at_@ -103,55 +103,56 @@ dev() {
> default_dev
> mv "$pkgdir"/usr/lib/dovecot/dovecot-config \
> "$subpkgdir"/usr/lib/dovecot/
> + _mv $(cd "$pkgdir" && find usr -name *.la)
> }

This sounds ok.

> pgsql() {
> pkgdesc="postgresql driver for dovecot"
> depends="$pkgname-sql"
> - _mv $(cd "$pkgdir" && find usr -name '*_pgsql*')
> + _mv $(cd "$pkgdir" && find usr -name *_pgsql*)
> }

I don't think you can remove the quotation there. They are required to
prevent shell expansion so that 'find' will be able to do the wildcard
matching.

Same applies for all the following hunks.

> mysql() {
> pkgdesc="mysql driver for dovecot"
> depends="$pkgname-sql"
> - _mv $(cd "$pkgdir" && find usr -name '*_mysql*')
> + _mv $(cd "$pkgdir" && find usr -name *_mysql*)
> }
>
> sqlite() {
> pkgdesc="sqlite driver for dovecot"
> depends="$pkgname-sql"
> - _mv $(cd "$pkgdir" && find usr -name '*_sqlite*')
> + _mv $(cd "$pkgdir" && find usr -name *_sqlite*)
> }
>
> gssapi() {
> pkgdesc="GSSAPI auth plugin for dovecot"
> depends="$pkgname"
> - _mv $(cd "$pkgdir" && find usr -name '*_gssapi*')
> + _mv $(cd "$pkgdir" && find usr -name *_gssapi*)
> }
>
> ldap() {
> pkgdesc="LDAP auth plugin for dovecot"
> depends="$pkgname"
> - _mv $(cd "$pkgdir" && find usr -name '*_ldap*')
> - _mv $(cd "$pkgdir" && find etc/dovecot -name '*-ldap.conf*')
> + _mv $(cd "$pkgdir" && find usr -name *_ldap*)
> + _mv $(cd "$pkgdir" && find etc/dovecot -name *-ldap.conf*)
> }
>
> sql() {
> pkgdesc="SQL plugin for dovecot"
> depends="$pkgname"
> - _mv $(cd "$pkgdir" && find usr -name '*-sql.*')
> - _mv $(cd "$pkgdir" && find etc/dovecot -name '*-sql.conf*')
> + _mv $(cd "$pkgdir" && find usr -name *-sql.*)
> + _mv $(cd "$pkgdir" && find etc/dovecot -name *-sql.conf*)
> }


---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Wed Dec 23 2015 - 08:44:39 GMT