- Update to 0.1.2.14

- Pass maintainership to submitter [1]

PR:		113289 [1]
		112492
Submitted by:	Nils Vogels <nivo@is-root.com> [1]
		Peter Thoenen <peter.thoenen@yahoo.com> (old maintainer)
Approved by:	maintainer
Thanks to:	bf <bf2006a@yahoo.com>

5 files changed, 74 insertions, 16 deletions

diff --git a/security/tor/Makefile b/security/tor/Makefile
index be1ec7a312fa..ffb535c74065 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	tor
-PORTVERSION=	0.1.1.26
-PORTREVISION=	1
+PORTVERSION=	0.1.2.14
 CATEGORIES=	security net
 MASTER_SITES=	http://tor.eff.org/dist/ \
 		http://mirror.onionland.org/dist/
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	peter.thoenen@yahoo.com
+MAINTAINER=	nivo+kw+ports.bfa274@is-root.com
 COMMENT=	An anonymizing overlay network for TCP
 
 RUN_DEPENDS=	tsocks:${PORTSDIR}/net/tsocks
@@ -21,32 +21,76 @@ LIB_DEPENDS=	event-1.3b:${PORTSDIR}/devel/libevent
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 
+OPTIONS=	EVENTDNS "asynchronous DNS module" on \
+		THREADS "multi-threading support" on \
+		TRANSPARENT "transparent proxy support" on \
+		VIDALIA "Vidalia graphical Tor controller" off
+
 USE_RC_SUBR=	tor
 SUB_FILES=	pkg-message
 
+CONFLICTS=	tor-devel*
+
 MANCOMPRESSED=	no
 MAN1=		tor.1 tor-resolve.1 torify.1
 
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
+CONFIGURE_ENV+=	CPPFLAGS+=-I{LOCALBASE}/include \
+		LDFLAGS+=-L{LOCALBASE}/lib
+
+.if defined(WITH_EVENTDNS)
+CONFIGURE_ARGS+=	--enable-eventdns
+.else
+CONFIGURE_ARGS+=	--disable-eventdns
+.endif
+
+.if defined(WITH_THREADS)
+CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ENV+=	LDFLAGS+={PTHREAD_LIBS}
+.else
+CONFIGURE_ARGS+=	--disable-threads
+.endif
+
+.if defined(WITH_TRANSPARENT)
+CONFIGURE_ARGS+=	--enable-transparent
+.else
+CONFIGURE_ARGS+=	--disable-transparent
+.endif
+
+.ifdef(WITH_VIDALIA)
+RUN_DEPENDS+=	vidalia:${PORTSDIR}/net-mgmt/vidalia
+.endif
+
 post-patch:
 	@${MV} ${WRKSRC}/contrib/tor-tsocks.conf \
 		${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} \
 		-n 10 ${REINPLACE_CMD} -E \
 		-e 's!-g -O2!!' \
-		-e 's!-O2!!'
+		-e 's!-O2!!' \
+		-e 's|netintet|netinet|g' \
+		-e 's|netinet/in6|netinet6/in6|g'
+
+post-configure:
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-lpthread|${PTHREAD_LIBS}|g'
 
 pre-su-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
 		${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	@${TOUCH} /var/log/tor
-	@${CHOWN} _tor:_tor /var/log/tor
-	@${MKDIR} /var/db/tor
-	@${MKDIR} /var/db/tor/data
-	@${CHOWN} _tor:_tor /var/db/tor
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
+	${MKDIR} /var/run/tor
+	${CHOWN} _tor:_tor /var/run/tor
+	${TOUCH} /var/log/tor
+	${CHOWN} _tor:_tor /var/log/tor
+	${MKDIR} /var/db/tor/data
+	${CHOWN} _tor:_tor /var/db/tor
+	${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.post.mk>
diff --git a/security/tor/distinfo b/security/tor/distinfo
index 5938a1b8f0f0..0a9299b1acb1 100644
--- a/security/tor/distinfo
+++ b/security/tor/distinfo
@@ -1,3 +1,3 @@
-MD5 (tor-0.1.1.26.tar.gz) = 0667df7a1f670bee5163b607aea172ba
-SHA256 (tor-0.1.1.26.tar.gz) = 3be8c89be5b927e73b77a82ca3d83f0f162fceea2d6a14ce1c0cf5333b36cd1c
-SIZE (tor-0.1.1.26.tar.gz) = 893367
+MD5 (tor-0.1.2.14.tar.gz) = dc93a52f9c12ec7fe73b3905a28f09ec
+SHA256 (tor-0.1.2.14.tar.gz) = bc23e6f826f1f736e9d5e56ba79195099882aef2029a63dd667915bc1eb836a6
+SIZE (tor-0.1.2.14.tar.gz) = 1225040
diff --git a/security/tor/files/patch-src+or+config.c b/security/tor/files/patch-src+or+config.c
new file mode 100644
index 000000000000..285dd1fbe834
--- /dev/null
+++ b/security/tor/files/patch-src+or+config.c
@@ -0,0 +1,11 @@
+--- src/or/config.c.orig	Mon May 28 13:11:12 2007
++++ src/or/config.c	Mon May 28 13:12:04 2007
+@@ -3901,7 +3901,7 @@
+ #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+   if (server && version < LE_13B) {
+     thread_unsafe = 1;
+-    sad_os = "BSD variants"
++    sad_os = "BSD variants";
+       }
+ #elif defined(__APPLE__) || defined(__darwin__)
+   if (server && version < LE_13B) {
diff --git a/security/tor/files/tor.in b/security/tor/files/tor.in
index 81cc72e9161c..093fd47b32ef 100644
--- a/security/tor/files/tor.in
+++ b/security/tor/files/tor.in
@@ -39,7 +39,7 @@ required_files=${tor_conf}
 required_dirs=${tor_datadir}
 pidfile=${tor_pidfile}
 command="%%PREFIX%%/bin/${name}"
-command_args="-f ${tor_conf} --pidfile ${tor_pidfile} --runasdaemon 1 --datadirectory ${tor_datadir} --user ${tor_user} --group ${tor_group} --log \"notice file ${tor_logfile}\""
+command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir} --User ${tor_user} --Group ${tor_group} --Log \"notice file ${tor_logfile}\""
 extra_commands="log"
 log_cmd="${name}_log"
 
diff --git a/security/tor/pkg-descr b/security/tor/pkg-descr
index 1435eed8c86a..72a692937021 100644
--- a/security/tor/pkg-descr
+++ b/security/tor/pkg-descr
@@ -10,4 +10,7 @@ messaging, IRC, SSH, and more. Tor also provides a platform on which
 software developers can build new applications with built-in
 anonymity, safety, and privacy features.
 
+Remember that this is development code -- DON'T RELY ON THE CURRENT TOR
+NETWORK FOR ANONYMITY!
+
 WWW: http://tor.eff.org/