From 442eb8dc5181473c869755cd55bc665cd4b1ed81 Mon Sep 17 00:00:00 2001 From: Stuart Shelton Date: Thu, 14 Jun 2018 22:44:14 +0100 Subject: Add net-fs/samba-4.5.16 --- net-fs/samba/Manifest | 4 +- net-fs/samba/files/4.4/samba4.initd-r1 | 6 +- net-fs/samba/samba-4.5.16.ebuild | 297 +++++++++++++++++++++++++++++++++ 3 files changed, 303 insertions(+), 4 deletions(-) create mode 100644 net-fs/samba/samba-4.5.16.ebuild diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 272f58e7..b01364aa 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,7 +1,7 @@ AUX 4.2/samba4.confd 1783 BLAKE2B 773d5da817e3c4a93ce31a3bd81715632f879711a3ecfa6821f91523c65eb49c90498f86e7c2108df8b5c89d811105d2e685efadb1317a10af07e501339fb8c8 SHA512 6fc7edf192957f97b171c97482317bf563385917cfdbf950ed28d9387961bd16f82844c6f9b5c430508ec6dc7331ecdf5f81fa3135663316061c1d0b1808f53d AUX 4.2/samba4.initd-r1 1175 BLAKE2B af963963ef5834ab5a520bc570420559a05521ec171fed9a5c0c79549abb33b4b7e4a01d4802b59e946e037f607b9b61051a8a91284fbc3556863adb06e90d84 SHA512 4bc820efc4b6d27f7e709de68f41d0bde6eaa5cf74a7b030ca640af39f7876d43ca099501d4260507a2760d8e411c5119faaa9c05ca9565e76f93a3f5b91eef6 AUX 4.4/samba4.confd 1783 BLAKE2B 773d5da817e3c4a93ce31a3bd81715632f879711a3ecfa6821f91523c65eb49c90498f86e7c2108df8b5c89d811105d2e685efadb1317a10af07e501339fb8c8 SHA512 6fc7edf192957f97b171c97482317bf563385917cfdbf950ed28d9387961bd16f82844c6f9b5c430508ec6dc7331ecdf5f81fa3135663316061c1d0b1808f53d -AUX 4.4/samba4.initd-r1 1175 BLAKE2B af963963ef5834ab5a520bc570420559a05521ec171fed9a5c0c79549abb33b4b7e4a01d4802b59e946e037f607b9b61051a8a91284fbc3556863adb06e90d84 SHA512 4bc820efc4b6d27f7e709de68f41d0bde6eaa5cf74a7b030ca640af39f7876d43ca099501d4260507a2760d8e411c5119faaa9c05ca9565e76f93a3f5b91eef6 +AUX 4.4/samba4.initd-r1 1194 BLAKE2B 41afd319fb86e6669de74f001a0a0c54caefa4d39d8f4f5d5bdab2346dc3c25694172f2edf863b2e602ddf7b2b2b0a07162cd4fcef8cf1353ae3f43fcadc51d8 SHA512 665b62e627fbd8dcaccfdcb139f65688d2b1216b6a557830c526d4bd008fd98000c622590b7e082b3d51ddebe1ebddf6eea8c41a7280f138677faa344bb985e6 AUX nmbd.service 224 BLAKE2B 499598b7e80f3dddbcc0b2d3ba217774cfcd7d87cc5287bdc75b8b616e039e235f2202e4c5275421ec018911e92680da923d9403f7bfc65e1995216f4c157fef SHA512 098dfb270c5a5c29f59b4fd8d51b17931771e25e481124832f1a086677825527e2afa7276e8614e5007fbf044d253ce2eaf3a7caf7461ad5d90d0b1c7f157f9d AUX samba-4.2.3-heimdal_compilefix.patch 819 BLAKE2B f19e9e1af0d5616fc04473ddcdd898f2a942afb284e72a3a50454ffa63c201a3ad1b061d966107c749450cefe260e40090327f0144e1086e9bba4607c3811500 SHA512 0f6ddbf58e5d5b83e3fb9738dd10c2ab0f1ed96fb62f9b4389a40729b3fe2d4af1a5c5bd2d44fa7d568136072b787b6358aeca3026f1acec4f5a6869e74f2536 AUX samba-4.2.7-pam.patch 1273 BLAKE2B 41a17b701a592500f3b85be29fd134048ebd9403c510c339d1094f915c5eeae729972c7231169fa890dfde802797276a9c419eb17ed7a23e5ad1aaa46cdfd8ec SHA512 5f900ebfdfb15af38814864f7ec8cd52d3525098d6f2017ab2f29d301e6a0e622d2ab37976fbd97180cbfe23c7853e91ab7966655eb46ebd9bdd2951205e46bc @@ -19,6 +19,7 @@ DIST samba-4.2.14.tar.gz 20883281 BLAKE2B 90bff4ef0752b952e2e31b6e86223ae7e78524 DIST samba-4.5.10.tar.gz 20989431 BLAKE2B 564d7c98dad101e74be1d54790abd3907b502ad1bdb7322be4853370dd6877a8f5604fec967555cf048978cbcb5a4ad111810657dcc8a58d0cea2843dfcd29ff SHA512 046bae9c66083a4fe656d6a7b02b64343c66e0ea4925193a898dbda107b5b158d1897f16c36f4c393a30457a49215fa6ef91720367f4946760ec48ce02a4a68a 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-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372 DIST samba-disable-python-patches-4.2.9.tar.xz 6016 BLAKE2B 064c971d76e3974279e71d0446715307d4f2d48b7e4d385917c8a65f6a5af202845f52c0aca5dabb89134be11b6859e9aa084e9eb07499c32b51625e99c9d07c SHA512 02fc666a36f8e733e522663d80775d130fabee9d5fb4e1c261d28815e07be425ae8977213f9216c7af62dd8b2619e7e13d71f9a25780b058c8119901c2115a18 DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 BLAKE2B b46ea587df583ea71c8ac3d6ce3045d80bcb0cc3d7eab8fa23f812d76dcb6258e4fbec7723128da29fa5369b9372370145904798b21d4e75bb62946ddd98bc0e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927 @@ -27,3 +28,4 @@ EBUILD samba-4.2.14.ebuild 7243 BLAKE2B 42163a30b2e4a611148d61ff1f0c2679eb692082 EBUILD samba-4.5.10-r1.ebuild 7887 BLAKE2B b068064c31640150727ab097cd5feefdb2a1d755c3eb3cfd4c93bc35026d73b8cd7490a6f4fef333cc998fa18ba2c5ed261ced34147019a5eaa695dc987299c2 SHA512 e6a59bfe5adf5548fbe732caa8852a16b6a2cac87a0f305257ee2ada24ac412bff46f80b9b67915edc1ad7b8cbed5ecad41fba2e1adeb30f6a9f647497a9f516 EBUILD samba-4.5.10.ebuild 7733 BLAKE2B 9b15d19be58af03057a8fbafb72c2434c253b7e0184f234c7cda4cec44aa423ab454220cc8157771b70f66eae81f1f4e419d7474462ed5864fab049e243635a7 SHA512 d5a20f9a15606ddca38963f98d2f678de34c83a3d63a5fe8a2faade2ac317d0cb6a611d8f213c18efd986be207aec18a91952d54bccf1862aa26edf19e59f46c EBUILD samba-4.5.15.ebuild 8186 BLAKE2B 39ea2ca59e86e29b0867dc85e491c7ff33b79b0fc77becbbb3dc0deed9d36289426a7e8f522975aa3d7da54394ca89d0135bc6ea3ec941e4aca8d534aa05bbaa SHA512 a3cd072a176dcd68fe606d40168cc95caf83d1cea4bb1b06e3cb788cffe6da43da33d7c818c1431fd2762872e70a6627968fe28f526426d5318b4ac8f556b6dd +EBUILD samba-4.5.16.ebuild 8249 BLAKE2B 4001af54cc1d701bf382b74f33a5c2d2a0e358227e48fb623c79f63c097134372b29996e56cc5c09e825d627e251eca26fd9e40011abcc49bd98de913def8792 SHA512 4b221203eeb434d755747f95b65b576d85c9eae17d3d48e7c15ce88de57a99a7df85e352976a0eaf0b0854db6ca4cfd7d828bcdf10dd7f6701f4eeb30e3c42af diff --git a/net-fs/samba/files/4.4/samba4.initd-r1 b/net-fs/samba/files/4.4/samba4.initd-r1 index 9f7635be..a5f6e4f7 100644 --- a/net-fs/samba/files/4.4/samba4.initd-r1 +++ b/net-fs/samba/files/4.4/samba4.initd-r1 @@ -1,9 +1,9 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later extra_started_commands="reload" -piddir="/var/run/samba" +[ -z "${piddir}" ] && piddir="/var/run/samba" depend() { after slapd @@ -34,7 +34,7 @@ signal_do() { } start_pre() { - checkpath -d /var/run/samba || return 1 + checkpath -d "${piddir}" || return 1 } start() { diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16.ebuild new file mode 100644 index 00000000..8c7cd01c --- /dev/null +++ b/net-fs/samba/samba-4.5.16.ebuild @@ -0,0 +1,297 @@ +# 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="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 up, 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}] + net-libs/libnsl:=[${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? ( + 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= )" +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}/var/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 + + if use systemd; then + 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 + 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://www.samba.org/samba/history/${P}.html " + elog "https://www.samba.org/samba/history/${PN}-4.5.0.html and" + elog "https://wiki.samba.org/index.php/Samba4/HOWTO " +} +# vi: set diffopt=iwhite,filler: -- cgit v1.2.3-65-gdbad