[tor-commits] [tor/master] Put hashes of all tor source files into or_sha1.i

[nickm at torproject.org]

commit eeedc5c13c51ea508280be7539a261520b715ff6
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Sat Jun 18 00:54:04 2011 -0700

    Put hashes of all tor source files into or_sha1.i
---
 changes/bug3427    |    4 ++++
 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 0000000..267d4d4
--- /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 a9ac3cd..8777639 100644
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -72,11 +72,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; \