Skip to content

Commit 31db0ad

Browse files
authored
Merge pull request #2388 from flatcar/buildbot/weekly-portage-stable-package-updates-2024-10-21
Weekly portage-stable package updates 2024-10-21
2 parents 4de0564 + 1143e75 commit 31db0ad

File tree

497 files changed

+10855
-7666
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

497 files changed

+10855
-7666
lines changed

.github/workflows/portage-stable-packages-list

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ sys-devel/gnuconfig
624624
sys-devel/m4
625625
sys-devel/patch
626626

627-
sys-firmware/edk2-ovmf-bin
627+
sys-firmware/edk2-bin
628628
sys-firmware/intel-microcode
629629
sys-firmware/ipxe
630630
sys-firmware/seabios-bin
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- containers-common ([CVE-2024-9341](https://nvd.nist.gov/vuln/detail/CVE-2024-9341))
2+
- containers-image ([CVE-2024-3727](https://nvd.nist.gov/vuln/detail/CVE-2024-3727))
3+
- podman ([CVE-2024-9407](https://nvd.nist.gov/vuln/detail/CVE-2024-9407))
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
- SDK: catalyst ([4.0.0](https://gitweb.gentoo.org/proj/catalyst.git/log/?h=4.0.0))
2+
- SDK: crossdev ([20240921](https://gitweb.gentoo.org/proj/crossdev.git/log/?h=20240921))
3+
- SDK: edk2-bin ([202408](https://github.com/tianocore/edk2/releases/tag/edk2-stable202408) (includes [202405](https://github.com/tianocore/edk2/releases/tag/edk2-stable202405), [202402](https://github.com/tianocore/edk2/releases/tag/edk2-stable202402), [202311](https://github.com/tianocore/edk2/releases/tag/edk2-stable202311), [202308](https://github.com/tianocore/edk2/releases/tag/edk2-stable202308), [202305](https://github.com/tianocore/edk2/releases/tag/edk2-stable202305), [202302](https://github.com/tianocore/edk2/releases/tag/edk2-stable202302), [202211](https://github.com/tianocore/edk2/releases/tag/edk2-stable202211), [202208](https://github.com/tianocore/edk2/releases/tag/edk2-stable202208), [202205](https://github.com/tianocore/edk2/releases/tag/edk2-stable202205)))
4+
- SDK: meson ([1.5.2](https://github.com/mesonbuild/meson/commits/1.5.2/))
5+
- SDK: rust ([1.81.0](https://blog.rust-lang.org/2024/09/05/Rust-1.81.0.html))
6+
- base, dev: ldb ([2.8.1](https://gitlab.com/samba-team/samba/-/commit/6ca4df6374136d1d205de689618dc8fce5177d14) (includes [2.8.0](https://gitlab.com/samba-team/samba/-/commit/94f11c3c21bc3b8a34d376ab99becd2c6260af62)))
7+
- base, dev: libgcrypt ([1.11.0](https://dev.gnupg.org/T7165))
8+
- base, dev: samba ([4.19.7](https://gitlab.com/samba-team/samba/-/blob/bce5c475d12fb75619bc85d176bfd40420b4fce8/WHATSNEW.txt))
9+
- base, dev: selinux-base ([2.20240916](https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20240916))
10+
- base, dev: selinux-base-policy ([2.20240916](https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20240916))
11+
- base, dev: selinux-container ([2.20240916](https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20240916))
12+
- base, dev: selinux-dbus ([2.20240916](https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20240916))
13+
- base, dev: selinux-policykit ([2.20240916](https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20240916))
14+
- base, dev: selinux-sssd ([2.20240916](https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20240916))
15+
- base, dev: selinux-unconfined ([2.20240916](https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20240916))
16+
- base, dev: socat ([1.8.0.0](https://repo.or.cz/socat.git/blob/2da070164d454971d5c970b5278e645051f0d0f7:/CHANGES))
17+
- base, dev: talloc ([2.4.2](https://gitlab.com/samba-team/samba/-/commit/f28966c1638806a5af1fa4e451b668af638491ce))
18+
- base, dev: tdb ([1.4.10](https://gitlab.com/samba-team/samba/-/commit/5032ab712c6e9d6562cd10b1d840d2ee052d1d16))
19+
- base, dev: tevent ([0.16.1](https://gitlab.com/samba-team/samba/-/commit/0ba05d5bbb1788b0b8cee26748bcda0c90c48baa) (includes [0.16.0](https://gitlab.com/samba-team/samba/-/commit/acd9248b13cba06d5b748f17aa9bc5d62079d9cc)))
20+
- dev: gdb ([15.2](https://lists.gnu.org/archive/html/info-gnu/2024-09/msg00011.html))
21+
- sysext-podman: aardvark-dns ([1.12.2](https://github.com/containers/aardvark-dns/releases/tag/v1.12.2) (includes [1.12.1](https://github.com/containers/aardvark-dns/releases/tag/v1.12.1), [1.12.0](https://github.com/containers/aardvark-dns/releases/tag/v1.12.0)))
22+
- sysext-podman: containers-common ([0.60.4](https://github.com/containers/common/releases/tag/v0.60.4) (includes [0.60.3](https://github.com/containers/common/releases/tag/v0.60.3), [0.60.2](https://github.com/containers/common/releases/tag/v0.60.2), [0.60.1](https://github.com/containers/common/releases/tag/v0.60.1), [0.60.0](https://github.com/containers/common/releases/tag/v0.60.0), [0.59.2](https://github.com/containers/common/releases/tag/v0.59.2)))
23+
- sysext-podman: containers-image ([5.32.2](https://github.com/containers/image/releases/tag/v5.32.2) (includes [5.32.1](https://github.com/containers/image/releases/tag/v5.32.1), [5.32.0](https://github.com/containers/image/releases/tag/v5.32.0), [5.31.0](https://github.com/containers/image/releases/tag/v5.31.0), [5.30.2](https://github.com/containers/image/releases/tag/v5.30.2), [5.30.1](https://github.com/containers/image/releases/tag/v5.30.1)))
24+
- sysext-podman: containers-storage ([1.55.0](https://github.com/containers/storage/releases/tag/v1.55.0) (includes [1.54.0](https://github.com/containers/storage/releases/tag/v1.54.0)))
25+
- sysext-podman: crun ([1.17](https://github.com/containers/crun/releases/tag/1.17) (includes [1.16.1](https://github.com/containers/crun/releases/tag/1.16.1), [1.16](https://github.com/containers/crun/releases/tag/1.16), [1.15](https://github.com/containers/crun/releases/tag/1.15), [1.14.4](https://github.com/containers/crun/releases/tag/1.14.4)))
26+
- sysext-podman: fuse-overlayfs ([1.14](https://github.com/containers/fuse-overlayfs/releases/tag/v1.14))
27+
- sysext-podman: netavark ([1.12.2](https://github.com/containers/netavark/releases/tag/v1.12.2) (includes [1.12.1](https://github.com/containers/netavark/releases/tag/v1.12.1), [1.12.0](https://github.com/containers/netavark/releases/tag/v1.12.0), [1.11.0](https://github.com/containers/netavark/releases/tag/v1.11.0)))
28+
- sysext-podman: passt ([2024.09.06](https://archives.passt.top/passt-user/20240906171530.763b3179@elisabeth/T/#u))
29+
- sysext-podman: podman ([5.2.4](https://github.com/containers/podman/releases/tag/v5.2.4) (includes [5.2.3](https://github.com/containers/podman/releases/tag/v5.2.3), [5.2.2](https://github.com/containers/podman/releases/tag/v5.2.2), [5.2.1](https://github.com/containers/podman/releases/tag/v5.2.1), [5.2.0](https://github.com/containers/podman/releases/tag/v5.2.0), [5.1.2](https://github.com/containers/podman/releases/tag/v5.1.2), [5.1.1](https://github.com/containers/podman/releases/tag/v5.1.1), [5.1.0](https://github.com/containers/podman/releases/tag/v5.1.0)))
30+
- sysext-python: setuptools ([74.1.3](https://github.com/pypa/setuptools/blob/v74.1.3/NEWS.rst))

sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ DEPEND="
4343
sys-apps/seismograph
4444
sys-boot/grub
4545
amd64? ( sys-boot/shim )
46-
sys-firmware/edk2-ovmf-bin
46+
sys-firmware/edk2-bin
4747
sys-fs/btrfs-progs
4848
sys-fs/cryptsetup
4949
dev-perl/Parse-Yapp

sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sec-policy/flatcar-selinux-patches/0001-Flatcar-modifications.patch

Lines changed: 59 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 07cf1b05c8b3b9460b4afc2998a9f170881faa16 Mon Sep 17 00:00:00 2001
1+
From b4725fecc9298279266ecfd842536b1b1c03cdb0 Mon Sep 17 00:00:00 2001
22
From: Krzesimir Nowak <[email protected]>
33
Date: Mon, 4 Dec 2023 12:17:25 +0100
44
Subject: [PATCH] Flatcar modifications
@@ -8,16 +8,16 @@ Subject: [PATCH] Flatcar modifications
88
policy/modules/kernel/corenetwork.if.in | 26 ++++
99
policy/modules/kernel/corenetwork.te.in | 12 +-
1010
policy/modules/kernel/files.if | 45 +++++++
11-
policy/modules/kernel/kernel.te | 84 ++++++++++++
11+
policy/modules/kernel/kernel.te | 125 +++++++++++++++++
1212
policy/modules/services/container.fc | 6 +
1313
policy/modules/services/container.te | 170 +++++++++++++++++++++++-
1414
policy/modules/system/init.te | 8 ++
1515
policy/modules/system/locallogin.te | 9 +-
1616
policy/modules/system/logging.te | 9 ++
17-
10 files changed, 386 insertions(+), 3 deletions(-)
17+
10 files changed, 427 insertions(+), 3 deletions(-)
1818

1919
diff --git a/refpolicy/policy/modules/admin/netutils.te b/refpolicy/policy/modules/admin/netutils.te
20-
index 3c43a1d84..429c67220 100644
20+
index 63d2f9cb8..62dff5f94 100644
2121
--- a/refpolicy/policy/modules/admin/netutils.te
2222
+++ b/refpolicy/policy/modules/admin/netutils.te
2323
@@ -128,6 +128,16 @@ corenet_raw_sendrecv_generic_if(ping_t)
@@ -37,7 +37,7 @@ index 3c43a1d84..429c67220 100644
3737

3838
dev_read_urand(ping_t)
3939

40-
@@ -212,6 +222,16 @@ corenet_udp_bind_traceroute_port(traceroute_t)
40+
@@ -213,6 +223,16 @@ corenet_udp_bind_traceroute_port(traceroute_t)
4141
corenet_tcp_connect_all_ports(traceroute_t)
4242
corenet_sendrecv_all_client_packets(traceroute_t)
4343
corenet_sendrecv_traceroute_server_packets(traceroute_t)
@@ -55,7 +55,7 @@ index 3c43a1d84..429c67220 100644
5555
dev_read_rand(traceroute_t)
5656
dev_read_urand(traceroute_t)
5757
diff --git a/refpolicy/policy/modules/kernel/corenetwork.if.in b/refpolicy/policy/modules/kernel/corenetwork.if.in
58-
index d1038d742..a675c8e28 100644
58+
index bc1535469..d057c4031 100644
5959
--- a/refpolicy/policy/modules/kernel/corenetwork.if.in
6060
+++ b/refpolicy/policy/modules/kernel/corenetwork.if.in
6161
@@ -877,6 +877,32 @@ interface(`corenet_sctp_bind_generic_node',`
@@ -92,7 +92,7 @@ index d1038d742..a675c8e28 100644
9292
## <summary>
9393
## Bind TCP sockets to generic nodes.
9494
diff --git a/refpolicy/policy/modules/kernel/corenetwork.te.in b/refpolicy/policy/modules/kernel/corenetwork.te.in
95-
index 53bf7849c..9edac05e8 100644
95+
index b1649ec3a..ca612de44 100644
9696
--- a/refpolicy/policy/modules/kernel/corenetwork.te.in
9797
+++ b/refpolicy/policy/modules/kernel/corenetwork.te.in
9898
@@ -381,7 +381,17 @@ allow corenet_unconfined_type port_type:sctp_socket { name_connect };
@@ -115,10 +115,10 @@ index 53bf7849c..9edac05e8 100644
115115
# Infiniband
116116
corenet_ib_access_all_pkeys(corenet_unconfined_type)
117117
diff --git a/refpolicy/policy/modules/kernel/files.if b/refpolicy/policy/modules/kernel/files.if
118-
index b9c451321..104dc1e3e 100644
118+
index 778e82713..d1bd353e0 100644
119119
--- a/refpolicy/policy/modules/kernel/files.if
120120
+++ b/refpolicy/policy/modules/kernel/files.if
121-
@@ -8023,3 +8023,48 @@ interface(`files_relabel_all_pidfiles',`
121+
@@ -8065,3 +8065,48 @@ interface(`files_relabel_all_pidfiles',`
122122
relabel_files_pattern($1, pidfile, pidfile)
123123
relabel_lnk_files_pattern($1, pidfile, pidfile)
124124
')
@@ -168,10 +168,10 @@ index b9c451321..104dc1e3e 100644
168168
+ relabelfrom_chr_files_pattern($1, { file_type -policy_config_t $2 }, { file_type -policy_config_t $2 })
169169
+')
170170
diff --git a/refpolicy/policy/modules/kernel/kernel.te b/refpolicy/policy/modules/kernel/kernel.te
171-
index a3dbeeeda..69d6bc9f0 100644
171+
index b791ebc71..c80159473 100644
172172
--- a/refpolicy/policy/modules/kernel/kernel.te
173173
+++ b/refpolicy/policy/modules/kernel/kernel.te
174-
@@ -376,6 +376,90 @@ files_mounton_default(kernel_t)
174+
@@ -377,6 +377,131 @@ files_mounton_default(kernel_t)
175175

176176
mcs_process_set_categories(kernel_t)
177177

@@ -258,6 +258,47 @@ index a3dbeeeda..69d6bc9f0 100644
258258
+optional_policy(`
259259
+ mount_watch_reads_runtime_files(kernel_t)
260260
+')
261+
+
262+
+#
263+
+# FLATCAR:
264+
+#
265+
+# This one happens in cl.update.docker-btrfs-compat, cl.update.oem and cl.update.payload.
266+
+#
267+
+# avc: denied { perfmon } for pid=[0-9]* comm="systemd" capability=38 scontext=system_u:system_r:kernel_t:s0 tcontext=system_u:system_r:kernel_t:s0 tclass=capability2 permissive=1
268+
+# avc: denied { perfmon } for pid=[0-9]* comm="systemd" capability=38 scontext=system_u:system_r:kernel_t:s0 tcontext=system_u:system_r:kernel_t:s0 tclass=capability2 permissive=0
269+
+# avc: denied { perfmon } for pid=[0-9]* comm="runc" capability=38 scontext=system_u:system_r:kernel_t:s0 tcontext=system_u:system_r:kernel_t:s0 tclass=capability2 permissive=0
270+
+#
271+
+allow kernel_t self:capability2 { perfmon };
272+
+
273+
+#
274+
+# FLATCAR:
275+
+#
276+
+# This one happens in sysext.zfs.reboot. The kernel module is a part
277+
+# of sysext, and it probably is labeled wrong.
278+
+#
279+
+# avc: denied { module_load } for pid=[0-9]* comm="modprobe" path="/usr/lib/modules/6.6.56-flatcar/extra/spl.ko" dev="overlay" ino=[0-9]* scontext=system_u:system_r:kernel_t:s0 tcontext=system_u:object_r:unlabeled_t:s0 tclass=system permissive=1
280+
+#
281+
+allow kernel_t unlabeled_t:system { module_load };
282+
+
283+
+#
284+
+# FLATCAR:
285+
+#
286+
+# This one happens in cl.update.docker-btrfs-compat, cl.update.oem and cl.update.payload.
287+
+#
288+
+# avc: denied { confidentiality } for pid=[0-9]* comm="systemd-udevd" lockdown_reason="use of tracefs" scontext=system_u:system_r:kernel_t:s0 tcontext=system_u:system_r:kernel_t:s0 tclass=lockdown permissive=1
289+
+#
290+
+allow kernel_t self:lockdown { confidentiality };
291+
+
292+
+#
293+
+# FLATCAR:
294+
+#
295+
+# This one happens in cl.update.docker-btrfs-compat, cl.update.oem and cl.update.payload.
296+
+#
297+
+# avc: denied { bpf } for pid=[0-9]* comm="systemd" capability=39 scontext=system_u:system_r:kernel_t:s0 tcontext=system_u:system_r:kernel_t:s0 tclass=capability2 permissive=1
298+
+# avc: denied { bpf } for pid=[0-9]* comm="systemd" capability=39 scontext=system_u:system_r:kernel_t:s0 tcontext=system_u:system_r:kernel_t:s0 tclass=capability2 permissive=0
299+
+# avc: denied { bpf } for pid=[0-9]* comm="runc" capability=39 scontext=system_u:system_r:kernel_t:s0 tcontext=system_u:system_r:kernel_t:s0 tclass=capability2 permissive=0
300+
+#
301+
+allow kernel_t self:capability2 { bpf };
261302
+
262303
mls_process_read_all_levels(kernel_t)
263304
mls_process_write_all_levels(kernel_t)
@@ -280,7 +321,7 @@ index f98e68ba0..045b1b5b2 100644
280321
/run/containers(/.*)? gen_context(system_u:object_r:container_runtime_t,s0)
281322
/run/crun(/.*)? gen_context(system_u:object_r:container_runtime_t,s0)
282323
diff --git a/refpolicy/policy/modules/services/container.te b/refpolicy/policy/modules/services/container.te
283-
index 095308a13..7cd6e45e4 100644
324+
index 8fcd88e1e..ab16ff8b7 100644
284325
--- a/refpolicy/policy/modules/services/container.te
285326
+++ b/refpolicy/policy/modules/services/container.te
286327
@@ -58,6 +58,52 @@ gen_tunable(container_use_dri, false)
@@ -345,7 +386,7 @@ index 095308a13..7cd6e45e4 100644
345386

346387
## <desc>
347388
## <p>
348-
@@ -1192,3 +1238,125 @@ optional_policy(`
389+
@@ -1247,3 +1293,125 @@ optional_policy(`
349390
unconfined_domain_noaudit(spc_user_t)
350391
domain_ptrace_all_domains(spc_user_t)
351392
')
@@ -472,10 +513,10 @@ index 095308a13..7cd6e45e4 100644
472513
+#
473514
+allow container_t tmp_t:file { read };
474515
diff --git a/refpolicy/policy/modules/system/init.te b/refpolicy/policy/modules/system/init.te
475-
index 03d0de8ed..16b75d04d 100644
516+
index 796426508..e1761f8fd 100644
476517
--- a/refpolicy/policy/modules/system/init.te
477518
+++ b/refpolicy/policy/modules/system/init.te
478-
@@ -1678,3 +1678,11 @@ optional_policy(`
519+
@@ -1686,3 +1686,11 @@ optional_policy(`
479520
userdom_dontaudit_rw_all_users_stream_sockets(systemprocess)
480521
userdom_dontaudit_write_user_tmp_files(systemprocess)
481522
')
@@ -488,12 +529,12 @@ index 03d0de8ed..16b75d04d 100644
488529
+require { type unconfined_t; }
489530
+allow init_t unconfined_t:file exec_file_perms;
490531
diff --git a/refpolicy/policy/modules/system/locallogin.te b/refpolicy/policy/modules/system/locallogin.te
491-
index 4dc9981bc..ee68ba624 100644
532+
index 9534db006..e60eb7b59 100644
492533
--- a/refpolicy/policy/modules/system/locallogin.te
493534
+++ b/refpolicy/policy/modules/system/locallogin.te
494535
@@ -34,7 +34,14 @@ role system_r types sulogin_t;
495536

496-
allow local_login_t self:capability { chown dac_read_search dac_override fowner fsetid kill setgid setuid sys_nice sys_resource sys_tty_config };
537+
allow local_login_t self:capability { chown dac_override dac_read_search fowner fsetid kill setgid setuid sys_nice sys_resource sys_tty_config };
497538
dontaudit local_login_t self:capability net_admin;
498539
-allow local_login_t self:process { getcap setcap setexec setrlimit setsched };
499540
+#
@@ -508,7 +549,7 @@ index 4dc9981bc..ee68ba624 100644
508549
allow local_login_t self:fifo_file rw_fifo_file_perms;
509550
allow local_login_t self:sock_file read_sock_file_perms;
510551
diff --git a/refpolicy/policy/modules/system/logging.te b/refpolicy/policy/modules/system/logging.te
511-
index a7b6173d8..343ef1abc 100644
552+
index ed01f0e4a..9504b6e72 100644
512553
--- a/refpolicy/policy/modules/system/logging.te
513554
+++ b/refpolicy/policy/modules/system/logging.te
514555
@@ -507,6 +507,15 @@ userdom_dontaudit_search_user_home_dirs(syslogd_t)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DIST samba-4.18.9.tar.gz 41332779 BLAKE2B 8a0769c73d42b941b6f69d62243dd2b93d66748231465b853320cf1bf4b3dd8a912ac7bddfaa9c8b1941788951c2ccd630dabb23cf94965bc1d1e4cb5d74d123 SHA512 93a6c878bca583f59208df2a7865bbd453f7a65dc2f39a863797ef807bdeced4d632c5edd4579e341f8cf3b0b2fbe41e68a815a1510518bdd43e9a25a973c94c
1+
DIST samba-4.19.7.tar.gz 41851647 BLAKE2B 9bd58363d4cd30f900b286be7c7e172ed0308c4527308d15309a5f3881ba9b1d4c3dd2a37f19d63fdf80a36bd89c9b6001ab2a5aefb724f10721e3a0dc09fa94 SHA512 a837a6255be6268a48c9f41ccad5db040c69b596936a37b011a4c8e3ec68f27ebd1947b86d26b544a7b546ed426dadc450353dff9553698ca4e6e0a3af162ad3

sdk_container/src/third_party/coreos-overlay/net-fs/samba/metadata.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
<flag name="cluster">Enable support for clustering</flag>
1717
<flag name="glusterfs">Enable support for Glusterfs filesystem via <pkg>sys-cluster/glusterfs</pkg></flag>
1818
<flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> for AD DC</flag>
19-
<flag name="json">Enable json audit support through <pkg>dev-libs/jansson</pkg></flag>
2019
<flag name="iprint">Enabling iPrint technology by Novell</flag>
20+
<flag name="json">Enable json audit support through <pkg>dev-libs/jansson</pkg></flag>
21+
<flag name="lmdb">Enable LMDB backend for bundled ldb</flag>
2122
<flag name="profiling-data">Enables support for collecting profiling data</flag>
2223
<flag name="quota">Enables support for user quotas</flag>
2324
<flag name="regedit">Enable support for regedit command-line tool</flag>

sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.18.9.ebuild renamed to sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.19.7.ebuild

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
EAPI=8
55

6-
PYTHON_COMPAT=( python3_{10..11} )
6+
PYTHON_COMPAT=( python3_{10..12} )
77
PYTHON_REQ_USE="threads(+),xml(+)"
88
TMPFILES_OPTIONAL=1
99
inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles
@@ -17,13 +17,13 @@ if [[ ${PV} == *_rc* ]]; then
1717
SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
1818
else
1919
SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
20-
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
20+
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
2121
fi
2222
S="${WORKDIR}/${MY_P}"
2323

2424
LICENSE="GPL-3"
2525
SLOT="0"
26-
IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg"
26+
IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg"
2727
IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux"
2828
IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind"
2929
IUSE+=" zeroconf"
@@ -57,9 +57,9 @@ MULTILIB_WRAPPED_HEADERS=(
5757
/usr/include/samba-4.0/ctdb_version.h
5858
)
5959

60-
TALLOC_VERSION="2.4.0"
61-
TDB_VERSION="1.4.8"
62-
TEVENT_VERSION="0.14.1"
60+
TALLOC_VERSION="2.4.1"
61+
TDB_VERSION="1.4.9"
62+
TEVENT_VERSION="0.15.0"
6363

6464
# Flatcar: exclude perl, icu, libtasn1, Parse-Yapp from DEPEND
6565
COMMON_DEPEND="
@@ -70,8 +70,8 @@ COMMON_DEPEND="
7070
dev-libs/popt[${MULTILIB_USEDEP}]
7171
>=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}]
7272
>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
73-
>=sys-libs/ldb-2.7.2:=[ldap(+)?,${MULTILIB_USEDEP}]
74-
<sys-libs/ldb-2.8.0:=[ldap(+)?,${MULTILIB_USEDEP}]
73+
>=sys-libs/ldb-2.8.1:=[ldap(+)?,${MULTILIB_USEDEP}]
74+
<sys-libs/ldb-2.9.0:=[ldap(+)?,${MULTILIB_USEDEP}]
7575
sys-libs/libcap[${MULTILIB_USEDEP}]
7676
sys-libs/liburing:=[${MULTILIB_USEDEP}]
7777
sys-libs/ncurses:=
@@ -111,6 +111,7 @@ COMMON_DEPEND="
111111
snapper? ( sys-apps/dbus )
112112
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] )
113113
system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
114+
!system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
114115
systemd? ( sys-apps/systemd:= )
115116
unwind? (
116117
llvm-libunwind? ( sys-libs/llvm-libunwind:= )
@@ -269,7 +270,6 @@ multilib_src_configure() {
269270
--nopyc
270271
--nopyo
271272
--without-winexe
272-
--accel-aes=$(usex cpu_flags_x86_aes intelaesni none)
273273
$(multilib_native_use_with acl acl-support)
274274
$(multilib_native_usex addc '' '--without-ad-dc')
275275
$(multilib_native_use_with ads)
@@ -377,6 +377,8 @@ multilib_src_install() {
377377
dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
378378
dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
379379
dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
380+
381+
use python && python_optimize
380382
fi
381383

382384
if use pam && use winbind ; then

0 commit comments

Comments
 (0)