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

[libressl] Fix GitHub download URL #42218

Merged
merged 2 commits into from
Nov 19, 2024
Merged

[libressl] Fix GitHub download URL #42218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
411927e
[libressl] Fix GitHub download URL
donny-dont Nov 18, 2024
8681bad
[libressl] Fix GitHub download URL
donny-dont Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions ports/libressl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,16 @@ endif()
vcpkg_download_distfile(
LIBRESSL_SOURCE_ARCHIVE
URLS "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${VERSION}.tar.gz"
"https://github.com/libressl/portable/releases/download/v{VERSION}/${PORT}-${VERSION}.tar.gz"
"https://github.com/libressl/portable/releases/download/v${VERSION}/${PORT}-${VERSION}.tar.gz"
FILENAME "${PORT}-${VERSION}.tar.gz"
SHA512 b5ec6d1f4e3842ecb487f9a67d86db658d05cbe8cd3fcba61172affa8c65c5d0823aa244065a7233f06c669d04a5a36517c02a2d99d2f2da3c4df729ac243b37
)

vcpkg_download_distfile(WARNINGS_REMOVAL_PATCH
Copy link
Member

Choose a reason for hiding this comment

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

Can you explain why you removed this patch?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounded like @dg0yt wanted it removed but it was merged before I got to it.

see #42145 (review)

Copy link
Member

Choose a reason for hiding this comment

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

The patch isn't to fix some warning that fails under /WX?

If the warning just ends up in logs that nobody cares about, then sure, it has no real reason to be here, but I'm assuming if it went to a long forlorn and forgotten text file that someone wouldn't have taken the effort to backport it.

Copy link
Contributor Author

@donny-dont donny-dont Nov 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Nope /WX is not present.

I’ve been running a vcpkg registry since 2018 at https://github.com/WebKitForWindows/WebKitRequirements for the Windows WebKit port. We’re getting outside contributors including your cohorts at https://playwright.dev/ . So I’m trying to migrate to the canonical registry.

Picked up the libressl port and tried to land the patches that were present here upstream. Was trying to be neighborly by doing that. Maybe in the past it was required 🤷 but it’s not anymore. And the patch will be present in the next release.

Can keep the patch or drop it. Don’t have a strong opinion

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe I didn't pay enough attention...
There might be users which bring custom toolchains that apply /WX.
So patches to resolve issues with /WX are useful.

Copy link
Member

Choose a reason for hiding this comment

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

Nah, we normally patch out /WX things, and we normally don't expect ports to be warning clean on all platforms, because port consumers generally can't do anything about the results.

If the patch is not needed for the port to build successfully and only affects logs, I agree with @dg0yt's original comment

URLS https://github.com/libressl/portable/commit/1996dbc07d129cf2b1d32be384a131b9e6fa5373.diff?full_index=1
FILENAME Disable-additional-MSVC-warnings.patch
SHA512 8e32bd2b14c84a9e7106d5bc0ffc9f6bea712db2087c7b944e9b41a3a6cca0b09adcee2cff9bfd136060d539a34f7dc7d9283ec1c058028cc15410475790f4b6
)

vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${LIBRESSL_SOURCE_ARCHIVE}"
PATCHES
pkgconfig.diff
${WARNINGS_REMOVAL_PATCH}
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
1 change: 1 addition & 0 deletions ports/libressl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "libressl",
"version": "4.0.0",
"port-version": 1,
"description": [
"LibreSSL is a TLS/crypto stack.",
"It was forked from OpenSSL in 2014 by the OpenBSD project, with goals of modernizing the codebase, improving security, and applying best practice development processes.",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5046,7 +5046,7 @@
},
"libressl": {
"baseline": "4.0.0",
"port-version": 0
"port-version": 1
},
"librsvg": {
"baseline": "2.40.20",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libressl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "becbc2d569c392b3f2d60027db3797b51839c53a",
"version": "4.0.0",
"port-version": 1
},
{
"git-tree": "b734f8a265b1b45c5cbf6ebedf32e8aca340807f",
"version": "4.0.0",
Expand Down