Index: head/devel/kronosnet/Makefile =================================================================== --- head/devel/kronosnet/Makefile (revision 525705) +++ head/devel/kronosnet/Makefile (revision 525706) @@ -1,44 +1,44 @@ # Created by: David Shane Holden # $FreeBSD$ PORTNAME= kronosnet -PORTVERSION= 1.13 +PORTVERSION= 1.14 CATEGORIES= devel MASTER_SITES= https://kronosnet.org/releases/ MAINTAINER= egypcio@FreeBSD.org COMMENT= Network abstraction layer designed for high availability LICENSE= GPLv2 LIB_DEPENDS= liblzo2.so:archivers/lzo2 \ liblz4.so:archivers/liblz4 \ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ libqb.so.0:devel/libqb \ libzstd.so:archivers/zstd USES= autoreconf gmake localbase libtool pkgconfig ssl USE_BINUTILS= yes USE_GCC= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes LDFLAGS+= -B${LOCALBASE}/bin INSTALL_TARGET= install-strip TEST_TARGET= check OPTIONS_DEFINE= MANPAGES DOCS OPTIONS_DEFAULT=MANPAGES OPTIONS_SUB= yes MANPAGES_BUILD_DEPENDS= doxygen:devel/doxygen MANPAGES_CONFIGURE_ENABLE= man .include .if ${SSL_DEFAULT} == base CONFIGURE_ENV= openssl_CFLAGS="-I/usr/include" openssl_LIBS="-lcrypto" .endif .include Index: head/devel/kronosnet/distinfo =================================================================== --- head/devel/kronosnet/distinfo (revision 525705) +++ head/devel/kronosnet/distinfo (revision 525706) @@ -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 Index: head/devel/kronosnet/files/patch-configure.ac =================================================================== --- head/devel/kronosnet/files/patch-configure.ac (revision 525705) +++ head/devel/kronosnet/files/patch-configure.ac (nonexistent) @@ -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],[ Property changes on: head/devel/kronosnet/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/kronosnet/files/patch-libknet_crypto__openssl.c =================================================================== --- head/devel/kronosnet/files/patch-libknet_crypto__openssl.c (revision 525705) +++ head/devel/kronosnet/files/patch-libknet_crypto__openssl.c (nonexistent) @@ -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"); Property changes on: head/devel/kronosnet/files/patch-libknet_crypto__openssl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property