Attachment #208550 for bug #241445

Lines 2-10 Link Here

(-)devel/kronosnet/Makefile (-9 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= kronosnet	4	PORTNAME= kronosnet
5	PORTVERSION= 1.3	5	PORTVERSION= 1.13
6	PORTREVISION= 5	6	CATEGORIES= devel net
7	CATEGORIES= devel
8	MASTER_SITES= https://kronosnet.org/releases/	7	MASTER_SITES= https://kronosnet.org/releases/
9		8
10	MAINTAINER= dpejesh@yahoo.com	9	MAINTAINER= dpejesh@yahoo.com
Lines 16-22 Link Here
16	liblz4.so:archivers/liblz4 \	15	liblz4.so:archivers/liblz4 \
17	libnspr4.so:devel/nspr \	16	libnspr4.so:devel/nspr \
18	libnss3.so:security/nss \	17	libnss3.so:security/nss \
19	libqb.so.0:devel/libqb	18	libqb.so.0:devel/libqb \
		19	libzstd.so:archivers/zstd
20		20
21	USES= autoreconf gmake libtool localbase pkgconfig ssl	21	USES= autoreconf gmake libtool localbase pkgconfig ssl
22	USE_BINUTILS= yes	22	USE_BINUTILS= yes
Lines 37-49 Link Here
37		37
38	.include <bsd.port.options.mk>	38	.include <bsd.port.options.mk>
39		39
		40	.if ${OSVERSION} >= 1200086
		41	EXTRA_PATCHES+= ${FILESDIR}/extra-openssl11-patch-configure.ac
		42	.endif
		43
40	.if ${SSL_DEFAULT} == base	44	.if ${SSL_DEFAULT} == base
41	BROKEN_FreeBSD_12= error: storage size of 'ctx' isn't known	45	CONFIGURE_ENV+= openssl_CFLAGS='-I/usr/include' \
42	BROKEN_FreeBSD_13= error: storage size of 'ctx' isn't known	46	openssl_LIBS='-lcrypto'
43	EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-ssl-base-configure.ac
44	CONFIGURE_ENV= openssl_CFLAGS=-I/usr/include openssl_LIBS=-lcrypto
45	.elif ${SSL_DEFAULT} == libressl	47	.elif ${SSL_DEFAULT} == libressl
46	EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-ssl-libressl-configure.ac	48	EXTRA_PATCHES+= ${FILESDIR}/extra-libressl-patch-configure.ac
47	.endif	49	.endif
48		50
49	.include <bsd.port.mk>	51	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)devel/kronosnet/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1524484064	1	TIMESTAMP = 1571840666
2	SHA256 (kronosnet-1.3.tar.gz) = c24d93dbb25561e684cecf4d7afd58c98a7f883ba9ad812793e268ad857c3a62	2	SHA256 (kronosnet-1.13.tar.gz) = 91685584655c2e0f7927b1d1a6001e26253244f68b997dcb2cf8b06a428f4e65
3	SIZE (kronosnet-1.3.tar.gz) = 701399	3	SIZE (kronosnet-1.13.tar.gz) = 753915




--- configure.ac.orig	2019-10-16 07:04:53 UTC
+++ configure.ac
@@ -123,10 +123,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 >= 1.1],
+			  [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL11], [1], [openssl 1.1 crypto])])
 ])
 
 AC_ARG_ENABLE([compress-all],

Lines 1-10 Link Here

(-)devel/kronosnet/files/extra-patch-ssl-base-configure.ac (-10 lines)
1	--- configure.ac.orig 2018-02-26 13:46:34 UTC
2	+++ configure.ac
3	@@ -414,7 +414,6 @@ WARNLIST="
4	pointer-arith
5	write-strings
6	cast-align
7	- bad-function-cast
8	missing-format-attribute
9	float-equal
10	format=2




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




--- 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-*
 




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 {

Lines 1-4 Link Here

(-)devel/kronosnet/pkg-plist (-3 / +34 lines)
1	include/libknet.h	1	include/libknet.h
		2	include/libnozzle.h
2	lib/kronosnet/compress_bzip2.a	3	lib/kronosnet/compress_bzip2.a
3	lib/kronosnet/compress_bzip2.so	4	lib/kronosnet/compress_bzip2.so
4	lib/kronosnet/compress_lz4.a	5	lib/kronosnet/compress_lz4.a
Lines 11-25 Link Here
11	lib/kronosnet/compress_lzo2.so	12	lib/kronosnet/compress_lzo2.so
12	lib/kronosnet/compress_zlib.a	13	lib/kronosnet/compress_zlib.a
13	lib/kronosnet/compress_zlib.so	14	lib/kronosnet/compress_zlib.so
		15	lib/kronosnet/compress_zstd.a
		16	lib/kronosnet/compress_zstd.so
		17	lib/kronosnet/crypto_nss.a
		18	lib/kronosnet/crypto_nss.so
14	lib/kronosnet/crypto_openssl.a	19	lib/kronosnet/crypto_openssl.a
15	lib/kronosnet/crypto_openssl.so	20	lib/kronosnet/crypto_openssl.so
16	lib/kronosnet/crypto_nss.a
17	lib/kronosnet/crypto_nss.so
18	lib/libknet.a	21	lib/libknet.a
19	lib/libknet.so	22	lib/libknet.so
20	lib/libknet.so.1	23	lib/libknet.so.1
21	lib/libknet.so.1.1.0	24	lib/libknet.so.1.3.0
		25	lib/libnozzle.a
		26	lib/libnozzle.so
		27	lib/libnozzle.so.1
		28	lib/libnozzle.so.1.0.0
22	libdata/pkgconfig/libknet.pc	29	libdata/pkgconfig/libknet.pc
		30	libdata/pkgconfig/libnozzle.pc
23	%%MANPAGES%%man/man3/knet_addrtostr.3.gz	31	%%MANPAGES%%man/man3/knet_addrtostr.3.gz
24	%%MANPAGES%%man/man3/knet_get_compress_list.3.gz	32	%%MANPAGES%%man/man3/knet_get_compress_list.3.gz
25	%%MANPAGES%%man/man3/knet_get_crypto_list.3.gz	33	%%MANPAGES%%man/man3/knet_get_crypto_list.3.gz
Lines 30-35 Link Here
30	%%MANPAGES%%man/man3/knet_handle_clear_stats.3.gz	38	%%MANPAGES%%man/man3/knet_handle_clear_stats.3.gz
31	%%MANPAGES%%man/man3/knet_handle_compress.3.gz	39	%%MANPAGES%%man/man3/knet_handle_compress.3.gz
32	%%MANPAGES%%man/man3/knet_handle_crypto.3.gz	40	%%MANPAGES%%man/man3/knet_handle_crypto.3.gz
		41	%%MANPAGES%%man/man3/knet_handle_enable_access_lists.3.gz
33	%%MANPAGES%%man/man3/knet_handle_enable_filter.3.gz	42	%%MANPAGES%%man/man3/knet_handle_enable_filter.3.gz
34	%%MANPAGES%%man/man3/knet_handle_enable_pmtud_notify.3.gz	43	%%MANPAGES%%man/man3/knet_handle_enable_pmtud_notify.3.gz
35	%%MANPAGES%%man/man3/knet_handle_enable_sock_notify.3.gz	44	%%MANPAGES%%man/man3/knet_handle_enable_sock_notify.3.gz
Lines 42-47 Link Here
42	%%MANPAGES%%man/man3/knet_handle_new_ex.3.gz	51	%%MANPAGES%%man/man3/knet_handle_new_ex.3.gz
43	%%MANPAGES%%man/man3/knet_handle_pmtud_get.3.gz	52	%%MANPAGES%%man/man3/knet_handle_pmtud_get.3.gz
44	%%MANPAGES%%man/man3/knet_handle_pmtud_getfreq.3.gz	53	%%MANPAGES%%man/man3/knet_handle_pmtud_getfreq.3.gz
		54	%%MANPAGES%%man/man3/knet_handle_pmtud_set.3.gz
45	%%MANPAGES%%man/man3/knet_handle_pmtud_setfreq.3.gz	55	%%MANPAGES%%man/man3/knet_handle_pmtud_setfreq.3.gz
46	%%MANPAGES%%man/man3/knet_handle_remove_datafd.3.gz	56	%%MANPAGES%%man/man3/knet_handle_remove_datafd.3.gz
47	%%MANPAGES%%man/man3/knet_handle_set_transport_reconnect_interval.3.gz	57	%%MANPAGES%%man/man3/knet_handle_set_transport_reconnect_interval.3.gz
Lines 56-61 Link Here
56	%%MANPAGES%%man/man3/knet_host_remove.3.gz	66	%%MANPAGES%%man/man3/knet_host_remove.3.gz
57	%%MANPAGES%%man/man3/knet_host_set_name.3.gz	67	%%MANPAGES%%man/man3/knet_host_set_name.3.gz
58	%%MANPAGES%%man/man3/knet_host_set_policy.3.gz	68	%%MANPAGES%%man/man3/knet_host_set_policy.3.gz
		69	%%MANPAGES%%man/man3/knet_link_add_acl.3.gz
		70	%%MANPAGES%%man/man3/knet_link_clear_acl.3.gz
59	%%MANPAGES%%man/man3/knet_link_clear_config.3.gz	71	%%MANPAGES%%man/man3/knet_link_clear_config.3.gz
60	%%MANPAGES%%man/man3/knet_link_get_config.3.gz	72	%%MANPAGES%%man/man3/knet_link_get_config.3.gz
61	%%MANPAGES%%man/man3/knet_link_get_enable.3.gz	73	%%MANPAGES%%man/man3/knet_link_get_enable.3.gz
Lines 64-69 Link Here
64	%%MANPAGES%%man/man3/knet_link_get_pong_count.3.gz	76	%%MANPAGES%%man/man3/knet_link_get_pong_count.3.gz
65	%%MANPAGES%%man/man3/knet_link_get_priority.3.gz	77	%%MANPAGES%%man/man3/knet_link_get_priority.3.gz
66	%%MANPAGES%%man/man3/knet_link_get_status.3.gz	78	%%MANPAGES%%man/man3/knet_link_get_status.3.gz
		79	%%MANPAGES%%man/man3/knet_link_insert_acl.3.gz
		80	%%MANPAGES%%man/man3/knet_link_rm_acl.3.gz
67	%%MANPAGES%%man/man3/knet_link_set_config.3.gz	81	%%MANPAGES%%man/man3/knet_link_set_config.3.gz
68	%%MANPAGES%%man/man3/knet_link_set_enable.3.gz	82	%%MANPAGES%%man/man3/knet_link_set_enable.3.gz
69	%%MANPAGES%%man/man3/knet_link_set_ping_timers.3.gz	83	%%MANPAGES%%man/man3/knet_link_set_ping_timers.3.gz
Lines 79-84 Link Here
79	%%MANPAGES%%man/man3/knet_send.3.gz	93	%%MANPAGES%%man/man3/knet_send.3.gz
80	%%MANPAGES%%man/man3/knet_send_sync.3.gz	94	%%MANPAGES%%man/man3/knet_send_sync.3.gz
81	%%MANPAGES%%man/man3/knet_strtoaddr.3.gz	95	%%MANPAGES%%man/man3/knet_strtoaddr.3.gz
		96	%%MANPAGES%%man/man3/nozzle_add_ip.3.gz
		97	%%MANPAGES%%man/man3/nozzle_close.3.gz
		98	%%MANPAGES%%man/man3/nozzle_del_ip.3.gz
		99	%%MANPAGES%%man/man3/nozzle_get_fd.3.gz
		100	%%MANPAGES%%man/man3/nozzle_get_handle_by_name.3.gz
		101	%%MANPAGES%%man/man3/nozzle_get_ips.3.gz
		102	%%MANPAGES%%man/man3/nozzle_get_mac.3.gz
		103	%%MANPAGES%%man/man3/nozzle_get_mtu.3.gz
		104	%%MANPAGES%%man/man3/nozzle_get_name_by_handle.3.gz
		105	%%MANPAGES%%man/man3/nozzle_open.3.gz
		106	%%MANPAGES%%man/man3/nozzle_reset_mac.3.gz
		107	%%MANPAGES%%man/man3/nozzle_reset_mtu.3.gz
		108	%%MANPAGES%%man/man3/nozzle_run_updown.3.gz
		109	%%MANPAGES%%man/man3/nozzle_set_down.3.gz
		110	%%MANPAGES%%man/man3/nozzle_set_mac.3.gz
		111	%%MANPAGES%%man/man3/nozzle_set_mtu.3.gz
		112	%%MANPAGES%%man/man3/nozzle_set_up.3.gz
82	%%PORTDOCS%%%%DOCSDIR%%/COPYING.applications	113	%%PORTDOCS%%%%DOCSDIR%%/COPYING.applications
83	%%PORTDOCS%%%%DOCSDIR%%/COPYING.libraries	114	%%PORTDOCS%%%%DOCSDIR%%/COPYING.libraries
84	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT	115	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT

Return to bug 241445

Line 0 Link Here

(-)devel/kronosnet/files/extra-openssl11-patch-configure.ac (+15 lines)
	1	--- configure.ac.orig 2019-10-16 07:04:53 UTC
	2	+++ configure.ac
	3	@@ -123,10 +123,8 @@ AC_ARG_ENABLE([crypto-all],
	4
	5	KNET_OPTION_DEFINES([nss],[crypto],[PKG_CHECK_MODULES([nss], [nss])])
	6	KNET_OPTION_DEFINES([openssl],[crypto],[
	7	- PKG_CHECK_MODULES([openssl],[libcrypto < 1.1],
	8	- [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL10], [1], [openssl 1.0 crypto])],
	9	- [PKG_CHECK_MODULES([openssl],[libcrypto >= 1.1],
	10	- [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL11], [1], [openssl 1.1 crypto])])])
	11	+ PKG_CHECK_MODULES([openssl],[libcrypto >= 1.1],
	12	+ [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL11], [1], [openssl 1.1 crypto])])
	13	])
	14
	15	AC_ARG_ENABLE([compress-all],

Lines 1-26 Link Here

(-)devel/kronosnet/files/extra-patch-ssl-libressl-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([BUILDCRYPTOOPENSSL10], [1], [openssl 1.0 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

Lines 1-14 Link Here

(-)devel/kronosnet/files/patch-Makefile.am (-14 lines)
1	--- Makefile.am.orig 2018-02-26 13:46:34 UTC
2	+++ Makefile.am
3	@@ -44,11 +44,6 @@ dist_doc_DATA = \
4	README.licence \
5	README
6
7	-all-local: $(SPEC)
8	-
9	-clean-local:
10	- rm -f $(SPEC)
11	-
12	distclean-local:
13	rm -f $(PACKAGE_NAME)-.tar. $(PACKAGE_NAME)-.sha256 tag-*
14

Lines 1-22 Link Here

(-)devel/kronosnet/files/patch-libknet_common.c (-22 lines)
1	From 97924ac12d8da26b61d3bc3ab90fbd86b0b58e72 Mon Sep 17 00:00:00 2001
2	From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
3	Date: Thu, 24 Jan 2019 14:54:24 +0100
4	Subject: [PATCH] [common] fix not reporting a true dlinfo error cause
5	MIME-Version: 1.0
6	Content-Type: text/plain; charset=UTF-8
7	Content-Transfer-Encoding: 8bit
8
9	This was automatically caught with GCC 9
10	("'%s' directive argument is null").
11
12	Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
13	--- libknet/common.c.orig 2018-02-25 04:32:12 UTC
14	+++ libknet/common.c
15	@@ -82,6 +82,7 @@ static void *open_lib(knet_handle_t knet_h, const char
16	/*
17	* should we dlclose and return error?
18	*/
19	+ error = dlerror();
20	log_warn(knet_h, KNET_SUB_COMMON, "unable to dlinfo %s: %s",
21	libname, error);
22	} else {