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

[tor/master] add subdir-objects to AUTOMAKE_OPTIONS, this builds object files in subdirs with non-recursive make
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit e612179e09d88b4b1da3c2d046a19c8652e279a1 Author: Stewart Smith <stewart(a)flamingspork.com> Date: Fri Aug 3 00:19:58 2012 +1000 add subdir-objects to AUTOMAKE_OPTIONS, this builds object files in subdirs with non-recursive make --- Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 819795c..de7e837 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ # "foreign" means we don't follow GNU package layout standards # 1.7 means we require automake vesion 1.7 -AUTOMAKE_OPTIONS = foreign 1.7 +AUTOMAKE_OPTIONS = foreign 1.7 subdir-objects noinst_LIBRARIES= EXTRA_DIST=

1 0

[tor/master] remove contrib/Makefile and contrib/suse/Makefile from configure.in
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 12aa553349ed7e630fcec9a60dfde7137e1684de Author: Stewart Smith <stewart(a)flamingspork.com> Date: Fri Aug 3 08:59:32 2012 +1000 remove contrib/Makefile and contrib/suse/Makefile from configure.in (otherwise would throw an error of "required file X" not found as part of autogen.sh) --- configure.in | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 7b7d5fb..d4b3acb 100644 --- a/configure.in +++ b/configure.in @@ -1318,8 +1318,6 @@ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_z AC_CONFIG_FILES([ Doxyfile Makefile - contrib/Makefile - contrib/suse/Makefile contrib/suse/tor.sh contrib/tor.logrotate contrib/tor.sh

1 0

[tor/master] fix dependencies for some generated files
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 7bb04f111a6ba97dca627c1a76a05a58a42a7c21 Author: Stewart Smith <stewart(a)flamingspork.com> Date: Fri Aug 3 09:04:48 2012 +1000 fix dependencies for some generated files --- src/common/include.am | 6 +++--- src/or/include.am | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/include.am b/src/common/include.am index 0b175df..e6a19d8 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -56,7 +56,7 @@ noinst_HEADERS+= \ src/common/tortls.h \ src/common/util.h -src_common_common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) +src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) if test "@SHA1SUM@" != none; then \ (cd "$(srcdir)" && "@SHA1SUM@" $(src_common_libor_SOURCES) $(src_common_libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/^$.*$$$/"\1\\n"/p' > src/common/common_sha1.i; \ elif test "@OPENSSL@" != none; then \ @@ -66,5 +66,5 @@ src_common_common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HE touch src/common/common_sha1.i; \ fi -src_common_util_codedigest.o: src/common/common_sha1.i -src_common_crypto.o: src/common/sha256.c +src/common/util_codedigest.c: src/common/common_sha1.i +src/common/crypto.c: src/common/sha256.c diff --git a/src/or/include.am b/src/or/include.am index 3afc9bb..d672f6b 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -125,7 +125,7 @@ noinst_HEADERS+= \ src/or/status.h \ src/or/micro-revision.i -src_or_config_codedigest.o: src/or/or_sha1.i +src/or/config_codedigest.c: src/or/or_sha1.i src/or/micro-revision.i: FORCE @rm -f src/or/micro-revision.tmp; \ @@ -143,7 +143,7 @@ src/or/micro-revision.i: FORCE mv src/or/micro-revision.tmp src/or/micro-revision.i; \ fi; true -src_or_or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) +src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) if test "@SHA1SUM@" != none; then \ (cd "$(srcdir)" && "@SHA1SUM@" $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES)) | \ "@SED@" -n 's/^$.*$$$/"\1\\n"/p' > src/or/or_sha1.i; \

1 0

[tor/master] fix TESTS to include full path to src/test/test
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 8f466a1c606221e1391816296b20d9c54196ebbd Author: Stewart Smith <stewart(a)flamingspork.com> Date: Fri Aug 3 09:05:18 2012 +1000 fix TESTS to include full path to src/test/test --- src/test/include.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index fad6caf..03fef23 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,4 +1,4 @@ -TESTS+= test +TESTS+= src/test/test noinst_PROGRAMS+= src/test/test src/test/test-child src/test/bench

1 0

[tor/master] fix circular dependency for generating code digests
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 2e80ae895dbec1e2922aef584bafa0ddad728a14 Author: Stewart Smith <stewart(a)flamingspork.com> Date: Fri Aug 3 09:07:27 2012 +1000 fix circular dependency for generating code digests --- src/or/include.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/include.am b/src/or/include.am index d672f6b..ef5cda3 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -125,7 +125,7 @@ noinst_HEADERS+= \ src/or/status.h \ src/or/micro-revision.i -src/or/config_codedigest.c: src/or/or_sha1.i +src/or/config_codedigest.o: src/or/or_sha1.i src/or/micro-revision.i: FORCE @rm -f src/or/micro-revision.tmp; \

1 0

[tor/master] Fix up make distcheck and greatly simplify docs dependencies (although it's still a bit odd)
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 2606c8b289eb654c6b0cec8d3f25c72b426eab2b Author: Stewart Smith <stewart(a)flamingspork.com> Date: Fri Aug 3 11:20:52 2012 +1000 Fix up make distcheck and greatly simplify docs dependencies (although it's still a bit odd) --- doc/include.am | 42 ++++++++++-------------------------------- src/common/include.am | 12 +++++++----- 2 files changed, 17 insertions(+), 37 deletions(-) diff --git a/doc/include.am b/doc/include.am index fca46f2..44e09a7 100644 --- a/doc/include.am +++ b/doc/include.am @@ -17,10 +17,10 @@ all_mans = $(regular_mans) doc/tor-fw-helper if USE_ASCIIDOC if USE_FW_HELPER -nodist_man_MANS = $(all_mans:=.1) +man_MANS = $(all_mans:=.1) doc_DATA = $(all_mans:=.html) else -nodist_man_MANS = $(regular_mans:=.1) +man_MANS = $(regular_mans:=.1) doc_DATA = $(regular_mans:=.html) endif html_in = $(all_mans:=.html.in) @@ -30,7 +30,7 @@ else html_in = man_in = txt_in = -nodist_man_MANS = +man_MANS = doc_DATA = endif @@ -42,48 +42,26 @@ EXTRA_DIST+= doc/HACKING doc/asciidoc-helper.sh \ docdir = @docdir@ -asciidoc_product = $(nodist_man_MANS) $(doc_DATA) +asciidoc_product = $(man_MANS) $(doc_DATA) # Generate the html documentation from asciidoc, but don't do # machine-specific replacements yet -$(html_in) : +$(html_in) : $(txt_in) $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/$@ -doc/tor.html.in : doc/tor.1.txt -doc/torify.html.in : doc/torify.1.txt -doc/tor-gencert.html.in : doc/tor-gencert.1.txt -doc/tor-resolve.html.in : doc/tor-resolve.1.txt -doc/tor-fw-helper.html.in : doc/tor-fw-helper.1.txt - # Generate the manpage from asciidoc, but don't do # machine-specific replacements yet -$(man_in) : +$(man_in) : $(txt_in) $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/$@ -doc/tor.1.in : doc/tor.1.txt -doc/torify.1.in : doc/torify.1.txt -doc/tor-gencert.1.in : doc/tor-gencert.1.txt -doc/tor-resolve.1.in : doc/tor-resolve.1.txt -doc/tor-fw-helper.1.in : doc/tor-fw-helper.1.txt - # use ../config.status to swap all machine-specific magic strings # in the asciidoc with their replacements. -$(asciidoc_product) : +$(asciidoc_product) : $(txt_in) $(man_in) + $(MKDIR_P) $(@D) $(AM_V_GEN)if test -e $(top_srcdir)/$@.in && ! test -e $@.in ; then \ - cp $(top_srcdir)/$@.in doc/.; \ + cp $(top_srcdir)/$@.in $@; \ fi - $(AM_V_GEN)$(top_srcdir)/config.status --file=$@; - -doc/tor.1 : doc/tor.1.in -doc/torify.1 : doc/torify.1.in -doc/tor-gencert.1 : doc/tor-gencert.1.in -doc/tor-resolve.1 : doc/tor-resolve.1.in -doc/tor-fw-helper.1 : doc/tor-fw-helper.1.in -doc/tor.html : doc/tor.html.in -doc/torify.html : doc/torify.html.in -doc/tor-gencert.html : doc/tor-gencert.html.in -doc/tor-resolve.html : doc/tor-resolve.html.in -doc/tor-fw-helper.html : doc/tor-fw-helper.html.in + $(AM_V_GEN)$(CONFIG_STATUS) --file=$@; CLEANFILES+= $(asciidoc_product) config.log DISTCLEANFILES+= $(html_in) $(man_in) diff --git a/src/common/include.am b/src/common/include.am index e6a19d8..7bae31b 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -56,15 +56,17 @@ noinst_HEADERS+= \ src/common/tortls.h \ src/common/util.h +DISTCLEANFILES+= src/common/common_sha1.i + src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) if test "@SHA1SUM@" != none; then \ - (cd "$(srcdir)" && "@SHA1SUM@" $(src_common_libor_SOURCES) $(src_common_libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/^$.*$$$/"\1\\n"/p' > src/common/common_sha1.i; \ + (cd "$(srcdir)" && "@SHA1SUM@" $(src_common_libor_SOURCES) $(src_common_libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/^$.*$$$/"\1\\n"/p' > $@; \ elif test "@OPENSSL@" != none; then \ - (cd "$(srcdir)" && "@OPENSSL@" sha1 $(src_common_libor_SOURCES) $(src_Common_libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > src/common/common_sha1.i; \ + (cd "$(srcdir)" && "@OPENSSL@" sha1 $(src_common_libor_SOURCES) $(src_Common_libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > $@; \ else \ - rm src/common/common_sha1.i; \ - touch src/common/common_sha1.i; \ + rm $@; \ + touch $@; \ fi -src/common/util_codedigest.c: src/common/common_sha1.i +src/common/util_codedigest.o: src/common/common_sha1.i src/common/crypto.c: src/common/sha256.c

1 0

[tor/master] fix up calling of config.status to generate docs
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 301e24e4a85bfa0ff2dfb73f338c9b543c1e1b6c Author: Stewart Smith <stewart(a)flamingspork.com> Date: Fri Aug 3 11:26:21 2012 +1000 fix up calling of config.status to generate docs --- doc/include.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/include.am b/doc/include.am index 44e09a7..174cf4e 100644 --- a/doc/include.am +++ b/doc/include.am @@ -61,7 +61,7 @@ $(asciidoc_product) : $(txt_in) $(man_in) $(AM_V_GEN)if test -e $(top_srcdir)/$@.in && ! test -e $@.in ; then \ cp $(top_srcdir)/$@.in $@; \ fi - $(AM_V_GEN)$(CONFIG_STATUS) --file=$@; + $(AM_V_GEN)./config.status --file=$@; CLEANFILES+= $(asciidoc_product) config.log DISTCLEANFILES+= $(html_in) $(man_in)

1 0

[tor/master] Replace man_MANS with nodist_man1_MANS
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 8f60f70e213376f329e49ae46b4bb1b82f350aba Author: Jim Meyering <meyering(a)redhat.com> Date: Thu Aug 23 12:36:31 2012 -0400 Replace man_MANS with nodist_man1_MANS (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 174cf4e..011cc7f 100644 --- a/doc/include.am +++ b/doc/include.am @@ -17,10 +17,10 @@ all_mans = $(regular_mans) doc/tor-fw-helper if USE_ASCIIDOC if USE_FW_HELPER -man_MANS = $(all_mans:=.1) +nodist_man1_MANS = $(all_mans:=.1) doc_DATA = $(all_mans:=.html) else -man_MANS = $(regular_mans:=.1) +nodist_man1_MANS = $(regular_mans:=.1) doc_DATA = $(regular_mans:=.html) endif html_in = $(all_mans:=.html.in) @@ -30,7 +30,7 @@ else html_in = man_in = txt_in = -man_MANS = +nodist_man1_MANS = doc_DATA = endif @@ -42,7 +42,7 @@ EXTRA_DIST+= doc/HACKING doc/asciidoc-helper.sh \ docdir = @docdir@ -asciidoc_product = $(man_MANS) $(doc_DATA) +asciidoc_product = $(nodist_man1_MANS) $(doc_DATA) # Generate the html documentation from asciidoc, but don't do # machine-specific replacements yet

1 0

[tor/master] s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 0df149ff6e1ac86d23282a8904851f8897d68cec Author: Jim Meyering <meyering(a)redhat.com> Date: Thu Aug 23 12:35:21 2012 -0400 s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/ Apparently the former will stop working with newer auto* (commit message by nickm) --- configure.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index d4b3acb..7430867 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_INIT([tor],[0.2.4.0-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AM_CONFIG_HEADER(orconfig.h) +AC_CONFIG_HEADERS([orconfig.h]) AC_CANONICAL_HOST @@ -1332,4 +1332,3 @@ AC_OUTPUT if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then ./contrib/updateVersions.pl fi -

1 0

[tor/master] Make the _sha1.i file generation quieter
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 6d703f8db5d5a506f82f40a638560749755ddc6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 13:14:41 2012 -0400 Make the _sha1.i file generation quieter --- src/common/include.am | 2 +- src/or/include.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/include.am b/src/common/include.am index 7bae31b..116d268 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -59,7 +59,7 @@ noinst_HEADERS+= \ DISTCLEANFILES+= src/common/common_sha1.i src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) - if test "@SHA1SUM@" != none; then \ + $(AM_V_GEN)if test "@SHA1SUM@" != none; then \ (cd "$(srcdir)" && "@SHA1SUM@" $(src_common_libor_SOURCES) $(src_common_libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/^$.*$$$/"\1\\n"/p' > $@; \ elif test "@OPENSSL@" != none; then \ (cd "$(srcdir)" && "@OPENSSL@" sha1 $(src_common_libor_SOURCES) $(src_Common_libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > $@; \ diff --git a/src/or/include.am b/src/or/include.am index ef5cda3..7c31b53 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -144,7 +144,7 @@ src/or/micro-revision.i: FORCE fi; true src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) - if test "@SHA1SUM@" != none; then \ + $(AM_V_GEN)if test "@SHA1SUM@" != none; then \ (cd "$(srcdir)" && "@SHA1SUM@" $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES)) | \ "@SED@" -n 's/^$.*$$$/"\1\\n"/p' > src/or/or_sha1.i; \ elif test "@OPENSSL@" != none; then \ @@ -157,4 +157,4 @@ src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) CLEANFILES+= src/or/micro-revision.i -FORCE: \ No newline at end of file +FORCE:

1 0