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 E3881DCBEB2 for ; Wed, 23 Dec 2015 12:54:48 +0000 (UTC) Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 649B7DC12FE for ; Wed, 23 Dec 2015 12:54:47 +0000 (UTC) Received: by mail-wm0-f47.google.com with SMTP id p187so147560701wmp.0 for ; Wed, 23 Dec 2015 04:54:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=N4t2u1Vg37/egqq/hsnx53o74Cu/RvNBzaFAB/13uSo=; b=Wgz/2GFZuCfP7RamLFN10b9XAGAYSRqc/H1Aaq5rn0E4YZfv5EUq/7OKs+F2Slimx0 jFmScaM52bOzKhQRgSsY1NYzWJlywasupFG131c+QdPLXK/DIsa3d3fZU+ViBQPf/pu6 8X+CWF9iPxqceO+KMa+ASGU5cM0/cR7KhRrgAiv5rTnyZacUNjUjH+kT1t+M0Di/UWzG pNfBNnvuCU0e4IXSVAKsi8mPeDo4x8aKqC5EJlDn7J9ZEEdkiql4H5H4vAigL88lE5ll IW4L7e3Ik222GReyCaIal8Td3fYzAwh3G3ps2kSEZr/HbjgX3Lige6Yb7tCdNNTcEjAf GUvg== X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 X-Received: by 10.28.98.133 with SMTP id w127mr4644308wmb.4.1450875286479; Wed, 23 Dec 2015 04:54:46 -0800 (PST) Received: by 10.28.90.132 with HTTP; Wed, 23 Dec 2015 04:54:46 -0800 (PST) In-Reply-To: <20151223084439.31553c35@vostro> References: <1450824685-24620-1-git-send-email-valery.kartel@gmail.com> <20151223084439.31553c35@vostro> Date: Wed, 23 Dec 2015 14:54:46 +0200 Message-ID: Subject: Re: [alpine-aports] [PATCH] main/dovecot: Bugfix upgrade to 2.2.21 From: Valery Kartel To: Timo Teras Cc: alpine-aports@lists.alpinelinux.org Content-Type: multipart/alternative; boundary=001a1148d852106bba0527903a0b X-Virus-Scanned: ClamAV using ClamSMTP --001a1148d852106bba0527903a0b Content-Type: text/plain; charset=UTF-8 Yeah, I forgot about checksums :) I'll put all 3 commits together and will resend it. > - _mv $(cd "$pkgdir" && find usr -name '*_mysql*') > + _mv $(cd "$pkgdir" && find usr -name *_mysql*) > I don't think you can remove the quotation there.... I think the quotation have no sence because search templates have no spaces or any other quotation-aware chars (and it really works). 2015-12-23 8:44 GMT+02:00 Timo Teras : > Hi, > > On Wed, 23 Dec 2015 00:51:25 +0200 > Valery Kartel 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 > > @@ -3,8 +3,8 @@ > > # Contributor: Michael Mason > > # Maintainer: Natanael Copa > > 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 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 > > @@ -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*) > > } > --001a1148d852106bba0527903a0b Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Yeah, I forgot about checksums :)
I'll put all= 3 commits together and will resend it.

> -=C2=A0 =C2=A0 =C2=A0_m= v $(cd "$pkgdir" && find usr -name '*_mysql*') > +=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find usr = -name *_mysql*)
> I don't think you can remove the quotation ther= e....

I think the quotation have no sence because search = templates have no spaces or any other quotation-aware chars (and it really = works).

2015-12-23 8:44 GMT+02:00 Timo Teras <timo.teras@iki.fi>:
Hi,

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

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

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

>=C2=A0 main/dovecot/APKBUILD | 4 ++--
>=C2=A0 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
> @@ -3,8 +3,8 @@
>=C2=A0 # Contributor: Michael Mason <ms13sp@gmail.com>
>=C2=A0 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
>=C2=A0 pkgname=3Ddovecot
> -pkgver=3D2.2.20
> -pkgrel=3D1
> +pkgver=3D2.2.21
> +pkgrel=3D0
>=C2=A0 pkgdesc=3D"IMAP and POP3 server"
>=C2=A0 url=3D"http://www.dovecot.org/"
>=C2=A0 arch=3D"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@= gmail.com> wrote:

> ---
>=C2=A0 main/dovecot/APKBUILD | 29 +++++++++++++++--------------
>=C2=A0 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
> @@ -103,55 +103,56 @@ dev() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0default_dev
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mv "$pkgdir"/usr/lib/dovecot/dovec= ot-config \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$subpkgdir= "/usr/lib/dovecot/
> +=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find usr = -name *.la)
>=C2=A0 }

This sounds ok.

>=C2=A0 pgsql() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"postgresql driver for doveco= t"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname-sql"
> -=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find usr = -name '*_pgsql*')
> +=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find usr = -name *_pgsql*)
>=C2=A0 }

I don't think you can remove the quotation there. They are required to<= br> prevent shell expansion so that 'find' will be able to do the wildc= ard
matching.

Same applies for all the following hunks.

>=C2=A0 mysql() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"mysql driver for dovecot&quo= t;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname-sql"
> -=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find usr = -name '*_mysql*')
> +=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find usr = -name *_mysql*)
>=C2=A0 }
>
>=C2=A0 sqlite() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"sqlite driver for dovecot&qu= ot;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname-sql"
> -=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find usr = -name '*_sqlite*')
> +=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find usr = -name *_sqlite*)
>=C2=A0 }
>
>=C2=A0 gssapi() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"GSSAPI auth plugin for dovec= ot"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname"
> -=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find usr = -name '*_gssapi*')
> +=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find usr = -name *_gssapi*)
>=C2=A0 }
>
>=C2=A0 ldap() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"LDAP auth plugin for dovecot= "
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname"
> -=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find usr = -name '*_ldap*')
> -=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find etc/= dovecot -name '*-ldap.conf*')
> +=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find usr = -name *_ldap*)
> +=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find etc/= dovecot -name *-ldap.conf*)
>=C2=A0 }
>
>=C2=A0 sql() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"SQL plugin for dovecot"=
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname"
> -=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find usr = -name '*-sql.*')
> -=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find etc/= dovecot -name '*-sql.conf*')
> +=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find usr = -name *-sql.*)
> +=C2=A0 =C2=A0 =C2=A0_mv $(cd "$pkgdir" && find etc/= dovecot -name *-sql.conf*)
>=C2=A0 }

--001a1148d852106bba0527903a0b-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---