commit:     21957a03e172530e7761432c85297972ea5bb953
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 11:29:02 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 11:30:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21957a03

net-fs/samba: Bump to version 4.5.6

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 net-fs/samba/Manifest           |   1 +
 net-fs/samba/samba-4.5.6.ebuild | 266 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 267 insertions(+)

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 509db60d5f0..cad3dc7c663 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -2,6 +2,7 @@ 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.4.tar.gz 20958348 SHA256 
1800d10ea14cabef67c83cc56a0f37f4f30ba5df218b3a1e7c874069a08c0f40 SHA512 
7b24227e17ab091e6165c605f28af19fa846de63f3f24508411db2b509d942e599702dd278c8430481d7a404c5a97005148286ea4e94a35b57a1ec303b1a4409
 WHIRLPOOL 
a1b84726b0a0addb1ca2de8d84429280a82001bf2fb0fbd7524dd2499fb18370d19e099b0852b93cb105b3db45583688b107533d404703ac635c2e6e8e2cb81b
 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.6.0rc2.tar.gz 20956751 SHA256 
e05a941d6d089a4781a51eb758661d66ce9c23b7e6286da756f5910424de22d5 SHA512 
e66d9f50f0bda315c1a57cf94c5c06811bf5d0c709ebc513488635c1e044865abc27af9f60023e5ae4ae0c08f819bfc46886bd408be0c63aa8a09a945efa67e0
 WHIRLPOOL 
6fc370fbb4dc5501a3c134725bebe89869bb57d6d54c713d1920056ebe558ee378046e9fa1a6b70af6e23885b92ca4c3dde85e574e482e7a101b334cf0dc9705
 DIST samba-4.6.0rc3.tar.gz 20969909 SHA256 
42a0105317d3d7e96a8bbc1aa4ecefdfdb0eb12eac7bd6fd67b48bf92e22d224 SHA512 
7c1f76f482654256974f85d9b44e527e4b780be99e45c1c6e6be3efdaceab4484c2443efa2460e155db534dc76e614d25f47e4bb542779395182d7cbbf94927a
 WHIRLPOOL 
e400e72d59e3ede98983a2948507e043daa84c248af50e4114c71a15a7e9190708f6fa4cc6116fa664c8a6e1ebaf1e1eb2e5b22ed1ebcbfc41b3adb726a76bc4
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 SHA256 
8903eacbabdfaf7b64cbde03d7c367d1efdc92e54090f0f4b9ed5d2a462b1c18 SHA512 
c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
 WHIRLPOOL 
ad63db55d5dc96f56e6c9b30c2092e2f6e206b0ed5d13c249879d10753c8db2f475c5d4e651e2fc042ad992b648d3b4465f1b28c6b4bbf821cf503d27f741f7e

diff --git a/net-fs/samba/samba-4.5.6.ebuild b/net-fs/samba/samba-4.5.6.ebuild
new file mode 100644
index 00000000000..d76476baed2
--- /dev/null
+++ b/net-fs/samba/samba-4.5.6.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 "
+}

Reply via email to