Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-11-17 17:57:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'Tor: update to 4.5.3-rc' (#303) from tobtoht/feather:tor-4.5.3-rc into master

Browse source 
Reviewed-on: https://git.wownero.com/feather/feather/pulls/303
This commit is contained in:
tobtoht 2021-01-22 04:42:13 +00:00
commit c379456221
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Dockerfile
View file

@ -1,4 +1,4 @@
FROM ubuntu:16.04 FROM ubuntu:18.04
ARG THREADS=1 ARG THREADS=1
ARG QT_VERSION=5.15.2 ARG QT_VERSION=5.15.2
@ -22,7 +22,7 @@ RUN apt-get update && \
# libusb # libusb
libudev-dev \ libudev-dev \
# fontconfig # fontconfig
autopoint gettext gperf libpng12-dev \ autopoint gettext gperf libpng-dev \
# libxcb # libxcb
libpthread-stubs0-dev \ libpthread-stubs0-dev \
# xorgproto # xorgproto
@ -344,9 +344,9 @@ RUN wget https://www.openssl.org/source/openssl-1.0.2u.tar.gz && \
make -j$THREADS install_sw && \ make -j$THREADS install_sw && \
rm -rf $(pwd) rm -rf $(pwd)
RUN git clone -b tor-0.4.4.6 --depth 1 https://git.torproject.org/tor.git && \ RUN git clone -b tor-0.4.5.3-rc --depth 1 https://git.torproject.org/tor.git && \
cd tor && \ cd tor && \
git reset --hard 2a8b789ea6f308d081f369d78fa7cfdc9d00bf90 && \ git reset --hard e5c47d295bd3dc35f75c7d5c1753c650fd912640 && \
./autogen.sh && \ ./autogen.sh && \
./configure \ ./configure \
--disable-asciidoc \ --disable-asciidoc \
@ -354,6 +354,8 @@ RUN git clone -b tor-0.4.4.6 --depth 1 https://git.torproject.org/tor.git && \
--disable-html-manual \ --disable-html-manual \
--disable-system-torrc \ --disable-system-torrc \
--disable-module-relay \ --disable-module-relay \
--disable-lzma \
--disable-zstd \
--enable-static-tor \ --enable-static-tor \
--with-libevent-dir=/usr/local/libevent \ --with-libevent-dir=/usr/local/libevent \
--with-openssl-dir=/usr/local/openssl-1.0.2u \ --with-openssl-dir=/usr/local/openssl-1.0.2u \

4
Dockerfile.windows
View file

@ -144,9 +144,9 @@ RUN wget https://github.com/libevent/libevent/releases/download/release-2.1.11-s
make -j$THREADS install && \ make -j$THREADS install && \
rm -rf $(pwd) rm -rf $(pwd)
RUN git clone -b tor-0.4.4.6 --depth 1 https://git.torproject.org/tor.git && \ RUN git clone -b tor-0.4.5.3-rc --depth 1 https://git.torproject.org/tor.git && \
cd tor && \ cd tor && \
git reset --hard 2a8b789ea6f308d081f369d78fa7cfdc9d00bf90 && \ git reset --hard e5c47d295bd3dc35f75c7d5c1753c650fd912640 && \
./autogen.sh && \ ./autogen.sh && \
./configure --host=x86_64-w64-mingw32 \ ./configure --host=x86_64-w64-mingw32 \
--disable-asciidoc \ --disable-asciidoc \