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

[libpcap] update to 1.10.4 #34622

Merged
merged 4 commits into from
Oct 20, 2023
Merged

[libpcap] update to 1.10.4 #34622

merged 4 commits into from
Oct 20, 2023

Conversation

jiayuehua
Copy link
Contributor

  • 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.

@MonicaLiu0311 MonicaLiu0311 added the category:port-update The issue is with a library, which is requesting update new revision label Oct 20, 2023
@Cheney-W
Copy link
Contributor

The patch here does not need to be modified.

@jiayuehua
Copy link
Contributor Author

If not modified, when install new version libpcap, vcpkg report error:
-- Applying patch install-pc-on-msvc.patch
CMake Error at scripts/cmake/z_vcpkg_apply_patches.cmake:34 (message):
Applying patch failed: Checking patch CMakeLists.txt...

Hunk #1 succeeded at 3238 (offset 560 lines).

error: while searching for:

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig)?

?

  #?
  # Man pages.?

error: patch failed: CMakeLists.txt:2715

error: CMakeLists.txt: patch does not apply

@Cheney-W
Copy link
Contributor

Yes, you are right. I could reproduce this error in a new vcpkg folder. (I previously tested on an old vcpkg folder and did not encounter this error.)
However, please do not modify the line break at the end of the line. This patch was previously used in CRLF, please keep it as is to reduce the amount of modification.

@Cheney-W Cheney-W marked this pull request as draft October 20, 2023 09:08
@jiayuehua jiayuehua marked this pull request as ready for review October 20, 2023 09:19
@Cheney-W Cheney-W added the info:reviewed Pull Request changes follow basic guidelines label Oct 20, 2023
@Cheney-W
Copy link
Contributor

Thanks for your PR!

@jiayuehua
Copy link
Contributor Author

you are welcome.

@JavierMatosD JavierMatosD merged commit d07d3f7 into microsoft:master Oct 20, 2023
15 checks passed
@jiayuehua jiayuehua deleted the libpcap branch October 20, 2023 18:41
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.

4 participants