added tor patches

.gitignore

@@ -59,7 +59,6 @@ src/qt/test/moc*.cpp
 *.pyc
 *.o
 *.o-*
-*.patch
 *.a
 *.pb.cc
 *.pb.h

autogen.sh

@@ -1,9 +1,21 @@
 #!/bin/sh
 set -e
-pushd tor && git checkout -f . && popd
+pushd tor
+git checkout -f
+popd
+
 git submodule update --init
 srcdir="$(dirname $0)"
 cd "$srcdir"
 autoreconf --install --force
 
+pushd tor
+patch --no-backup-if-mismatch -f -p0 < ../tor-am.patch
+patch --no-backup-if-mismatch -f -p0 < ../tor-or-am.patch
+./autogen.sh
+popd
+
+
+
+
 

tor-am.patch

@@ -0,0 +1,13 @@
+--- src/include.am.orig	2017-09-25 18:03:11.313997234 +0200
++++ src/include.am	2017-09-25 18:03:25.476848093 +0200
+@@ -2,10 +2,5 @@
+ include src/trunnel/include.am
+ include src/common/include.am
+ include src/or/include.am
+-include src/rust/include.am
+-include src/test/include.am
+-include src/tools/include.am
+ include src/win32/include.am
+ include src/config/include.am
+-include src/test/fuzz/include.am
+-include src/trace/include.am

tor-or-am.patch

@@ -0,0 +1,70 @@
+--- src/or/include.am.orig	2017-12-27 18:22:37.599975953 +0000
++++ src/or/include.am	2017-12-27 18:25:17.332092382 +0000
+@@ -1,13 +1,5 @@
+-bin_PROGRAMS+= src/or/tor
+ noinst_LIBRARIES += \
+ 	src/or/libtor.a
+-if UNITTESTS_ENABLED
+-noinst_LIBRARIES += \
+-	src/or/libtor-testing.a
+-endif
+-if COVERAGE_ENABLED
+-noinst_PROGRAMS+= src/or/tor-cov
+-endif
+
+ if BUILD_NT_SERVICES
+ tor_platform_source=src/or/ntmain.c
+@@ -108,51 +100,17 @@
+ 	$(tor_platform_source)
+
+ src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
+-src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES)
+-
+-src_or_tor_SOURCES = src/or/tor_main.c
+-AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or
+
+-src/or/tor_main.$(OBJEXT) \
+-  src/or/src_or_tor_cov-tor_main.$(OBJEXT): micro-revision.i
+-
+-AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\""		\
++AM_CPPFLAGS +=  -I$(srcdir)/src/or -Isrc/or		\
++		-DSHARE_DATADIR="\"$(datadir)\""	\
+ 		-DLOCALSTATEDIR="\"$(localstatedir)\""	\
+ 		-DBINDIR="\"$(bindir)\""
+
+-src_or_libtor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
+-src_or_libtor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
+-
+ # -L flags need to go in LDFLAGS. -l flags need to go in LDADD.
+ # This seems to matter nowhere but on windows, but I assure you that it
+ # matters a lot there, and is quite hard to debug if you forget to do it.
+
+
+-src_or_tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@
+-src_or_tor_LDADD = src/or/libtor.a src/common/libor.a src/common/libor-ctime.a \
+-	src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \
+-	src/common/libor-event.a src/trunnel/libor-trunnel.a \
+-	src/trace/libor-trace.a \
+-	$(rust_ldadd) \
+-	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
+-	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
+-	@CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \
+-	@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
+-
+-if COVERAGE_ENABLED
+-src_or_tor_cov_SOURCES = src/or/tor_main.c
+-src_or_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
+-src_or_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
+-src_or_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@
+-src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \
+-	src/common/libor-ctime-testing.a \
+-	src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \
+-	src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \
+-	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
+-	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \
+-	@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
+-endif
+-
+ ORHEADERS = \
+ 	src/or/addressmap.h				\
+ 	src/or/bridges.h				\