Skip to content

Commit 3e91fda

Browse files
tobtohttobtoht
committed
Remove Tor
1 parent 287d410 commit 3e91fda

29 files changed

+8
-1024
lines changed

‎CMakeLists.txt‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,13 @@ cmake_policy(SET CMP0074 NEW)
2020
# Configurable options
2121
option(STATIC "Link libraries statically, requires static Qt" OFF)
2222
option(SELF_CONTAINED "Disable when building Feather for packages" OFF)
23-
option(TOR_DIR "Directory containing Tor binaries to embed inside Feather" OFF)
2423
option(CHECK_UPDATES "Enable checking for application updates" OFF)
2524
option(PLATFORM_INSTALLER "Built-in updater fetches installer (windows-only)" OFF)
2625
option(USE_DEVICE_TREZOR "Trezor support compilation" ON)
2726
option(DONATE_BEG "Prompt donation window every once in a while" OFF)
2827
option(WITH_SCANNER "Enable webcam QR scanner" ON)
2928
option(STACK_TRACE "Dump stack trace on crash (Linux only)" OFF)
3029

31-
# internal configuration options
32-
option(TOR_INSTALLED "Is Tor installed on the filesystem?" OFF)
33-
3430
# Plugins
3531
option(WITH_PLUGIN_HOME "Include Home tab plugin" ON)
3632
option(WITH_PLUGIN_TICKERS "Include Tickers Home plugin" ON)
@@ -138,32 +134,6 @@ if(UNIX AND NOT APPLE)
138134
endif()
139135

140136
include(GenerateDocs)
141-
include(TorQrcGenerator)
142-
143-
# To build Feather with embedded (and static) Tor, pass CMake -DTOR_DIR=/path/to/tor/
144-
if(TOR_DIR)
145-
if (NOT TOR_VERSION)
146-
message(FATAL_ERROR "TOR_DIR is specified but TOR_VERSION is not set")
147-
endif()
148-
149-
message(STATUS "Embedded Tor version: ${TOR_VERSION}")
150-
151-
# Always copy Tor when doing a reproducible build to prevent old versions from getting included
152-
if (REPRODUCIBLE)
153-
set(TOR_COPY_CMD "cp -a ${TOR_DIR}/* ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/tor")
154-
else()
155-
set(TOR_COPY_CMD "cp -au ${TOR_DIR}/* ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/tor")
156-
endif()
157-
158-
execute_process(COMMAND bash -c "${TOR_COPY_CMD}" RESULT_VARIABLE ret)
159-
if(ret EQUAL "1")
160-
message(FATAL_ERROR "Tor copy failure: ${TOR_COPY_CMD}")
161-
endif()
162-
163-
message(STATUS "Embedding Tor binaries at ${TOR_DIR}")
164-
else()
165-
message(STATUS "Skipping Tor inclusion because -DTOR_DIR=Off")
166-
endif()
167137

168138
message(STATUS "Using Boost include dir at ${Boost_INCLUDE_DIRS}")
169139
message(STATUS "Using Boost libraries at ${Boost_LIBRARIES}")

‎HACKING.md‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ brew install qt libsodium libzip qrencode unbound cmake boost hidapi openssl exp
5050

5151
Build [zxing-cpp](https://github.com/zxing-cpp/zxing-cpp) from source or compile Feather with `-DWITH_SCANNER=Off`.
5252

53-
### Tor daemon
54-
55-
A Tor daemon is required to connect to .onion nodes and the websocket server. Development builds do not include
56-
the Tor binary by default, this can be enabled with `-DTOR_DIR=/path/to/tor`. We recommend running a local Tor daemon
57-
as this prevents Feather from spawning a child process and saves time.
58-
5953
#### Arch Linux
6054

6155
```bash
@@ -132,5 +126,4 @@ There are some CMake options that you may pass to control how Feather is built:
132126
- `-DDONATE_BEG=OFF` - disable the dreaded donate requests
133127
- `-DUSE_DEVICE_TREZOR=OFF` - disable Trezor hardware wallet support
134128
- `-DWITH_SCANNER=ON` - enable the webcam QR code scanner
135-
- `-DTOR_DIR=/path/to/tor/` - embed a Tor binary in Feather, argument should be a directory containing the binary
136129
- `-DWITH_PLUGIN_<NAME>=OFF` - disable a plugin

‎cmake/TorQrcGenerator.cmake‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎cmake/assets_tor.qrc‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎contrib/depends/packages/libevent.mk‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎contrib/depends/packages/packages.mk‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,3 @@ mingw32_native_packages =
1515
qt_linux_packages := libxcb xcb_proto libXau xorgproto libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_cursor libxcb_util_wm freetype fontconfig dbus qt
1616
qt_darwin_packages := qt
1717
qt_mingw32_packages := qt
18-
19-
tor_linux_packages := libevent tor_linux
20-
tor_darwin_packages := tor_darwin
21-
tor_mingw32_packages := tor_mingw32

‎contrib/depends/packages/tor_darwin.mk‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎contrib/depends/packages/tor_linux.mk‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎contrib/depends/packages/tor_mingw32.mk‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎contrib/depends/toolchain.cmake.in‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ endif()
2525

2626
SET(ENV{PKG_CONFIG_PATH} @prefix@/lib/pkgconfig)
2727

28-
# use CACHE here because we need to be able to override these later
29-
SET(TOR_DIR @prefix@/Tor CACHE STRING "Tor dir")
30-
SET(TOR_VERSION @tor_version@ CACHE STRING "Tor version")
31-
3228
SET(Readline_ROOT_DIR @prefix@)
3329
SET(Readline_INCLUDE_DIR @prefix@/include)
3430
SET(Readline_LIBRARY @prefix@/lib/libreadline.a)

0 commit comments

Comments
 (0)