diff --git a/tor/build-tor-arm.sh b/tor/build-tor-arm.sh index 60af37a..b8148ed 100755 --- a/tor/build-tor-arm.sh +++ b/tor/build-tor-arm.sh @@ -1,10 +1,10 @@ #!/bin/sh -BUILD_DIR=${PWD}/build-tor +BUILD_DIR=${PWD}/build-tor-arm ZLIB_VERSION=1.2.11 LIBEVENT_VERSION=2.1.8-stable OPENSSL_VERSION=1.0.2p -TOR_VERSION=0.3.5.2-alpha +TOR_VERSION=0.3.5.3-alpha mkdir ${BUILD_DIR} cd ${BUILD_DIR} @@ -23,29 +23,27 @@ cd libevent-${LIBEVENT_VERSION} --enable-static \ --with-pic \ --host=arm-linux-gnueabihf -make -j$(nproc) -make install +make -j$(nproc) +make install cd .. curl -fsSL "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" | tar zxvf - -cd openssl-${OPENSSL_VERSION} -export ANDROID_NDK_HOME="${BUILD_DIR}/ndk" -./Configure --openssldir=$PWD/install no-shared no-dso android-armv7 +cd openssl-${OPENSSL_VERSION} +./Configure --openssldir=$PWD/install no-shared no-dso linux-armv4 make -j$(nproc) INSTALL_PREFIX=$PWD/install -make install +make install cd .. -curl -fsSL "https://www.torproject.org/dist/tor-${TOR_VERSION}.tar.gz" | tar zxvf - -cd tor-${TOR_VERSION} +curl -fsSL "https://www.torproject.org/dist/tor-${TOR_VERSION}.tar.gz" | tar zxvf - +cd tor-${TOR_VERSION} ./configure --prefix=$PWD/install \ --enable-static-tor \ --with-libevent-dir=$PWD/../libevent-${LIBEVENT_VERSION}/install \ --with-openssl-dir=$PWD/../openssl-${OPENSSL_VERSION}/install \ --with-zlib-dir=$PWD/../zlib-${ZLIB_VERSION}/install \ - --host=arm-linux-gnueabihf \ - CC=arm-linux-gnueabihf-gcc \ - AR=arm-linux-gnueabihf-ar STRIP=arm-linux-gnueabihf-strip RANLIB=arm-linux-gnueabihf-ranlib -make -j$(nproc) + --host=armv7-unknown-linux-gnueabi \ + --disable-tool-name-check +make -j$(nproc) make install echo "" diff --git a/tor/build-tor-cross-arm.sh b/tor/build-tor-cross-arm.sh old mode 100644 new mode 100755 diff --git a/tor/build-tor.sh b/tor/build-tor-x86.sh similarity index 53% rename from tor/build-tor.sh rename to tor/build-tor-x86.sh index ed449f0..f03703e 100755 --- a/tor/build-tor.sh +++ b/tor/build-tor-x86.sh @@ -1,47 +1,47 @@ #!/bin/sh -BUILD_DIR=build-tor +BUILD_DIR=${PWD}/build-tor-x86 ZLIB_VERSION=1.2.11 LIBEVENT_VERSION=2.1.8-stable OPENSSL_VERSION=1.0.2p -TOR_VERSION=0.3.5.2-alpha +TOR_VERSION=0.3.5.3-alpha -mkdir ${BUILD_DIR} \ - && cd ${BUILD_DIR} +mkdir ${BUILD_DIR} +cd ${BUILD_DIR} -curl -fsSL "https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz" | tar zxvf - \ - && cd zlib-${ZLIB_VERSION} \ - && ./configure --prefix=$PWD/install \ - && make -j$(nproc) \ - && make install \ - && cd .. +curl -fsSL "https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz" | tar zxvf - +cd zlib-${ZLIB_VERSION} +./configure --prefix=$PWD/install +make -j$(nproc) +make install +cd .. -curl -fsSL "https://github.com/libevent/libevent/releases/download/release-${LIBEVENT_VERSION}/libevent-${LIBEVENT_VERSION}.tar.gz" | tar zxvf - \ - && cd libevent-${LIBEVENT_VERSION} \ - && ./configure --prefix=$PWD/install \ +curl -fsSL "https://github.com/libevent/libevent/releases/download/release-${LIBEVENT_VERSION}/libevent-${LIBEVENT_VERSION}.tar.gz" | tar zxvf - +cd libevent-${LIBEVENT_VERSION} +./configure --prefix=$PWD/install \ --disable-shared \ --enable-static \ - --with-pic \ - && make -j$(nproc) \ - && make install \ - && cd .. + --with-pic +make -j$(nproc) +make install +cd .. -curl -fsSL "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" | tar zxvf - \ - && cd openssl-${OPENSSL_VERSION} \ - && ./config --prefix=$PWD/install no-shared no-dso \ - && make -j$(nproc) \ - && make install \ - && cd .. +curl -fsSL "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" | tar zxvf - +cd openssl-${OPENSSL_VERSION} +./config --prefix=$PWD/install no-shared no-dso +make -j$(nproc) +make install +cd .. -curl -fsSL "https://www.torproject.org/dist/tor-${TOR_VERSION}.tar.gz" | tar zxvf - \ - && cd tor-${TOR_VERSION} \ - && ./configure --prefix=$PWD/install \ +curl -fsSL "https://www.torproject.org/dist/tor-${TOR_VERSION}.tar.gz" | tar zxvf - +cd tor-${TOR_VERSION} +./configure --prefix=$PWD/install \ --enable-static-tor \ --with-libevent-dir=$PWD/../libevent-${LIBEVENT_VERSION}/install \ --with-openssl-dir=$PWD/../openssl-${OPENSSL_VERSION}/install \ - --with-zlib-dir=$PWD/../zlib-${ZLIB_VERSION}/install \ - && make -j$(nproc) \ - && make install + --with-zlib-dir=$PWD/../zlib-${ZLIB_VERSION}/install +make -j$(nproc) +make install echo "" echo "Results in ${BUILD_DIR}/tor-${TOR_VERSION}/install/bin" diff --git a/tor/tor b/tor/tor index cc38632..6993fd4 100755 Binary files a/tor/tor and b/tor/tor differ diff --git a/tor/tor-0.3.5.3-alpha.arm b/tor/tor-0.3.5.3-alpha.arm new file mode 100755 index 0000000..f308561 Binary files /dev/null and b/tor/tor-0.3.5.3-alpha.arm differ diff --git a/tor/tor-0.3.5.3-alpha.x86 b/tor/tor-0.3.5.3-alpha.x86 new file mode 100755 index 0000000..6993fd4 Binary files /dev/null and b/tor/tor-0.3.5.3-alpha.x86 differ