From c1b7c3126e856264395577206622c3bd95f30cc4 Mon Sep 17 00:00:00 2001 From: WillyPillow Date: Tue, 31 Jan 2017 18:03:36 +0800 Subject: [PATCH 1/3] Add gevent workaround --- zn.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zn.sh b/zn.sh index deb1a02..b9264ba 100644 --- a/zn.sh +++ b/zn.sh @@ -8,6 +8,8 @@ if [[ -z "$ZERONET_HOME" ]]; then apt-get install -y curl make python2-dev git clang grep c-ares-dev libev-dev openssl-tool export LIBEV_EMBED=false export CARES_EMBED=false + export CONFIG_SHELL=$PREFIX/bin/sh + export TMPDIR=$PREFIX/tmp pip2 install --upgrade pip && pip2 install https://github.com/fornwall/greenlet/archive/master.zip EMBED=0 pip2 install gevent pip2 install gevent msgpack-python From c400fcee633a87069e7f1703ab42cf26ad4170e0 Mon Sep 17 00:00:00 2001 From: WillyPillow Date: Tue, 31 Jan 2017 18:04:23 +0800 Subject: [PATCH 2/3] Clean up duplicate lines and unneeded greenlet workaround --- zn.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/zn.sh b/zn.sh index b9264ba..068bc83 100644 --- a/zn.sh +++ b/zn.sh @@ -4,15 +4,12 @@ if [[ -z "$ZERONET_HOME" ]]; then echo "--- Installing ZeroNet ---" termux-setup-storage apt-get -y update && apt-get -y upgrade - apt install clang -y apt-get install -y curl make python2-dev git clang grep c-ares-dev libev-dev openssl-tool export LIBEV_EMBED=false export CARES_EMBED=false export CONFIG_SHELL=$PREFIX/bin/sh export TMPDIR=$PREFIX/tmp - pip2 install --upgrade pip && pip2 install https://github.com/fornwall/greenlet/archive/master.zip - EMBED=0 pip2 install gevent - pip2 install gevent msgpack-python + EMBED=0 pip2 install gevent msgpack-python if [[ ! -d ~/ZeroNet ]]; then cd ~ From 291a8fe61af240cdf8b718c9df8b24020b1e9a9a Mon Sep 17 00:00:00 2001 From: WillyPillow Date: Tue, 31 Jan 2017 18:08:18 +0800 Subject: [PATCH 3/3] Use Git and add signature verification --- zn.sh | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/zn.sh b/zn.sh index 068bc83..6b29e76 100644 --- a/zn.sh +++ b/zn.sh @@ -4,7 +4,7 @@ if [[ -z "$ZERONET_HOME" ]]; then echo "--- Installing ZeroNet ---" termux-setup-storage apt-get -y update && apt-get -y upgrade - apt-get install -y curl make python2-dev git clang grep c-ares-dev libev-dev openssl-tool + apt-get install -y curl make python2-dev git clang grep c-ares-dev libev-dev openssl-tool gnupg gnupg-curl export LIBEV_EMBED=false export CARES_EMBED=false export CONFIG_SHELL=$PREFIX/bin/sh @@ -13,8 +13,17 @@ if [[ -z "$ZERONET_HOME" ]]; then if [[ ! -d ~/ZeroNet ]]; then cd ~ - curl -L https://github.com/HelloZeroNet/ZeroNet/archive/master.tar.gz | tar xz - mv ~/ZeroNet-master ~/ZeroNet + git clone https://github.com/HelloZeroNet/ZeroNet.git + cd ZeroNet + gpg --keyserver keys.gnupg.net --recv-keys 960FFF2D6C145AA613E8491B5B63BAE6CB9613AE + COMMIT=`git log --oneline | head -n 1 | cut -f 1 -d ' '` + git verify-commit "$COMMIT" + if [ "$?" -eq 0 ]; then + git checkout "$COMMIT" + else + >&2 echo "Signature verification failed" + exit 1 + fi fi @@ -28,6 +37,14 @@ if [[ "$1" == "update" ]]; then echo "--- Updating ZeroNet ---" pushd $ZERONET_HOME git pull + COMMIT=`git log --oneline | head -n 1 | cut -f 1 -d ' '` + git verify-commit "$COMMIT" + if [ "$?" -eq 0 ]; then + git checkout "$COMMIT" + else + >&2 echo "Signature verification failed" + exit 1 + fi popd else pushd $ZERONET_HOME