Labels Milestones

migrated more from mcro #133

Merged

duke merged 4 commits from jahway603/hush3:dev into dev 2 years ago

Conversation 12 Commits 4 Files Changed 2

jahway603 commented 2 years ago

Collaborator

• migrated utfcpp from gitHord to git.hush.is migrated repo
• migrated boost from gitHord to upstream

* migrated utfcpp from gitHord to git.hush.is migrated repo * migrated boost from gitHord to upstream

👀 1

jahway603 added 1 commit 2 years ago

58d3d21285 migrated more from mcro

jahway603 referenced this pull request 2 years ago

Fix boost dependency #131

jahway603 referenced this pull request 2 years ago

Fix utfcpp dependency #130

duke commented 2 years ago

Owner

@jahway603 looks mostly groovy. What is the reason for the checksum change on utfcpp?

@jahway603 looks mostly groovy. What is the reason for the checksum change on utfcpp?

jahway603 commented 2 years ago

Poster

Collaborator

The reason for the different checksums is because gitea created it's own new *.tar.gz for a "Release", which had to be created manually.

$ wget https://git.hush.is/jahway603/utfcpp/archive/v3.1.tar.gz
$ sha256sum v3.1.tar.gz 
eb4d5b9843a8411a20da8d011983e5351bf6c5893814f6756de8a31392185a98  v3.1.tar.gz

$ wget https://github.com/MyHush/utfcpp/archive/v3.1.tar.gz
$ sha256sum v3.1.tar.gz
ab531c3fd5d275150430bfaca01d7d15e017a188183be932322f2f651506b096  v3.1.tar.gz

The reason for the different checksums is because gitea created it's own new *.tar.gz for a "Release", which had to be created manually. ``` $ wget https://git.hush.is/jahway603/utfcpp/archive/v3.1.tar.gz $ sha256sum v3.1.tar.gz eb4d5b9843a8411a20da8d011983e5351bf6c5893814f6756de8a31392185a98 v3.1.tar.gz ``` ``` $ wget https://github.com/MyHush/utfcpp/archive/v3.1.tar.gz $ sha256sum v3.1.tar.gz ab531c3fd5d275150430bfaca01d7d15e017a188183be932322f2f651506b096 v3.1.tar.gz ```

duke commented 2 years ago

Owner

@jahway603 I forked the repo to hush/utfcpp and made a new release with the exact file we used to have on Github, so the the SHA256 checksum is now the same. Please update this PR to use https://git.hush.is/hush/utfcpp/releases/tag/3.1 and don't change the checksum, and it should work. Thanks!

@jahway603 I forked the repo to hush/utfcpp and made a new release with the exact file we used to have on Github, so the the SHA256 checksum is now the same. Please update this PR to use https://git.hush.is/hush/utfcpp/releases/tag/3.1 and don't change the checksum, and it should work. Thanks!

jahway603 added 2 commits 2 years ago

41b2a75e1f Merge remote-tracking branch 'remotes/upstream/dev' into dev

b956945509 fixed utfcpp to use Hush gitea copy

jahway603 commented 2 years ago

Poster

Collaborator

Fresh git clone and changed it to use the hush/utfcpp release, but it bombs because of a hashing error. I don't know how to force this utfcpp.mk file to download that exact file you want...

rm -f /home/wtf/dev/hush3/depends/sources/download-stamps/.stamp_fetched-utfcpp-utfcpp-3.1.tar.gz.hash
touch /home/wtf/dev/hush3/depends/sources/download-stamps/.stamp_fetched-utfcpp-utfcpp-3.1.tar.gz.hash
cd /home/wtf/dev/hush3/depends/sources/download-stamps; (test -f /home/wtf/dev/hush3/depends/sources/utfcpp-3.1.tar.gz || ( mkdir -p /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1 && echo Fetching utfcpp... && ( curl --location --fail --connect-timeout 10 --retry 3 -o "/home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/utfcpp-3.1.tar.gz.temp" "/utfcpp-3.1.tar.gz" || curl --location --fail --connect-timeout 10 --retry 3 -o "/home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/utfcpp-3.1.tar.gz.temp" "https://git.hush.is/hush/utfcpp/archive/v3.1.tar.gz" ) && echo "ab531c3fd5d275150430bfaca01d7d15e017a188183be932322f2f651506b096  /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/utfcpp-3.1.tar.gz.temp" > /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/.utfcpp-3.1.tar.gz.hash && sha256sum -c /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/.utfcpp-3.1.tar.gz.hash && mv /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/utfcpp-3.1.tar.gz.temp /home/wtf/dev/hush3/depends/sources/utfcpp-3.1.tar.gz && rm -rf /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1 ))
Fetching utfcpp...
curl: (3) URL using bad/illegal format or missing URL
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100 25867    0 25867    0     0  23366      0 --:--:--  0:00:01 --:--:-- 23366
/home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/utfcpp-3.1.tar.gz.temp: FAILED
sha256sum: WARNING: 1 computed checksum did NOT match
make: *** [funcs.mk:264: /home/wtf/dev/hush3/depends/sources/download-stamps/.stamp_fetched-utfcpp-utfcpp-3.1.tar.gz.hash] Error 1
make: Leaving directory '/home/wtf/dev/hush3/depends'

What I do see is the following... which has a changed checksum in the release you just created...

$ wget wget https://git.hush.is/hush/utfcpp/archive/v3.1.tar.gz
$ sha256sum v3.1.tar.gz 
eb4d5b9843a8411a20da8d011983e5351bf6c5893814f6756de8a31392185a98  v3.1.tar.gz

Fresh git clone and changed it to use the hush/utfcpp release, but it bombs because of a hashing error. I don't know how to force this utfcpp.mk file to download that exact file you want... ``` rm -f /home/wtf/dev/hush3/depends/sources/download-stamps/.stamp_fetched-utfcpp-utfcpp-3.1.tar.gz.hash touch /home/wtf/dev/hush3/depends/sources/download-stamps/.stamp_fetched-utfcpp-utfcpp-3.1.tar.gz.hash cd /home/wtf/dev/hush3/depends/sources/download-stamps; (test -f /home/wtf/dev/hush3/depends/sources/utfcpp-3.1.tar.gz || ( mkdir -p /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1 && echo Fetching utfcpp... && ( curl --location --fail --connect-timeout 10 --retry 3 -o "/home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/utfcpp-3.1.tar.gz.temp" "/utfcpp-3.1.tar.gz" || curl --location --fail --connect-timeout 10 --retry 3 -o "/home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/utfcpp-3.1.tar.gz.temp" "https://git.hush.is/hush/utfcpp/archive/v3.1.tar.gz" ) && echo "ab531c3fd5d275150430bfaca01d7d15e017a188183be932322f2f651506b096 /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/utfcpp-3.1.tar.gz.temp" > /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/.utfcpp-3.1.tar.gz.hash && sha256sum -c /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/.utfcpp-3.1.tar.gz.hash && mv /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/utfcpp-3.1.tar.gz.temp /home/wtf/dev/hush3/depends/sources/utfcpp-3.1.tar.gz && rm -rf /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1 )) Fetching utfcpp... curl: (3) URL using bad/illegal format or missing URL % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 25867 0 25867 0 0 23366 0 --:--:-- 0:00:01 --:--:-- 23366 /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/utfcpp-3.1.tar.gz.temp: FAILED sha256sum: WARNING: 1 computed checksum did NOT match make: *** [funcs.mk:264: /home/wtf/dev/hush3/depends/sources/download-stamps/.stamp_fetched-utfcpp-utfcpp-3.1.tar.gz.hash] Error 1 make: Leaving directory '/home/wtf/dev/hush3/depends' ``` What I do see is the following... which has a changed checksum in the release you just created... ``` $ wget wget https://git.hush.is/hush/utfcpp/archive/v3.1.tar.gz $ sha256sum v3.1.tar.gz eb4d5b9843a8411a20da8d011983e5351bf6c5893814f6756de8a31392185a98 v3.1.tar.gz ```

jahway603 commented 2 years ago

Poster

Collaborator

I was only able to succesfully build hush by changing the utfcpp sha256sum hash to eb4d5b9843a8411a20da8d011983e5351bf6c5893814f6756de8a31392185a98 which is the same hash as the file https://git.hush.is/hush/utfcpp/archive/v3.1.tar.gz

I was only able to succesfully build hush by changing the utfcpp sha256sum hash to `eb4d5b9843a8411a20da8d011983e5351bf6c5893814f6756de8a31392185a98` which is the same hash as the file https://git.hush.is/hush/utfcpp/archive/v3.1.tar.gz

duke commented 2 years ago

Owner

@jahway603 sorry, the filename to download is now: https://git.hush.is/attachments/11822fe4-3846-4ce4-9c84-ba0877a7b186

which is the file uploaded to the release, not the auto-generated file from Gitea, which has a different checksum.

@jahway603 sorry, the filename to download is now: https://git.hush.is/attachments/11822fe4-3846-4ce4-9c84-ba0877a7b186 which is the file uploaded to the release, not the auto-generated file from Gitea, which has a different checksum.

jahway603 commented 2 years ago

Poster

Collaborator

I'm well aware of what you're saying.

What I am asking is - how do I force the Hush build system (in depends/packages/utfcpp.mk) to use that "special" or unique gitea filename?

I'm well aware of what you're saying. What I am asking is - how do I force the Hush build system (in depends/packages/utfcpp.mk) to use that "special" or unique gitea filename?

duke commented 2 years ago

Owner

@jahway603 change $(package)_download_path to https://git.hush.is/attachments/ and $(package)_file_name to 11822fe4-3846-4ce4-9c84-ba0877a7b186 should hopefully work

@jahway603 change `$(package)_download_path` to `https://git.hush.is/attachments/` and `$(package)_file_name` to `11822fe4-3846-4ce4-9c84-ba0877a7b186` should hopefully work

jahway603 commented 2 years ago

Poster

Collaborator

It definitely does not like that, lol

cd /home/wtf/dev/hush3/depends/sources/download-stamps; (test -f /home/wtf/dev/hush3/depends/sources/11822fe4-3846-4ce4-9c84-ba0877a7b186 || ( mkdir -p /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1 && echo Fetching utfcpp... && ( curl --location --fail --connect-timeout 10 --retry 3 -o "/home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/11822fe4-3846-4ce4-9c84-ba0877a7b186.temp" "/11822fe4-3846-4ce4-9c84-ba0877a7b186" || curl --location --fail --connect-timeout 10 --retry 3 -o "/home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/11822fe4-3846-4ce4-9c84-ba0877a7b186.temp" "https://git.hush.is/attachments/v3.1.tar.gz" ) && echo "ab531c3fd5d275150430bfaca01d7d15e017a188183be932322f2f651506b096  /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/11822fe4-3846-4ce4-9c84-ba0877a7b186.temp" > /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/.11822fe4-3846-4ce4-9c84-ba0877a7b186.hash && sha256sum -c /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/.11822fe4-3846-4ce4-9c84-ba0877a7b186.hash && mv /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/11822fe4-3846-4ce4-9c84-ba0877a7b186.temp /home/wtf/dev/hush3/depends/sources/11822fe4-3846-4ce4-9c84-ba0877a7b186 && rm -rf /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1 ))
Fetching utfcpp...
curl: (3) URL using bad/illegal format or missing URL
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
curl: (22) The requested URL returned error: 500 
Warning: Transient problem: HTTP error Will retry in 1 seconds. 3 retries 
Warning: left.
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
curl: (22) The requested URL returned error: 500 
Warning: Transient problem: HTTP error Will retry in 2 seconds. 2 retries 
Warning: left.
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
curl: (22) The requested URL returned error: 500 
Warning: Transient problem: HTTP error Will retry in 4 seconds. 1 retries 
Warning: left.
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
curl: (22) The requested URL returned error: 500 
make: *** [funcs.mk:264: /home/wtf/dev/hush3/depends/sources/download-stamps/.stamp_fetched-utfcpp-11822fe4-3846-4ce4-9c84-ba0877a7b186.hash] Error 22
make: Leaving directory '/home/wtf/dev/hush3/depends'

It definitely does not like that, lol ``` cd /home/wtf/dev/hush3/depends/sources/download-stamps; (test -f /home/wtf/dev/hush3/depends/sources/11822fe4-3846-4ce4-9c84-ba0877a7b186 || ( mkdir -p /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1 && echo Fetching utfcpp... && ( curl --location --fail --connect-timeout 10 --retry 3 -o "/home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/11822fe4-3846-4ce4-9c84-ba0877a7b186.temp" "/11822fe4-3846-4ce4-9c84-ba0877a7b186" || curl --location --fail --connect-timeout 10 --retry 3 -o "/home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/11822fe4-3846-4ce4-9c84-ba0877a7b186.temp" "https://git.hush.is/attachments/v3.1.tar.gz" ) && echo "ab531c3fd5d275150430bfaca01d7d15e017a188183be932322f2f651506b096 /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/11822fe4-3846-4ce4-9c84-ba0877a7b186.temp" > /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/.11822fe4-3846-4ce4-9c84-ba0877a7b186.hash && sha256sum -c /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/.11822fe4-3846-4ce4-9c84-ba0877a7b186.hash && mv /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1/11822fe4-3846-4ce4-9c84-ba0877a7b186.temp /home/wtf/dev/hush3/depends/sources/11822fe4-3846-4ce4-9c84-ba0877a7b186 && rm -rf /home/wtf/dev/hush3/depends/work/download/utfcpp-3.1 )) Fetching utfcpp... curl: (3) URL using bad/illegal format or missing URL % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 curl: (22) The requested URL returned error: 500 Warning: Transient problem: HTTP error Will retry in 1 seconds. 3 retries Warning: left. 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 curl: (22) The requested URL returned error: 500 Warning: Transient problem: HTTP error Will retry in 2 seconds. 2 retries Warning: left. 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 curl: (22) The requested URL returned error: 500 Warning: Transient problem: HTTP error Will retry in 4 seconds. 1 retries Warning: left. 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 curl: (22) The requested URL returned error: 500 make: *** [funcs.mk:264: /home/wtf/dev/hush3/depends/sources/download-stamps/.stamp_fetched-utfcpp-11822fe4-3846-4ce4-9c84-ba0877a7b186.hash] Error 22 make: Leaving directory '/home/wtf/dev/hush3/depends' ```

duke commented 2 years ago

Owner

@jahway603 that output looks like it's trying to download https://git.hush.is/attachments/v3.1.tar.gz which isn't write, push a commit and I can take a look

@jahway603 that output looks like it's trying to download `https://git.hush.is/attachments/v3.1.tar.gz` which isn't write, push a commit and I can take a look

jahway603 added 1 commit 2 years ago

398db65c0e NOW using special gitea file

jahway603 commented 2 years ago

Poster

Collaborator

@duke had to also change $(package)_download_file to 11822fe4-3846-4ce4-9c84-ba0877a7b186 and now it builds fine with it

@duke had to also change `$(package)_download_file` to `11822fe4-3846-4ce4-9c84-ba0877a7b186` and now it builds fine with it

duke commented 2 years ago

Owner

@jahway603 good enough for me 👍

@jahway603 good enough for me :+1:

👍 1

duke merged commit 7d2427074d into dev 2 years ago

duke referenced this issue from a commit 2 years ago

Merge pull request 'migrated more from mcro' (#133) from jahway603/hush3:dev into dev

duke referenced this issue from a commit 8 months ago

Port scheduler race condition fix from BTC upstream #133, https://github.com/bitcoin/bitcoin/commit/12519bf62b8c49b1c1744eca6ea5b3162a61f962

The pull request has been merged as 7d2427074d.

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

0-500 bounty
bounty up to 500 HUSH 2001-5000 bounty
bounty between 2001 and 5000 HUSH 501-2000 bounty
bounty between 501 and 2000 HUSH arm
something doesn't work on arm beginners
for new developers bug
may or may not be a bug build
problems building documentation
not enough information feature
new feature high priority
high priority i2p
related to i2p low priority
low priority medium priority
medium priority question
something is not clear release
release label or issue related to it testing
related to testing tor
related to tor wontfix
this won't be fixed

No Label 0-500 bounty 2001-5000 bounty 501-2000 bounty arm beginners bug build documentation feature high priority i2p low priority medium priority question release testing tor wontfix

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

This pull request currently doesn't have any dependencies.

Write Preview

Loading…

Cancel

Save

There is no content yet.