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.

Sign up for GitHub

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

Jump to bottom

[openscap] update to 1.3.7 #31917

Merged
merged 25 commits into from
Jun 14, 2023
Merged

[openscap] update to 1.3.7 #31917

merged 25 commits into from
Jun 14, 2023

Conversation

jiayuehua
Copy link
Contributor

@jiayuehua jiayuehua commented Jun 10, 2023 •
edited
Loading

Fixes #27328
coauthored by @JonLiu1993

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@jiayuehua jiayuehua marked this pull request as ready for review June 10, 2023 07:14
@Adela0814 Adela0814 added the category:port-update The issue is with a library, which is requesting update new revision label Jun 12, 2023
Adela0814
Adela0814 suggested changes Jun 12, 2023
View reviewed changes
ports/openscap/vcpkg.json Outdated
@@ -1,7 +1,6 @@
{
"name": "openscap",
"version": "1.3.1",
"port-version": 4,
"version": "1.3.6",
Copy link
Contributor

Choose a reason for hiding this comment

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

The latest version is 1.3.7, please update to 1.3.7. Thanks.

ports/openscap/portfile.cmake Outdated
@@ -1,11 +1,12 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO OpenSCAP/openscap
REF 3a4c635691380fa990a226acc8558db35d7ebabc #1.3.1
SHA512 12681d43b2ce067c5a5c4eb47e14d91d6e9362b1f98f1d35b05d79ad84c7ee8c29f438eaae8e8465033155e500bb0f936eb79af46fab15e4a07e03c6be8b655d
REF 3eccd5c064b9b152fe14a95b3534c60e003be17f #1.3.6
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
REF 3eccd5c064b9b152fe14a95b3534c60e003be17f #1.3.6
REF $VERSION

ports/openscap/portfile.cmake Outdated
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

@Adela0814
Copy link
Contributor

Note: I will be converting your PR to draft status. When you respond, please revert to "ready for review". That way, I can be aware that you've responded since you can't modify the tags.

@Adela0814 Adela0814 marked this pull request as draft June 12, 2023 06:08
@jiayuehua jiayuehua changed the title [openscap] update to 1.3.6 [openscap] update to 1.3.7 Jun 12, 2023
@jiayuehua jiayuehua marked this pull request as ready for review June 12, 2023 12:15
@jiayuehua
Copy link
Contributor Author

@Adela0814 I have summit my change.

@Adela0814 Adela0814 added the requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function label Jun 13, 2023
@Adela0814
Copy link
Contributor

@jiayuehua I encountered an error while testing the feature.
Repro step: .\vcpkg.exe install openscap[*]:x64-windows

Error message:

E:\4\vcpkg\buildtrees\openscap\src\1.3.7-278c0d1b45.clean\src\OVAL\probes\crapi\digest.c(30): fatal error C1083: Cannot open include file: 'unistd.h': No such file or directory
E:\4\vcpkg\buildtrees\openscap\src\1.3.7-278c0d1b45.clean\src\OVAL\probes\crapi\md5.c(30): fatal error C1083: Cannot open include file: 'sys/mman.h': No such file or directory

install-x64-windows-dbg-out.log

@Adela0814 Adela0814 marked this pull request as draft June 13, 2023 09:37
@jiayuehua jiayuehua marked this pull request as ready for review June 13, 2023 11:13
@jiayuehua
Copy link
Contributor Author

jiayuehua commented Jun 13, 2023 •
edited
Loading

should be ok now @Adela0814

@Adela0814 Adela0814 added info:reviewed Pull Request changes follow basic guidelines and removed requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function labels Jun 14, 2023
@Adela0814
Copy link
Contributor

Tested all feature on the following triplets:

  • x64-windows
  • x64-windows-static
  • x86-windows

@vicroms vicroms merged commit 27d2b9a into microsoft:master Jun 14, 2023
@JonLiu1993 JonLiu1993 mentioned this pull request Jun 14, 2023
Closed
dg0yt
dg0yt reviewed Jun 14, 2023
View reviewed changes
ports/openscap/vcpkg.json
Comment on lines -34 to -40
"util": {
"description": "build available utils",
"dependencies": [
{
"name": "getopt-win32",
"platform": "windows"
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Why did the PR remove the util feature? It may break users of the port.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the util install cmake have some problem. I will try to fix it today.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

#31982

ports/openscap/vcpkg.json
@@ -1,7 +1,6 @@
{
"name": "openscap",
"version": "1.3.1",
"port-version": 4,
"version": "1.3.7",
"description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.",
Copy link
Contributor

Choose a reason for hiding this comment

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

And the port is even described as "command line tool".

@jiayuehua jiayuehua deleted the openscap branch June 14, 2023 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dg0yt dg0yt dg0yt left review comments

@Adela0814 Adela0814 Adela0814 approved these changes

Assignees

@JonLiu1993 JonLiu1993

@Adela0814 Adela0814

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[openscap] update to 1.3.6
5 participants
@jiayuehua @Adela0814 @dg0yt @vicroms @JonLiu1993