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

[urho3d, xcb-util-wm] Hash fixes #29383

Merged
merged 5 commits into from
Feb 3, 2023
Merged

Conversation

BillyONeal
Copy link
Member

@BillyONeal BillyONeal commented Feb 2, 2023

All these problems were detected in https://dev.azure.com/vcpkg/public/_build/results?buildId=84431 because the SAS token to our asset cache expired 😳

[Urho3D] Fix download hash.

The change appears to be changing some of the cases of filenames from uppercase to lowercase; possibly in response to one of the CVEs in Git when applied to case-insensitive filesystems.

[xcb-util-wm] Correct the download hash.

That SHA512 is for 24eb17df2e1245885e72c9d4bbb0a0f69f0700f2, which was 0.4.1, not 0c6681e465c9cc7b1fbb60778ba1eaa61ab01a14 which is 0.4.2.

This was probably just done wrong originally in #27240

Detected in https://dev.azure.com/vcpkg/public/_build/results?buildId=84431

The change appears to be changing some of the cases of filenames from uppercase to lowercase; possibly in response to one of the CVEs in Git when applied to case-insensitive filesystems.
That SHA512 is for 24eb17df2e1245885e72c9d4bbb0a0f69f0700f2, which was 0.4.1, not 0c6681e465c9cc7b1fbb60778ba1eaa61ab01a14 which is 0.4.2.

This was probably just done wrong originally in microsoft#27240
github-actions[bot]
github-actions bot previously approved these changes Feb 2, 2023
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.

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/stx/portfile.cmake

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/stx/vcpkg.json
  • ports/urho3d/vcpkg.json

Valid values for the license field can be found in the documentation

@Cheney-W Cheney-W added category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. labels Feb 2, 2023
@lamarrr
Copy link
Contributor

lamarrr commented Feb 2, 2023

I see the patch failed. I suppose it’s quite different.
Please give me some time to submit a patch for v0.0.2 instead.

@JonLiu1993
Copy link
Member

It looks like the patch application for the stx port failed:

CMake Error at scripts/cmake/z_vcpkg_apply_patches.cmake:34 (message):
  Applying patch failed: Checking patch CMakeLists.txt...

  error: while searching for:

  # ===============================================?

  ?

  if(STX_ENABLE_BACKTRACE)?

    if(NOT EXISTS third_party/abseil)?
      execute_process(?
        COMMAND git submodule update --init --recursive third_party/abseil?
        WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})?
    endif()?
    add_subdirectory(third_party/abseil)?

  endif()?

  ?

  # the atomics library doesn't automatically link on my Android phone?

  

  error: patch failed: CMakeLists.txt:204

  error: CMakeLists.txt: patch does not apply

Call Stack (most recent call first):
  scripts/cmake/vcpkg_extract_source_archive.cmake:153 (z_vcpkg_apply_patches)
  scripts/cmake/vcpkg_extract_source_archive_ex.cmake:8 (vcpkg_extract_source_archive)
  scripts/cmake/vcpkg_from_github.cmake:113 (vcpkg_extract_source_archive_ex)
  ports/stx/portfile.cmake:3 (vcpkg_from_github)
  scripts/ports.cmake:147 (include)

@lamarrr lamarrr mentioned this pull request Feb 2, 2023
@lamarrr
Copy link
Contributor

lamarrr commented Feb 2, 2023

I've updated the port #29392

@JonLiu1993 JonLiu1993 added depends:different-pr This PR or Issue depends on a PR which has been filed and removed depends:different-pr This PR or Issue depends on a PR which has been filed labels Feb 3, 2023
@JonLiu1993
Copy link
Member

JonLiu1993 commented Feb 3, 2023

I've updated the port #29392

@lamarrr, Thanks for your contribution. This PR #29383 has already updated stx, we don’t need to submit an additional PR to update this port, I will merge your PR changes into Billy’s PR, thanks again.

@BillyONeal BillyONeal changed the title [urho3d, stx, xcb-util-wm] Hash fixes [urho3d, xcb-util-wm] Hash fixes Feb 3, 2023
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.

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/urho3d/vcpkg.json

Valid values for the license field can be found in the documentation

@BillyONeal
Copy link
Member Author

@lamarrr, Thanks for your contribution. This PR #29383 has already updated stx, we don’t need to submit an additional PR to update this port, I will merge your PR changes into Billy’s PR, thanks again.

I reverted my changes since they did not work in this PR.

@BillyONeal BillyONeal merged commit 845339c into microsoft:master Feb 3, 2023
@BillyONeal BillyONeal deleted the hash-fixes branch February 3, 2023 03:36
@Cheney-W Cheney-W added the info:reviewed Pull Request changes follow basic guidelines label Feb 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants