Attachment 196768 Details for Bug 231033 – [PATCH] net-p2p/libbt: update to 1.0.6, reviewed

[patch] [PATCH] net-p2p/libbt: update to 1.0.6, reviewed

net-p2p_libbt_106.diff (text/plain), 5.20 KB, created by Vinícius Zavam on 2018-09-01 17:05:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vinícius Zavam

Created: 2018-09-01 17:05:45 UTC

Size: 5.20 KB

patch

obsolete

>Index: net-p2p/libbt/Makefile
>===================================================================
>--- net-p2p/libbt/Makefile	(revision 478710)
>+++ net-p2p/libbt/Makefile	(working copy)
>@@ -1,43 +1,43 @@
> # Created by: Florent Thoumie <flz@xbsd.org>
> # $FreeBSD$
> 
> PORTNAME=	libbt
>-PORTVERSION=	1.05
>-PORTREVISION=	5
>+PORTVERSION=	1.06
> CATEGORIES=	net-p2p devel
> MASTER_SITES=	SF
> 
>-MAINTAINER=	ports@FreeBSD.org
>+LICENSE=	GPLv2 LGPL21
>+LICENSE_COMB=	multi
>+
>+MAINTAINER=	egypcio@googlemail.com
> COMMENT=	C library implementing the core BitTorrent protocol
> 
>-LIB_DEPENDS=	libcurl.so:ftp/curl
>+LIB_DEPENDS=	libcurl.so:ftp/curl \
>+		libuuid.so:misc/e2fsprogs-libuuid
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+USES=		gmake localbase ssl
> 
>-PORTDOCS=	protocol-ext.txt protocol.txt
>+PORTDOCS=	protocol.txt protocol-ext.txt \
>+		CHANGELOG CREDITS README
> 
>-.include <bsd.port.options.mk>
>+OPTIONS_DEFINE=	DOCS
>+OPTIONS_SUB=	yes
> 
> 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
>+	${INSTALL_DATA} ${WRKSRC}/src/libbt.a ${STAGEDIR}${PREFIX}/lib
>+	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} btcheck btget btlist ${STAGEDIR}${PREFIX}/bin)
>+	(cd ${WRKSRC}/include && ${INSTALL_DATA} *.h ${STAGEDIR}${PREFIX}/include/libbt)
>+
>+post-install-DOCS-on:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
>-.for i in ${PORTDOCS}
>-	${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR}
>-.endfor
>+	${RLN} ${WRKSRC}/docs/*.txt ${WRKSRC}
>+	(cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
> 
> .include <bsd.port.mk>
>Index: net-p2p/libbt/distinfo
>===================================================================
>--- net-p2p/libbt/distinfo	(revision 478710)
>+++ net-p2p/libbt/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (libbt-1.05.tar.gz) = d4d770120c7e5df6957b2b40e1edb6695106142360d5caac521b31a4c59fa1c7
>-SIZE (libbt-1.05.tar.gz) = 322880
>+TIMESTAMP = 1535654605
>+SHA256 (libbt-1.06.tar.gz) = 89f7887ef892158fec2691efaf26036dab2a239ab87881473ae405f2f2d13560
>+SIZE (libbt-1.06.tar.gz) = 334835
>Index: net-p2p/libbt/files/patch-include__util.h
>===================================================================
>--- net-p2p/libbt/files/patch-include__util.h	(revision 478710)
>+++ net-p2p/libbt/files/patch-include__util.h	(working copy)
>@@ -1,12 +1,21 @@
>---- include/util.h	Fri Apr 16 08:41:48 2004
>-+++ include/util.h.new	Sun May 30 14:17:54 2004
>-@@ -28,9 +28,4 @@
>+--- 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 free(p) use_btfree_instead
>--
>- #endif
>++/*
>++ #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);
>+ 
>Index: net-p2p/libbt/files/patch-src__udpproto.c
>===================================================================
>--- net-p2p/libbt/files/patch-src__udpproto.c	(nonexistent)
>+++ net-p2p/libbt/files/patch-src__udpproto.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/udpproto.c.orig	2018-08-30 18:56:26 UTC
>++++ src/udpproto.c
>+@@ -4,7 +4,7 @@
>+ #include <string.h>
>+ #include <stdlib.h>
>+ #include <unistd.h>
>+-
>++#include <limits.h>
>+ #include <arpa/inet.h>
>+ 
>+ #include "udpproto.h"
>
>Property changes on: net-p2p/libbt/files/patch-src__udpproto.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-p2p/libbt/pkg-plist
>===================================================================
>--- net-p2p/libbt/pkg-plist	(revision 478710)
>+++ net-p2p/libbt/pkg-plist	(working copy)
>@@ -1,17 +1,25 @@
> bin/btcheck
> bin/btget
> bin/btlist
> include/libbt/benc.h
> include/libbt/bitset.h
> include/libbt/bterror.h
> include/libbt/btmessage.h
> include/libbt/bts.h
>+include/libbt/config.h
> include/libbt/context.h
> include/libbt/peer.h
>+include/libbt/peerexchange.h
> include/libbt/random.h
> include/libbt/segmenter.h
> include/libbt/strbuf.h
> include/libbt/stream.h
> include/libbt/types.h
>+include/libbt/udpproto.h
> include/libbt/util.h
> lib/libbt.a
>+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
>+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/protocol-ext.txt
>+%%PORTDOCS%%%%DOCSDIR%%/protocol.txt

Actions: View | Diff

Attachments on bug 231033: 196717 | 196728 | 196766 | 196768 | 196769 | 196770