aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan P. Stanić <mps@arvanta.net>2021-03-05 16:26:24 +0000
committerMilan P. Stanić <mps@arvanta.net>2021-03-05 21:40:50 +0000
commit590dc58428d09705ddcc886129ec86d932249b5d (patch)
treeee5c1f433781e67f77260c5feeb9dba386743e52
parenta97a6c264e6100c21f0cefb1f00494e117310aa0 (diff)
downloadaports-590dc58428d09705ddcc886129ec86d932249b5d.tar.gz
aports-590dc58428d09705ddcc886129ec86d932249b5d.tar.bz2
aports-590dc58428d09705ddcc886129ec86d932249b5d.tar.xz
main/dovecot: upgrade to 2.3.14
use 0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch instead of fix-oauth2-jwt.c.patch, posted to me by upstream author add fix-libssl_iostream_openssl.patch, also posted by upstream author add prepare() and add autoreconf to it, and add gettext-dev to makedepends, autoreconf need it
-rw-r--r--main/dovecot/0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch (renamed from main/dovecot/fix-oauth2-jwt.c.patch)22
-rw-r--r--main/dovecot/APKBUILD20
-rw-r--r--main/dovecot/fix-libssl_iostream_openssl.patch14
3 files changed, 43 insertions, 13 deletions
diff --git a/main/dovecot/fix-oauth2-jwt.c.patch b/main/dovecot/0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch
index b3755f6993..5c4ab58e7e 100644
--- a/main/dovecot/fix-oauth2-jwt.c.patch
+++ b/main/dovecot/0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch
@@ -1,18 +1,23 @@
-From 42c37d2473116bf4a7fcafcaf94de83947fe80bc Mon Sep 17 00:00:00 2001
+From 7372d154a41bc1c2b510c6dfb3ab67099e3a90a7 Mon Sep 17 00:00:00 2001
From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 13 Aug 2020 20:01:41 +0300
Subject: [PATCH] oauth2-jwt: Use int64_t instead time_t for portability
+---
+ src/lib-oauth2/oauth2-jwt.c | 27 +++++++++++++++++----------
+ 1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/lib-oauth2/oauth2-jwt.c b/src/lib-oauth2/oauth2-jwt.c
-index a68875e57..0adf612d9 100644
+index 83b241c558..09d3970743 100644
--- a/src/lib-oauth2/oauth2-jwt.c
+++ b/src/lib-oauth2/oauth2-jwt.c
-@@ -31,18 +31,25 @@ static const char *get_field(const struct json_tree *tree, const char *key)
+@@ -30,19 +30,26 @@ static const char *get_field(const struct json_tree *tree, const char *key)
+ return json_tree_get_value_str(value_node);
}
- static int get_time_field(const struct json_tree *tree, const char *key,
-- long *value_r)
+-static int
+-get_time_field(const struct json_tree *tree, const char *key, long *value_r)
++static int get_time_field(const struct json_tree *tree, const char *key,
+ int64_t *value_r)
{
+ time_t tvalue;
@@ -40,8 +45,8 @@ index a68875e57..0adf612d9 100644
+ return -1;
}
- static int oauth2_lookup_hmac_key(const struct oauth2_settings *set,
-@@ -283,9 +290,9 @@ oauth2_jwt_body_process(const struct oauth2_settings *set, const char *alg, cons
+ static int
+@@ -311,9 +318,9 @@ oauth2_jwt_body_process(const struct oauth2_settings *set, const char *alg,
const char *sub = get_field(tree, "sub");
int ret;
@@ -53,3 +58,6 @@ index a68875e57..0adf612d9 100644
int tz_offset ATTR_UNUSED;
if (sub == NULL) {
+--
+2.20.1
+
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 18361d7778..4291ec45e5 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -4,11 +4,11 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dovecot
-pkgver=2.3.13
+pkgver=2.3.14
_pkgverminor=${pkgver%.*}
_pkgvermajor=${_pkgverminor%.*}
pkgrel=0
-_pigeonholever=0.5.13
+_pigeonholever=0.5.14
_pigeonholevermajor=${_pigeonholever%.*}
pkgdesc="IMAP and POP3 server"
url="https://www.dovecot.org/"
@@ -24,6 +24,7 @@ makedepends="
bzip2-dev
clucene-dev
expat-dev
+ gettext-dev
heimdal-dev
libcap-dev
openssl-dev
@@ -60,8 +61,9 @@ source="https://www.dovecot.org/releases/$_pkgverminor/dovecot-$pkgver.tar.gz
skip-iconv-check.patch
split-protocols.patch
default-config.patch
- fix-oauth2-jwt.c.patch
fix-out-of-memory-test.patch
+ fix-libssl_iostream_openssl.patch
+ 0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch
dovecot.logrotate
dovecot.initd
"
@@ -99,6 +101,11 @@ _builddir_pigeonhole="$srcdir/$pkgname-$_pkgverminor-pigeonhole-$_pigeonholever"
# - CVE-2017-14461
# - CVE-2017-15132
+prepare() {
+ default_prepare
+ autoreconf -vi
+}
+
_configure() {
./configure \
--build=$CBUILD \
@@ -315,12 +322,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
-7f428b0f14323a5dda00aef93f4835c2c38a7b780a939a47f759d31df4636e86055f95d17e2358cb37a2704ea022dfad602c7ed4568cba644347f20fd1e15e3b fix-oauth2-jwt.c.patch
733cdbfb7f6b2608470bd30a0f9190ec86099d4c8e48b7fb92d7b595be665bf749976889033e1ad438edd3f99f2e0d496dd0d667291915c80df82f7e62483f59 fix-out-of-memory-test.patch
+0fb56eb9c7fae8d8b1d794928ce2ba58d03c102cd7c3f959799c62c5d838ff535ecccb64bc1970d960f67d49388c880773e9eac5aed3bcf92e6efed3b56cc837 fix-libssl_iostream_openssl.patch
+5da4367fd8bb0ea4d94c676568a5f0142217a7556fbcf5cdbdfc92e5b7955d432858a5e944ad0aebc310b6b5c4219f800428e6ddadee1a3aaa954847a8a46317 0001-oauth2-jwt-Use-int64_t-instead-time_t-for-portabilit.patch
9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0 dovecot.logrotate
d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70 dovecot.initd"
diff --git a/main/dovecot/fix-libssl_iostream_openssl.patch b/main/dovecot/fix-libssl_iostream_openssl.patch
new file mode 100644
index 0000000000..5c4cbb6263
--- /dev/null
+++ b/main/dovecot/fix-libssl_iostream_openssl.patch
@@ -0,0 +1,14 @@
+diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am
+index e9e5116953..718d451c4f 100644
+--- a/src/lib-dcrypt/Makefile.am
++++ b/src/lib-dcrypt/Makefile.am
+@@ -20,7 +20,8 @@ libdcrypt_la_CFLAGS = $(AM_CPPFLAGS) \
+ if BUILD_DCRYPT_OPENSSL
+ pkglib_LTLIBRARIES += libdcrypt_openssl.la
+ libdcrypt_openssl_la_SOURCES = dcrypt-openssl.c
+-libdcrypt_openssl_la_LDFLAGS = -module -avoid-version ../lib-ssl-iostream/libssl_iostream_openssl.la
++libdcrypt_openssl_la_LDFLAGS = -module -avoid-version ../lib-ssl-iostream/libssl_iostream.la \
++ ../lib-ssl-iostream/libssl_iostream_openssl.la
+ libdcrypt_openssl_la_LIBADD = $(SSL_LIBS)
+ libdcrypt_openssl_la_DEPENDENCIES = ../lib-ssl-iostream/libssl_iostream_openssl.la
+ libdcrypt_openssl_la_CFLAGS = $(AM_CPPFLAGS) \