Attachment 205918 Details for Bug 232865 – updated patch

[patch] updated patch

libkronosnet-1.10.diff (text/plain), 6.89 KB, created by Florian Smeets on 2019-07-20 08:10:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Smeets

Created: 2019-07-20 08:10:27 UTC

Size: 6.89 KB

patch

obsolete

>Index: devel/kronosnet/Makefile
>===================================================================
>--- devel/kronosnet/Makefile	(revision 506966)
>+++ devel/kronosnet/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	kronosnet
>-PORTVERSION=	1.3
>-PORTREVISION=	4
>+PORTVERSION=	1.10
> CATEGORIES=	devel
> MASTER_SITES=	https://kronosnet.org/releases/
> 
>@@ -16,7 +15,8 @@
> 		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
> USE_BINUTILS=	yes
>@@ -38,10 +38,10 @@
> .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
>+.if ${OSVERSION} >= 1200085
>+EXTRA_PATCHES=	${.CURDIR}/files/extra-patch-ssl-openssl11-configure.ac
>+.endif
> .elif ${SSL_DEFAULT} == libressl
> EXTRA_PATCHES=	${.CURDIR}/files/extra-patch-ssl-libressl-configure.ac
> .endif
>Index: devel/kronosnet/distinfo
>===================================================================
>--- devel/kronosnet/distinfo	(revision 506966)
>+++ 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 = 1563579744
>+SHA256 (kronosnet-1.10.tar.gz) = a6795035127336b0181ef474fb11a4a3195652e7a2b9f80b47302a56dd900261
>+SIZE (kronosnet-1.10.tar.gz) = 744450
>Index: devel/kronosnet/files/extra-patch-ssl-libressl-configure.ac
>===================================================================
>--- devel/kronosnet/files/extra-patch-ssl-libressl-configure.ac	(revision 506966)
>+++ devel/kronosnet/files/extra-patch-ssl-libressl-configure.ac	(working copy)
>@@ -16,11 +16,3 @@
>  
>  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
>Index: devel/kronosnet/files/extra-patch-ssl-openssl11-configure.ac
>===================================================================
>--- devel/kronosnet/files/extra-patch-ssl-openssl11-configure.ac	(nonexistent)
>+++ devel/kronosnet/files/extra-patch-ssl-openssl11-configure.ac	(working copy)
>@@ -0,0 +1,18 @@
>+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([BUILDCRYPTOOPENSSL11], [1], [openssl 1.1 crypto])])])
>+ 
>+ AC_ARG_ENABLE([compress-all],
>+ 	[AS_HELP_STRING([--disable-compress-all],[disable libknet all compress modules support])],,
>
>Property changes on: devel/kronosnet/files/extra-patch-ssl-openssl11-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/pkg-plist
>===================================================================
>--- devel/kronosnet/pkg-plist	(revision 506966)
>+++ 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.2.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
>@@ -56,6 +65,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 +77,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 +92,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

Actions: View | Diff

Attachments on bug 232865: 198817 | 205918