diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-11 16:32:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-11 16:32:58 -0400 |
| commit | b55e31aeb453875728295de664383b12e76fefdc (patch) | |
| tree | 11c0d776603d83fce7fa73340039bc3263526492 | |
| parent | 42ff326afa2148f321ea7dce30e3008ff509ab35 (diff) | |
| parent | eeedc5c13c51ea508280be7539a261520b715ff6 (diff) | |
| download | tor-b55e31aeb453875728295de664383b12e76fefdc.tar.gz tor-b55e31aeb453875728295de664383b12e76fefdc.zip | |
Merge remote-tracking branch 'rransom-tor/bug3427'
| -rw-r--r-- | changes/bug3427 | 4 | ||||
| -rw-r--r-- | src/or/Makefile.am | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/changes/bug3427 b/changes/bug3427 new file mode 100644 index 0000000000..267d4d4221 --- /dev/null +++ b/changes/bug3427 @@ -0,0 +1,4 @@ + * Minor bugfixes: + - Make 'tor --digests' list hashes of all Tor source files. + Bugfix on 0.2.2.4-alpha; fixes bug 3427. + diff --git a/src/or/Makefile.am b/src/or/Makefile.am index a12d56b73d..344e63ff87 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -137,11 +137,13 @@ micro-revision.i: FORCE mv micro-revision.tmp micro-revision.i; \ fi; true -or_sha1.i: $(tor_SOURCES) +or_sha1.i: $(tor_SOURCES) $(libtor_a_SOURCES) if test "@SHA1SUM@" != none; then \ - @SHA1SUM@ $(tor_SOURCES) | @SED@ -n 's/^\(.*\)$$/"\1\\n"/p' > or_sha1.i; \ + @SHA1SUM@ $(tor_SOURCES) $(libtor_a_SOURCES) | \ + @SED@ -n 's/^\(.*\)$$/"\1\\n"/p' > or_sha1.i; \ elif test "@OPENSSL@" != none; then \ - @OPENSSL@ sha1 $(tor_SOURCES) | @SED@ -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > or_sha1.i; \ + @OPENSSL@ sha1 $(tor_SOURCES) $(libtor_a_SOURCES) | \ + @SED@ -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > or_sha1.i; \ else \ rm or_sha1.i; \ touch or_sha1.i; \ |