From 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Apr 2018 14:14:48 +0100 Subject: gentoo resync : 19.04.2018 --- net-fs/samba/Manifest | 12 +- net-fs/samba/files/samba-4.6-no_ads.patch | 37 ++++ net-fs/samba/files/samba-4.7.4-no_ads.patch | 22 -- net-fs/samba/samba-4.6.14.ebuild | 1 + net-fs/samba/samba-4.6.15.ebuild | 312 +++++++++++++++++++++++++++ net-fs/samba/samba-4.7.6.ebuild | 2 +- net-fs/samba/samba-4.7.7.ebuild | 319 ++++++++++++++++++++++++++++ net-fs/samba/samba-4.8.0.ebuild | 2 +- 8 files changed, 679 insertions(+), 28 deletions(-) create mode 100644 net-fs/samba/files/samba-4.6-no_ads.patch delete mode 100644 net-fs/samba/files/samba-4.7.4-no_ads.patch create mode 100644 net-fs/samba/samba-4.6.15.ebuild create mode 100644 net-fs/samba/samba-4.7.7.ebuild (limited to 'net-fs/samba') diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 2a99ca592e38..019c6ed699c1 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -7,8 +7,8 @@ AUX samba-4.2.3-heimdal_compilefix.patch 819 BLAKE2B f19e9e1af0d5616fc04473ddcdd AUX samba-4.2.7-pam.patch 1273 BLAKE2B 41a17b701a592500f3b85be29fd134048ebd9403c510c339d1094f915c5eeae729972c7231169fa890dfde802797276a9c419eb17ed7a23e5ad1aaa46cdfd8ec SHA512 5f900ebfdfb15af38814864f7ec8cd52d3525098d6f2017ab2f29d301e6a0e622d2ab37976fbd97180cbfe23c7853e91ab7966655eb46ebd9bdd2951205e46bc AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c 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.7.4-no_ads.patch 603 BLAKE2B 1da70c2fd2856f6270404f5b42bd6687507977234f2951d152e20ed99fcc76b7e0d67cc7f7abec89e4d7c50b2982f3abf770dde2694bf17213bc1d5bae7f19b7 SHA512 0310f45f4e060ffcd6ab17edfaba84a81f54147af6256f1d59c5b7314d4d638be35e0db79a6723a9adf9b54c87fc51af62b528ab52e3bcaa6102d1970715722e 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 @@ -21,13 +21,17 @@ DIST samba-4.2.14.tar.gz 20883281 BLAKE2B 90bff4ef0752b952e2e31b6e86223ae7e78524 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.6.14.tar.gz 21161954 BLAKE2B e514c23f46679ba0415b91ada99e0263f123df6b1b76e5e1ead67ab248bb38cdc2e20107a71630b7c31305b3b2b72526b2b16758f048e7c1a0810af7f4fa09f7 SHA512 a235f5932d7ec2cad22c841ae5138c5bc5a8bce0fe2327146a7f34d9abb46656b323d66c490d0058bbf0831a5b5fa328722e0566155d430e3a180440be1c70d3 +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.6.tar.gz 16864824 BLAKE2B 0c519f83e95f9ef9ff13c6a4998d0c98e67765253e855386febe20f836873b10e94161d1539d24af835f464d56edd7f5595abd30b8d6b039cd8ba887563394b1 SHA512 8190b06f543cc3d4a9a98f93ad5e4e16e4e87ea462435723044a780942cea7efc77c66cd3e61941bf449a2ac0f4346ced378f032d5fb1776280a3c4bcb951b46 +DIST samba-4.7.7.tar.gz 16875059 BLAKE2B 05ecf13562e847070498e923df0cc85836b2fb98d4618942f60e4f28d6c5110b382cfe494e6578bbc06e14052c5d87b0f542ada186e4f132375c4360eaa8bb9f SHA512 78f180f602f08ab9e3000ae016f667e44f059a865b606c21e18857efb89af469c2cb2f9c1316e658badf1a1f41826ba87ccb23f38dc31fe82bf9e5b8fb93daad DIST samba-4.8.0.tar.gz 17659751 BLAKE2B 389d7b6039a00734b514eb017bb201f119b8b894b98af4387ac3186a082b2de295e78b58e96539b93433d3d850e9be19f6ef9a63f66fa9a330f3a88d25b28a03 SHA512 64ffbddb6cf9eee00e5d67a471387b81759c3b4bf67793083aa021e232c8321182182eb9c642b9c25fb1a488f135dec34f7e092d286f94836c488022f8a15c01 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372 EBUILD samba-4.2.14.ebuild 7066 BLAKE2B 7c88d976faf5e47b17678c2523a9cce59a93f4e401cc8a9d7e293051b9430fc6dada6c0eb0e06308e20ca6e10993c10d5a0c65ce55d26b4443d0b682efc4fd60 SHA512 b86f624ea3caaa517a8baf7e98edfdc470a294f2e0df3ccd5c3b979215386b762d166c81c187988ae151068149f722429e4b33e32092f842cb697aedacc8d6a5 EBUILD samba-4.5.16.ebuild 8098 BLAKE2B cf69d4455596d6bce7f71ddcda1e61b76d4bcf5b1e60f1d094a12cbeff0e3f9259c3e149b4866df60dba9d6001bcb5f52e92fff1130669bd2ba5e683cd54d802 SHA512 7cd783f9bd03c7874517b04990638077a146d34b668a87f95e9c1d5208e50859bd6a12d9702a33f8055b4bab262a07df6267b2e7f58311dda919aafebb966f9d -EBUILD samba-4.6.14.ebuild 8624 BLAKE2B daf6360bfd73e5eee3c0124430cdf96c39aa82fd179f5cf57b980602532c2e64ab2ac44ad1f6c0aa2ee07167b3a0b60cb1198e93cf68d08418706740e747a64b SHA512 3542a26f213e44df646dcbb579f0fa08598530df019075ebddb51bcae4eb1360b5da849396d42bb40832c7ff53869f259e6b16e5771532061e566f74d59405a0 -EBUILD samba-4.7.6.ebuild 8718 BLAKE2B cc282255ced147081a5866ed3ae4113f331fde97a7a4c47f19353ed720ec0c2646c11f1a20428faaa3b1df1a95457bee58b130bd13ff22ed1ec9710dcc47a38f SHA512 f92768a1965c32bb7a3189a5224daf6dfa577d1ad797e7edff4805893722c80a031ca458efb86da2c8ac4b0c186c4964fe5191444e7f189e11e59bf082c212ce -EBUILD samba-4.8.0.ebuild 8362 BLAKE2B 382182aa68cf089d81a24dd797b3f2e0125cd28915fa0729571b46b1681180c54440f5d70c1b6a22128dbd2c8ec2c8b58cd7bd3bca7c244966b8c2a7e74968c5 SHA512 b80b8f9595378d1b22f49c0802172c2d605508c4cd5c788b7013217fbfd035c932cdc9a2e36c4c9e4c0607c7f8cfe6ee339bbfc3075b64ae515227365728c6cc +EBUILD samba-4.6.14.ebuild 8662 BLAKE2B 9c17e3e4b11f15acba081bfe97dba553939ef98579c1957b40b776f3baf0858c09e6a242b384517395a42f7f5d40c686fb7d3c8483c2a072045ca25339affb3a SHA512 96e049e48d45de3f861207eed2a891831f870a1dc59006e36a0b5b7e296e45173ed1f1684a1fcc9c7a08863cd428565780cde5809a10c1fef62e263dcb278383 +EBUILD samba-4.6.15.ebuild 8662 BLAKE2B 9c17e3e4b11f15acba081bfe97dba553939ef98579c1957b40b776f3baf0858c09e6a242b384517395a42f7f5d40c686fb7d3c8483c2a072045ca25339affb3a SHA512 96e049e48d45de3f861207eed2a891831f870a1dc59006e36a0b5b7e296e45173ed1f1684a1fcc9c7a08863cd428565780cde5809a10c1fef62e263dcb278383 +EBUILD samba-4.7.6.ebuild 8716 BLAKE2B 12106f6a53f79b903a9dcf3091b6ebbc85ad91deb406cbda789d02c50f2ec9301edffce9c2dd1ec12daa0e4130f5cd383e04e547573d487d3c6cbee4ddba16da SHA512 444f4f768c02376fc6724e841aeb0650411bed49643f38d41c143ef9180e115a6bc90b6ff84a00970bcc58036c14385b88fa11646be1dbd56d360c460094685c +EBUILD samba-4.7.7.ebuild 8716 BLAKE2B 12106f6a53f79b903a9dcf3091b6ebbc85ad91deb406cbda789d02c50f2ec9301edffce9c2dd1ec12daa0e4130f5cd383e04e547573d487d3c6cbee4ddba16da SHA512 444f4f768c02376fc6724e841aeb0650411bed49643f38d41c143ef9180e115a6bc90b6ff84a00970bcc58036c14385b88fa11646be1dbd56d360c460094685c +EBUILD samba-4.8.0.ebuild 8360 BLAKE2B 7efc77fb7e4e56b990a130a2c8cfcd42323cb12ebf3c75df4380fa33acc9a4d38b66222ee3cfd3c8de0e3c1978f8c7c00a4459117046cd5ab175afa0ce78e7f2 SHA512 50efbb207cf31c7629531bec96d647855836fc264a227505b240127fb1cd933e362576f4bbca8f813a436128cd5582d51b013c6b88fe212718cec561c72de4c5 MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be diff --git a/net-fs/samba/files/samba-4.6-no_ads.patch b/net-fs/samba/files/samba-4.6-no_ads.patch new file mode 100644 index 000000000000..e3f3dfd03058 --- /dev/null +++ b/net-fs/samba/files/samba-4.6-no_ads.patch @@ -0,0 +1,37 @@ +From 655504d97a98541bebac812953fd48c49526312d Mon Sep 17 00:00:00 2001 +From: Volker Lendecke +Date: Sat, 3 Feb 2018 07:07:24 +0100 +Subject: [PATCH] libads: 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 02:47:44 CET 2018 on sn-devel-144 + +Bug: https://bugzilla.samba.org/show_bug.cgi?id=13273 + +(cherry picked from commit 859698d29b547217356851094ed8188236e717b6) +--- + source3/libads/kerberos_keytab.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c +index ffd100c..37ac7ba 100644 +--- a/source3/libads/kerberos_keytab.c ++++ b/source3/libads/kerberos_keytab.c +@@ -640,7 +640,11 @@ int ads_keytab_list(const char *keytab_name) + } + + if (keytab_name == NULL) { ++#ifdef HAVE_ADS + ret = ads_keytab_open(context, &keytab); ++#else ++ ret = ENOENT; ++#endif + } else { + ret = smb_krb5_kt_open(context, keytab_name, False, &keytab); + } +-- +1.9.1 + diff --git a/net-fs/samba/files/samba-4.7.4-no_ads.patch b/net-fs/samba/files/samba-4.7.4-no_ads.patch deleted file mode 100644 index d4c26a39a737..000000000000 --- a/net-fs/samba/files/samba-4.7.4-no_ads.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://lists.samba.org/archive/samba-technical/2017-December/124629.html - ---- a/source3/libads/kerberos_keytab.c -+++ b/source3/libads/kerberos_keytab.c -@@ -32,8 +32,6 @@ - - #ifdef HAVE_KRB5 - --#ifdef HAVE_ADS -- - /* This MAX_NAME_LEN is a constant defined in krb5.h */ - #ifndef MAX_KEYTAB_NAME_LEN - #define MAX_KEYTAB_NAME_LEN 1100 -@@ -85,6 +83,8 @@ - return ret; - } - -+#ifdef HAVE_ADS -+ - /********************************************************************** - Adds a single service principal, i.e. 'host' to the system keytab - ***********************************************************************/ diff --git a/net-fs/samba/samba-4.6.14.ebuild b/net-fs/samba/samba-4.6.14.ebuild index e12d8c119d60..ac34ac0c5aa6 100644 --- a/net-fs/samba/samba-4.6.14.ebuild +++ b/net-fs/samba/samba-4.6.14.ebuild @@ -122,6 +122,7 @@ 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 + "${FILESDIR}/${PN}-4.6-no_ads.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" diff --git a/net-fs/samba/samba-4.6.15.ebuild b/net-fs/samba/samba-4.6.15.ebuild new file mode 100644 index 000000000000..ac34ac0c5aa6 --- /dev/null +++ b/net-fs/samba/samba-4.6.15.ebuild @@ -0,0 +1,312 @@ +# 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 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/~axs/samba-4.6.7-disable-python-patches.tar.xz" +[[ ${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.0.0[${MULTILIB_USEDEP}] + sys-apps/attr[${MULTILIB_USEDEP}] + ~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}] + sys-libs/libcap + sys-libs/ncurses:0=[${MULTILIB_USEDEP}] + sys-libs/readline:0= + >=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.3.12[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/tevent-0.9.34[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? ( !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[${MULTILIB_USEDEP}] ) + systemd? ( sys-apps/systemd:0= )" +DEPEND="${CDEPEND} + ${PYTHON_DEPS} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig + 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 !system-mitkrb5 ) + addns? ( python ) + ads? ( acl gnutls ldap ) + 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}-glibc-2.26-no_rpc.patch" #637320 + "${FILESDIR}/${PN}-4.6-no_ads.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 + + # install the patches from tarball(s) + eapply "${WORKDIR}/patches" + + # 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=() + 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 + ) + 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_enable ceph cephfs) + $(use_with cluster cluster-support) + $(use_enable cups) + $(use_with debug lttng) + $(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 python '' '--disable-python') + $(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 + --disable-cephfs + --without-cluster-support + --disable-cups + --without-dmapi + --without-fam + --disable-gnutls + --without-gpgme + --disable-iprint + $(use_with ldap) + $(use_with debug lttng) + --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 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://samba.org/samba/history/${PN}-4.5.0.html and" + elog "http://wiki.samba.org/index.php/Samba4/HOWTO " +} diff --git a/net-fs/samba/samba-4.7.6.ebuild b/net-fs/samba/samba-4.7.6.ebuild index 48e53c45e323..5b1399ed756f 100644 --- a/net-fs/samba/samba-4.7.6.ebuild +++ b/net-fs/samba/samba-4.7.6.ebuild @@ -132,7 +132,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" "${FILESDIR}"/talloc-disable-python.patch "${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch" - "${FILESDIR}/${PN}-4.7.4-no_ads.patch" + "${FILESDIR}/${PN}-4.6-no_ads.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" diff --git a/net-fs/samba/samba-4.7.7.ebuild b/net-fs/samba/samba-4.7.7.ebuild new file mode 100644 index 000000000000..5b1399ed756f --- /dev/null +++ b/net-fs/samba/samba-4.7.7.ebuild @@ -0,0 +1,319 @@ +# 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 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" +[[ ${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}] + sys-apps/attr[${MULTILIB_USEDEP}] + >=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] + sys-libs/libcap + sys-libs/ncurses:0=[${MULTILIB_USEDEP}] + sys-libs/readline:0= + >=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.3.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/tevent-0.9.34[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? ( !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= ) + || ( + net-libs/libnsl + ::' \ + -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}" + --bundled-libraries="${bundled_libs}" + --builtin-libraries=NONE + --disable-rpath + --disable-rpath-install + --nopyc + --nopyo + ) + 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_enable ceph cephfs) + $(use_with cluster cluster-support) + $(use_enable cups) + $(use_with debug lttng) + $(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 python '' '--disable-python') + $(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 + --disable-cephfs + --without-cluster-support + --disable-cups + --without-dmapi + --without-fam + --disable-gnutls + --without-gpgme + --disable-iprint + $(use_with ldap) + $(use_with debug lttng) + --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 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://samba.org/samba/history/${PN}-4.5.0.html and" + elog "http://wiki.samba.org/index.php/Samba4/HOWTO " +} diff --git a/net-fs/samba/samba-4.8.0.ebuild b/net-fs/samba/samba-4.8.0.ebuild index fe8425877744..7a9862d6d28e 100644 --- a/net-fs/samba/samba-4.8.0.ebuild +++ b/net-fs/samba/samba-4.8.0.ebuild @@ -131,7 +131,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.7.4-no_ads.patch" + "${FILESDIR}/${PN}-4.6-no_ads.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" -- cgit v1.2.3