Attachment #175453 for bug #212952




# $FreeBSD$

PORTNAME=	tor
PORTVERSION=	0.2.8.8
PORTREVISION=	1
CATEGORIES=	security net ipv6
MASTER_SITES=	TOR



STATIC_TOR_DESC=	Build a static tor
TCMALLOC_DESC=		Use the tcmalloc memory allocation library
TOR2WEB_DESC=		(EXPERT OPTION) Faster but non-anonymous hidden services
TRANSPARENT_DESC=	Transparent proxy support

OPTIONS_DEFAULT=	TRANSPARENT


USE_RC_SUBR=	tor
SUB_FILES=	pkg-message
SUB_LIST=	USER="${USERS}" GROUP="${GROUPS}"
PLIST_SUB=	USER=${USER} GROUP=${GROUP}

GROUPS=		_tor
USERS=		_tor

CONFIGURE_ARGS+=	--disable-transparent
.endif

pre-everything::
.if ${PORT_OPTIONS:MTOR2WEB}
	@${ECHO_MSG}
	@${ECHO_MSG} "Warning: The expert option 'tor2web' is chosen."
	@${ECHO_MSG} "         With this option tor cannot be used for regular traffic,"
	@${ECHO_MSG} "         only for non-anonymous hidden service traffic."
	@${ECHO_MSG} "         Please make sure you understand this option."
	@${ECHO_MSG}
.endif

post-patch:
	@${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
		${WRKSRC}/configure

		${WRKSRC}/Makefile

post-install:
	@${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor ${STAGEDIR}/var/db/tor

.if ! ${PORT_OPTIONS:MTOR2WEB}
check regression-test test: build

Lines 1-3 Link Here

(-)security/tor/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1472080840	1	TIMESTAMP = 1475695389
2	SHA256 (tor-0.2.8.7.tar.gz) = ae44e2b699e82db7ff318432fd558dfa941ad154e4055f16d208514951742fc6	2	SHA256 (tor-0.2.8.8.tar.gz) = b1af02c61253dcdb4e1a4f552adaba4e07aed0e5468e45c0764550161480e3de
3	SIZE (tor-0.2.8.7.tar.gz) = 5179093	3	SIZE (tor-0.2.8.8.tar.gz) = 5093794

Lines 26-32 Link Here

(-)security/tor/files/tor.in (-1 / +1 lines)
26		26
27	: ${tor_enable="NO"}	27	: ${tor_enable="NO"}
28	: ${tor_conf="%%PREFIX%%/etc/tor/torrc"}	28	: ${tor_conf="%%PREFIX%%/etc/tor/torrc"}
29	: ${tor_user="_tor"}	29	: ${tor_user="%%USER%%"}
30	: ${tor_pidfile="/var/run/tor/tor.pid"}	30	: ${tor_pidfile="/var/run/tor/tor.pid"}
31	: ${tor_datadir="/var/db/tor"}	31	: ${tor_datadir="/var/db/tor"}
32		32

Lines 9-13 Link Here

(-)security/tor/pkg-plist (-2 / +3 lines)
9	man/man1/torify.1.gz	9	man/man1/torify.1.gz
10	%%DATADIR%%/geoip	10	%%DATADIR%%/geoip
11	%%DATADIR%%/geoip6	11	%%DATADIR%%/geoip6
12	@dir(_tor,_tor,750) /var/run/tor	12	@dir(%%USER%%,%%GROUP%%,700) /var/run/tor
13	@dir(_tor,_tor,750) /var/log/tor	13	@dir(%%USER%%,%%GROUP%%,700) /var/log/tor
		14	@dir(%%USER%%,%%GROUP%%,700) /var/db/tor

Return to bug 212952

Lines 2-9 Link Here

(-)security/tor/Makefile (-4 / +15 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= tor	4	PORTNAME= tor
5	PORTVERSION= 0.2.8.7	5	PORTVERSION= 0.2.8.8
6	PORTREVISION= 1
7	CATEGORIES= security net ipv6	6	CATEGORIES= security net ipv6
8	MASTER_SITES= TOR	7	MASTER_SITES= TOR
9		8
Lines 29-35 Link Here
29		28
30	STATIC_TOR_DESC= Build a static tor	29	STATIC_TOR_DESC= Build a static tor
31	TCMALLOC_DESC= Use the tcmalloc memory allocation library	30	TCMALLOC_DESC= Use the tcmalloc memory allocation library
32	TOR2WEB_DESC= Faster but non-anonymous hidden services	31	TOR2WEB_DESC= (EXPERT OPTION) Faster but non-anonymous hidden services
33	TRANSPARENT_DESC= Transparent proxy support	32	TRANSPARENT_DESC= Transparent proxy support
34		33
35	OPTIONS_DEFAULT= TRANSPARENT	34	OPTIONS_DEFAULT= TRANSPARENT
Lines 36-41 Link Here
36		35
37	USE_RC_SUBR= tor	36	USE_RC_SUBR= tor
38	SUB_FILES= pkg-message	37	SUB_FILES= pkg-message
		38	SUB_LIST= USER="${USERS}" GROUP="${GROUPS}"
		39	PLIST_SUB= USER=${USER} GROUP=${GROUP}
39		40
40	GROUPS= _tor	41	GROUPS= _tor
41	USERS= _tor	42	USERS= _tor
Lines 88-93 Link Here
88	CONFIGURE_ARGS+= --disable-transparent	89	CONFIGURE_ARGS+= --disable-transparent
89	.endif	90	.endif
90		91
		92	pre-everything::
		93	.if ${PORT_OPTIONS:MTOR2WEB}
		94	@${ECHO_MSG}
		95	@${ECHO_MSG} "Warning: The expert option 'tor2web' is chosen."
		96	@${ECHO_MSG} " With this option tor cannot be used for regular traffic,"
		97	@${ECHO_MSG} " only for non-anonymous hidden service traffic."
		98	@${ECHO_MSG} " Please make sure you understand this option."
		99	@${ECHO_MSG}
		100	.endif
		101
91	post-patch:	102	post-patch:
92	@${REINPLACE_CMD} -E -e "s@(-z) (relro\|now)@-Wl,\1,\2@g" \	103	@${REINPLACE_CMD} -E -e "s@(-z) (relro\|now)@-Wl,\1,\2@g" \
93	${WRKSRC}/configure	104	${WRKSRC}/configure
Lines 109-115 Link Here
109	${WRKSRC}/Makefile	120	${WRKSRC}/Makefile
110		121
111	post-install:	122	post-install:
112	@${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor	123	@${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor ${STAGEDIR}/var/db/tor
113		124
114	.if ! ${PORT_OPTIONS:MTOR2WEB}	125	.if ! ${PORT_OPTIONS:MTOR2WEB}
115	check regression-test test: build	126	check regression-test test: build