Date: Fri, 5 Nov 2010 22:01:02 GMT From: Chris Rees <utisoft@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/151974: Maintainer update: net/opentracker fix whitelist bug Message-ID: <201011052201.oA5M127I037692@amnesiac.bayofrum.net> Resent-Message-ID: <201011052240.oA5Me9OY029863@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 151974
>Category: ports
>Synopsis: Maintainer update: net/opentracker fix whitelist bug
>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: Fri Nov 05 22:40:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Chris Rees
>Release: FreeBSD 8.0-RELEASE-p4 i386
>Organization:
bayofrum
>Environment:
System: FreeBSD amnesiac.bayofrum.net 8.0-RELEASE-p4 FreeBSD 8.0-RELEASE-p4 #0: Mon Jul 12 20:22:27 UTC 2010 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Opentracker used to need 40 extra characters at the end of your whitelist/blacklist file otherwise the last info_hash won't be loaded.
>How-To-Repeat:
>Fix:
Added file: files/patch-ot_accesslist.c (various whitespace fixes added)
--- opentracker.patch begins here ---
diff -ruN opentracker.orig/Makefile opentracker/Makefile
--- opentracker.orig/Makefile 2010-11-05 21:51:22.000000000 +0000
+++ opentracker/Makefile 2010-11-05 21:57:31.000000000 +0000
@@ -16,7 +16,7 @@
BUILD_DEPENDS= ${LOCALBASE}/lib/libowfat.a:${PORTSDIR}/devel/libowfat
-USE_BZIP2= yes
+USE_BZIP2= yes
USE_RC_SUBR= ${PORTNAME}
OPTIONS= WANT_ACCESSLIST_BLACK "Enable client blacklisting" Off \
@@ -53,11 +53,14 @@
MAKE_ENV+=FEATURES="${FEATURES}"
+post-patch:
+ @${FIND} ${WRKSRC} -name "*.orig" -a -exec ${RM} -f {} \;
+
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
- ${MKDIR} ${PREFIX}/etc/${PORTNAME}
- ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample \
- ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf.sample
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+ ${MKDIR} ${PREFIX}/etc/${PORTNAME}
+ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample \
+ ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf.sample
post-install:
@if [ ! -f ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf ]; then \
diff -ruN opentracker.orig/files/patch-ot_accesslist.c opentracker/files/patch-ot_accesslist.c
--- opentracker.orig/files/patch-ot_accesslist.c 1970-01-01 01:00:00.000000000 +0100
+++ opentracker/files/patch-ot_accesslist.c 2010-11-05 21:52:45.000000000 +0000
@@ -0,0 +1,12 @@
+--- ot_accesslist.c.orig 2010-11-04 17:34:00.000000000 -0700
++++ ot_accesslist.c 2010-11-04 17:51:33.000000000 -0700
+@@ -54,8 +54,7 @@
+ return;
+ }
+
+- /* No use to scan if there's not enough room for another full info_hash */
+- map_end = map + maplen - 40;
++ map_end = map + maplen;
+ read_offs = map;
+
+ /* We do ignore anything that is not of the form "^[:xdigit:]{40}[^:xdigit:].*" */
--- opentracker.patch ends here ---
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011052201.oA5M127I037692>