Attachment #196717 for bug #231033




# Created by: Florent Thoumie <flz@xbsd.org>
# $FreeBSD$

PORTNAME=	libbt
PORTVERSION=	1.06
PORTREVISION=	5
CATEGORIES=	net-p2p devel
MASTER_SITES=	SF

LICENSE=	GPLv2 LGPL21
LICENSE_COMB=	multi

MAINTAINER=	egypcio@googlemail.com
COMMENT=	C library implementing the core BitTorrent protocol

LIB_DEPENDS=	libcurl.so:ftp/curl

GNU_CONFIGURE=	yes
USES=		gmake ssl
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

PORTDOCS=	protocol-ext.txt protocol.txt

.include <bsd.port.options.mk>

post-patch:
	@${REINPLACE_CMD} -e 's|depend||' ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e 's|-lssl|-lcrypto|' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|\(CFLAGS:=\)|\1\@CFLAGS\@ \@CPPFLAGS\@ |' ${WRKSRC}/src/Makefile.in

do-install:
	${INSTALL_DATA} ${WRKSRC}/src/libbt.a ${STAGEDIR}${PREFIX}/lib
	${MKDIR} ${STAGEDIR}${PREFIX}/include/libbt
.for i in btcheck btget btlist
	${INSTALL_PROGRAM} ${WRKSRC}/src/${i} ${STAGEDIR}${PREFIX}/bin
.endfor
.for i in benc.h bitset.h bterror.h btmessage.h bts.h context.h peer.h random.h segmenter.h strbuf.h stream.h types.h util.h
	${INSTALL_DATA} ${WRKSRC}/include/${i} ${STAGEDIR}${PREFIX}/include/libbt
.endfor
	${MKDIR} ${STAGEDIR}${DOCSDIR}
.for i in ${PORTDOCS}
	${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR}
.endfor

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)net-p2p/libbt/distinfo (-2 / +3 lines)
1	SHA256 (libbt-1.05.tar.gz) = d4d770120c7e5df6957b2b40e1edb6695106142360d5caac521b31a4c59fa1c7	1	TIMESTAMP = 1535654605
2	SIZE (libbt-1.05.tar.gz) = 322880	2	SHA256 (libbt-1.06.tar.gz) = 89f7887ef892158fec2691efaf26036dab2a239ab87881473ae405f2f2d13560
		3	SIZE (libbt-1.06.tar.gz) = 334835




--- include/util.h.orig	2018-08-30 18:48:15 UTC
+++ include/util.h
@@ -53,11 +53,15 @@
 	typedef void (*exitfn_ptr) (int,void*);
 	int on_exit( exitfn_ptr exitfn, void* data) ;
 #endif
-#define malloc(s) use_btmalloc_instead
-#define calloc(n,s) use_btcalloc_instead
-#define realloc(p,s) use_btrealloc_instead
+/*
+ #define malloc(s) use_btmalloc_instead
+ #define calloc(n,s) use_btcalloc_instead
+ #define realloc(p,s) use_btrealloc_instead
+/*
 #undef free
+/*
 #define free(p) use_btfree_instead
+*/
 
 void hexdump( void *buf, int buflen);
 

Line 0 Link Here

(-)net-p2p/libbt/files/patch-src__udpproto.c (+11 lines)
	1	--- src/udpproto.c.orig 2018-08-30 18:56:26 UTC
	2	+++ src/udpproto.c
	3	@@ -4,7 +4,7 @@
	4	#include <string.h>
	5	#include <stdlib.h>
	6	#include <unistd.h>
	7	-
	8	+#include <limits.h>
	9	#include <arpa/inet.h>
	10
	11	#include "udpproto.h"

Return to bug 231033

Lines 1-43 Link Here

(-)net-p2p/libbt/Makefile (-4 / +6 lines)
1	# Created by: Florent Thoumie <flz@xbsd.org>	1	# Created by: Florent Thoumie <flz@xbsd.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libbt	4	PORTNAME= libbt
5	PORTVERSION= 1.05	5	PORTVERSION= 1.06
6	PORTREVISION= 5
7	CATEGORIES= net-p2p devel	6	CATEGORIES= net-p2p devel
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9		8
10	MAINTAINER= ports@FreeBSD.org	9	LICENSE= GPLv2 LGPL21
		10	LICENSE_COMB= multi
		11
		12	MAINTAINER= egypcio@googlemail.com
11	COMMENT= C library implementing the core BitTorrent protocol	13	COMMENT= C library implementing the core BitTorrent protocol
12		14
13	LIB_DEPENDS= libcurl.so:ftp/curl	15	LIB_DEPENDS= libcurl.so:ftp/curl
14		16
15	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
16	USES= gmake	18	USES= gmake ssl
17	CPPFLAGS+= -I${LOCALBASE}/include	19	CPPFLAGS+= -I${LOCALBASE}/include
18	LDFLAGS+= -L${LOCALBASE}/lib	20	LDFLAGS+= -L${LOCALBASE}/lib
19		21
20	PORTDOCS= protocol-ext.txt protocol.txt	22	PORTDOCS= protocol-ext.txt protocol.txt
21		23
22	.include <bsd.port.options.mk>	24	.include <bsd.port.options.mk>
23		25
24	post-patch:	26	post-patch:
25	@${REINPLACE_CMD} -e 's\|depend\|\|' ${WRKSRC}/Makefile.in	27	@${REINPLACE_CMD} -e 's\|depend\|\|' ${WRKSRC}/Makefile.in
26	@${REINPLACE_CMD} -e 's\|-lssl\|-lcrypto\|' ${WRKSRC}/configure	28	@${REINPLACE_CMD} -e 's\|-lssl\|-lcrypto\|' ${WRKSRC}/configure
27	@${REINPLACE_CMD} -e 's\|\(CFLAGS:=\)\|\1\@CFLAGS\@ \@CPPFLAGS\@ \|' ${WRKSRC}/src/Makefile.in	29	@${REINPLACE_CMD} -e 's\|\(CFLAGS:=\)\|\1\@CFLAGS\@ \@CPPFLAGS\@ \|' ${WRKSRC}/src/Makefile.in
28		30
29	do-install:	31	do-install:
30	${INSTALL_DATA} ${WRKSRC}/src/libbt.a ${STAGEDIR}${PREFIX}/lib	32	${INSTALL_DATA} ${WRKSRC}/src/libbt.a ${STAGEDIR}${PREFIX}/lib
31	${MKDIR} ${STAGEDIR}${PREFIX}/include/libbt	33	${MKDIR} ${STAGEDIR}${PREFIX}/include/libbt
32	.for i in btcheck btget btlist	34	.for i in btcheck btget btlist
33	${INSTALL_PROGRAM} ${WRKSRC}/src/${i} ${STAGEDIR}${PREFIX}/bin	35	${INSTALL_PROGRAM} ${WRKSRC}/src/${i} ${STAGEDIR}${PREFIX}/bin
34	.endfor	36	.endfor
35	.for i in benc.h bitset.h bterror.h btmessage.h bts.h context.h peer.h random.h segmenter.h strbuf.h stream.h types.h util.h	37	.for i in benc.h bitset.h bterror.h btmessage.h bts.h context.h peer.h random.h segmenter.h strbuf.h stream.h types.h util.h
36	${INSTALL_DATA} ${WRKSRC}/include/${i} ${STAGEDIR}${PREFIX}/include/libbt	38	${INSTALL_DATA} ${WRKSRC}/include/${i} ${STAGEDIR}${PREFIX}/include/libbt
37	.endfor	39	.endfor
38	${MKDIR} ${STAGEDIR}${DOCSDIR}	40	${MKDIR} ${STAGEDIR}${DOCSDIR}
39	.for i in ${PORTDOCS}	41	.for i in ${PORTDOCS}
40	${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR}	42	${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR}
41	.endfor	43	.endfor
42		44
43	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Lines 1-12 Link Here

(-)net-p2p/libbt/files/patch-include__util.h (-6 / +15 lines)
1	--- include/util.h Fri Apr 16 08:41:48 2004	1	--- include/util.h.orig 2018-08-30 18:48:15 UTC
2	+++ include/util.h.new Sun May 30 14:17:54 2004	2	+++ include/util.h
3	@@ -28,9 +28,4 @@	3	@@ -53,11 +53,15 @@
4	typedef void (exitfn_ptr) (int,void);	4	typedef void (exitfn_ptr) (int,void);
5	int on_exit( exitfn_ptr exitfn, void* data) ;	5	int on_exit( exitfn_ptr exitfn, void* data) ;
6	#endif	6	#endif
7	-#define malloc(s) use_btmalloc_instead	7	-#define malloc(s) use_btmalloc_instead
8	-#define calloc(n,s) use_btcalloc_instead	8	-#define calloc(n,s) use_btcalloc_instead
9	-#define realloc(p,s) use_btrealloc_instead	9	-#define realloc(p,s) use_btrealloc_instead
10	-#define free(p) use_btfree_instead	10	+/*
11	-	11	+ #define malloc(s) use_btmalloc_instead
12	#endif	12	+ #define calloc(n,s) use_btcalloc_instead
		13	+ #define realloc(p,s) use_btrealloc_instead
		14	+/*
		15	#undef free
		16	+/*
		17	#define free(p) use_btfree_instead
		18	+*/
		19
		20	void hexdump( void *buf, int buflen);
		21