diff options
| author | Zach van Rijn <me@zv.io> | 2021-06-29 15:46:51 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2021-06-29 15:46:51 +0000 |
| commit | e4b2e30c9f39c9eb308ec7bdfcb6cb768d545e21 (patch) | |
| tree | fec7f850ebab71fb4e69a4a89815d5df27edf708 /user | |
| parent | ab29b4bbb33a6b29edc871fb06a26a9ee4443b5f (diff) | |
| parent | d56819d2f11c5813287d2de9588bd0e9a96b1ad9 (diff) | |
| download | packages-e4b2e30c9f39c9eb308ec7bdfcb6cb768d545e21.tar.gz packages-e4b2e30c9f39c9eb308ec7bdfcb6cb768d545e21.tar.bz2 packages-e4b2e30c9f39c9eb308ec7bdfcb6cb768d545e21.tar.xz packages-e4b2e30c9f39c9eb308ec7bdfcb6cb768d545e21.zip | |
Merge branch 'user/dovecot/2.3.14' into 'master'
user/dovecot: bump to 2.3.14
See merge request adelie/packages!605
Diffstat (limited to 'user')
| -rw-r--r-- | user/dovecot/APKBUILD | 10 | ||||
| -rw-r--r-- | user/dovecot/time64.patch | 26 |
2 files changed, 13 insertions, 23 deletions
diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD index b7aaceef8..6f9a8d145 100644 --- a/user/dovecot/APKBUILD +++ b/user/dovecot/APKBUILD @@ -5,10 +5,10 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=dovecot -pkgver=2.3.13 +pkgver=2.3.14 _pkgvermajor=2.3 pkgrel=0 -_pigeonholever=0.5.13 +_pigeonholever=0.5.14 _pigeonholevermajor=${_pigeonholever%.*} pkgdesc="IMAP and POP3 server" url="https://www.dovecot.org/" @@ -258,13 +258,13 @@ _submv() { done } -sha512sums="758a169fba8925637ed18fa7522a6f06c9fe01a1707b1ca0d0a4d8757c578a8e117c91733e8314403839f9a484bbcac71ce3532c82379eb583b480756d556a95 dovecot-2.3.13.tar.gz -fcbc13d71af4e6dd4e34192484e203d755e5015da76a4774b11a79182b2baad36cab5a471346093111ace36a7775dfe8294555f8b777786dde386820b3ec5cd3 dovecot-2.3-pigeonhole-0.5.13.tar.gz +sha512sums="69df234cb739c7ee7ae3acfb9756bc22481e94c95463d32bfac315c7ec4b1ba0dfbff552b769f2ab7ee554087ca2ebbe331aa008d3af26417016612dc7cad103 dovecot-2.3.14.tar.gz +c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc dovecot-2.3-pigeonhole-0.5.14.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 -ee2e1916c712db77409567b4ded9c7fb7dfed295e044c19694bc369af3d4a7086caf14e97809531f76b630bc578271af6e5137985b7d4e8d2afb2a71f800912f time64.patch +28e0e3efcb1dd06cd971f1a8caa88989a165dbf14fdebf26ec1ab083020c6831231fec08c2a9d363e6af74003deeeb27122d044eccd02cf7945b464758e04622 time64.patch 9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0 dovecot.logrotate d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70 dovecot.initd" diff --git a/user/dovecot/time64.patch b/user/dovecot/time64.patch index c6f8e6261..4cd5c46e1 100644 --- a/user/dovecot/time64.patch +++ b/user/dovecot/time64.patch @@ -1,27 +1,17 @@ ---- dovecot-2.3.11.3/src/lib-oauth2/oauth2-jwt.c.old 2020-08-12 12:20:41.000000000 +0000 -+++ dovecot-2.3.11.3/src/lib-oauth2/oauth2-jwt.c 2020-09-15 14:21:24.285796733 +0000 -@@ -31,13 +31,13 @@ +--- 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) -+ long long *value_r) + 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; - if (value == NULL) - return 0; -- if ((str_to_long(value, value_r) < 0 && -+ if ((str_to_llong(value, value_r) < 0 && - !iso8601_date_parse((const unsigned char*)value, strlen(value), - value_r, &tz_offset)) || - *value_r < 0) -@@ -283,9 +283,9 @@ - const char *sub = get_field(tree, "sub"); - +@@ -313,7 +313,7 @@ int ret; -- long t0 = time(NULL); -+ long long t0 = time(NULL); + long t0 = time(NULL); /* default IAT and NBF to now */ - long iat, nbf, exp; + long long iat, nbf, exp; |