Date: Sat, 4 Jan 2014 00:29:52 +0000 (UTC) From: Brendan Fabeny <bf@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338607 - in head/security: tor tor-devel Message-ID: <201401040029.s040TqgU024391@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bf Date: Sat Jan 4 00:29:51 2014 New Revision: 338607 URL: http://svnweb.freebsd.org/changeset/ports/338607 Log: Update tor and tor-devel to 0.2.4.20 Modified: head/security/tor-devel/Makefile head/security/tor-devel/distinfo head/security/tor/Makefile head/security/tor/distinfo head/security/tor/pkg-plist Modified: head/security/tor-devel/Makefile ============================================================================== --- head/security/tor-devel/Makefile Sat Jan 4 00:28:42 2014 (r338606) +++ head/security/tor-devel/Makefile Sat Jan 4 00:29:51 2014 (r338607) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tor -DISTVERSION= 0.2.4.18-rc +DISTVERSION= 0.2.4.20 CATEGORIES= security net ipv6 MASTER_SITES= https://www.torproject.org/dist/ \ ftp://ftp.bit.nl/mirror/tor/ \ @@ -47,7 +47,7 @@ PKGNAMESUFFIX= -devel MAINTAINER= bf@FreeBSD.org COMMENT= An anonymizing overlay network for TCP -LICENSE= BSD +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE GNU_CONFIGURE= yes Modified: head/security/tor-devel/distinfo ============================================================================== --- head/security/tor-devel/distinfo Sat Jan 4 00:28:42 2014 (r338606) +++ head/security/tor-devel/distinfo Sat Jan 4 00:29:51 2014 (r338607) @@ -1,2 +1,2 @@ -SHA256 (tor-0.2.4.18-rc.tar.gz) = e4e644274e24c2270f638fbcbe1c9167607ec98332a1cef4c3d03f408eb3aef5 -SIZE (tor-0.2.4.18-rc.tar.gz) = 2854762 +SHA256 (tor-0.2.4.20.tar.gz) = ccc51747cbcbf98f658c34d5c693ff8a868698da0349d056e98287ef2e294d9f +SIZE (tor-0.2.4.20.tar.gz) = 2867180 Modified: head/security/tor/Makefile ============================================================================== --- head/security/tor/Makefile Sat Jan 4 00:28:42 2014 (r338606) +++ head/security/tor/Makefile Sat Jan 4 00:29:51 2014 (r338607) @@ -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 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 Modified: head/security/tor/distinfo ============================================================================== --- head/security/tor/distinfo Sat Jan 4 00:28:42 2014 (r338606) +++ head/security/tor/distinfo Sat Jan 4 00:29:51 2014 (r338607) @@ -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 Modified: head/security/tor/pkg-plist ============================================================================== --- head/security/tor/pkg-plist Sat Jan 4 00:28:42 2014 (r338606) +++ head/security/tor/pkg-plist Sat Jan 4 00:29:51 2014 (r338607) @@ -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 /
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401040029.s040TqgU024391>