From ff37b7a1ecd58b83190d68ff1ea2ee64e2f1e539 Mon Sep 17 00:00:00 2001 From: jahway603 Date: Fri, 15 Jul 2022 11:43:05 -0400 Subject: [PATCH 1/2] update build.sh and CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- INSTALL.md | 2 +- zcutil/build.sh | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3a2b1e08a..5866ab2e3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,7 +37,7 @@ Before we get started, here are a few things we expect from you (and that you sh ## How to contribute -If you'd like to contribute, start by searching through the [issues](https://github.com/MyHush/hush3/issues) and [pull requests](https://github.com/MyHush/hush3/pulls) to see whether someone else has raised a similar idea or question. +If you'd like to contribute, start by searching through the [issues](https://git.hush.is/hush/hush3/issues) and [pull requests](https://git.hush.is/hush/hush3/pulls) to see whether someone else has raised a similar idea or question. If you don't see your idea listed, and you think it can contribute to Hush, do one of the following: * **If your contribution is minor,** such as a fixing a typo, open a pull request. @@ -49,7 +49,7 @@ Don't write shitty code. Do not emulate "jl777 code style" from Komodo, we consi ## Setting up your environment -The Hush Core (hushd) is mainly written in C++ with specific modules written in C. Follow the [Install](https://github.com/MyHush/hush3/blob/master/INSTALL.md) instructions to build hushd from sources. For more informations about the Hush Platform and a full API documentation please visit the official [Hush Developer documentation](https://gilardh.github.io/dev-website/developers/) +The Hush Core (hushd) is mainly written in C++ with specific modules written in C. Follow the [Install](https://git.hush.is/hush/hush3/src/branch/master/INSTALL.md) instructions to build hushd from sources. For more informations about the Hush Platform and a full API documentation please visit the official [Hush Developer documentation](https://faq.hush.is/rpc/) Other Hush software is written in Rust or Go. We avoid Javascript at all costs. diff --git a/INSTALL.md b/INSTALL.md index 114ef1775..ad81f40b9 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -25,7 +25,7 @@ sudo swapon /swapfile # install build dependencies sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib \ autoconf libtool ncurses-dev unzip git python zlib1g-dev wget \ - bsdmainutils automake curl unzip nano libsodium-dev + bsdmainutils automake curl unzip nano libsodium-dev cmake # clone git repo git clone https://git.hush.is/hush/hush3 cd hush3 diff --git a/zcutil/build.sh b/zcutil/build.sh index a5ecda2ca..42f4196b3 100755 --- a/zcutil/build.sh +++ b/zcutil/build.sh @@ -5,6 +5,12 @@ set -eu -o pipefail +# Check if cmake, a new dependency for randomx support, is installed on system and exits if it is not +if ! [ -x "$(command -v cmake)" ]; then + echo 'Error: cmake is not installed. Install cmake and try again.' >&2 + exit 1 +fi + function cmd_pref() { if type -p "$2" > /dev/null; then eval "$1=$2" From b6ee6ba57e4c1ad9961cedade9cff38adbb4f16c Mon Sep 17 00:00:00 2001 From: jahway603 Date: Fri, 15 Jul 2022 12:58:29 -0400 Subject: [PATCH 2/2] changed libsodium to gitea hosted version --- depends/packages/libsodium.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/depends/packages/libsodium.mk b/depends/packages/libsodium.mk index 0be8e1676..2d930c4ae 100644 --- a/depends/packages/libsodium.mk +++ b/depends/packages/libsodium.mk @@ -1,7 +1,8 @@ package=libsodium $(package)_version=1.0.18 -$(package)_download_path=https://github.com/MyHush/libsodium/releases/download/$($(package)_version)/ -$(package)_file_name=$(package)-$($(package)_version).tar.gz +$(package)_download_path=https://git.hush.is/attachments +$(package)_file_name=0d9f589e-a9f9-4ddb-acaa-0f1b423b32eb +$(package)_download_file=0d9f589e-a9f9-4ddb-acaa-0f1b423b32eb $(package)_sha256_hash=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 $(package)_dependencies= $(package)_config_opts=