svn commit: r518653 - in head/devel/kronosnet: . files

Vinícius Zavam egypcio at FreeBSD.org
Fri Nov 29 14:25:07 UTC 2019 

Author: egypcio
Date: Fri Nov 29 14:25:05 2019
New Revision: 518653
URL: https://svnweb.freebsd.org/changeset/ports/518653

Log:
  devel/kronosnet: Update to 1.13 (Builds against openssl11 and libressl)
  
  PR:		241445
  Approved by:	portmgr (maintainer timeout: 4 weeks)
  Obtained from:	https://github.com/kronosnet/kronosnet/issues/269

Added:
  head/devel/kronosnet/files/patch-configure.ac   (contents, props changed)
  head/devel/kronosnet/files/patch-libknet_crypto__openssl.c   (contents, props changed)
Deleted:
  head/devel/kronosnet/files/extra-patch-ssl-libressl-configure.ac
  head/devel/kronosnet/files/patch-Makefile.am
  head/devel/kronosnet/files/patch-libknet_common.c
Modified:
  head/devel/kronosnet/Makefile
  head/devel/kronosnet/distinfo
  head/devel/kronosnet/pkg-plist

Modified: head/devel/kronosnet/Makefile
==============================================================================
--- head/devel/kronosnet/Makefile	Fri Nov 29 14:04:06 2019	(r518652)
+++ head/devel/kronosnet/Makefile	Fri Nov 29 14:25:05 2019	(r518653)
@@ -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 @@ LIB_DEPENDS=	liblzo2.so:archivers/lzo2 \
 		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_DEFINE=	MANPAGES DOCS
 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>

Modified: head/devel/kronosnet/distinfo
==============================================================================
--- head/devel/kronosnet/distinfo	Fri Nov 29 14:04:06 2019	(r518652)
+++ head/devel/kronosnet/distinfo	Fri Nov 29 14:25:05 2019	(r518653)
@@ -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

Added: head/devel/kronosnet/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/kronosnet/files/patch-configure.ac	Fri Nov 29 14:25:05 2019	(r518653)
@@ -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],[

Added: head/devel/kronosnet/files/patch-libknet_crypto__openssl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/kronosnet/files/patch-libknet_crypto__openssl.c	Fri Nov 29 14:25:05 2019	(r518653)
@@ -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");

Modified: head/devel/kronosnet/pkg-plist
==============================================================================
--- head/devel/kronosnet/pkg-plist	Fri Nov 29 14:04:06 2019	(r518652)
+++ head/devel/kronosnet/pkg-plist	Fri Nov 29 14:25:05 2019	(r518653)
@@ -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.a
 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/kronosnet/crypto_nss.so
 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 @@ libdata/pkgconfig/libknet.pc
 %%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 @@ libdata/pkgconfig/libknet.pc
 %%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 @@ libdata/pkgconfig/libknet.pc
 %%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 @@ libdata/pkgconfig/libknet.pc
 %%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 @@ libdata/pkgconfig/libknet.pc
 %%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

More information about the svn-ports-all mailing list