Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(Upgrades for /depends + gitian-*.yml setup)(Fix for Coin Control "sorting" bug) (Fix for windows builds hashes) (Statically linked libcurl) #461

Merged
merged 69 commits into from May 27, 2019

Conversation

Projects
None yet
3 participants
@mxaddict
Copy link
Contributor

commented May 2, 2019

Fix for Coin Control "sorting" bug

This is a fix for issues #427 #471 #473

@mxaddict

This comment has been minimized.

Copy link
Contributor Author

commented May 2, 2019

NOTE: The fix involves upgrading to QT 5.9.8, which breaks compatibility for OSX older than 10.10

@mxaddict mxaddict requested review from proletesseract and aguycalled May 2, 2019

mxaddict added some commits May 2, 2019

depends: tar: Always extract as yourself
For normal users, --no-same-owner is default, but not so for root, where
it is assumed that root can change ownership willy-nilly. This is not
the case for privilege-limited container environments where we gaslight
the process into thinking it's root.

@mxaddict mxaddict force-pushed the mxaddict:patch-5 branch from fe51f40 to 922c486 May 4, 2019

@mxaddict mxaddict force-pushed the mxaddict:patch-5 branch 2 times, most recently from 406eb1c to a7b7e63 May 4, 2019

@mxaddict mxaddict force-pushed the mxaddict:patch-5 branch from a7b7e63 to 5885a3c May 4, 2019

@aguycalled

This comment has been minimized.

Copy link
Member

commented May 15, 2019

Hashes of my builds:

529345176af82959a39aa1ccd93589edb1843025c17d00e961c9c1f01a6ba26e  navcoin-4.6.0-arm-linux-gnueabihf.tar.gz
a9371072b2a1931e191a8d26505b4e95e20e2b0d3984ed633b70e891346b435b  navcoin-4.6.0-i686-pc-linux-gnu.tar.gz
d8bf8c19fd3bd15f7040c6ac018d39ea8cf05567d5b4f3ef4bbe8bfd7fdc5108  navcoin-4.6.0-osx-unsigned.dmg
d89ad4c4016834ed7ccd43cfb3a51713d5a8eab8c7f563bda3ab7593d109dd53  navcoin-4.6.0-osx-unsigned.tar.gz
6404cc63c8d9b4c9f3b67c04f3ad68a590518fb28b1db50933a78c298c322d4d  navcoin-4.6.0-osx64.tar.gz
4bf7b84019a6a5b7bb0e08c1df76ce37101850ad62dac18ab8505785fdd93900  navcoin-4.6.0-win32-setup-unsigned.exe
2bfeaca0a9a1a9beca2fa5dff09f551b28b9d80caae5fb2fb4edd0e1bfa3ce30  navcoin-4.6.0-win32.zip
e112692aa62e48180d738ccd80a2c00b9d87afd3d445c1d2f08f0e14c35b7f5a  navcoin-4.6.0-win64-setup-unsigned.exe
a1bc0ab3cfba76bc2e3f9016b8d02fd46a9073b6a0a8d788cde2f8def6bbbc3b  navcoin-4.6.0-win64.zip
178ec34849ed4349ee998a7d0a0d2b321d2a215c0b17a0a67b164bb7dfe34f7b  navcoin-4.6.0-x86_64-linux-gnu.tar.gz
5e44a45c8791355ae3b79e0b1a40d0655908f051d52a74a98ed5527f986cc27a  navcoin-4.6.0.tar.gz

Everything matches except osx

@mxaddict

This comment has been minimized.

Copy link
Contributor Author

commented May 15, 2019

Hashes of my builds:

a2f931814d31c392d978f8b145d0e7c10a04fff826a8ee0528bb252a64c7fcbf navcoin-4.6.0-aarch64-linux-gnu.tar.gz 529345176af82959a39aa1ccd93589edb1843025c17d00e961c9c1f01a6ba26e navcoin-4.6.0-arm-linux-gnueabihf.tar.gz a9371072b2a1931e191a8d26505b4e95e20e2b0d3984ed633b70e891346b435b navcoin-4.6.0-i686-pc-linux-gnu.tar.gz d8bf8c19fd3bd15f7040c6ac018d39ea8cf05567d5b4f3ef4bbe8bfd7fdc5108 navcoin-4.6.0-osx-unsigned.dmg d89ad4c4016834ed7ccd43cfb3a51713d5a8eab8c7f563bda3ab7593d109dd53 navcoin-4.6.0-osx-unsigned.tar.gz 6404cc63c8d9b4c9f3b67c04f3ad68a590518fb28b1db50933a78c298c322d4d navcoin-4.6.0-osx64.tar.gz 4bf7b84019a6a5b7bb0e08c1df76ce37101850ad62dac18ab8505785fdd93900 navcoin-4.6.0-win32-setup-unsigned.exe 2bfeaca0a9a1a9beca2fa5dff09f551b28b9d80caae5fb2fb4edd0e1bfa3ce30 navcoin-4.6.0-win32.zip e112692aa62e48180d738ccd80a2c00b9d87afd3d445c1d2f08f0e14c35b7f5a navcoin-4.6.0-win64-setup-unsigned.exe a1bc0ab3cfba76bc2e3f9016b8d02fd46a9073b6a0a8d788cde2f8def6bbbc3b navcoin-4.6.0-win64.zip 178ec34849ed4349ee998a7d0a0d2b321d2a215c0b17a0a67b164bb7dfe34f7b navcoin-4.6.0-x86_64-linux-gnu.tar.gz 5e44a45c8791355ae3b79e0b1a40d0655908f051d52a74a98ed5527f986cc27a navcoin-4.6.0.tar.gz

Everything matches but osx

Hmmm, what SDK did you use for the OSX build?

@mxaddict

This comment has been minimized.

Copy link
Contributor Author

commented May 15, 2019

This is the SDK that I used:

curl --location --fail https://bitcoincore.org/depends-sources/sdks/MacOSX10.11.sdk.tar.gz -o inputs/MacOSX10.11.sdk.tar.gz
@aguycalled

This comment has been minimized.

Copy link
Member

commented May 15, 2019

bc1cf275e3cc675e820aecb72f98f587257d59fcf27f8dfafd4a176430594be9  MacOSX10.11.sdk.tar.gz
@mxaddict

This comment has been minimized.

Copy link
Contributor Author

commented May 15, 2019

bec9d089ebf2e2dd59b1a811a38ec78ebd5da18cbbcd6ab39d1e59f64ac5033f  ../gitian-builder/inputs/MacOSX10.11.sdk.tar.gz
@aguycalled

This comment has been minimized.

Copy link
Member

commented May 15, 2019

will get it from bitcoincore and relaunch mac build

@mxaddict

This comment has been minimized.

Copy link
Contributor Author

commented May 15, 2019

will get it from bitcoincore and relaunch mac build

ACK

@aguycalled

This comment has been minimized.

Copy link
Member

commented May 15, 2019

a55c619308766030a846a37c116d96886d674da84cc790f4a5ac9b8110499bac  navcoin-4.6.0-osx-unsigned.dmg
ca1a50867b15e0e71b483f3402dbfe447e0f3b91c8f79790a58b3280c75e2021  navcoin-4.6.0-osx-unsigned.tar.gz
033c8e83159f6eaf638b59be3e8b1b4fc792fbf0b5f0cb8bab00a2c5a634f1ac  navcoin-4.6.0-osx64.tar.gz

bingo

@aguycalled

This comment has been minimized.

Copy link
Member

commented May 15, 2019

tested correctly executed in enviroment without libcurl

@aguycalled

This comment has been minimized.

Copy link
Member

commented May 15, 2019

tested locally in debian

# All windows code is PIC, forcing it on just adds useless compile warnings
AX_CHECK_COMPILE_FLAG([-fPIC],[PIC_FLAGS="-fPIC"])
fi

This comment has been minimized.

Copy link
@aguycalled

aguycalled May 15, 2019

Member

why is this removed?

This comment has been minimized.

Copy link
@mxaddict

mxaddict May 15, 2019

Author Contributor

May have been an oversight on my part when merging upstream changes.

I'll re-add it.

This comment has been minimized.

Copy link
@aguycalled

aguycalled May 15, 2019

Member

i remember seeing this alert when building the gui in some systems, but maybe it's not necessary anymore with the new qt version

This comment has been minimized.

Copy link
@mxaddict

mxaddict May 15, 2019

Author Contributor

NVM, it was not removed, it was MOVED :D

This comment has been minimized.

Copy link
@mxaddict

mxaddict May 15, 2019

Author Contributor

This was removed:

AX_CHECK_COMPILE_FLAG([-fPIC],[CFLAGS="-fPIC"])

And

AX_CHECK_COMPILE_FLAG([-fPIC],[PIC_FLAGS="-fPIC"])

Was put in it's place.

@mxaddict mxaddict requested a review from matt-auckland May 15, 2019

@mxaddict

This comment has been minimized.

Copy link
Contributor Author

commented May 15, 2019

tested correctly executed in enviroment without libcurl

Were you able to also test the original issue for this PR?

Sorting of the inputs on coin control dialog 👍

@aguycalled

This comment has been minimized.

Copy link
Member

commented May 15, 2019

yes, the issue is fixed for me

@proletesseract

This comment has been minimized.

Copy link
Member

commented May 22, 2019

compiling on linux now. do you want me to run a full gititan build and compare hashes?

@mxaddict

This comment has been minimized.

Copy link
Contributor Author

commented May 22, 2019

compiling on linux now. do you want me to run a full gititan build and compare hashes?

Yes please, that is one of the fixes, all build hashes should match 👍

@proletesseract

This comment has been minimized.

Copy link
Member

commented May 24, 2019

my linux build finished and the hashes match

@proletesseract

This comment has been minimized.

Copy link
Member

commented May 27, 2019

Linux hashes

600fffa7e6072b4062c404ba54aa68ba002717ee5dce26bbbca95e6428281439  build/out/navcoin-4.6.0-aarch64-linux-gnu-debug.tar.gz
a2f931814d31c392d978f8b145d0e7c10a04fff826a8ee0528bb252a64c7fcbf  build/out/navcoin-4.6.0-aarch64-linux-gnu.tar.gz
25a7dc2fea99fc8b605a2cc694d73bda367589c6436c2542956ac9e423460b5c  build/out/navcoin-4.6.0-arm-linux-gnueabihf-debug.tar.gz
529345176af82959a39aa1ccd93589edb1843025c17d00e961c9c1f01a6ba26e  build/out/navcoin-4.6.0-arm-linux-gnueabihf.tar.gz
778e92dd93cf725178a50c42be2be290ea83a2f14f44b69d791528c9e2c1a4c0  build/out/navcoin-4.6.0-i686-pc-linux-gnu-debug.tar.gz
a9371072b2a1931e191a8d26505b4e95e20e2b0d3984ed633b70e891346b435b  build/out/navcoin-4.6.0-i686-pc-linux-gnu.tar.gz
ee9581e9fbae17a2c876816a3494df67e530ed59b8c948a51df08de281ee0ede  build/out/navcoin-4.6.0-x86_64-linux-gnu-debug.tar.gz
178ec34849ed4349ee998a7d0a0d2b321d2a215c0b17a0a67b164bb7dfe34f7b  build/out/navcoin-4.6.0-x86_64-linux-gnu.tar.gz

OSX hashes

a55c619308766030a846a37c116d96886d674da84cc790f4a5ac9b8110499bac  build/out/navcoin-4.6.0-osx-unsigned.dmg
ca1a50867b15e0e71b483f3402dbfe447e0f3b91c8f79790a58b3280c75e2021  build/out/navcoin-4.6.0-osx-unsigned.tar.gz
033c8e83159f6eaf638b59be3e8b1b4fc792fbf0b5f0cb8bab00a2c5a634f1ac  build/out/navcoin-4.6.0-osx64.tar.gz

Windows hashes

b1dd88cdd8bf09af2539d0b345e647129d8fd55c92b6d824b6ecc53efd531028  build/out/navcoin-4.6.0-win.tar.gz
11f3e4170f104c2ffc78e08603a03df7a9be22fe72431932e4063d42412d230b  build/out/navcoin-4.6.0-win32-debug.zip
4bf7b84019a6a5b7bb0e08c1df76ce37101850ad62dac18ab8505785fdd93900  build/out/navcoin-4.6.0-win32-setup-unsigned.exe
2bfeaca0a9a1a9beca2fa5dff09f551b28b9d80caae5fb2fb4edd0e1bfa3ce30  build/out/navcoin-4.6.0-win32.zip
df559db6d69bb4b01a69bd8dd981bbac947dee781087e0f567772feb8f54227f  build/out/navcoin-4.6.0-win64-debug.zip
e112692aa62e48180d738ccd80a2c00b9d87afd3d445c1d2f08f0e14c35b7f5a  build/out/navcoin-4.6.0-win64-setup-unsigned.exe
a1bc0ab3cfba76bc2e3f9016b8d02fd46a9073b6a0a8d788cde2f8def6bbbc3b  build/out/navcoin-4.6.0-win64.zip

All matching

@proletesseract proletesseract merged commit a4c8eb6 into navcoin:master May 27, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.