From 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:52:04 +0100 Subject: gentoo resync : 14.07.2018 --- net-fs/Manifest.gz | Bin 4695 -> 4694 bytes net-fs/libnfs/Manifest | 2 +- net-fs/libnfs/libnfs-9999.ebuild | 4 - net-fs/samba/Manifest | 8 +- net-fs/samba/metadata.xml | 1 + net-fs/samba/samba-4.2.14.ebuild | 2 +- net-fs/samba/samba-4.8.2.ebuild | 286 ----------------------------------- net-fs/samba/samba-4.9.0_rc1.ebuild | 287 ++++++++++++++++++++++++++++++++++++ 8 files changed, 294 insertions(+), 296 deletions(-) delete mode 100644 net-fs/samba/samba-4.8.2.ebuild create mode 100644 net-fs/samba/samba-4.9.0_rc1.ebuild (limited to 'net-fs') diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz index 229e82a183cb..cb9577e4c172 100644 Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest index 28c33a5dfea1..750f03a5e1ef 100644 --- a/net-fs/libnfs/Manifest +++ b/net-fs/libnfs/Manifest @@ -5,5 +5,5 @@ DIST libnfs-3.0.0.tar.gz 249035 BLAKE2B 321bbc6eb2d926c41afae95a873cd9103446d2bd EBUILD libnfs-1.9.7.ebuild 1041 BLAKE2B c10d98df553a00f89ae4ae30219067ff16ec308f69d25d91b34a58b9be5d13155d58c309af6f66b7b1854cbc59075b07a79349105f7dddd3b9e756f059dc8e1b SHA512 bcec2c0c325e1ebad33b62caa1891176fed02c40f962ea047d4366d0427c0920e242c90d54502d8a216774c3c083ab4e0a80aab92c4aabc1e83a3a7ec8e698af EBUILD libnfs-2.0.0.ebuild 1110 BLAKE2B fb8098132e10496fd160092eb5b0eaa207b9fce499a97d19ed9f2c0562ec138d6237f49f5061c0eaec3d0b5c2224462f91c2858b5269cd402fcd48aded422d85 SHA512 31fe7ef50c243c033501d310e0d7bf995ff4c84895403caf94251a9793ec9e1404b1e1ca4d19dbfdb3dc48ff86fc49b0013e81242b541e81aac6a3a600454425 EBUILD libnfs-3.0.0.ebuild 1262 BLAKE2B 2863f0367604bb8a3eedd696a68e111283610ee5e1ff8e19be2db933d1f6ec5e29e21cab67900ca9d867933d45eab9be1529d3ae63c7ba1708b931616d7edac1 SHA512 8b2e891f5cd834953000b13d273b4270a748db10ea32ac55453fe32a8c66a05239feda67f547d54d3c443248d71f028a41c1c17ee2530b250292dfb4a698d1c0 -EBUILD libnfs-9999.ebuild 1262 BLAKE2B 2863f0367604bb8a3eedd696a68e111283610ee5e1ff8e19be2db933d1f6ec5e29e21cab67900ca9d867933d45eab9be1529d3ae63c7ba1708b931616d7edac1 SHA512 8b2e891f5cd834953000b13d273b4270a748db10ea32ac55453fe32a8c66a05239feda67f547d54d3c443248d71f028a41c1c17ee2530b250292dfb4a698d1c0 +EBUILD libnfs-9999.ebuild 1210 BLAKE2B 24f63a66d483c1ce06aa120a33e7b19e93c3600861a771b3e050d6802637dc5912cd8ac18a15a85fdd1dbb05baec6927da3ca5ccaa405b6ed72b0e7ac40f5ec6 SHA512 07ce95ae4b64c0dc86b51d6e22d991fe82cf7fc6fc676a29fb682ce88652f7ec522ece3c963849b44baa8933f1fce27160a36c42e2bef368a2fdc25b0e2c5a41 MISC metadata.xml 416 BLAKE2B dd298d1b48b996a31ccef799be0e581239d99bed3f79f05aba02693821e869cbb73425af4ba1d581d641ca52a7b636dba591e68cbcb7c647cfd6840745c16721 SHA512 69475dd9d86a2335ee1780e6a330ff6096ccf99d14fea094b8bab5a59aa1deb2841b7c0e1bf5c00fcec38756c219af9b7ff255f1986a54756c28128b9e447ce5 diff --git a/net-fs/libnfs/libnfs-9999.ebuild b/net-fs/libnfs/libnfs-9999.ebuild index 96606a99d49c..d8c9dd244267 100644 --- a/net-fs/libnfs/libnfs-9999.ebuild +++ b/net-fs/libnfs/libnfs-9999.ebuild @@ -24,10 +24,6 @@ RDEPEND="" DEPEND="${RDEPEND} virtual/pkgconfig" -PATCHES=( - "${FILESDIR}/${PN}-3.0.0-utils.patch" -) - src_prepare() { default eautoreconf diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 3303dc816693..1932e357ba66 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -24,13 +24,13 @@ 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.2.tar.gz 17675145 BLAKE2B 3ae5c33c85d7f0e4cf7fe45fbef55cd0d5aec2e77355297be31c4a32de41ff40338f58843a3e31942ca2c2a086829ed4f339485a7dd39693f1e433526eb23af1 SHA512 061b968c81c2272b5e353444ef53372ae5caa66f5af0b28b422e7d33a32ed0d321900c13636729c0e21a4d8dedcaff7ca7a5f6fe682b71c292f9a66a497a2766 DIST samba-4.8.3.tar.gz 17680660 BLAKE2B ee2c37eb935b3545eec8975d2427e55cf0dcdc8f9725e7549ffd42f8069e2b1ee65178895c173cd694442aac0a888d661837edeb8990e948b021a69e3078106f SHA512 0dd035f5f2cfc5f47f2e9b9e295548ecce73014f01e9539d9cc639f27b00e1e71a57acb018da70e70d3761281246933b6935be151df1bd35e539d6d338686217 +DIST samba-4.9.0rc1.tar.gz 17960031 BLAKE2B d430b56fcb314a3c6a5da0cbd9b55434c02580b19991827ccd6bf65a056bd7a920b7f37eb0bdfb85e0251e6fc4ec1f28f4a1fd81ab66ee98eb58149efd1e2f5a SHA512 9984a5589e49a575b95eb584560acbd14265f5ed6f1f057254f357e63e6293bc9642a458d7623b7245e29a68f6a1f869f50a72ba67fab59715e17ba7739660c8 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.2.14.ebuild 7140 BLAKE2B c09f771cb1db8d7be599084d4ad9956a41afefeeb9e2b229a9f215b24494348641a95c9f1da7048e18485f14f10dd7d2e0ba745b0c59930b0dbdf810ccd7119e SHA512 70ee5c801744693da54a8c0d944f41e80b60b1ce4a44b51bc36d0433ddbfe3ac98f704094f734faed3b425f08cd2c7543a9bfd4329ee450862a57475af1ac840 EBUILD samba-4.5.16.ebuild 8167 BLAKE2B d979c6b102cfcb3a77a18decad488ba40604fc9ac8d8889e114f09cef489897727197a09eed2c2d057a04aaf2367b3e4f53db260a2edc792db8cd2091113312b SHA512 db32b221d811e09f0a07c5d5fde3f528425c4a7375e8fa45fc9cca96d3b1e64f165f19836926efc8198f05bdb8ddc43f718854d82ad034a97d11f0423e36f2d6 EBUILD samba-4.6.15.ebuild 8732 BLAKE2B 984e99c120299e958b69d749b84627c2a094d6f4a207e775112af2bcfe09918feb6cfe89cb999ea31c645dd59fd7edf2fee8e53f98ba664c331142044d3ec3ad SHA512 3f39c3320b0ef3b6d611827b103432726c7788cc9164ae5eb11b02b0eaa8fe1eecb1677cd9630024b5a6abc78f72d8abaa90f63e72df718a36462216e92f76fc EBUILD samba-4.7.7.ebuild 8728 BLAKE2B 2ce8c1eeb3251f446af6844642bf449a7a0fa53ded5dc4202aee6f109cf76145c9fe201be37e371804d147d3c1870d97e554d1d7dbbf996c131ef7f0d40479c0 SHA512 390a7b3fa453a36061237e8f78e94d061e2f130c9fc7197ae21b14f296592868a775228042194cc36b0f6ce0bf2244c2d9314a38234316d5bf80b15fce33871c -EBUILD samba-4.8.2.ebuild 8361 BLAKE2B ceb9c6330f7ca6b6cff8d24902cee18b5bd2df7974c629fb47c3e9acd02acbc213ddef36ee10ee4af11c601c5c44511fb130239f6049f08fac0c27d8ba8eb1e8 SHA512 b59727776cb37ca5476fb3f0a8993942059f7939503021b226f7b07c81f2ab6cf4065a083545dbdfca3a718434b4a1b5c0c07adf4b4412efa2e326f95df1de5e EBUILD samba-4.8.3.ebuild 8308 BLAKE2B 44920ec9e0594446ffc441ef6b5a3843351b3ca0ab98516e5f3951e728e5ea1a99b30ae62ae9d890e65e95b11e7eeee05b19272c95c25ac6805baca39a4761c4 SHA512 c2f58f7f1f381241a97982cb760bbbe7f03f6203989ca59f9e7c290c23f6c5a19c46e1f1dba94a5ec84d925a8ccc0fdaf78602ec856877507e42b8ec5fc01e8b -MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be +EBUILD samba-4.9.0_rc1.ebuild 8392 BLAKE2B ee657d46873bb03311b2e18b2b89c2d196461dc34aff8931f4ec35bcb6e49a18a4147b899522646bda06f56410b3b557b05d280904096cf246aa8bcc902b5c23 SHA512 a389ed4223c5f3ab81a4b7048ac3efee94669b70c03ce960b53f8d0f0ca186831944bcf3645fae29d7afff74fc719a5d91d3c32d4843825ccce5c01249457827 +MISC metadata.xml 1730 BLAKE2B d42bec763cdfdbee859606d1b39474dd9977bfb70ac597d2bbfb66bf5f77ca318b7064aa7f02eaf3ace85462fe19dd0f5da919f4a5c1d900d6a4dc57fc21688d SHA512 b10a146ac000f15e75701e49dbb672081b6704aa1f57c8d5bdac7a2983b5d8846c9b34634c81eec961ba683141202ce1197c980882d438b42beec25d9cfeece6 diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml index 2a3bd677e0d2..743e5e2960d8 100644 --- a/net-fs/samba/metadata.xml +++ b/net-fs/samba/metadata.xml @@ -18,6 +18,7 @@ Enable support for clustering Enable support for DMAPI. This currently works only in combination with XFS. Use app-crypt/gpgme for AD DC + Enable json audit support through dev-libs/jansson Enabling iPrint technology by Novell Enables support for user quotas Use app-crypt/heimdal instead of diff --git a/net-fs/samba/samba-4.2.14.ebuild b/net-fs/samba/samba-4.2.14.ebuild index 290889c069a1..393fd23ce924 100644 --- a/net-fs/samba/samba-4.2.14.ebuild +++ b/net-fs/samba/samba-4.2.14.ebuild @@ -5,7 +5,7 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE='threads(+),xml(+)' -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils +inherit python-single-r1 waf-utils multilib-minimal linux-info systemd versionator eutils MY_PV="${PV/_rc/rc}" MY_P="${PN}-${MY_PV}" diff --git a/net-fs/samba/samba-4.8.2.ebuild b/net-fs/samba/samba-4.8.2.ebuild deleted file mode 100644 index eb9a466868e3..000000000000 --- a/net-fs/samba/samba-4.8.2.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="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-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.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.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 ) - 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-without_ads_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 - 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 "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.0_rc1.ebuild b/net-fs/samba/samba-4.9.0_rc1.ebuild new file mode 100644 index 000000000000..f69471635919 --- /dev/null +++ b/net-fs/samba/samba-4.9.0_rc1.ebuild @@ -0,0 +1,287 @@ +# 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="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-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.4.1[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] + sys-libs/libcap + sys-libs/ncurses:0=[${MULTILIB_USEDEP}] + sys-libs/readline:0= + >=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/tevent-0.9.37[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 ) + 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= ) +" +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 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" +) + +#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_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' '') + $(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 "https://samba.org/samba/history/${P}.html " + elog "https://wiki.samba.org/index.php/Samba4/HOWTO " +} -- cgit v1.2.3