Merge remote-tracking branch 'rransom-tor/bug3427'

This commit is contained in:
Nick Mathewson 2011-07-11 16:32:58 -04:00
commit b55e31aeb4
2 changed files with 9 additions and 3 deletions

4
changes/bug3427 Normal file
View File

@ -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.

View File

@ -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; \