March 2011 - tor-commits - lists.torproject.org

[tor/master] Merge remote branch 'origin/maint-0.2.2'
by nickm＠torproject.org 09 Mar '11

09 Mar '11

commit 19baca4837557cf25760fb80478bf3f9ad6822e1 Merge: b5f2b44 f31ba6a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 9 16:20:14 2011 -0500 Merge remote branch 'origin/maint-0.2.2' changes/bug2574 | 3 +++ contrib/suse/tor.sh.in | 8 ++++++++ 2 files changed, 11 insertions(+), 0 deletions(-)

1 0

[tor/master] openSUSE initscript create /var/run/tor fixes Ticket #2573
by nickm＠torproject.org 09 Mar '11

09 Mar '11

commit f31ba6a3566e9f7bba827adfebe865c8179a06db Author: Andreas Stieger <andreas.stieger(a)gmx.de> Date: Wed Mar 9 20:41:25 2011 +0000 openSUSE initscript create /var/run/tor fixes Ticket #2573 (changes file added by nickm) --- changes/bug2574 | 3 +++ contrib/suse/tor.sh.in | 8 ++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/changes/bug2574 b/changes/bug2574 new file mode 100644 index 0000000..7022749 --- /dev/null +++ b/changes/bug2574 @@ -0,0 +1,3 @@ + o Minor packaging issues + - Create the /var/run/tor directory on startup on OpenSUSE if it is + not already created. Patch from Andreas Stieger. Fixes bug 2574. diff --git a/contrib/suse/tor.sh.in b/contrib/suse/tor.sh.in index 5dad649..b7e9005 100644 --- a/contrib/suse/tor.sh.in +++ b/contrib/suse/tor.sh.in @@ -51,6 +51,8 @@ export TORUSER TORGROUP=@TORGROUP@ export TORGROUP +TOR_DAEMON_PID_DIR="@LOCALSTATEDIR@/run/tor" + if [ -x /bin/su ] ; then SUPROG=/bin/su elif [ -x /sbin/su ] ; then @@ -67,6 +69,12 @@ case "$1" in start) echo "Starting tor daemon" + + if [ ! -d $TOR_DAEMON_PID_DIR ] ; then + mkdir -p $TOR_DAEMON_PID_DIR + chown $TORUSER:$TORGROUP $TOR_DAEMON_PID_DIR + fi + ## Start daemon with startproc(8). If this fails ## the echo return value is set appropriate.

1 0

[tor/maint-0.2.2] openSUSE initscript create /var/run/tor fixes Ticket #2573
by nickm＠torproject.org 09 Mar '11

09 Mar '11

commit f31ba6a3566e9f7bba827adfebe865c8179a06db Author: Andreas Stieger <andreas.stieger(a)gmx.de> Date: Wed Mar 9 20:41:25 2011 +0000 openSUSE initscript create /var/run/tor fixes Ticket #2573 (changes file added by nickm) --- changes/bug2574 | 3 +++ contrib/suse/tor.sh.in | 8 ++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/changes/bug2574 b/changes/bug2574 new file mode 100644 index 0000000..7022749 --- /dev/null +++ b/changes/bug2574 @@ -0,0 +1,3 @@ + o Minor packaging issues + - Create the /var/run/tor directory on startup on OpenSUSE if it is + not already created. Patch from Andreas Stieger. Fixes bug 2574. diff --git a/contrib/suse/tor.sh.in b/contrib/suse/tor.sh.in index 5dad649..b7e9005 100644 --- a/contrib/suse/tor.sh.in +++ b/contrib/suse/tor.sh.in @@ -51,6 +51,8 @@ export TORUSER TORGROUP=@TORGROUP@ export TORGROUP +TOR_DAEMON_PID_DIR="@LOCALSTATEDIR@/run/tor" + if [ -x /bin/su ] ; then SUPROG=/bin/su elif [ -x /sbin/su ] ; then @@ -67,6 +69,12 @@ case "$1" in start) echo "Starting tor daemon" + + if [ ! -d $TOR_DAEMON_PID_DIR ] ; then + mkdir -p $TOR_DAEMON_PID_DIR + chown $TORUSER:$TORGROUP $TOR_DAEMON_PID_DIR + fi + ## Start daemon with startproc(8). If this fails ## the echo return value is set appropriate.

1 0

r24327: {website} but when it *is* used, it references a page that doesn't exi (website/trunk/include)
by Roger Dingledine 09 Mar '11

09 Mar '11

Author: arma Date: 2011-03-09 18:57:30 +0000 (Wed, 09 Mar 2011) New Revision: 24327 Modified: website/trunk/include/navigation.wmi Log: but when it *is* used, it references a page that doesn't exist Modified: website/trunk/include/navigation.wmi =================================================================== --- website/trunk/include/navigation.wmi 2011-03-09 18:56:59 UTC (rev 24326) +++ website/trunk/include/navigation.wmi 2011-03-09 18:57:30 UTC (rev 24327) @@ -7,7 +7,7 @@ <: # path link text my @navigation = ( - 'home' , 'Home', + 'index' , 'Home', 'about/overview' , 'About Tor', 'docs/documentation' , 'Documentation', 'projects/projects' , 'Projects', @@ -19,6 +19,6 @@ 'download/download' , 'Download', 'donate/donate' , 'Donate', 'getinvolved/volunteer' , 'Get Involved', - ); + ); :>

1 0

r24326: {} i take it back. it is used mysteriously in ways i do not und (website/trunk/include)
by Roger Dingledine 09 Mar '11

09 Mar '11

Author: arma Date: 2011-03-09 18:56:59 +0000 (Wed, 09 Mar 2011) New Revision: 24326 Added: website/trunk/include/navigation.wmi Log: i take it back. it is used mysteriously in ways i do not understand. Added: website/trunk/include/navigation.wmi =================================================================== --- website/trunk/include/navigation.wmi (rev 0) +++ website/trunk/include/navigation.wmi 2011-03-09 18:56:59 UTC (rev 24326) @@ -0,0 +1,24 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 22069 $ +# Translation-Priority: 1-high + +<: + # path link text + my @navigation = ( + 'home' , 'Home', + 'about/overview' , 'About Tor', + 'docs/documentation' , 'Documentation', + 'projects/projects' , 'Projects', + 'press/press' , 'Press', + '<blog>' , 'Blog', + 'http://printfection.com/torprojectstore' , 'Store', + ); + my @calltoaction = ( + 'download/download' , 'Download', + 'donate/donate' , 'Donate', + 'getinvolved/volunteer' , 'Get Involved', + ); + +:>

1 0

r24325: {} remove a copy of navigation.wmi that is never used as far as (website/trunk/include)
by Roger Dingledine 09 Mar '11

09 Mar '11

Author: arma Date: 2011-03-09 18:52:22 +0000 (Wed, 09 Mar 2011) New Revision: 24325 Removed: website/trunk/include/navigation.wmi Log: remove a copy of navigation.wmi that is never used as far as i can tell Deleted: website/trunk/include/navigation.wmi =================================================================== --- website/trunk/include/navigation.wmi 2011-03-09 18:29:06 UTC (rev 24324) +++ website/trunk/include/navigation.wmi 2011-03-09 18:52:22 UTC (rev 24325) @@ -1,24 +0,0 @@ -#!/usr/bin/wml - -## translation metadata -# Revision: $Revision: 22069 $ -# Translation-Priority: 1-high - -<: - # path link text - my @navigation = ( - 'home' , 'Home', - 'about/overview' , 'About Tor', - 'docs/documentation' , 'Documentation', - 'projects/projects' , 'Projects', - 'press/press' , 'Press', - '<blog>' , 'Blog', - 'http://printfection.com/torprojectstore' , 'Store', - ); - my @calltoaction = ( - 'download/download' , 'Download', - 'donate/donate' , 'Donate', - 'getinvolved/volunteer' , 'Get Involved', - ); - -:>

1 0

r24324: {website} don't try to delete project/trace/www-master.torproject.org (website/trunk)
by Roger Dingledine 09 Mar '11

09 Mar '11

Author: arma Date: 2011-03-09 18:29:06 +0000 (Wed, 09 Mar 2011) New Revision: 24324 Modified: website/trunk/publish Log: don't try to delete project/trace/www-master.torproject.org every time i push. also, say where vescum actually is Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2011-03-09 18:13:38 UTC (rev 24323) +++ website/trunk/publish 2011-03-09 18:29:06 UTC (rev 24324) @@ -6,8 +6,8 @@ # don't copy over stuff with permissions that make it useless chmod a+r * -R -rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi -Prvz --delete . vescum:/srv/www-master.torproject.org/htdocs +rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum.torproject.org:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update" -ssh vescum '/home/mirroradm/bin/trigger-mirrors' -ssh vescum chmod g+w -R /srv/www-master.torproject.org/htdocs +ssh vescum.torproject.org '/home/mirroradm/bin/trigger-mirrors' +ssh vescum.torproject.org chmod g+w -R /srv/www-master.torproject.org/htdocs

1 0

r24323: {website} fix the path (website/trunk/manpages/en)
by Runa Sandvik 09 Mar '11

09 Mar '11

Author: runa Date: 2011-03-09 18:13:38 +0000 (Wed, 09 Mar 2011) New Revision: 24323 Modified: website/trunk/manpages/en/tor-manual-dev.wml Log: fix the path Modified: website/trunk/manpages/en/tor-manual-dev.wml =================================================================== --- website/trunk/manpages/en/tor-manual-dev.wml 2011-03-09 18:06:27 UTC (rev 24322) +++ website/trunk/manpages/en/tor-manual-dev.wml 2011-03-09 18:13:38 UTC (rev 24323) @@ -14,7 +14,7 @@ <div id="maincol"> <: die "Missing git clone" unless -d "$(TORGIT)"; - my $man = `cat manpages/lang/tor.1.txt | asciidoc -d manpage -s -o - -`; + my $man = `cat ../manpages/lang/tor.1.txt | asciidoc -d manpage -s -o - -`; die "No manpage because of asciidoc error or file not available from git" unless $man; print $man; :>

1 0

r24322: {website} now the french translation builds (in website/trunk: . docs/fr)
by Roger Dingledine 09 Mar '11

09 Mar '11

Author: arma Date: 2011-03-09 18:06:27 +0000 (Wed, 09 Mar 2011) New Revision: 24322 Modified: website/trunk/Makefile.common website/trunk/docs/fr/tor-manual-dev.wml Log: now the french translation builds Modified: website/trunk/Makefile.common =================================================================== --- website/trunk/Makefile.common 2011-03-09 17:56:44 UTC (rev 24321) +++ website/trunk/Makefile.common 2011-03-09 18:06:27 UTC (rev 24322) @@ -17,8 +17,8 @@ -D DEVTAG=$(DEVTAG) \ -D STABLETAG=$(STABLETAG) -LANGS=ar bms de en es et fa it fi fr ja ko nl no pl pt ru se tr zh-cn -#LANGS=en +#LANGS=ar bms de en es et fa it fi fr ja ko nl no pl pt ru se tr zh-cn +LANGS=en fr WMLFILES=$(wildcard $(patsubst %, %/*.wml, $(LANGS))) WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi ) Modified: website/trunk/docs/fr/tor-manual-dev.wml =================================================================== --- website/trunk/docs/fr/tor-manual-dev.wml 2011-03-09 17:56:44 UTC (rev 24321) +++ website/trunk/docs/fr/tor-manual-dev.wml 2011-03-09 18:06:27 UTC (rev 24322) @@ -14,9 +14,9 @@ <div id="maincol"> <: die "Missing git clone" unless -d "$(TORGIT)"; - my $man = `cat manpages/fr/tor.1.txt | asciidoc -d manpage -s -o - -`; - die "No manpage because of asciidoc error or file not available from git" unless $man; - print $man; +# my $man = `cat ../manpages/fr/tor.1.txt | asciidoc -d manpage -s -o - -`; +# die "No manpage because of asciidoc error or file not available from git" unless $man; +# print $man; :> </div>

1 0

r24321: {website} cleaning up the manpage directory and fixing the script (in website/trunk/manpages: . en)
by Runa Sandvik 09 Mar '11

09 Mar '11

Author: runa Date: 2011-03-09 17:56:44 +0000 (Wed, 09 Mar 2011) New Revision: 24321 Added: website/trunk/manpages/en/ website/trunk/manpages/en/tor-manual-dev.wml Removed: website/trunk/manpages/tor-manual-dev.wml Modified: website/trunk/manpages/po2man.sh Log: cleaning up the manpage directory and fixing the script Copied: website/trunk/manpages/en/tor-manual-dev.wml (from rev 24319, website/trunk/manpages/tor-manual-dev.wml) =================================================================== --- website/trunk/manpages/en/tor-manual-dev.wml (rev 0) +++ website/trunk/manpages/en/tor-manual-dev.wml 2011-03-09 17:56:44 UTC (rev 24321) @@ -0,0 +1,30 @@ +## translation metadata +# Revision: $Revision: 23689 $ + +#include "head.wmi" TITLE="Tor Project: manual" + +# Translators shouldn't translate this file, unless they want +# to translate the whole man page too. +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> + <a href="<page docs/documentation>">Documentation » </a> + <a href="<page docs/tor-doc-osx>">Tor Dev Manual</a> + </div> + <div id="maincol"> + <: + die "Missing git clone" unless -d "$(TORGIT)"; + my $man = `cat manpages/lang/tor.1.txt | asciidoc -d manpage -s -o - -`; + die "No manpage because of asciidoc error or file not available from git" unless $man; + print $man; + :> + </div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi> Modified: website/trunk/manpages/po2man.sh =================================================================== --- website/trunk/manpages/po2man.sh 2011-03-09 17:55:38 UTC (rev 24320) +++ website/trunk/manpages/po2man.sh 2011-03-09 17:56:44 UTC (rev 24321) @@ -81,7 +81,7 @@ # replace "lang" with the # correct name of the language # directory. - cp "$translated/tor-manual-dev.wml" "$wml/docs/$lang" + cp "$translated/en/tor-manual-dev.wml" "$wml/docs/$lang" sed -i "0,/lang/ s/lang/"$lang"/" "$wml/docs/$lang/tor-manual-dev.wml" fi fi Deleted: website/trunk/manpages/tor-manual-dev.wml =================================================================== --- website/trunk/manpages/tor-manual-dev.wml 2011-03-09 17:55:38 UTC (rev 24320) +++ website/trunk/manpages/tor-manual-dev.wml 2011-03-09 17:56:44 UTC (rev 24321) @@ -1,30 +0,0 @@ -## translation metadata -# Revision: $Revision: 23689 $ - -#include "head.wmi" TITLE="Tor Project: manual" - -# Translators shouldn't translate this file, unless they want -# to translate the whole man page too. -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page docs/documentation>">Documentation » </a> - <a href="<page docs/tor-doc-osx>">Tor Dev Manual</a> - </div> - <div id="maincol"> - <: - die "Missing git clone" unless -d "$(TORGIT)"; - my $man = `cat manpages/lang/tor.1.txt | asciidoc -d manpage -s -o - -`; - die "No manpage because of asciidoc error or file not available from git" unless $man; - print $man; - :> - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi>

1 0