Skip to content

Remove problem pr1224#1226

Merged
hans-schmidt merged 8 commits intoRavenProject:masterfrom
hans-schmidt:remove_problem_pr1224
Mar 12, 2023
Merged

Remove problem pr1224#1226
hans-schmidt merged 8 commits intoRavenProject:masterfrom
hans-schmidt:remove_problem_pr1224

Conversation

@hans-schmidt
Copy link
Contributor

@hans-schmidt hans-schmidt commented Jan 5, 2023 •
edited
Loading

This fully reverts PR-1224
+
Then it only updates the URL for qt-5.12.11

see also PR #1225

@hans-schmidt
Copy link
Contributor Author

hans-schmidt commented Jan 5, 2023 •
edited
Loading

After PR-1224 is fully reverted from the master branch, fixing the build is simply a matter of updating the URL for qt-5.12.11. That's all this PR does.

There is NO NEED to:
-downgrade libzmq 4.3.4 to 4.3.1 (v4.3.1 has a heap overflow vulnerability)
-disable libravenconsensus from being built
-make ANY changes at all to source code

@hans-schmidt hans-schmidt mentioned this pull request Jan 5, 2023
Open
HyperPeek
HyperPeek approved these changes Jan 5, 2023
View reviewed changes
Copy link
Contributor

@HyperPeek HyperPeek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clean fix without code change to master, approved.

@TronBlack TronBlack self-requested a review March 10, 2023 22:09
@TronBlack TronBlack self-assigned this Mar 10, 2023
TronBlack
TronBlack approved these changes Mar 10, 2023
View reviewed changes
Copy link
Collaborator

@TronBlack TronBlack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@TronBlack
Copy link
Collaborator

TronBlack commented Mar 10, 2023

Should this have a new minor version number considering the changes are being made to master?

@hans-schmidt
Copy link
Contributor Author

hans-schmidt commented Mar 11, 2023

This PR requests commit to master branch only to undo PR #1224 which was made to master branch. In the past, we always committed to develop branch and tested there before merging to master.

It does also update a build system url to fix a build problem for people who want to build from master. If/when new distribution binaries are posted, we should increment the version number.

Note that PR #1225 is still needed to make the same corrections to develop branch.

@hans-schmidt hans-schmidt merged commit e48d932 into RavenProject:master Mar 12, 2023
michaelmcshinsky pushed a commit to michaelmcshinsky/Ravencoin that referenced this pull request Oct 27, 2023
@hans-schmidt @michaelmcshinsky
Remove problem pr1224 (RavenProject#1226)
87b9832 
* Revert "port veil changes using std::mutex instead of c-style pthread"

This reverts commit 4c605b6.

* Revert "force posix"

This reverts commit eb7a25a.

* Revert "add trial workflow for x86_64-w64-mingw32"

This reverts commit 9433d3d.

* Revert "patch qt with bitcoin pr#22186"

This reverts commit 9aa1b3e.

* Revert "revert libzmq 4.3.4 -> 4.3.1 (introduced on c8197cd)"

This reverts commit d2e39c0.

* Revert "update path with working url for qt"

This reverts commit dbb4b9f.

* Revert "patch boost for ifdef pthread"

This reverts commit f760f3a.

* Update URL for qt-5.12.11
michaelmcshinsky pushed a commit to michaelmcshinsky/Ravencoin that referenced this pull request Oct 27, 2023
@hans-schmidt @michaelmcshinsky
Remove problem pr1224 (RavenProject#1226)
92dd436 
* Revert "port veil changes using std::mutex instead of c-style pthread"

This reverts commit 4c605b6.

* Revert "force posix"

This reverts commit eb7a25a.

* Revert "add trial workflow for x86_64-w64-mingw32"

This reverts commit 9433d3d.

* Revert "patch qt with bitcoin pr#22186"

This reverts commit 9aa1b3e.

* Revert "revert libzmq 4.3.4 -> 4.3.1 (introduced on c8197cd)"

This reverts commit d2e39c0.

* Revert "update path with working url for qt"

This reverts commit dbb4b9f.

* Revert "patch boost for ifdef pthread"

This reverts commit f760f3a.

* Update URL for qt-5.12.11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TronBlack TronBlack TronBlack approved these changes

@HyperPeek HyperPeek HyperPeek approved these changes

Assignees

@TronBlack TronBlack

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@hans-schmidt @TronBlack @HyperPeek