Attachment 198817 Details for Bug 232865 – patch

[patch] patch

devel_kronosnet-1.5-opensslfix.diff (text/plain), 3.02 KB, created by Florian Smeets on 2018-10-31 19:30:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Smeets

Created: 2018-10-31 19:30:23 UTC

Size: 3.02 KB

patch

obsolete

>Index: devel/kronosnet/Makefile
>===================================================================
>--- devel/kronosnet/Makefile	(revision 483538)
>+++ devel/kronosnet/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	kronosnet
>-PORTVERSION=	1.3
>-PORTREVISION=	2
>+PORTVERSION=	1.5
> CATEGORIES=	devel
> MASTER_SITES=	https://kronosnet.org/releases/
> 
>@@ -38,8 +37,12 @@
> .include <bsd.port.options.mk>
> 
> .if ${SSL_DEFAULT} == base
>+CONFIGURE_ENV=	openssl_CFLAGS=-I/usr/include openssl_LIBS=-lcrypto
>+.if ${OSVERSION} >= 1200085
>+EXTRA_PATCHES=	${.CURDIR}/files/extra-patch-ssl-openssl11-configure.ac
>+.else
> EXTRA_PATCHES=	${.CURDIR}/files/extra-patch-ssl-base-configure.ac
>-CONFIGURE_ENV=	openssl_CFLAGS=-I/usr/include openssl_LIBS=-lcrypto
>+.endif
> .elif ${SSL_DEFAULT} == libressl
> EXTRA_PATCHES=	${.CURDIR}/files/extra-patch-ssl-libressl-configure.ac
> .endif
>Index: devel/kronosnet/distinfo
>===================================================================
>--- devel/kronosnet/distinfo	(revision 483538)
>+++ 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 = 1540976336
>+SHA256 (kronosnet-1.5.tar.gz) = 1b7a4764aa7074b6b1d48c05e96ed4a4f88b1508ede56d0a0bb95c400714dfc9
>+SIZE (kronosnet-1.5.tar.gz) = 698383
>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,26 @@
>+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])],,
>+@@ -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-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

Actions: View | Diff

Attachments on bug 232865: 198817 | 205918