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/dovecot/time64.patch | |
| 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/dovecot/time64.patch')
| -rw-r--r-- | user/dovecot/time64.patch | 26 |
1 files changed, 8 insertions, 18 deletions
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; |