backport: merge bitcoin#18434, #21664, #20608, #21871, #21255, #21428, #21889, #22070, #22392, #23535, #23811, #23838, #23839, #23148, #20422, #24561, #26075, #25458, partial #22381 (guix backports: part 1) #5355

kwvg · 2023-04-28T17:52:15Z

Additional Information

Depends on ci: drop i686 builds, temporarily enable glibc backwards compatibility for most CI builds #5372
Dependency for backport: merge bitcoin#23909, #23778, #24495,#25313, #24042, #24057, #24348, #24484, #24489, #24599, #24503, #24506, #24573, #25779, #24736, #24842, #25006, #25076, #25490, #25558 (guix backports: part 2) #5408
Dash's minimum macOS version is 10.15 (Darwin 19) and the backport of scripts: add checks for minimum required OS versions bitcoin/bitcoin#21871 has been modified to reflect that appropriately.
- The deviation occurs due to an out-of-order backport of build: set OSX_MIN_VERSION to 10.15 bitcoin/bitcoin#22993 done in merge bitcoin#19817, bitcoin#20470, bitcoin#22993: macOS C++17 bump #4477, needed for C++17 support.
RUN_SECURITY_TESTS has been set to disabled on x86_64-w64-mingw32 as the version of binutils shipped with Focal lacks arguments those tests rely on (see Udjin's build from when the make check failures were fixed, link).
- This behaviour has been acknowledged in a comment in scripts: add PE .reloc section check to security-check.py bitcoin/bitcoin#18629 (see comment)
- Guix avoids this by patching binutils (see patch introduced in bitcoin#22381, backported through this PR and removed in bitcoin#23778, aimed to be backported in dash#5408)

depends/packages/qt.mk

contrib/devtools/test-symbol-check.py

github-actions · 2023-05-24T17:48:23Z

This pull request has conflicts, please rebase.

github-actions · 2023-05-31T16:09:36Z

This pull request has conflicts, please rebase.

… checks

…hem (with macOS) excludes: - d6ef354

note: focal uses glibc 2.31, which is used by gitian, so our build environment has support for a version of glibc that far exceeds our maximum supported version (2.28). this could be remedied by switching to debian buster (oldstable) which uses 2.28.

…-darwin

courtesy of bitcoin#22405

…tion on x86_64

…terpreter

UdjinM6

re-utACK

PastaPastaPasta · 2023-06-08T03:29:54Z

My hashes

f83c3e07af6f:/dash#           sha1sum guix-build-$(git rev-parse --short=12 HEAD)/distsrc-*/src/dashd{,.exe}
          sha1sum guix-build-$(git rev-parse --short=12 HEAD)/distsrc-*/src/qt/dash-qt{,.exe}
81d24910dfdcbda348af74d4d8bc53a1dc140b08  guix-build-3c8088f2e89b/distsrc-3c8088f2e89b-aarch64-linux-gnu/src/dashd
fb966fa4da492c98539e8675601f59d34a2f3f71  guix-build-3c8088f2e89b/distsrc-3c8088f2e89b-arm-linux-gnueabihf/src/dashd
96201d76032840397cbbba572f6ec49d3f6ba490  guix-build-3c8088f2e89b/distsrc-3c8088f2e89b-riscv64-linux-gnu/src/dashd
de0e2c866ab73e3db85c716d15d03e2b9bc84833  guix-build-3c8088f2e89b/distsrc-3c8088f2e89b-x86_64-apple-darwin18/src/dashd
ff78b2936fa4649a18d3890c4a186ddb6ecb040a  guix-build-3c8088f2e89b/distsrc-3c8088f2e89b-x86_64-linux-gnu/src/dashd
57ae14680bc725c1d41b654dc54dbdaa4ae79570  guix-build-3c8088f2e89b/distsrc-3c8088f2e89b-x86_64-w64-mingw32/src/dashd.exe
999503ac2fd7c4629bff3da398c4d1fc9c4cbe80  guix-build-3c8088f2e89b/distsrc-3c8088f2e89b-aarch64-linux-gnu/src/qt/dash-qt
7a584d97853195f4733a28d5cdc7506a90160a1b  guix-build-3c8088f2e89b/distsrc-3c8088f2e89b-arm-linux-gnueabihf/src/qt/dash-qt
71feb475499d359ad670feb698cb30ae35816289  guix-build-3c8088f2e89b/distsrc-3c8088f2e89b-riscv64-linux-gnu/src/qt/dash-qt
7b09b2216dedf218c846060b1a423c01cde88db5  guix-build-3c8088f2e89b/distsrc-3c8088f2e89b-x86_64-apple-darwin18/src/qt/dash-qt
14c599a228fd9826a0d3f002a3ba3ba62fc42261  guix-build-3c8088f2e89b/distsrc-3c8088f2e89b-x86_64-linux-gnu/src/qt/dash-qt
09915a9dd03bd01e39e485bcaa15f8b3f1ca0a36  guix-build-3c8088f2e89b/distsrc-3c8088f2e89b-x86_64-w64-mingw32/src/qt/dash-qt.exe

PastaPastaPasta

ACK for merging via merge commit

knst reviewed Apr 29, 2023

View reviewed changes

depends/packages/qt.mk Outdated Show resolved Hide resolved

knst reviewed Apr 29, 2023

View reviewed changes

contrib/devtools/test-symbol-check.py Show resolved Hide resolved

kwvg force-pushed the guix_p1 branch 3 times, most recently from 2e45567 to 6cce7c4 Compare May 10, 2023 12:40

kwvg force-pushed the guix_p1 branch from 6cce7c4 to 2f9a759 Compare May 10, 2023 12:53

kwvg mentioned this pull request May 10, 2023

backport: merge bitcoin#22402, #23583, #23618, #17874, #21286, #23489, #23675, #24130, #23556, #23862, #24722, #24132, #24668, #25643, #25719, partial #22469, #23677 (qt backports) #5362

Merged

kwvg force-pushed the guix_p1 branch 3 times, most recently from 50fc073 to 5a199fa Compare May 13, 2023 12:58

kwvg force-pushed the guix_p1 branch 4 times, most recently from 735a49f to 8afc161 Compare May 13, 2023 17:19

kwvg mentioned this pull request May 13, 2023

ci: drop i686 builds, temporarily enable glibc backwards compatibility for most CI builds #5372

Merged

kwvg force-pushed the guix_p1 branch 4 times, most recently from 5a7bbd8 to 16e9e1b Compare May 19, 2023 16:57

github-actions bot added the needs rebase label May 24, 2023

kwvg force-pushed the guix_p1 branch from 16e9e1b to 56c4c7d Compare May 28, 2023 09:43

github-actions bot removed the needs rebase label May 28, 2023

kwvg force-pushed the guix_p1 branch from 56c4c7d to d972313 Compare May 30, 2023 02:59

github-actions bot added the needs rebase label May 31, 2023

kwvg force-pushed the guix_p1 branch from d972313 to 286fbd7 Compare May 31, 2023 16:37

github-actions bot removed the needs rebase label May 31, 2023

kwvg and others added 22 commits June 7, 2023 14:40

fix: disable security tests on win64 CI build

0024743

fix: move test-security-check call

101cb67

merge bitcoin#21664: use LIEF for macOS and Windows symbol & security…

ef9300a

… checks

merge bitcoin#20608: add symbol check test for PE binaries

067d4a4

merge bitcoin#21871: add checks for minimum required OS versions

ef65f61

merge bitcoin#21255: run test-symbol-check for RISC-V

1be3afd

merge bitcoin#21428: Cleanup in test-{security,symbol}-check.py

d4a8d49

partial bitcoin#22381: Test security-check sanity before performing t…

24a6642

…hem (with macOS) excludes: - d6ef354

merge bitcoin#21889: check for control flow instrumentation

cdedbea

merge bitcoin#22070: don't use cf-protection when targeting arm-apple…

8dab702

…-darwin

build: run backwards compatibility symbol checks on all builds

d28ba33

courtesy of bitcoin#22405

merge bitcoin#22392: use LIEF for ELF security & symbol checks

110dbf8

merge bitcoin#23535: check for control flow instrumentation

1e9278e

merge bitcoin#23811: match on EXE_FORMATS rather than name string

bd2135f

merge bitcoin#23838: make security checks architecture independent

38c3bd0

merge bitcoin#23839: build with and test for control flow instrumenta…

e39a1de

…tion on x86_64

merge bitcoin#23148: Fix guix linker-loader path and add check_ELF_in…

f2a5b47

…terpreter

merge bitcoin#20422: mac deployment unification

7753957

merge bitcoin#24561: use LIEF 0.12.0

e91a62b

merge bitcoin#25458: parallelize LIEF build

ecb9ff8

merge bitcoin#26075: remove 32bit linux code from release scripts

3c8088f

kwvg dismissed UdjinM6’s stale review via 3c8088f June 7, 2023 09:12

kwvg force-pushed the guix_p1 branch from de235d5 to 3c8088f Compare June 7, 2023 09:12

github-actions bot removed the needs rebase label Jun 7, 2023

kwvg requested a review from UdjinM6 June 7, 2023 09:15

UdjinM6 approved these changes Jun 7, 2023

View reviewed changes

PastaPastaPasta approved these changes Jun 8, 2023

View reviewed changes

PastaPastaPasta merged commit 66dfd36 into dashpay:develop Jun 8, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

backport: merge bitcoin#18434, #21664, #20608, #21871, #21255, #21428, #21889, #22070, #22392, #23535, #23811, #23838, #23839, #23148, #20422, #24561, #26075, #25458, partial #22381 (guix backports: part 1) #5355

backport: merge bitcoin#18434, #21664, #20608, #21871, #21255, #21428, #21889, #22070, #22392, #23535, #23811, #23838, #23839, #23148, #20422, #24561, #26075, #25458, partial #22381 (guix backports: part 1) #5355

kwvg commented Apr 28, 2023 •

edited

Loading

github-actions bot commented May 24, 2023

github-actions bot commented May 31, 2023

UdjinM6 left a comment

PastaPastaPasta commented Jun 8, 2023

PastaPastaPasta left a comment

backport: merge bitcoin#18434, #21664, #20608, #21871, #21255, #21428, #21889, #22070, #22392, #23535, #23811, #23838, #23839, #23148, #20422, #24561, #26075, #25458, partial #22381 (guix backports: part 1) #5355

backport: merge bitcoin#18434, #21664, #20608, #21871, #21255, #21428, #21889, #22070, #22392, #23535, #23811, #23838, #23839, #23148, #20422, #24561, #26075, #25458, partial #22381 (guix backports: part 1) #5355

Conversation

kwvg commented Apr 28, 2023 • edited Loading

Additional Information

github-actions bot commented May 24, 2023

github-actions bot commented May 31, 2023

UdjinM6 left a comment

Choose a reason for hiding this comment

PastaPastaPasta commented Jun 8, 2023

PastaPastaPasta left a comment

Choose a reason for hiding this comment

kwvg commented Apr 28, 2023 •

edited

Loading