Attachment #164153 for bug #203014

View | Details | Raw Unified | Return to bug 203014 | Differences between

and this patch




# $FreeBSD$

PORTNAME=	tor
DISTVERSION=	0.2.7.6
CATEGORIES=	security net ipv6
MASTER_SITES=	TOR


USES=		cpe gmake
CPE_VENDOR=	torproject
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-openssl-dir=${OPENSSLBASE} --disable-asciidoc
CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"

OPTIONS_DEFINE=	BUFFEREVENTS INSTR_DOWNLOADS \
		STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT

OPTIONS_DEFAULT=	THREADS TRANSPARENT

OPTIONS_GROUP=	TRANSPORT
OPTIONS_GROUP_TRANSPORT=	OBFSPROXY

BUFFEREVENTS_CONFIGURE_ENABLE=		bufferevents
INSTR_DOWNLOADS_CONFIGURE_ENABLE=	instrument-downloads
OBFSPROXY_BUILD_DEPENDS=		${LOCALBASE}/bin/obfsproxy:security/obfsproxy
TOR2WEB_CONFIGURE_ENABLE=		tor2web-mode
TRANSPARENT_CONFIGURE_ENABLE=		transparent

BUFFEREVENTS_DESC=	Use libevent's buffered IO
INSTR_DOWNLOADS_DESC=	Instrument downloads for analysis
OBFSPROXY_DESC=		Pluggable transport proxy written in Python
STATIC_TOR_DESC=	Build a static tor
TCMALLOC_DESC=		Use the tcmalloc memory allocation library
TOR2WEB_DESC=		Faster but non-anonymous hidden services


OPTIONS_DEFAULT=	THREADS TRANSPARENT

OPTIONS_GROUP=	TRANSPORT
OPTIONS_GROUP_TRANSPORT=	OBFSPROXY

USE_OPENSSL=	yes

USE_RC_SUBR=	tor


.include <bsd.port.options.mk>

.if (${OSVERSION} < 1000015)
WITH_OPENSSL_PORT=	yes
.endif

.if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \
empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64)
CONFIGURE_ARGS+=	--enable-gcc-hardening

CONFIGURE_ARGS+=	--disable-gcc-hardening
.endif

.if ${PORT_OPTIONS:MOBFSPROXY}
BUILD_DEPENDS +=	${LOCALBASE}/bin/obfsproxy:security/obfsproxy
.else
CONFIGURE_ARGS+=	--disable-bufferevents
.endif

.if ${PORT_OPTIONS:MINSTR_DOWNLOADS}
CONFIGURE_ARGS+=	--enable-instrument-downloads
.else
CONFIGURE_ARGS+=	--disable-instrument-downloads
.endif

.if ${PORT_OPTIONS:MSTATIC_TOR}
BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:devel/libevent2
CONFIGURE_ARGS+=	--enable-static-tor \
			--disable-linker-hardening \
			--with-libevent-dir=${LOCALBASE}/lib \
			--with-zlib-dir=/usr/lib
.if ${PORT_OPTIONS:MBUFFEREVENTS}
TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
.endif
.else
CONFIGURE_ARGS+=	--enable-linker-hardening
LIB_DEPENDS+=		libevent.so:devel/libevent2
TOR_LIBEVENT_LIBS=	-levent
.if ${PORT_OPTIONS:MBUFFEREVENTS}
TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}


.if ${PORT_OPTIONS:MTCMALLOC}
CONFIGURE_ARGS+=	--with-tcmalloc
LDFLAGS+=		"-L${LOCALBASE}/lib"
.if ${PORT_OPTIONS:MSTATIC_TOR}
BUILD_DEPENDS +=	${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools
.else
LIB_DEPENDS+=		libtcmalloc.so:${PORTSDIR}/devel/google-perftools
.endif
BUILD_DEPENDS +=	${LOCALBASE}/lib/libtcmalloc.so:devel/google-perftools
LIB_DEPENDS+=		libtcmalloc.so:devel/google-perftools
.endif

.if ! ${PORT_OPTIONS:MTOR2WEB}
check regression-test test: build
	@cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
		${MAKE_ARGS} check
.endif

.if ${PORT_OPTIONS:MTRANSPARENT}
CONFIGURE_ARGS+=	--enable-transparent
.else
CONFIGURE_ARGS+=	--disable-transparent
.endif

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

post-configure:
	@${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(install_mans:=.1)|' \
		${WRKSRC}/Makefile

.if ! ${PORT_OPTIONS:MTOR2WEB}
check regression-test test: build
	@cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
	${MAKE_ARGS} check

.endif
.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (tor-0.2.6.10.tar.gz) = 0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d	1	SHA256 (tor-0.2.7.6.tar.gz) = 493a8679f904503048114aca6467faef56861206bab8283d858f37141d95105d
2	SIZE (tor-0.2.6.10.tar.gz) = 3587211	2	SIZE (tor-0.2.7.6.tar.gz) = 4869754




--- configure.orig	2012-06-15 03:10:31.000000000 -0400
+++ configure	2012-06-17 08:46:34.000000000 -0400
@@ -6319,6 +6319,7 @@
 fi
 
 
+if false ; then
 trylibeventdir=""
 
 # Check whether --with-libevent-dir was given.
@@ -6645,6 +6646,7 @@
 LIBS="$tor_saved_LIBS"
 LDFLAGS="$tor_saved_LDFLAGS"
 CPPFLAGS="$tor_saved_CPPFLAGS"
+fi
 
 
 
@@ -6707,6 +6709,7 @@
 fi
 
 
+if false ; then
 if test "$enable_static_libevent" = "yes"; then
    if test "$tor_cv_library_libevent_dir" = "(system)"; then
      as_fn_error $? "\"You must specify an explicit --with-libevent-dir=x option when using --enable-static-libevent\"" "$LINENO" 5
@@ -6716,6 +6719,7 @@
 else
      TOR_LIBEVENT_LIBS="-levent"
 fi
+fi
 
 if test "$enable_bufferevents" = "yes" ; then
   if test "$ac_cv_header_event2_bufferevent_ssl_h" != "yes" ; then
@@ -6794,12 +6798,14 @@
 
 $as_echo "#define USE_BUFFEREVENTS 1" >>confdefs.h
 
+if false ; then
   if test "$enable_static_libevent" = "yes"; then
     TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent_openssl.a $TOR_LIBEVENT_LIBS"
   else
     TOR_LIBEVENT_LIBS="-levent_openssl $TOR_LIBEVENT_LIBS"
   fi
 fi
+fi
 
 
 




and edit %%PREFIX%%/etc/tor/torrc as desired. (However, note that the
%%PREFIX%%/etc/rc.d/tor rc.subr script can override some torrc
options: see that script for details.) To use the torify script, install
the net/torsocks port.
a major update of tor, you should:

Before starting the tor server. Tor users are strongly advised to prevent traffic
analysis that exploits sequential IP ID by setting:
touch /var/log/tor
chown -R _tor:_tor /var/db/tor /var/log/tor /var/run/tor
chmod -R 700 /var/db/tor

	# sysctl net.inet.ip.random_id=1
analysis that exploits sequential IP IDs by setting:

Please read sysctl.conf(5) for more information and details.

(see sysctl.conf(5)).
================================================================================




# tor_enable (bool):	Set it to "YES" to enable tor. Default: NO
# tor_conf (str):	Points to your torrc file.
#			Default: %%PREFIX%%/etc/tor/torrc
# tor_user (str):	Tor daemon user.	Default: _tor
# tor_group (str):	Tor daemon group.	Default: _tor
# tor_datadir (str):	Tor data directory.	Default: /var/db/tor
# tor_logdir (str):	Tor log directory.	Default: /var/log/tor
# tor_loglevel (str):	Tor log severity level.	Default: notice
#

. /etc/rc.subr

: ${tor_enable="NO"}
: ${tor_conf="%%PREFIX%%/etc/tor/torrc"}
: ${tor_user="_tor"}
: ${tor_group="_tor"}
: ${tor_datadir="/var/db/tor"}
: ${tor_logdir="/var/log/tor"}
: ${tor_logfile="${tor_logdir}/tor.log"}
: ${tor_loglevel="notice"}
: ${tor_piddir="/var/run/tor"}
: ${tor_pidfile="${tor_piddir}/tor.pid"}

required_files=${tor_conf}
# required_dirs="${tor_datadir} ${tor_logdir} ${tor_piddir}"
pidfile=${tor_pidfile}

command="%%PREFIX%%/bin/${name}"
command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir} --Log ${tor_loglevel}\ file\ ${tor_logfile}"
extra_commands="log reload"
log_cmd="${name}_log"
start_precmd="${name}_prestart"

tor_log() {
	cat ${tor_logfile}
}

tor_prestart() {
	if [ -f "${tor_logdir}" ]; then
	  tor_log_old=$(awk '{print $5" "$6" "$7}' ${tor_logdir} | grep \)$ | head -n1)
	  if [ "x${tor_log_old}" != "x" ]; then
	  	tor_log_old_rev=$(echo ${tor_log_old} | cut -d\- -f2 | cut -d\) -f1)
	  	echo Saving a backup for ${tor_log_old}...
	  	mv ${tor_logdir} /tmp/tor.log.${tor_log_old_rev}
	  	echo ${tor_logdir} was moved to save an old log file. Creating new log dir...
	  	install -d -m 0700 -o ${tor_user} -g ${tor_group} ${tor_logdir}
	  	mv /tmp/tor.log.${tor_log_old_rev} ${tor_logdir}/.
	  else
	  	echo You have something else on ${tor_logdir}! Please check it.
	  	return 1;
	  fi
	fi

	if [ ! -d "${tor_datadir}" ]; then
	  echo ${tor_datadir} not found. Creating it...
	  install -d -m 0700 -o ${tor_user} -g ${tor_group} ${tor_datadir}
	fi
	if [ ! -d "${tor_logdir}" ]; then
	  echo ${tor_logdir} not found. Creating it...
	  install -d -m 0700 -o ${tor_user} -g ${tor_group} ${tor_logdir}
	fi
	if [ ! -d "${tor_piddir}" ]; then
	  echo ${tor_piddir} not found. Creating it...
	  install -d -m 0700 -o ${tor_user} -g ${tor_group} ${tor_piddir}
	fi
}

run_rc_command "$1"


Return to bug 203014

Lines 2-8 Link Here

(-)Makefile (-41 / +36 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= tor	4	PORTNAME= tor
5	DISTVERSION= 0.2.6.10	5	DISTVERSION= 0.2.7.6
6	CATEGORIES= security net ipv6	6	CATEGORIES= security net ipv6
7	MASTER_SITES= TOR	7	MASTER_SITES= TOR
8		8
Lines 15-30 Link Here
15	USES= cpe gmake	15	USES= cpe gmake
16	CPE_VENDOR= torproject	16	CPE_VENDOR= torproject
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= --with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc	18	CONFIGURE_ARGS= --with-openssl-dir=${OPENSSLBASE} --disable-asciidoc
19	CONFIGURE_ENV= TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
20	TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
21	TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
22		19
23	OPTIONS_DEFINE= BUFFEREVENTS INSTR_DOWNLOADS \	20	OPTIONS_DEFINE= BUFFEREVENTS INSTR_DOWNLOADS \
24	STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT	21	STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT
25		22
		23	OPTIONS_DEFAULT= THREADS TRANSPARENT
		24
		25	OPTIONS_GROUP= TRANSPORT
		26	OPTIONS_GROUP_TRANSPORT= OBFSPROXY
		27
		28	BUFFEREVENTS_CONFIGURE_ENABLE= bufferevents
		29	INSTR_DOWNLOADS_CONFIGURE_ENABLE= instrument-downloads
		30	OBFSPROXY_BUILD_DEPENDS= ${LOCALBASE}/bin/obfsproxy:security/obfsproxy
		31	TOR2WEB_CONFIGURE_ENABLE= tor2web-mode
		32	TRANSPARENT_CONFIGURE_ENABLE= transparent
		33
26	BUFFEREVENTS_DESC= Use libevent's buffered IO	34	BUFFEREVENTS_DESC= Use libevent's buffered IO
27	INSTR_DOWNLOADS_DESC= Instrument downloads for analysis	35	INSTR_DOWNLOADS_DESC= Instrument downloads for analysis
		36	OBFSPROXY_DESC= Pluggable transport proxy written in Python
28	STATIC_TOR_DESC= Build a static tor	37	STATIC_TOR_DESC= Build a static tor
29	TCMALLOC_DESC= Use the tcmalloc memory allocation library	38	TCMALLOC_DESC= Use the tcmalloc memory allocation library
30	TOR2WEB_DESC= Faster but non-anonymous hidden services	39	TOR2WEB_DESC= Faster but non-anonymous hidden services
Lines 32-37 Link Here
32		41
33	OPTIONS_DEFAULT= THREADS TRANSPARENT	42	OPTIONS_DEFAULT= THREADS TRANSPARENT
34		43
		44	OPTIONS_GROUP= TRANSPORT
		45	OPTIONS_GROUP_TRANSPORT= OBFSPROXY
		46
35	USE_OPENSSL= yes	47	USE_OPENSSL= yes
36		48
37	USE_RC_SUBR= tor	49	USE_RC_SUBR= tor
Lines 44-49 Link Here
44		56
45	.include <bsd.port.options.mk>	57	.include <bsd.port.options.mk>
46		58
		59	.if (${OSVERSION} < 1000015)
		60	WITH_OPENSSL_PORT= yes
		61	.endif
		62
47	.if !defined(USE_GCC) && empty(CC:T:Mgcc4) && \	63	.if !defined(USE_GCC) && empty(CC:T:Mgcc4) && \
48	empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64)	64	empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64)
49	CONFIGURE_ARGS+= --enable-gcc-hardening	65	CONFIGURE_ARGS+= --enable-gcc-hardening
Lines 51-79 Link Here
51	CONFIGURE_ARGS+= --disable-gcc-hardening	67	CONFIGURE_ARGS+= --disable-gcc-hardening
52	.endif	68	.endif
53		69
54	.if ${PORT_OPTIONS:MBUFFEREVENTS}	70	.if ${PORT_OPTIONS:MOBFSPROXY}
55	CONFIGURE_ARGS+= --enable-bufferevents	71	BUILD_DEPENDS += ${LOCALBASE}/bin/obfsproxy:security/obfsproxy
56	.else
57	CONFIGURE_ARGS+= --disable-bufferevents
58	.endif	72	.endif
59		73
60	.if ${PORT_OPTIONS:MINSTR_DOWNLOADS}
61	CONFIGURE_ARGS+= --enable-instrument-downloads
62	.else
63	CONFIGURE_ARGS+= --disable-instrument-downloads
64	.endif
65
66	.if ${PORT_OPTIONS:MSTATIC_TOR}	74	.if ${PORT_OPTIONS:MSTATIC_TOR}
67	BUILD_DEPENDS += ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2	75	BUILD_DEPENDS += ${LOCALBASE}/lib/libevent.a:devel/libevent2
68	CONFIGURE_ARGS+= --enable-static-tor \	76	CONFIGURE_ARGS+= --enable-static-tor \
69	--with-zlib-dir=/usr/lib --disable-linker-hardening	77	--disable-linker-hardening \
70	TOR_LIBEVENT_LIBS= ${LOCALBASE}/lib/libevent.a	78	--with-libevent-dir=${LOCALBASE}/lib \
		79	--with-zlib-dir=/usr/lib
71	.if ${PORT_OPTIONS:MBUFFEREVENTS}	80	.if ${PORT_OPTIONS:MBUFFEREVENTS}
72	TOR_LIBEVENT_LIBS:= ${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}	81	TOR_LIBEVENT_LIBS:= ${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
73	.endif	82	.endif
74	.else	83	.else
75	CONFIGURE_ARGS+= --enable-linker-hardening	84	CONFIGURE_ARGS+= --enable-linker-hardening
76	LIB_DEPENDS+= libevent.so:${PORTSDIR}/devel/libevent2	85	LIB_DEPENDS+= libevent.so:devel/libevent2
77	TOR_LIBEVENT_LIBS= -levent	86	TOR_LIBEVENT_LIBS= -levent
78	.if ${PORT_OPTIONS:MBUFFEREVENTS}	87	.if ${PORT_OPTIONS:MBUFFEREVENTS}
79	TOR_LIBEVENT_LIBS:= -levent_openssl ${TOR_LIBEVENT_LIBS}	88	TOR_LIBEVENT_LIBS:= -levent_openssl ${TOR_LIBEVENT_LIBS}
Lines 82-117 Link Here
82		91
83	.if ${PORT_OPTIONS:MTCMALLOC}	92	.if ${PORT_OPTIONS:MTCMALLOC}
84	CONFIGURE_ARGS+= --with-tcmalloc	93	CONFIGURE_ARGS+= --with-tcmalloc
		94	LDFLAGS+= "-L${LOCALBASE}/lib"
85	.if ${PORT_OPTIONS:MSTATIC_TOR}	95	.if ${PORT_OPTIONS:MSTATIC_TOR}
86	BUILD_DEPENDS += ${LOCALBASE}/lib/libtcmalloc.so:${PORTSDIR}/devel/google-perftools	96	BUILD_DEPENDS += ${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools
87	.else
88	LIB_DEPENDS+= libtcmalloc.so:${PORTSDIR}/devel/google-perftools
89	.endif	97	.endif
		98	BUILD_DEPENDS += ${LOCALBASE}/lib/libtcmalloc.so:devel/google-perftools
		99	LIB_DEPENDS+= libtcmalloc.so:devel/google-perftools
90	.endif	100	.endif
91		101
92	.if ${PORT_OPTIONS:MTOR2WEB}	102	.if ! ${PORT_OPTIONS:MTOR2WEB}
93	CONFIGURE_ARGS+= --enable-tor2web-mode	103	check regression-test test: build
		104	@cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
		105	${MAKE_ARGS} check
94	.endif	106	.endif
95		107
96	.if ${PORT_OPTIONS:MTRANSPARENT}
97	CONFIGURE_ARGS+= --enable-transparent
98	.else
99	CONFIGURE_ARGS+= --disable-transparent
100	.endif
101
102	post-patch:
103	@${REINPLACE_CMD} -E -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
104	-e "s@(-z) (relro\|now)@-Wl,\1,\2@g" \
105	${WRKSRC}/configure
106
107	post-configure:	108	post-configure:
108	@${REINPLACE_CMD} -e '\\|^nodist_man1_MANS =\|s\|$$\|$$(install_mans:=.1)\|' \	109	@${REINPLACE_CMD} -e '\\|^nodist_man1_MANS =\|s\|$$\|$$(install_mans:=.1)\|' \
109	${WRKSRC}/Makefile	110	${WRKSRC}/Makefile
110		111
111	.if ! ${PORT_OPTIONS:MTOR2WEB}
112	check regression-test test: build
113	@cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
114	${MAKE_ARGS} check
115
116	.endif
117	.include <bsd.port.mk>	112	.include <bsd.port.mk>

Lines 1-49 Link Here

(-)files/patch-configure (-49 lines)
1	--- configure.orig 2012-06-15 03:10:31.000000000 -0400
2	+++ configure 2012-06-17 08:46:34.000000000 -0400
3	@@ -6319,6 +6319,7 @@
4	fi
5
6
7	+if false ; then
8	trylibeventdir=""
9
10	# Check whether --with-libevent-dir was given.
11	@@ -6645,6 +6646,7 @@
12	LIBS="$tor_saved_LIBS"
13	LDFLAGS="$tor_saved_LDFLAGS"
14	CPPFLAGS="$tor_saved_CPPFLAGS"
15	+fi
16
17
18
19	@@ -6707,6 +6709,7 @@
20	fi
21
22
23	+if false ; then
24	if test "$enable_static_libevent" = "yes"; then
25	if test "$tor_cv_library_libevent_dir" = "(system)"; then
26	as_fn_error $? "\"You must specify an explicit --with-libevent-dir=x option when using --enable-static-libevent\"" "$LINENO" 5
27	@@ -6716,6 +6719,7 @@
28	else
29	TOR_LIBEVENT_LIBS="-levent"
30	fi
31	+fi
32
33	if test "$enable_bufferevents" = "yes" ; then
34	if test "$ac_cv_header_event2_bufferevent_ssl_h" != "yes" ; then
35	@@ -6794,12 +6798,14 @@
36
37	$as_echo "#define USE_BUFFEREVENTS 1" >>confdefs.h
38
39	+if false ; then
40	if test "$enable_static_libevent" = "yes"; then
41	TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent_openssl.a $TOR_LIBEVENT_LIBS"
42	else
43	TOR_LIBEVENT_LIBS="-levent_openssl $TOR_LIBEVENT_LIBS"
44	fi
45	fi
46	+fi
47
48
49

Lines 3-21 Link Here

(-)files/pkg-message.in (-12 / +5 lines)
3	and edit %%PREFIX%%/etc/tor/torrc as desired. (However, note that the	3	and edit %%PREFIX%%/etc/tor/torrc as desired. (However, note that the
4	%%PREFIX%%/etc/rc.d/tor rc.subr script can override some torrc	4	%%PREFIX%%/etc/rc.d/tor rc.subr script can override some torrc
5	options: see that script for details.) To use the torify script, install	5	options: see that script for details.) To use the torify script, install
6	the net/torsocks port. After installing tor for the first time, or after	6	the net/torsocks port.
7	a major update of tor, you should:
8		7
9	rm -r /var/db/tor /var/run/tor	8	Before starting the tor server. Tor users are strongly advised to prevent traffic
10	mkdir -p /var/db/tor/data /var/run/tor	9	analysis that exploits sequential IP ID by setting:
11	touch /var/log/tor
12	chown -R _tor:_tor /var/db/tor /var/log/tor /var/run/tor
13	chmod -R 700 /var/db/tor
14		10
15	before starting the tor server. Tor users are strongly advised to prevent traffic	11	# sysctl net.inet.ip.random_id=1
16	analysis that exploits sequential IP IDs by setting:
17		12
18	sysctl net.inet.ip.random_id=1	13	Please read sysctl.conf(5) for more information and details.
19
20	(see sysctl.conf(5)).
21	================================================================================	14	================================================================================

Lines 13-22 Link Here

(-)files/tor.in (-9 / +45 lines)
13	# tor_enable (bool): Set it to "YES" to enable tor. Default: NO	13	# tor_enable (bool): Set it to "YES" to enable tor. Default: NO
14	# tor_conf (str): Points to your torrc file.	14	# tor_conf (str): Points to your torrc file.
15	# Default: %%PREFIX%%/etc/tor/torrc	15	# Default: %%PREFIX%%/etc/tor/torrc
16	# tor_user (str): Tor daemon user. Default: _tor	16	# tor_user (str): Tor daemon user. Default: _tor
17	# tor_datadir (str): Tor datadir. Default: /var/db/tor	17	# tor_group (str): Tor daemon group. Default: _tor
18	# tor_logfile (str): Tor log file. Default: /var/log/tor	18	# tor_datadir (str): Tor data directory. Default: /var/db/tor
19	# tor_loglevel (str): Tor log severity level. Default: notice	19	# tor_logdir (str): Tor log directory. Default: /var/log/tor
		20	# tor_loglevel (str): Tor log severity level. Default: notice
20	#	21	#
21		22
22	. /etc/rc.subr	23	. /etc/rc.subr
Lines 29-50 Link Here
29	: ${tor_enable="NO"}	30	: ${tor_enable="NO"}
30	: ${tor_conf="%%PREFIX%%/etc/tor/torrc"}	31	: ${tor_conf="%%PREFIX%%/etc/tor/torrc"}
31	: ${tor_user="_tor"}	32	: ${tor_user="_tor"}
32	: ${tor_pidfile="/var/run/tor/tor.pid"}	33	: ${tor_group="_tor"}
33	: ${tor_logfile="/var/log/tor"}	34	: ${tor_datadir="/var/db/tor"}
		35	: ${tor_logdir="/var/log/tor"}
		36	: ${tor_logfile="${tor_logdir}/tor.log"}
34	: ${tor_loglevel="notice"}	37	: ${tor_loglevel="notice"}
35	: ${tor_datadir="/var/db/tor"}	38	: ${tor_piddir="/var/run/tor"}
		39	: ${tor_pidfile="${tor_piddir}/tor.pid"}
36		40
37	required_files=${tor_conf}	41	required_files=${tor_conf}
38	required_dirs=${tor_datadir}	42	# required_dirs="${tor_datadir} ${tor_logdir} ${tor_piddir}"
39	pidfile=${tor_pidfile}	43	pidfile=${tor_pidfile}
		44
40	command="%%PREFIX%%/bin/${name}"	45	command="%%PREFIX%%/bin/${name}"
41	command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir} --+Log ${tor_loglevel}\ file\ ${tor_logfile}"	46	command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir} --Log ${tor_loglevel}\ file\ ${tor_logfile}"
42	extra_commands="log reload"	47	extra_commands="log reload"
43	log_cmd="${name}_log"	48	log_cmd="${name}_log"
		49	start_precmd="${name}_prestart"
44		50
45	tor_log() {	51	tor_log() {
46	cat ${tor_logfile}	52	cat ${tor_logfile}
47	}	53	}
48		54
		55	tor_prestart() {
		56	if [ -f "${tor_logdir}" ]; then
		57	tor_log_old=$(awk '{print $5" "$6" "$7}' ${tor_logdir} \| grep \)$ \| head -n1)
		58	if [ "x${tor_log_old}" != "x" ]; then
		59	tor_log_old_rev=$(echo ${tor_log_old} \| cut -d\- -f2 \| cut -d\) -f1)
		60	echo Saving a backup for ${tor_log_old}...
		61	mv ${tor_logdir} /tmp/tor.log.${tor_log_old_rev}
		62	echo ${tor_logdir} was moved to save an old log file. Creating new log dir...
		63	install -d -m 0700 -o ${tor_user} -g ${tor_group} ${tor_logdir}
		64	mv /tmp/tor.log.${tor_log_old_rev} ${tor_logdir}/.
		65	else
		66	echo You have something else on ${tor_logdir}! Please check it.
		67	return 1;
		68	fi
		69	fi
		70
		71	if [ ! -d "${tor_datadir}" ]; then
		72	echo ${tor_datadir} not found. Creating it...
		73	install -d -m 0700 -o ${tor_user} -g ${tor_group} ${tor_datadir}
		74	fi
		75	if [ ! -d "${tor_logdir}" ]; then
		76	echo ${tor_logdir} not found. Creating it...
		77	install -d -m 0700 -o ${tor_user} -g ${tor_group} ${tor_logdir}
		78	fi
		79	if [ ! -d "${tor_piddir}" ]; then
		80	echo ${tor_piddir} not found. Creating it...
		81	install -d -m 0700 -o ${tor_user} -g ${tor_group} ${tor_piddir}
		82	fi
		83	}
		84
49	run_rc_command "$1"	85	run_rc_command "$1"
50		86