aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/kronosnet/Makefile2
-rw-r--r--devel/kronosnet/distinfo6
-rw-r--r--devel/kronosnet/files/patch-configure.ac23
-rw-r--r--devel/kronosnet/files/patch-libknet_crypto__openssl.c59
4 files changed, 4 insertions, 86 deletions
diff --git a/devel/kronosnet/Makefile b/devel/kronosnet/Makefile
index 0540b8a12df3..f5a775015d4a 100644
--- a/devel/kronosnet/Makefile
+++ b/devel/kronosnet/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= kronosnet
-PORTVERSION= 1.13
+PORTVERSION= 1.14
CATEGORIES= devel
MASTER_SITES= https://kronosnet.org/releases/
diff --git a/devel/kronosnet/distinfo b/devel/kronosnet/distinfo
index 1447ed9bcb02..7a8e82a0f051 100644
--- a/devel/kronosnet/distinfo
+++ b/devel/kronosnet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572171668
-SHA256 (kronosnet-1.13.tar.gz) = 91685584655c2e0f7927b1d1a6001e26253244f68b997dcb2cf8b06a428f4e65
-SIZE (kronosnet-1.13.tar.gz) = 753915
+TIMESTAMP = 1581337922
+SHA256 (kronosnet-1.14.tar.gz) = 10c39aed10b7a0581bca19ee755a3272386d9360756a76c1b009fe34abec8dc4
+SIZE (kronosnet-1.14.tar.gz) = 762612
diff --git a/devel/kronosnet/files/patch-configure.ac b/devel/kronosnet/files/patch-configure.ac
deleted file mode 100644
index e91cd80fe690..000000000000
--- a/devel/kronosnet/files/patch-configure.ac
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.ac.orig 2019-10-27 10:22:37 UTC
-+++ configure.ac
-@@ -122,19 +122,13 @@ AC_ARG_ENABLE([crypto-all],
- [ enable_crypto_all="yes" ])
-
- KNET_OPTION_DEFINES([nss],[crypto],[PKG_CHECK_MODULES([nss], [nss])])
--KNET_OPTION_DEFINES([openssl],[crypto],[
-- PKG_CHECK_MODULES([openssl],[libcrypto < 1.1],
-- [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL10], [1], [openssl 1.0 crypto])],
-- [PKG_CHECK_MODULES([openssl],[libcrypto >= 1.1],
-- [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL11], [1], [openssl 1.1 crypto])])])
--])
-+KNET_OPTION_DEFINES([openssl],[crypto],[PKG_CHECK_MODULES([openssl],[libcrypto])])
-
- AC_ARG_ENABLE([compress-all],
- [AS_HELP_STRING([--disable-compress-all],[disable libknet all compress modules support])],,
- [ enable_compress_all="yes" ])
-
- KNET_OPTION_DEFINES([zstd],[compress],[PKG_CHECK_MODULES([libzstd], [libzstd])])
--
- KNET_OPTION_DEFINES([zlib],[compress],[PKG_CHECK_MODULES([zlib], [zlib])])
- KNET_OPTION_DEFINES([lz4],[compress],[PKG_CHECK_MODULES([liblz4], [liblz4])])
- KNET_OPTION_DEFINES([lzo2],[compress],[
diff --git a/devel/kronosnet/files/patch-libknet_crypto__openssl.c b/devel/kronosnet/files/patch-libknet_crypto__openssl.c
deleted file mode 100644
index e5d988ffc58d..000000000000
--- a/devel/kronosnet/files/patch-libknet_crypto__openssl.c
+++ /dev/null
@@ -1,59 +0,0 @@
---- libknet/crypto_openssl.c.orig 2019-10-27 10:24:59 UTC
-+++ libknet/crypto_openssl.c
-@@ -50,7 +50,7 @@ static int openssl_is_init = 0;
- * crypt/decrypt functions openssl1.0
- */
-
--#ifdef BUILDCRYPTOOPENSSL10
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
- static int encrypt_openssl(
- knet_handle_t knet_h,
- const struct iovec *iov,
-@@ -150,9 +150,7 @@ out:
- EVP_CIPHER_CTX_cleanup(&ctx);
- return err;
- }
--#endif
--
--#ifdef BUILDCRYPTOOPENSSL11
-+#else /* (OPENSSL_VERSION_NUMBER < 0x10100000L) */
- static int encrypt_openssl(
- knet_handle_t knet_h,
- const struct iovec *iov,
-@@ -386,7 +384,7 @@ static int opensslcrypto_authenticate_an
- return 0;
- }
-
--#ifdef BUILDCRYPTOOPENSSL10
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
- static pthread_mutex_t *openssl_internal_lock;
-
- static void openssl_internal_locking_callback(int mode, int type, char *file, int line)
-@@ -476,7 +474,7 @@ static void opensslcrypto_fini(
- crypto_instance->model_instance = NULL;
- }
-
--#ifdef BUILDCRYPTOOPENSSL10
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
- ERR_free_strings();
- #endif
-
-@@ -497,7 +495,7 @@ static int opensslcrypto_init(
- knet_handle_crypto_cfg->crypto_hash_type);
-
- if (!openssl_is_init) {
--#ifdef BUILDCRYPTOOPENSSL10
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
- ERR_load_crypto_strings();
- OPENSSL_add_all_algorithms_noconf();
- if (openssl_internal_lock_setup() < 0) {
-@@ -505,8 +503,7 @@ static int opensslcrypto_init(
- errno = EAGAIN;
- return -1;
- }
--#endif
--#ifdef BUILDCRYPTOOPENSSL11
-+#else
- if (!OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
- | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)) {
- log_err(knet_h, KNET_SUB_OPENSSLCRYPTO, "Unable to init openssl");