commit:     49b774319eec93601a9ad48bbad32f6db0bbbd84
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 24 08:56:00 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 24 08:56:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b77431

net-fs/samba: Bump to versions 4.5.7 and 4.6.1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-fs/samba/Manifest           |   2 +
 net-fs/samba/samba-4.5.7.ebuild | 266 +++++++++++++++++++++++++++++++++++
 net-fs/samba/samba-4.6.1.ebuild | 299 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 567 insertions(+)

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 4275ed9a2de..d4e27c5d601 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -2,8 +2,10 @@ DIST samba-4.2.11.tar.gz 20875348 SHA256 
75bce53c922e51352933c9846f2c4b1e251fabb
 DIST samba-4.2.14.tar.gz 20883281 SHA256 
db820a9947e44f04b0eb25e4aa0c3db32c4042fca541775ee8e2905093e888e6 SHA512 
269dd74ba788657434f51ac70953a293c94bcf98280eaa6f44634c5da54169a5ea7865d543a7c23860c4750a40cdee7caeaf5c7fc3dbc137f444e90f31a09890
 WHIRLPOOL 
925369c2f9c222d718bf4aacc7b1a83b8275acd96bbc1eca52ad96c86847327807560674ee9b180173d17a1e6109307ec4f70f1acbebe2efc8a9e67f2141e17d
 DIST samba-4.5.5.tar.gz 20953640 SHA256 
bff02762b3e4ee030f02266c6e24a0b888248b387246219b7fbe3e1758ef2184 SHA512 
dd9bd2cdd16ef9289c46583b9809fb2757f821bcfedacbac384718b977f981a20d011065087b2fa985c57082512b9cc5d5e19daede3fc6c7e063e04a66349b4a
 WHIRLPOOL 
0dcffe3071ef2e621a2bc5b317e05036b5a75c6a0231538026bdee76bb43743d72acff128025e7957791a65856794cbfa2bfbca203b5f0a685455e1798b29f40
 DIST samba-4.5.6.tar.gz 20978580 SHA256 
0d8ff81ef034344d09c9614fae7a2ad19cf7b175eb080e8548aa7783040ade70 SHA512 
089ffbeae5d967ad1c805db55f2778dd4cc23083ed732df04a6f1f9d9bd734004002e93c9f1dd3128cf363a26060d0baf30256a0ba78f797cd340ae478e2c0b0
 WHIRLPOOL 
03c6cd57e76bbfc8b2f6bcd2893376687063c0e3455e00646e71e32cb0c908d5e2bc8a33344cc9252cf466345bd8121e715e029f12d5ba10203dd5e302811ab5
+DIST samba-4.5.7.tar.gz 20981612 SHA256 
ac70f09af80639d8189e1b9bc0a554841ee44df2b1ef58e7e682ad5400fd9400 SHA512 
3515ab133470b902e35e77f43639881af87643adeb7b3f43f319a684bff9db2e2d5acffbd67d69d910c270f6676a2cbcc25730fc27015a00cb9d44154e60cf2d
 WHIRLPOOL 
016c2163162ed3ab126c16c47de4dc21b0d2b1116b207fc9359510a323e81d6d502f99b46885c6fee0cf8dd19c3ed5df5275eea79b47c3b0fc0ce935f3ec7db2
 DIST samba-4.6.0-disable-python-patches.tar.xz 7544 SHA256 
508adeea65604ef8f4da006504de7c27bed56d7003db1166dc5d3b01f5a6be6e SHA512 
07de2c0877aff31069ed0ab4fbe1c2272c854ae898ee5300a3b176ba31a218b05acff0b5120a5da0995592e7877c607865d2194c992df17b27c993836f58a654
 WHIRLPOOL 
12888f2ebf8d4ed5619860b2e6929599022b8ab1245970a5e1258f26e89aca1f87ab58fa54c7300dbd79a0c8fd6955e12c8aca6eeca246cdf06661d53ca3f6dd
 DIST samba-4.6.0.tar.gz 21090602 SHA256 
a3b3592e63d7064cae2624991f4925a443f3846c0dabb7011aee052c3fd4cc2b SHA512 
734582b540ba25ea73c5bf8b0801c01808eaea4a0d96b6b26c5ac18bcc4eb4fa42c9d3484891c577f80453bf9f7e5fe7c56b0ec7148e5c0dad0279889b9af93a
 WHIRLPOOL 
f20991345b490d78386a33c867f843e9151930f80997d4a00e0ef924bf6b1ea3fcc6a7786b6f153073213b530225108e012882f74c1a24398587827d0dffc672
+DIST samba-4.6.1.tar.gz 21097666 SHA256 
5d2751faa3cd33affd4f49681f700eff9f6c22d6b08e8858ae0d3cd8e51c535e SHA512 
8c759bb6483f67d632f35d779bf1afb44907fd478e3e5919fc95f36dd198e393819ed419686235ba01b5ec0e15ea80cb11e7fa8f22f37a1742bf0e818a3c6c14
 WHIRLPOOL 
a4ec6692a72979756acd2381f428c6f3f0f6dd909a4270d529ad5348cbdd4bbe9f19d37ff24977a8683c5b48323edb251d946b138f3ce44793c1fe03884435be
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 SHA256 
8903eacbabdfaf7b64cbde03d7c367d1efdc92e54090f0f4b9ed5d2a462b1c18 SHA512 
c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
 WHIRLPOOL 
ad63db55d5dc96f56e6c9b30c2092e2f6e206b0ed5d13c249879d10753c8db2f475c5d4e651e2fc042ad992b648d3b4465f1b28c6b4bbf821cf503d27f741f7e
 DIST samba-disable-python-patches-4.2.9.tar.xz 6016 SHA256 
222d0153f03dddde28a0b906ee2b27076223ac88b84a998aaa285f658861edfa SHA512 
02fc666a36f8e733e522663d80775d130fabee9d5fb4e1c261d28815e07be425ae8977213f9216c7af62dd8b2619e7e13d71f9a25780b058c8119901c2115a18
 WHIRLPOOL 
ebba3a6d41a41844621759672aa8c984d26f44d12007c8e929405470c381bc262523ec68d3972e86cf675c45f092fa287496167e42940e70d704790753e47b03
 DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 SHA256 
fa0d776e04e3222c0dc4761e376717f4154937cdcb85f4117b8978dfb770a78e SHA512 
920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927
 WHIRLPOOL 
6d55710895435ad012e23f8c252e5276966241014710349ca7fa9cf037e8742030b8e053f7cb71309a0a45f48d2235d55393243bf4d19476a22dd39bb1b7748d

diff --git a/net-fs/samba/samba-4.5.7.ebuild b/net-fs/samba/samba-4.5.7.ebuild
new file mode 100644
index 00000000000..d76476baed2
--- /dev/null
+++ b/net-fs/samba/samba-4.5.7.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2017 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-disable-python-patches-4.5.0_rc1.tar.xz";
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~amd64 ~hppa ~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"
+
+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(+)?,${MULTILIB_USEDEP}]
+       sys-libs/libcap
+       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+       sys-libs/readline:0=
+       >=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}
+       virtual/pkgconfig"
+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 )
+       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"
+)
+
+#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:<gpgme\.h>:<gpgme/gpgme.h>:' \
+               -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_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_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 /usr/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 '[email protected]'
+               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.6.1.ebuild b/net-fs/samba/samba-4.6.1.ebuild
new file mode 100644
index 00000000000..aa112b04b0b
--- /dev/null
+++ b/net-fs/samba/samba-4.6.1.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2017 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.6.0-disable-python-patches.tar.xz";
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~amd64 ~hppa ~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 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.31-r1[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}]
+       )
+       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= )
+       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
+               )
+       )"
+DEPEND="${CDEPEND}
+       ${PYTHON_DEPS}
+       virtual/pkgconfig"
+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 )
+       test? ( python )
+       addns? ( python )
+       ads? ( acl gnutls ldap )
+       gpg? ( addc )
+       ?? ( 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
+
+       # 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:<gpgme\.h>:<gpgme/gpgme.h>:' \
+               -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_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 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
+                       --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 /usr/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 '[email protected]'
+               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 "
+}

Reply via email to