diff options
| author | bf <bf@FreeBSD.org> | 2011-08-31 00:57:43 +0800 |
|---|---|---|
| committer | bf <bf@FreeBSD.org> | 2011-08-31 00:57:43 +0800 |
| commit | ba72f333533d123eed3c448dfd4804b35bb64842 (patch) | |
| tree | 10609f400f0374d793aa1e77352d59cf6520641d /security/tor/Makefile | |
| parent | 00c3bf75581128298b14899a8ee4e1bdf1df2b3b (diff) | |
| download | freebsd-ports-gnome-ba72f333533d123eed3c448dfd4804b35bb64842.tar.gz freebsd-ports-gnome-ba72f333533d123eed3c448dfd4804b35bb64842.tar.zst freebsd-ports-gnome-ba72f333533d123eed3c448dfd4804b35bb64842.zip | |
update to 0.2.2.32
Diffstat (limited to 'security/tor/Makefile')
| -rw-r--r-- | security/tor/Makefile | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/security/tor/Makefile b/security/tor/Makefile index 436726145ace..4b9d8e6fb6c7 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -6,7 +6,7 @@ # PORTNAME= tor -DISTVERSION= 0.2.1.30 +DISTVERSION= 0.2.2.32 CATEGORIES= security net ipv6 MASTER_SITES= https://www.torproject.org/dist/ \ ftp://ftp.bit.nl/mirror/tor/ \ @@ -40,13 +40,17 @@ COMMENT= An anonymizing overlay network for TCP LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent +LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2 GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-openssl-dir="${OPENSSLBASE}" +CONFIGURE_ARGS= --with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc \ + --enable-linker-hardening +CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \ + TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \ + TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/event2" \ + TOR_LIBEVENT_LIBS="-levent-2.0" 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 \ @@ -65,6 +69,12 @@ MAN1= tor.1 tor-resolve.1 torify.1 tor-gencert.1 .include <bsd.port.pre.mk> +.if ( (${OSVERSION} >= 703100 && ${OSVERSION} < 800000) || \ +(${OSVERSION} >= 800500 && ${OSVERSION} < 900000) || \ +(${OSVERSION} >= 900003) ) && !defined(USE_GCC) +CONFIGURE_ARGS+= --enable-gcc-hardening +.endif + .if ( ${OSVERSION} < 704000 || \ (${OSVERSION} >= 800000 && ${OSVERSION} < 801500) || \ (${OSVERSION} >= 900000 && ${OSVERSION} < 900011) ) @@ -78,12 +88,6 @@ CONFIGURE_ARGS+= --enable-buf-freelists 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 @@ -113,12 +117,14 @@ post-patch: ${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 '\|CFLAGS=|{s|-g||;s|-O[0-9]\{0,1\}||;}' \ - -e 's|netinet/in6||g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e '\|^install-data-am:|s|install-docDATA||' \ + ${WRKSRC}/doc/Makefile.in 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 post-install: ${MKDIR} /var/run/tor |