commit:     35c319952a14cc8122fc56c5df5b4241935411bd
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 17 17:00:03 2025 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Nov 17 17:28:17 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c31995

net-fs/samba: add 4.21.10

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 net-fs/samba/Manifest             |   1 +
 net-fs/samba/samba-4.21.10.ebuild | 393 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 394 insertions(+)

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 30dccdf41190..12e9e15f34bb 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,4 +1,5 @@
 DIST samba-4.20.8.tar.gz 42531989 BLAKE2B 
4c8d6d4fe40c0640667089179af5a8a49e6117fcd46b735ac59ffad0334e7fddffb99d2204c30d272a1902b8bf22bc9dc10a7b58762642977f0aec25acb91a57
 SHA512 
1dc598cb3aa830d35985e5840f1956d48b93eef02805248ececd0eb472b514311a9f6e69798bb5f5735a845b6e1c8de84b4ecaff6dea7a61324202d6fb0b3eeb
+DIST samba-4.21.10.tar.gz 42700998 BLAKE2B 
44029738256a44a9e4b86cf4dc198e3b0145d382005a444e32522138fe1127018c2cbb3b2f4bbd43e7c27911b09cf435fdd213a69404a98a80745b3090262f1f
 SHA512 
2911620ff6ff09ae3b85e277bc1e1b783ccfe4f0bfd5a31f4df31e546a1eee698923fae1daa112e0c41f37d47a452f4306893883438b26e95e0fc7f5d1f67341
 DIST samba-4.21.7.tar.gz 42689509 BLAKE2B 
c7cfdab05402f0df38c1a643126072fdaf4d031e339e171180009ecaf9de7d06c490f344b2eea6ccec1021ecbf84aabe5c0d9b2718ab461f95502ce52dd1ffbc
 SHA512 
f44a0dc880b2a5694f9c46ff11c808ae263f68c91cc9b0e32869bb44f84c1fdcc49370a396f38e0f452133c29357d8ad80a689af67bd85f648b2121e7792b555
 DIST samba-4.21.8.tar.gz 42696867 BLAKE2B 
b86d9a5f2ae072b50555757d97241ff48d2a1155323da43c70a6f809a1fb2e303077d414b6614ca1740e06b4f613d1754860eeed043d65afc77cf1ecf2fc823f
 SHA512 
194d89f2df2513b9e7e84b2b2554c8f553f6115ba98d3b3dee3efced33cbce74c9b4fac119625a4b772a516ab3fcb21595e1bd2e6f9bf3d162b25f6bb25b6dce
 DIST samba-4.21.9.tar.gz 42695134 BLAKE2B 
21132a5fb75d42772f7c6ba414f7bb7b862e43d10b84a97155b1f2aeb40d4841d36697e9a6a795eed2a38a7076933b0b2cd731ea679f0dc820137b897be9e835
 SHA512 
465ccb912c443e3b187d9662f605141011626b12ebc979558e3c710487382cae8fe110e0bc5232f04c839cb5d13313f8f68f2edd2511ead31cefb9096ecdcf08

diff --git a/net-fs/samba/samba-4.21.10.ebuild 
b/net-fs/samba/samba-4.21.10.ebuild
new file mode 100644
index 000000000000..659c7cd530d7
--- /dev/null
+++ b/net-fs/samba/samba-4.21.10.ebuild
@@ -0,0 +1,393 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info 
systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/";
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+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"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0/2.10.0"
+IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg"
+IUSE+=" iprint json ldap llvm-libunwind lmdb pam profiling-data python quota"
+IUSE+=" +regedit selinux snapper spotlight syslog system-heimdal 
+system-mitkrb5"
+IUSE+=" systemd test unwind winbind zeroconf"
+
+# ldap needs ads (bug #941578)
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+       addc? ( json python !system-mitkrb5 winbind )
+       ads? ( acl ldap python winbind )
+       cluster? ( ads )
+       gpg? ( addc )
+       ldap? ( ads )
+       spotlight? ( json )
+       test? ( python )
+       !ads? ( !addc )
+       ?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+       /usr/include/samba-4.0/policy.h
+       /usr/include/samba-4.0/dcerpc_server.h
+       /usr/include/samba-4.0/ctdb.h
+       /usr/include/samba-4.0/ctdb_client.h
+       /usr/include/samba-4.0/ctdb_protocol.h
+       /usr/include/samba-4.0/ctdb_private.h
+       /usr/include/samba-4.0/ctdb_typesafe_cb.h
+       /usr/include/samba-4.0/ctdb_version.h
+)
+
+TALLOC_VERSION="2.4.2"
+TDB_VERSION="1.4.12"
+TEVENT_VERSION="0.16.1"
+
+COMMON_DEPEND="
+       >=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}]
+       dev-lang/perl:=
+       dev-libs/icu:=[${MULTILIB_USEDEP}]
+       dev-libs/libbsd[${MULTILIB_USEDEP}]
+       dev-libs/libtasn1:=[${MULTILIB_USEDEP}]
+       dev-libs/popt[${MULTILIB_USEDEP}]
+       dev-perl/Parse-Yapp
+       >=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}]
+       >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+       !sys-libs/ldb
+       sys-libs/libcap[${MULTILIB_USEDEP}]
+       sys-libs/liburing:=[${MULTILIB_USEDEP}]
+       sys-libs/ncurses:=
+       sys-libs/readline:=
+       >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
+       >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
+       >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}]
+       virtual/zlib:=[${MULTILIB_USEDEP}]
+       virtual/libcrypt:=[${MULTILIB_USEDEP}]
+       virtual/libiconv
+       $(python_gen_cond_dep '
+               addc? (
+                       dev-python/cryptography[${PYTHON_USEDEP}]
+                       dev-python/dnspython:=[${PYTHON_USEDEP}]
+                       dev-python/markdown[${PYTHON_USEDEP}]
+                       net-dns/bind[gssapi]
+               )
+               ads? (
+                       dev-python/cryptography[${PYTHON_USEDEP}]
+                       dev-python/dnspython:=[${PYTHON_USEDEP}]
+                       dev-python/markdown[${PYTHON_USEDEP}]
+                       net-dns/bind[gssapi]
+               )
+       ')
+       acl? ( virtual/acl )
+       ceph? ( sys-cluster/ceph )
+       cluster? ( net-libs/rpcsvc-proto )
+       cups? ( net-print/cups )
+       debug? ( dev-util/lttng-ust )
+       fam? ( virtual/fam )
+       gpg? ( app-crypt/gpgme:= )
+       json? ( dev-libs/jansson:= )
+       ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+       lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] )
+       pam? ( sys-libs/pam )
+       python? (
+               sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+               sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+               sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+       )
+       snapper? ( sys-apps/dbus )
+       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] )
+       system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
+       !system-heimdal? ( !system-mitkrb5? ( 
sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
+       systemd? ( sys-apps/systemd:= )
+       unwind? (
+               llvm-libunwind? ( llvm-runtimes/libunwind:= )
+               !llvm-libunwind? ( sys-libs/libunwind:= )
+       )
+       zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+       dev-perl/JSON
+       net-libs/libtirpc[${MULTILIB_USEDEP}]
+       net-libs/rpcsvc-proto
+       spotlight? ( dev-libs/glib )
+       test? (
+               >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+               $(python_gen_cond_dep 
"dev-python/python-subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+               !system-mitkrb5? (
+                       >=net-dns/resolv_wrapper-1.1.4
+                       >=net-libs/socket_wrapper-1.1.9
+                       >=sys-libs/nss_wrapper-1.1.3
+                       >=sys-libs/uid_wrapper-1.2.1
+               )
+       )"
+RDEPEND="${COMMON_DEPEND}
+       client? ( net-fs/cifs-utils[ads?] )
+       python? ( ${PYTHON_DEPS} )
+       selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+       app-text/docbook-xsl-stylesheets
+       dev-libs/libxslt
+       virtual/pkgconfig
+"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-4.18.4-pam.patch
+       "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch
+)
+
+CONFDIR="${FILESDIR}/4.4"
+WAF_BINARY="${S}/buildtools/bin/waf"
+SHAREDMODS=""
+
+pkg_setup() {
+       # Package fails to build with distcc
+       export DISTCC_DISABLE=1
+       export PYTHONHASHSEED=1
+
+       python-single-r1_pkg_setup
+
+       SHAREDMODS="$(usev !snapper '!')vfs_snapper"
+       if use cluster ; then
+               SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+       elif use ads ; then
+               SHAREDMODS+=",idmap_ad"
+       fi
+}
+
+check_samba_dep_versions() {
+       actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' 
lib/talloc/wscript || die)
+       if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
+               eerror "Source talloc version: ${TALLOC_VERSION}"
+               eerror "Ebuild talloc version: ${actual_talloc_version}"
+               die "Ebuild needs to fix TALLOC_VERSION!"
+       fi
+
+       actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' 
lib/tdb/wscript || die)
+       if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
+               eerror "Source tdb version: ${TDB_VERSION}"
+               eerror "Ebuild tdb version: ${actual_tdb_version}"
+               die "Ebuild needs to fix TDB_VERSION!"
+       fi
+
+       actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' 
lib/tevent/wscript || die)
+       if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
+               eerror "Source tevent version: ${TEVENT_VERSION}"
+               eerror "Ebuild tevent version: ${actual_tevent_version}"
+               die "Ebuild needs to fix TEVENT_VERSION!"
+       fi
+}
+
+src_prepare() {
+       default
+
+       check_samba_dep_versions
+
+       # Unbundle dnspython
+       sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+       # Unbundle iso8601 unless tests are enabled
+       if ! use test ; then
+               sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+       fi
+
+       # Ugly hackaround for bug #592502
+       #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+       # bug #943942
+       append-cflags -std=gnu17
+
+       # WAF
+       multilib_copy_sources
+}
+
+multilib_src_configure() {
+       # When specifying libs for samba build you must append NONE to the end 
to
+       # stop it automatically including things
+       local bundled_libs="NONE"
+       if ! use system-heimdal && ! use system-mitkrb5 ; then
+               
bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+       fi
+
+       # We "use" bundled cmocka when we're not running tests as we're
+       # not using it anyway. Means we avoid making users install it for
+       # no reason. bug #802531
+       if ! use test ; then
+               bundled_libs="cmocka,${bundled_libs}"
+       fi
+
+       # bug #874633
+       if use llvm-libunwind ; then
+               mkdir -p "${T}"/${ABI}/pkgconfig || die
+
+               local -x 
PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}"
+
+               cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die
+               exec_prefix=\${prefix}
+               libdir=/usr/$(get_libdir)
+               includedir=\${prefix}/include
+
+               Name: libunwind-generic
+               Description: libunwind generic library
+               Version: 1.70
+               Libs: -L\${libdir} -lunwind
+               Cflags: -I\${includedir}
+               EOF
+       fi
+
+       local myconf=(
+               --enable-fhs
+               --sysconfdir="${EPREFIX}/etc"
+               --localstatedir="${EPREFIX}/var"
+               --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+               --with-piddir="${EPREFIX}/run/${PN}"
+               --bundled-libraries="${bundled_libs}"
+               --builtin-libraries=NONE
+               --disable-rpath
+               --disable-rpath-install
+               --nopyc
+               --nopyo
+               --without-winexe
+               $(multilib_native_use_with acl acl-support)
+               $(multilib_native_usex addc '' '--without-ad-dc')
+               $(multilib_native_use_enable ceph cephfs)
+               $(multilib_native_use_with cluster cluster-support)
+               $(multilib_native_use_enable cups)
+               --without-dmapi
+               $(multilib_native_use_with fam)
+               $(multilib_native_use_enable glusterfs)
+               $(multilib_native_use_with gpg gpgme)
+               $(multilib_native_use_with json)
+               $(multilib_native_use_enable iprint)
+               $(multilib_native_use_with pam)
+               $(multilib_native_usex pam 
"--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+               $(multilib_native_use_with quota quotas)
+               $(multilib_native_use_with regedit)
+               $(multilib_native_use_enable spotlight)
+               $(multilib_native_use_with syslog)
+               $(multilib_native_use_with systemd)
+               --systemd-install-services
+               --with-systemddir="$(systemd_get_systemunitdir)"
+               $(multilib_native_use_with unwind libunwind)
+               $(multilib_native_use_with winbind)
+               $(multilib_native_usex python '' '--disable-python')
+               $(multilib_native_use_enable zeroconf avahi)
+               $(multilib_native_usex test '--enable-selftest' '')
+               $(usev system-mitkrb5 "--with-system-mitkrb5 ${ESYSROOT}/usr 
$(multilib_native_usex addc --with-experimental-mit-ad-dc '')")
+               $(use_with ads)
+               $(use_with debug lttng)
+               $(use_with ldap)
+               $(use_with profiling-data)
+               --private-libraries='!ldb'
+               $(usex lmdb '' --without-ldb-lmdb)
+               # bug #683148
+               --jobs 1
+       )
+
+       if multilib_is_native_abi ; then
+               myconf+=( --with-shared-modules=${SHAREDMODS} )
+       else
+               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[@]}
+}
+
+multilib_src_compile() {
+       waf-utils_src_compile
+}
+
+multilib_src_test() {
+       if multilib_is_native_abi ; then
+               "${WAF_BINARY}" test || die "Test failed"
+       fi
+}
+
+multilib_src_install() {
+       waf-utils_src_install
+
+       # Make all .so files executable
+       find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+       # smbspool_krb5_wrapper must only be accessible to root, bug #880739
+       find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx 
{} + || die
+
+       # Remove empty runtime dirs created by build system (bug #892341)
+       find "${ED}"/{run,var} -type d -empty -delete || die
+
+       if multilib_is_native_abi ; then
+               # Install ldap schema for server (bug #491002)
+               if use ldap ; then
+                       insinto /etc/openldap/schema
+                       doins examples/LDAP/samba.schema
+               fi
+
+               # Create symlink for cups (bug #552310)
+               if use cups ; then
+                       dosym ../../../bin/smbspool \
+                               /usr/libexec/cups/backend/smb
+               fi
+
+               # Install example config file
+               insinto /etc/samba
+               doins examples/smb.conf.default
+
+               # Fix paths in example file (bug #603964)
+               sed \
+                       -e '/log file 
=/s@/usr/local/samba/var/@/var/log/samba/@' \
+                       -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+                       -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+                       -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+                       -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+                       -i "${ED}"/etc/samba/smb.conf.default || die
+
+               # Install init script and conf.d file
+               newinitd "${CONFDIR}/samba4.initd-r1" samba
+               newconfd "${CONFDIR}/samba4.confd" samba
+
+               dotmpfiles "${FILESDIR}"/samba.conf
+               if ! use addc ; then
+                       rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
+                               || die
+               fi
+
+               # Preserve functionality for old gentoo-specific unit names
+               dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+               dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+               dosym winbind.service 
"$(systemd_get_systemunitdir)/winbindd.service"
+
+               use python && python_optimize
+       fi
+
+       if use pam && use winbind ; then
+               newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+               # bugs #376853 and #590374
+               insinto /etc/security
+               doins examples/pam_winbind/pam_winbind.conf
+       fi
+}
+
+pkg_postinst() {
+       tmpfiles_process samba.conf
+}

Reply via email to