Attachment 208636 Details for Bug 241445 – [PATCH] devel/kronosnet: update 1.3 to 1.13, builds against openssl11 (base, or ports) and libressl

[patch] [PATCH] devel/kronosnet: update 1.3 to 1.13, builds against openssl11 (base, or ports) and libressl

ports_r515788_PATCH__devel_kronosnet.diff (text/plain), 13.39 KB, created by Vinícius Zavam on 2019-10-27 16:25:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vinícius Zavam

Created: 2019-10-27 16:25:37 UTC

Size: 13.39 KB

patch

obsolete

>Index: devel/kronosnet/Makefile
>===================================================================
>--- devel/kronosnet/Makefile	(revision 515788)
>+++ devel/kronosnet/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	kronosnet
>-PORTVERSION=	1.3
>-PORTREVISION=	5
>+PORTVERSION=	1.13
> CATEGORIES=	devel
> MASTER_SITES=	https://kronosnet.org/releases/
> 
>@@ -16,9 +15,10 @@
> 		liblz4.so:archivers/liblz4 \
> 		libnspr4.so:devel/nspr \
> 		libnss3.so:security/nss \
>-		libqb.so.0:devel/libqb
>+		libqb.so.0:devel/libqb \
>+		libzstd.so:archivers/zstd
> 
>-USES=		autoreconf gmake libtool localbase pkgconfig ssl
>+USES=		autoreconf gmake localbase libtool pkgconfig ssl
> USE_BINUTILS=	yes
> USE_GCC=	yes
> USE_LDCONFIG=	yes
>@@ -32,18 +32,13 @@
> OPTIONS_DEFAULT=MANPAGES
> OPTIONS_SUB=	yes
> 
>-MANPAGES_BUILD_DEPENDS=	doxygen:devel/doxygen
>+MANPAGES_BUILD_DEPENDS=		doxygen:devel/doxygen
> MANPAGES_CONFIGURE_ENABLE=	man
> 
> .include <bsd.port.options.mk>
> 
> .if ${SSL_DEFAULT} == base
>-BROKEN_FreeBSD_12=	error: storage size of 'ctx' isn't known
>-BROKEN_FreeBSD_13=	error: storage size of 'ctx' isn't known
>-EXTRA_PATCHES=	${.CURDIR}/files/extra-patch-ssl-base-configure.ac
>-CONFIGURE_ENV=	openssl_CFLAGS=-I/usr/include openssl_LIBS=-lcrypto
>-.elif ${SSL_DEFAULT} == libressl
>-EXTRA_PATCHES=	${.CURDIR}/files/extra-patch-ssl-libressl-configure.ac
>+CONFIGURE_ENV=	openssl_CFLAGS="-I/usr/include" openssl_LIBS="-lcrypto"
> .endif
> 
> .include <bsd.port.mk>
>Index: devel/kronosnet/distinfo
>===================================================================
>--- devel/kronosnet/distinfo	(revision 515788)
>+++ devel/kronosnet/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1524484064
>-SHA256 (kronosnet-1.3.tar.gz) = c24d93dbb25561e684cecf4d7afd58c98a7f883ba9ad812793e268ad857c3a62
>-SIZE (kronosnet-1.3.tar.gz) = 701399
>+TIMESTAMP = 1572171668
>+SHA256 (kronosnet-1.13.tar.gz) = 91685584655c2e0f7927b1d1a6001e26253244f68b997dcb2cf8b06a428f4e65
>+SIZE (kronosnet-1.13.tar.gz) = 753915
>Index: devel/kronosnet/files/extra-patch-ssl-libressl-configure.ac
>===================================================================
>--- devel/kronosnet/files/extra-patch-ssl-libressl-configure.ac	(revision 515788)
>+++ devel/kronosnet/files/extra-patch-ssl-libressl-configure.ac	(nonexistent)
>@@ -1,26 +0,0 @@
>-Use openssl 1.0 API when libressl is set as the default ssl implementation.
>-
>---- configure.ac.orig	2018-02-26 13:46:34 UTC
>-+++ configure.ac
>-@@ -114,11 +114,8 @@ AC_ARG_ENABLE([crypto-all],
>- 
>- 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])])])
>--])
>-+	PKG_CHECK_MODULES([openssl], [libcrypto],
>-+		[AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL10], [1], [openssl 1.0 crypto])])])
>- 
>- AC_ARG_ENABLE([compress-all],
>- 	[AS_HELP_STRING([--disable-compress-all],[disable libknet all compress modules support])],,
>-@@ -414,7 +411,6 @@ WARNLIST="
>- 	pointer-arith
>- 	write-strings
>- 	cast-align
>--	bad-function-cast
>- 	missing-format-attribute
>- 	float-equal
>- 	format=2
>
>Property changes on: devel/kronosnet/files/extra-patch-ssl-libressl-configure.ac
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-on
>\ 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: devel/kronosnet/files/patch-Makefile.am
>===================================================================
>--- devel/kronosnet/files/patch-Makefile.am	(revision 515788)
>+++ devel/kronosnet/files/patch-Makefile.am	(nonexistent)
>@@ -1,14 +0,0 @@
>---- Makefile.am.orig	2018-02-26 13:46:34 UTC
>-+++ Makefile.am
>-@@ -44,11 +44,6 @@ dist_doc_DATA		= \
>- 			  README.licence \
>- 			  README
>- 
>--all-local: $(SPEC)
>--
>--clean-local:
>--	rm -f $(SPEC)
>--
>- distclean-local:
>- 	rm -f $(PACKAGE_NAME)-*.tar.* $(PACKAGE_NAME)-*.sha256* tag-*
>- 
>
>Property changes on: devel/kronosnet/files/patch-Makefile.am
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-on
>\ 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: devel/kronosnet/files/patch-configure.ac
>===================================================================
>--- devel/kronosnet/files/patch-configure.ac	(nonexistent)
>+++ devel/kronosnet/files/patch-configure.ac	(working copy)
>@@ -0,0 +1,23 @@
>+--- 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: devel/kronosnet/files/patch-configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/kronosnet/files/patch-libknet_common.c
>===================================================================
>--- devel/kronosnet/files/patch-libknet_common.c	(revision 515788)
>+++ devel/kronosnet/files/patch-libknet_common.c	(nonexistent)
>@@ -1,22 +0,0 @@
>-From 97924ac12d8da26b61d3bc3ab90fbd86b0b58e72 Mon Sep 17 00:00:00 2001
>-From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
>-Date: Thu, 24 Jan 2019 14:54:24 +0100
>-Subject: [PATCH] [common] fix not reporting a true dlinfo error cause
>-MIME-Version: 1.0
>-Content-Type: text/plain; charset=UTF-8
>-Content-Transfer-Encoding: 8bit
>-
>-This was automatically caught with GCC 9
>-("'%s' directive argument is null").
>-
>-Signed-off-by: Jan PokornÃ½ <jpokorny@redhat.com>
>---- libknet/common.c.orig	2018-02-25 04:32:12 UTC
>-+++ libknet/common.c
>-@@ -82,6 +82,7 @@ static void *open_lib(knet_handle_t knet_h, const char
>- 		/*
>- 		 * should we dlclose and return error?
>- 		 */
>-+		error = dlerror();
>- 		log_warn(knet_h, KNET_SUB_COMMON, "unable to dlinfo %s: %s",
>- 			 libname, error);
>- 	} else {
>
>Property changes on: devel/kronosnet/files/patch-libknet_common.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
>Index: devel/kronosnet/files/patch-libknet_crypto__openssl.c
>===================================================================
>--- devel/kronosnet/files/patch-libknet_crypto__openssl.c	(nonexistent)
>+++ devel/kronosnet/files/patch-libknet_crypto__openssl.c	(working copy)
>@@ -0,0 +1,59 @@
>+--- 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: devel/kronosnet/files/patch-libknet_crypto__openssl.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/kronosnet/pkg-plist
>===================================================================
>--- devel/kronosnet/pkg-plist	(revision 515788)
>+++ devel/kronosnet/pkg-plist	(working copy)
>@@ -1,4 +1,5 @@
> include/libknet.h
>+include/libnozzle.h
> lib/kronosnet/compress_bzip2.a
> lib/kronosnet/compress_bzip2.so
> lib/kronosnet/compress_lz4.a
>@@ -11,6 +12,8 @@
> lib/kronosnet/compress_lzo2.so
> lib/kronosnet/compress_zlib.a
> lib/kronosnet/compress_zlib.so
>+lib/kronosnet/compress_zstd.a
>+lib/kronosnet/compress_zstd.so
> lib/kronosnet/crypto_openssl.a
> lib/kronosnet/crypto_openssl.so
> lib/kronosnet/crypto_nss.a
>@@ -18,8 +21,13 @@
> lib/libknet.a
> lib/libknet.so
> lib/libknet.so.1
>-lib/libknet.so.1.1.0
>+lib/libknet.so.1.3.0
>+lib/libnozzle.a
>+lib/libnozzle.so
>+lib/libnozzle.so.1
>+lib/libnozzle.so.1.0.0
> libdata/pkgconfig/libknet.pc
>+libdata/pkgconfig/libnozzle.pc
> %%MANPAGES%%man/man3/knet_addrtostr.3.gz
> %%MANPAGES%%man/man3/knet_get_compress_list.3.gz
> %%MANPAGES%%man/man3/knet_get_crypto_list.3.gz
>@@ -31,6 +39,7 @@
> %%MANPAGES%%man/man3/knet_handle_compress.3.gz
> %%MANPAGES%%man/man3/knet_handle_crypto.3.gz
> %%MANPAGES%%man/man3/knet_handle_enable_filter.3.gz
>+%%MANPAGES%%man/man3/knet_handle_enable_access_lists.3.gz
> %%MANPAGES%%man/man3/knet_handle_enable_pmtud_notify.3.gz
> %%MANPAGES%%man/man3/knet_handle_enable_sock_notify.3.gz
> %%MANPAGES%%man/man3/knet_handle_free.3.gz
>@@ -42,6 +51,7 @@
> %%MANPAGES%%man/man3/knet_handle_new_ex.3.gz
> %%MANPAGES%%man/man3/knet_handle_pmtud_get.3.gz
> %%MANPAGES%%man/man3/knet_handle_pmtud_getfreq.3.gz
>+%%MANPAGES%%man/man3/knet_handle_pmtud_set.3.gz
> %%MANPAGES%%man/man3/knet_handle_pmtud_setfreq.3.gz
> %%MANPAGES%%man/man3/knet_handle_remove_datafd.3.gz
> %%MANPAGES%%man/man3/knet_handle_set_transport_reconnect_interval.3.gz
>@@ -56,6 +66,8 @@
> %%MANPAGES%%man/man3/knet_host_remove.3.gz
> %%MANPAGES%%man/man3/knet_host_set_name.3.gz
> %%MANPAGES%%man/man3/knet_host_set_policy.3.gz
>+%%MANPAGES%%man/man3/knet_link_add_acl.3.gz
>+%%MANPAGES%%man/man3/knet_link_clear_acl.3.gz
> %%MANPAGES%%man/man3/knet_link_clear_config.3.gz
> %%MANPAGES%%man/man3/knet_link_get_config.3.gz
> %%MANPAGES%%man/man3/knet_link_get_enable.3.gz
>@@ -66,6 +78,8 @@
> %%MANPAGES%%man/man3/knet_link_get_status.3.gz
> %%MANPAGES%%man/man3/knet_link_set_config.3.gz
> %%MANPAGES%%man/man3/knet_link_set_enable.3.gz
>+%%MANPAGES%%man/man3/knet_link_insert_acl.3.gz
>+%%MANPAGES%%man/man3/knet_link_rm_acl.3.gz
> %%MANPAGES%%man/man3/knet_link_set_ping_timers.3.gz
> %%MANPAGES%%man/man3/knet_link_set_pong_count.3.gz
> %%MANPAGES%%man/man3/knet_link_set_priority.3.gz
>@@ -79,6 +93,23 @@
> %%MANPAGES%%man/man3/knet_send.3.gz
> %%MANPAGES%%man/man3/knet_send_sync.3.gz
> %%MANPAGES%%man/man3/knet_strtoaddr.3.gz
>+%%MANPAGES%%man/man3/nozzle_add_ip.3.gz
>+%%MANPAGES%%man/man3/nozzle_close.3.gz
>+%%MANPAGES%%man/man3/nozzle_del_ip.3.gz
>+%%MANPAGES%%man/man3/nozzle_get_fd.3.gz
>+%%MANPAGES%%man/man3/nozzle_get_handle_by_name.3.gz
>+%%MANPAGES%%man/man3/nozzle_get_ips.3.gz
>+%%MANPAGES%%man/man3/nozzle_get_mac.3.gz
>+%%MANPAGES%%man/man3/nozzle_get_mtu.3.gz
>+%%MANPAGES%%man/man3/nozzle_get_name_by_handle.3.gz
>+%%MANPAGES%%man/man3/nozzle_open.3.gz
>+%%MANPAGES%%man/man3/nozzle_reset_mac.3.gz
>+%%MANPAGES%%man/man3/nozzle_reset_mtu.3.gz
>+%%MANPAGES%%man/man3/nozzle_run_updown.3.gz
>+%%MANPAGES%%man/man3/nozzle_set_down.3.gz
>+%%MANPAGES%%man/man3/nozzle_set_mac.3.gz
>+%%MANPAGES%%man/man3/nozzle_set_mtu.3.gz
>+%%MANPAGES%%man/man3/nozzle_set_up.3.gz
> %%PORTDOCS%%%%DOCSDIR%%/COPYING.applications
> %%PORTDOCS%%%%DOCSDIR%%/COPYING.libraries
> %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 241445: 208542 | 208550 | 208629 | 208636