upgrade Tor from 0.4.5.8 to 0.4.7.13

Tor 0.4.5 series reached End Of Life on Feb 15th 2023:
https://gitlab.torproject.org/tpo/core/team/-/wikis/NetworkTeam/CoreTorReleases

This commit upgrades Tor on EOTK to the latest 0.4.7.13 release.

Recently Tor changed the way it distributes tarball signatures,
so this commit also keep things up to date in that regard.
pull/111/head
Silvio Rhatto 2023-03-03 13:58:47 -03:00
rodzic e4a4ca429f
commit 3db34a7315
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 0B67F75BCEE634FB
1 zmienionych plików z 9 dodań i 4 usunięć

Wyświetl plik

@ -6,6 +6,7 @@ keyserver="keyserver.ubuntu.com" # standard
CustomiseVars() {
install_dir=$opt_dir/$tool.d
tool_tarball=`basename "$tool_url"`
tool_checksum=`basename "$tool_checksum_url"`
tool_sig=`basename "$tool_sig_url"`
tool_dir=`basename "$tool_tarball" .tar.gz`
}
@ -13,6 +14,8 @@ CustomiseVars() {
SetupForBuild() {
test -f "$tool_tarball" || curl -o "$tool_tarball" "$tool_url" || exit 1
test -f "$tool_sig" || curl -o "$tool_sig" "$tool_sig_url" || exit 1
test -z "$tool_checksum" || test -f "$tool_checksum" || curl -o "$tool_checksum" "$tool_checksum_url" || exit 1
test -z "$tool_checksum" || $tool_checksum_command "$tool_checksum" || exit 1
gpg --keyserver "hkp://$keyserver:80" --recv-keys $tool_signing_keys || exit 1
gpg --verify "$tool_sig" || exit 1
test -d "$tool_dir" || tar zxf "$tool_tarball" || exit 1
@ -24,7 +27,7 @@ BuildAndCleanup() {
$MAKE install || exit 1
cd $opt_dir || exit 1
for x in $tool_link_paths ; do ln -sf "$install_dir/$x" || exit 1 ; done
rm -rf "$tool_tarball" "$tool_sig" "$tool_dir" || exit 1
rm -rf "$tool_tarball" "$tool_sig" "$tool_dir" "$tool_checksum" || exit 1
}
# ------------------------------------------------------------------
@ -60,10 +63,12 @@ ConfigureOpenResty() { # this accepts arguments
SetupTorVars() {
tool="tor"
tool_version="0.4.5.8"
tool_signing_keys="6AFEE6D49E92B601 C218525819F78451"
tool_version="0.4.7.13"
tool_signing_keys="514102454D0A87DB0767A1EBBE6A0531C18A9179 B74417EDDF22AC9F9E90F49142E86A2A11F48D36 2133BC600AB133E1D826D173FE43009C4607B1FB"
tool_url="https://dist.torproject.org/$tool-$tool_version.tar.gz"
tool_sig_url="https://dist.torproject.org/$tool-$tool_version.tar.gz.asc"
tool_checksum_url="https://dist.torproject.org/$tool-$tool_version.tar.gz.sha256sum"
tool_checksum_command="sha256sum -c"
tool_sig_url="https://dist.torproject.org/$tool-$tool_version.tar.gz.sha256sum.asc"
tool_link_paths="bin/$tool"
}