diff options
| author | bf <bf@FreeBSD.org> | 2011-09-10 03:26:41 +0800 |
|---|---|---|
| committer | bf <bf@FreeBSD.org> | 2011-09-10 03:26:41 +0800 |
| commit | 252acc6faf3a60a87655c47b3e6e8dbeaceee8e6 (patch) | |
| tree | 7c16976e6102b4508176662b1b7b65516b3194e8 /security | |
| parent | 29be42658c3bbf8d0f06298f8d2c94bd443ce6c3 (diff) | |
| download | freebsd-ports-gnome-252acc6faf3a60a87655c47b3e6e8dbeaceee8e6.tar.gz freebsd-ports-gnome-252acc6faf3a60a87655c47b3e6e8dbeaceee8e6.tar.zst freebsd-ports-gnome-252acc6faf3a60a87655c47b3e6e8dbeaceee8e6.zip | |
- update to 0.2.3.3-alpha
- allow WITH_BUFFEREVENTS again, after upstream changes
- use gcc hardening on versions of the OS that support PIE
- fix linking in the WITH_TCMALLOC case without
changing the default search path for all libraries,
to try to prevent any additional problems
Diffstat (limited to 'security')
| -rw-r--r-- | security/tor-devel/Makefile | 13 | ||||
| -rw-r--r-- | security/tor-devel/distinfo | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile index 74cfcccbde70..f6628078cc99 100644 --- a/security/tor-devel/Makefile +++ b/security/tor-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= tor -DISTVERSION= 0.2.3.2-alpha -PORTREVISION= 1 +DISTVERSION= 0.2.3.3-alpha CATEGORIES= security net ipv6 MASTER_SITES= https://www.torproject.org/dist/ \ ftp://ftp.bit.nl/mirror/tor/ \ @@ -72,6 +71,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} < 802000) || \ (${OSVERSION} >= 900000 && ${OSVERSION} < 900027) ) @@ -80,7 +85,6 @@ WITH_OPENSSL_PORT= yes .include "${PORTSDIR}/Mk/bsd.openssl.mk" .if defined(WITH_BUFFEREVENTS) -BROKEN = there are unresolved problems with BUFFEREVENTS; please disable this option CONFIGURE_ARGS+= --enable-bufferevents .else CONFIGURE_ARGS+= --disable-bufferevents @@ -117,7 +121,6 @@ TOR_LIBEVENT_LIBS:= -levent_openssl-2.0 ${TOR_LIBEVENT_LIBS} .if defined(WITH_TCMALLOC) CONFIGURE_ARGS+= --with-tcmalloc -LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITH_STATIC_TOR) BUILD_DEPENDS += ${LOCALBASE}/lib/libtcmalloc.so:${PORTSDIR}/devel/google-perftools .else @@ -145,6 +148,8 @@ post-patch: ${WRKSRC}/contrib/Makefile.in @${REINPLACE_CMD} -e '\|^install-data-am:|s|install-docDATA||' \ ${WRKSRC}/doc/Makefile.in + @${REINPLACE_CMD} -e "s|-ltcmalloc|${LOCALBASE}/lib/libtcmalloc.so|" \ + ${WRKSRC}/configure post-configure: @${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \ diff --git a/security/tor-devel/distinfo b/security/tor-devel/distinfo index c2cf78371474..3afd0a1d7b0e 100644 --- a/security/tor-devel/distinfo +++ b/security/tor-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (tor-0.2.3.2-alpha.tar.gz) = 8f423af73c8d8477752858cfcc0c15860f487a0f9a390e791eaea22f4b467edd -SIZE (tor-0.2.3.2-alpha.tar.gz) = 2755750 +SHA256 (tor-0.2.3.3-alpha.tar.gz) = 10293bc387769e47dcef308ff1cdeb1fea1b5ad316ff7b82069c43b51da0f129 +SIZE (tor-0.2.3.3-alpha.tar.gz) = 2813912 |