Attachment #198817 for bug #232865




# $FreeBSD$

PORTNAME=	kronosnet
PORTVERSION=	1.5
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	https://kronosnet.org/releases/


.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
.endif
.elif ${SSL_DEFAULT} == libressl
EXTRA_PATCHES=	${.CURDIR}/files/extra-patch-ssl-libressl-configure.ac
.endif

Lines 1-3 Link Here

(-)devel/kronosnet/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1524484064	1	TIMESTAMP = 1540976336
2	SHA256 (kronosnet-1.3.tar.gz) = c24d93dbb25561e684cecf4d7afd58c98a7f883ba9ad812793e268ad857c3a62	2	SHA256 (kronosnet-1.5.tar.gz) = 1b7a4764aa7074b6b1d48c05e96ed4a4f88b1508ede56d0a0bb95c400714dfc9
3	SIZE (kronosnet-1.3.tar.gz) = 701399	3	SIZE (kronosnet-1.5.tar.gz) = 698383




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

Return to bug 232865

Lines 2-9 Link Here

(-)devel/kronosnet/Makefile (-3 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= kronosnet	4	PORTNAME= kronosnet
5	PORTVERSION= 1.3	5	PORTVERSION= 1.5
6	PORTREVISION= 2
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= https://kronosnet.org/releases/	7	MASTER_SITES= https://kronosnet.org/releases/
9		8
Lines 38-45 Link Here
38	.include <bsd.port.options.mk>	37	.include <bsd.port.options.mk>
39		38
40	.if ${SSL_DEFAULT} == base	39	.if ${SSL_DEFAULT} == base
		40	CONFIGURE_ENV= openssl_CFLAGS=-I/usr/include openssl_LIBS=-lcrypto
		41	.if ${OSVERSION} >= 1200085
		42	EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-ssl-openssl11-configure.ac
		43	.else
41	EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-ssl-base-configure.ac	44	EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-ssl-base-configure.ac
42	CONFIGURE_ENV= openssl_CFLAGS=-I/usr/include openssl_LIBS=-lcrypto	45	.endif
43	.elif ${SSL_DEFAULT} == libressl	46	.elif ${SSL_DEFAULT} == libressl
44	EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-ssl-libressl-configure.ac	47	EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-ssl-libressl-configure.ac
45	.endif	48	.endif

Line 0 Link Here

(-)devel/kronosnet/files/extra-patch-ssl-openssl11-configure.ac (+26 lines)
	1	Use openssl 1.0 API when libressl is set as the default ssl implementation.
	2
	3	--- configure.ac.orig 2018-02-26 13:46:34 UTC
	4	+++ configure.ac
	5	@@ -114,11 +114,8 @@ AC_ARG_ENABLE([crypto-all],
	6
	7	KNET_OPTION_DEFINES([nss],[crypto],[PKG_CHECK_MODULES([nss], [nss])])
	8	KNET_OPTION_DEFINES([openssl],[crypto],[
	9	- PKG_CHECK_MODULES([openssl],[libcrypto < 1.1],
	10	- [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL10], [1], [openssl 1.0 crypto])],
	11	- [PKG_CHECK_MODULES([openssl],[libcrypto >= 1.1],
	12	- [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL11], [1], [openssl 1.1 crypto])])])
	13	-])
	14	+ PKG_CHECK_MODULES([openssl], [libcrypto],
	15	+ [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL11], [1], [openssl 1.1 crypto])])])
	16
	17	AC_ARG_ENABLE([compress-all],
	18	[AS_HELP_STRING([--disable-compress-all],[disable libknet all compress modules support])],,
	19	@@ -414,7 +411,6 @@ WARNLIST="
	20	pointer-arith
	21	write-strings
	22	cast-align
	23	- bad-function-cast
	24	missing-format-attribute
	25	float-equal
	26	format=2