commit:     9633a3b92e639be48800e37b61a0126f785f80b7
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 27 18:47:58 2025 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 18:53:23 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9633a3b9

net-fs/samba: add 4.20.7

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

 net-fs/samba/Manifest            |   1 +
 net-fs/samba/samba-4.20.7.ebuild | 385 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 386 insertions(+)

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index d74e45a952d0..be105c3a52dc 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -2,6 +2,7 @@ DIST samba-4.19.7.tar.gz 41851647 BLAKE2B 
9bd58363d4cd30f900b286be7c7e172ed0308c
 DIST samba-4.19.8.tar.gz 41878540 BLAKE2B 
8d0e720ad572b6c17d90b5f9822eae6bdbaedcc05397fb79a77fc3838a6c9fac852f7ef31d47433efe057b39d97652c7391c4d28b33c4b8f95503129e0bb8470
 SHA512 
90d5bc6f52d7905b00b846e024220c0eec999d83f0343522e1cf76038e7630280bd0c039ce553e3024f8ebf91ab9b5f18d9395bd46811e1a3bc97261d1f69ca7
 DIST samba-4.19.9.tar.gz 41877221 BLAKE2B 
62c6fa2bca40edd8ff879aa34515532a9dc2620df6d6c9cc88677fbd5ff337a635a5ab7964df36d28a1c09748a343424100fa5d483005e9bb34706fa713f4d97
 SHA512 
c7345cbf2b756429cb7ae4e722f7e3389778711b64a943885b8fdb0e1db85ea93fff6098378d973f8a971faf05052c7f23a6a067e713680c5345b046d9a1fec1
 DIST samba-4.20.5.tar.gz 42503174 BLAKE2B 
c0e3eed4b7ee02697f379d2f1697ba05536885345fbd6a28959f167686176a2b228306c7a691a3f63940944dc219523a7683f9f41a0150bae94e691c6a89b6cc
 SHA512 
a666fc76dad2d9a68e802454555d2e93f7f71c2781ca5d11cf2fe8af046990b4be6677bbc754298613173849efb4387c16c2fd5557d65ba8b5a1ac02bd8c542a
+DIST samba-4.20.7.tar.gz 42523056 BLAKE2B 
3ddd41876dc7219396c410941a350bea89464d1012caa112b17457c03612821b64e6be6694ea8a06d3d1168983198c8837edc3cbaa5e8bef11c7bc2fe81531c6
 SHA512 
60699e332774a33f7c831f628e720bb2f25cf4a3462f24c2451b5eb799952d1a16ee487d76218ff651836ae2c0f406783da520f859a6af47b9a5d1c090019bda
 DIST samba-4.21.0.tar.gz 42625973 BLAKE2B 
0889f2be3b78affee88250114397de87a77da77d9674815ec5605780a6bb3e2e28dbbae53b66695196408f4aef550acce793e6397045fbea4bb236fdd095ce1a
 SHA512 
5d1d7f89d46f29a772bb56c060934e6868e5a3962915f3c5ab2daff3c3f49863af36c89f989066dd496cf5d0ed8cc63ad9c93f2cfe0b98797baa87b50bc5bf3f
 DIST samba-4.21.1.tar.gz 42635617 BLAKE2B 
e99c6d45758d50195a634d2a2ebdbe324ca3f205d8013fb8fb2160c2581d7551bbff946f3413b2782648470e922d84d8a2f9c3d33e32c46db6391b749ba30000
 SHA512 
a3fb57d9dc72e7b924995cc59887535a75f4462d3afb68098321efeb15541e372071e3f8277006f9e792491e25a0f05127c2929fd2f22d9ee7dace3c13088cdb
 DIST samba-4.21.4.tar.gz 42669530 BLAKE2B 
37c3b924799369dfe7a9ac208d3e470d4c41c45eb725f973e6948c3581523abe5fe768ea0a82e38c5a1cf5ad238896ddfd1783a1adebc9fa6d42fbb6769e9bdb
 SHA512 
eed6bfe8b9122198fb44cb0bbb30e7f0c9936147d88f731a79146617edf76b1d5773b36972ac96813feb57effd29825d77e72ad705027eb93ce3b5b7fd196102

diff --git a/net-fs/samba/samba-4.20.7.ebuild b/net-fs/samba/samba-4.20.7.ebuild
new file mode 100644
index 000000000000..ba5c0cd3c89b
--- /dev/null
+++ b/net-fs/samba/samba-4.20.7.ebuild
@@ -0,0 +1,385 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..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"
+IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg"
+IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota 
+regedit selinux"
+IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test 
unwind winbind"
+IUSE+=" zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+       addc? ( json python !system-mitkrb5 winbind )
+       ads? ( acl ldap python winbind )
+       cluster? ( ads )
+       gpg? ( addc )
+       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.10"
+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-2.9.2:=[ldap(+)?,${MULTILIB_USEDEP}]
+       <sys-libs/ldb-2.10.0:=[ldap(+)?,${MULTILIB_USEDEP}]
+       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}]
+       sys-libs/zlib[${MULTILIB_USEDEP}]
+       virtual/libcrypt:=[${MULTILIB_USEDEP}]
+       virtual/libiconv
+       $(python_gen_cond_dep '
+               addc? (
+                       dev-python/dnspython:=[${PYTHON_USEDEP}]
+                       dev-python/markdown[${PYTHON_USEDEP}]
+               )
+               ads? (
+                       dev-python/dnspython:=[${PYTHON_USEDEP}]
+                       net-dns/bind-tools[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}] )
+       pam? ( sys-libs/pam )
+       python? (
+               sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+               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
+
+       sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+               -i source4/dsdb/samdb/ldb_modules/password_hash.c \
+               || die
+
+       # 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_with ads)
+               $(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 debug lttng)
+               $(use_with ldap)
+               $(use_with profiling-data)
+               # 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-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