mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 22:47:14 -08:00
app-containers/lxc: glibc-2.43 const fixes
Bug: https://bugs.gentoo.org/972401 Signed-off-by: Alfred Wingate <parona@protonmail.com> Part-of: https://codeberg.org/gentoo/gentoo/pulls/1768 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
@@ -0,0 +1,134 @@
|
||||
https://bugs.gentoo.org/972401
|
||||
https://github.com/lxc/lxc/issues/4710
|
||||
https://github.com/lxc/lxc/pull/4711
|
||||
https://github.com/lxc/lxc/commit/c2809b067bbd5c63f0f78a5acd6f7af4e77e584c
|
||||
|
||||
From c2809b067bbd5c63f0f78a5acd6f7af4e77e584c Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
Date: Sat, 18 Jul 2026 23:11:52 +0300
|
||||
Subject: [PATCH] tree-wide: fix const-correctness issues exposed by glibc 2.43
|
||||
|
||||
glibc 2.43 implements strchr(3), strrchr(3) and strstr(3) as
|
||||
C23-style _Generic macros which propagate the const qualifier
|
||||
of the input string to the return type.
|
||||
|
||||
For example, a 'const char *' input now produces 'const char *'
|
||||
output types and vice-versa (non-const -> non-const).
|
||||
|
||||
Building with clang and -Werror=incompatible-pointer-types fails:
|
||||
|
||||
src/lxc/confile.c:2690:4: error: assigning to 'char *' from
|
||||
'const char *' discards qualifiers
|
||||
[-Werror,-Wincompatible-pointer-types-discards-qualifiers]
|
||||
|
||||
Constify the result pointers where they are only read. Where the
|
||||
code intentionally writes through the result into caller-owned
|
||||
writable storage, drop the bogus const from the parameter instead
|
||||
of casting it away: update_hwaddr() (and thus its caller
|
||||
append_unexp_config_line()) modify the string in-place via
|
||||
rand_complete_hwaddr(), so 'char *' is the honest type. The two
|
||||
call sites already pass writable buffers (a strdup()'d line and an
|
||||
internally built one), so no cast is needed.
|
||||
|
||||
The one remaining cast is in cgroup1-only pam_cgfs code
|
||||
(cgv1_handle_cpuset_hierarchy) where the writable buffer is passed
|
||||
down through a const 'cgroup' parameter; that hierarchy is slated
|
||||
for removal, so the minimal cast is kept there.
|
||||
|
||||
This is just a build fix, the runtime behavior is unchanged.
|
||||
|
||||
Fixes: #4710
|
||||
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
--- a/src/lxc/confile.c
|
||||
+++ b/src/lxc/confile.c
|
||||
@@ -2675,7 +2675,7 @@ static int set_config_console_size(const char *key, const char *value,
|
||||
* lxc.include.
|
||||
* 'x' and 'X' are substituted in-place.
|
||||
*/
|
||||
-static void update_hwaddr(const char *line)
|
||||
+static void update_hwaddr(char *line)
|
||||
{
|
||||
char *p;
|
||||
|
||||
@@ -2701,7 +2701,7 @@ static void update_hwaddr(const char *line)
|
||||
rand_complete_hwaddr(p);
|
||||
}
|
||||
|
||||
-int append_unexp_config_line(const char *line, struct lxc_conf *conf)
|
||||
+int append_unexp_config_line(char *line, struct lxc_conf *conf)
|
||||
{
|
||||
size_t linelen;
|
||||
size_t len = conf->unexpanded_len;
|
||||
@@ -4213,7 +4213,7 @@ static int get_config_uts_name(const char *key, char *retv, int inlen,
|
||||
static int get_config_hooks(const char *key, char *retv, int inlen,
|
||||
struct lxc_conf *c, void *data)
|
||||
{
|
||||
- char *subkey;
|
||||
+ const char *subkey;
|
||||
int len, fulllen = 0, found = -1;
|
||||
struct string_entry *entry;
|
||||
int i;
|
||||
--- a/src/lxc/confile.h
|
||||
+++ b/src/lxc/confile.h
|
||||
@@ -75,7 +75,7 @@ __hidden extern int lxc_list_net(struct lxc_conf *c, const char *key, char *retv
|
||||
|
||||
__hidden extern int lxc_config_read(const char *file, struct lxc_conf *conf, bool from_include);
|
||||
|
||||
-__hidden extern int append_unexp_config_line(const char *line, struct lxc_conf *conf);
|
||||
+__hidden extern int append_unexp_config_line(char *line, struct lxc_conf *conf);
|
||||
|
||||
extern int lxc_config_define_add(struct lxc_list *defines, char *arg);
|
||||
|
||||
--- a/src/lxc/confile_utils.c
|
||||
+++ b/src/lxc/confile_utils.c
|
||||
@@ -903,7 +903,7 @@ int lxc_inherit_namespace(const char *nsfd_path, const char *lxcpath,
|
||||
{
|
||||
__do_free char *dup = NULL;
|
||||
int fd, pid;
|
||||
- char *lastslash;
|
||||
+ const char *lastslash;
|
||||
|
||||
if (nsfd_path[0] == '/') {
|
||||
return open(nsfd_path, O_RDONLY | O_CLOEXEC);
|
||||
--- a/src/lxc/pam/pam_cgfs.c
|
||||
+++ b/src/lxc/pam/pam_cgfs.c
|
||||
@@ -362,7 +362,7 @@ static char *copy_to_eol(char *s)
|
||||
/* Check if given entry under /proc/<pid>/mountinfo is a fuse.lxcfs mount. */
|
||||
static bool is_lxcfs(const char *line)
|
||||
{
|
||||
- char *p = strstr(line, " - ");
|
||||
+ const char *p = strstr(line, " - ");
|
||||
if (!p)
|
||||
return false;
|
||||
|
||||
@@ -1914,7 +1914,7 @@ static bool cgv1_handle_cpuset_hierarchy(struct cgv1_hierarchy *h,
|
||||
|
||||
if (*cgroup == '/')
|
||||
cgroup++;
|
||||
- slash = strchr(cgroup, '/');
|
||||
+ slash = (char *)strchr(cgroup, '/');
|
||||
if (slash)
|
||||
*slash = '\0';
|
||||
|
||||
--- a/src/lxc/storage/nbd.c
|
||||
+++ b/src/lxc/storage/nbd.c
|
||||
@@ -291,7 +291,7 @@ static void nbd_detach(const char *path)
|
||||
*/
|
||||
static int nbd_get_partition(const char *src)
|
||||
{
|
||||
- char *p = strchr(src, ':');
|
||||
+ const char *p = strchr(src, ':');
|
||||
if (!p)
|
||||
return 0;
|
||||
|
||||
--- a/src/lxc/storage/zfs.c
|
||||
+++ b/src/lxc/storage/zfs.c
|
||||
@@ -461,7 +461,7 @@ int zfs_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
|
||||
orig_src = cmd_output;
|
||||
}
|
||||
|
||||
- tmp = strrchr(orig_src, '/');
|
||||
+ tmp = (char *)strrchr(orig_src, '/');
|
||||
if (!tmp) {
|
||||
ERROR("Failed to detect \"/\" in \"%s\"", orig_src);
|
||||
return -1;
|
||||
@@ -0,0 +1,184 @@
|
||||
# Copyright 2022-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit bash-completion-r1 linux-info meson optfeature systemd verify-sig
|
||||
|
||||
DESCRIPTION="A userspace interface for the Linux kernel containment features"
|
||||
HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
|
||||
SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
|
||||
verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc )"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 LGPL-3" # LGPL-2.1+ is listed, but it's covered by "LGPL-3"
|
||||
SLOT="0/1.700" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while bumping.
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
|
||||
IUSE="apparmor +caps doc examples io-uring landlock man pam seccomp selinux ssl systemd test +tools"
|
||||
|
||||
REQUIRED_USE="landlock? ( seccomp )"
|
||||
|
||||
RDEPEND="acct-group/lxc
|
||||
acct-user/lxc
|
||||
apparmor? ( sys-libs/libapparmor )
|
||||
caps? ( sys-libs/libcap )
|
||||
io-uring? ( >=sys-libs/liburing-2:= )
|
||||
pam? ( sys-libs/pam )
|
||||
seccomp? ( sys-libs/libseccomp )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
ssl? ( dev-libs/openssl:0= )
|
||||
systemd? (
|
||||
sys-apps/dbus
|
||||
sys-apps/systemd:=
|
||||
)
|
||||
tools? ( sys-libs/libcap )"
|
||||
DEPEND="${RDEPEND}
|
||||
caps? ( sys-libs/libcap[static-libs] )
|
||||
tools? ( sys-libs/libcap[static-libs] )
|
||||
sys-kernel/linux-headers"
|
||||
BDEPEND="virtual/pkgconfig
|
||||
doc? ( app-text/doxygen )
|
||||
man? ( app-text/docbook2X )
|
||||
verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
CONFIG_CHECK="~!NETPRIO_CGROUP
|
||||
~CGROUPS
|
||||
~CGROUP_CPUACCT
|
||||
~CGROUP_DEVICE
|
||||
~CGROUP_FREEZER
|
||||
|
||||
~CGROUP_SCHED
|
||||
~CPUSETS
|
||||
~IPC_NS
|
||||
~MACVLAN
|
||||
|
||||
~MEMCG
|
||||
~NAMESPACES
|
||||
~NET_NS
|
||||
~PID_NS
|
||||
|
||||
~POSIX_MQUEUE
|
||||
~USER_NS
|
||||
~UTS_NS
|
||||
~VETH"
|
||||
|
||||
ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
|
||||
ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
|
||||
ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
|
||||
ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
|
||||
ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
|
||||
ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
|
||||
ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
|
||||
|
||||
DOCS=( AUTHORS MAINTAINERS README.md doc/FAQ.txt )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/lxc-7.0.0-glibc-2.43-const-fix.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use landlock ; then
|
||||
WARNING_SECURITY_LANDLOCK="CONFIG_SECURITY_LANDLOCK: needed with landlock"
|
||||
fi
|
||||
linux-info_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
|
||||
# -Dtools-multicall=false: will create a single binary called 'lxc' that conflicts with LXD.
|
||||
local emesonargs=(
|
||||
--localstatedir "${EPREFIX}/var"
|
||||
|
||||
-Dcoverity-build=false
|
||||
-Dinstall-state-dirs=false
|
||||
-Doss-fuzz=false
|
||||
-Dspecfile=false
|
||||
-Dtools-multicall=false
|
||||
|
||||
-Dcommands=true
|
||||
-Dinstall-init-files=true
|
||||
-Dmemfd-rexec=true
|
||||
-Dthread-safety=true
|
||||
|
||||
$(meson_use apparmor)
|
||||
$(meson_use caps capabilities)
|
||||
$(meson_use doc api-docs)
|
||||
$(meson_use examples)
|
||||
$(meson_use io-uring io-uring-event-loop)
|
||||
$(meson_use landlock landlock-monitor)
|
||||
$(meson_use man)
|
||||
$(meson_use pam pam-cgroup)
|
||||
$(meson_use seccomp)
|
||||
$(meson_use selinux)
|
||||
$(meson_use ssl openssl)
|
||||
$(meson_use test tests)
|
||||
$(meson_use tools)
|
||||
|
||||
$(usex systemd -Ddbus=true -Ddbus=false)
|
||||
$(usex systemd -Dinit-script="systemd" -Dinit-script="openrc")
|
||||
|
||||
-Ddata-path=/var/lib/lxc
|
||||
-Ddoc-path=/usr/share/doc/${PF}
|
||||
-Dlog-path=/var/log/lxc
|
||||
-Drootfs-mount-path=/var/lib/lxc/rootfs
|
||||
-Druntime-path=/run
|
||||
)
|
||||
|
||||
use tools && local emesonargs+=( -Dcapabilities=true )
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use doc ; then
|
||||
local HTML_DOCS=( "${BUILD_DIR}/html/"* )
|
||||
fi
|
||||
meson_src_install
|
||||
|
||||
# The main bash-completion file will collide with lxd, need to relocate and update symlinks.
|
||||
local lxcbashcompdir="${D}/$(get_bashcompdir)"
|
||||
mkdir -p "${lxcbashcompdir}" || die "Failed to create bashcompdir."
|
||||
mv "${lxcbashcompdir}"/_lxc "${lxcbashcompdir}"/lxc-start || die "Failed to move _lxc bash completion file."
|
||||
|
||||
# Build system will install all bash completion files regardless of our 'tools' use flag.
|
||||
# Though installing them all will add bash completions for commands that don't exist, it's
|
||||
# cleaner than dealing with individual files based on the use flag status.
|
||||
bashcomp_alias lxc-start lxc-{attach,autostart,cgroup,checkpoint,config,console,copy,create,destroy,device,execute,freeze,info,ls,monitor,snapshot,stop,top,unfreeze,unshare,update-config,usernsexec,wait}
|
||||
|
||||
find "${ED}" -name '*.la' -delete -o -name '*.a' -delete || die
|
||||
|
||||
# Replace upstream systemd files.
|
||||
if use systemd ; then
|
||||
rm -r "${D}$(systemd_get_systemunitdir)" || die "Failed to remove systemd lib dir"
|
||||
else
|
||||
# The openrc files aren't installed with correct permissions.
|
||||
fperms 0755 /etc/init.d/lxc-{containers,net}
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}/${PN}.initd.9" ${PN}
|
||||
systemd_newunit "${FILESDIR}"/lxc-monitord.service.5.0.0 lxc-monitord.service
|
||||
systemd_newunit "${FILESDIR}"/lxc-net.service.5.0.0 lxc-net.service
|
||||
systemd_newunit "${FILESDIR}"/lxc.service-5.0.0 lxc.service
|
||||
systemd_newunit "${FILESDIR}"/lxc_at.service.5.0.0 "lxc@.service"
|
||||
|
||||
if ! use apparmor; then
|
||||
sed -i '/lxc-apparmor-load/d' "${D}$(systemd_get_systemunitdir)/lxc.service" ||
|
||||
die "Failed to remove apparmor references from lxc.service systemd unit."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Please refer to "
|
||||
elog "https://wiki.gentoo.org/wiki/LXC for introduction and usage guide."
|
||||
elog
|
||||
elog "Run 'lxc-checkconfig' to see optional kernel features."
|
||||
elog
|
||||
|
||||
optfeature "creating your own LXC containers" app-containers/distrobuilder
|
||||
optfeature "automatic template scripts" app-containers/lxc-templates
|
||||
optfeature "Debian-based distribution container image support" dev-util/debootstrap
|
||||
optfeature "snapshot & restore functionality" sys-process/criu
|
||||
}
|
||||
Reference in New Issue
Block a user