From 22910f5d14da606bd7f06e19a2f61c5d1a8fc94b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 May 2018 15:22:17 +0100 Subject: gentoo resync : 25.05.2018 --- net-fs/samba/Manifest | 5 +- .../files/samba-4.8-without_ads_build_fix.patch | 49 ++++ net-fs/samba/samba-4.8.1.ebuild | 286 --------------------- net-fs/samba/samba-4.8.2.ebuild | 2 +- 4 files changed, 52 insertions(+), 290 deletions(-) create mode 100644 net-fs/samba/files/samba-4.8-without_ads_build_fix.patch delete mode 100644 net-fs/samba/samba-4.8.1.ebuild (limited to 'net-fs/samba') diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 67aa0d741d6c..398614aff602 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -9,6 +9,7 @@ AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8f AUX samba-4.5.1-compile_et_fix.patch 762 BLAKE2B 432d8380e3511c3dbb408479d0152fb0760e9e487a3033718fa39b9ca4a87a04c9cf8ac41a4b9268020a1d41dee9efa5bde3f0e71498483102fcae80749ad62c SHA512 9605751653dcbbce41be807a9b4f8e5f657db6622f843e91c4df9c4b3e4ad621b6e8e3891f2b970208d55a80801355988f253e3c844ca51a658cd6de8c373e24 AUX samba-4.6-no_ads.patch 1102 BLAKE2B 34d7f4364a1eb5dc93cfdba3fe011d71361c134bcc7ed15f07731a8dbfc57d8b555b6942b3a1fb7ff1ae082d609849c0b8191613ed3880318102a03588a2d2ce SHA512 a077711b51801d7af215dec62782ef166e45fdc007a9a8f3ae724638d3d7f6e3177ace5be549d327964b787b1d64b7e0d4485fa4a2a013617824d991c547c780 AUX samba-4.7.3-krb-cross-compile.patch 1590 BLAKE2B 34cf304441731556556e40ed386f110dd8aa26a49680fa106b550edede86842e736c5652cd4aa54f0da7955600442cbc41350031dc8b67deae11f68050a6cf7c SHA512 0f762326f5b72d10e4c553630a8c4c433de884d80024c26e4f0e46b26bc24ac53c07642d833bb327f0010b7ee0ce2df05a94dc8868f3f363f68f9851b76265c5 +AUX samba-4.8-without_ads_build_fix.patch 1325 BLAKE2B 3a203397c4cc860f9681bf5015dcf36e2c4ba2672714fc95151548855790e7d0b517ca0568494a8915d02e492c02d3cbf07d5e4fc74a44acfe0153ffb62f2a5a SHA512 1947ec4a1d98c52e223763a7e3981642d3faa38c0e11e8f947c369b7e4ecde17d657e96fc8eeb3dd1ef8fa688c930c77a67e240d9176728583a9d8f55cf9a490 AUX samba-glibc-2.26-no_rpc.patch 631 BLAKE2B 22e414bcd329d7d32381c61ad4341de69a07235447dc4116855cca9ce99d32a5ffe111602fdf6ea02c6fe9c5b3331ecaec974faa5e22e009f15964296b53825a SHA512 18a466cbe42313f096ebeb635e5738b59672e96fd5c7db80cff5aa96c0edeb359b6833967bfac09eb5c010eec4309b3b73c0f941173b520918939974fa599541 AUX samba.conf 61 BLAKE2B fff77908503f3718cdcf04b60eda6bf717fb37628107676ed66133da235af95ac91d6209f97830de7a5bfdee9e25f850334bb445ee22110d14eb82e1b399694c SHA512 4a75185762c90d110c399215fbfc939d30804b558ffdb11cc68dee6f87a94c86cadbcd63935884db1266cf40fe24fefb75f9067fe4751ad9838d7a43e8973b9e AUX samba.service 199 BLAKE2B 5949503c588684a48ab0a26f5811bb053d8527eb9da2ecc8b4bd911ea6d51969bc9607b14f3f72394127ff24967849d3e829a05b6584ba3f3de5e640d240c204 SHA512 eb277917f15de958f4a0404b66c6d2cc82ae4319b85f2f442489988d523bf92e2a9d23a6051ee693cd4bcfbc67947e8028c59906ad3e537578daf5caee8a6f16 @@ -23,13 +24,11 @@ DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c DIST samba-4.6.15.tar.gz 21175479 BLAKE2B 40751be51e5ae1368b66d5e0919092935749a749dbb469dd503864acb9d5caf1c26c0894ac3a5294ed8b2c79de31366d80f1b565bffb4f18a7ba659872748feb SHA512 7b55e305c41380ba6dd4df94bdd88aa2d4ebbe27ec258331c04a9610ee820e4c290a3dfdcd04fa89e100b115a674380881699d6cd565f08d753d1b23036c4986 DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb DIST samba-4.7.7.tar.gz 16875059 BLAKE2B 05ecf13562e847070498e923df0cc85836b2fb98d4618942f60e4f28d6c5110b382cfe494e6578bbc06e14052c5d87b0f542ada186e4f132375c4360eaa8bb9f SHA512 78f180f602f08ab9e3000ae016f667e44f059a865b606c21e18857efb89af469c2cb2f9c1316e658badf1a1f41826ba87ccb23f38dc31fe82bf9e5b8fb93daad -DIST samba-4.8.1.tar.gz 17675747 BLAKE2B 109692c46e87bcf8a0573c8523943e31086665f6683e4fd634dc5ed93d71da15f82c5354b10883067ea662f947e49b7139208490ae482df6fe3a8209ed77341e SHA512 0c48ca0efc2b5b456e4c77ba7d21cacda9e02534e9715b07f712951e47af1959deb3e30d733324b997573feb1aefd81d1eec1c0b691e417a89d81f302ed9e568 DIST samba-4.8.2.tar.gz 17675145 BLAKE2B 3ae5c33c85d7f0e4cf7fe45fbef55cd0d5aec2e77355297be31c4a32de41ff40338f58843a3e31942ca2c2a086829ed4f339485a7dd39693f1e433526eb23af1 SHA512 061b968c81c2272b5e353444ef53372ae5caa66f5af0b28b422e7d33a32ed0d321900c13636729c0e21a4d8dedcaff7ca7a5f6fe682b71c292f9a66a497a2766 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372 EBUILD samba-4.2.14.ebuild 7128 BLAKE2B ec7d757f67ed562b5376c317bb6a0a03b66cac9941400a65829c8e2608164d7a78d0c0704289101d7f38a1b43527518c47b2c44f9836c57294719fef1226b7bc SHA512 2c9139f97a5dbe76d78ed82b85ba1fbae7d37e2da48939942f69f546bd0b2a9403e2167cc1cb4ad998e680c524684615e5c87c92f424a767b038d7b911e5b217 EBUILD samba-4.5.16.ebuild 8163 BLAKE2B 5425cd0deee01d5bd2ea33ce1e3e3c826f21ddf73050d653b90216b8797e15528706abcce5850eade5eaf3a1baad3456e6344146979e2baba110c3e53520d5da SHA512 d595cc925dd4d8aca99d0b0b2b0bfa77a265c8d1df345fe22acb1a56e1dc1db6fdefc7f6cf49b9147cbef54f8eb1d7172f896906217394871f7f91d8a924646d EBUILD samba-4.6.15.ebuild 8728 BLAKE2B 522bb8590e18c696853fb2e87106c8275cd855b330660c25918d754ab0ac9013b28b1517af7147cda64135958cd0a79087b5ff7365e48b20eb5d1c6f0cdd6460 SHA512 4d48c665ee9708cdc3fbd290c56e6eba41cf878a2f4130f994bbfdc5ea6194a98c286cd5ee0ea7f9c41409bf783acf395add7ad36491d223742ed816bf6b2652 EBUILD samba-4.7.7.ebuild 8724 BLAKE2B 72fd87b0411656a99a43382d6c7a72741c1751aad5277d5a969887656fb98e301c5f831b3bc51986f776f273e16208450c65d226482c8691d3f1b174bd154afb SHA512 9db5c86a3c208a9336057411a944b63cfed811cf5115e26746fff4511fbe2f7fe7ecc5fb41443489873aaa7703987df4381bcdefa044208c718f8d3ce5274afb -EBUILD samba-4.8.1.ebuild 8323 BLAKE2B 808c5b997a723a9148798be098171d9d44d493aac64bd042c5b4b30426395d2766c90a0bacfcb08017828c30826a8531ae4a00e3e5224fc6d074aa6db2a86d5c SHA512 a89ee5a24d7989a2effe655d536a4472b223010d437c9bec3b3a212f752ba79a58941e8c4879bf5c4f5fd9b04773a71f1471e09eeb7e8236a60a20885d2f93c2 -EBUILD samba-4.8.2.ebuild 8323 BLAKE2B eb4bfcb32c2c80abc4b9facd250b201847826a859335c992ddadea123fcfbc4a9f523ebf9c4ef0e2cd90d20a144585b223d249d7ee5c324e69c44233084b5114 SHA512 e36fe30d69c5077ee41803769b573b4e1b44a37154d513d02663127d80c6175bfe1d44aa39a46f4d6b1ebd91217efcd48890b0e5a1fe3f9f4c19dcf2cad36651 +EBUILD samba-4.8.2.ebuild 8358 BLAKE2B ad1e4e508755838c91586b364680557430478bdda8ce29be8278b95f336a0dbaa547191fca18727e546884b247fb3021cf18943daba94ed45f56fadddec098ae SHA512 d51fc7cd90a80b27b80a87990120a33b4bc6764734ce81df481bc437a600f7f410f2b41b0c5da5de973659ef9c321271868c10762beaa97f9f410e300296cba0 MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be diff --git a/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch b/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch new file mode 100644 index 000000000000..a2a4702d0075 --- /dev/null +++ b/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch @@ -0,0 +1,49 @@ +From 223d3f1ed782af2b251962ada8cce190933fff7e Mon Sep 17 00:00:00 2001 +From: Volker Lendecke +Date: Sat, 3 Feb 2018 07:07:55 +0100 +Subject: [PATCH] libgpo: Fix the build --without-ads + +Signed-off-by: Volker Lendecke +Reviewed-by: David Disseldorp + +Autobuild-User(master): David Disseldorp +Autobuild-Date(master): Tue Feb 6 15:36:01 CET 2018 on sn-devel-144 + +Bug: https://bugzilla.samba.org/show_bug.cgi?id=13331 + +(cherry picked from commit a222b7506b53e689708834237f18877231dca589) +--- + libgpo/pygpo.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c +index 7a02a0d..b6b53b7 100644 +--- a/libgpo/pygpo.c ++++ b/libgpo/pygpo.c +@@ -319,6 +319,7 @@ static PyObject *py_gpo_get_sysvol_gpt_version(PyObject * self, + return result; + } + ++#ifdef HAVE_ADS + static ADS_STATUS find_samaccount(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, + const char *samaccountname, + uint32_t *uac_ret, const char **dn_ret) +@@ -468,11 +469,15 @@ out: + return ret; + } + ++#endif ++ + static PyMethodDef ADS_methods[] = { + { "connect", (PyCFunction)py_ads_connect, METH_NOARGS, + "Connect to the LDAP server" }, ++#ifdef HAVE_ADS + { "get_gpo_list", (PyCFunction)py_ads_get_gpo_list, METH_KEYWORDS, + NULL }, ++#endif + { NULL } + }; + +-- +1.9.1 + diff --git a/net-fs/samba/samba-4.8.1.ebuild b/net-fs/samba/samba-4.8.1.ebuild deleted file mode 100644 index 30c1346e24f0..000000000000 --- a/net-fs/samba/samba-4.8.1.ebuild +++ /dev/null @@ -1,286 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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="~amd64 ~arm64 ~hppa ~x86" - -DESCRIPTION="Samba Suite Version 4" -HOMEPAGE="http://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-python/subunit[${PYTHON_USEDEP},${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.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/libcap - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/libiconv - pam? ( virtual/pam ) - acl? ( virtual/acl ) - addns? ( - net-dns/bind-tools[gssapi] - dev-python/dnspython:=[${PYTHON_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= ) -" -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/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 ) - python? ( ldap ) - 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" -) - -#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:::' \ - -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 the 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 "http://samba.org/samba/history/${P}.html " - elog "http://wiki.samba.org/index.php/Samba4/HOWTO " -} diff --git a/net-fs/samba/samba-4.8.2.ebuild b/net-fs/samba/samba-4.8.2.ebuild index 3bfb4b1af5ba..cd603d27bdea 100644 --- a/net-fs/samba/samba-4.8.2.ebuild +++ b/net-fs/samba/samba-4.8.2.ebuild @@ -114,7 +114,6 @@ REQUIRED_USE=" ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) - python? ( ldap ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ${PYTHON_REQUIRED_USE} @@ -131,6 +130,7 @@ 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-without_ads_build_fix.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" -- cgit v1.2.3