From 8c364c784966be1700ea39ae45028f3e9be9cae0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 27 Mar 2018 22:40:05 +0100 Subject: gentoo resync : 27.03.2018 --- net-fs/Manifest.gz | Bin 5021 -> 5023 bytes net-fs/samba/Manifest | 6 +- net-fs/samba/samba-4.5.15.ebuild | 291 --------------------------------------- net-fs/samba/samba-4.7.6.ebuild | 7 +- net-fs/samba/samba-4.8.0.ebuild | 7 +- 5 files changed, 14 insertions(+), 297 deletions(-) delete mode 100644 net-fs/samba/samba-4.5.15.ebuild (limited to 'net-fs') diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz index 5fde616a6cb8..d80e168eaece 100644 Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 9c68a5ad6c8a..bfa42e995711 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -19,7 +19,6 @@ AUX talloc-disable-python.patch 1706 BLAKE2B cc447f5077c82d7eb584692121b9b34c03a AUX winbindd.service 240 BLAKE2B f0b96a5a1d93a3c04bb2a2b2b500718b41fc907a3c551827a459c5d8184abc3caed0ac5edcf16032650dc2d58c38b779473c7a619047956f1381415e3de4dd93 SHA512 f1ce6d035e8e0fcdc73f14e3b60c9647043777ff6b2a982a81ed07eb4df5ff245a9511e3e4a9d8163f9c8f3fb86d2a39a67621ace68392eb7c2f2e2a55d587f7 DIST samba-4.2.14.tar.gz 20883281 BLAKE2B 90bff4ef0752b952e2e31b6e86223ae7e785248ef01b15d6a26f0912452cbfdb1e828b88c81c8b6d36e1e2ca7d79a00ffd196625eb6ee96b587483a25044fd47 SHA512 269dd74ba788657434f51ac70953a293c94bcf98280eaa6f44634c5da54169a5ea7865d543a7c23860c4750a40cdee7caeaf5c7fc3dbc137f444e90f31a09890 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d -DIST samba-4.5.15.tar.gz 21020181 BLAKE2B 0d113c4d3147102e2cc192a14d145c46930b8f772683bc27e90b264e43c5660298e468c494de41e80fb2dcd80a0dbef0b9ce1f74dc9e89eca52865ceba605382 SHA512 e77d746767d55ff933cddbb4d6e0f97f0b12e630c564852bee02f5f9764633167f1c098df7606af2a1930a9bdd4665fb79d7748ff07532db4e9a581fb639450c 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.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb @@ -27,9 +26,8 @@ DIST samba-4.7.6.tar.gz 16864824 BLAKE2B 0c519f83e95f9ef9ff13c6a4998d0c98e677652 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.15.ebuild 8100 BLAKE2B 996d16a48c8448b442dff2f5552d8c302629d9f8f726e0c4f87e2c056c219846aa798ca2c0971b42196c190cead961ed58608064599019372401d13c232891f5 SHA512 362a8430090e9d5df7767daf45d35cfd374b4a6107d5bfe45df0c10dcb1275376f4ec9547c0a75bcb580e114c933004829dd283febedf51340f8ce83b16c74ab EBUILD samba-4.5.16.ebuild 8099 BLAKE2B d47cfce6faaa618d8b0705798d581f50da1241f9ffceb3cb78855025d35a3491956f1be90603a217b9e309690c9e414f5a739c14e98c0260d724f51772fc5b67 SHA512 fd00c6fd607e7c979b6f666075d085dbc2f186c179321e07be4f909160c3fb9018404d31b2c9e1bdbfb3771cab4583ffa91242df452c01edb80190cdc03920a1 EBUILD samba-4.6.14.ebuild 8625 BLAKE2B 8ea87d6c465a2c1e10fd120baba6058470a0c18c1c7e0b5c8120d8cf6cf6d756d3dc80d7ef733822d55245be05fcc2e52dae6928fcbc646aa9529311bc4f976e SHA512 3f58b695aaa5641e43feb4a7cb3109ff07a3a083a0c8a2badeab630ef89affd73b00787e2a71cc3d02d82163ddcd6c007e314b8652684cb02f57865bf5ed28ce -EBUILD samba-4.7.6.ebuild 8660 BLAKE2B 065a8de49ddd51e8c1b8abcfbdd59a80128c08440c4fe081ce667c70639e30bad0db2673fdbcedbbbce0432f7af10c07ec4bba361c484b07859edb0960e31941 SHA512 6689829b484ae3857d21b0995954550415e3bdc74f2c788e33bc6b2ba1899b6d8caaab8ffd8ae6c93cb3ea716d6953df53c9444abd888eda0bee024db34b3384 -EBUILD samba-4.8.0.ebuild 8304 BLAKE2B cd59b69b7c0c256cba9546b94c195a09fbfc3910143f913f664db1d1a44f9a560951fc0f235c1ad47cd7e0f9f1fe37bc564edf24edb22673f6ac702233e582ee SHA512 f3156e1d8ac58b2230fc1c0c88346c8b975ccdea689ad1d39815cce1a45fd025b851afe386b579b4df28471c5482883535d0d93a44b0fdc37042ad854f127203 +EBUILD samba-4.7.6.ebuild 8719 BLAKE2B c8e48a47d74c7f6b8c8d1b86b0c12a9e638ee863d51c70db79656c38c7652fa57ee09fe645eca256aeb6db65c9e59311633eb69ea3d958349538860611043090 SHA512 0c3a915c802503267dccce0e0b680587430b3aae2ffbe946e540b46d48c0e818f23dbea780edb2cba80b0bd5659ebfaa90fe35b3d311fa0635cd74807baf088d +EBUILD samba-4.8.0.ebuild 8363 BLAKE2B bf0aece7240ee9386804100adaf462c2f3089ffdc8238deeee09eebea08d75c4b04e496ad848285c3d1702c2e8fcdb2da24266d2558dc79010fde6565517d297 SHA512 e9dfe4ee4cfd1f6ee3147cfbedead4e291f7c8be3e947703a44efa26c4bf8399b501d15d91ed887fda553fc3162f59a1e6bebe09075cc5f5458f3e05679f6b10 MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be diff --git a/net-fs/samba/samba-4.5.15.ebuild b/net-fs/samba/samba-4.5.15.ebuild deleted file mode 100644 index 5ead0fdc00b4..000000000000 --- a/net-fs/samba/samba-4.5.15.ebuild +++ /dev/null @@ -1,291 +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 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="http://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}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-apps/attr[${MULTILIB_USEDEP}] - >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}] - =sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/libiconv - pam? ( virtual/pam ) - acl? ( virtual/acl ) - addns? ( net-dns/bind-tools[gssapi] ) - cluster? ( !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= )" -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:::' \ - -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 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 32f91596d86f..b9cff1dabea4 100644 --- a/net-fs/samba/samba-4.7.6.ebuild +++ b/net-fs/samba/samba-4.7.6.ebuild @@ -77,7 +77,12 @@ CDEPEND=" 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= )" + systemd? ( sys-apps/systemd:0= ) + || ( + net-libs/libnsl + =app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:0= )" + systemd? ( sys-apps/systemd:0= ) + || ( + net-libs/libnsl +