~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
4 2

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

Details
Message ID
<1450824685-24620-1-git-send-email-valery.kartel@gmail.com>
Sender timestamp
1450824685
DKIM signature
missing
Download raw message
Patch: +2 -2
It's a re-commit of http://patchwork.alpinelinux.org/patch/1232/ which is accepted but somehow not applied in git
---
 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 <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@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"
-- 
2.6.4



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Timo Teras <timo.teras@iki.fi>
Details
Message ID
<20151223084439.31553c35@vostro>
In-Reply-To
<1450824685-24620-1-git-send-email-valery.kartel@gmail.com> (view parent)
Sender timestamp
1450853079
DKIM signature
missing
Download raw message
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.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 <ms13sp@gmail.com>
>  # Maintainer: Natanael Copa <ncopa@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@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
> @@ -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@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Details
Message ID
<CAKTwcDP_-y2OcQgdpJ=bGEvFnAV+NnYHujhC2FqPBjcc6NJ+rA@mail.gmail.com>
In-Reply-To
<20151223084439.31553c35@vostro> (view parent)
Sender timestamp
1450875286
DKIM signature
missing
Download raw message
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 <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.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 <ms13sp@gmail.com>
> >  # Maintainer: Natanael Copa <ncopa@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@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
> > @@ -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*)
> >  }
>
Timo Teras <timo.teras@iki.fi>
Details
Message ID
<20151223145946.31be30d8@vostro>
In-Reply-To
<CAKTwcDP_-y2OcQgdpJ=bGEvFnAV+NnYHujhC2FqPBjcc6NJ+rA@mail.gmail.com> (view parent)
Sender timestamp
1450875586
DKIM signature
missing
Download raw message
On Wed, 23 Dec 2015 14:54:46 +0200
Valery Kartel <valery.kartel@gmail.com> wrote:

> 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).

It is pure luck then. It is shell executing that line. And if there's a
file / directory matching the *foo* pattern, the shell would expand the
wildcards. The quotation is needed to make sure shell does not do
wildcard expansion.

/Timo



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Details
Message ID
<CAKTwcDNBc-nhyXsQMhSpq27bWwikRAbGDrPKP4tDTDFb0uND5A@mail.gmail.com>
In-Reply-To
<20151223145946.31be30d8@vostro> (view parent)
Sender timestamp
1450876387
DKIM signature
missing
Download raw message
Ok. In merged commit I leave quotation in place.

2015-12-23 14:59 GMT+02:00 Timo Teras <timo.teras@iki.fi>:

> On Wed, 23 Dec 2015 14:54:46 +0200
> Valery Kartel <valery.kartel@gmail.com> wrote:
>
> > 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).
>
> It is pure luck then. It is shell executing that line. And if there's a
> file / directory matching the *foo* pattern, the shell would expand the
> wildcards. The quotation is needed to make sure shell does not do
> wildcard expansion.
>
> /Timo
>
>
Reply to thread Export thread (mbox)