Changes to compile tor 0.3.5.3-alpha

2018-11-01 21:10:06 -07:00
5 changed files with 6 additions and 5 deletions
--- a/external/Makefile
+++ b/external/Makefile
@ -253,6 +253,7 @@ tor/configure:
 tor/Makefile: tor/configure
 	cp config.sub tor
 	sed -i '14i #include <errno.h>' tor/src/lib/fs/freespace.c
 	cp config.guess tor
 	cd tor && \
                CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) PKG_CONFIG_PATH="$(EXTERNAL_ROOT)/lib/pkgconfig" CFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fwrapv -fno-strict-aliasing -fno-strict-overflow" LDFLAGS="$(LDFLAGS)" \
@ -270,7 +271,7 @@ tor-build-stamp: tor/Makefile
 tor: lzma zstd libevent openssl tor-build-stamp
 	test -d bin || mkdir bin
-	cp tor/src/or/tor bin
+	cp tor/src/app/tor bin
 tor-clean:
 	-rm -f bin/tor
--- a/external/libevent
+++ b/external/libevent
@ -1 +1 @@
-Subproject commit 90ae4c5013032158bafad41279823d90eec4d206
+Subproject commit c51b159cff9f5e86696f5b9a4c6f517276056258
--- a/external/tor
+++ b/external/tor
@ -1 +1 @@
-Subproject commit da95b91355248ad8f3a6aa6733cc6d24915f59ce
+Subproject commit 444e9b37c53b0246158a4fca2e4e6e732deb8799
--- a/external/xz
+++ b/external/xz
@ -1 +1 @@
-Subproject commit 3d566cd519017eee1a400e7961ff14058dfaf33c
+Subproject commit b5be61cc06088bb07f488f9baf7d447ff47b37c1
--- a/external/zstd
+++ b/external/zstd
@ -1 +1 @@
-Subproject commit f4340f46b2387bc8de7d5320c0b83bb1499933ad
+Subproject commit 90ae50224d15e8dbcb9fa26b9be096366733db8e
		`@ -1 +1 @@`
			`Subproject commit 90ae4c5013032158bafad41279823d90eec4d206`				`Subproject commit c51b159cff9f5e86696f5b9a4c6f517276056258`
		`@ -1 +1 @@`
			`Subproject commit da95b91355248ad8f3a6aa6733cc6d24915f59ce`				`Subproject commit 444e9b37c53b0246158a4fca2e4e6e732deb8799`
		`@ -1 +1 @@`
			`Subproject commit 3d566cd519017eee1a400e7961ff14058dfaf33c`				`Subproject commit b5be61cc06088bb07f488f9baf7d447ff47b37c1`
		`@ -1 +1 @@`
			`Subproject commit f4340f46b2387bc8de7d5320c0b83bb1499933ad`				`Subproject commit 90ae50224d15e8dbcb9fa26b9be096366733db8e`