Remove torsocks submodule and misc unused files

3 years ago · 42a64f9b0a
parent 33a85e1bd8
commit 42a64f9b0a
5 changed files with 0 additions and 247 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,9 +1,6 @@
 [submodule "monero"]
 	path = monero
 	url = https://git.wownero.com/feather/monero.git
-[submodule "contrib/torsocks"]
-	path = contrib/torsocks
-	url = https://git.torproject.org/torsocks.git
 [submodule "contrib/tor"]
 	path = contrib/tor
 	url = https://git.torproject.org/tor.git
--- a/contrib/build_tor.sh
+++ b/contrib/build_tor.sh
@ -1,126 +0,0 @@
-#!/usr/bin/env bash
-# this file is used by feather's CMake
-# arguments: ./build.tor $TAG $ROOT_FEATHER_DIR
-
-set -ex
-
-ERR_WIN="This script does not work on Windows"
-if [[ "$OSTYPE" == "msys" ]]; then
-    echo "$ERR_WIN"
-    exit 1
-elif [[ "$OSTYPE" == "win32" ]]; then
-    echo "$ERR_WIN"
-    exit 1
-fi
-
-TOR_TAG="$1"
-ROOT_DIR="$2"
-STATIC="$3"
-TOR_DIR="$ROOT_DIR/contrib/tor"
-TORSOCKS_DIR="$ROOT_DIR/contrib/torsocks"
-TARGET_DIR="$ROOT_DIR/src/tor"
-
-CPU_CORE_COUNT="$(nproc)"
-
-#
-### tor
-#
-
-pushd "$TOR_DIR"
-
-rm -rf "$TOR_DIR/build"
-mkdir -p "$TOR_DIR/build"
-
-# configure
-git -C "$TOR_DIR" fetch
-git -C "$TOR_DIR" checkout tor-0.4.3.5
-bash "$TOR_DIR/autogen.sh"
-
-if [[ "$STATIC" = "ON" ]]; then
-    # static assumes that openssl has been compiled with:
-    #    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./config no-asm no-shared no-zlib-dynamic --prefix=/usr/local/openssl --openssldir=/usr/local/openssl
-    # and libevent with:
-    #    cmake -DEVENT_LIBRARY_STATIC=ON -DOPENSSL_ROOT_DIR=/usr/local/openssl -DCMAKE_INSTALL_PREFIX=/usr/local/libevent
-    # and zlib with:
-    #    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --static --prefix=/usr/local/zlib
-
-    LDFLAGS="-L/usr/local/openssl/lib/" LIBS="-lssl -lcrypto -lpthread -ldl" CPPFLAGS="-I/usr/local/openssl/include/" ./configure \
-    --enable-static-zlib \
-    --enable-static-openssl \
-    --enable-static-libevent \
-    --disable-system-torrc \
-    --with-libevent-dir=/usr/local/libevent \
-    --with-openssl-dir=/usr/local/openssl/ \
-    --with-zlib-dir=/usr/local/zlib \
-    --disable-system-torrc \
-    --disable-tool-name-check \
-    --disable-systemd \
-    --disable-lzma \
-    --disable-unittests \
-    --disable-zstd \
-    --disable-seccomp \
-    --disable-asciidoc \
-    --disable-manpage \
-    --disable-html-manual \
-    --disable-system-torrc \
-    --prefix="$TOR_DIR/build"
-else
-    bash "$TOR_DIR/configure" \
-    --disable-tool-name-check \
-    --disable-systemd \
-    --disable-lzma \
-    --disable-unittests \
-    --disable-zstd \
-    --disable-asciidoc \
-    --disable-manpage \
-    --disable-html-manual \
-    --prefix="$TOR_DIR/build"
-fi
-
-# build
-make -j "$CPU_CORE_COUNT"
-make install -j "$CPU_CORE_COUNT"
-
-# copy to lib/tor
-cp "$TOR_DIR/build/bin/tor" "$TARGET_DIR"
-cp "$TOR_DIR/build/etc/tor/torrc.sample"* "$TARGET_DIR"
-
-#
-### torsocks
-#
-
-pushd "$TORSOCKS_DIR"
-mkdir -p "$TORSOCKS_DIR/build"
-
-# configure
-bash "$TORSOCKS_DIR/autogen.sh"
-bash "$TORSOCKS_DIR/configure" --prefix="$TORSOCKS_DIR/build"
-
-# build
-make -j "$CPU_CORE_COUNT"
-make install -j "$CPU_CORE_COUNT"
-
-# copy to lib/torsocks
-cp "$TORSOCKS_DIR/build/lib/torsocks/"* "$TARGET_DIR"
-cp "$TORSOCKS_DIR/build/bin/"* "$TARGET_DIR"
-cp "$TORSOCKS_DIR/build/etc/tor/"* "$TARGET_DIR"
-
-#
-### verify installation
-#
-
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    for fn in "$TARGET_DIR/libtorsocks.so" "$TARGET_DIR/tor"; do
-        if [[ ! -f "$fn" ]]; then
-            echo "[*] Failed to install tor or torsocks: no such file $fn"
-            exit 1
-        fi; done
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-    for fn in "$TARGET_DIR/libtorsocks.dylib" "$TARGET_DIR/tor"; do
-        if [[ ! -f "$fn" ]]; then
-            echo "[*] Failed to install tor or torsocks: no such file $fn"
-            exit 1
-        fi; done
-fi
-
-echo "[*] Compiled tor/torsocks into $TARGET_DIR"
--- a/contrib/torsocks
+++ b/contrib/torsocks
@ -1 +0,0 @@
-Subproject commit 4c00ec8773fd63fa48ef49e1ccf2adac598427be
--- a/contrib/torsocks_macos.patch
+++ b/contrib/torsocks_macos.patch
@ -1,53 +0,0 @@
-From fc5eafeb2886605d4de1546846f06a12a18c87ef Mon Sep 17 00:00:00 2001
-From: "J.W" <jakwings@gmail.com>
-Date: Mon, 22 Apr 2019 05:19:32 +0100
-Subject: [PATCH 1/2] Fix macros for accept4(2)
-
-Both accept(2) and accept4(2) exist on linux but accept4(2) does not
-exist on macos 10.11.6 (and maybe other distros).
---
- src/lib/torsocks.c | 9 ++++++++-
- src/lib/torsocks.h | 4 +++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c
-index 16f2da0..9527513 100644
--- a/src/lib/torsocks.c
-+++ b/src/lib/torsocks.c
-@@ -234,9 +234,16 @@ static void init_libc_symbols(void)
- 	tsocks_libc_socket = dlsym(libc_ptr, LIBC_SOCKET_NAME_STR);
- 	tsocks_libc_syscall = dlsym(libc_ptr, LIBC_SYSCALL_NAME_STR);
- 	tsocks_libc_execve = dlsym(libc_ptr, LIBC_EXECVE_NAME_STR);
-+	tsocks_libc_accept = dlsym(libc_ptr, LIBC_ACCEPT_NAME_STR);
-+#if (defined(__linux__))
- 	tsocks_libc_accept4 = dlsym(libc_ptr, LIBC_ACCEPT4_NAME_STR);
-+#endif
-+
- 	if (!tsocks_libc_connect || !tsocks_libc_close || !tsocks_libc_socket ||
-			!tsocks_libc_syscall || !tsocks_libc_execve || ! tsocks_libc_accept4) {
-+#if (defined(__linux__))
-+			!tsocks_libc_accept4 ||
-+#endif
-+			!tsocks_libc_syscall || !tsocks_libc_execve || ! tsocks_libc_accept) {
- 		ERR("Unable to lookup symbols in " LIBC_NAME "(%s)", dlerror());
- 		goto error;
- 	}
-diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h
-index 33da526..bf9109d 100644
--- a/src/lib/torsocks.h
-+++ b/src/lib/torsocks.h
-@@ -30,8 +30,10 @@
-  * libc call outside of torsocks can be used. These are declared for each
-  * symbol torsocks hijacked.
-  */
-+#define TSOCKS_LIBC_FUNC(name) \
-+	tsocks_libc_##name
- #define TSOCKS_LIBC_DECL(name, type, sig) \
-	type (*tsocks_libc_##name)(sig);
-+	type (*TSOCKS_LIBC_FUNC(name))(sig);
- #define TSOCKS_DECL(name, type, sig) \
- 	extern type tsocks_##name(sig);
- 
-- 
-2.21.0
-
--- a/utils/pubkeys/kitware.asc
+++ b/utils/pubkeys/kitware.asc
@ -1,64 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=0GnF
-----END PGP PUBLIC KEY BLOCK-----
				`@ -1 +0,0 @@`
				`Subproject commit 4c00ec8773fd63fa48ef49e1ccf2adac598427be`