From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 5 22:40:09 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6C11106567A for ; Fri, 5 Nov 2010 22:40:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id ABC988FC1A for ; Fri, 5 Nov 2010 22:40:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oA5Me9gb029864 for ; Fri, 5 Nov 2010 22:40:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oA5Me9OY029863; Fri, 5 Nov 2010 22:40:09 GMT (envelope-from gnats) Resent-Date: Fri, 5 Nov 2010 22:40:09 GMT Resent-Message-Id: <201011052240.oA5Me9OY029863@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chris Rees Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8A351065670 for ; Fri, 5 Nov 2010 22:30:43 +0000 (UTC) (envelope-from chris@amnesiac.bayofrum.net) Received: from relay.pcl-ipout02.plus.net (relay.pcl-ipout02.plus.net [212.159.7.100]) by mx1.freebsd.org (Postfix) with ESMTP id 52BBF8FC13 for ; Fri, 5 Nov 2010 22:30:42 +0000 (UTC) Received: from outmx04.plus.net ([212.159.14.19]) by relay.pcl-ipout02.plus.net with ESMTP; 05 Nov 2010 22:01:26 +0000 Received: from [87.115.222.53] (helo=amnesiac.bayofrum.net) by outmx04.plus.net with esmtp (Exim) id 1PEULd-0001ZT-Mu for FreeBSD-gnats-submit@freebsd.org; Fri, 05 Nov 2010 22:01:25 +0000 Received: from amnesiac.bayofrum.net (localhost [127.0.0.1]) by amnesiac.bayofrum.net (8.14.3/8.14.3) with ESMTP id oA5M13tD037695 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Fri, 5 Nov 2010 22:01:04 GMT (envelope-from chris@amnesiac.bayofrum.net) Received: (from chris@localhost) by amnesiac.bayofrum.net (8.14.3/8.14.3/Submit) id oA5M127I037692; Fri, 5 Nov 2010 22:01:02 GMT (envelope-from chris) Message-Id: <201011052201.oA5M127I037692@amnesiac.bayofrum.net> Date: Fri, 5 Nov 2010 22:01:02 GMT From: Chris Rees To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/151974: Maintainer update: net/opentracker fix whitelist bug X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Chris Rees List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2010 22:40:09 -0000 >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: