build 13.2.7

Kore-Core · Aug 28, 2019 · f53f551 · f53f551
1 parent e494a40
commit f53f551
Show file tree

Hide file tree

Showing 71 changed files with 2,135 additions and 190 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
diff --git a/Makefile.am b/Makefile.am
@@ -14,9 +14,23 @@ pkgconfig_DATA = libbitcoinconsensus.pc
 endif
 
 BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
+DEPLOY_BITCOIND_BIN=$(top_builddir)/release/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
 BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT)
+DEPLOYBITCOIN_QT_BIN=$(top_builddir)/release/$(BITCOIN_GUI_NAME)$(EXEEXT)
 BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
+DEPLOY_BITCOIN_CLI_BIN=$(top_builddir)/release/$(BITCOIN_CLI_NAME)$(EXEEXT)
+OBFS4PROXY_BIN=$(top_builddir)/src/obfs4/obfs4proxy/obfs4proxy$(EXEEXT)
+DEPLOY_OBFS4PROXY_BIN=$(top_builddir)/release/obfs4proxy$(EXEEXT)
 BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
+BITCOIN_LINUX_INSTALLER=kore-installer
+TOR_BROWSER_VERSION=8.5.4
+TOR_BROWSER_LINUX_DOWNLOAD=https://www.torproject.org/dist/torbrowser/$(TOR_BROWSER_VERSION)/tor-browser-linux64-$(TOR_BROWSER_VERSION)_en-US.tar.xz
+TOR_BROWSER_WINDOWS_DOWNLOAD=https://www.torproject.org/dist/torbrowser/$(TOR_BROWSER_VERSION)/torbrowser-install-win64-$(TOR_BROWSER_VERSION)_en-US.exe
+TOR_BROWSER_MAC_DOWNLOAD=https://www.torproject.org/dist/torbrowser/$(TOR_BROWSER_VERSION)/TorBrowser-$(TOR_BROWSER_VERSION)-osx64_en-US.dmg
+DEPLOY_TOR_BROWSER_WINDOWS=$(top_builddir)/release/torbrowser-setup.exe
+DEPLOY_TOR_BROWSER_LINUX=$(top_builddir)/release/torbrowser-setup.tar.xz
+BUILD_LINUX_DIR=$(top_builddir)/share/debian
+BUILD_LINUX_INSTALLER=$(BUILD_LINUX_DIR)/build.sh
 
 empty :=
 space := $(empty) $(empty)
@@ -66,14 +80,30 @@ distcleancheck:
 	@:
 
 $(BITCOIN_WIN_INSTALLER): all-recursive
+	cd ./src/obfs4/; GOOS=windows GOARCH=amd64 go build -o obfs4proxy/obfs4proxy.exe ./obfs4proxy; cd ../../
 	$(MKDIR_P) $(top_builddir)/release
-	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
+	rm $(DEPLOY_BITCOIND_BIN); STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
-	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
+	rm $(DEPLOYBITCOIN_QT_BIN); STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
-	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
+	rm $(DEPLOY_BITCOIN_CLI_BIN); STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
+	rm $(DEPLOY_OBFS4PROXY_BIN); cp $(OBFS4PROXY_BIN) $(DEPLOY_OBFS4PROXY_BIN)
+	$(top_builddir)/share/tor-browser-conf/moz-byteshift.py -i="$(top_builddir)/share/tor-browser-conf/mozilla.txt" -o="$(top_builddir)/share/tor-browser-conf/mozilla.cfg"
+	@test -f $(DEPLOY_TOR_BROWSER_WINDOWS) || wget -O $(DEPLOY_TOR_BROWSER_WINDOWS) --show-progress $(TOR_BROWSER_WINDOWS_DOWNLOAD)
 	@test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/share/setup.nsi || \
 	  echo error: could not build $@
 	@echo built $@
 
+$(BITCOIN_LINUX_INSTALLER):
+	cd ./src/obfs4/; go build -o obfs4proxy/obfs4proxy ./obfs4proxy; cd ../../
+	$(MKDIR_P) $(top_builddir)/release
+	rm $(DEPLOY_BITCOIND_BIN); strip -s $(BITCOIND_BIN)  -o $(DEPLOY_BITCOIND_BIN)
+	rm $(DEPLOYBITCOIN_QT_BIN); strip -s $(BITCOIN_QT_BIN)  -o $(DEPLOYBITCOIN_QT_BIN)
+	rm $(DEPLOY_BITCOIN_CLI_BIN); strip -s $(BITCOIN_CLI_BIN) -o $(DEPLOY_BITCOIN_CLI_BIN)
+	rm $(DEPLOY_OBFS4PROXY_BIN); strip -s $(OBFS4PROXY_BIN) -o $(DEPLOY_OBFS4PROXY_BIN)
+	$(top_builddir)/share/tor-browser-conf/moz-byteshift.py -i="$(top_builddir)/share/tor-browser-conf/mozilla.txt" -o="$(top_builddir)/share/tor-browser-conf/mozilla.cfg"
+	@test -f $(DEPLOY_TOR_BROWSER_LINUX) || wget -O $(DEPLOY_TOR_BROWSER_LINUX) --show-progress $(TOR_BROWSER_LINUX_DOWNLOAD)
+	cp $(top_builddir)/changelog $(BUILD_LINUX_DIR)/debian
+	cd $(BUILD_LINUX_DIR); debuild -us -uc
+
 $(OSX_APP)/Contents/PkgInfo:
 	$(MKDIR_P) $(@D)
 	@echo "APPL????" > $@
@@ -154,6 +184,10 @@ if TARGET_WINDOWS
 deploy: $(BITCOIN_WIN_INSTALLER)
 endif
 
+if TARGET_LINUX
+deploy: $(BITCOIN_LINUX_INSTALLER)
+endif
+
 $(BITCOIN_QT_BIN): FORCE
 	$(MAKE) -C src qt/$(@F)
 
@@ -221,7 +255,7 @@ dist_noinst_SCRIPTS = autogen.sh
 
 EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
 
-CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
+CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER) $(BITCOIN_LINUX_INSTALLER)
 
 .INTERMEDIATE: $(COVERAGE_INFO)
 

diff --git a/README.md b/README.md
@@ -51,6 +51,7 @@ sudo apt-get install -y software-properties-common
 sudo apt-get install -y autotools-dev autoconf automake build-essential
 sudo apt-get install -y qttools5-dev-tools qttools5-dev libprotobuf-dev libqrencode-dev
 sudo apt-get install -y libtool pkg-config protobuf-compiler python3
+sudo apt-get install -y devscripts debhelper
 
 
 ```
@@ -67,9 +68,42 @@ make
 ```bash
 cd ..
 ./autogen.sh
-./configure --with-gui=qt5 --prefix=$(pwd)/depends/x86_64-pc-linux-gnu
+./configure --with-gui=qt5 --prefix=`pwd`/depends/x86_64-pc-linux-gnu --disable-tests  --enable-tor-browser
 
 make
 ```
 
+### Generating the installer (.deb)
+#### First, Download Go
+```bash
+From a web browser open and save the following link: 
+  https://golang.org/doc/install?download=go1.12.7.linux-amd64.tar.gz
+```
+
+#### Second, Install Go
+```bash
+cd ~/Downloads
+sudo tar -C /usr/local -xzf go1.12.7.linux-amd64.tar.gz
+```
+
+#### Third, make Go available 
+```bash
+in a terminal make go available, with the following command:
+export PATH=$PATH:/usr/local/go/bin
+```
+
+#### Fourth, generate the (.deb)
+```bash
+from the kore root directory, give the command:
+make deploy
+```
+
+### Installing kore (.deb)
+```bash
+  The installer is generated in the share folder, so in order to install it, give the following command: 
+  cd <kore-dir>/share
+  sudo apt install ./kore_<version>_amd64.deb
+  * <kore-dir> is the directory where you download the kore git repository
+  * <version> is this source code version
+```
 
diff --git a/autogen.sh b/autogen.sh
@@ -3,6 +3,10 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+# initializing all git modules modules
+git submodule init 
+git submodule update
+
 srcdir="$(dirname $0)"
 cd "$srcdir"
 if [ -z ${LIBTOOLIZE} ] && GLIBTOOLIZE="`which glibtoolize 2>/dev/null`"; then

diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4
@@ -134,6 +134,8 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
     if test "x$bitcoin_cv_need_acc_widget" = xyes; then
       _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(AccessibleFactory)], [-lqtaccessiblewidgets])
     fi
+    _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QJpegPlugin)],[-lqjpeg])
+    AC_DEFINE(QT_JPEG_SUPPORT, 1, [Define this symbol if able to deal with jpeg])
     _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QMinimalIntegrationPlugin)],[-lqminimal])
     AC_DEFINE(QT_QPA_PLATFORM_MINIMAL, 1, [Define this symbol if the minimal qt platform exists])
     if test "x$TARGET_OS" = xwindows; then
@@ -359,6 +361,9 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
       if test -d "$qt_plugin_path/accessible"; then
         QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible"
       fi
+      if test -d "$qt_plugin_path/imageformats"; then
+        QT_LIBS="$QT_LIBS -L$qt_plugin_path/imageformats"
+      fi
      if test "x$use_pkgconfig" = xyes; then
      : dnl
      m4_ifdef([PKG_CHECK_MODULES],[

diff --git a/changelog b/changelog
@@ -0,0 +1,26 @@
+kore (0.13.2.7) stable; urgency=medium
+  * only works for testnet
+  * upgrade tor to 0.4.1.5
+  * obfs4 ez for Qt
+
+ -- Kore <dev@kore.com>  Wed, 21 Aug 2019 10:00:00 -0300
+
+kore (0.13.2.6) stable; urgency=medium
+  * only works for testnet
+  * upgrade openssl to 1.0.2s
+  * upgrade qt to 5.9.8
+  * upgrade tor to 0.4.1.4-rc
+  * Ubuntu tor browser integration
+  * Ubuntu compilation for obfs4 ez
+  * Ubuntu installation package ez
+
+ -- Kore <dev@kore.com>  Thu, 07 Aug 2019 12:00:00 -0300
+
+kore (0.13.2.5) stable; urgency=medium
+  * Trime Drift Penalty
+  * Better Status bar icons
+  * Checkbox for "For Staking Only" at Unlock Dialog, starting checked.
+  * Fix when wallet was configured with staking=1 at kore.conf
+
+ -- Kore <dev@kore.com>  Thu, 8 Jun 2019 12:00:00 -0300
+
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 13)
 define(_CLIENT_VERSION_REVISION, 2)
-define(_CLIENT_VERSION_BUILD, 5)
+define(_CLIENT_VERSION_BUILD, 7)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)
 AC_INIT([Kore Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.kore.org],[kore])
@@ -12,10 +12,6 @@ AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([build-aux/m4])
 
-# Configuring tor in order to compile correctly
-# check if the --prefix parameter is used!
-AX_SUBDIRS_CONFIGURE([tor], [ [--enable-lzma=no], [--disable-unittests], [--disable-tool-name-check], [--disable-seccomp], [--disable-asciidoc], [--with-openssl-dir=$($PKG_CONFIG --variable=libdir zlib libevent openssl)] ])
-
 BITCOIN_DAEMON_NAME=kored
 BITCOIN_GUI_NAME=kore-qt
 BITCOIN_CLI_NAME=kore-cli
@@ -169,6 +165,12 @@ AC_ARG_ENABLE([lcov],
   [use_lcov=$enableval],
   [use_lcov=no])
 
+AC_ARG_ENABLE([tor-browser],
+  [AS_HELP_STRING([--enable-tor-browser],
+  [enable tor browser (default is no)])],
+  [enable_tor_browser=$enableval],
+  [enable_tor_browser=no])  
+
 AC_ARG_ENABLE([glibc-back-compat],
   [AS_HELP_STRING([--enable-glibc-back-compat],
   [enable backwards compatibility with glibc])],
@@ -1125,6 +1127,7 @@ AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
 AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
 AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes])
 AM_CONDITIONAL([USE_LIBSECP256K1],[test x$use_libsecp256k1 = xyes])
+AM_CONDITIONAL([ENABLE_TOR_BROWSER],[test x$enable_tor_browser = xyes])
 
 AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version])
 AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version])
@@ -1231,6 +1234,7 @@ echo "  with wallet   = $enable_wallet"
 echo "  with gui / qt = $bitcoin_enable_qt"
 if test x$bitcoin_enable_qt != xno; then
     echo "    qt version  = $bitcoin_qt_got_major_vers"
+    echo "    tor browser = $enable_tor_browser"
     echo "    with qr     = $use_qr"
 fi
 echo "  with zmq      = $use_zmq"

diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk
@@ -1,8 +1,8 @@
 package=openssl
-$(package)_version=1.0.2q
+$(package)_version=1.0.2s
 $(package)_download_path=https://www.openssl.org/source
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684
+$(package)_sha256_hash=cabd5c9492825ce5bd23f3c3aeed6a97f8142f606d893df216411f07d1abab96
 
 define $(package)_set_vars
 $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
@@ -1,20 +1,20 @@
 PACKAGE=qt
-$(package)_version=5.9.6
+$(package)_version=5.9.8
 $(package)_download_path=https://download.qt.io/official_releases/qt/5.9/$($(package)_version)/submodules
 $(package)_suffix=opensource-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=eed620cb268b199bd83b3fc6a471c51d51e1dc2dbb5374fc97a0cc75facbe36f
+$(package)_sha256_hash=9b9dec1f67df1f94bce2955c5604de992d529dde72050239154c56352da0907d
 $(package)_dependencies=openssl zlib
 $(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
 $(package)_build_subdir=qtbase
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch xkb-default.patch
 
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
-$(package)_qttranslations_sha256_hash=9822084f8e2d2939ba39f4af4c0c2320e45d5996762a9423f833055607604ed8
+$(package)_qttranslations_sha256_hash=fb5a47799754af73d3bf501fe513342cfe2fc37f64e80df5533f6110e804220c
 
 $(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=50e75417ec0c74bb8b1989d1d8e981ee83690dce7dfc0c2169f7c00f397e5117
+$(package)_qttools_sha256_hash=a97556eb7b2f30252cdd8a598c396cfce2b2f79d2bae883af6d3b26a2cdcc63c
 
 $(package)_extra_sources  = $($(package)_qttranslations_file_name)
 $(package)_extra_sources += $($(package)_qttools_file_name)

diff --git a/depends/packages/tor.mk b/depends/packages/tor.mk
@@ -1,8 +1,8 @@
 package=tor
-$(package)_version=0.3.4.9
+$(package)_version=0.4.1.5
 $(package)_download_path=https://dist.torproject.org
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=1a171081f02b9a6ff9e28c0898defb7670e5bbb3bdbcaddfcf4e4304aedd164a
+$(package)_sha256_hash=a864e0b605fb933fcc167bf242eed4233949e8a1bf23ac8e0381b106cd920425
 $(package)_dependencies=zlib libevent openssl
 $(package)_patches=remove_libcap.patch
 
@@ -25,14 +25,43 @@ endef
 define $(package)_stage_cmds
   $(MAKE) DESTDIR=$($(package)_staging_dir) install && \
   mkdir -p $($(package)_staging_prefix_dir)/lib && \
-  cp $($(package)_build_dir)/src/or/libtor.a $($(package)_staging_prefix_dir)/lib/libtor.a && \
+  cp $($(package)_build_dir)/src/core/libtor-app.a $($(package)_staging_prefix_dir)/lib/libtor-app.a && \
-  cp $($(package)_build_dir)/src/common/libor.a $($(package)_staging_prefix_dir)/lib/libor.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-ctime.a $($(package)_staging_prefix_dir)/lib/libtor-ctime.a && \
-  cp $($(package)_build_dir)/src/common/libor-ctime.a $($(package)_staging_prefix_dir)/lib/libor-ctime.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-crypt-ops.a $($(package)_staging_prefix_dir)/lib/libtor-crypt-ops.a && \
-  cp $($(package)_build_dir)/src/common/libor-crypto.a $($(package)_staging_prefix_dir)/lib/libor-crypto.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-dispatch.a $($(package)_staging_prefix_dir)/lib/libtor-dispatch.a && \
-  cp $($(package)_build_dir)/src/common/libor-event.a $($(package)_staging_prefix_dir)/lib/libor-event.a && \
+  cp $($(package)_build_dir)/src/lib/libcurve25519_donna.a $($(package)_staging_prefix_dir)/lib/libcurve25519_donna.a && \
-	cp $($(package)_build_dir)/src/common/libcurve25519_donna.a $($(package)_staging_prefix_dir)/lib/libcurve25519_donna.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-log.a $($(package)_staging_prefix_dir)/lib/libtor-log.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-string.a $($(package)_staging_prefix_dir)/lib/libtor-string.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-malloc.a $($(package)_staging_prefix_dir)/lib/libtor-malloc.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-thread.a $($(package)_staging_prefix_dir)/lib/libtor-thread.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-err.a $($(package)_staging_prefix_dir)/lib/libtor-err.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-lock.a $($(package)_staging_prefix_dir)/lib/libtor-lock.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-wallclock.a $($(package)_staging_prefix_dir)/lib/libtor-wallclock.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-intmath.a $($(package)_staging_prefix_dir)/lib/libtor-intmath.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-buf.a $($(package)_staging_prefix_dir)/lib/libtor-buf.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-compress.a $($(package)_staging_prefix_dir)/lib/libtor-compress.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-container.a $($(package)_staging_prefix_dir)/lib/libtor-container.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-encoding.a $($(package)_staging_prefix_dir)/lib/libtor-encoding.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-evloop.a $($(package)_staging_prefix_dir)/lib/libtor-evloop.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-fdio.a $($(package)_staging_prefix_dir)/lib/libtor-fdio.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-fs.a $($(package)_staging_prefix_dir)/lib/libtor-fs.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-geoip.a $($(package)_staging_prefix_dir)/lib/libtor-geoip.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-math.a $($(package)_staging_prefix_dir)/lib/libtor-math.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-memarea.a $($(package)_staging_prefix_dir)/lib/libtor-memarea.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-meminfo.a $($(package)_staging_prefix_dir)/lib/libtor-meminfo.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-net.a $($(package)_staging_prefix_dir)/lib/libtor-net.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-osinfo.a $($(package)_staging_prefix_dir)/lib/libtor-osinfo.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-process.a $($(package)_staging_prefix_dir)/lib/libtor-process.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-pubsub.a $($(package)_staging_prefix_dir)/lib/libtor-pubsub.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-sandbox.a $($(package)_staging_prefix_dir)/lib/libtor-sandbox.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-smartlist-core.a $($(package)_staging_prefix_dir)/lib/libtor-smartlist-core.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-term.a $($(package)_staging_prefix_dir)/lib/libtor-term.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-time.a $($(package)_staging_prefix_dir)/lib/libtor-time.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-tls.a $($(package)_staging_prefix_dir)/lib/libtor-tls.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-trace.a $($(package)_staging_prefix_dir)/lib/libtor-trace.a && \
+  cp $($(package)_build_dir)/src/lib/libtor-version.a $($(package)_staging_prefix_dir)/lib/libtor-version.a && \
   cp $($(package)_build_dir)/src/trunnel/libor-trunnel.a $($(package)_staging_prefix_dir)/lib/libor-trunnel.a && \
-	cp $($(package)_build_dir)/src/ext/ed25519/donna/libed25519_donna.a $($(package)_staging_prefix_dir)/lib/libed25519_donna.a && \
+  cp $($(package)_build_dir)/src/ext/ed25519/donna/libed25519_donna.a $($(package)_staging_prefix_dir)/lib/libed25519_donna.a && \
   cp $($(package)_build_dir)/src/ext/ed25519/ref10/libed25519_ref10.a $($(package)_staging_prefix_dir)/lib/libed25519_ref10.a && \
   cp $($(package)_build_dir)/src/ext/keccak-tiny/libkeccak-tiny.a $($(package)_staging_prefix_dir)/lib/libkeccak-tiny.a
 endef