Attachment 165564 Details for Bug 206235 – Patch

[patch] Patch

tor.patch (text/plain), 5.39 KB, created by Dmitry Marakasov on 2016-01-14 13:08:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2016-01-14 13:08:31 UTC

Size: 5.39 KB

patch

obsolete

>Index: UPDATING
>===================================================================
>--- UPDATING	(revision 406111)
>+++ UPDATING	(working copy)
>@@ -5,6 +5,14 @@
> You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
>+20160114:
>+  AFFECTS: users of security/tor, security/tor-devel
>+  AUTHOR: amdmi3@FreeBSD.org
>+
>+  Tor ports now create /var/log/tor subdirectory for tor logs. If you've
>+  used /var/log/tor as a log _file_, you'll need to update your torrc and
>+  move the file away before updating the port.
>+
> 20160113:
>   AFFECTS: users of sysutils/ansible
>   AUTHOR: lifanov@mail.lifanov.com
>Index: security/tor/Makefile
>===================================================================
>--- security/tor/Makefile	(revision 406109)
>+++ security/tor/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	tor
> PORTVERSION=	0.2.7.6
>+PORTREVISION=	1
> CATEGORIES=	security net ipv6
> MASTER_SITES=	TOR
> 
>@@ -106,6 +107,10 @@
> post-patch:
> 	@${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
> 		${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|lib/tor|db/tor|' \
>+		${WRKSRC}/src/config/torrc.*.in \
>+		${WRKSRC}/doc/tor.1.* \
>+		${WRKSRC}/doc/tor.html.in
> 
> post-patch-STATIC_TOR-off:
> 	@${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
>@@ -119,6 +124,9 @@
> 	@${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(install_mans:=.1)|' \
> 		${WRKSRC}/Makefile
> 
>+post-install:
>+	@${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor
>+
> .if ! ${PORT_OPTIONS:MTOR2WEB}
> check regression-test test: build
> 	@cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
>Index: security/tor/files/pkg-message.in
>===================================================================
>--- security/tor/files/pkg-message.in	(revision 406109)
>+++ security/tor/files/pkg-message.in	(working copy)
>@@ -3,18 +3,11 @@
> 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. After installing tor for the first time, or after
>-a major update of tor, you should:
>+the net/torsocks port.
> 
>-rm -r /var/db/tor /var/run/tor
>-mkdir -p /var/db/tor/data /var/run/tor
>-touch /var/log/tor
>-chown -R _tor:_tor /var/db/tor /var/log/tor /var/run/tor
>-chmod -R 700 /var/db/tor
>+Tor users are strongly advised to prevent traffic analysis that
>+exploits sequential IP IDs by setting:
> 
>-before starting the tor server. Tor users are strongly advised to prevent traffic
>-analysis that exploits sequential IP IDs by setting:
>-
> sysctl net.inet.ip.random_id=1
> 
> (see sysctl.conf(5)).
>Index: security/tor/pkg-plist
>===================================================================
>--- security/tor/pkg-plist	(revision 406109)
>+++ security/tor/pkg-plist	(working copy)
>@@ -9,3 +9,5 @@
> man/man1/torify.1.gz
> %%DATADIR%%/geoip
> %%DATADIR%%/geoip6
>+@dir(_tor,_tor,750) /var/run/tor
>+@dir(_tor,_tor,750) /var/log/tor
>Index: security/tor-devel/Makefile
>===================================================================
>--- security/tor-devel/Makefile	(revision 406109)
>+++ security/tor-devel/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	tor
> PORTVERSION=	0.2.7.6
>+PORTREVISION=	1
> CATEGORIES=	security net ipv6
> MASTER_SITES=	TOR
> PKGNAMESUFFIX=	-devel
>@@ -109,6 +110,10 @@
> post-patch:
> 	@${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
> 		${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|lib/tor|db/tor|' \
>+		${WRKSRC}/src/config/torrc.*.in \
>+		${WRKSRC}/doc/tor.1.* \
>+		${WRKSRC}/doc/tor.html.in
> 
> post-patch-STATIC_TOR-off:
> 	@${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
>@@ -122,6 +127,9 @@
> 	@${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(install_mans:=.1)|' \
> 		${WRKSRC}/Makefile
> 
>+post-install:
>+	@${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor
>+
> .if ! ${PORT_OPTIONS:MTOR2WEB}
> check regression-test test: build
> 	@cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
>Index: security/tor-devel/files/pkg-message.in
>===================================================================
>--- security/tor-devel/files/pkg-message.in	(revision 406109)
>+++ security/tor-devel/files/pkg-message.in	(working copy)
>@@ -3,18 +3,11 @@
> 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. After installing tor for the first time, or after
>-a major update of tor, you should:
>+the net/torsocks port.
> 
>-rm -r /var/db/tor /var/run/tor
>-mkdir -p /var/db/tor/data /var/run/tor
>-touch /var/log/tor
>-chown -R _tor:_tor /var/db/tor /var/log/tor /var/run/tor
>-chmod -R 700 /var/db/tor
>+Tor users are strongly advised to prevent traffic analysis that
>+exploits sequential IP IDs by setting:
> 
>-before starting the tor server. Tor users are strongly advised to prevent traffic
>-analysis that exploits sequential IP IDs by setting:
>-
> sysctl net.inet.ip.random_id=1
> 
> (see sysctl.conf(5)).
>Index: security/tor-devel/pkg-plist
>===================================================================
>--- security/tor-devel/pkg-plist	(revision 406109)
>+++ security/tor-devel/pkg-plist	(working copy)
>@@ -9,3 +9,5 @@
> man/man1/torify.1.gz
> %%DATADIR%%/geoip
> %%DATADIR%%/geoip6
>+@dir(_tor,_tor,750) /var/run/tor
>+@dir(_tor,_tor,750) /var/log/tor

Actions: View | Diff

Attachments on bug 206235: 165564