From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 23 04:20:03 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 7833E1065678 for ; Fri, 23 Jul 2010 04:20:03 +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 5683C8FC13 for ; Fri, 23 Jul 2010 04:20:03 +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 o6N4K376043713 for ; Fri, 23 Jul 2010 04:20:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o6N4K3MU043712; Fri, 23 Jul 2010 04:20:03 GMT (envelope-from gnats) Resent-Date: Fri, 23 Jul 2010 04:20:03 GMT Resent-Message-Id: <201007230420.o6N4K3MU043712@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, bf Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 17C05106564A for ; Fri, 23 Jul 2010 04:19:19 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id E1D318FC0C for ; Fri, 23 Jul 2010 04:19:18 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o6N4JIVs005256 for ; Fri, 23 Jul 2010 04:19:18 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o6N4JIjK005255; Fri, 23 Jul 2010 04:19:18 GMT (envelope-from nobody) Message-Id: <201007230419.o6N4JIjK005255@www.freebsd.org> Date: Fri, 23 Jul 2010 04:19:18 GMT From: bf To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/148854: [PATCH]security/tor-devel: update to 0.2.2.14-alpha X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jul 2010 04:20:03 -0000 >Number: 148854 >Category: ports >Synopsis: [PATCH]security/tor-devel: update to 0.2.2.14-alpha >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jul 23 04:20:02 UTC 2010 >Closed-Date: >Last-Modified: >Originator: bf >Release: 9-CURRENT amd64 >Organization: - >Environment: >Description: -update to 0.2.2.14-alpha -restrict scope of sed commands to only those files that need to be patched -allow the use of base system openssl on those versions of FreeBSD that now have 0.9.8n (this may fix problems reported by some users) >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN -x 'new.*' -x 'old.*' tor-devel.orig/Makefile tor-devel/Makefile --- tor-devel.orig/Makefile 2010-07-22 23:45:25.000000000 -0400 +++ tor-devel/Makefile 2010-07-23 00:12:22.000000000 -0400 @@ -6,7 +6,7 @@ # PORTNAME= tor -DISTVERSION= 0.2.2.13-alpha +DISTVERSION= 0.2.2.14-alpha CATEGORIES= security net ipv6 MASTER_SITES= http://www.torproject.org/dist/ \ http://tor.cypherpunks.at/dist/ \ @@ -23,7 +23,6 @@ GNU_CONFIGURE= yes USE_OPENSSL= yes -WITH_OPENSSL_PORT= yes CONFIGURE_ARGS+= --with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" @@ -43,6 +42,10 @@ .include +.if ( ${OSVERSION} < 801000 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900011) ) +WITH_OPENSSL_PORT= yes +.endif + .if defined(WITH_BUFFREELISTS) CONFIGURE_ARGS+= --enable-buf-freelists .else @@ -82,15 +85,11 @@ ${WRKSRC}/contrib/tor-tsocks.conf.sample @${REINPLACE_CMD} -e "s|tor-tsocks.conf|tor-tsocks.conf.sample|g" \ ${WRKSRC}/contrib/Makefile.in - @${FIND} -X ${WRKSRC} -type f | ${XARGS} \ - -n 10 ${REINPLACE_CMD} -E \ - -e 's|-g -O2||g' \ - -e 's|-O2||g' \ - -e 's|-g -O||g' \ - -e 's|netinet/in6|netinet6/in6|g' + @${REINPLACE_CMD} -e '\|CFLAGS=|{s|-g||;s|-O[0-9]\{0,1\}||;}' \ + -e 's|netinet/in6|netinet6/in6|g' ${WRKSRC}/configure post-configure: - @${FIND} -X ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ + @${FIND} -X ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \ "s|-lpthread|${PTHREAD_LIBS}|g" pre-su-install: diff -ruN -x 'new.*' -x 'old.*' tor-devel.orig/distinfo tor-devel/distinfo --- tor-devel.orig/distinfo 2010-07-22 23:45:33.000000000 -0400 +++ tor-devel/distinfo 2010-07-22 21:57:20.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (tor-0.2.2.13-alpha.tar.gz) = 8e332a7a91f78cdc3071a6fd77609264 -SHA256 (tor-0.2.2.13-alpha.tar.gz) = abf0386ceec9b04a795ac270cdad40f0497916eaf1cec4f952c915a3a7da3dc2 -SIZE (tor-0.2.2.13-alpha.tar.gz) = 2306769 +MD5 (tor-0.2.2.14-alpha.tar.gz) = 62100f26d9ccdbe9a570d0757946dfb9 +SHA256 (tor-0.2.2.14-alpha.tar.gz) = 0afc7b79007b5265d59dbca0a5e676aa22ea7177c512253d3a06308d30fd895f +SIZE (tor-0.2.2.14-alpha.tar.gz) = 2527986 >Release-Note: >Audit-Trail: >Unformatted: