Attachment #207192 for bug #239486

View | Details | Raw Unified | Return to bug 239486
Collapse All | Expand All




PORTNAME=	retroshare
DISTVERSIONPREFIX=	v
DISTVERSION=	0.6.4
PORTREVISION=	5
CATEGORIES=	net-p2p

PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/


USES=		compiler:features desktop-file-utils dos2unix \
		gnome pkgconfig qmake qt:5 ssl

USE_GITHUB=	yes
GH_ACCOUNT=	RetroShare
GH_PROJECT=	RetroShare
RS_REVISION=	0e6d27a

USE_GNOME=	libxml2 libxslt
USE_GL=		gl
USE_QT=		core gui multimedia printsupport network widgets xml \
		buildtools_build uitools_build
USE_LDCONFIG=	yes

DOS2UNIX_FILES=	retroshare-nogui/src/retroshare-nogui.pro

.include <bsd.port.pre.mk>




--- libretroshare/src/tcponudp/bss_tou.c.orig	2019-09-04 17:37:42 UTC
+++ libretroshare/src/tcponudp/bss_tou.c
@@ -90,13 +90,18 @@ static int clear_tou_socket_error(int s)
 
 #include "tou.h"
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L 
 //static void BIO_set_shutdown(BIO *a,int s) { a->shutdown=s; }
 
 static int  BIO_get_shutdown(BIO *a) { return a->shutdown; }
 static int  BIO_get_init(BIO *a) { return a->init; }
 static void BIO_set_init(BIO *a,int i) { a->init=i; }
 static void BIO_set_data(BIO *a,void *p) { a->ptr = p; }
+#elif  defined(LIBRESSL_VERSION_NUMBER)
+int  BIO_get_shutdown(BIO *a) { return a->shutdown; }
+int  BIO_get_init(BIO *a) { return a->init; }
+void BIO_set_init(BIO *a,int i) { a->init=i; }
+void BIO_set_data(BIO *a,void *p) { a->ptr = p; }
 #else
 typedef struct bio_method_st {
     int type;

Return to bug 239486

Lines 4-10 Link Here

(-)Makefile (-1 / +5 lines)
4	PORTNAME= retroshare	4	PORTNAME= retroshare
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 0.6.4	6	DISTVERSION= 0.6.4
7	PORTREVISION= 4	7	PORTREVISION= 5
8	CATEGORIES= net-p2p	8	CATEGORIES= net-p2p
9		9
10	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/	10	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
Lines 30-43 Link Here
30		30
31	USES= compiler:features desktop-file-utils dos2unix \	31	USES= compiler:features desktop-file-utils dos2unix \
32	gnome pkgconfig qmake qt:5 ssl	32	gnome pkgconfig qmake qt:5 ssl
		33
33	USE_GITHUB= yes	34	USE_GITHUB= yes
34	GH_ACCOUNT= RetroShare	35	GH_ACCOUNT= RetroShare
35	GH_PROJECT= RetroShare	36	GH_PROJECT= RetroShare
36	RS_REVISION= 0e6d27a	37	RS_REVISION= 0e6d27a
		38
37	USE_GNOME= libxml2 libxslt	39	USE_GNOME= libxml2 libxslt
38	USE_GL= gl	40	USE_GL= gl
39	USE_QT= core gui multimedia printsupport network widgets xml \	41	USE_QT= core gui multimedia printsupport network widgets xml \
40	buildtools_build uitools_build	42	buildtools_build uitools_build
		43	USE_LDCONFIG= yes
		44
41	DOS2UNIX_FILES= retroshare-nogui/src/retroshare-nogui.pro	45	DOS2UNIX_FILES= retroshare-nogui/src/retroshare-nogui.pro
42		46
43	.include <bsd.port.pre.mk>	47	.include <bsd.port.pre.mk>

Line 0 Link Here

(-)files/patch-libretroshare_src_tcponudp-bss_tou.c (+22 lines)
	1	--- libretroshare/src/tcponudp/bss_tou.c.orig 2019-09-04 17:37:42 UTC
	2	+++ libretroshare/src/tcponudp/bss_tou.c
	3	@@ -90,13 +90,18 @@ static int clear_tou_socket_error(int s)
	4
	5	#include "tou.h"
	6
	7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
	8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L
	9	//static void BIO_set_shutdown(BIO *a,int s) { a->shutdown=s; }
	10
	11	static int BIO_get_shutdown(BIO *a) { return a->shutdown; }
	12	static int BIO_get_init(BIO *a) { return a->init; }
	13	static void BIO_set_init(BIO *a,int i) { a->init=i; }
	14	static void BIO_set_data(BIO a,void p) { a->ptr = p; }
	15	+#elif defined(LIBRESSL_VERSION_NUMBER)
	16	+int BIO_get_shutdown(BIO *a) { return a->shutdown; }
	17	+int BIO_get_init(BIO *a) { return a->init; }
	18	+void BIO_set_init(BIO *a,int i) { a->init=i; }
	19	+void BIO_set_data(BIO a,void p) { a->ptr = p; }
	20	#else
	21	typedef struct bio_method_st {
	22	int type;