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

[wolfSSL] update version to v5.4.0 AND [wolfTPM] update version to v2.5.0 AND [wolfMQTT] update version to v1.14.0 #25936

Merged
merged 2 commits into from
Jul 30, 2022

Conversation

dgarske
Copy link
Contributor

@dgarske dgarske commented Jul 22, 2022

  • What does your PR fix?

Updated to stable wolfSSL v5.4.0
Updated to stable wolfTPM v2.5.0
Updated to stable wolfMQTT v1.14.0
Fixes #25858

  • Which triplets are supported/not supported? Have you updated the CI baseline?

all

yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

yes

@ghost
Copy link

ghost commented Jul 22, 2022

CLA assistant check
All CLA requirements met.

@dgarske
Copy link
Contributor Author

dgarske commented Jul 22, 2022

FYI: @JacobBarthelmeh and @embhorn

@FrankXie05 FrankXie05 added the category:port-update The issue is with a library, which is requesting update new revision label Jul 25, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for wolftpm have changed but the version was not updated
version: 2.5.0
old SHA: d7b76cdee52715ded9066374432428528d3b22e2
new SHA: b18c17a1a5166e5e6d6e3f54babfc480dc87b3f0
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for wolfmqtt have changed but the version was not updated
version: 1.13.0
old SHA: bc6b26e4254f8938dc9db7f7b5dc84958a45c877
new SHA: 6b333d32f75662bfc3d331a9148cf47c5bfccd38
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for wolfssl have changed but the version was not updated
version: 5.4.0
old SHA: 57aac1c50b45275c7a99eca32ad985998b292dc8
new SHA: 53de158d1ee1ef8f107ba8183b3ad25fc3dd90c2
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

@FrankXie05
Copy link
Contributor

@dgarske Please bump the port version. See documentation.
Also please run command vcpkg x-add-version --all then commit the changes.

@FrankXie05 FrankXie05 changed the title wolfSSL release updates for wolfTPM v2.5.0 and wolfSSL v5.4.0 [wolfSSL] update version to v5.4.0 AND [wolfTPM] update version to v2.5.0 Jul 25, 2022
@dgarske dgarske force-pushed the wolfssl_20220722 branch 5 times, most recently from afb0afc to 7744a20 Compare July 25, 2022 21:36
@dgarske dgarske marked this pull request as ready for review July 25, 2022 21:48
@dgarske dgarske changed the title [wolfSSL] update version to v5.4.0 AND [wolfTPM] update version to v2.5.0 [wolfSSL] update version to v5.4.0 AND [wolfTPM] update version to v2.5.0 AND [wolfMQTT] update version to v1.14.0 Jul 25, 2022
github-actions[bot]
github-actions bot previously approved these changes Jul 26, 2022
@dgarske
Copy link
Contributor Author

dgarske commented Jul 26, 2022

The failures are due to a wolfSSL CMake bug with v5.4.0 where our SP math all is enabled by default, yet the wolfssl/wolfcrypt/sp_int.h is not being installed. Patch here: wolfSSL/wolfssl#5401
I'll be updating with a post release patch for wolfSSL.

@dgarske
Copy link
Contributor Author

dgarske commented Jul 26, 2022

Hi @FrankXie05 , having trouble reproducing the latest errors. I have only tried on Mac OS X and Ubuntu 20. Any tips?

./vcpkg remove wolfssl wolfmqtt wolftpm
./vcpkg install wolfssl wolfmqtt wolftpm
./vcpkg x-add-version --all

@FrankXie05
Copy link
Contributor

FrankXie05 commented Jul 27, 2022

@dgarske
Log from install-x86-windows-dbg-out.log of wolfmqtt

D:\installed\x86-windows\include\wolfssl/wolfcrypt/integer.h(37): fatal error C1083: Cannot open include file: 'wolfssl/wolfcrypt/sp_int.h': No such file or directory
ninja: build stopped: subcommand failed.

Regarding this issue, I see that you have fixed it upstream, but the current commit doesn't merge your content, we need a patch until the next release.

Log from install-x64-windows-dbg-out.log of wolftpm

D:\buildtrees\wolftpm\src\v2.5.0-942afdea65.clean\wolftpm/options.h(60): fatal error C1070: mismatched #if/#endif pair in file 'D:\buildtrees\wolftpm\src\v2.5.0-942afdea65.clean\wolftpm\options.h'
ninja: build stopped: subcommand failed.

The problem is that the file options.h does not have permission to read and write content(https://github.com/wolfSSL/wolfTPM/blob/d7b76cdee52715ded9066374432428528d3b22e2/CMakeLists.txt#L201), resulting in #if not matching #endif.

CMake Error at CMakeLists.txt:211 (file):
  file failed to open for writing (Permission denied):

    D:/buildtrees/wolftpm/src/v2.5.0-942afdea65.clean/wolftpm/options.h

config-x86-windows-out (3).log
install-x64-windows-dbg-out.log
install-x86-windows-dbg-out (1).log

github-actions[bot]
github-actions bot previously approved these changes Jul 27, 2022
@dgarske dgarske force-pushed the wolfssl_20220722 branch from 34bea0d to d08c13b Compare July 27, 2022 18:42
@dgarske
Copy link
Contributor Author

dgarske commented Jul 27, 2022

@FrankXie05 this is good to go now. Thanks for your help.

ports/wolfmqtt/portfile.cmake Show resolved Hide resolved
ports/wolfssl/portfile.cmake Show resolved Hide resolved
ports/wolftpm/portfile.cmake Show resolved Hide resolved
@FrankXie05 FrankXie05 added the info:reviewed Pull Request changes follow basic guidelines label Jul 29, 2022
@ras0219-msft ras0219-msft merged commit 66045de into microsoft:master Jul 30, 2022
@ras0219-msft
Copy link
Contributor

Looks great, thanks for the contribution!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[wolfSSL] update to 5.4.0
4 participants