Skip to content

Updated dependencies (3.24.x) #1665

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
Merged
merged 11 commits into from
Apr 17, 2025
Merged

Updated dependencies (3.24.x) #1665

merged 11 commits into from
Apr 17, 2025

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Apr 8, 2025 •
edited by craigcomstock
Loading

Automated dependency updates for the 3.24.x branch

  • [in progress] rhel-6 needed openssl patches removed as described in spec file Build Status

@craigcomstock
Copy link
Contributor

@cf-bottom jenkins exotics

@cf-bottom
Copy link

Alright, I triggered a build:

Build Status

(with exotics)

Jenkins: https://ci.cfengine.com/job/pr-pipeline/12000/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12000/

@craigcomstock
Copy link
Contributor

mingw failure is a known issue: https://northerntech.atlassian.net/browse/ENT-12744

13:18:05 checking for libiconv... no
13:18:05 configure: error: libiconv not found
13:18:05 debian/rules:13: recipe for target 'build-stamp' failed
13:18:05 make: *** [build-stamp] Error 1

@olehermanse olehermanse mentioned this pull request Apr 14, 2025
Closed
@craigcomstock
Copy link
Contributor

@cf-bottom jenkins with exotics

@cf-bottom
Copy link

Alright, I triggered a build:

Build Status

(with exotics)

Jenkins: https://ci.cfengine.com/job/pr-pipeline/12028/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12028/

@craigcomstock
Copy link
Contributor

redhat_6 needs help with openssl patches

16:19:50 + patch -p1
16:19:50 patching file crypto/threads_pthread.c
16:19:50 Hunk #1 FAILED at 129.
16:19:50 Hunk #2 FAILED at 198.
16:19:50 Hunk #3 FAILED at 523.
16:19:50 Hunk #4 FAILED at 557.
16:19:50 4 out of 4 hunks FAILED -- saving rejects to file crypto/threads_pthread.c.rej
16:19:50 error: Bad exit status from /var/tmp/rpm-tmp.iZOKH5 (%prep)
16:19:50 
16:19:50 
16:19:50 RPM build errors:
16:19:50     Bad exit status from /var/tmp/rpm-tmp.iZOKH5 (%prep)

mingw needs same fixes as in master PR: #1664 will add those patches and retry that platform by itself.

@craigcomstock
Copy link
Contributor

craigcomstock commented Apr 15, 2025 •
edited
Loading

retry mingw by itself with fixes from master PR: Build Status, end status was not updated due to this PR not getting rebased with set github status changes recently made.

@craigcomstock
Copy link
Contributor

My mingw only build accidentally tried fr-tests. I didn't check the right boxes to skip it. So mingw is looking good!

github-actions bot and others added 11 commits April 17, 2025 14:14
@github-actions @craigcomstock
Updated dependency 'libcurl' from version 8.12.1 to 8.13.0
c7adbb0
@github-actions @craigcomstock
Updated dependency 'libcurl-hub' from version 8.12.1 to 8.13.0
83e320b
@github-actions @craigcomstock
Updated dependency 'libexpat' from version 2.7.0 to 2.7.1
1ee9660
@github-actions @craigcomstock
Updated dependency 'libxml2' from version 2.13.6 to 2.14.1
15aa915
@github-actions @craigcomstock
Updated dependency 'openssl' from version 3.4.1 to 3.5.0
6b01c45
@craigcomstock
Removed 32-bit Windows client as it is no longer supported
4f15487 
Ticket: none
Changelog: title
@craigcomstock
Adjusted mingw libxml2 build to exclude libiconv
aec5c82 
In libxml2 2.13.6 and previous the configure script would allow no iconv to be found.
With 2.14.1 the configure script was changed to default to looking for iconv if no explicit --without-iconv was specified.

We have been building libxml2 on mingw platform without iconv "always" as far as I can tell so this is not a functional change, only a build-time change.

Ticket: ENT-12744
Changelog: none
(cherry picked from commit 5ea00dd)
@craigcomstock
Adjusted dll filename for mingw libxml2 dependency build
8e67e8f 
Caused by 10b5796 Updated dependency 'libxml2' from version 2.13.6 to 2.14.1

Ticket: none
Changelog: none
(cherry picked from commit 1da160e)
@craigcomstock
Removed two patches for hpux which are no longer needed
3d46dba 
${PATCH} -p1 < 0001-Revert-rcu-Ensure-that-updates-to-the-ID-field-of-a-.patch
${PATCH} -p1 < 0002-Don-t-use-__ATOMIC_ACQ_REL-on-older-compilers.patch

Ticket: none
Changelog: none
(cherry picked from commit 26b48ad)
@craigcomstock
Removed unused openssl patches: 0001 and 0002
c6f388a 
Last hold-out was hpux with pre 3.5.0 openssl version

Ticket: none
Changelog: none
(cherry picked from commit f1e2d48)
@craigcomstock
Adjusted openssl spec file for rhel/centos-6 platform
cd0bc82 
Removed the patch files already.
rhel-6 is not supported in master so didn't remove from main spec file.

Ticket: none
Changelog: none
@craigcomstock craigcomstock force-pushed the update-dependencies-action-3.24.x-1744123894 branch from 88002d0 to cd0bc82 Compare April 17, 2025 19:15
@craigcomstock craigcomstock merged commit 54c9803 into 3.24.x Apr 17, 2025
2 of 3 checks passed
@craigcomstock craigcomstock deleted the update-dependencies-action-3.24.x-1744123894 branch April 17, 2025 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@craigcomstock craigcomstock Awaiting requested review from craigcomstock

@larsewi larsewi Awaiting requested review from larsewi

@olehermanse olehermanse Awaiting requested review from olehermanse

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@craigcomstock @cf-bottom