Attachment #212151 for bug #243073




# $FreeBSD: head/net/pichi/Makefile 519824 2019-12-11 17:53:48Z jbeich $

PORTNAME=	pichi
DISTVERSION=	1.2.1
PORTREVISION=	1
CATEGORIES=	net

MAINTAINER=	pichi@elude.in
COMMENT=	Flexible rule-based proxy

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

PLIST_SUB=	DISTVERSION=${DISTVERSION}

CMAKE_BUILD_TYPE=	MinSizeRel
CMAKE_ARGS=	-DVERSION=${DISTVERSION}
CMAKE_ON=	BUILD_SERVER BUILD_TEST
INSTALL_TARGET=	install/strip
TEST_TARGET=	test
TEST_TARGET=		test

OPTIONS_DEFINE=		DEVEL STATIC TLS
OPTIONS_DEFAULT=	TLS
OPTIONS_SUB=		yes

TLS_DESC=	Enable TLS support ( requiring OpenSSL )
TLS_CMAKE_BOOL=	ENABLE_TLS

STATIC_DESC=		Static linking
STATIC_CMAKE_BOOL=	STATIC_LINK
STATIC_BUILD_DEPENDS=	boost-libs>=1.67.0:devel/boost-libs \
			libmaxminddb>=1.3.0:net/libmaxminddb \

			libmbedx509.so:security/mbedtls \
			libsodium.so:security/libsodium

DEVEL_DESC=		Install development files
DEVEL_CMAKE_BOOL=	INSTALL_HEADERS

.include <bsd.port.options.mk>

.if ! ${PORT_OPTIONS:MSTATIC}

.endif
.endif

.if ${PORT_OPTIONS:MDEVEL}
post-install:
	${MKDIR} ${STAGEDIR}${ETCDIR}
	${INSTALL_DATA} ${WRKSRC}/test/geo.mmdb ${STAGEDIR}${ETCDIR}/geo.mmdb
	${INSTALL_DATA} ${WRKSRC}/server/pichi.json.default ${STAGEDIR}${ETCDIR}/pichi.json.sample
	${MKDIR} ${STAGEDIR}${PREFIX}/include
	${INSTALL_DATA} ${WRKSRC}/include/pichi.h ${STAGEDIR}${PREFIX}/include/pichi.h
.else
post-install:
	${MKDIR} ${STAGEDIR}${ETCDIR}
	${INSTALL_DATA} ${WRKSRC}/test/geo.mmdb ${STAGEDIR}${ETCDIR}/geo.mmdb
	${INSTALL_DATA} ${WRKSRC}/server/pichi.json.default ${STAGEDIR}${ETCDIR}/pichi.json.sample
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)pichi/distinfo (-2 / +2 lines)
1	TIMESTAMP = 1554899633	1	TIMESTAMP = 1554899633
2	SHA256 (pichi-router-pichi-1.2.0_GH0.tar.gz) = 8965077371f2dbf49a63659d686470c191c2c21c47a32f44b3b8bb2d72968043	2	SHA256 (pichi-router-pichi-1.2.1_GH0.tar.gz) = d7121fa83bae4178d2320844b902be104968d599b2dd069d45c7fba1a43f124b
3	SIZE (pichi-router-pichi-1.2.0_GH0.tar.gz) = 1841049	3	SIZE (pichi-router-pichi-1.2.1_GH0.tar.gz) = 1986692




--- CMakeLists.txt.orig	2019-04-14 16:29:43 UTC
+++ CMakeLists.txt
@@ -19,6 +19,14 @@ find_package(MaxmindDB 1.3.0 REQUIRED)
 find_package(Rapidjson 1.1.0 REQUIRED)
 find_package(Threads REQUIRED)
 
+if (Boost_VERSION_STRING VERSION_LESS "1.70.0")
+  set(RESOLVER_CONSTRUCTED_FROM_EXECUTOR OFF)
+else (Boost_VERSION_STRING VERSION_LESS "1.70.0")
+  set(RESOLVER_CONSTRUCTED_FROM_EXECUTOR ON)
+endif (Boost_VERSION_STRING VERSION_LESS "1.70.0")
+
+configure_file(${CMAKE_SOURCE_DIR}/include/config.h.in ${CMAKE_BINARY_DIR}/include/config.h)
+
 include_directories(
   ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_BINARY_DIR}/include

Lines 1-8 Link Here

(-)pichi/files/patch-cmake_ProcessOptions.cmake (-8 lines)
1	--- cmake/ProcessOptions.cmake.orig 2019-04-14 16:29:43 UTC
2	+++ cmake/ProcessOptions.cmake
3	@@ -83,5 +83,3 @@ if (BUILD_SERVER)
4	check_function_exists("setsid" HAS_SETSID)
5	check_function_exists("close" HAS_CLOSE)
6	endif (BUILD_SERVER)
7	-
8	-configure_file(${CMAKE_SOURCE_DIR}/include/config.h.in ${CMAKE_BINARY_DIR}/include/config.h)

Lines 1-11 Link Here

(-)pichi/files/patch-include_config.h.in (-11 lines)
1	--- include/config.h.in.orig 2019-04-14 16:29:43 UTC
2	+++ include/config.h.in
3	@@ -13,6 +13,8 @@
4	#cmakedefine HAS_SETSID
5	#cmakedefine HAS_CLOSE
6
7	+#cmakedefine RESOLVER_CONSTRUCTED_FROM_EXECUTOR
8	+
9	#cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
10
11	#ifdef CMAKE_INSTALL_PREFIX




--- src/net/asio.cpp.orig	2019-04-14 16:29:43 UTC
+++ src/net/asio.cpp
@@ -79,8 +79,12 @@ void connect(Endpoint const& endpoint, Socket& s, Yiel
   else
 #endif // BUILD_TEST
     asio::async_connect(s,
-                        tcp::resolver{s.get_executor().context()}.async_resolve(
-                            endpoint.host_, endpoint.port_, yield),
+                        tcp::resolver{s.get_executor()
+#ifndef RESOLVER_CONSTRUCTED_FROM_EXECUTOR
+                                          .context()
+#endif // RESOLVER_CONSTRUCTED_FROM_EXECUTOR
+                        }
+                            .async_resolve(endpoint.host_, endpoint.port_, yield),
                         yield);
 }
 




bin/pichi
%%ETCDIR%%/geo.mmdb
@sample %%ETCDIR%%/pichi.json.sample
etc/pichi/geo.mmdb
%%NO_STATIC%%lib/libpichi.so.%%DISTVERSION%%
%%NO_STATIC%%lib/libpichi.so
%%STATIC%%%%DEVEL%%lib/libpichi.a
%%DEVEL%%include/boost/asio/spawn2.hpp
%%DEVEL%%include/pichi.h
%%DEVEL%%include/pichi/api/egress_manager.hpp
%%DEVEL%%include/pichi/api/ingress_manager.hpp
%%DEVEL%%include/pichi/api/iterator.hpp
%%DEVEL%%include/pichi/api/rest.hpp
%%DEVEL%%include/pichi/api/router.hpp
%%DEVEL%%include/pichi/api/server.hpp
%%DEVEL%%include/pichi/api/session.hpp
%%DEVEL%%include/pichi/api/vos.hpp
%%DEVEL%%include/pichi/asserts.hpp
%%DEVEL%%include/pichi/buffer.hpp
%%DEVEL%%include/pichi/common.hpp
%%DEVEL%%include/pichi/config.hpp
%%DEVEL%%include/pichi/config.hpp.in
%%DEVEL%%include/pichi/crypto/aead.hpp
%%DEVEL%%include/pichi/crypto/hash.hpp
%%DEVEL%%include/pichi/crypto/key.hpp
%%DEVEL%%include/pichi/crypto/method.hpp
%%DEVEL%%include/pichi/crypto/stream.hpp
%%DEVEL%%include/pichi/exception.hpp
%%DEVEL%%include/pichi/net/adapter.hpp
%%DEVEL%%include/pichi/net/asio.hpp
%%DEVEL%%include/pichi/net/common.hpp
%%DEVEL%%include/pichi/net/direct.hpp
%%DEVEL%%include/pichi/net/helpers.hpp
%%DEVEL%%include/pichi/net/http.hpp
%%DEVEL%%include/pichi/net/reject.hpp
%%DEVEL%%include/pichi/net/socks5.hpp
%%DEVEL%%include/pichi/net/spawn.hpp
%%DEVEL%%include/pichi/net/ssaead.hpp
%%DEVEL%%include/pichi/net/ssstream.hpp
%%DEVEL%%include/pichi/scope_guard.hpp
%%DEVEL%%include/pichi/test/socket.hpp
%%DEVEL%%include/pichi/uri.hpp


Return to bug 243073

Lines 1-12 Link Here

(-)pichi/Makefile (-9 / +18 lines)
1	# $FreeBSD: head/net/pichi/Makefile 519824 2019-12-11 17:53:48Z jbeich $	1	# $FreeBSD: head/net/pichi/Makefile 519824 2019-12-11 17:53:48Z jbeich $
2		2
3	PORTNAME= pichi	3	PORTNAME= pichi
4	DISTVERSION= 1.2.0	4	DISTVERSION= 1.2.1
5	PORTREVISION= 1	5	PORTREVISION= 1
6	CATEGORIES= net	6	CATEGORIES= net
7		7
8	MAINTAINER= pichi@elude.in	8	MAINTAINER= pichi@elude.in
9	COMMENT= Application Layer Proxy controlled via RESTful APIs	9	COMMENT= Flexible rule-based proxy
10		10
11	LICENSE= BSD3CLAUSE	11	LICENSE= BSD3CLAUSE
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
Lines 22-41 Link Here
22	PLIST_SUB= DISTVERSION=${DISTVERSION}	22	PLIST_SUB= DISTVERSION=${DISTVERSION}
23		23
24	CMAKE_BUILD_TYPE= MinSizeRel	24	CMAKE_BUILD_TYPE= MinSizeRel
25	CMAKE_ARGS= -DVERSION=${DISTVERSION}	25	CMAKE_ARGS= -DVERSION=${DISTVERSION}
26	CMAKE_ON= BUILD_SERVER BUILD_TEST	26	CMAKE_ON= BUILD_SERVER BUILD_TEST
27	CMAKE_OFF= INSTALL_HEADERS	27	INSTALL_TARGET= install/strip
28	INSTALL_TARGET= install/strip	28	TEST_TARGET= test
29	TEST_TARGET= test
30		29
31	OPTIONS_DEFINE= STATIC TLS	30	OPTIONS_DEFINE= DEVEL STATIC TLS
32	OPTIONS_DEFAULT= TLS	31	OPTIONS_DEFAULT= TLS
33	OPTIONS_SUB= yes	32	OPTIONS_SUB= yes
34		33
35	TLS_DESC= Enable TLS support ( requiring OpenSSL )	34	TLS_DESC= Enable TLS support ( requiring OpenSSL )
36	TLS_CMAKE_BOOL= ENABLE_TLS	35	TLS_CMAKE_BOOL= ENABLE_TLS
37		36
38	STATIC_DESC= Build/Install static library	37	STATIC_DESC= Static linking
39	STATIC_CMAKE_BOOL= STATIC_LINK	38	STATIC_CMAKE_BOOL= STATIC_LINK
40	STATIC_BUILD_DEPENDS= boost-libs>=1.67.0:devel/boost-libs \	39	STATIC_BUILD_DEPENDS= boost-libs>=1.67.0:devel/boost-libs \
41	libmaxminddb>=1.3.0:net/libmaxminddb \	40	libmaxminddb>=1.3.0:net/libmaxminddb \
Lines 51-56 Link Here
51	libmbedx509.so:security/mbedtls \	50	libmbedx509.so:security/mbedtls \
52	libsodium.so:security/libsodium	51	libsodium.so:security/libsodium
53		52
		53	DEVEL_DESC= Install development files
		54	DEVEL_CMAKE_BOOL= INSTALL_HEADERS
		55
54	.include <bsd.port.options.mk>	56	.include <bsd.port.options.mk>
55		57
56	.if ! ${PORT_OPTIONS:MSTATIC}	58	.if ! ${PORT_OPTIONS:MSTATIC}
Lines 65-75 Link Here
65	.endif	67	.endif
66	.endif	68	.endif
67		69
		70	.if ${PORT_OPTIONS:MDEVEL}
68	post-install:	71	post-install:
69	${MKDIR} ${STAGEDIR}${ETCDIR}	72	${MKDIR} ${STAGEDIR}${ETCDIR}
70	${INSTALL_DATA} ${WRKSRC}/test/geo.mmdb ${STAGEDIR}${ETCDIR}/geo.mmdb	73	${INSTALL_DATA} ${WRKSRC}/test/geo.mmdb ${STAGEDIR}${ETCDIR}/geo.mmdb
71	${INSTALL_DATA} ${WRKSRC}/server/pichi.json.default ${STAGEDIR}${ETCDIR}/pichi.json.sample	74	${INSTALL_DATA} ${WRKSRC}/server/pichi.json.default ${STAGEDIR}${ETCDIR}/pichi.json.sample
72	${MKDIR} ${STAGEDIR}${PREFIX}/include	75	${MKDIR} ${STAGEDIR}${PREFIX}/include
73	${INSTALL_DATA} ${WRKSRC}/include/pichi.h ${STAGEDIR}${PREFIX}/include/pichi.h	76	${INSTALL_DATA} ${WRKSRC}/include/pichi.h ${STAGEDIR}${PREFIX}/include/pichi.h
		77	.else
		78	post-install:
		79	${MKDIR} ${STAGEDIR}${ETCDIR}
		80	${INSTALL_DATA} ${WRKSRC}/test/geo.mmdb ${STAGEDIR}${ETCDIR}/geo.mmdb
		81	${INSTALL_DATA} ${WRKSRC}/server/pichi.json.default ${STAGEDIR}${ETCDIR}/pichi.json.sample
		82	.endif
74		83
75	.include <bsd.port.mk>	84	.include <bsd.port.mk>

Lines 1-17 Link Here

(-)pichi/files/patch-CMakeLists.txt (-17 lines)
1	--- CMakeLists.txt.orig 2019-04-14 16:29:43 UTC
2	+++ CMakeLists.txt
3	@@ -19,6 +19,14 @@ find_package(MaxmindDB 1.3.0 REQUIRED)
4	find_package(Rapidjson 1.1.0 REQUIRED)
5	find_package(Threads REQUIRED)
6
7	+if (Boost_VERSION_STRING VERSION_LESS "1.70.0")
8	+ set(RESOLVER_CONSTRUCTED_FROM_EXECUTOR OFF)
9	+else (Boost_VERSION_STRING VERSION_LESS "1.70.0")
10	+ set(RESOLVER_CONSTRUCTED_FROM_EXECUTOR ON)
11	+endif (Boost_VERSION_STRING VERSION_LESS "1.70.0")
12	+
13	+configure_file(${CMAKE_SOURCE_DIR}/include/config.h.in ${CMAKE_BINARY_DIR}/include/config.h)
14	+
15	include_directories(
16	${CMAKE_SOURCE_DIR}/include
17	${CMAKE_BINARY_DIR}/include

Lines 1-17 Link Here

(-)pichi/files/patch-src_net_asio.cpp (-17 lines)
1	--- src/net/asio.cpp.orig 2019-04-14 16:29:43 UTC
2	+++ src/net/asio.cpp
3	@@ -79,8 +79,12 @@ void connect(Endpoint const& endpoint, Socket& s, Yiel
4	else
5	#endif // BUILD_TEST
6	asio::async_connect(s,
7	- tcp::resolver{s.get_executor().context()}.async_resolve(
8	- endpoint.host_, endpoint.port_, yield),
9	+ tcp::resolver{s.get_executor()
10	+#ifndef RESOLVER_CONSTRUCTED_FROM_EXECUTOR
11	+ .context()
12	+#endif // RESOLVER_CONSTRUCTED_FROM_EXECUTOR
13	+ }
14	+ .async_resolve(endpoint.host_, endpoint.port_, yield),
15	yield);
16	}
17

Lines 1-7 Link Here

(-)pichi/pkg-plist (-4 / +39 lines)
1	bin/pichi	1	bin/pichi
2	include/pichi.h	2	%%ETCDIR%%/geo.mmdb
3	@sample etc/pichi/pichi.json.sample	3	@sample %%ETCDIR%%/pichi.json.sample
4	etc/pichi/geo.mmdb
5	%%NO_STATIC%%lib/libpichi.so.%%DISTVERSION%%	4	%%NO_STATIC%%lib/libpichi.so.%%DISTVERSION%%
6	%%NO_STATIC%%lib/libpichi.so	5	%%NO_STATIC%%lib/libpichi.so
7	%%STATIC%%lib/libpichi.a	6	%%STATIC%%%%DEVEL%%lib/libpichi.a
		7	%%DEVEL%%include/boost/asio/spawn2.hpp
		8	%%DEVEL%%include/pichi.h
		9	%%DEVEL%%include/pichi/api/egress_manager.hpp
		10	%%DEVEL%%include/pichi/api/ingress_manager.hpp
		11	%%DEVEL%%include/pichi/api/iterator.hpp
		12	%%DEVEL%%include/pichi/api/rest.hpp
		13	%%DEVEL%%include/pichi/api/router.hpp
		14	%%DEVEL%%include/pichi/api/server.hpp
		15	%%DEVEL%%include/pichi/api/session.hpp
		16	%%DEVEL%%include/pichi/api/vos.hpp
		17	%%DEVEL%%include/pichi/asserts.hpp
		18	%%DEVEL%%include/pichi/buffer.hpp
		19	%%DEVEL%%include/pichi/common.hpp
		20	%%DEVEL%%include/pichi/config.hpp
		21	%%DEVEL%%include/pichi/config.hpp.in
		22	%%DEVEL%%include/pichi/crypto/aead.hpp
		23	%%DEVEL%%include/pichi/crypto/hash.hpp
		24	%%DEVEL%%include/pichi/crypto/key.hpp
		25	%%DEVEL%%include/pichi/crypto/method.hpp
		26	%%DEVEL%%include/pichi/crypto/stream.hpp
		27	%%DEVEL%%include/pichi/exception.hpp
		28	%%DEVEL%%include/pichi/net/adapter.hpp
		29	%%DEVEL%%include/pichi/net/asio.hpp
		30	%%DEVEL%%include/pichi/net/common.hpp
		31	%%DEVEL%%include/pichi/net/direct.hpp
		32	%%DEVEL%%include/pichi/net/helpers.hpp
		33	%%DEVEL%%include/pichi/net/http.hpp
		34	%%DEVEL%%include/pichi/net/reject.hpp
		35	%%DEVEL%%include/pichi/net/socks5.hpp
		36	%%DEVEL%%include/pichi/net/spawn.hpp
		37	%%DEVEL%%include/pichi/net/ssaead.hpp
		38	%%DEVEL%%include/pichi/net/ssstream.hpp
		39	%%DEVEL%%include/pichi/scope_guard.hpp
		40	%%DEVEL%%include/pichi/test/socket.hpp
		41	%%DEVEL%%include/pichi/uri.hpp
		42