From 1c951e15c950848bbb7ce84ac9ce73ade939ec29 Mon Sep 17 00:00:00 2001 From: Gorgone Date: Thu, 16 Sep 2021 18:53:54 +0200 Subject: [PATCH] Update _zerotier version update to 1.6.5 --- support/software/_zerotier | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/support/software/_zerotier b/support/software/_zerotier index 1bba582..054463c 100644 --- a/support/software/_zerotier +++ b/support/software/_zerotier @@ -5,17 +5,17 @@ build_zerotier() { clear source "$tccfgdir/$1" -stable="https://github.com/zerotier/ZeroTierOne/archive/1.4.6.tar.gz" +stable="https://github.com/zerotier/ZeroTierOne/archive/1.6.5.tar.gz" cd $dldir slogo -[ -d ZeroTierOne-1.4.6 ] && rm -rf ZeroTierOne-1.4.6 #remove build dir -[ -f 1.4.6.tar.gz ] && rm -f 1.4.6.tar.gz #remove download +[ -d ZeroTierOne-1.6.5 ] && rm -rf ZeroTierOne-1.6.5 #remove build dir +[ -f 1.6.5.tar.gz ] && rm -f 1.6.5.tar.gz #remove download echo -en "\nZeroTierOne\n===========\ndownload please wait ... " wget $stable --progress=dot -q --show-progress 2>&1 | awk 'NF>2 && $(NF-2) ~ /%/{printf "\rdownload please wait ... %s",$(NF-2)} END{print "\rdownload please wait ... Done!"}' #download stable package echo -e "extracting please wait ... " -tar -zxf 1.4.6.tar.gz #extract source -cd ZeroTierOne-1.4.6 +tar -zxf 1.6.5.tar.gz #extract source +cd ZeroTierOne-1.6.5 sed "11a\\override CC=$tcdir/$_toolchainname/bin/$_compiler"gcc"" -i make-linux.mk sed "12a\\override CXX=$tcdir/$_toolchainname/bin/$_compiler"g++"" -i make-linux.mk sed "13a\\override STRIP=$tcdir/$_toolchainname/bin/$_compiler"strip"" -i make-linux.mk @@ -26,34 +26,34 @@ upx -9 -q zerotier-one |grep zerotier |awk '{print "compress -> " $1" "$3" "$4 #copy binarys [ $1 = "native" ] && _toolchainname=$(uname -m) -[ -d "$sodir/ZeroTierOne-1.4.6.$_toolchainname" ] && rm -rf "$sodir/ZeroTierOne-1.4.6.$_toolchainname" -mkdir -p "$sodir/ZeroTierOne-1.4.6.$_toolchainname" -mv {zerotier-cli,zerotier-idtool,zerotier-one} "$sodir/ZeroTierOne-1.4.6.$_toolchainname" +[ -d "$sodir/ZeroTierOne-1.6.5.$_toolchainname" ] && rm -rf "$sodir/ZeroTierOne-1.6.5.$_toolchainname" +mkdir -p "$sodir/ZeroTierOne-1.6.5.$_toolchainname" +mv {zerotier-cli,zerotier-idtool,zerotier-one} "$sodir/ZeroTierOne-1.6.5.$_toolchainname" } deb_package() { clear slogo -mkdir -p "$sodir/ZeroTierOne-1.4.6.$_toolchainname/DEBIAN" -mkdir -p "$sodir/ZeroTierOne-1.4.6.$_toolchainname/usr/local/bin" -cd "$sodir/ZeroTierOne-1.4.6.$_toolchainname" -mv {zerotier-cli,zerotier-idtool,zerotier-one} "$sodir/ZeroTierOne-1.4.6.$_toolchainname/usr/local/bin" +mkdir -p "$sodir/ZeroTierOne-1.6.5.$_toolchainname/DEBIAN" +mkdir -p "$sodir/ZeroTierOne-1.6.5.$_toolchainname/usr/local/bin" +cd "$sodir/ZeroTierOne-1.6.5.$_toolchainname" +mv {zerotier-cli,zerotier-idtool,zerotier-one} "$sodir/ZeroTierOne-1.6.5.$_toolchainname/usr/local/bin" printf "\nPackage Info\n============\n" echo "Package: zerotierone -Version: 1.4.6 +Version: 1.6.5 Section: custom Priority: optional Architecture: all Essential: no Installed-Size: 1024 Maintainer: https://github.com/zerotier/ZeroTierOne -Description: virtual network card">"$sodir/ZeroTierOne-1.4.6.$_toolchainname/DEBIAN/control" -echo "ZeroTierOne-1.4.6.$_toolchainname" -cat "$sodir/ZeroTierOne-1.4.6.$_toolchainname/DEBIAN/control" +Description: virtual network card">"$sodir/ZeroTierOne-1.6.5.$_toolchainname/DEBIAN/control" +echo "ZeroTierOne-1.6.5.$_toolchainname" +cat "$sodir/ZeroTierOne-1.6.5.$_toolchainname/DEBIAN/control" cd "$sodir" printf "\n" -dpkg-deb --build "ZeroTierOne-1.4.6.$_toolchainname" -[ -f "ZeroTierOne-1.4.6.$_toolchainname".deb ] && mv "ZeroTierOne-1.4.6.$_toolchainname".deb $adir +dpkg-deb --build "ZeroTierOne-1.6.5.$_toolchainname" +[ -f "ZeroTierOne-1.6.5.$_toolchainname".deb ] && mv "ZeroTierOne-1.6.5.$_toolchainname".deb $adir printf "\n" exit }