Dovecot 2.2.26 was actually released as 2.2.26.0 after some
critical issues were fixed in the initial release. After some
discussion about how the numbering scheme should be handled, a
temporary fix was introduced and remaining hardcoded version
numbers removed.
---
main/dovecot/APKBUILD | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 0e571b1..1579edf 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -3,9 +3,10 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dovecot
-pkgver=2.2.25
-pkgrel=2
-_pigeonholever=0.4.14
+pkgver=2.2.26.0
+pkgrel=1
+_majorpkgver=${pkgver%.*.*}
+_pigeonholever=0.4.15
pkgdesc="IMAP and POP3 server"
url="http://www.dovecot.org/"
arch="all"
@@ -20,8 +21,8 @@ subpackages="$pkgname-doc $pkgname-dev
$pkgname-sql $pkgname-pgsql $pkgname-mysql $pkgname-sqlite
$pkgname-gssapi $pkgname-ldap $pkgname-pigeonhole-plugin:_pigeonhole
"
-source="http://www.dovecot.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.gz
- http://pigeonhole.dovecot.org/releases/2.2/$pkgname-2.2-pigeonhole-$_pigeonholever.tar.gz
+source="http://www.dovecot.org/releases/$_majorpkgver/$pkgname-$pkgver.tar.gz
+ http://pigeonhole.dovecot.org/releases/$_majorpkgver/$pkgname-$_majorpkgver-pigeonhole-$_pigeonholever.tar.gz
hide-dl-errors.patch
dovecot.logrotate
dovecot.initd
@@ -29,7 +30,7 @@ source="http://www.dovecot.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.gz
options="libtool"
builddir="$srcdir"/$pkgname-$pkgver
-_builddirpigeonhole="$srcdir"/$pkgname-2.2-pigeonhole-$_pigeonholever
+_builddirpigeonhole="$srcdir"/$pkgname-$_majorpkgver-pigeonhole-$_pigeonholever
prepare() {
cd "$builddir"
@@ -177,19 +178,18 @@ sql() {
_mv $(cd "$pkgdir" && find usr -name '*-sql.*')
_mv $(cd "$pkgdir" && find etc/dovecot -name '*-sql.conf*')
}
-
-md5sums="8f62ea76489c47c369cbbe0b19818448 dovecot-2.2.25.tar.gz
-27e47fb731f2948d6905b12b6184705f dovecot-2.2-pigeonhole-0.4.14.tar.gz
+md5sums="85bc42328de41d1eb8d6d3f1db666db8 dovecot-2.2.26.0.tar.gz
+85ad06e630aaeefe389b683dcf4544d8 dovecot-2.2-pigeonhole-0.4.15.tar.gz
49f7a03284cc657857fe2ae22b8c82a0 hide-dl-errors.patch
df6d43508a82903a97e3a2a5b8436d3d dovecot.logrotate
f0c227ab4e2593f6d410440b82103de1 dovecot.initd"
-sha256sums="d8d9f32c846397f7c22749a84c5cf6f59c55ff7ded3dc9f07749a255182f9667 dovecot-2.2.25.tar.gz
-dff30a636c1516158f3e159c669a254569c9dabaa6ecfa3669379101ea5b3300 dovecot-2.2-pigeonhole-0.4.14.tar.gz
+sha256sums="f692a1f39de36cd15f6681f7fee5fba2ef3e72b529acbee02b23422e16926f05 dovecot-2.2.26.0.tar.gz
+c99ace6ead310c6c3b639922da618f90d846307da4fe252d994e5e51bf8a3de3 dovecot-2.2-pigeonhole-0.4.15.tar.gz
d6accdd6e271647c01ab8fa0a9491ee822486484961e2d5c252bf70e816d2bfa hide-dl-errors.patch
d0fef8cd8200549877d7594cf458d6b33f05b31f95f1fd9a8368e8471c082735 dovecot.logrotate
1a3c845c216bb6f9633d27a8c1c0d01b591942c463bddb5ae835f162bd7fb4bf dovecot.initd"
-sha512sums="b38d815a727723dbeccf844be4bf05509fc4808ac1a25ba482da7ca25f30c5c57107b6064791326b39aa80bd45b61043266b451ee33ece3521bdbffca57fdecf dovecot-2.2.25.tar.gz
-97e72a3046a5975d416e49a900a9d801224c6de944aea4fd80b0e9c571af68d4e11c4a152ab6048abd9867a31eb4d8e3e648165489fb4a2b57a9a2929760247e dovecot-2.2-pigeonhole-0.4.14.tar.gz
+sha512sums="7b4c170efd964eabbd9a0166164e53b7964b90fc245bab1c3328bf199c4880288c89811dcfd9833f899057921eefb4451c561f3b3d725df9ea346df8fde82a3d dovecot-2.2.26.0.tar.gz
+bd590a95029801251ff3c76b38b6ddfc25446b82937217dc4ea421075c7b651ae0356b088403d5ad9bb87bc86817d727faccaf4e2500bfd46a242d331fc252f5 dovecot-2.2-pigeonhole-0.4.15.tar.gz
1e9a1f2990019236546c7be581a4d6d0b430110d27a00bc3298f5c154ef9a4aadefa193d02a017912f826d771058fd5c6ef6cb454e14f0d15749fa8f3a68c64a hide-dl-errors.patch
9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0 dovecot.logrotate
6ec75a8396f4d826390e69aa8177593573eaf0e0ab537b2a4720573e04c92ff615f39e1559b48313b2cd2f03704cd977bb594a568ecc5dd22e38926c12f3c48c dovecot.initd"
--
2.10.1
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---
On Sun, 30 Oct 2016 13:23:53 +0100
Pierre Jaury <pierre@jaury.eu> wrote:
> diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
> index 0e571b1..1579edf 100644
> --- a/main/dovecot/APKBUILD
> +++ b/main/dovecot/APKBUILD
> @@ -3,9 +3,10 @@
> # Contributor: Michael Mason <ms13sp@gmail.com>
> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
> pkgname=dovecot
> -pkgver=2.2.25
> -pkgrel=2
> -_pigeonholever=0.4.14
> +pkgver=2.2.26.0
> +pkgrel=1
pkgrel is reset to 0.
I also flattened the follow up commit to this one (which would need a
pkgrel increase if it was kept separate).
Applied the two as one with the above change.
Thanks!
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---