Skip to content

Updated dependencies (master)#2340

Draft
github-actions[bot] wants to merge 14 commits into
masterfrom
update-dependencies-action-master-1783929879
Draft

Updated dependencies (master)#2340
github-actions[bot] wants to merge 14 commits into
masterfrom
update-dependencies-action-master-1783929879

Conversation

@github-actions

@github-actions github-actions Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Automated dependency updates for the master branch

together: cfengine/core#6235

@larsewi

larsewi commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

@cf-bottom Jenkins please :)

@cf-bottom

Copy link
Copy Markdown

@larsewi

larsewi commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

@cf-bottom Jenkins please :)

@cf-bottom

Copy link
Copy Markdown

@olehermanse

olehermanse commented Jul 13, 2026

Copy link
Copy Markdown
Member

will rebase

@olehermanse olehermanse reopened this Jul 13, 2026
@olehermanse olehermanse force-pushed the update-dependencies-action-master-1783929879 branch from 0d4779f to 60f655b Compare July 13, 2026 18:03
@cfengine cfengine deleted a comment from olehermanse Jul 13, 2026
@craigcomstock craigcomstock force-pushed the update-dependencies-action-master-1783929879 branch from 993418e to f882a56 Compare July 13, 2026 19:45
@craigcomstock

Copy link
Copy Markdown
Contributor

@cf-bottom jenkins please

@cf-bottom

Copy link
Copy Markdown

@craigcomstock

Copy link
Copy Markdown
Contributor

@cf-bottom jenkins please

@cf-bottom

Copy link
Copy Markdown

@aleksandrychev aleksandrychev self-assigned this Jul 14, 2026
@aleksandrychev

Copy link
Copy Markdown
Contributor

@cf-bottom jenkins please

@cf-bottom

Copy link
Copy Markdown

@aleksandrychev aleksandrychev marked this pull request as draft July 14, 2026 10:27
@aleksandrychev

Copy link
Copy Markdown
Contributor

windows only - Build Status before running full pipeline

@aleksandrychev

Copy link
Copy Markdown
Contributor

PACKAGES_x86_64_mingw successfully built

@cf-bottom please jenkins

@cf-bottom

Copy link
Copy Markdown


as_fn_error $? "Could not find pthreads library" "$LINENO" 5

+fi

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

we should not be patching the configure script, but rather configure.ac and in this case Makefile.am where I recently added -ldl.

It's a bit of a mess as we add the autotools stuff and then in either patch 0005 or 0009 we add files like this configure which we should really NOT include, preferring to run autoconf/etc instead.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

good catch, moved the -ldl fix into the autotools source. 0012 now patches configure.ac and Makefile.am. 0013 carries the regenerated configure/Makefile.in, same split as 0009/0010.

@aleksandrychev aleksandrychev force-pushed the update-dependencies-action-master-1783929879 branch from b4b906a to 679f7b5 Compare July 14, 2026 18:55
@aleksandrychev

Copy link
Copy Markdown
Contributor

@cf-bottom jenkins please

@cf-bottom

Copy link
Copy Markdown

@aleksandrychev aleksandrychev force-pushed the update-dependencies-action-master-1783929879 branch from 679f7b5 to 160f66d Compare July 15, 2026 10:16
@aleksandrychev

Copy link
Copy Markdown
Contributor

rebased

@aleksandrychev

Copy link
Copy Markdown
Contributor

@cf-bottom jenkins please

@cf-bottom

Copy link
Copy Markdown

@aleksandrychev

Copy link
Copy Markdown
Contributor

@cf-bottom jenkins

@cf-bottom

Copy link
Copy Markdown


lib_LTLIBRARIES = liblmdb.la
liblmdb_la_SOURCES = mdb.c midl.c module.c
-liblmdb_la_LDFLAGS=-no-undefined -avoid-version -ldl

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't think you should include this patch. Just revert the previous changes to an existing patch that I made to include -ldl and your changes to configure.ac will handle the situation. Just make sure the patch with configure itself contains the right changes as well, which I think it should at this point.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Reworked as suggested: dropped patches 0012/0013 and reverted the hard-coded -ldl changes in fb82709 the AC_CHECK_LIB([dl], [dlopen]) detection now lives in 0003 configure.ac and the regenerated check in 0005 configure. With AM_LDFLAGS = -ldl gone the 0003 hunk count is correct again, so the include_HEADERS fix commit is removed entirely.

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ihor Aleksandrychiev <igor.aleksandrychev@northern.tech>
Date: Tue, 14 Jul 2026 20:53:21 +0300
Subject: [PATCH 13/13] Updated generated autotools files

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think this patch should also be removed. Just revert my previous changes instead.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

in commit fb82709, remove the changes to deps-packaging/lmdb/0005-Generated-autoconf-files.patch and deps-packaging/lmdb/0009-Added-mdb_dump-and-mdb_load-to-build.patch

---
libraries/liblmdb/Makefile | 117 ---------------------------------
libraries/liblmdb/Makefile.am | 13 ++++
libraries/liblmdb/Makefile.am | 14 ++++

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

when you fix the earlier patch you can remove this commit entirely.

@aleksandrychev aleksandrychev force-pushed the update-dependencies-action-master-1783929879 branch from 1bf4320 to 29d07d2 Compare July 15, 2026 14:09
craigcomstock and others added 4 commits July 15, 2026 17:14
lmdb 1.0.0's module.c uses dlopen() on Unix, but libdl does not exist
on Windows (mingw uses LoadLibrary() instead), so -ldl must not be
hard-coded in the Makefile.am autotools source. Instead, configure.ac
detects libdl via AC_CHECK_LIB([dl], [dlopen]), which adds -ldl to LIBS
only when it actually links: Unix builds still link against libdl,
while the mingw cross build simply omits it. The generated configure
in 0005 carries the corresponding regenerated check.

Ticket: none
Changelog: none
Adjusting core code to work with a dynamic max key size in lmdb is a larger effort.

Ticket: ENT-14295
Changelog: none
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
lmdb 1.0.0 added incremental dump/load and MDB_RPAGE_CACHE remapping
code that treats the Windows LARGE_INTEGER union as a scalar integer,
which fails to compile with x86_64-w64-mingw32-gcc. Add a patch that
accesses the .QuadPart member on Windows so offset arithmetic and
SetFilePointerEx() use the correct type. POSIX builds are unaffected.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@aleksandrychev aleksandrychev force-pushed the update-dependencies-action-master-1783929879 branch from 29d07d2 to 23e513f Compare July 15, 2026 14:14
@cfengine cfengine deleted a comment from cf-bottom Jul 15, 2026
@aleksandrychev

Copy link
Copy Markdown
Contributor

@cf-bottom jenkins please

@cf-bottom

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

5 participants