Bug 112493
| Summary: | security/tor-devel | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Peter Thoenen <peter.thoenen> | ||||
| Component: | Individual Port(s) | Assignee: | Martin Wilke <miwi> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
|
Description
Peter Thoenen
2007-05-07 15:50:04 UTC
Responsible Changed From-To: freebsd-ports-bugs->miwi I'll take it. You might want to try this instead: diff -ruN tor-devel.orig/Makefile tor-devel/Makefile --- tor-devel.orig/Makefile Fri Apr 6 21:07:30 2007 +++ tor-devel/Makefile Mon May 28 17:37:02 2007 @@ -6,13 +6,12 @@ # PORTNAME= tor -PORTVERSION= 0.1.2.12 -PORTREVISION= 1 +PORTVERSION= 0.1.2.14 CATEGORIES= security net MASTER_SITES= http://tor.eff.org/dist/ \ http://mirror.onionland.org/dist/ PKGNAMESUFFIX= -devel -DISTNAME= ${PORTNAME}-${PORTVERSION}-rc +DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= peter.thoenen@yahoo.com COMMENT= An anonymizing overlay network for TCP @@ -23,24 +22,64 @@ GNU_CONFIGURE= yes USE_OPENSSL= yes +OPTIONS= EVENTDNS "asynchronous DNS module" off \ + 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-1.1.[0-9]* MANCOMPRESSED= no -MAN1= tor.1 tor-resolve.1 torify.1 +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} \ diff -ruN tor-devel.orig/distinfo tor-devel/distinfo --- tor-devel.orig/distinfo Tue Mar 27 21:20:32 2007 +++ tor-devel/distinfo Mon May 28 14:50:08 2007 @@ -1,3 +1,3 @@ -MD5 (tor-0.1.2.12-rc.tar.gz) = 096e46d261a8f66525ecc241904e89c4 -SHA256 (tor-0.1.2.12-rc.tar.gz) = cebd76bbb9b79a2e433f4b588b33a25143f748856968737d1bffac80c427b3bb -SIZE (tor-0.1.2.12-rc.tar.gz) = 1170674 +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 -ruN tor-devel.orig/files/patch-src+or+config.c tor-devel/files/patch-src+or+config.c --- tor-devel.orig/files/patch-src+or+config.c Wed Dec 31 19:00:00 1969 +++ tor-devel/files/patch-src+or+config.c Mon May 28 13:13:57 2007 @@ -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) { ____________________________________________________________________________________ Now that's room service! Choose from over 150,000 hotels in 45,000 destinations on Yahoo! Travel to find your fit. http://farechase.yahoo.com/promo-generic-14795097 bf wrote:
> You might want to try this instead:
>
Your a better man than me ;) ... approved and thanks for the the extra
config options .. will also include this in the tor port update.
Once more unto the breach, dear friends, once more ...
* new tor-devel incorporates most of the functionality
of trans-proxy-tor and dns-proxy-tor, so unless there
is interest in these ports independent of tor, they
can be retired when these features are deemed stable
* memory allocation pools to increase efficiency and
replace some usages of malloc()
*new configuration options, so update your torrc
*async dnsevent has become the only option for dns,
old dnsworker component has been ripped out
bf
____________________________________________________________________________________
Fussy? Opinionated? Impossible to please? Perfect. Join Yahoo!'s user panel and lay it on us. http://surveylink.yahoo.com/gmrs/yahoo_panel_invite.asp?a=7
State Changed From-To: open->feedback Peter can you please take a look in this new patch http://www.freebsd.org/cgi/query-pr.cgi?pr=112493&getpatch=2 . THanks. miwi 2007-06-06 06:02:30 UTC
FreeBSD ports repository
Modified files:
security/tor-devel Makefile distinfo pkg-plist
Log:
- Update to 0.2.0.2 alpha
PR: 112493
Submitted by: bf <bf2006a@yahoo.com>
Approved by: maintainer
Revision Changes Path
1.43 +46 -7 ports/security/tor-devel/Makefile
1.31 +3 -3 ports/security/tor-devel/distinfo
1.13 +1 -0 ports/security/tor-devel/pkg-plist
_______________________________________________
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"
State Changed From-To: feedback->closed Committed. Thanks! |
