Skip to content

Bump c-ares to 1.34.5#81159

Merged
thevar1able merged 9 commits intomasterfrom
bump-c-ares
Jun 5, 2025
Merged

Bump c-ares to 1.34.5#81159
thevar1able merged 9 commits intomasterfrom
bump-c-ares

Conversation

@thevar1able
Copy link
Copy Markdown
Member

@thevar1able thevar1able commented Jun 2, 2025 •
edited
Loading

Changelog category (leave one):

  • Improvement

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

Update c-ares to v1.34.5.

Superseeds #81147

@clickhouse-gh
Copy link
Copy Markdown
Contributor

clickhouse-gh bot commented Jun 2, 2025 •
edited
Loading

Workflow [PR], commit [f35ff8e]

@clickhouse-gh clickhouse-gh bot added pr-improvement Pull request with some product improvements submodule changed At least one submodule changed in this PR. labels Jun 2, 2025
@larryluogit
Copy link
Copy Markdown
Contributor

larryluogit commented Jun 2, 2025

Build(amd_tidy) failed with "Fatal error: sources with unknown license found in c-ares."
Could anyone share how to address this error?

@thevar1able
Copy link
Copy Markdown
Member Author

thevar1able commented Jun 2, 2025 •
edited
Loading

@larryluogit take a look at utils/list-licenses/list-licenses.sh

diff --git a/utils/list-licenses/list-licenses.sh b/utils/list-licenses/list-licenses.sh
index 237ae15a5e7..bf5b6d51700 100755
--- a/utils/list-licenses/list-licenses.sh
+++ b/utils/list-licenses/list-licenses.sh
@@ -52,6 +52,8 @@ do
          ${GREP_CMD} -q -i -F 'The above copyright notice and this permission notice shall be' "$LIB_LICENSE" &&
          ${GREP_CMD} -q -i -F 'THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND' "$LIB_LICENSE" &&
          echo "MIT") ||
+        (${GREP_CMD} -q -i -F 'MIT License' "$LIB_LICENSE" &&
+         echo "MIT") ||
         (${GREP_CMD} -q -F 'PostgreSQL' "$LIB_LICENSE" &&
          echo "PostgreSQL") ||
         (${GREP_CMD} -q -i -F 'Permission to use, copy, modify, and distribute this software for any purpose' "$LIB_LICENSE" &&

@alexey-milovidov alexey-milovidov self-assigned this Jun 2, 2025
@thevar1able thevar1able marked this pull request as draft June 2, 2025 19:39
@larryluogit
Copy link
Copy Markdown
Contributor

larryluogit commented Jun 3, 2025

@thevar1able this PR addresses CVE-2024-25629, which exist in both 24.8lts and 25.3lts. Could you please set backport flag when you merge the PR?

@thevar1able thevar1able marked this pull request as ready for review June 5, 2025 03:44
@thevar1able
Copy link
Copy Markdown
Member Author

thevar1able commented Jun 5, 2025

test_kafka_bad_messages #58321

@thevar1able thevar1able enabled auto-merge June 5, 2025 03:44
@thevar1able thevar1able added this pull request to the merge queue Jun 5, 2025
Merged via the queue into master with commit 1990427 Jun 5, 2025
233 of 239 checks passed
@thevar1able thevar1able deleted the bump-c-ares branch June 5, 2025 04:47
@robot-ch-test-poll3 robot-ch-test-poll3 added the pr-synced-to-cloud The PR is synced to the cloud repo label Jun 5, 2025
This was referenced Jun 5, 2025
Merged
Merged
thevar1able added a commit that referenced this pull request Jun 5, 2025
@thevar1able
Merge pull request #81332 from ClickHouse/cherrypick/24.8/81159
d7e9607 
Cherry pick #81159 to 24.8: Bump `c-ares` to `1.34.5`
thevar1able added a commit that referenced this pull request Jun 5, 2025
@thevar1able
Merge pull request #81333 from ClickHouse/cherrypick/25.3/81159
69561d1 
Cherry pick #81159 to 25.3: Bump `c-ares` to `1.34.5`
robot-clickhouse added a commit that referenced this pull request Jun 5, 2025
@robot-clickhouse
Backport #81159 to 24.8: Bump c-ares to 1.34.5
ed2132f
@robot-clickhouse-ci-2 robot-clickhouse-ci-2 mentioned this pull request Jun 5, 2025
Merged
robot-clickhouse added a commit that referenced this pull request Jun 5, 2025
@robot-clickhouse
Backport #81159 to 25.3: Bump c-ares to 1.34.5
c26ec6f
@robot-clickhouse-ci-2 robot-clickhouse-ci-2 mentioned this pull request Jun 5, 2025
Merged
@robot-clickhouse robot-clickhouse added the pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore label Jun 5, 2025
alexey-milovidov added a commit that referenced this pull request Jun 5, 2025
@alexey-milovidov
Merge pull request #81379 from ClickHouse/backport/25.3/81159
6b1cb97 
Backport #81159 to 25.3: Bump `c-ares` to `1.34.5`
@rschu1ze rschu1ze mentioned this pull request Jun 9, 2025
Merged
thevar1able added a commit that referenced this pull request Jun 10, 2025
@thevar1able
Merge pull request #81378 from ClickHouse/backport/24.8/81159
ab04426 
Backport #81159 to 24.8: Bump `c-ares` to `1.34.5`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alexey-milovidov alexey-milovidov alexey-milovidov approved these changes

Assignees

@alexey-milovidov alexey-milovidov

Labels

pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore pr-improvement Pull request with some product improvements pr-synced-to-cloud The PR is synced to the cloud repo submodule changed At least one submodule changed in this PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@thevar1able @larryluogit @alexey-milovidov @robot-clickhouse @robot-ch-test-poll3