diff options
author | VinÃcius Zavam <egypcio@FreeBSD.org> | 2020-02-10 21:58:28 +0800 |
---|---|---|
committer | VinÃcius Zavam <egypcio@FreeBSD.org> | 2020-02-10 21:58:28 +0800 |
commit | 361818fe65dcd4dd26737e7bb812dcb793147006 (patch) | |
tree | 6d3f3ce081a94bd4907864ea211728d3796f17bc /devel/kronosnet/files | |
parent | 3c5dc423cec9a93a4a1d22d8c823999f29973db7 (diff) | |
download | freebsd-ports-gnome-361818fe65dcd4dd26737e7bb812dcb793147006.tar.gz freebsd-ports-gnome-361818fe65dcd4dd26737e7bb812dcb793147006.tar.zst freebsd-ports-gnome-361818fe65dcd4dd26737e7bb812dcb793147006.zip |
devel/kronosnet: update 1.13 to 1.14
files/*
- patch-configure.ac; merged into upstream [0]
- patch-libknet_crypto__openssl.c; dito.
[0] https://github.com/kronosnet/kronosnet/pull/270 (647eeae, 7f11ac2)
Diffstat (limited to 'devel/kronosnet/files')
-rw-r--r-- | devel/kronosnet/files/patch-configure.ac | 23 | ||||
-rw-r--r-- | devel/kronosnet/files/patch-libknet_crypto__openssl.c | 59 |
2 files changed, 0 insertions, 82 deletions
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"); |