Attachment #238177 for bug #264970




PORTNAME=	libtorrent-rasterbar
DISTVERSION=	1.2.18 # 2.x is unusable until memory problems are resolved, see https://github.com/arvidn/libtorrent/issues/6781
PORTREVISION=	0
PORTEPOCH=	2
CATEGORIES=	net-p2p
MASTER_SITES=	https://github.com/arvidn/libtorrent/releases/download/v${DISTVERSION}/

MAINTAINER=	yuri@FreeBSD.org
COMMENT=	C++ library implementing a BitTorrent client
WWW=		https://libtorrent.org/

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libboost_chrono.so:devel/boost-libs \
		libboost_random.so:devel/boost-libs \
		libboost_system.so:devel/boost-libs

USES=		cmake compiler:c++11-lib iconv:wchar_t libtool localbase:ldflags pathfix pkgconfig python:test shebangfix ssl
SHEBANG_FILES=	test/socks.py test/web_server.py
USE_LDCONFIG=	yes

USE_CXXSTD=	c++17 # prevent boost-related SEGV, see bug#264278

PORTDOCS=	${DOCFILES} docs/*
PORTEXAMPLES=	*.cpp

OPTIONS_DEFINE=		DOCS EXAMPLES LOGGING
OPTIONS_DEFAULT=	LOGGING
OPTIONS_SUB=		yes
LOGGING_DESC=		Enable logging to disk

EXAMPLES_CMAKE_BOOL=	build_examples
LOGGING_CMAKE_BOOL=	logging

PORTSCOUT=	limit:^1.* # 2.x is WIP and we don't accept it before qBittorrent does

CONFLICTS_INSTALL=	libtorrent-rasterbar2

post-patch:
	@${REINPLACE_CMD} -e 's|return "python3";|return "${PYTHON_CMD}";|' \
		${WRKSRC}/test/setup_transfer.cpp

post-install:
	# py-bindings seems to link this exact name after v1.2.14
	# TODO: figure out how to make symlinks in Jamfile
	/bin/ln -s libtorrent-rasterbar.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libtorrent-rasterbar.so.10.0.0
	@${RM} ${STAGEDIR}${PREFIX}/include/libtorrent/Makefile*
	# Workaround for -DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES being set in
	# Mk/Uses/cmake.mk
	# References:   https://mariadb.atlassian.net/browse/MDEV-9388
	#               https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=206169
	@${REINPLACE_CMD} 's/-l-pthread/-lpthread/' \
		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libtorrent-rasterbar.pc

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${DOCFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}
	${RM} ${STAGEDIR}${DOCSDIR}/docs/._*

post-install-EXAMPLES-on:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/examples/${PORTEXAMPLES} \
		${STAGEDIR}${EXAMPLESDIR}

do-test:

Lines 1-3 Link Here

(-)b/net-p2p/libtorrent-rasterbar/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1654705780	1	TIMESTAMP = 1667577326
2	SHA256 (libtorrent-rasterbar-1.2.16.tar.gz) = 5bdc221662541abdc324ded0a74b5cd3f30e6260871080b4a4b3295fb09f02e0	2	SHA256 (libtorrent-rasterbar-1.2.18.tar.gz) = fef2b6817de4e6d960e019c27f21daf27bc2468a81d9e028a19d45d61456fa72
3	SIZE (libtorrent-rasterbar-1.2.16.tar.gz) = 4163867	3	SIZE (libtorrent-rasterbar-1.2.18.tar.gz) = 4178407




include/libtorrent/udp_tracker_connection.hpp
include/libtorrent/union_endpoint.hpp
include/libtorrent/units.hpp
include/libtorrent/upnp.hpp
include/libtorrent/utf8.hpp
include/libtorrent/utp_socket_manager.hpp
include/libtorrent/utp_stream.hpp
include/libtorrent/vector_utils.hpp
include/libtorrent/version.hpp
include/libtorrent/web_connection_base.hpp
include/libtorrent/web_peer_connection.hpp
include/libtorrent/write_resume_data.hpp
include/libtorrent/xml_parse.hpp
lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarConfig.cmake
lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarConfigVersion.cmake
lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets.cmake
lib/libtorrent-rasterbar.so
lib/libtorrent-rasterbar.so.%%SO_VER%%
lib/libtorrent-rasterbar.so.%%SHLIB_VER%%
lib/libtorrent-rasterbar.so.10.0.0
libdata/pkgconfig/libtorrent-rasterbar.pc
share/cmake/Modules/FindLibtorrentRasterbar.cmake




PORTNAME=	libtorrent-rasterbar
DISTVERSIONPREFIX=	v
DISTVERSION=	1.2.18
PORTREVISION=	0
PORTEPOCH=	2
CATEGORIES=	net-p2p python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	yuri@FreeBSD.org
COMMENT=	Python bindings for libtorrent-rasterbar
WWW=		https://libtorrent.org/

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/../../COPYING

BROKEN=		can't create dynamic relocation R_X86_64_32 against local symbol in readonly segment, see https://github.com/arvidn/libtorrent/issues/6890

BUILD_DEPENDS=	b2:devel/boost_build
LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
		${PY_BOOST}

USES=		compiler:c11 iconv localbase:ldflags python:3.6+
USE_GITHUB=	yes
GH_ACCOUNT=	arvidn
GH_PROJECT=	libtorrent
USE_PYTHON=	distutils
PYDISTUTILS_PKGNAME=	libtorrent
PYDISTUTILS_BUILD_TARGET=	build_ext --b2-args="fpic=on libtorrent-link=shared boost-link=shared"
PYDISTUTILS_INSTALL_TARGET=	build_ext --b2-args="fpic=on libtorrent-link=shared boost-link=shared" install

BINARY_ALIAS=	b2=${FILESDIR}/b2

CFLAGS+=	-DTORRENT_DISABLE_LOGGING # undefined symbol: https://github.com/arvidn/libtorrent/issues/3331
LDFLAGS+=	${LOCALBASE}/lib/libboost_python${PYTHON_SUFFIX}.so ${LOCALBASE}/lib/libiconv.so # fails to link libs: https://github.com/arvidn/libtorrent/issues/3330

WRKSRC_SUBDIR=	bindings/python

# ensure python paths are correctly identified
CONFIGURE_ENV=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
		PYTHON_VERSION="${PYTHON_VERSION}"

PORTSCOUT=	limit:^1.* # 2.x is WIP and we don't accept it before qBittorrent does

PLIST_FILES+=	${PYTHON_SITELIBDIR}/${PYDISTUTILS_PKGNAME}/__init__${PYTHON_EXT_SUFFIX}.so
post-install:
	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PYDISTUTILS_PKGNAME}/__init__${PYTHON_EXT_SUFFIX}.so

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/net-p2p/py-libtorrent-rasterbar/distinfo (-4 / +3 lines)
1	TIMESTAMP = 1654714860	1	TIMESTAMP = 1667577329
2	SHA256 (arvidn-libtorrent-v1.2.16_GH0.tar.gz) = 2ee435c3e2e6dd8825903230b41fbaf0741b7aed57094f2ca0e6214d89fef9d4	2	SHA256 (arvidn-libtorrent-v1.2.18_GH0.tar.gz) = c4213bfb695db3e3b266be71865a7942f9007200aa4021946818fdc5e5e4a3d3
3	SIZE (arvidn-libtorrent-v1.2.16_GH0.tar.gz) = 3624920	3	SIZE (arvidn-libtorrent-v1.2.18_GH0.tar.gz) = 3633926
4	-

Return to bug 264970

Lines 1-23 Link Here

(-)b/net-p2p/libtorrent-rasterbar/Makefile (-2 / +5 lines)
1	PORTNAME= libtorrent-rasterbar	1	PORTNAME= libtorrent-rasterbar
2	DISTVERSION= 1.2.16 # 2.x is unusable until memory problems are resolved, see https://github.com/arvidn/libtorrent/issues/6781	2	DISTVERSION= 1.2.18 # 2.x is unusable until memory problems are resolved, see https://github.com/arvidn/libtorrent/issues/6781
3	PORTREVISION= 2	3	PORTREVISION= 0
4	PORTEPOCH= 2	4	PORTEPOCH= 2
5	CATEGORIES= net-p2p	5	CATEGORIES= net-p2p
6	MASTER_SITES= https://github.com/arvidn/libtorrent/releases/download/v${DISTVERSION}/	6	MASTER_SITES= https://github.com/arvidn/libtorrent/releases/download/v${DISTVERSION}/
7		7
8	MAINTAINER= yuri@FreeBSD.org	8	MAINTAINER= yuri@FreeBSD.org
9	COMMENT= C++ library implementing a BitTorrent client	9	COMMENT= C++ library implementing a BitTorrent client
10	WWW= https://libtorrent.org/	10	WWW= https://libtorrent.org/
11		11
12	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	LIB_DEPENDS= libboost_chrono.so:devel/boost-libs \	15	LIB_DEPENDS= libboost_chrono.so:devel/boost-libs \
16	libboost_random.so:devel/boost-libs \	16	libboost_random.so:devel/boost-libs \
17	libboost_system.so:devel/boost-libs	17	libboost_system.so:devel/boost-libs
18		18
19	USES= cmake compiler:c++11-lib iconv:wchar_t libtool localbase:ldflags pathfix pkgconfig python:test shebangfix ssl	19	USES= cmake compiler:c++11-lib iconv:wchar_t libtool localbase:ldflags pathfix pkgconfig python:test shebangfix ssl
20	SHEBANG_FILES= test/socks.py test/web_server.py	20	SHEBANG_FILES= test/socks.py test/web_server.py
21	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
22		22
23	USE_CXXSTD= c++17 # prevent boost-related SEGV, see bug#264278	23	USE_CXXSTD= c++17 # prevent boost-related SEGV, see bug#264278
Lines 31-70 DOCFILES= AUTHORS ChangeLog Link Here
31	PORTDOCS= ${DOCFILES} docs/*	31	PORTDOCS= ${DOCFILES} docs/*
32	PORTEXAMPLES= *.cpp	32	PORTEXAMPLES= *.cpp
33		33
34	OPTIONS_DEFINE= DOCS EXAMPLES LOGGING	34	OPTIONS_DEFINE= DOCS EXAMPLES LOGGING
35	OPTIONS_DEFAULT= LOGGING	35	OPTIONS_DEFAULT= LOGGING
36	OPTIONS_SUB= yes	36	OPTIONS_SUB= yes
37	LOGGING_DESC= Enable logging to disk	37	LOGGING_DESC= Enable logging to disk
38		38
39	EXAMPLES_CMAKE_BOOL= build_examples	39	EXAMPLES_CMAKE_BOOL= build_examples
40	LOGGING_CMAKE_BOOL= logging	40	LOGGING_CMAKE_BOOL= logging
41		41
42	PORTSCOUT= limit:^1.* # 2.x is WIP and we don't accept it before qBittorrent does	42	PORTSCOUT= limit:^1.* # 2.x is WIP and we don't accept it before qBittorrent does
43		43
44	CONFLICTS_INSTALL= libtorrent-rasterbar2	44	CONFLICTS_INSTALL= libtorrent-rasterbar2
45		45
46	post-patch:	46	post-patch:
47	@${REINPLACE_CMD} -e 's\|return "python3";\|return "${PYTHON_CMD}";\|' \	47	@${REINPLACE_CMD} -e 's\|return "python3";\|return "${PYTHON_CMD}";\|' \
48	${WRKSRC}/test/setup_transfer.cpp	48	${WRKSRC}/test/setup_transfer.cpp
49		49
50	post-install:	50	post-install:
		51	# py-bindings seems to link this exact name after v1.2.14
		52	# TODO: figure out how to make symlinks in Jamfile
		53	/bin/ln -s libtorrent-rasterbar.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libtorrent-rasterbar.so.10.0.0
51	@${RM} ${STAGEDIR}${PREFIX}/include/libtorrent/Makefile*	54	@${RM} ${STAGEDIR}${PREFIX}/include/libtorrent/Makefile*
52	# Workaround for -DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES being set in	55	# Workaround for -DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES being set in
53	# Mk/Uses/cmake.mk	56	# Mk/Uses/cmake.mk
54	# References: https://mariadb.atlassian.net/browse/MDEV-9388	57	# References: https://mariadb.atlassian.net/browse/MDEV-9388
55	# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=206169	58	# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=206169
56	@${REINPLACE_CMD} 's/-l-pthread/-lpthread/' \	59	@${REINPLACE_CMD} 's/-l-pthread/-lpthread/' \
57	${STAGEDIR}${PREFIX}/libdata/pkgconfig/libtorrent-rasterbar.pc	60	${STAGEDIR}${PREFIX}/libdata/pkgconfig/libtorrent-rasterbar.pc
58		61
59	post-install-DOCS-on:	62	post-install-DOCS-on:
60	@${MKDIR} ${STAGEDIR}${DOCSDIR}	63	@${MKDIR} ${STAGEDIR}${DOCSDIR}
61	${INSTALL_DATA} ${DOCFILES:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}	64	${INSTALL_DATA} ${DOCFILES:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}
62	cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}	65	cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}
63	${RM} ${STAGEDIR}${DOCSDIR}/docs/._*	66	${RM} ${STAGEDIR}${DOCSDIR}/docs/._*
64		67
65	post-install-EXAMPLES-on:	68	post-install-EXAMPLES-on:
66	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	69	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
67	${INSTALL_DATA} ${WRKSRC}/examples/${PORTEXAMPLES} \	70	${INSTALL_DATA} ${WRKSRC}/examples/${PORTEXAMPLES} \
68	${STAGEDIR}${EXAMPLESDIR}	71	${STAGEDIR}${EXAMPLESDIR}
69		72
70	do-test:	73	do-test:

Lines 235-256 include/libtorrent/udp_socket.hpp Link Here

(-)b/net-p2p/libtorrent-rasterbar/pkg-plist (+1 lines)
235	include/libtorrent/udp_tracker_connection.hpp	235	include/libtorrent/udp_tracker_connection.hpp
236	include/libtorrent/union_endpoint.hpp	236	include/libtorrent/union_endpoint.hpp
237	include/libtorrent/units.hpp	237	include/libtorrent/units.hpp
238	include/libtorrent/upnp.hpp	238	include/libtorrent/upnp.hpp
239	include/libtorrent/utf8.hpp	239	include/libtorrent/utf8.hpp
240	include/libtorrent/utp_socket_manager.hpp	240	include/libtorrent/utp_socket_manager.hpp
241	include/libtorrent/utp_stream.hpp	241	include/libtorrent/utp_stream.hpp
242	include/libtorrent/vector_utils.hpp	242	include/libtorrent/vector_utils.hpp
243	include/libtorrent/version.hpp	243	include/libtorrent/version.hpp
244	include/libtorrent/web_connection_base.hpp	244	include/libtorrent/web_connection_base.hpp
245	include/libtorrent/web_peer_connection.hpp	245	include/libtorrent/web_peer_connection.hpp
246	include/libtorrent/write_resume_data.hpp	246	include/libtorrent/write_resume_data.hpp
247	include/libtorrent/xml_parse.hpp	247	include/libtorrent/xml_parse.hpp
248	lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarConfig.cmake	248	lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarConfig.cmake
249	lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarConfigVersion.cmake	249	lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarConfigVersion.cmake
250	lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets-%%CMAKE_BUILD_TYPE%%.cmake	250	lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets-%%CMAKE_BUILD_TYPE%%.cmake
251	lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets.cmake	251	lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets.cmake
252	lib/libtorrent-rasterbar.so	252	lib/libtorrent-rasterbar.so
253	lib/libtorrent-rasterbar.so.%%SO_VER%%	253	lib/libtorrent-rasterbar.so.%%SO_VER%%
254	lib/libtorrent-rasterbar.so.%%SHLIB_VER%%	254	lib/libtorrent-rasterbar.so.%%SHLIB_VER%%
		255	lib/libtorrent-rasterbar.so.10.0.0
255	libdata/pkgconfig/libtorrent-rasterbar.pc	256	libdata/pkgconfig/libtorrent-rasterbar.pc
256	share/cmake/Modules/FindLibtorrentRasterbar.cmake	257	share/cmake/Modules/FindLibtorrentRasterbar.cmake

Lines 1-44 Link Here

(-)b/net-p2p/py-libtorrent-rasterbar/Makefile (-6 / +8 lines)
1	PORTNAME= libtorrent-rasterbar	1	PORTNAME= libtorrent-rasterbar
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 1.2.16	3	DISTVERSION= 1.2.18
4	PORTREVISION= 1	4	PORTREVISION= 0
5	PORTEPOCH= 2	5	PORTEPOCH= 2
6	CATEGORIES= net-p2p python	6	CATEGORIES= net-p2p python
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
8		8
9	MAINTAINER= yuri@FreeBSD.org	9	MAINTAINER= yuri@FreeBSD.org
10	COMMENT= Python bindings for libtorrent-rasterbar	10	COMMENT= Python bindings for libtorrent-rasterbar
11	WWW= https://libtorrent.org/	11	WWW= https://libtorrent.org/
12		12
13	LICENSE= BSD3CLAUSE	13	LICENSE= BSD3CLAUSE
14	LICENSE_FILE= ${WRKSRC}/../../COPYING	14	LICENSE_FILE= ${WRKSRC}/../../COPYING
15		15
16	BROKEN= can't create dynamic relocation R_X86_64_32 against local symbol in readonly segment, see https://github.com/arvidn/libtorrent/issues/6890
17
18	BUILD_DEPENDS= b2:devel/boost_build	16	BUILD_DEPENDS= b2:devel/boost_build
19	LIB_DEPENDS= libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \	17	LIB_DEPENDS= libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
20	${PY_BOOST}	18	${PY_BOOST}
21		19
22	USES= compiler:c11 iconv localbase:ldflags python:3.6+	20	USES= compiler:c11 iconv localbase:ldflags python:3.6+
23	USE_GITHUB= yes	21	USE_GITHUB= yes
24	GH_ACCOUNT= arvidn	22	GH_ACCOUNT= arvidn
25	GH_PROJECT= libtorrent	23	GH_PROJECT= libtorrent
26	USE_PYTHON= distutils autoplist	24	USE_PYTHON= distutils
		25	PYDISTUTILS_PKGNAME= libtorrent
		26	PYDISTUTILS_BUILD_TARGET= build_ext --b2-args="fpic=on libtorrent-link=shared boost-link=shared"
		27	PYDISTUTILS_INSTALL_TARGET= build_ext --b2-args="fpic=on libtorrent-link=shared boost-link=shared" install
27		28
28	BINARY_ALIAS= b2=${FILESDIR}/b2	29	BINARY_ALIAS= b2=${FILESDIR}/b2
29		30
30	CFLAGS+= -DTORRENT_DISABLE_LOGGING # undefined symbol: https://github.com/arvidn/libtorrent/issues/3331	31	CFLAGS+= -DTORRENT_DISABLE_LOGGING # undefined symbol: https://github.com/arvidn/libtorrent/issues/3331
31	LDFLAGS+= ${LOCALBASE}/lib/libboost_python${PYTHON_SUFFIX}.so ${LOCALBASE}/lib/libiconv.so # fails to link libs: https://github.com/arvidn/libtorrent/issues/3330	32	LDFLAGS+= ${LOCALBASE}/lib/libboost_python${PYTHON_SUFFIX}.so ${LOCALBASE}/lib/libiconv.so # fails to link libs: https://github.com/arvidn/libtorrent/issues/3330
32		33
33	WRKSRC_SUBDIR= bindings/python	34	WRKSRC_SUBDIR= bindings/python
34		35
35	# ensure python paths are correctly identified	36	# ensure python paths are correctly identified
36	CONFIGURE_ENV= PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \	37	CONFIGURE_ENV= PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
37	PYTHON_VERSION="${PYTHON_VERSION}"	38	PYTHON_VERSION="${PYTHON_VERSION}"
38		39
39	PORTSCOUT= limit:^1.* # 2.x is WIP and we don't accept it before qBittorrent does	40	PORTSCOUT= limit:^1.* # 2.x is WIP and we don't accept it before qBittorrent does
40		41
		42	PLIST_FILES+= ${PYTHON_SITELIBDIR}/${PYDISTUTILS_PKGNAME}/__init__${PYTHON_EXT_SUFFIX}.so
41	post-install:	43	post-install:
42	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/libtorrent*.so	44	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PYDISTUTILS_PKGNAME}/__init__${PYTHON_EXT_SUFFIX}.so
43		45
44	.include <bsd.port.mk>	46	.include <bsd.port.mk>