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

[winpcap] Avoid downloading unstable license #23138

Merged
merged 1 commit into from
Feb 16, 2022
Merged

[winpcap] Avoid downloading unstable license #23138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 7 deletions ports/winpcap/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ vcpkg_download_distfile(ARCHIVE
SHA512 89a5109ed17f8069f7a43497f6fec817c58620dbc5fa506e52069b9113c5bc13f69c307affe611281cb727cfa0f8529d07044d41427e350b24468ccc89a87f33
)

vcpkg_download_distfile(COPYRIGHT
URLS "https://www.winpcap.org/misc/copyright.htm"
FILENAME "Wpcap_license.htm"
SHA512 bb2519e8f3d02c408fa3f2ef339adda1cc31338d05d2fa4ce25d5369427243fd3e2abc4b21aa654b2be5791f53c2281847a4a15778ffcb90576fd166140c7d2e
)

# MSBuild performs in-source builds, so to ensure reliability we must clear them each time
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src)

Expand Down Expand Up @@ -174,4 +168,5 @@ endif()

vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pcap-stdinc.h" "#define inline __inline" "#ifndef __cplusplus\n#define inline __inline\n#endif")

configure_file(${COPYRIGHT} "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files.
")
2 changes: 1 addition & 1 deletion ports/winpcap/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "winpcap",
"version": "4.1.3",
"port-version": 7,
"port-version": 8,
"description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.",
"homepage": "https://www.winpcap.org",
"supports": "windows"
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 @@ -7322,7 +7322,7 @@
},
"winpcap": {
"baseline": "4.1.3",
"port-version": 7
"port-version": 8
},
"winpty": {
"baseline": "0.4.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/w-/winpcap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "85d70a721afa26cf8ff26aec62fd04a16f8e6f7b",
"version": "4.1.3",
"port-version": 8
},
{
"git-tree": "8b3f6f5a5e85be5df29d86d4e8e1621a9f3369f4",
"version": "4.1.3",
Expand Down