commit 8ce6722d7654e6b19fb3d3741b7329b95cb72bac Author: Sebastian Hahn sebastian@torproject.org Date: Fri Feb 10 00:51:58 2012 +0100
Properly protect paths to sed, sha1sum, openssl
in Makefile.am, we used it without quoting it, causing build failure if your openssl/sed/sha1sum happened to live in a directory with a space in it (very common on windows) --- changes/bug5065 | 5 +++++ src/common/Makefile.am | 4 ++-- src/or/Makefile.am | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/changes/bug5065 b/changes/bug5065 new file mode 100644 index 0000000..d195313 --- /dev/null +++ b/changes/bug5065 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Fix build if path to sed, openssl or sha1sum contains spaces. + This is pretty common on Windows. Fixes bug 5065; bugfix on + 0.2.2.1-alpha. + diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 6952591..6da1782 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -20,9 +20,9 @@ noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tort
common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) if test "@SHA1SUM@" != none; then \ - @SHA1SUM@ $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) | @SED@ -n 's/^(.*)$$/"\1\n"/p' > common_sha1.i; \ + "@SHA1SUM@" $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) | "@SED@" -n 's/^(.*)$$/"\1\n"/p' > common_sha1.i; \ elif test "@OPENSSL@" != none; then \ - @OPENSSL@ sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) | @SED@ -n 's/SHA1((.*))= (.*)/"\2 \1\n"/p' > common_sha1.i; \ + "@OPENSSL@" sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) | "@SED@" -n 's/SHA1((.*))= (.*)/"\2 \1\n"/p' > common_sha1.i; \ else \ rm common_sha1.i; \ touch common_sha1.i; \ diff --git a/src/or/Makefile.am b/src/or/Makefile.am index a9ac3cd..4f4e9c9 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -74,9 +74,9 @@ micro-revision.i: FORCE
or_sha1.i: $(tor_SOURCES) if test "@SHA1SUM@" != none; then \ - @SHA1SUM@ $(tor_SOURCES) | @SED@ -n 's/^(.*)$$/"\1\n"/p' > or_sha1.i; \ + "@SHA1SUM@" $(tor_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) | "@SED@" -n 's/SHA1((.*))= (.*)/"\2 \1\n"/p' > or_sha1.i; \ else \ rm or_sha1.i; \ touch or_sha1.i; \