[lxc/lxc] 1b3b06: meson: fix build on NixOS

[Alexander Mikhalitsyn]

Branch: refs/heads/stable-6.0
Home: https://github.com/lxc/lxc
Commit: 1b3b06d8e23f16fdcea6c99471ffe7919c089b10
https://github.com/lxc/lxc/commit/1b3b06d8e23f16fdcea6c99471ffe7919c089b10
Author: Alexander Mikhalitsyn <aleksandr....@canonical.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M src/lxc/cmd/meson.build
M src/lxc/tools/meson.build

Log Message:
-----------
meson: fix build on NixOS

Fixes: #4427
Signed-off-by: Alexander Mikhalitsyn <aleksandr....@canonical.com>


Commit: 41aa42e27bd7a341b583836770679aa2c1c84f07
https://github.com/lxc/lxc/commit/41aa42e27bd7a341b583836770679aa2c1c84f07
Author: Alexander Mikhalitsyn <aleksandr....@canonical.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M .github/workflows/build.yml

Log Message:
-----------
github: test the lxc multicall binary builds too

Signed-off-by: Alexander Mikhalitsyn <aleksandr....@canonical.com>


Commit: bd8d5b747fc7256be97df6381e1f6e6451f8e00c
https://github.com/lxc/lxc/commit/bd8d5b747fc7256be97df6381e1f6e6451f8e00c
Author: Alexander Mikhalitsyn <aleksandr....@canonical.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M src/lxc/network.c

Log Message:
-----------
lxc/network: handle non-existing sysctl <ifname>/disable_ipv6

Skip writting to /proc/sys/net/ipv6/conf/<ifname>/disable_ipv6
if it does not exist.

Fixes: #4431
Signed-off-by: Alexander Mikhalitsyn <aleksandr....@canonical.com>


Commit: e31ce9753bebb40efa41e86d421ab2ad1a0cd03c
https://github.com/lxc/lxc/commit/e31ce9753bebb40efa41e86d421ab2ad1a0cd03c
Author: Alexander Mikhalitsyn <aleksandr....@canonical.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M src/lxc/network.c

Log Message:
-----------
network: netdev_configure_server_veth: reduce scope of disable_ipv6_fd/path vars

Signed-off-by: Alexander Mikhalitsyn <aleksandr....@canonical.com>


Commit: f98b7ab53ce76edcfb03227fc57c16b84a13fc07
https://github.com/lxc/lxc/commit/f98b7ab53ce76edcfb03227fc57c16b84a13fc07
Author: MMFuba <11430558...@users.noreply.github.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M doc/lxc-attach.sgml.in

Log Message:
-----------
Update lxc-attach.sgml.in

added hint to use numerical value for uid and gid

Signed-off-by: MMFuba <11430558...@users.noreply.github.com>


Commit: bb23a71af1d21f8b82550b75b78975f917537f25
https://github.com/lxc/lxc/commit/bb23a71af1d21f8b82550b75b78975f917537f25
Author: MMFuba <11430558...@users.noreply.github.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M doc/lxc-execute.sgml.in

Log Message:
-----------
Update lxc-execute.sgml.in

add hint to use numerical values for uid and gid

Signed-off-by: MMFuba <11430558...@users.noreply.github.com>


Commit: 247f5eed5da3d4a494394cc90af129371164ea0c
https://github.com/lxc/lxc/commit/247f5eed5da3d4a494394cc90af129371164ea0c
Author: KATOH Yasufumi <ka...@jazz.email.ne.jp>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M doc/ja/lxc-attach.sgml.in
M doc/ja/lxc-execute.sgml.in

Log Message:
-----------
Update lxc-{attach,execute}.sgml.in

Update for 52bf34d and a7aa297

Signed-off-by: KATOH Yasufumi <ka...@jazz.email.ne.jp>


Commit: be7179a08fba0ac73cdeeb1595555b79b6f049a3
https://github.com/lxc/lxc/commit/be7179a08fba0ac73cdeeb1595555b79b6f049a3
Author: KATOH Yasufumi <ka...@jazz.email.ne.jp>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M doc/ja/lxc-execute.sgml.in

Log Message:
-----------
Update lxc-execute.sgml.in

Update for a7aa297

Signed-off-by: KATOH Yasufumi <ka...@jazz.email.ne.jp>


Commit: fdeb88655cd1295df52db99a36e62f1336fe9e12
https://github.com/lxc/lxc/commit/fdeb88655cd1295df52db99a36e62f1336fe9e12
Author: Jacob McNamee <ja...@jacobmcnamee.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M templates/lxc-local.in

Log Message:
-----------
lxc-local: fix use of `LXC_PATH` before init

Signed-off-by: Jacob McNamee <ja...@jacobmcnamee.com>


Commit: 81a2c8253ab62c8cd76db6799398d893536e5fa3
https://github.com/lxc/lxc/commit/81a2c8253ab62c8cd76db6799398d893536e5fa3
Author: Jacob McNamee <ja...@jacobmcnamee.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M templates/lxc-local.in

Log Message:
-----------
lxc-local: fix incorrect path to `templates` file

Signed-off-by: Jacob McNamee <ja...@jacobmcnamee.com>


Commit: 32c7a157d69efcf57ae6af41643790425b30fb3b
https://github.com/lxc/lxc/commit/32c7a157d69efcf57ae6af41643790425b30fb3b
Author: Jacob McNamee <ja...@jacobmcnamee.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M templates/lxc-local.in

Log Message:
-----------
lxc-local: remove check for template existence before extraction

This check always fails because template files do not exist until the
rootfs is unpacked. File existence is already confirmed before replacing
variables

Signed-off-by: Jacob McNamee <ja...@jacobmcnamee.com>


Commit: 89071ba7b056a480dadca6c27d10955b70dab96c
https://github.com/lxc/lxc/commit/89071ba7b056a480dadca6c27d10955b70dab96c
Author: Alexander Mikhalitsyn <aleksandr....@canonical.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M config/apparmor/abstractions/container-base.in
M config/apparmor/abstractions/start-container.in
M src/lxc/lsm/apparmor.c

Log Message:
-----------
apparmor: fix rule path pattern specification syntax

See also:
https://bugs.launchpad.net/lxc/+bug/2064144
https://github.com/lxc/incus/pull/889/commits/d2c13e3f6312f08750981a80a510530e881c4ec7

Signed-off-by: Alexander Mikhalitsyn <aleksandr....@canonical.com>


Commit: e97321ff921aaaee8a8082a4b4d0659f7f2b3060
https://github.com/lxc/lxc/commit/e97321ff921aaaee8a8082a4b4d0659f7f2b3060
Author: Alexander Mikhalitsyn <aleksandr....@canonical.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M config/apparmor/abstractions/container-base

Log Message:
-----------
apparmor: regenerate rules

Follow the instruction from config/apparmor/README:

./lxc-generate-aa-rules.py container-rules.base > container-rules
cat abstractions/container-base.in container-rules > abstractions/container-base

Signed-off-by: Alexander Mikhalitsyn <aleksandr....@canonical.com>


Commit: cba7a6746e3fa4a3f9fa576e4cf9a169bcef64bc
https://github.com/lxc/lxc/commit/cba7a6746e3fa4a3f9fa576e4cf9a169bcef64bc
Author: Alexander Mikhalitsyn <aleksandr....@canonical.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M config/apparmor/abstractions/container-base.in
M config/apparmor/abstractions/start-container.in
M src/lxc/lsm/apparmor.c

Log Message:
-----------
apparmor: use /{,**} instead of /**

It turned out, that old (and incorrect) rule:
mount options=(rw,make-slave) -> **,

is NOT equivalent to:
mount options=(rw,make-slave) -> /**,

Let's use:
mount options=(rw,make-slave) -> /{,**},

Signed-off-by: Alexander Mikhalitsyn <aleksandr....@canonical.com>


Commit: f91ce0d8bdce2fc773f4f419adffc6bcc66937a3
https://github.com/lxc/lxc/commit/f91ce0d8bdce2fc773f4f419adffc6bcc66937a3
Author: Alexander Mikhalitsyn <aleksandr....@canonical.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M config/apparmor/abstractions/container-base

Log Message:
-----------
apparmor: regenerate rules

Signed-off-by: Alexander Mikhalitsyn <aleksandr....@canonical.com>


Commit: 8e72b94bdd974d70a79e0f490283b2a54320716e
https://github.com/lxc/lxc/commit/8e72b94bdd974d70a79e0f490283b2a54320716e
Author: Alexander Mikhalitsyn <aleksandr....@canonical.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M .github/workflows/build.yml
M .github/workflows/cifuzz.yml
M .github/workflows/commits.yml
M .github/workflows/coverity.yml
M .github/workflows/sanitizers.yml
M .github/workflows/static-analysis.yml

Log Message:
-----------
github: start using ubuntu-24.04

Signed-off-by: Alexander Mikhalitsyn <aleksandr....@canonical.com>


Commit: 6ba6c32088038d93435de47d2945dfa4e4d69905
https://github.com/lxc/lxc/commit/6ba6c32088038d93435de47d2945dfa4e4d69905
Author: Alexander Mikhalitsyn <aleksandr....@canonical.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M .github/workflows/static-analysis.yml

Log Message:
-----------
github: properly check apparmor profile changes

Signed-off-by: Alexander Mikhalitsyn <aleksandr....@canonical.com>


Commit: 6a0b1504eed3f498b723e99930b2d73acddc487d
https://github.com/lxc/lxc/commit/6a0b1504eed3f498b723e99930b2d73acddc487d
Author: Alexander Mikhalitsyn <aleksandr....@canonical.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M src/lxc/storage/zfs.c

Log Message:
-----------
lxc/storage/zfs: ignore false-positive use-after-free warning

free(dataset) is perfecly valid after failed realloc(dataset, len) call.

Signed-off-by: Alexander Mikhalitsyn <aleksandr....@canonical.com>


Commit: f92aa606623a89082153cc856767f065b1f905be
https://github.com/lxc/lxc/commit/f92aa606623a89082153cc856767f065b1f905be
Author: Alexander Mikhalitsyn <aleksandr....@canonical.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M .github/workflows/build.yml
M .github/workflows/sanitizers.yml

Log Message:
-----------
github: exclude clang & ubuntu-24.04 combination

Temporary workaround for:
https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-18/+bug/2064187

Signed-off-by: Alexander Mikhalitsyn <aleksandr....@canonical.com>


Commit: 9fb53cfa1f0b28ccaa7737d896bd0c8b6f45a7ce
https://github.com/lxc/lxc/commit/9fb53cfa1f0b28ccaa7737d896bd0c8b6f45a7ce
Author: Alexander Mikhalitsyn <aleksandr....@canonical.com>
Date: 2024-06-27 (Thu, 27 Jun 2024)

Changed paths:
M src/lxc/tools/meson.build

Log Message:
-----------
meson: fix build with -Dtools-multicall=true on NixOS

See also:
https://github.com/lxc/lxc/pull/4428

Fixes: #4427
Signed-off-by: Alexander Mikhalitsyn <aleksandr....@canonical.com>


Compare: https://github.com/lxc/lxc/compare/3dee5fb88c6f...9fb53cfa1f0b

To unsubscribe from these emails, change your notification settings at https://github.com/lxc/lxc/settings/notifications