Commit 8ce6722d authored by Sebastian Hahn's avatar Sebastian Hahn
Browse files

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)
parent c8b85508

changes/bug5065

0 → 100644
+5 −0
Original line number Original line Diff line number Diff line 
  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.

src/common/Makefile.am

+2 −2
Original line number Original line Diff line number Diff line
@@ -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)

common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)

	if test "@SHA1SUM@" != none; then \

	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 \

	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 \

	else \

	  rm common_sha1.i; \

	  rm common_sha1.i; \

	  touch common_sha1.i; \

	  touch common_sha1.i; \

src/or/Makefile.am

+2 −2
Original line number Original line Diff line number Diff line
@@ -74,9 +74,9 @@ micro-revision.i: FORCE 




or_sha1.i: $(tor_SOURCES)

or_sha1.i: $(tor_SOURCES)

	if test "@SHA1SUM@" != none; then \

	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 \

	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 \

	else \

	  rm or_sha1.i; \

	  rm or_sha1.i; \

	  touch or_sha1.i; \

	  touch or_sha1.i; \