Update our fork from upstream

.github/ISSUE_TEMPLATE/00-report-package-build-failure.yml

@@ -35,7 +35,7 @@ body:
     id: logs
     attributes:
       label: Failure logs
-      description: The console output and all the logs metioned in the output
+      description: The console output and all the logs mentioned in the output.
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/01-request-a-new-port.yml

@@ -1,5 +1,5 @@
 name: Request a new port
-description: Request a new port/library that vcpkg should support
+description: Request a new port/library that vcpkg should support.
 title: "[New Port Request] <library name here>"
 labels: ["category:new-port", "info:good-first-issue"]
 

.github/ISSUE_TEMPLATE/03-request-a-feature-or-improvement-to-a-port.yml

@@ -1,5 +1,5 @@
 name: Request a feature or improvement to a port
-description: Suggest an improvement to one the the ports/libraries in vcpkg
+description: Suggest an improvement to one the the ports/libraries in vcpkg.
 title: "[<portname>] <short description of feature>"
 labels: ["category:port-feature"]
 body:

.github/ISSUE_TEMPLATE/04-request-a-feature-or-improvement.yml

@@ -1,5 +1,5 @@
 name: Request a feature or improvement
-description: Suggest an improvement to vcpkg
+description: Suggest an improvement to vcpkg.
 title: ''
 labels: ["category:vcpkg-feature"]
 body:

.github/ISSUE_TEMPLATE/05-other-type-of-bug-report.md

@@ -1,6 +1,6 @@
 ---
 name: Other type of bug report
-about: Let us know about an issues that does not fit into any of the other issues
+about: Let us know about an issues that does not fit into any of the other issues.
   types
 title: ''
 labels: ''

.github/pull_request_template.md

@@ -1,12 +1,12 @@
 <!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. -->
 
-<!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/ -->
+<!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. -->
 
 <!-- If this PR updates an existing port, please uncomment and fill out this checklist:
 
-- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md)
-- [ ] SHA512s are updated for each updated download
-- [ ] The "supports" clause reflects platforms that may be fixed by this new version
+- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
+- [ ] SHA512s are updated for each updated download.
+- [ ] The "supports" clause reflects platforms that may be fixed by this new version.
 - [ ] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) 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.
@@ -16,9 +16,9 @@ END OF PORT UPDATE CHECKLIST (delete this line) -->
 
 <!-- If this PR adds a new port, please uncomment and fill out this checklist:
 
-- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md)
+- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
 - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines.
-- [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html)
+- [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html).
 - [ ] The versioning scheme in `vcpkg.json` matches what upstream says.
 - [ ] The license declaration in `vcpkg.json` matches what upstream says.
 - [ ] The installed as the "copyright" file matches what upstream says.

.github/workflows/check_issues.yml

@@ -11,7 +11,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           script: |
             let issue_query = {
@@ -20,25 +20,59 @@ jobs:
               repo: context.repo.repo
             };
             let issue = await github.rest.issues.get(issue_query)
+            let commentLabelClose = async (comment, label) => {
+              await github.rest.issues.removeAllLabels(issue_query);
+              await github.rest.issues.setLabels({...issue_query, labels: [label]});
+              await github.rest.issues.createComment({...issue_query, body: comment});
+              await github.rest.issues.update({...issue_query, state: "closed"});
+            }
 
             // missing-windows-sdk-issue
             let reg = /RC Pass 1: command "rc .*" failed \(exit code 0\) with the following output:/;
             if (reg.test(issue.data.body)){
-              await github.rest.issues.removeAllLabels(issue_query);
-              await github.rest.issues.setLabels({...issue_query, labels: ["category:question"]});
               let body = "Thanks for posting this issue. Please make sure you have the following installed.\n" +
                          "- Visual Studio Desktop development with C++.\n" +
                          "- Windows 10 SDK or Windows 11 SDK.";
-              await github.rest.issues.createComment({...issue_query, body}); 
-              // Close the issue? 
+              return await commentLabelClose(body, "category:question");
             }
 
             // msys2 download fails => old vcpkg version
             reg = /error: https:\/\/repo\.msys2\.org\/.*: failed: status code 404/;
             if (reg.test(issue.data.body)){
-              await github.rest.issues.removeAllLabels(issue_query);
-              await github.rest.issues.setLabels({...issue_query, labels: ["category:question"]});
               let body = "Try updating your vcpkg version via `git pull` to resolve this issue. MSYS2 downloads are removed from the upstream servers from time to time, so using an up-to-date vcpkg version is necessary."
-              await github.rest.issues.createComment({...issue_query, body}); 
-              // Close the issue? 
+              return await commentLabelClose(body, "category:question");
+            }
+
+            // Issue text is: Copy issue body from .../issue_body.md
+            reg = /^Copy issue body from .*issue_body.md$/;
+            if (reg.test(issue.data.body)){
+              let body = "Please see #30604 for how to report a build failure."
+              return await commentLabelClose(body, "requires:more-information");
+            }
+
+            // Issue to short like #36592 or #36668
+            reg = /^error: building.* BUILD_FAILED\r\nElapsed time.*\r\nPlease ensure.*(\r\nThen check .*\r\n.*)?$/;
+            if (reg.test(issue.data.body)){
+              let body = "Please see #30604 for how to report a build failure."
+              return await commentLabelClose(body, "requires:more-information");
+            }
+
+            // pkg-config/ not found issues like #36011
+            reg = /CMake Error at scripts\/cmake\/vcpkg_find_acquire_program.*\r\n(.*Please install it via your package manager:[\s\S]+)Call Stack/;
+            match = issue.data.body.match(reg)
+            if (match){
+              let body = "From the log:\n```\n" + match[1] + "```\n"
+              return await commentLabelClose(body, "category:question");
+            }
+
+            // MSVC internal compiler error like #36628
+            if (issue.data.body.indexOf("fatal error C1001: Internal compiler error") !== -1){
+              let body = "The build failed due to an internal compiler error. Please update your compiler or revert to an old version."
+              return await commentLabelClose(body, "category:question");
+            }
+
+            // configure: error: 'autoconf-archive' is missing like #37013
+            if (issue.data.body.indexOf("configure: error: 'autoconf-archive' is missing") !== -1){
+              let body = "Please install `autoconf-archive` via `brew install autoconf-archive` (macos) or `sudo apt-get install autoconf-archive` (linux)"
+              return await commentLabelClose(body, "category:question");
             }

.github/workflows/stale.yml

@@ -3,29 +3,33 @@ on:
   schedule:
     - cron: '30 1 * * *'
 
+permissions:
+  issues: write
+
 jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v8
         with:
           stale-issue-message: 'This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 28 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment.'
           any-of-labels: 'category:question,requires:repro,requires:more-information'
           days-before-issue-stale: 28
           days-before-pr-stale: -1
           days-before-close: 14
-      - uses: actions/stale@v6
+      - uses: actions/stale@v8
         with:
           stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 60 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment."
           any-of-labels: 'category:new-port'
           close-issue-label: 'info:new-port-unresolved'
           days-before-issue-stale: 60
           days-before-pr-stale: -1
           days-before-close: 14
-      - uses: actions/stale@v6
+      - uses: actions/stale@v8
         with:
           stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 180 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment."
           exempt-issue-labels: 'no-stale,category:new-port,category:question,requires:repro,requires:more-information'
           days-before-issue-stale: 180
           days-before-pr-stale: -1
           days-before-close: 14
+          operations-per-run: 50

.github/workflows/untrustedPR.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # fetch-depth 50 tries to ensure we capture the whole history of the branch
           fetch-depth: 50
@@ -31,7 +31,15 @@ jobs:
           if [ -s .github-pr.changed-portfiles ]; then (grep -n -H -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' $(cat .github-pr.changed-portfiles) || true) > .github-pr.deprecated-cmake; else touch .github-pr.deprecated-cmake; fi
           git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*vcpkg.json' | sed 's/[MAR]\t*//' > .github-pr.changed-manifest-files
           cat .github-pr.changed-manifest-files | while read filename; do grep -q -E '"license": ' "$filename" || echo "$filename" || true; done > .github-pr.missing-license
-          cat .github-pr.changed-manifest-files | while read filename; do match=$(grep -oiP '"license": ".*\K(AGPL-1\.0|AGPL-3\.0|BSD-2-Clause-FreeBSD|BSD-2-Clause-NetBSD|bzip2-1\.0\.5|eCos-2\.0|GFDL-1\.1|GFDL-1\.2|GFDL-1\.3|GPL-1\.0|GPL-1\.0\+|GPL-2\.0|GPL-2\.0\+|GPL-2\.0-with-autoconf-exception|GPL-2\.0-with-bison-exception|GPL-2\.0-with-classpath-exception|GPL-2\.0-with-font-exception|GPL-2\.0-with-GCC-exception|GPL-3\.0|GPL-3\.0\+|GPL-3\.0-with-autoconf-exception|GPL-3\.0-with-GCC-exception|LGPL-2\.0|LGPL-2\.0\+|LGPL-2\.1|LGPL-2\.1\+|LGPL-3\.0|LGPL-3\.0\+|Nunit|StandardML-NJ|wxWindows)(?=[ "])' "$filename" || true); if [ ! -z "$match" ]; then echo "$filename (has deprecated license \"$match\")" ; fi ; done > .github-pr.deprecated-license
+          cat .github-pr.changed-manifest-files | while read filename; do grep -n -H '"license": "' "$filename" || true; done > .github-pr.all-licenses
+          cat .github-pr.all-licenses | while read license; do \
+            location=$(echo $license | grep -oP '^.*?:[0-9]+:'); \
+            echo $license | \
+            grep -oiP '(AGPL-1\.0|AGPL-3\.0|BSD-2-Clause-FreeBSD|BSD-2-Clause-NetBSD|bzip2-1\.0\.5|eCos-2\.0|GFDL-1\.1|GFDL-1\.2|GFDL-1\.3|GPL-1\.0|GPL-1\.0\+|GPL-2\.0|GPL-2\.0\+|GPL-2\.0-with-autoconf-exception|GPL-2\.0-with-bison-exception|GPL-2\.0-with-classpath-exception|GPL-2\.0-with-font-exception|GPL-2\.0-with-GCC-exception|GPL-3\.0|GPL-3\.0\+|GPL-3\.0-with-autoconf-exception|GPL-3\.0-with-GCC-exception|LGPL-2\.0|LGPL-2\.0\+|LGPL-2\.1|LGPL-2\.1\+|LGPL-3\.0|LGPL-3\.0\+|Nunit|StandardML-NJ|wxWindows)(?=[ ")&|,])' | \
+            while read id; do \
+              echo "$location$id"; \
+            done || true; \
+          done > .github-pr.deprecated-license
           ./vcpkg format-manifest --all --convert-control
           git diff > .github-pr.format-manifest
           git add -u
@@ -46,7 +54,7 @@ jobs:
           git reset HEAD~ --mixed
 
       - name: Generate Reply
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const { promises: fs } = require('fs')
@@ -57,7 +65,7 @@ jobs:
             const deprecated_function = (await fs.readFile('.github-pr.deprecated-function', 'utf8')).split('\n').filter(s => s.length > 0)
             const deprecated_cmake = (await fs.readFile('.github-pr.deprecated-cmake', 'utf8')).split('\n').filter(s => s.length > 0)
             const missing_license = (await fs.readFile('.github-pr.missing-license', 'utf8')).trim()
-            const deprecated_license = (await fs.readFile('.github-pr.deprecated-license', 'utf8')).trim()
+            const deprecated_license = (await fs.readFile('.github-pr.deprecated-license', 'utf8')).split('\n').filter(s => s.length > 0)
 
             let approve = true;
             if (format !== "") {
@@ -96,7 +104,7 @@ jobs:
 
             if (deprecated_function.length > 0) {
               var deprecated_output = '';
-              deprecated_output += "You have modified or added at least one portfile where deprecated functions are used.\n"
+              deprecated_output += "**You have modified or added at least one portfile where deprecated functions are used**\n"
               deprecated_output += "If you feel able to do so, please consider migrating them to the new functions.\n";
               core.warning(deprecated_output);
 
@@ -149,23 +157,31 @@ jobs:
               }
             }
 
-            if (missing_license !== "" || deprecated_license !== "") {
-              var license_output = '';
-              license_output += 'You have modified or added at least one vcpkg.json where you should check the \"license\" field.\n'
-              if (missing_license !== "") {
-                license_output += 'If you feel able to do so, please consider adding a "license" field to the following files:\n'
-                license_output += missing_license
-                license_output += "\n\nValid values for the license field can be found at https://learn.microsoft.com/en-us/vcpkg/reference/vcpkg-json#license\n\n"
-              }
-              if (deprecated_license !== "") {
-                license_output += 'If you feel able to do so, please consider replacing the deprecated license identifiers in the following files:\n'
-                license_output += deprecated_license
-                license_output += "\n\nDeprecated and non deprecated license identifiers can be found at https://spdx.org/licenses/#deprecated\n"
-              }
+            if (missing_license !== "" || deprecated_license.length > 0) {
+              core.summary.addRaw('You have modified or added at least one vcpkg.json where you should check the \"license\" field.');
+              core.summary.addEOL();
+            }
+
+            if (missing_license !== "") {
+              license_output = 'If you feel able to do so, please consider adding a "license" field to the following files:\n'
+              license_output += missing_license
+              license_output += "\n\nValid values for the license field can be found at https://learn.microsoft.com/vcpkg/reference/vcpkg-json#license\n\n"
 
               core.warning(license_output);
             }
 
+            for (let line of deprecated_license) {
+              [file, line_number, match] = line.split(':');
+              var license_output = `SPDX deprecated license identifier ${match}.`;
+              license_output += "\nIf you feel able to do so, please consider replacing it."
+              license_output += "\nUpdated license identifiers can be found at https://spdx.org/licenses/."
+
+
+              core.notice(license_output, {file, startLine: line_number});
+            }
+
+            core.summary.write();
+
             if (!approve) {
               process.exitCode = 1;
             }