From 7ff6621796459addd8848495e999ecdba3d15e19 Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Sat, 30 Apr 2022 16:25:23 +0000
Subject: user/dovecot: bump { 2.3.14 --> 2.3.18 } (+pigeonhole { 0.5.14 -->
 0.5.18 }). fixes #622.

---
 user/dovecot/APKBUILD     | 16 ++++++++--------
 user/dovecot/time64.patch | 20 --------------------
 2 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 user/dovecot/time64.patch

diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD
index 6f9a8d145..199cd6c2d 100644
--- a/user/dovecot/APKBUILD
+++ b/user/dovecot/APKBUILD
@@ -5,11 +5,13 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Lee Starnes <lee@canned-death.us>
 pkgname=dovecot
-pkgver=2.3.14
-_pkgvermajor=2.3
+pkgver=2.3.18
+case "$pkgver" in
+	*.*.*.*) _pkgvermajor=${pkgver%.*.*};;
+	*.*.*) _pkgvermajor=${pkgver%.*};;
+esac
 pkgrel=0
-_pigeonholever=0.5.14
-_pigeonholevermajor=${_pigeonholever%.*}
+_pigeonholever=0.5.18
 pkgdesc="IMAP and POP3 server"
 url="https://www.dovecot.org/"
 arch="all"
@@ -36,7 +38,6 @@ source="https://www.dovecot.org/releases/$_pkgvermajor/dovecot-$pkgver.tar.gz
 	default-config.patch
 	ssl-paths.patch
 	test-file-cache-enomem.patch
-	time64.patch
 	dovecot.logrotate
 	dovecot.initd
 	"
@@ -258,13 +259,12 @@ _submv() {
 	done
 }
 
-sha512sums="69df234cb739c7ee7ae3acfb9756bc22481e94c95463d32bfac315c7ec4b1ba0dfbff552b769f2ab7ee554087ca2ebbe331aa008d3af26417016612dc7cad103  dovecot-2.3.14.tar.gz
-c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc  dovecot-2.3-pigeonhole-0.5.14.tar.gz
+sha512sums="b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233  dovecot-2.3.18.tar.gz
+44c3d945a5aebb8935e6e46751e44f505f2abd529c31e3efb689d3b5b9cdf9bca4f5231fc42a8d19837cb95c7618f5b64dfdf5964f40a0a6987144a37cdbaaec  dovecot-2.3-pigeonhole-0.5.18.tar.gz
 fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a  skip-iconv-check.patch
 794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5  split-protocols.patch
 0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07  default-config.patch
 5e68a0042a7c11b3d8c411fc157f5960e2e3305dac11f4b6b880441e2b4105769ddf6c56f67a995af6e1a58f3bfa2c199ea51318a3a0e37c7ef0ae6c4109b13f  ssl-paths.patch
 277d0b55583908cd6c063fb190eb3d2a362a3a33306e35a069a0bca28968f11627c455887d82d01884313b7f7e18530c056bd7a4cda0a1f9c4be7065cd033aa9  test-file-cache-enomem.patch
-28e0e3efcb1dd06cd971f1a8caa88989a165dbf14fdebf26ec1ab083020c6831231fec08c2a9d363e6af74003deeeb27122d044eccd02cf7945b464758e04622  time64.patch
 9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0  dovecot.logrotate
 d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70  dovecot.initd"
diff --git a/user/dovecot/time64.patch b/user/dovecot/time64.patch
deleted file mode 100644
index 4cd5c46e1..000000000
--- a/user/dovecot/time64.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- dovecot-2.3.14.orig/src/lib-oauth2/oauth2-jwt.c	2021-03-13 23:56:53.250000000 +0000
-+++ dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c	2021-03-13 23:57:23.640000000 +0000
-@@ -31,7 +31,7 @@
- }
- 
- static int
--get_time_field(const struct json_tree *tree, const char *key, long *value_r)
-+get_time_field(const struct json_tree *tree, const char *key, long long *value_r)
- {
- 	const char *value = get_field(tree, key);
- 	int tz_offset ATTR_UNUSED;
-@@ -313,7 +313,7 @@
- 	int ret;
- 	long t0 = time(NULL);
- 	/* default IAT and NBF to now */
--	long iat, nbf, exp;
-+	long long iat, nbf, exp;
- 	int tz_offset ATTR_UNUSED;
- 
- 	if (sub == NULL) {
-- 
cgit v1.2.3-60-g2f50