August 2012 - tor-commits - lists.torproject.org

[tor/master] Add missing dependency so the html.in files get built
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 3f6666493535477e7dea25407522ce4f0d74c21a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 12:52:33 2012 -0400 Add missing dependency so the html.in files get built --- doc/include.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/doc/include.am b/doc/include.am index 011cc7f..4876a62 100644 --- a/doc/include.am +++ b/doc/include.am @@ -63,5 +63,7 @@ $(asciidoc_product) : $(txt_in) $(man_in) fi $(AM_V_GEN)./config.status --file=$@; +$(doc_DATA) : $(html_in) + CLEANFILES+= $(asciidoc_product) config.log DISTCLEANFILES+= $(html_in) $(man_in)

1 0

[tor/master] Make asciidoc generation quieter
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit b67057a542f8e732795537c4c9812c87973c595a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 13:19:40 2012 -0400 Make asciidoc generation quieter --- doc/include.am | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/include.am b/doc/include.am index 4876a62..8003486 100644 --- a/doc/include.am +++ b/doc/include.am @@ -57,11 +57,11 @@ $(man_in) : $(txt_in) # use ../config.status to swap all machine-specific magic strings # in the asciidoc with their replacements. $(asciidoc_product) : $(txt_in) $(man_in) - $(MKDIR_P) $(@D) - $(AM_V_GEN)if test -e $(top_srcdir)/$@.in && ! test -e $@.in ; then \ + $(AM_V_GEN)$(MKDIR_P) $(@D) && \ + if test -e $(top_srcdir)/$@.in && ! test -e $@.in ; then \ cp $(top_srcdir)/$@.in $@; \ - fi - $(AM_V_GEN)./config.status --file=$@; + fi && \ + ./config.status -q --file=$@; $(doc_DATA) : $(html_in)

1 0

[tor/master] Add some attributes to make a2x quieter
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 0867479e3e374b14fd8408b65465739146ddf18e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 13:19:54 2012 -0400 Add some attributes to make a2x quieter --- doc/tor-fw-helper.1.txt | 2 ++ doc/tor-gencert.1.txt | 2 ++ doc/tor-resolve.1.txt | 2 ++ doc/tor.1.txt | 2 ++ doc/torify.1.txt | 8 ++++++-- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/doc/tor-fw-helper.1.txt b/doc/tor-fw-helper.1.txt index 49b0910..4caf16c 100644 --- a/doc/tor-fw-helper.1.txt +++ b/doc/tor-fw-helper.1.txt @@ -2,6 +2,8 @@ // See LICENSE for licensing information // This is an asciidoc file used to generate the manpage/html reference. // Learn asciidoc on http://www.methods.co.nz/asciidoc/userguide.html +:man source: Tor +:man manual: Tor Manual tor-fw-helper(1) ================ Jacob Appelbaum diff --git a/doc/tor-gencert.1.txt b/doc/tor-gencert.1.txt index 2a2d117..aa61ec3 100644 --- a/doc/tor-gencert.1.txt +++ b/doc/tor-gencert.1.txt @@ -2,6 +2,8 @@ // See LICENSE for licensing information // This is an asciidoc file used to generate the manpage/html reference. // Learn asciidoc on http://www.methods.co.nz/asciidoc/userguide.html +:man source: Tor +:man manual: Tor Manual tor-gencert(1) ============== Nick Mathewson diff --git a/doc/tor-resolve.1.txt b/doc/tor-resolve.1.txt index bdc636b..341d302 100644 --- a/doc/tor-resolve.1.txt +++ b/doc/tor-resolve.1.txt @@ -2,6 +2,8 @@ // See LICENSE for licensing information // This is an asciidoc file used to generate the manpage/html reference. // Learn asciidoc on http://www.methods.co.nz/asciidoc/userguide.html +:man source: Tor +:man manual: Tor Manual tor-resolve(1) ============== Peter Palfrader diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f1ae7bb..d55baa0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2,6 +2,8 @@ // See LICENSE for licensing information // This is an asciidoc file used to generate the manpage/html reference. // Learn asciidoc on http://www.methods.co.nz/asciidoc/userguide.html +:man source: Tor +:man manual: Tor Manual TOR(1) ====== diff --git a/doc/torify.1.txt b/doc/torify.1.txt index 4a4be12..22b3fe5 100644 --- a/doc/torify.1.txt +++ b/doc/torify.1.txt @@ -2,10 +2,10 @@ // See LICENSE for licensing information // This is an asciidoc file used to generate the manpage/html reference. // Learn asciidoc on http://www.methods.co.nz/asciidoc/userguide.html +:man source: Tor +:man manual: Tor Manual torify(1) ========= -Peter Palfrader -Jacob Appelbaum NAME ---- @@ -48,3 +48,7 @@ SEE ALSO -------- **tor**(1), **tor-resolve**(1), **torsocks**(1), **tsocks**(1), **tsocks.conf**(5). + +AUTHORS +------- +Peter Palfrader and Jacob Appelbaum wrote this manual.

1 0

[tor/master] We now need automake 1.9 or later
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 5db37bca3d031912f9da10427ec2e73faf621694 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 24 10:29:05 2012 -0400 We now need automake 1.9 or later Automake 1.7 is too broken to even investigate why it broke at this point. --- Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index de7e837..4820255 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,8 +4,8 @@ # See LICENSE for licensing information # "foreign" means we don't follow GNU package layout standards -# 1.7 means we require automake vesion 1.7 -AUTOMAKE_OPTIONS = foreign 1.7 subdir-objects +# 1.9 means we require automake vesion 1.9 +AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects noinst_LIBRARIES= EXTRA_DIST=

1 0

[tor/master] Better fix to avoid loudness on mkdir -p
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 7638612f019b7a2e7d77a4de2bfbbf9fc8c6e33c Author: Jim Meyering <meyering(a)redhat.com> Date: Mon Aug 27 10:05:02 2012 -0400 Better fix to avoid loudness on mkdir -p (commit message by nickm) --- doc/include.am | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/include.am b/doc/include.am index 8003486..bb01038 100644 --- a/doc/include.am +++ b/doc/include.am @@ -57,11 +57,11 @@ $(man_in) : $(txt_in) # use ../config.status to swap all machine-specific magic strings # in the asciidoc with their replacements. $(asciidoc_product) : $(txt_in) $(man_in) - $(AM_V_GEN)$(MKDIR_P) $(@D) && \ - if test -e $(top_srcdir)/$@.in && ! test -e $@.in ; then \ + $(AM_V_GEN)$(MKDIR_P) $(@D) + $(AM_V_at)if test -e $(top_srcdir)/$@.in && ! test -e $@.in ; then \ cp $(top_srcdir)/$@.in $@; \ - fi && \ - ./config.status -q --file=$@; + fi + $(AM_V_at)./config.status -q --file=$@; $(doc_DATA) : $(html_in)

1 0

[tor/master] Update .gitignore with new autotools droppings from nonrecursive make
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit f1b33ce81a68dae2db2e3b0f9bbd6715de8ec3bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 10:11:55 2012 -0400 Update .gitignore with new autotools droppings from nonrecursive make --- .gitignore | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 3a28ecf..8034ae6 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ *.log # Autotools stuff .deps +.dirstamp # Stuff made by our makefiles *.bak @@ -41,6 +42,7 @@ /config.guess /config.sub /conftest* +/micro-revision.* /patch-stamp /stamp-h /stamp-h.in @@ -140,7 +142,6 @@ /src/or/Makefile /src/or/Makefile.in /src/or/or_sha1.i -/src/or/micro-revision.* /src/or/tor /src/or/tor.exe /src/or/libtor.a

1 0

[tor/master] build: minimal adjustments to make out-of-tree build work
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 90d1c8575726f2169b9cdb7f7eb28b01e30cae80 Author: Jim Meyering <meyering(a)redhat.com> Date: Mon Aug 27 10:00:22 2012 -0400 build: minimal adjustments to make out-of-tree build work --- Makefile.am | 1 + src/common/include.am | 1 + src/or/include.am | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4820255..466eaf8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,7 @@ TESTS= noinst_PROGRAMS= DISTCLEANFILES= bin_SCRIPTS= +AM_CPPFLAGS= include src/include.am include doc/include.am include contrib/include.am diff --git a/src/common/include.am b/src/common/include.am index 116d268..0ab4769 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -7,6 +7,7 @@ EXTRA_DIST+= \ src/common/Makefile.nmake #CFLAGS = -Wall -Wpointer-arith -O2 +AM_CPPFLAGS += -I$(srcdir)/src/common -Isrc/common if USE_OPENBSD_MALLOC libor_extra_source=src/common/OpenBSD_malloc_Linux.c diff --git a/src/or/include.am b/src/or/include.am index 7c31b53..65ff684 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -55,18 +55,18 @@ src_or_libtor_a_SOURCES = \ src/or/status.c \ $(evdns_source) \ $(tor_platform_source) \ - src/or/config_codedigest.c + src/or/config_codedigest.c #libtor_a_LIBADD = ../common/libor.a ../common/libor-crypto.a \ # ../common/libor-event.a src_or_tor_SOURCES = src/or/tor_main.c -src_or_tor_INCLUDES= -Isrc/or/ +AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or -src/or/tor_main.c: src/or/micro-revision.i +src/or/tor_main.c: micro-revision.i -AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ +AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \ -DBINDIR="\"$(bindir)\"" @@ -123,24 +123,24 @@ noinst_HEADERS+= \ src/or/routerlist.h \ src/or/routerparse.h \ src/or/status.h \ - src/or/micro-revision.i + micro-revision.i src/or/config_codedigest.o: src/or/or_sha1.i -src/or/micro-revision.i: FORCE - @rm -f src/or/micro-revision.tmp; \ +micro-revision.i: FORCE + @rm -f micro-revision.tmp; \ if test -d "$(top_srcdir)/.git" && \ test -x "`which git 2>&1;true`"; then \ HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \ - echo \"$$HASH\" > src/or/micro-revision.tmp; \ + echo \"$$HASH\" > micro-revision.tmp; \ fi; \ - if test ! -f src/or/micro-revision.tmp ; then \ - if test ! -f src/or/micro-revision.i ; then \ - echo '""' > src/or/micro-revision.i; \ + if test ! -f micro-revision.tmp ; then \ + if test ! -f micro-revision.i ; then \ + echo '""' > micro-revision.i; \ fi; \ - elif test ! -f src/or/micro-revision.i || \ - test x"`cat src/or/micro-revision.tmp`" != x"`cat src/or/micro-revision.i`"; then \ - mv src/or/micro-revision.tmp src/or/micro-revision.i; \ + elif test ! -f micro-revision.i || \ + test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ + mv micro-revision.tmp micro-revision.i; \ fi; true src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) @@ -155,6 +155,6 @@ src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) touch src/or/or_sha1.i; \ fi -CLEANFILES+= src/or/micro-revision.i +CLEANFILES+= micro-revision.i FORCE:

1 0

[tor/master] Changes file for nonrecursive make branch
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 09d90b1b65066e79dc6de59f2ffca9e28ab5e7ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 10:28:45 2012 -0400 Changes file for nonrecursive make branch --- changes/nonrecursive_make | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/changes/nonrecursive_make b/changes/nonrecursive_make new file mode 100644 index 0000000..71120a5 --- /dev/null +++ b/changes/nonrecursive_make @@ -0,0 +1,16 @@ + o Major features (build): + - Switch to a nonrecursive Makefile structure. Now instead of each + Makefile.am invoking other Makefile.ams, there is a master + Makefile.am that includes the others. This makes our build process + slightly more maintainable, and improves parallelism for building + with make -j. Original patch by Stewart Smith; various fixes by + Jim Meyering. + + o Minor bugfixes (documentation): + - We no longer warn so much when generating manpages from their + asciidoc source. + + o New requirements: + - Tor maintainers now require Automake version 1.9 or later to build + Tor from the Git repository. (Automake is not required when building + from a source distribution.)

1 0

[tor/master] Merge branch 'bug6524_nm'
by nickm＠torproject.org 27 Aug '12

27 Aug '12

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 27 Aug '12

27 Aug '12

commit 557c07c19c2026341bcfe3003b4454a56f160e69 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 27 14:15:19 2012 +0000 Update translations for vidalia_help --- cs/server.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cs/server.po b/cs/server.po index a334f88..a164962 100644 --- a/cs/server.po +++ b/cs/server.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-08-27 13:44+0000\n" +"PO-Revision-Date: 2012-08-27 14:13+0000\n" "Last-Translator: digitaldreamer <digitaldreamer(a)email.cz>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -74,7 +74,7 @@ msgstr "Vyplňte následující údaje:" msgid "" "Nickname: The name which your relay will be known as on the Tor " "network. An example of a relay nickname is \"MyVidaliaRelay\"." -msgstr "" +msgstr "Přezdívka: Jméno pod kterým bude váš relay uveden na síti Tor. Příkla přezdívky je \"MyVidaliaRelay\"." #. type: Content of: <html><body><ol><ul><li> #: en/server.html:50 @@ -83,14 +83,14 @@ msgid "" "contact you in case there is an important Tor security update or something " "goes wrong with your relay. You might also include your PGP or GPG key ID " "and fingerprint." -msgstr "" +msgstr "Kontaktní informace: Vaše emailová adresa. Tato adresa bude použita pouze k tomu, abyste byli informování pokud výjde pro Tor důležitá bezpečnostní záplata, nebo pokud bude nějaký problém s vašim Relayem. Můžete také připojit svůj PGP nebo GPG klíč a Otisk." #. type: Content of: <html><body><ol><ul><li> #: en/server.html:56 msgid "" "Relay Port: The port on which your relay will listen for traffic from" " clients or other Tor relays." -msgstr "" +msgstr "Relay Port: Port, na kterým bude vaše relay přijímat data od jin7ch klient; nebo jin7ch Tor relayí." #. type: Content of: <html><body><ol><li> #: en/server.html:62 @@ -101,17 +101,17 @@ msgid "" "mirror the relay directory, make sure the Directory Port is different" " than the Relay port you entered above. Bridge relays must " "mirror the relay directory." -msgstr "" +msgstr "Pokud budete chtít hostovat kopii adresáře relayí pro ostatní uživatele na síti, můžete zaškrtnout políčko Zrcadlit adresář relayí. Pokud máte pomalé připojení, toto políčko nezaškrtávejte. Pokud se rozhodnete hostovat kopii adresáře relayí, ujistěte se, že Port Adresáře je jiný než Port Relaye který jste zadali výše. Bridge relay musí hostovat kopii adresáře relayí." #. type: Content of: <html><body> #: en/server.html:71 msgid "<a name=\"bandwidth\"/>" -msgstr "" +msgstr "<a name=\"bandwidth\"/>" #. type: Content of: <html><body><h3> #: en/server.html:72 msgid "Bandwidth Limits" -msgstr "" +msgstr "Omezení rychlosti" #. type: Content of: <html><body> #: en/server.html:74 @@ -120,7 +120,7 @@ msgid "" "allows you to limit the amount of bandwidth that you are willing to " "contribute to the Tor network. You can run a relay, while still keeping your" " network connection usable for your own use." -msgstr "" +msgstr "Provoz Tor relaye může spotřebovat hodně z vaší šířky pásma; Tor vám však umožní omezit šířku pásma, jakou jste ochotní poskytnout síti Tor. " #. type: Content of: <html><body> #: en/server.html:80

1 0