starred/chia-blockchain
1
0
Fork 0
mirror of https://github.com/Chia-Network/chia-blockchain.git synced 2026-08-24 10:05:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Gh 1.3.3v2 (#11011)

Browse Source 
* Non Hobo patch the winstaller for CVE-2022-0778 (#10995)

* install.sh is not upgrading OpenSSL on MacOS (#11003)

* MacOS isn't updating OpenSSL in install.sh

* Exit if no brew on MacOS

* Code the if tree like a pro instead.

Co-authored-by: Kyle Altendorf <sda@fstab.net>

Co-authored-by: Kyle Altendorf <sda@fstab.net>

* Remove hobo patch

* apt show not needed (#10997)

* install/upgrade openssl on Arch Linux also

* Update CHANGELOG

* revert Arch change backport

Co-authored-by: Kyle Altendorf <sda@fstab.net>
This commit is contained in:
Gene Hoffman
2022-04-02 23:59:03 -07:00
committed by GitHub
co-authored by Kyle Altendorf
parent cdb24ba518
commit 0269797b0a
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build-windows-installer.yml
+1 -1
View File
@@ -62,7 +62,7 @@ jobs:
- uses: actions/setup-python@v2
name: Install Python 3.9
with:
python-version: "3.9"
python-version: "3.9.11"
- name: Setup Node 16.x
uses: actions/setup-node@v2.4.1
CHANGELOG.md
+8 -1
View File
@@ -8,13 +8,20 @@ for setuptools_scm/PEP 440 reasons.
## [Unreleased]
## 1.3.3 Chia blockchain 2022-4-02
### Fixed
- In version 1.3.2 our patch for the OpenSSL vulnerability was not complete for the Windows installer. Thank you @xsmolasses of Core-Pool.
- MacOS would not update openssl when installing via `install.sh`
- Some debugging information remained in `install.sh`
## 1.3.2 Chia blockchain 2022-4-01
### Fixed
- Fixed OpenSSL vulnerability CVE-2022-0778
## 1.3.1 Chia blockchain 2022-3-16
### Fixed
build_scripts/build_windows.ps1
-4
View File
@@ -60,8 +60,6 @@ if (Test-Path -Path .\bladebit\) {
mv .\bladebit\ .\venv\lib\site-packages\
}
Write-Output " ---"
Write-Output "Build chia-blockchain wheels"
Write-Output " ---"
@@ -86,8 +84,6 @@ Write-Output " ---"
$SPEC_FILE = (python -c 'import chia; print(chia.PYINSTALLER_SPEC_PATH)') -join "`n"
pyinstaller --log-level INFO $SPEC_FILE
Invoke-WebRequest https://github.com/python/cpython-bin-deps/raw/7bc5363d366acd7f9c130e27cf650d5414723a99/amd64/libssl-1_1.dll -OutFile ".\dist\daemon\libssl-1_1.dll"
Write-Output " ---"
Write-Output "Copy chia executables to chia-blockchain-gui\"
Write-Output " ---"
install.sh
+7 -4
View File
@@ -118,12 +118,10 @@ if [ "$(uname)" = "Linux" ]; then
echo "Installing on Ubuntu pre 20.04 LTS."
sudo apt-get update
sudo apt-get install -y python3.7-venv python3.7-distutils openssl
apt show openssl
elif [ "$UBUNTU" = "true" ] && [ "$UBUNTU_PRE_2004" = "0" ] && [ "$UBUNTU_2100" = "0" ]; then
echo "Installing on Ubuntu 20.04 LTS."
sudo apt-get update
sudo apt-get install -y python3.8-venv python3-distutils openssl
apt show openssl
elif [ "$UBUNTU" = "true" ] && [ "$UBUNTU_2100" = "1" ]; then
echo "Installing on Ubuntu 21.04 or newer."
sudo apt-get update
@@ -172,8 +170,13 @@ if [ "$(uname)" = "Linux" ]; then
sudo yum install -y python39 openssl
fi
fi
elif [ "$(uname)" = "Darwin" ] && ! type brew >/dev/null 2>&1; then
echo "Installation currently requires brew on MacOS - https://brew.sh/"
elif [ "$(uname)" = "Darwin" ]; then
echo "Installing on macOS."
if ! type brew >/dev/null 2>&1; then
echo "Installation currently requires brew on macOS - https://brew.sh/"
exit 1
fi
echo "Installing OpenSSL"
brew install openssl
elif [ "$(uname)" = "OpenBSD" ]; then
export MAKE=${MAKE:-gmake}