From nobody@FreeBSD.org  Tue Sep 22 07:21:40 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5133410656A6
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 22 Sep 2009 07:21:40 +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 3F7E38FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 22 Sep 2009 07:21:40 +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 n8M7LdW2065145
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 22 Sep 2009 07:21:39 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n8M7LdmR065144;
	Tue, 22 Sep 2009 07:21:39 GMT
	(envelope-from nobody)
Message-Id: <200909220721.n8M7LdmR065144@www.freebsd.org>
Date: Tue, 22 Sep 2009 07:21:39 GMT
From: Andrei Lavreniyuk <andy.lavr@reactor-xg.kiev.ua>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] ports/security/tor-devel (fix geoip, aclocal)
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: peter.thoenen@yahoo.com

>Number:         139048
>Category:       ports
>Synopsis:       [PATCH] ports/security/tor-devel (fix geoip, aclocal)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 22 07:30:01 UTC 2009
>Closed-Date:    Thu Oct 29 11:02:35 UTC 2009
>Last-Modified:  Thu Oct 29 11:10:09 UTC 2009
>Originator:     Andrei Lavreniyuk
>Release:        FreeBSD 8.0-RC1
>Organization:
Technica-03, Inc.
>Environment:
FreeBSD datacenter.technica-03.local 8.0-RC1 FreeBSD 8.0-RC1 #0: Sat Sep 19 12:33:44 EEST 2009     root@datacenter.technica-03.local:/usr/obj/usr/src/sys/SMP64  amd64
>Description:
--- 1 ---

cd .. && /bin/sh ./config.status contrib/torify
config.status: creating contrib/torify
 cd . && /bin/sh /usr/ports/security/tor-devel/work/tor-0.2.2.2-alpha/missing --run automake-1.10 --foreign  Makefile
aclocal.m4:14: error: this file was generated for autoconf 2.61.
You have another version of autoconf.  If you want to use that,
you should regenerate the build system entirely.
aclocal.m4:14: the top level
autom4te-2.62: /usr/local/bin/gm4 failed with exit status: 63
automake-1.10: autoconf failed with exit status: 63
WARNING: `automake-1.10' is probably too old.  You should only need it if
         you modified `Makefile.am', `acinclude.m4' or `configure.in'.
         You might want to install the `Automake' and `Perl' packages.
         Grab them from any GNU archive site.
 /bin/sh ./config.status

--- end 1 ---


--- 2 ---

===>  Patching for tor-devel-0.2.2.2.a                         
===>   tor-devel-0.2.2.2.a depends on file: /usr/local/lib/libcrypto.so.6 - found
===>   tor-devel-0.2.2.2.a depends on file: /usr/local/bin/automake-1.10 - found 
===>   tor-devel-0.2.2.2.a depends on file: /usr/local/bin/autoconf-2.62 - found 
===>   tor-devel-0.2.2.2.a depends on package: libtool>=2.2 - found              
===>   tor-devel-0.2.2.2.a depends on shared library: event-1.4 - found          
===>  Configuring for tor-devel-0.2.2.2.a                                        
configure: WARNING: Unrecognized options: --disable-geoip-stats                  

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Unrecognized options ^^^^^^^^^^^^^^^^^^^

checking for a BSD-compatible install... /usr/bin/install -c -o root -g wheel    
checking whether build environment is sane... yes                                
checking for a thread-safe mkdir -p... /usr/local/bin/gmkdir -p                  
checking for gawk... no                                                          
checking for mawk... no                                                          
checking for nawk... nawk                                                        
checking whether make sets $(MAKE)... yes                                        

--- end 2 --- 
>How-To-Repeat:
For version tor-0.2.2.2-alpha

# cd /usr/ports/security/tor-devel
# make

>Fix:

Please view and add my patch.

Patch attached with submission follows:

diff -ruN tor-devel.bak/Makefile tor-devel/Makefile
--- tor-devel.bak/Makefile	2009-09-19 10:33:26.000000000 +0300
+++ tor-devel/Makefile	2009-09-22 09:16:25.915263017 +0300
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tor
-DISTVERSION=	0.2.2.1-alpha
+DISTVERSION=	0.2.2.2-alpha
 CATEGORIES=	security net ipv6
 MASTER_SITES=	http://www.torproject.org/dist/ \
 		http://tor.cypherpunks.at/dist/ \
@@ -21,13 +21,15 @@
 RUN_DEPENDS=	torsocks:${PORTSDIR}/net/torsocks
 LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
 
+USE_AUTOTOOLS=	libtool:22 aclocal:110 autoconf:262
+ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
+
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
 OPTIONS=	BUFFREELISTS "freelists for buffer RAM" on \
-		GEOIP "track country data" off \
 		INSTR_DOWNLOADS "instrument downloads for analysis" off \
 		TCMALLOC "use the tcmalloc memory allocation library" off \
 		THREADS "multi-threading support" on \
@@ -50,12 +52,6 @@
 CONFIGURE_ARGS+=	--disable-buf-freelists
 .endif
 
-.if defined(WITH_GEOIP)
-CONFIGURE_ARGS+=	--enable-geoip-stats
-.else
-CONFIGURE_ARGS+=	--disable-geoip-stats
-.endif
-
 .if defined(WITH_INSTR_DOWNLOADS)
 CONFIGURE_ARGS+=	--enable-instrument-downloads
 .else
diff -ruN tor-devel.bak/distinfo tor-devel/distinfo
--- tor-devel.bak/distinfo	2009-09-19 10:33:26.000000000 +0300
+++ tor-devel/distinfo	2009-09-22 09:16:26.289642870 +0300
@@ -1,3 +1,3 @@
-MD5 (tor-0.2.2.1-alpha.tar.gz) = bf7611974dbc546a5368e2926eea4d52
-SHA256 (tor-0.2.2.1-alpha.tar.gz) = 10c66a84cedc43726fecf219b6c523e54eac4efff57d6ce4d9031a86933de013
-SIZE (tor-0.2.2.1-alpha.tar.gz) = 2443660
+MD5 (tor-0.2.2.2-alpha.tar.gz) = 205f46d7c2646b1f22e231ccc8e443f1
+SHA256 (tor-0.2.2.2-alpha.tar.gz) = acdb4bec0070aeaaac4b36c1206ff5705bcc8be81db26c6982fff9020ed2097d
+SIZE (tor-0.2.2.2-alpha.tar.gz) = 2392652


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Sep 22 07:30:12 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139048 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: peter.thoenen@yahoo.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/139048: [PATCH] ports/security/tor-devel (fix geoip, aclocal)
Date: Tue, 22 Sep 2009 07:30:08 UT

 Maintainer of security/tor-devel,
 
 Please note that PR ports/139048 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/139048
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Tue Sep 22 12:25:33 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139048 

From: "b. f." <bf1783@googlemail.com>
To: bug-followup@FreeBSD.org, miwi@FreeBSD.org, andy.lavr@reactor-xg.kiev.ua, 
	peter.thoenen@yahoo.com
Cc:  
Subject: Re: ports/139048: [PATCH] ports/security/tor-devel (fix geoip, 
	aclocal)
Date: Tue, 22 Sep 2009 23:11:13 +0000

 It is worth noting that this release fixes a security problem:
 
 "Fix a remotely triggerable memory leak when a consensus document
       contains more than one signature from the same voter. Bugfix on
       0.2.0.3-alpha."
 
 For this value of USE_AUTOTOOLS, GNU_CONFIGURE is implied, and setting
 it explicitly is unnecessary.
 
 I have not encountered the error in your first snippet. How is it that
 any of the autotools were invoked in the first place, if you were
 simply running the configure script?  The script merely defines a few
 autotools-related variables, but as far as I can tell does not use
 them.  Unless there is a specific problem with the bundled script, we
 should not be taking more time and adding more dependencies to
 regenerate it with USE_AUTOTOOLS: instead we should just use
 GNU_CONFIGURE.
 
 b.
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Thu Oct 29 11:02:34 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139048 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139048: commit references a PR
Date: Thu, 29 Oct 2009 11:02:41 +0000 (UTC)

 miwi        2009-10-29 11:02:28 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/tor-devel   Makefile distinfo 
   Log:
   - Update to 0.2.2.5-alpha
   
   PR:             139048
   Submitted by:   Andrei Lavreniyuk <andy.lavr@reactor-xg.kiev.ua>
                   "b. f." <bf1783@googlemail.com>
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.82      +1 -8      ports/security/tor-devel/Makefile
   1.61      +3 -3      ports/security/tor-devel/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
