From 1c795d5e8dea3cbfb9297c9ab567676b20e839a0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Nov 2025 07:11:59 +0000 Subject: [PATCH] net-fs/samba: Sync with Gentoo It's from Gentoo commit 88b78aeb2c1c3c8774e3234ff47ed984ee523316. Signed-off-by: Flatcar Buildbot --- .../portage-stable/net-fs/samba/samba-4.20.8-r1.ebuild | 2 +- .../portage-stable/net-fs/samba/samba-4.21.7.ebuild | 2 +- .../portage-stable/net-fs/samba/samba-4.21.8.ebuild | 4 +++- .../portage-stable/net-fs/samba/samba-4.21.9-r1.ebuild | 4 +++- .../portage-stable/net-fs/samba/samba-4.22.3.ebuild | 2 +- .../portage-stable/net-fs/samba/samba-4.22.4.ebuild | 4 +++- .../portage-stable/net-fs/samba/samba-4.22.5-r1.ebuild | 6 ++++-- .../portage-stable/net-fs/samba/samba-4.23.0.ebuild | 4 +++- .../portage-stable/net-fs/samba/samba-4.23.2-r1.ebuild | 6 ++++-- 9 files changed, 23 insertions(+), 11 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.20.8-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.20.8-r1.ebuild index 1a0f932971..b0c63cceef 100644 --- a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.20.8-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.20.8-r1.ebuild @@ -78,7 +78,7 @@ COMMON_DEPEND=" >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/zlib:=[${MULTILIB_USEDEP}] virtual/libcrypt:=[${MULTILIB_USEDEP}] virtual/libiconv $(python_gen_cond_dep ' diff --git a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.21.7.ebuild b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.21.7.ebuild index 054c5dc47b..7825cd88cd 100644 --- a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.21.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.21.7.ebuild @@ -79,7 +79,7 @@ COMMON_DEPEND=" >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/zlib:=[${MULTILIB_USEDEP}] virtual/libcrypt:=[${MULTILIB_USEDEP}] virtual/libiconv $(python_gen_cond_dep ' diff --git a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.21.8.ebuild b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.21.8.ebuild index 859ebf0287..7825cd88cd 100644 --- a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.21.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.21.8.ebuild @@ -79,7 +79,7 @@ COMMON_DEPEND=" >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/zlib:=[${MULTILIB_USEDEP}] virtual/libcrypt:=[${MULTILIB_USEDEP}] virtual/libiconv $(python_gen_cond_dep ' @@ -304,6 +304,8 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) # bug 914898 + append-cppflags "-I${ESYSROOT}/usr/include/et" waf-utils_src_configure ${myconf[@]} diff --git a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.21.9-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.21.9-r1.ebuild index 6566205eed..659c7cd530 100644 --- a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.21.9-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.21.9-r1.ebuild @@ -79,7 +79,7 @@ COMMON_DEPEND=" >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/zlib:=[${MULTILIB_USEDEP}] virtual/libcrypt:=[${MULTILIB_USEDEP}] virtual/libiconv $(python_gen_cond_dep ' @@ -308,6 +308,8 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) # bug 914898 + append-cppflags "-I${ESYSROOT}/usr/include/et" waf-utils_src_configure ${myconf[@]} diff --git a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.22.3.ebuild b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.22.3.ebuild index 04c0ea147e..b07d5ef352 100644 --- a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.22.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.22.3.ebuild @@ -79,7 +79,7 @@ COMMON_DEPEND=" >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/zlib:=[${MULTILIB_USEDEP}] virtual/libcrypt:=[${MULTILIB_USEDEP}] virtual/libiconv $(python_gen_cond_dep ' diff --git a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.22.4.ebuild b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.22.4.ebuild index 27bc11609d..6e443b4b49 100644 --- a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.22.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.22.4.ebuild @@ -79,7 +79,7 @@ COMMON_DEPEND=" >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/zlib:=[${MULTILIB_USEDEP}] virtual/libcrypt:=[${MULTILIB_USEDEP}] virtual/libiconv $(python_gen_cond_dep ' @@ -304,6 +304,8 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) # bug 914898 + append-cppflags "-I${ESYSROOT}/usr/include/et" waf-utils_src_configure ${myconf[@]} diff --git a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.22.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.22.5-r1.ebuild index dcbcc71af3..7578ac5f62 100644 --- a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.22.5-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.22.5-r1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == *_rc* ]]; then SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" else SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" fi S="${WORKDIR}/${MY_P}" @@ -79,7 +79,7 @@ COMMON_DEPEND=" >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/zlib:=[${MULTILIB_USEDEP}] virtual/libcrypt:=[${MULTILIB_USEDEP}] virtual/libiconv $(python_gen_cond_dep ' @@ -308,6 +308,8 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) # bug 914898 + append-cppflags "-I${ESYSROOT}/usr/include/et" waf-utils_src_configure ${myconf[@]} diff --git a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.23.0.ebuild b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.23.0.ebuild index 4887f81256..6c3ef48d1e 100644 --- a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.23.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.23.0.ebuild @@ -80,7 +80,7 @@ COMMON_DEPEND=" >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/zlib:=[${MULTILIB_USEDEP}] virtual/libcrypt:=[${MULTILIB_USEDEP}] virtual/libiconv $(python_gen_cond_dep ' @@ -307,6 +307,8 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) # bug 914898 + append-cppflags "-I${ESYSROOT}/usr/include/et" waf-utils_src_configure ${myconf[@]} diff --git a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.23.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.23.2-r1.ebuild index dd7219c462..288ddd8e85 100644 --- a/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.23.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-fs/samba/samba-4.23.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{11..13} ) +PYTHON_COMPAT=( python3_{11..14} ) PYTHON_REQ_USE="threads(+),xml(+)" inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles @@ -80,7 +80,7 @@ COMMON_DEPEND=" >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/zlib:=[${MULTILIB_USEDEP}] virtual/libcrypt:=[${MULTILIB_USEDEP}] virtual/libiconv $(python_gen_cond_dep ' @@ -311,6 +311,8 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) # bug 914898 + append-cppflags "-I${ESYSROOT}/usr/include/et" waf-utils_src_configure ${myconf[@]}