diff options
| author | tobik <tobik@FreeBSD.org> | 2018-12-01 17:30:36 +0800 |
|---|---|---|
| committer | tobik <tobik@FreeBSD.org> | 2018-12-01 17:30:36 +0800 |
| commit | 0be8f7726676537f56bc7bdd7891d6e925bb031a (patch) | |
| tree | 4bd48b800fdbcd36fbf01a473fe9d580c27ae97a | |
| parent | 0a82821ff75fa1975ff5c180ce23b2dcc3e10c0f (diff) | |
| download | freebsd-ports-gnome-0be8f7726676537f56bc7bdd7891d6e925bb031a.tar.gz freebsd-ports-gnome-0be8f7726676537f56bc7bdd7891d6e925bb031a.tar.zst freebsd-ports-gnome-0be8f7726676537f56bc7bdd7891d6e925bb031a.zip | |
devel/kore: Update to 3.2.0
Changes: https://kore.io/releases/3.2.0#changelog
| -rw-r--r-- | devel/kore/Makefile | 3 | ||||
| -rw-r--r-- | devel/kore/distinfo | 6 | ||||
| -rw-r--r-- | devel/kore/files/patch-src_domain.c | 65 |
3 files changed, 4 insertions, 70 deletions
diff --git a/devel/kore/Makefile b/devel/kore/Makefile index 229238e5307b..c3dbbaa8c541 100644 --- a/devel/kore/Makefile +++ b/devel/kore/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= kore -PORTVERSION= 3.1.0 -PORTREVISION= 1 +PORTVERSION= 3.2.0 CATEGORIES= devel www MASTER_SITES= https://kore.io/releases/ diff --git a/devel/kore/distinfo b/devel/kore/distinfo index 7424a296aa9d..dadde21705f6 100644 --- a/devel/kore/distinfo +++ b/devel/kore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531988034 -SHA256 (kore-3.1.0.tar.gz) = 3f78fb03262046ffa036a7e112dbcbc45fbfca509a949b42f87a55da409f6595 -SIZE (kore-3.1.0.tar.gz) = 989917 +TIMESTAMP = 1543654920 +SHA256 (kore-3.2.0.tar.gz) = 24b7a0e0d7f07e1f5a60984feedd37c1aa19a9a5e2c97cccce061b689f8345f8 +SIZE (kore-3.2.0.tar.gz) = 998602 diff --git a/devel/kore/files/patch-src_domain.c b/devel/kore/files/patch-src_domain.c deleted file mode 100644 index aebe5b632c43..000000000000 --- a/devel/kore/files/patch-src_domain.c +++ /dev/null @@ -1,65 +0,0 @@ -From f87624a459342de33ff58619901da96749fad057 Mon Sep 17 00:00:00 2001 -From: Joris Vink <joris@coders.se> -Date: Mon, 1 Oct 2018 10:36:33 +0200 -Subject: [PATCH] Add missing KORE_NO_TLS guards. - -Fixes NOTLS=1 builds on openssl 1.1.1 ---- - src/domain.c | 4 ++++ - 1 file changed, 4 insertions(+) - -With some additional changes to fix build with OpenSSL 1.0.1u on -FreeBSD 10.4. - ---- src/domain.c.orig 2018-07-18 14:25:49 UTC -+++ src/domain.c -@@ -125,6 +125,7 @@ kore_domain_init(void) - { - TAILQ_INIT(&domains); - -+#if !defined(KORE_NO_TLS) - #if !defined(LIBRESSL_VERSION_TEXT) && OPENSSL_VERSION_NUMBER >= 0x10100000L - if (keymgr_rsa_meth == NULL) { - if ((keymgr_rsa_meth = RSA_meth_new("kore RSA keymgr method", -@@ -143,6 +144,7 @@ kore_domain_init(void) - - EC_KEY_METHOD_set_sign(keymgr_ec_meth, NULL, NULL, keymgr_ecdsa_sign); - #endif -+#endif - } - - void -@@ -155,6 +157,7 @@ kore_domain_cleanup(void) - kore_domain_free(dom); - } - -+#if !defined(KORE_NO_TLS) - #if !defined(LIBRESSL_VERSION_TEXT) && OPENSSL_VERSION_NUMBER >= 0x10100000L - if (keymgr_rsa_meth != NULL) { - RSA_meth_free(keymgr_rsa_meth); -@@ -166,6 +169,7 @@ kore_domain_cleanup(void) - keymgr_ec_meth = NULL; - } - #endif -+#endif - } - - int -@@ -774,7 +778,7 @@ domain_load_certificate_chain(SSL_CTX *ctx, const void - if (SSL_CTX_use_certificate(ctx, x) == 0) - fatal("SSL_CTX_use_certificate: %s", ssl_errno_s); - --#if defined(LIBRESSL_VERSION_TEXT) -+#if defined(LIBRESSL_VERSION_TEXT) || OPENSSL_VERSION_NUMBER <= 0x1000115fL - sk_X509_pop_free(ctx->extra_certs, X509_free); - ctx->extra_certs = NULL; - #else -@@ -784,7 +788,7 @@ domain_load_certificate_chain(SSL_CTX *ctx, const void - ERR_clear_error(); - while ((ca = PEM_read_bio_X509(in, NULL, NULL, NULL)) != NULL) { - /* ca its reference count won't be increased. */ --#if defined(LIBRESSL_VERSION_TEXT) -+#if defined(LIBRESSL_VERSION_TEXT) || OPENSSL_VERSION_NUMBER <= 0x1000115fL - if (SSL_CTX_add_extra_chain_cert(ctx, ca) == 0) - fatal("SSL_CTX_add_extra_chain_cert: %s", ssl_errno_s); - #else |