From: Nicholas Marriott (nicholas.marriottgmail.com)
Date: Mon Aug 23 2010 - 14:24:12 CDT

• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

btpd is alive again on github.

patches are now upstream so patch -E.

comments/ok?

cheers

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/btpd/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 12 Jul 2010 22:07:37 -0000 1.9
+++ Makefile 9 Aug 2010 18:30:24 -0000
-2,15 +2,14
 
 COMMENT= BitTorrent Protocol Daemon
 
-DISTNAME= btpd-0.15
-REVISION= 1
+DISTNAME= btpd-0.16
 CATEGORIES= net
 
 MAINTAINER= Nicholas Marriott <nicmopenbsd.org>
 
-HOMEPAGE= http://www.murmeldjur.se/btpd/
+HOMEPAGE= http://wiki.github.com/btpd/btpd/
 
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES= http://github.com/downloads/btpd/btpd/
 
 # BSD
 PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/btpd/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 12 Feb 2009 12:27:35 -0000 1.5
+++ distinfo 9 Aug 2010 18:30:51 -0000
-1,5 +1,5
-MD5 (btpd-0.15.tar.gz) = tk4ui5k26ZaFvB5yRmVVYQ==
-RMD160 (btpd-0.15.tar.gz) = ID6olCpTAu0m2QCP0aCNo1hZHTw=
-SHA1 (btpd-0.15.tar.gz) = 1hOuPUbz71SK2Kfg3yeLDicrtmw=
-SHA256 (btpd-0.15.tar.gz) = wiKSRMPLNwrJVWDi6f9/XQlGEu4rKh42I37H8ncH250=
-SIZE (btpd-0.15.tar.gz) = 144706
+MD5 (btpd-0.16.tar.gz) = /gQqro18UV7NhVZz0cKzPg==
+RMD160 (btpd-0.16.tar.gz) = Ba8ULY7MWCZ3kJCHvVMSlWHIYTU=
+SHA1 (btpd-0.16.tar.gz) = +305btXCJNxudDrEgeT+tKPPe3U=
+SHA256 (btpd-0.16.tar.gz) = KWvbcY6rqcqTi+5W8JdmIgBslWmAq3/HozlTDYj1Hrg=
+SIZE (btpd-0.16.tar.gz) = 159716
Index: patches/patch-btpd_addrinfo_c
===================================================================
RCS file: patches/patch-btpd_addrinfo_c
diff -N patches/patch-btpd_addrinfo_c
--- patches/patch-btpd_addrinfo_c 11 Jan 2010 22:53:35 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
-1,12 +0,0
-$OpenBSD: patch-btpd_addrinfo_c,v 1.1 2010/01/11 22:53:35 nicm Exp $
---- btpd/addrinfo.c.orig Wed Dec 23 18:45:51 2009
-+++ btpd/addrinfo.c Wed Dec 23 18:45:54 2009
- -52,7 +52,7 addrinfo_td_cb(void *arg)
- struct ai_ctx *ctx = arg;
- if (!ctx->cancel)
- ctx->cb(ctx->arg, ctx->error, ctx->res);
-- else if (ctx->error != 0)
-+ else if (ctx->res != NULL)
- freeaddrinfo(ctx->res);
- free(ctx);
- }
Index: patches/patch-misc_http_client_c
===================================================================
RCS file: patches/patch-misc_http_client_c
diff -N patches/patch-misc_http_client_c
--- patches/patch-misc_http_client_c 11 Jan 2010 22:53:35 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
-1,25 +0,0
-$OpenBSD: patch-misc_http_client_c,v 1.1 2010/01/11 22:53:35 nicm Exp $
---- misc/http_client.c.orig Mon Jan 12 14:43:18 2009
-+++ misc/http_client.c Tue Dec 22 23:19:29 2009
- -230,6 +230,12 again:
- else
- goto error;
- }
-+
-+ /* req->rbuf.buf may be reallocated inside iobuf_write()
-+ * so we should calculate the offset before that happens
-+ */
-+ size_t consumed = end - (char *)req->rbuf.buf + dlen;
-+
- if (!iobuf_write(&req->rbuf, "", 1))
- goto error;
- req->rbuf.off--;
- -237,7 +243,7 again:
- goto error;
- if (req->cancel)
- goto cancel;
-- iobuf_consumed(&req->rbuf, end - (char *)req->rbuf.buf + dlen);
-+ iobuf_consumed(&req->rbuf, consumed);
- goto again;
- case PS_CHUNK_SIZE:
- assert(req->chunked);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/btpd/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 8 Feb 2009 14:36:01 -0000 1.2
+++ pkg/PLIST 11 Aug 2010 07:50:32 -0000
-2,5 +2,8
 bin bin/btcli
 bin bin/btinfo
 bin bin/btpd
+man man/man1/btcli.1
+man man/man1/btinfo.1
+man man/man1/btpd.1
 share/doc/btpd/
 share/doc/btpd/README

• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]