diff options
| author | Brendan Fabeny <bf@FreeBSD.org> | 2014-01-04 00:29:51 +0000 |
|---|---|---|
| committer | Brendan Fabeny <bf@FreeBSD.org> | 2014-01-04 00:29:51 +0000 |
| commit | d574c9bd082e5e329f5c44b5e54bf55784908b85 (patch) | |
| tree | 8cab96497e0a91a3a0470ac162d54566bd2710f2 /security/tor | |
| parent | 56bc288a0727a76dfd7f2830fe8bafd297e47954 (diff) | |
| download | ports-d574c9bd082e5e329f5c44b5e54bf55784908b85.tar.gz ports-d574c9bd082e5e329f5c44b5e54bf55784908b85.zip | |
Update tor and tor-devel to 0.2.4.20
Notes
Notes:
svn path=/head/; revision=338607
Diffstat (limited to 'security/tor')
| -rw-r--r-- | security/tor/Makefile | 19 | ||||
| -rw-r--r-- | security/tor/distinfo | 4 | ||||
| -rw-r--r-- | security/tor/pkg-plist | 2 |
3 files changed, 11 insertions, 14 deletions
diff --git a/security/tor/Makefile b/security/tor/Makefile index 26c745813543..8c8b2b8f2681 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tor -DISTVERSION= 0.2.3.25 -PORTREVISION= 1 +DISTVERSION= 0.2.4.20 CATEGORIES= security net ipv6 MASTER_SITES= https://www.torproject.org/dist/ \ ftp://ftp.bit.nl/mirror/tor/ \ @@ -49,7 +48,7 @@ MASTER_SITES= https://www.torproject.org/dist/ \ MAINTAINER= bf@FreeBSD.org COMMENT= An anonymizing overlay network for TCP -LICENSE= BSD +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE GNU_CONFIGURE= yes @@ -109,6 +108,10 @@ CONFIGURE_ARGS+= --disable-gcc-hardening WITH_OPENSSL_PORT= yes .endif +.if ( ${OSVERSION} < 800038 ) +CPPFLAGS+= -DSTAILQ_ENTRY=SIMPLEQ_ENTRY +.endif + .if ${PORT_OPTIONS:MBUFFEREVENTS} CONFIGURE_ARGS+= --enable-bufferevents .else @@ -171,12 +174,6 @@ CONFIGURE_ARGS+= --disable-transparent .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 - @${REINPLACE_CMD} -e '\|^install-data-am:|s|install-docDATA||' \ - ${WRKSRC}/doc/Makefile.in @${REINPLACE_CMD} -E -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \ -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \ ${WRKSRC}/configure @@ -184,8 +181,8 @@ post-patch: post-configure: @${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \ "s|-lpthread|${PTHREAD_LIBS}|g" - @${REINPLACE_CMD} -e '\|^nodist_man_MANS =|s|$$|${MAN1}|' \ - ${WRKSRC}/doc/Makefile + @${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|${MAN1:S@^@doc/@}|' \ + ${WRKSRC}/Makefile post-install: ${MKDIR} /var/run/tor diff --git a/security/tor/distinfo b/security/tor/distinfo index 223b77491728..012bf60c7078 100644 --- a/security/tor/distinfo +++ b/security/tor/distinfo @@ -1,2 +1,2 @@ -SHA256 (tor-0.2.3.25.tar.gz) = bb2d6f1136f33e11d37e6e34184143bf191e59501613daf33ae3d6f78f3176a0 -SIZE (tor-0.2.3.25.tar.gz) = 3190011 +SHA256 (tor-0.2.4.20.tar.gz) = ccc51747cbcbf98f658c34d5c693ff8a868698da0349d056e98287ef2e294d9f +SIZE (tor-0.2.4.20.tar.gz) = 2867180 diff --git a/security/tor/pkg-plist b/security/tor/pkg-plist index 136c54c17f36..cbd123779d29 100644 --- a/security/tor/pkg-plist +++ b/security/tor/pkg-plist @@ -3,9 +3,9 @@ bin/tor bin/tor-gencert bin/tor-resolve bin/torify -etc/tor/tor-tsocks.conf.sample etc/tor/torrc.sample %%DATADIR%%/geoip +%%DATADIR%%/geoip6 @dirrm %%DATADIR%% @dirrmtry etc/tor @cwd / |