net-fs/samba: Security cleanup
authorLars Wendler <polynomial-c@gentoo.org>
Thu, 26 Mar 2020 18:58:47 +0000 (19:58 +0100)
committerLars Wendler <polynomial-c@gentoo.org>
Thu, 26 Mar 2020 19:06:33 +0000 (20:06 +0100)
Bug: https://bugs.gentoo.org/693558
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
23 files changed:
net-fs/samba/Manifest
net-fs/samba/files/nmbd.service [deleted file]
net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch [deleted file]
net-fs/samba/files/samba-4.5.1-compile_et_fix.patch [deleted file]
net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch [deleted file]
net-fs/samba/files/samba-glibc-2.26-no_rpc.patch [deleted file]
net-fs/samba/files/samba.service [deleted file]
net-fs/samba/files/smbd.service [deleted file]
net-fs/samba/files/smbd.socket [deleted file]
net-fs/samba/files/smbd_at.service [deleted file]
net-fs/samba/files/talloc-disable-python.patch [deleted file]
net-fs/samba/files/winbindd.service [deleted file]
net-fs/samba/samba-4.10.11.ebuild [deleted file]
net-fs/samba/samba-4.10.13.ebuild [deleted file]
net-fs/samba/samba-4.10.2-r1.ebuild [deleted file]
net-fs/samba/samba-4.11.4.ebuild [deleted file]
net-fs/samba/samba-4.11.6.ebuild [deleted file]
net-fs/samba/samba-4.5.16-r1.ebuild [deleted file]
net-fs/samba/samba-4.8.12.ebuild [deleted file]
net-fs/samba/samba-4.8.6-r4.ebuild [deleted file]
net-fs/samba/samba-4.8.6-r5.ebuild [deleted file]
net-fs/samba/samba-4.9.17.ebuild [deleted file]
net-fs/samba/samba-4.9.18.ebuild [deleted file]

index 9d3ffd7c6793cdee8be1dea34e3f377488631412..fb43e058142051a69bf22519af1c536c4246c89a 100644 (file)
@@ -1,13 +1,3 @@
-DIST samba-4.10.11.tar.gz 18342499 BLAKE2B 9555f0e7ee46a7d372defd1c0978024cf36e23a33229cba2e374bed7bad67cb1e24ad5f37e989e01397fec2bcf7aa403bbb67669a764ec0a669571b182915c34 SHA512 776978698cc2d0e86d22d61caadc24f886f0e7fd35788806ebc641502a9a1f4a46afcde7c82e3d644eaaef8c302da5f795b9518681014b7f46a39422766fb758
-DIST samba-4.10.13.tar.gz 18350580 BLAKE2B ab97d46284bee60762543ed1c27846e22dd984ff61b1601cc32af46b87cca30751ffc6b1ca4da7045c22224cd4f23c46cfa42f478098676bc243412f319f6658 SHA512 959986ce8cb846d9e3e6b83eff896fefa140b1b5d03ace878100c806a4e969352b37b0dca9e7795775bab7d8230770dae66cd48b4856a2c416f0234fd63e0bf2
-DIST samba-4.10.2.tar.gz 18280710 BLAKE2B f15b117d1159dfa6cd279c5011629d688fcfba94a2ca8184a827d0787a31f76a38f46b355454b916f2e62c0a88109b86664f6bb16fc0e23d0f61d09908e587cd SHA512 3d146ea12567ebb02a7babcad779b82339ffbfb19f6f2be5cac33eb18af2c9b546dc1cd910072a5c9e152ba9c4a632ed6870c48a8f6ad9d04304b130f240a4bf
-DIST samba-4.11.4.tar.gz 18530105 BLAKE2B 39e0cc6965681f3d64e861edebe2b77e558b68d9a3f4d7fa52e6ccfe704f2294fb3fb1a619d07d2130f36b1bf572300c733a273ccf78d554807e0f5897dcbcff SHA512 18ae1cb8b092c441a3fd4c6ecc9f35841dc51e3061f435107f7d2579b5e8ca6f8c96a947627dbd401b81c7de2293ff2587c30be694e160bf8a10c6d15aa73880
 DIST samba-4.11.6.tar.gz 18541566 BLAKE2B 2b4a40be7cec8a9706cbc344796885f59403aa11ca3d8a7dc40b3d287ec222c11d7395fd193c4b66c4116f1bffd869caf444a950d508f5a9a596db32553e1461 SHA512 3815080a1693c596a126371a5ea4e8534317a7266803c7de13a7e5b3ee9757dfbf13c0de20d498a6683d3aaf56941ed42f289e3c24f88713529a5f047a691af2
 DIST samba-4.11.7.tar.gz 18541292 BLAKE2B 083ee2ebade2dd6267f8c53234bd98cc3325d28cf0a03fce2f45accfd36acfaaa9cdc82f326e913cfdbd585b0d705c71a95685ec37901e7d8a4d17cd2a04d3f2 SHA512 c728adbc9fd86f9b745f62d2f435d0fd5e8d1381725a657f8d14ec246d5c758c9eb92bd82c25b0c3f40ce4d10eaf5ce7792363b8a8c4df2e6c78c1458fef4f95
 DIST samba-4.12.0.tar.gz 18156651 BLAKE2B a02a5cdce9551743bfa88fe9e42ab2f2b6fc3ec96e933bcb92f994681b8dbbeef675f718e723f131c95252a51d964d141f5dda98529dc7779ba372fc6d0080c5 SHA512 d50be899675b8e3504311e73bb75fbb8264e918e0d1765239ecb5b14e15c0917565f8a9ce1877fb604151bf4f23dfc4c2f7f30a53c872681e3d2571d3ed5ef82
-DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
-DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
-DIST samba-4.8.12.tar.gz 17764832 BLAKE2B d2c0c8b9090da7c94b9343fd3f416e9aafad64273abc9be0639b011f71072926a0b303cf53e63c4e470aeb168e8ec23003b5f4ed4258aac8d6b3d029f71fba6f SHA512 f29595f6390d01860cb6acd750d2e36b4d207dd1da16465c21c8d6d732ce27bd0582a0f34296081e2659638d839c8b12f28deccc31982afa94650da8bce8df8b
-DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
-DIST samba-4.9.17.tar.gz 18100548 BLAKE2B c0b9a869b67fafaaa09776c472d8a7fd56eed10577ea554d07a8ed1d591dcb783381ea3d2c026315bdeebb0b4a8d456d4193da65be1a88b246d235ecda70cac0 SHA512 658fd4a073e7f93ccb270d63d4a12fc29ec30d3928464f81c583c85706d3a559794dbde23c6dee17ac7c3333ce2c5afb965c152fdeb6b7bd643fe1bafcd35823
-DIST samba-4.9.18.tar.gz 18103049 BLAKE2B f1071f76924722294be545534c3462d12963073dade444d9aebbbcb56bb84f5ae608bf9a97583e1050713ea668ced6aaf13f0a180e7b682da8405d40600cace9 SHA512 c7161fdf90d5e2ee5fd28aca93b596f4dc4417d2f8519a586a2319e42a62107a026adc128b90f7c3ad71d4d21c0b782bc8eb79005714bf0ee93fba19ffeef624
diff --git a/net-fs/samba/files/nmbd.service b/net-fs/samba/files/nmbd.service
deleted file mode 100644 (file)
index 44b4ffb..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Samba NetBIOS name server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/samba/nmbd.pid
-ExecStart=/usr/sbin/nmbd -D 
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch b/net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch
deleted file mode 100644 (file)
index 12b2df3..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 41eeabcb0175659aebf6d480c43fb64310f37d9c Mon Sep 17 00:00:00 2001
-From: Andrew Bartlett <abartlet@samba.org>
-Date: Wed, 20 Mar 2019 13:57:50 +1300
-Subject: [PATCH] build: Allow build when --disable-gnutls is set
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=13844
-
-Signed-off-by: Andrew Bartlett <abartlet@samba.org>
----
- lib/mscat/wscript | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lib/mscat/wscript b/lib/mscat/wscript
-index 7ca9ef567ee..4d1f752a3c1 100644
---- a/lib/mscat/wscript
-+++ b/lib/mscat/wscript
-@@ -12,7 +12,11 @@ def configure(conf):
-         if not conf.find_program('asn1Parser', var='ASN1PARSER'):
-             Logs.warn('WARNING: ans1Parser hasn\'t been found! Please install it (e.g. libtasn1-bin)')
--    conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')
-+    # GnuTLS is currently able to be disabled
-+    if conf.env.enable_gnutls:
-+        conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')
-+    else:
-+        Logs.warn('WARNING: gnutls disabled so dumpmscat will not be built')
- def build(bld):
-     if (bld.CONFIG_SET('HAVE_LIBTASN1') and
--- 
-2.11.0
-
diff --git a/net-fs/samba/files/samba-4.5.1-compile_et_fix.patch b/net-fs/samba/files/samba-4.5.1-compile_et_fix.patch
deleted file mode 100644 (file)
index 463512f..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
---- samba-4.5.1/source4/heimdal_build/wscript_configure
-+++ samba-4.5.1/source4/heimdal_build/wscript_configure
-@@ -258,7 +258,11 @@
- # With the proper checks in place we should be able to build against the system libtommath.
- #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'):
- #    conf.define('USING_SYSTEM_TOMMATH', 1)
--check_system_heimdal_binary("compile_et")
--check_system_heimdal_binary("asn1_compile")
-+# comment out next line to stop Gentoo Samba build from using the compile_et in e2fsprogs-libs
-+# to compile the error tables. This produces a compile error later on.
-+#check_system_heimdal_binary("compile_et")
-+#
-+# As a precaution do the same for asn1_compile
-+#check_system_heimdal_binary("asn1_compile")
diff --git a/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch b/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch
deleted file mode 100644 (file)
index 1093b1d..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-Do not install the python DSDB modules when ADDC is disabled.
-This is a change integrated upstream in 4.9.1 (or earlier).
-
-Without this, the python dsdb_dns.so module is installed, which
-is linked to libdnsserver-common.so that is NOT installed, and so
-potential breakage ensues.
-
---- a/source4/dsdb/wscript_build       2018-01-17 03:08:39.000000000 -0500
-+++ b/source4/dsdb/wscript_build       2018-11-08 10:43:58.064486832 -0500
-@@ -63,10 +63,11 @@
-       )
- bld.SAMBA_PYTHON('python_dsdb',
-       source='pydsdb.c',
-       # the dependency on dcerpc here is because gensec
-       # depends on dcerpc but the waf circular dependency finder
-       # removes it so we end up with unresolved symbols.
-       deps='samdb pyldb-util dcerpc com_err pyrpc_util pyparam_util dsdb_garbage_collect_tombstones',
--      realname='samba/dsdb.so'
-+      realname='samba/dsdb.so',
-+      enabled=bld.AD_DC_BUILD_IS_ENABLED()
-       )
---- a/source4/dns_server/wscript_build 2018-11-08 11:49:03.450296286 -0500
-+++ b/source4/dns_server/wscript_build 2018-11-08 11:49:23.327864408 -0500
-@@ -64,9 +64,10 @@
-                   private_library=True,
-                   deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
-                   enabled=bld.AD_DC_BUILD_IS_ENABLED())
- bld.SAMBA_PYTHON('python_dsdb_dns',
-                source='pydns.c',
-                deps='samdb pyldb-util pyrpc_util dnsserver_common pytalloc-util',
--               realname='samba/dsdb_dns.so')
-+               realname='samba/dsdb_dns.so',
-+               enabled=bld.AD_DC_BUILD_IS_ENABLED())
diff --git a/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch b/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch
deleted file mode 100644 (file)
index e664468..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-https://attachments.samba.org/attachment.cgi?id=13172
-https://bugs.gentoo.org/637320
-
---- a/lib/replace/wscript
-+++ b/lib/replace/wscript
-@@ -71,7 +71,7 @@
-     conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
-     conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
--    conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
-+    conf.CHECK_CODE('ypstat s;', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
-     conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
-     conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
diff --git a/net-fs/samba/files/samba.service b/net-fs/samba/files/samba.service
deleted file mode 100644 (file)
index 8214ff8..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Samba AD server
-After=network.target winbindd.service
-Conflicts=nmbd.service smbd.service
-
-[Service]
-ExecStart=/usr/sbin/samba --interactive 
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/samba/files/smbd.service b/net-fs/samba/files/smbd.service
deleted file mode 100644 (file)
index 5c006a4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Samba SMB/CIFS server
-After=network.target nmbd.service winbindd.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/samba/smbd.pid
-ExecStart=/usr/sbin/smbd -D 
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/samba/files/smbd.socket b/net-fs/samba/files/smbd.socket
deleted file mode 100644 (file)
index 833bf43..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Samba SMB/CIFS server socket
-
-[Socket]
-ListenStream=445
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/net-fs/samba/files/smbd_at.service b/net-fs/samba/files/smbd_at.service
deleted file mode 100644 (file)
index e1f71be..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Samba SMB/CIFS server instance
-
-[Service]
-ExecStart=/usr/sbin/smbd -F
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
diff --git a/net-fs/samba/files/talloc-disable-python.patch b/net-fs/samba/files/talloc-disable-python.patch
deleted file mode 100644 (file)
index 6ef45eb..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/lib/talloc/wscript       2017-04-28 04:57:26.000000000 -0400
-+++ b/lib/talloc/wscript       2017-07-05 14:30:42.700580464 -0400
-@@ -74,19 +74,22 @@
-                                      implied_deps='replace'):
-             conf.define('USING_SYSTEM_TALLOC', 1)
--        using_system_pytalloc_util = True
--        if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
--                                             implied_deps='talloc replace'):
-+        if conf.env.disable_python:
-             using_system_pytalloc_util = False
--
--        # We need to get a pytalloc-util for all the python versions
--        # we are building for
--        if conf.env['EXTRA_PYTHON']:
--            name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
--            if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
-+        else:
-+            using_system_pytalloc_util = True
-+            if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
-                                                  implied_deps='talloc replace'):
-                 using_system_pytalloc_util = False
-+            # We need to get a pytalloc-util for all the python versions
-+            # we are building for
-+            if conf.env['EXTRA_PYTHON']:
-+                name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
-+                if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
-+                                                     implied_deps='talloc replace'):
-+                    using_system_pytalloc_util = False
-+
-         if using_system_pytalloc_util:
-             conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
diff --git a/net-fs/samba/files/winbindd.service b/net-fs/samba/files/winbindd.service
deleted file mode 100644 (file)
index 67a778f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Samba Winbind daemon
-After=network.target nmbd.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/samba/winbindd.pid
-ExecStart=/usr/sbin/winbindd -D 
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/samba/samba-4.10.11.ebuild b/net-fs/samba/samba-4.10.11.ebuild
deleted file mode 100644 (file)
index ed134f4..0000000
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
-iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
-+system-mitkrb5 systemd test winbind zeroconf"
-
-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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-       net-libs/libnsl:=[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( sys-libs/pam )
-       acl? ( virtual/acl )
-       $(python_gen_cond_dep "
-               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-               addns? (
-                       net-dns/bind-tools[gssapi]
-                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-               )
-       ")
-       ceph? ( sys-cluster/ceph )
-       cluster? (
-               net-libs/rpcsvc-proto
-               !dev-db/ctdb
-       )
-       cups? ( net-print/cups )
-       debug? ( dev-util/lttng-ust )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gnutls? (
-               dev-libs/libgcrypt:0
-               >=net-libs/gnutls-1.4.0
-       )
-       gpg? ( app-crypt/gpgme )
-       json? ( dev-libs/jansson )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-       system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:0= )
-       zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
-       ${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       net-libs/libtirpc[${MULTILIB_USEDEP}]
-       virtual/pkgconfig
-       || (
-               net-libs/rpcsvc-proto
-               <sys-libs/glibc-2.26[rpc(+)]
-       )
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.9
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       python? ( ${PYTHON_DEPS} )
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-       addc? ( python gnutls json winbind )
-       addns? ( python )
-       ads? ( acl gnutls ldap winbind )
-       cluster? ( ads )
-       gpg? ( addc )
-       test? ( python )
-       ?? ( system-heimdal system-mitkrb5 )
-       ${PYTHON_REQUIRED_USE}
-"
-
-# 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"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.4.0-pam.patch"
-       "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-       "${FILESDIR}/${PN}-4.9.2-timespec.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-       if use cluster ; then
-               SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-       elif use ads ; then
-               SHAREDMODS="idmap_ad"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # un-bundle 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
-
-       # Friggin' WAF shit
-       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
-
-       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
-               $(multilib_native_use_with acl acl-support)
-               $(multilib_native_usex addc '' '--without-ad-dc')
-               $(multilib_native_use_with addns dnsupdate)
-               $(multilib_native_use_with ads)
-               $(multilib_native_use_enable ceph cephfs)
-               $(multilib_native_use_with cluster cluster-support)
-               $(multilib_native_use_enable cups)
-               $(multilib_native_use_with dmapi)
-               $(multilib_native_use_with fam)
-               $(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 syslog)
-               $(multilib_native_use_with systemd)
-               $(multilib_native_use_with winbind)
-               $(multilib_native_usex python '' '--disable-python')
-               $(multilib_native_use_enable zeroconf avahi)
-               $(multilib_native_usex test '--enable-selftest' '')
-               $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-               $(use_enable gnutls)
-               $(use_with debug lttng)
-               $(use_with ldap)
-               $(use_with profiling-data)
-       )
-
-       multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-       CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-               waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-       waf-utils_src_compile
-}
-
-multilib_src_install() {
-       waf-utils_src_install
-
-       # Make all .so files executable
-       find "${ED}" -type f -name "*.so" -exec chmod +x {} + || 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 (#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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       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
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/lock/samba
-       keepdir /var/log/samba
-       keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_install_all() {
-       # Attempt to fix bug #673168
-       find "${ED}" -type d -name "Yapp" -print0 \
-               | xargs -0 --no-run-if-empty rm -r || die
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware that this release contains the best of all of Samba's"
-       ewarn "technology parts, both a file server (that you can reasonably expect"
-       ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-       ewarn "controller work previously known as 'samba4'."
-
-       elog "For further information and migration steps make sure to read "
-       elog "https://samba.org/samba/history/${P}.html "
-       elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.10.13.ebuild b/net-fs/samba/samba-4.10.13.ebuild
deleted file mode 100644 (file)
index ed134f4..0000000
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
-iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
-+system-mitkrb5 systemd test winbind zeroconf"
-
-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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-       net-libs/libnsl:=[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( sys-libs/pam )
-       acl? ( virtual/acl )
-       $(python_gen_cond_dep "
-               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-               addns? (
-                       net-dns/bind-tools[gssapi]
-                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-               )
-       ")
-       ceph? ( sys-cluster/ceph )
-       cluster? (
-               net-libs/rpcsvc-proto
-               !dev-db/ctdb
-       )
-       cups? ( net-print/cups )
-       debug? ( dev-util/lttng-ust )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gnutls? (
-               dev-libs/libgcrypt:0
-               >=net-libs/gnutls-1.4.0
-       )
-       gpg? ( app-crypt/gpgme )
-       json? ( dev-libs/jansson )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-       system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:0= )
-       zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
-       ${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       net-libs/libtirpc[${MULTILIB_USEDEP}]
-       virtual/pkgconfig
-       || (
-               net-libs/rpcsvc-proto
-               <sys-libs/glibc-2.26[rpc(+)]
-       )
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.9
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       python? ( ${PYTHON_DEPS} )
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-       addc? ( python gnutls json winbind )
-       addns? ( python )
-       ads? ( acl gnutls ldap winbind )
-       cluster? ( ads )
-       gpg? ( addc )
-       test? ( python )
-       ?? ( system-heimdal system-mitkrb5 )
-       ${PYTHON_REQUIRED_USE}
-"
-
-# 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"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.4.0-pam.patch"
-       "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-       "${FILESDIR}/${PN}-4.9.2-timespec.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-       if use cluster ; then
-               SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-       elif use ads ; then
-               SHAREDMODS="idmap_ad"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # un-bundle 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
-
-       # Friggin' WAF shit
-       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
-
-       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
-               $(multilib_native_use_with acl acl-support)
-               $(multilib_native_usex addc '' '--without-ad-dc')
-               $(multilib_native_use_with addns dnsupdate)
-               $(multilib_native_use_with ads)
-               $(multilib_native_use_enable ceph cephfs)
-               $(multilib_native_use_with cluster cluster-support)
-               $(multilib_native_use_enable cups)
-               $(multilib_native_use_with dmapi)
-               $(multilib_native_use_with fam)
-               $(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 syslog)
-               $(multilib_native_use_with systemd)
-               $(multilib_native_use_with winbind)
-               $(multilib_native_usex python '' '--disable-python')
-               $(multilib_native_use_enable zeroconf avahi)
-               $(multilib_native_usex test '--enable-selftest' '')
-               $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-               $(use_enable gnutls)
-               $(use_with debug lttng)
-               $(use_with ldap)
-               $(use_with profiling-data)
-       )
-
-       multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-       CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-               waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-       waf-utils_src_compile
-}
-
-multilib_src_install() {
-       waf-utils_src_install
-
-       # Make all .so files executable
-       find "${ED}" -type f -name "*.so" -exec chmod +x {} + || 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 (#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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       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
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/lock/samba
-       keepdir /var/log/samba
-       keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_install_all() {
-       # Attempt to fix bug #673168
-       find "${ED}" -type d -name "Yapp" -print0 \
-               | xargs -0 --no-run-if-empty rm -r || die
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware that this release contains the best of all of Samba's"
-       ewarn "technology parts, both a file server (that you can reasonably expect"
-       ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-       ewarn "controller work previously known as 'samba4'."
-
-       elog "For further information and migration steps make sure to read "
-       elog "https://samba.org/samba/history/${P}.html "
-       elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.10.2-r1.ebuild b/net-fs/samba/samba-4.10.2-r1.ebuild
deleted file mode 100644 (file)
index e83a909..0000000
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap
-pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-       net-libs/libnsl:=[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( sys-libs/pam )
-       acl? ( virtual/acl )
-       $(python_gen_cond_dep "
-               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-               addns? (
-                       net-dns/bind-tools[gssapi]
-                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-               )
-       ")
-       ceph? ( sys-cluster/ceph )
-       cluster? (
-               net-libs/rpcsvc-proto
-               !dev-db/ctdb
-       )
-       cups? ( net-print/cups )
-       debug? ( dev-util/lttng-ust )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gnutls? (
-               dev-libs/libgcrypt:0
-               >=net-libs/gnutls-1.4.0
-       )
-       gpg? ( app-crypt/gpgme )
-       json? ( dev-libs/jansson )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-       system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:0= )
-       zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
-       ${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       net-libs/libtirpc[${MULTILIB_USEDEP}]
-       virtual/pkgconfig
-       || (
-               net-libs/rpcsvc-proto
-               <sys-libs/glibc-2.26[rpc(+)]
-       )
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.9
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       python? ( ${PYTHON_DEPS} )
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-       addc? ( python gnutls json winbind )
-       addns? ( python )
-       ads? ( acl gnutls ldap winbind )
-       cluster? ( ads )
-       gpg? ( addc )
-       test? ( python )
-       ?? ( system-heimdal system-mitkrb5 )
-       ${PYTHON_REQUIRED_USE}
-"
-
-# 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"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.4.0-pam.patch"
-       "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-       "${FILESDIR}/${PN}-4.9.2-timespec.patch"
-       "${FILESDIR}/${PN}-4.10.0-disable_gnutls_build_fix.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-       if use cluster ; then
-               SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-       elif use ads ; then
-               SHAREDMODS="idmap_ad"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # un-bundle 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
-
-       # Friggin' WAF shit
-       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
-
-       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
-               $(multilib_native_use_with acl acl-support)
-               $(multilib_native_usex addc '' '--without-ad-dc')
-               $(multilib_native_use_with addns dnsupdate)
-               $(multilib_native_use_with ads)
-               $(multilib_native_use_enable ceph cephfs)
-               $(multilib_native_use_with cluster cluster-support)
-               $(multilib_native_use_enable cups)
-               $(multilib_native_use_with dmapi)
-               $(multilib_native_use_with fam)
-               $(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 syslog)
-               $(multilib_native_use_with systemd)
-               $(multilib_native_use_with winbind)
-               $(multilib_native_usex python '' '--disable-python')
-               $(multilib_native_use_enable zeroconf avahi)
-               $(multilib_native_usex test '--enable-selftest' '')
-               $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-               $(use_enable gnutls)
-               $(use_with debug lttng)
-               $(use_with ldap)
-       )
-
-       multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-       CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-               waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-       waf-utils_src_compile
-}
-
-multilib_src_install() {
-       waf-utils_src_install
-
-       # Make all .so files executable
-       find "${ED}" -type f -name "*.so" -exec chmod +x {} + || 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 (#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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       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
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/lock/samba
-       keepdir /var/log/samba
-       keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware that this release contains the best of all of Samba's"
-       ewarn "technology parts, both a file server (that you can reasonably expect"
-       ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-       ewarn "controller work previously known as 'samba4'."
-
-       elog "For further information and migration steps make sure to read "
-       elog "https://samba.org/samba/history/${P}.html "
-       elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.11.4.ebuild b/net-fs/samba/samba-4.11.4.ebuild
deleted file mode 100644 (file)
index 7914bd6..0000000
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint 
-json ldap pam profiling-data python quota selinux syslog system-heimdal 
-+system-mitkrb5 systemd test winbind zeroconf"
-
-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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/libgcrypt:0
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-       >=net-libs/gnutls-3.2.0
-       net-libs/libnsl:=[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( sys-libs/pam )
-       acl? ( virtual/acl )
-       $(python_gen_cond_dep "
-               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-               addns? (
-                       net-dns/bind-tools[gssapi]
-                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-               )
-       ")
-       ceph? ( sys-cluster/ceph )
-       cluster? (
-               net-libs/rpcsvc-proto
-               !dev-db/ctdb
-       )
-       cups? ( net-print/cups )
-       debug? ( dev-util/lttng-ust )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gpg? ( app-crypt/gpgme )
-       json? ( dev-libs/jansson )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-       system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:0= )
-       zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
-       ${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       net-libs/libtirpc[${MULTILIB_USEDEP}]
-       virtual/pkgconfig
-       || (
-               net-libs/rpcsvc-proto
-               <sys-libs/glibc-2.26[rpc(+)]
-       )
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.9
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       python? ( ${PYTHON_DEPS} )
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-       addc? ( python json winbind )
-       addns? ( python )
-       ads? ( acl ldap winbind )
-       cluster? ( ads )
-       gpg? ( addc )
-       test? ( python )
-       ?? ( system-heimdal system-mitkrb5 )
-       ${PYTHON_REQUIRED_USE}
-"
-
-# 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"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.4.0-pam.patch"
-       "${FILESDIR}/${PN}-4.9.2-timespec.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-       if use cluster ; then
-               SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-       elif use ads ; then
-               SHAREDMODS="idmap_ad"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # un-bundle 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
-
-       # Friggin' WAF shit
-       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
-
-       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
-               $(multilib_native_use_with acl acl-support)
-               $(multilib_native_usex addc '' '--without-ad-dc')
-               $(multilib_native_use_with addns dnsupdate)
-               $(multilib_native_use_with ads)
-               $(multilib_native_use_enable ceph cephfs)
-               $(multilib_native_use_with cluster cluster-support)
-               $(multilib_native_use_enable cups)
-               $(multilib_native_use_with dmapi)
-               $(multilib_native_use_with fam)
-               $(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 syslog)
-               $(multilib_native_use_with systemd)
-               $(multilib_native_use_with winbind)
-               $(multilib_native_usex python '' '--disable-python')
-               $(multilib_native_use_enable zeroconf avahi)
-               $(multilib_native_usex test '--enable-selftest' '')
-               $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-               $(use_with debug lttng)
-               $(use_with ldap)
-               $(use_with profiling-data)
-       )
-
-       multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-       CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-               waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-       waf-utils_src_compile
-}
-
-multilib_src_install() {
-       waf-utils_src_install
-
-       # Make all .so files executable
-       find "${ED}" -type f -name "*.so" -exec chmod +x {} + || 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 (#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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       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
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/lock/samba
-       keepdir /var/log/samba
-       keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_install_all() {
-       # Attempt to fix bug #673168
-       find "${ED}" -type d -name "Yapp" -print0 \
-               | xargs -0 --no-run-if-empty rm -r || die
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware that this release contains the best of all of Samba's"
-       ewarn "technology parts, both a file server (that you can reasonably expect"
-       ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-       ewarn "controller work previously known as 'samba4'."
-
-       elog "For further information and migration steps make sure to read "
-       elog "https://samba.org/samba/history/${P}.html "
-       elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.11.6.ebuild b/net-fs/samba/samba-4.11.6.ebuild
deleted file mode 100644 (file)
index 7914bd6..0000000
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint 
-json ldap pam profiling-data python quota selinux syslog system-heimdal 
-+system-mitkrb5 systemd test winbind zeroconf"
-
-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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/libgcrypt:0
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-       >=net-libs/gnutls-3.2.0
-       net-libs/libnsl:=[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( sys-libs/pam )
-       acl? ( virtual/acl )
-       $(python_gen_cond_dep "
-               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-               addns? (
-                       net-dns/bind-tools[gssapi]
-                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-               )
-       ")
-       ceph? ( sys-cluster/ceph )
-       cluster? (
-               net-libs/rpcsvc-proto
-               !dev-db/ctdb
-       )
-       cups? ( net-print/cups )
-       debug? ( dev-util/lttng-ust )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gpg? ( app-crypt/gpgme )
-       json? ( dev-libs/jansson )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-       system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:0= )
-       zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
-       ${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       net-libs/libtirpc[${MULTILIB_USEDEP}]
-       virtual/pkgconfig
-       || (
-               net-libs/rpcsvc-proto
-               <sys-libs/glibc-2.26[rpc(+)]
-       )
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.9
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       python? ( ${PYTHON_DEPS} )
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-       addc? ( python json winbind )
-       addns? ( python )
-       ads? ( acl ldap winbind )
-       cluster? ( ads )
-       gpg? ( addc )
-       test? ( python )
-       ?? ( system-heimdal system-mitkrb5 )
-       ${PYTHON_REQUIRED_USE}
-"
-
-# 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"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.4.0-pam.patch"
-       "${FILESDIR}/${PN}-4.9.2-timespec.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-       if use cluster ; then
-               SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-       elif use ads ; then
-               SHAREDMODS="idmap_ad"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # un-bundle 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
-
-       # Friggin' WAF shit
-       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
-
-       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
-               $(multilib_native_use_with acl acl-support)
-               $(multilib_native_usex addc '' '--without-ad-dc')
-               $(multilib_native_use_with addns dnsupdate)
-               $(multilib_native_use_with ads)
-               $(multilib_native_use_enable ceph cephfs)
-               $(multilib_native_use_with cluster cluster-support)
-               $(multilib_native_use_enable cups)
-               $(multilib_native_use_with dmapi)
-               $(multilib_native_use_with fam)
-               $(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 syslog)
-               $(multilib_native_use_with systemd)
-               $(multilib_native_use_with winbind)
-               $(multilib_native_usex python '' '--disable-python')
-               $(multilib_native_use_enable zeroconf avahi)
-               $(multilib_native_usex test '--enable-selftest' '')
-               $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-               $(use_with debug lttng)
-               $(use_with ldap)
-               $(use_with profiling-data)
-       )
-
-       multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-       CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-               waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-       waf-utils_src_compile
-}
-
-multilib_src_install() {
-       waf-utils_src_install
-
-       # Make all .so files executable
-       find "${ED}" -type f -name "*.so" -exec chmod +x {} + || 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 (#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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       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
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/lock/samba
-       keepdir /var/log/samba
-       keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_install_all() {
-       # Attempt to fix bug #673168
-       find "${ED}" -type d -name "Yapp" -print0 \
-               | xargs -0 --no-run-if-empty rm -r || die
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware that this release contains the best of all of Samba's"
-       ewarn "technology parts, both a file server (that you can reasonably expect"
-       ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-       ewarn "controller work previously known as 'samba4'."
-
-       elog "For further information and migration steps make sure to read "
-       elog "https://samba.org/samba/history/${P}.html "
-       elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.5.16-r1.ebuild b/net-fs/samba/samba-4.5.16-r1.ebuild
deleted file mode 100644 (file)
index 8ec36b9..0000000
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
-       https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-# 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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="${PYTHON_DEPS}
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       $(python_gen_cond_dep "
-               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-       ")
-       net-libs/libnsl:=[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.1.30[ldap(+)?,python(+),${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.8[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.10[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( sys-libs/pam )
-       acl? ( virtual/acl )
-       addns? ( net-dns/bind-tools[gssapi] )
-       cluster? (
-               net-libs/rpcsvc-proto
-               !dev-db/ctdb
-       )
-       cups? ( net-print/cups )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gnutls? (
-               dev-libs/libgcrypt:0
-               >=net-libs/gnutls-1.4.0
-       )
-       gpg? ( app-crypt/gpgme )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-       system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:0= )
-       zeroconf? ( net-dns/avahi )"
-DEPEND="${CDEPEND}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       virtual/pkgconfig
-       test? (
-               >=sys-libs/nss_wrapper-1.1.3
-               >=net-dns/resolv_wrapper-1.1.4
-               >=net-libs/socket_wrapper-1.1.7
-               >=sys-libs/uid_wrapper-1.2.1
-       )"
-RDEPEND="${CDEPEND}
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-       addc? ( gnutls !system-mitkrb5 )
-       ads? ( acl gnutls ldap )
-       cluster? ( ads )
-       gpg? ( addc )
-       ?? ( system-heimdal system-mitkrb5 )
-       ${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.4.0-pam.patch"
-       "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-       "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-       if use cluster ; then
-               SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-       elif use ads ; then
-               SHAREDMODS="idmap_ad"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # install the patches from tarball(s)
-       eapply "${WORKDIR}/patches"
-
-       # 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
-
-       # Friggin' WAF shit
-       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
-
-       local myconf=()
-       myconf=(
-               --enable-fhs
-               --sysconfdir="${EPREFIX}/etc"
-               --localstatedir="${EPREFIX}/var"
-               --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-               --with-piddir="${EPREFIX}/run/${PN}"
-               --without-lttng
-               --bundled-libraries="${bundled_libs}"
-               --builtin-libraries=NONE
-               --disable-rpath
-               --disable-rpath-install
-               --nopyc
-               --nopyo
-               --disable-cephfs
-       )
-       if multilib_is_native_abi ; then
-               myconf+=(
-                       $(use_with acl acl-support)
-                       $(usex addc '' '--without-ad-dc')
-                       $(use_with addns dnsupdate)
-                       $(use_with ads)
-                       $(use_with cluster cluster-support)
-                       $(use_enable cups)
-                       $(use_with dmapi)
-                       $(use_with fam)
-                       $(use_enable gnutls)
-                       $(use_with gpg gpgme)
-                       $(use_enable iprint)
-                       $(use_with ldap)
-                       $(use_with pam)
-                       $(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-                       $(use_with quota quotas)
-                       $(use_with syslog)
-                       $(use_with systemd)
-                       $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-                       $(use_with winbind)
-                       $(usex test '--enable-selftest' '')
-                       $(use_enable zeroconf avahi)
-                       --with-shared-modules=${SHAREDMODS}
-               )
-       else
-               myconf+=(
-                       --without-acl-support
-                       --without-ad-dc
-                       --without-dnsupdate
-                       --without-ads
-                       --disable-avahi
-                       --without-cluster-support
-                       --disable-cups
-                       --without-dmapi
-                       --without-fam
-                       --disable-gnutls
-                       --without-gpgme
-                       --disable-iprint
-                       $(use_with ldap)
-                       --without-pam
-                       --without-quotas
-                       --without-syslog
-                       --without-systemd
-                       $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-                       --without-winbind
-                       --disable-python
-               )
-       fi
-
-       CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-               waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-       waf-utils_src_compile
-}
-
-multilib_src_install() {
-       waf-utils_src_install
-
-       # Make all .so files executable
-       find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-       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 (#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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       fi
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware that this release contains the best of all of Samba's"
-       ewarn "technology parts, both a file server (that you can reasonably expect"
-       ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-       ewarn "controller work previously known as 'samba4'."
-
-       elog "For further information and migration steps make sure to read "
-       elog "https://samba.org/samba/history/${P}.html "
-       elog "https://samba.org/samba/history/${PN}-4.5.0.html and"
-       elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.8.12.ebuild b/net-fs/samba/samba-4.8.12.ebuild
deleted file mode 100644 (file)
index ea9d19f..0000000
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
-iprint ldap pam profiling-data python quota selinux syslog system-heimdal
-+system-mitkrb5 systemd test winbind zeroconf"
-
-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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-       net-libs/libnsl:=[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-1.3.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( sys-libs/pam )
-       acl? ( virtual/acl )
-       $(python_gen_cond_dep "
-               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-               addns? (
-                       net-dns/bind-tools[gssapi]
-                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-               )
-       ")
-       ceph? ( sys-cluster/ceph )
-       cluster? (
-               net-libs/rpcsvc-proto
-               !dev-db/ctdb
-       )
-       cups? ( net-print/cups )
-       debug? ( dev-util/lttng-ust )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gnutls? (
-               dev-libs/libgcrypt:0
-               >=net-libs/gnutls-1.4.0
-       )
-       gpg? ( app-crypt/gpgme )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-       system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:0= )
-       zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
-       ${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       net-libs/libtirpc[${MULTILIB_USEDEP}]
-       virtual/pkgconfig
-       || (
-               net-libs/rpcsvc-proto
-               <sys-libs/glibc-2.26[rpc(+)]
-       )
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.9
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       python? ( ${PYTHON_DEPS} )
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-       addc? ( python gnutls winbind )
-       addns? ( python )
-       ads? ( acl gnutls ldap winbind )
-       cluster? ( ads )
-       gpg? ( addc )
-       test? ( python )
-       ?? ( system-heimdal system-mitkrb5 )
-       ${PYTHON_REQUIRED_USE}
-"
-
-# 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"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.4.0-pam.patch"
-       "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-       "${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-       if use cluster ; then
-               SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-       elif use ads ; then
-               SHAREDMODS="idmap_ad"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # un-bundle dnspython
-       sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-       # unbundle iso8601 unless tests are enabled
-       use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-       # 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
-
-       # Friggin' WAF shit
-       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
-
-       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
-               $(multilib_native_use_with acl acl-support)
-               $(multilib_native_usex addc '' '--without-ad-dc')
-               $(multilib_native_use_with addns dnsupdate)
-               $(multilib_native_use_with ads)
-               $(multilib_native_use_enable ceph cephfs)
-               $(multilib_native_use_with cluster cluster-support)
-               $(multilib_native_use_enable cups)
-               $(multilib_native_use_with dmapi)
-               $(multilib_native_use_with fam)
-               $(multilib_native_use_with gpg gpgme)
-               $(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 syslog)
-               $(multilib_native_use_with systemd)
-               $(multilib_native_use_with winbind)
-               $(multilib_native_usex python '' '--disable-python')
-               $(multilib_native_use_enable zeroconf avahi)
-               $(multilib_native_usex test '--enable-selftest' '')
-               $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-               $(use_enable gnutls)
-               $(use_with debug lttng)
-               $(use_with ldap)
-               $(use_with profiling-data)
-       )
-       multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-       CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-               waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-       waf-utils_src_compile
-}
-
-multilib_src_install() {
-       waf-utils_src_install
-
-       # Make all .so files executable
-       find "${ED}" -type f -name "*.so" -exec chmod +x {} +
-
-       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 (#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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       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
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/lock/samba
-       keepdir /var/log/samba
-       keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware that this release contains the best of all of Samba's"
-       ewarn "technology parts, both a file server (that you can reasonably expect"
-       ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-       ewarn "controller work previously known as 'samba4'."
-
-       elog "For further information and migration steps make sure to read "
-       elog "https://samba.org/samba/history/${P}.html "
-       elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.8.6-r4.ebuild b/net-fs/samba/samba-4.8.6-r4.ebuild
deleted file mode 100644 (file)
index 5b52da4..0000000
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-       net-libs/libnsl:=[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( sys-libs/pam )
-       acl? ( virtual/acl )
-       $(python_gen_cond_dep "
-               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-               addns? (
-                       net-dns/bind-tools[gssapi]
-                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-               )
-       ")
-       ceph? ( sys-cluster/ceph )
-       cluster? (
-               net-libs/rpcsvc-proto
-               !dev-db/ctdb
-       )
-       cups? ( net-print/cups )
-       debug? ( dev-util/lttng-ust )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gnutls? (
-               dev-libs/libgcrypt:0
-               >=net-libs/gnutls-1.4.0
-       )
-       gpg? ( app-crypt/gpgme )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-       system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:0= )
-       zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
-       ${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       net-libs/libtirpc[${MULTILIB_USEDEP}]
-       virtual/pkgconfig
-       || (
-               net-libs/rpcsvc-proto
-               <sys-libs/glibc-2.26[rpc(+)]
-       )
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.7
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       python? ( ${PYTHON_DEPS} )
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-       addc? ( python gnutls winbind )
-       addns? ( python )
-       ads? ( acl gnutls ldap winbind )
-       cluster? ( ads )
-       gpg? ( addc )
-       test? ( python )
-       ?? ( system-heimdal system-mitkrb5 )
-       ${PYTHON_REQUIRED_USE}
-"
-
-# 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"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.4.0-pam.patch"
-       "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-       "${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-       if use cluster ; then
-               SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-       elif use ads ; then
-               SHAREDMODS="idmap_ad"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # un-bundle dnspython
-       sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-       # unbundle iso8601 unless tests are enabled
-       use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-       # 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
-
-       # Friggin' WAF shit
-       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
-
-       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
-               $(multilib_native_use_with acl acl-support)
-               $(multilib_native_usex addc '' '--without-ad-dc')
-               $(multilib_native_use_with addns dnsupdate)
-               $(multilib_native_use_with ads)
-               $(multilib_native_use_enable ceph cephfs)
-               $(multilib_native_use_with cluster cluster-support)
-               $(multilib_native_use_enable cups)
-               $(multilib_native_use_with dmapi)
-               $(multilib_native_use_with fam)
-               $(multilib_native_use_with gpg gpgme)
-               $(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 syslog)
-               $(multilib_native_use_with systemd)
-               $(multilib_native_use_with winbind)
-               $(multilib_native_usex python '' '--disable-python')
-               $(multilib_native_use_enable zeroconf avahi)
-               $(multilib_native_usex test '--enable-selftest' '')
-               $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-               $(use_enable gnutls)
-               $(use_with debug lttng)
-               $(use_with ldap)
-       )
-       multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-       CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-               waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-       waf-utils_src_compile
-}
-
-multilib_src_install() {
-       waf-utils_src_install
-
-       # Make all .so files executable
-       find "${ED}" -type f -name "*.so" -exec chmod +x {} +
-
-       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 (#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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       fi
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware that this release contains the best of all of Samba's"
-       ewarn "technology parts, both a file server (that you can reasonably expect"
-       ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-       ewarn "controller work previously known as 'samba4'."
-
-       elog "For further information and migration steps make sure to read "
-       elog "https://samba.org/samba/history/${P}.html "
-       elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.8.6-r5.ebuild b/net-fs/samba/samba-4.8.6-r5.ebuild
deleted file mode 100644 (file)
index 2b2d8e5..0000000
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-       net-libs/libnsl:=[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( sys-libs/pam )
-       acl? ( virtual/acl )
-       $(python_gen_cond_dep "
-               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-               addns? (
-                       net-dns/bind-tools[gssapi]
-                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-               )
-       ")
-       ceph? ( sys-cluster/ceph )
-       cluster? (
-               net-libs/rpcsvc-proto
-               !dev-db/ctdb
-       )
-       cups? ( net-print/cups )
-       debug? ( dev-util/lttng-ust )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gnutls? (
-               dev-libs/libgcrypt:0
-               >=net-libs/gnutls-1.4.0
-       )
-       gpg? ( app-crypt/gpgme )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-       system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:0= )
-       zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
-       ${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       net-libs/libtirpc[${MULTILIB_USEDEP}]
-       virtual/pkgconfig
-       || (
-               net-libs/rpcsvc-proto
-               <sys-libs/glibc-2.26[rpc(+)]
-       )
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.9
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       python? ( ${PYTHON_DEPS} )
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-       addc? ( python gnutls winbind )
-       addns? ( python )
-       ads? ( acl gnutls ldap winbind )
-       cluster? ( ads )
-       gpg? ( addc )
-       test? ( python )
-       ?? ( system-heimdal system-mitkrb5 )
-       ${PYTHON_REQUIRED_USE}
-"
-
-# 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"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.4.0-pam.patch"
-       "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-       "${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-       if use cluster ; then
-               SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-       elif use ads ; then
-               SHAREDMODS="idmap_ad"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # un-bundle dnspython
-       sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-       # unbundle iso8601 unless tests are enabled
-       use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-       # 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
-
-       # Friggin' WAF shit
-       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
-
-       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
-               $(multilib_native_use_with acl acl-support)
-               $(multilib_native_usex addc '' '--without-ad-dc')
-               $(multilib_native_use_with addns dnsupdate)
-               $(multilib_native_use_with ads)
-               $(multilib_native_use_enable ceph cephfs)
-               $(multilib_native_use_with cluster cluster-support)
-               $(multilib_native_use_enable cups)
-               $(multilib_native_use_with dmapi)
-               $(multilib_native_use_with fam)
-               $(multilib_native_use_with gpg gpgme)
-               $(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 syslog)
-               $(multilib_native_use_with systemd)
-               $(multilib_native_use_with winbind)
-               $(multilib_native_usex python '' '--disable-python')
-               $(multilib_native_use_enable zeroconf avahi)
-               $(multilib_native_usex test '--enable-selftest' '')
-               $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-               $(use_enable gnutls)
-               $(use_with debug lttng)
-               $(use_with ldap)
-       )
-       multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-       CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-               waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-       waf-utils_src_compile
-}
-
-multilib_src_install() {
-       waf-utils_src_install
-
-       # Make all .so files executable
-       find "${ED}" -type f -name "*.so" -exec chmod +x {} +
-
-       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 (#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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       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
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/lock/samba
-       keepdir /var/log/samba
-       keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware that this release contains the best of all of Samba's"
-       ewarn "technology parts, both a file server (that you can reasonably expect"
-       ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-       ewarn "controller work previously known as 'samba4'."
-
-       elog "For further information and migration steps make sure to read "
-       elog "https://samba.org/samba/history/${P}.html "
-       elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.9.17.ebuild b/net-fs/samba/samba-4.9.17.ebuild
deleted file mode 100644 (file)
index b01d8c4..0000000
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
-iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
-+system-mitkrb5 systemd test winbind zeroconf"
-
-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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-       net-libs/libnsl:=[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.14[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.37[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( sys-libs/pam )
-       acl? ( virtual/acl )
-       $(python_gen_cond_dep "
-               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-               addns? (
-                       net-dns/bind-tools[gssapi]
-                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-               )
-       ")
-       ceph? ( sys-cluster/ceph )
-       cluster? (
-               net-libs/rpcsvc-proto
-               !dev-db/ctdb
-       )
-       cups? ( net-print/cups )
-       debug? ( dev-util/lttng-ust )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gnutls? (
-               dev-libs/libgcrypt:0
-               >=net-libs/gnutls-1.4.0
-       )
-       gpg? ( app-crypt/gpgme )
-       json? ( dev-libs/jansson )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-       system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:0= )
-       zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
-       ${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       net-libs/libtirpc[${MULTILIB_USEDEP}]
-       virtual/pkgconfig
-       || (
-               net-libs/rpcsvc-proto
-               <sys-libs/glibc-2.26[rpc(+)]
-       )
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.9
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       python? ( ${PYTHON_DEPS} )
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-       addc? ( python gnutls json winbind )
-       addns? ( python )
-       ads? ( acl gnutls ldap winbind )
-       cluster? ( ads )
-       gpg? ( addc )
-       test? ( python )
-       ?? ( system-heimdal system-mitkrb5 )
-       ${PYTHON_REQUIRED_USE}
-"
-
-# 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"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.4.0-pam.patch"
-       "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-       "${FILESDIR}/${PN}-4.9.2-timespec.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-       if use cluster ; then
-               SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-       elif use ads ; then
-               SHAREDMODS="idmap_ad"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # un-bundle 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
-
-       # Friggin' WAF shit
-       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
-
-       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
-               $(multilib_native_use_with acl acl-support)
-               $(multilib_native_usex addc '' '--without-ad-dc')
-               $(multilib_native_use_with addns dnsupdate)
-               $(multilib_native_use_with ads)
-               $(multilib_native_use_enable ceph cephfs)
-               $(multilib_native_use_with cluster cluster-support)
-               $(multilib_native_use_enable cups)
-               $(multilib_native_use_with dmapi)
-               $(multilib_native_use_with fam)
-               $(multilib_native_use_with gpg gpgme)
-               $(multilib_native_use_with json json-audit)
-               $(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 syslog)
-               $(multilib_native_use_with systemd)
-               $(multilib_native_use_with winbind)
-               $(multilib_native_usex python '' '--disable-python')
-               $(multilib_native_use_enable zeroconf avahi)
-               $(multilib_native_usex test '--enable-selftest' '')
-               $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-               $(use_enable gnutls)
-               $(use_with debug lttng)
-               $(use_with ldap)
-               $(use_with profiling-data)
-       )
-       multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-       CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-               waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-       waf-utils_src_compile
-}
-
-multilib_src_install() {
-       waf-utils_src_install
-
-       # Make all .so files executable
-       find "${ED}" -type f -name "*.so" -exec chmod +x {} + || 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 (#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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       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
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/lock/samba
-       keepdir /var/log/samba
-       keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware that this release contains the best of all of Samba's"
-       ewarn "technology parts, both a file server (that you can reasonably expect"
-       ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-       ewarn "controller work previously known as 'samba4'."
-
-       elog "For further information and migration steps make sure to read "
-       elog "https://samba.org/samba/history/${P}.html "
-       elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.9.18.ebuild b/net-fs/samba/samba-4.9.18.ebuild
deleted file mode 100644 (file)
index b01d8c4..0000000
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
-iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
-+system-mitkrb5 systemd test winbind zeroconf"
-
-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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-       net-libs/libnsl:=[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.14[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.37[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( sys-libs/pam )
-       acl? ( virtual/acl )
-       $(python_gen_cond_dep "
-               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-               addns? (
-                       net-dns/bind-tools[gssapi]
-                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-               )
-       ")
-       ceph? ( sys-cluster/ceph )
-       cluster? (
-               net-libs/rpcsvc-proto
-               !dev-db/ctdb
-       )
-       cups? ( net-print/cups )
-       debug? ( dev-util/lttng-ust )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gnutls? (
-               dev-libs/libgcrypt:0
-               >=net-libs/gnutls-1.4.0
-       )
-       gpg? ( app-crypt/gpgme )
-       json? ( dev-libs/jansson )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-       system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:0= )
-       zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
-       ${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       net-libs/libtirpc[${MULTILIB_USEDEP}]
-       virtual/pkgconfig
-       || (
-               net-libs/rpcsvc-proto
-               <sys-libs/glibc-2.26[rpc(+)]
-       )
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.9
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       python? ( ${PYTHON_DEPS} )
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-       addc? ( python gnutls json winbind )
-       addns? ( python )
-       ads? ( acl gnutls ldap winbind )
-       cluster? ( ads )
-       gpg? ( addc )
-       test? ( python )
-       ?? ( system-heimdal system-mitkrb5 )
-       ${PYTHON_REQUIRED_USE}
-"
-
-# 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"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.4.0-pam.patch"
-       "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-       "${FILESDIR}/${PN}-4.9.2-timespec.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-       if use cluster ; then
-               SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-       elif use ads ; then
-               SHAREDMODS="idmap_ad"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # un-bundle 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
-
-       # Friggin' WAF shit
-       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
-
-       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
-               $(multilib_native_use_with acl acl-support)
-               $(multilib_native_usex addc '' '--without-ad-dc')
-               $(multilib_native_use_with addns dnsupdate)
-               $(multilib_native_use_with ads)
-               $(multilib_native_use_enable ceph cephfs)
-               $(multilib_native_use_with cluster cluster-support)
-               $(multilib_native_use_enable cups)
-               $(multilib_native_use_with dmapi)
-               $(multilib_native_use_with fam)
-               $(multilib_native_use_with gpg gpgme)
-               $(multilib_native_use_with json json-audit)
-               $(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 syslog)
-               $(multilib_native_use_with systemd)
-               $(multilib_native_use_with winbind)
-               $(multilib_native_usex python '' '--disable-python')
-               $(multilib_native_use_enable zeroconf avahi)
-               $(multilib_native_usex test '--enable-selftest' '')
-               $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-               $(use_enable gnutls)
-               $(use_with debug lttng)
-               $(use_with ldap)
-               $(use_with profiling-data)
-       )
-       multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-       CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-               waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-       waf-utils_src_compile
-}
-
-multilib_src_install() {
-       waf-utils_src_install
-
-       # Make all .so files executable
-       find "${ED}" -type f -name "*.so" -exec chmod +x {} + || 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 (#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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       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
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/lock/samba
-       keepdir /var/log/samba
-       keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware that this release contains the best of all of Samba's"
-       ewarn "technology parts, both a file server (that you can reasonably expect"
-       ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-       ewarn "controller work previously known as 'samba4'."
-
-       elog "For further information and migration steps make sure to read "
-       elog "https://samba.org/samba/history/${P}.html "
-       elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}