ports/126262: [PATCH}security/tor: update to 0.2.0.30
bf
bf2006a at yahoo.com
Tue Aug 5 07:10:01 UTC 2008
>Number: 126262
>Category: ports
>Synopsis: [PATCH}security/tor: update to 0.2.0.30
>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: Tue Aug 05 07:10:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: bf
>Release: 7-STABLE i386
>Organization:
-
>Environment:
>Description:
0.2.0.30 has now been adopted as the new stable version; if this change is accepted, the CONFLICTS line in the port Makefile of security/tor-devel should be changed to
CONFLICTS= tor-0.2.0.[0-9]*
or the like.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN tor.orig/Makefile tor/Makefile
--- tor.orig/Makefile 2008-08-05 01:18:41.356172050 -0400
+++ tor/Makefile 2008-08-05 02:47:09.717768007 -0400
@@ -6,12 +6,13 @@
#
PORTNAME= tor
-PORTVERSION= 0.1.2.19
-PORTREVISION= 1
+DISTVERSION= 0.2.0.30
CATEGORIES= security net
MASTER_SITES= http://www.torproject.org/dist/ \
- http://mirror.onionland.org/dist/
-DISTNAME= ${PORTNAME}-${PORTVERSION}
+ http://tor.cypherpunks.at/dist/ \
+ http://tor.depthstrike.com/dist/ \
+ http://tor.boinc.ch/dist/ \
+ http://tor.anonymity.cn/dist/
MAINTAINER= nivo+kw+ports.bfa274 at is-root.com
COMMENT= An anonymizing overlay network for TCP
@@ -21,8 +22,12 @@
GNU_CONFIGURE= yes
USE_OPENSSL= yes
+CPPFLAGS+= -I${LOCALBASE}/include
+CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-OPTIONS= EVENTDNS "asynchronous DNS module" on \
+OPTIONS= BUFFREELISTS "freelists for buffer RAM" on \
+ CELLPOOL "memory pool allocator for cells" on \
+ TCMALLOC "use the tcmalloc memory allocation library" off \
THREADS "multi-threading support" on \
TRANSPARENT "transparent proxy support" on \
VIDALIA "Vidalia graphical Tor controller" off
@@ -30,25 +35,33 @@
USE_RC_SUBR= tor
SUB_FILES= pkg-message
-CONFLICTS= tor-devel*
+CONFLICTS= tor-devel-[0-9]*
MANCOMPRESSED= no
-MAN1= tor.1 tor-resolve.1 torify.1
+MAN1= tor.1 tor-resolve.1 torify.1 tor-gencert.1
.include <bsd.port.pre.mk>
-CONFIGURE_ENV+= CPPFLAGS+=-I{LOCALBASE}/include \
- LDFLAGS+=-L{LOCALBASE}/lib
+.if defined(WITH_BUFFREELISTS)
+CONFIGURE_ARGS+= --enable-buf-freelists
+.else
+CONFIGURE_ARGS+= --disable-buf-freelists
+.endif
-.if defined(WITH_EVENTDNS)
-CONFIGURE_ARGS+= --enable-eventdns
+.if defined(WITH_CELLPOOL)
+CONFIGURE_ARGS+= --enable-cell-pool
.else
-CONFIGURE_ARGS+= --disable-eventdns
+CONFIGURE_ARGS+= --disable-cell-pool
+.endif
+
+.if defined(WITH_TCMALLOC)
+CONFIGURE_ARGS+= --with-tcmalloc
+LIB_DEPENDS+= tcmalloc:${PORTSDIR}/devel/google-perftools
.endif
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
-CONFIGURE_ENV+= LDFLAGS+={PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_CFLAGS}
.else
CONFIGURE_ARGS+= --disable-threads
.endif
@@ -68,17 +81,16 @@
${WRKSRC}/contrib/tor-tsocks.conf.sample
@${REINPLACE_CMD} -e "s|tor-tsocks.conf|tor-tsocks.conf.sample|g" \
${WRKSRC}/contrib/Makefile.in
-#fix typos in configure scripts, undesirable compiler flags, wrong location of in6.h
- @${FIND} ${WRKSRC} -type f | ${XARGS} \
+ @${FIND} -X ${WRKSRC} -type f | ${XARGS} \
-n 10 ${REINPLACE_CMD} -E \
- -e 's!-g -O2!!' \
- -e 's!-O2!!' \
- -e 's|netintet|netinet|g' \
+ -e 's|-g -O2||g' \
+ -e 's|-O2||g' \
+ -e 's|-g -O||g' \
-e 's|netinet/in6|netinet6/in6|g'
post-configure:
- @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
- 's|-lpthread|${PTHREAD_LIBS}|g'
+ @${FIND} -X ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
+ "s|-lpthread|${PTHREAD_LIBS}|g"
pre-su-install:
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
@@ -93,4 +105,8 @@
${CHOWN} _tor:_tor /var/db/tor
${CAT} ${PKGMESSAGE}
+regression-test:
+ @( cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check )
+
.include <bsd.port.post.mk>
diff -ruN tor.orig/distinfo tor/distinfo
--- tor.orig/distinfo 2008-08-05 01:18:41.356172050 -0400
+++ tor/distinfo 2008-08-05 02:47:09.737761330 -0400
@@ -1,3 +1,3 @@
-MD5 (tor-0.1.2.19.tar.gz) = 4b3f9963b843010af5aa3bd6266d11e0
-SHA256 (tor-0.1.2.19.tar.gz) = 7e57198a0858f5ba8651d75225248c85b619e905f0ff4dbb45fffa2d03a1aa61
-SIZE (tor-0.1.2.19.tar.gz) = 1264275
+MD5 (tor-0.2.0.30.tar.gz) = d37b582ee35b4f69564b0635a449b5f6
+SHA256 (tor-0.2.0.30.tar.gz) = bc9e8bf841ef64f8b06eef91eeab430f91147a3c4d7a6919826fa33b20453387
+SIZE (tor-0.2.0.30.tar.gz) = 2155463
diff -ruN tor.orig/pkg-plist tor/pkg-plist
--- tor.orig/pkg-plist 2008-08-05 01:18:41.356172050 -0400
+++ tor/pkg-plist 2008-08-05 02:47:09.747764836 -0400
@@ -1,6 +1,9 @@
bin/tor
+bin/tor-gencert
bin/tor-resolve
bin/torify
etc/tor/tor-tsocks.conf.sample
etc/tor/torrc.sample
+share/tor/geoip
+ at dirrm share/tor
@dirrm etc/tor
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list