Date: Sat, 25 Apr 2009 12:22:30 +0200 (CEST) From: Peter Schuller <peter.schuller@infidyne.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dougb@FreeBSD.org Subject: ports/133993: [MAINTAINER] net-p2p/bitflu: update to 0.81 Message-ID: <20090425102230.B3F3C3AD37A@prometheus.scode.org> Resent-Message-ID: <200904251030.n3PAU3Xg088358@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 133993
>Category: ports
>Synopsis: [MAINTAINER] net-p2p/bitflu: update to 0.81
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Apr 25 10:30:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Peter Schuller
>Release: FreeBSD 8.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD prometheus.scode.org 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Fri Apr 24 21:16:17 CEST 2009
>Description:
- Update to 0.81. Most of the changes are due to dougb@ (thanks!), I just upped to .81 which
contains a IPv6 compatibility fix that caused problems in .80.
Of particular note for committer:
- The patch removes the @dirrm for the DOCSDIR. With it in place, removal fails because it tries
to remove it twice. portlint -C does complain about the @dirrm being m issing, but if I re-add it
pkg_delete:s are broken due to repeated removal attempts. Some ports seem to get away with this
(such as security/wipe) without portlint complaining, but I don't get what the rule is and why it
complains in my case but not in the wipe case.
Generated with FreeBSD Port Tools 0.77
Upstream ChangeLog:
Version 0.81 (Released: 20090412)
Network:
* Fixed IPv6 resolver on FreeBSD (and others?)
* Increased network buffer-size to 32kb (old: 8kb on Linux, 1kb on FreeBSD)
This should fix speed issues on *BSD
BitTorrent:
* Bugfix: Fixed broken 'tracker show' output (broke in 0.80 due to IPv6)
Kademlia:
* IPv6 Support (Experimental: Bitflu is currently the only implementation
that supports IPv6-Kad)
StorageVFS:
* New configuration option vfs_use_allocator
Turns bitflus internal pre-allocator on or off
Setting this to 1 causes bitflu to pre-allocate data.
This results in more disc activity but can help to avoid fragmentation
on some filesystems. Setting this to 0 turns the pre-allocation off
The default is '0' (= Disabled).
(Note: Bitflu <= 0.80 had this on and you couldn't turn it off)
Version 0.80 (Released: 20090209)
This might be the worst or the best bitflu release ever: You decide (and i
don't care :-p )
Bitflu 0.80 brings you (almost) full IPv6 support. yeah!
Core:
* Support for binding an OUTGOING connection to a specific (non-standard)
Interface has been dropped.
* Network: IPv6 support!
* Network: API-Change: Use of IPv4 has been replaced by RemoteIp
* Config: Bitflu will now create a backup of your configuration file
while starting up
StorageVFS:
* Bugfix: _WriteFile failed to check the return code of print() and close(), this
could have caused a corrupted clipboard file if you ran out of diskspace
BitTorrent:
* Bugfix: analyze_torrent and verify would cause a panic if the specified
queue_id string did not exist. Oops.
* Outgoing connections are (again) established less aggressive.
Bitflu ~0.62 tried very hard to create outgoing connections but
this would only reward people who are unable to receive
incoming connections.
* Tracker: Support IPv6 responses (TCP and UDP!)
* PEX: Bitflu cann receive IPv6 Peers and will use them .. maybe :-)
* New command: seedprio: Tells bitflu to reserve X upload slots
for a specific torrent
* New command: seedhide: Tells bitflu to hide X % while seeding a
torrent. So bitflu will look like a normal
downloader and leechers won't be able to get the
full torrent from just a single peer.
>How-To-Repeat:
>Fix:
--- bitflu-0.81.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-p2p/bitflu.orig/Makefile /usr/ports/net-p2p/bitflu/Makefile
--- /usr/ports/net-p2p/bitflu.orig/Makefile 2009-01-24 17:29:31.000000000 +0100
+++ /usr/ports/net-p2p/bitflu/Makefile 2009-04-25 11:29:03.371658419 +0200
@@ -6,7 +6,7 @@
#
PORTNAME= bitflu
-PORTVERSION= 0.70
+PORTVERSION= 0.81
CATEGORIES= net-p2p
MASTER_SITES= http://bitflu.workaround.ch/bitflu/ CENKES
EXTRACT_SUFX= .tgz
@@ -17,17 +17,28 @@
RUN_DEPENDS= p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
p5-URI>=0:${PORTSDIR}/net/p5-URI
-PLUGINSDIR= ${PREFIX}/lib/${PORTNAME}
+PLUGINSDIR= lib/perl5/Bitflu
USE_PERL5= yes
NO_BUILD= yes
SUB_FILES= pkg-message
SUB_LIST= DOCSDIR=${DOCSDIR} PLUGINSDIR=${PLUGINSDIR}
-PLIST_SUB= PLUGINSDIR=lib/${PORTNAME}
+PLIST_SUB= PLUGINSDIR=${PLUGINSDIR}
+
+PORTDOCS= ChangeLog.txt README.txt README_IPv6.txt
+
+OPTIONS= IPV6 "Enable functionality over IPv6 transport" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_IPV6)
+RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6
+.endif
post-patch:
@${REINPLACE_CMD} -e 's|'\''.bitflu.config'\''|"$$ENV{HOME}/.bitflu.config"|; \
- s|\./plugins|${PLUGINSDIR}|; s|\./workdir|$$ENV{HOME}/.bitflu.workdir|; \
+ s|\./plugins|${PREFIX}/${PLUGINSDIR}|; \
+ s|\./workdir|$$ENV{HOME}/.bitflu.workdir|; \
s|--config=\.bitflu.config|--config=~/.bitflu.config|' \
${WRKSRC}/bitflu.pl
@@ -36,18 +47,21 @@
${PREFIX}/bin/${PORTNAME}
${INSTALL_SCRIPT} ${WRKSRC}/tools/fluconvert.pl \
${PREFIX}/bin/fluconvert.pl
- ${INSTALL} -d ${PLUGINSDIR}/Bitflu
- ${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/*.pm ${PLUGINSDIR}/Bitflu/
+ ${INSTALL_SCRIPT} ${WRKSRC}/tools/dumptorrent.pl \
+ ${PREFIX}/bin/dumptorrent.pl
+ ${MKDIR} ${PREFIX}/${PLUGINSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/*.pm ${PREFIX}/${PLUGINSDIR}/
.if !defined(NOPORTEXAMPLES)
${INSTALL} -d ${EXAMPLESDIR}/
${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.config.example \
${EXAMPLESDIR}/${PORTNAME}.config
.endif
.if !defined(NOPORTDOCS)
- ${INSTALL} -d ${DOCSDIR}
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/tools/fluconvert-README.txt \
${DOCSDIR}/fluconvert-README.txt
.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/net-p2p/bitflu.orig/distinfo /usr/ports/net-p2p/bitflu/distinfo
--- /usr/ports/net-p2p/bitflu.orig/distinfo 2009-01-24 17:29:31.000000000 +0100
+++ /usr/ports/net-p2p/bitflu/distinfo 2009-04-25 11:29:06.107599392 +0200
@@ -1,3 +1,3 @@
-MD5 (bitflu-0.70.tgz) = 03e58b83e8852055a2c1042052ea8cc4
-SHA256 (bitflu-0.70.tgz) = 0593e052177f0fb405d718e1a1937a947a5f26ef8e09d50e7df3caee6d891377
-SIZE (bitflu-0.70.tgz) = 122943
+MD5 (bitflu-0.81.tgz) = 02f2f4fa09dc20c5f75a62b8d9f75932
+SHA256 (bitflu-0.81.tgz) = 6a460ba21a747c0e746830c063ec21fac1f2e51e799039a73ae58c06a8ca5322
+SIZE (bitflu-0.81.tgz) = 129085
diff -ruN --exclude=CVS /usr/ports/net-p2p/bitflu.orig/files/pkg-message.in /usr/ports/net-p2p/bitflu/files/pkg-message.in
--- /usr/ports/net-p2p/bitflu.orig/files/pkg-message.in 2008-10-12 19:56:01.000000000 +0200
+++ /usr/ports/net-p2p/bitflu/files/pkg-message.in 2009-04-25 11:27:39.306488718 +0200
@@ -1,19 +1,16 @@
-To use bitflu with the plugins installed by this package, configure
-your ~/.bitflu.config to search for plugins here (instead of the
-default ./plugins):
-
- %%PLUGINSDIR%%
-
-If you have previously used a version of bitflu prior to 0.4x, you may
-want to convert your data to the new storage plugin (which was
-introduced along with the upstream bitflu re-write). Such conversions
-can be done using fluconvert. If the package is build with
-documentation, the upstream instructions for using fluconvert is
-installed at:
-
- %%DOCSDIR%%/fluconvert-README.txt
-
-When installed by this port, the bitflu workdir is located under
-~/.bitflu.workdir by default rather than ./bitflu.workdir (you may
-want to use --config=./bitflu.workdir to produce the behavior used by
-the upstream version).
+*************************************************************************
+* To use bitflu with the plugins installed by this package, configure *
+* your ~/.bitflu.config to search for plugins here (instead of the *
+* default ./plugins): *
+* *
+* %%PREFIX%%/lib/perl5 (New location as of 0.80) *
+* *
+* If you have previously used a version of bitflu prior to 0.4x, you *
+* may want to convert your data to the new storage plugin (which was *
+* introduced along with the upstream bitflu re-write). Such conversions *
+* can be done using fluconvert. If the package is built with *
+* documentation, the instructions are installed at: *
+* *
+* %%DOCSDIR%%/fluconvert-README.txt *
+* *
+*************************************************************************
diff -ruN --exclude=CVS /usr/ports/net-p2p/bitflu.orig/pkg-plist /usr/ports/net-p2p/bitflu/pkg-plist
--- /usr/ports/net-p2p/bitflu.orig/pkg-plist 2008-10-12 19:56:01.000000000 +0200
+++ /usr/ports/net-p2p/bitflu/pkg-plist 2009-04-25 11:57:36.536784373 +0200
@@ -1,17 +1,16 @@
bin/bitflu
bin/fluconvert.pl
+bin/dumptorrent.pl
%%PORTDOCS%%%%DOCSDIR%%/fluconvert-README.txt
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bitflu.config
-%%PLUGINSDIR%%/Bitflu/00_StorageFarabDb.pm
-%%PLUGINSDIR%%/Bitflu/00_StorageVFS.pm
-%%PLUGINSDIR%%/Bitflu/10_AdminHTTP.pm
-%%PLUGINSDIR%%/Bitflu/10_AdminTelnet.pm
-%%PLUGINSDIR%%/Bitflu/20_DownloadBitTorrent.pm
-%%PLUGINSDIR%%/Bitflu/20_DownloadHTTP.pm
-%%PLUGINSDIR%%/Bitflu/30_SourcesBitTorrent.pm
-%%PLUGINSDIR%%/Bitflu/30_SourcesBitTorrentKademlia.pm
-%%PLUGINSDIR%%/Bitflu/99_Cron.pm
-@dirrm %%PLUGINSDIR%%/Bitflu
+%%PLUGINSDIR%%/00_StorageFarabDb.pm
+%%PLUGINSDIR%%/00_StorageVFS.pm
+%%PLUGINSDIR%%/10_AdminHTTP.pm
+%%PLUGINSDIR%%/10_AdminTelnet.pm
+%%PLUGINSDIR%%/20_DownloadBitTorrent.pm
+%%PLUGINSDIR%%/20_DownloadHTTP.pm
+%%PLUGINSDIR%%/30_SourcesBitTorrent.pm
+%%PLUGINSDIR%%/30_SourcesBitTorrentKademlia.pm
+%%PLUGINSDIR%%/99_Cron.pm
@dirrm %%PLUGINSDIR%%
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- bitflu-0.81.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090425102230.B3F3C3AD37A>