July 2014 - tor-commits - lists.torproject.org

[bridgedb/develop] Merge branch 'master' into develop
by isis＠torproject.org 30 Jul '14

30 Jul '14

commit 74cdb092998f006a1253aef74e96b3884dd014eb Merge: 1ed4585 09198e1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jul 30 21:15:09 2014 +0000 Merge branch 'master' into develop lib/bridgedb/email/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[bridgedb/master] Merge branch 'hotfix/12627-additional-unicode-fix'
by isis＠torproject.org 30 Jul '14

30 Jul '14

commit 09198e1ad0ca3e80e5c86d42218ab3bb693b15be Merge: c15167a e02faa0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jul 30 21:14:57 2014 +0000 Merge branch 'hotfix/12627-additional-unicode-fix' lib/bridgedb/email/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5
by nickm＠torproject.org 30 Jul '14

30 Jul '14

commit 74a8555d2be2ce9d33e9814212e5de49ba089274 Merge: 88590ed 8b470ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 30 14:00:21 2014 -0400 Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5 Conflicts: contrib/dist/tor.service.in changes/bug12731-systemd-no-run-as-daemon | 9 +++++++++ contrib/dist/tor.service.in | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --cc contrib/dist/tor.service.in index 9914a78,1d52f62..2fe51c7 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@@ -4,8 -4,9 +4,10 @@@ After = syslog.target network.target ns [Service] Type = simple +ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config - ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc + # A torrc that has "RunAsDaemon 1" won't work with the "simple" service type; + # let's explicitly override it. + ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc --RunAsDaemon 0 ExecReload = /bin/kill -HUP ${MAINPID} KillSignal = SIGINT TimeoutSec = 30

1 0

[tor/master] Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5
by nickm＠torproject.org 30 Jul '14

30 Jul '14

commit 88590ed3a66423fd4de3ad10dc67f1c9b18bf047 Merge: 7760916 0a70579 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 30 13:59:39 2014 -0400 Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5 changes/bug12730-systemd-verify-config | 3 +++ contrib/dist/tor.service.in | 1 + 2 files changed, 4 insertions(+)

1 0

[tor/master] Verify configuration file via ExecStartPre in the systemd unit file (#12730).
by nickm＠torproject.org 30 Jul '14

30 Jul '14

commit 0a705797840f893a94bd5b8b2cbb86e58a3a3fc7 Author: intrigeri <intrigeri(a)boum.org> Date: Tue Jul 29 12:13:01 2014 +0000 Verify configuration file via ExecStartPre in the systemd unit file (#12730). --- changes/bug12730-systemd-verify-config | 3 +++ contrib/dist/tor.service.in | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug12730-systemd-verify-config b/changes/bug12730-systemd-verify-config new file mode 100644 index 0000000..221633c --- /dev/null +++ b/changes/bug12730-systemd-verify-config @@ -0,0 +1,3 @@ + o Distribution: + - Verify configuration file via ExecStartPre in the systemd unit file. + Patch from intrigeri; resolves ticket 12730. diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index 5d76702..9914a78 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -4,6 +4,7 @@ After = syslog.target network.target nss-lookup.target [Service] Type = simple +ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc ExecReload = /bin/kill -HUP ${MAINPID} KillSignal = SIGINT

1 0

[tor/master] Explicitly disable RunAsDaemon in the systemd unit file (#12731).
by nickm＠torproject.org 30 Jul '14

30 Jul '14

commit 8b470ee4b54582b599debf5ab5b996eb06525093 Author: intrigeri <intrigeri(a)boum.org> Date: Tue Jul 29 12:23:04 2014 +0000 Explicitly disable RunAsDaemon in the systemd unit file (#12731). Our current systemd unit uses "Type = simple", so systemd does not expect tor to fork. If the user has "RunAsDaemon 1" in their torrc, then things won't work as expected. This is e.g. the case on Debian (and derivatives), since there we pass "--defaults-torrc /usr/share/tor/tor-service-defaults-torrc" (that contains "RunAsDaemon 1") by default. The only solution I could find is to explicitly pass "--RunAsDaemon 0" when starting tor from the systemd unit file, which this commit does. --- changes/bug12731-systemd-no-run-as-daemon | 9 +++++++++ contrib/dist/tor.service.in | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/changes/bug12731-systemd-no-run-as-daemon b/changes/bug12731-systemd-no-run-as-daemon new file mode 100644 index 0000000..f92e5af --- /dev/null +++ b/changes/bug12731-systemd-no-run-as-daemon @@ -0,0 +1,9 @@ + o Distribution: + - Explicitly disable RunAsDaemon in the systemd unit file. + Our current systemd unit uses "Type = simple", so systemd does + not expect tor to fork. If the user has "RunAsDaemon 1" in their + torrc, then things won't work as expected. This is e.g. the case + on Debian (and derivatives), since there we pass + "--defaults-torrc /usr/share/tor/tor-service-defaults-torrc" + (that contains "RunAsDaemon 1") by default. + Patch by intrigeri; resolves ticket 12731. diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index 5d76702..1d52f62 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -4,7 +4,9 @@ After = syslog.target network.target nss-lookup.target [Service] Type = simple -ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc +# A torrc that has "RunAsDaemon 1" won't work with the "simple" service type; +# let's explicitly override it. +ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc --RunAsDaemon 0 ExecReload = /bin/kill -HUP ${MAINPID} KillSignal = SIGINT TimeoutSec = 30

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 30 Jul '14

30 Jul '14

commit 0edb9b0492abbdd6c3ec397ad1f80c901568a713 Merge: f8cbba7 74a8555 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 30 14:18:11 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug12730-systemd-verify-config | 3 +++ changes/bug12731-systemd-no-run-as-daemon | 9 +++++++++ contrib/dist/tor.service.in | 5 ++++- 3 files changed, 16 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.5] Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5
by nickm＠torproject.org 30 Jul '14

30 Jul '14

commit 74a8555d2be2ce9d33e9814212e5de49ba089274 Merge: 88590ed 8b470ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 30 14:00:21 2014 -0400 Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5 Conflicts: contrib/dist/tor.service.in changes/bug12731-systemd-no-run-as-daemon | 9 +++++++++ contrib/dist/tor.service.in | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --cc contrib/dist/tor.service.in index 9914a78,1d52f62..2fe51c7 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@@ -4,8 -4,9 +4,10 @@@ After = syslog.target network.target ns [Service] Type = simple +ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config - ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc + # A torrc that has "RunAsDaemon 1" won't work with the "simple" service type; + # let's explicitly override it. + ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc --RunAsDaemon 0 ExecReload = /bin/kill -HUP ${MAINPID} KillSignal = SIGINT TimeoutSec = 30

1 0

[tor/maint-0.2.5] Verify configuration file via ExecStartPre in the systemd unit file (#12730).
by nickm＠torproject.org 30 Jul '14

30 Jul '14

commit 0a705797840f893a94bd5b8b2cbb86e58a3a3fc7 Author: intrigeri <intrigeri(a)boum.org> Date: Tue Jul 29 12:13:01 2014 +0000 Verify configuration file via ExecStartPre in the systemd unit file (#12730). --- changes/bug12730-systemd-verify-config | 3 +++ contrib/dist/tor.service.in | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug12730-systemd-verify-config b/changes/bug12730-systemd-verify-config new file mode 100644 index 0000000..221633c --- /dev/null +++ b/changes/bug12730-systemd-verify-config @@ -0,0 +1,3 @@ + o Distribution: + - Verify configuration file via ExecStartPre in the systemd unit file. + Patch from intrigeri; resolves ticket 12730. diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index 5d76702..9914a78 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -4,6 +4,7 @@ After = syslog.target network.target nss-lookup.target [Service] Type = simple +ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc ExecReload = /bin/kill -HUP ${MAINPID} KillSignal = SIGINT

1 0

[tor/maint-0.2.5] Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5
by nickm＠torproject.org 30 Jul '14

30 Jul '14

commit 88590ed3a66423fd4de3ad10dc67f1c9b18bf047 Merge: 7760916 0a70579 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 30 13:59:39 2014 -0400 Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5 changes/bug12730-systemd-verify-config | 3 +++ contrib/dist/tor.service.in | 1 + 2 files changed, 4 insertions(+)

1 0