commit: 95522b73d802d4c276aeccea6600a55e05acf5bc
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Mon Sep 4 11:18:09 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 13:39:29 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=95522b73
net-fs/samba: fix manifest
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-fs/samba/Manifest | 16 ++---
net-fs/samba/samba-4.5.10-r1.ebuild | 129 ++++++++++++++++++++++--------------
2 files changed, 87 insertions(+), 58 deletions(-)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index f010717..6470f0c 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,17 +1,17 @@
-AUX 4.3/samba4.confd 1783 SHA256
53755809cc27fdbaf98752cd3da45b5c2bda62dd46fcc37570c6e237f7954ffa SHA512
6fc7edf192957f97b171c97482317bf563385917cfdbf950ed28d9387961bd16f82844c6f9b5c430508ec6dc7331ecdf5f81fa3135663316061c1d0b1808f53d
WHIRLPOOL
868539ecf658f9da3574847cb1447dafe422c60a9208de5580cf7f53e4346e9c7d1c6b3e7ea5c684b83e613dd912c5245ffce6a43bc8bd9bf8417a9c7a5f2557
-AUX 4.3/samba4.initd-r1 1110 SHA256
44b53a5d5f516cb944a308613579b3e8e2716651961274b0b01afc70feede342 SHA512
f69c400d08be6f19864d06ea2a0b3518804b5ad64deac0279b2ad17827b51ef2170bb5b7ef57e8b7041170c66dc7c362f847d2eca0275b74c13adfa156055253
WHIRLPOOL
f45d26e8e3f3b86459ee0b4447eab4d585ed025e1f62971dfa48013921d1473c50f0c7aab5b002b7ec6e41281a6638a86ec7188b19773407d15ff1da05215801
+AUX 4.4/samba4.confd 1783 SHA256
53755809cc27fdbaf98752cd3da45b5c2bda62dd46fcc37570c6e237f7954ffa SHA512
6fc7edf192957f97b171c97482317bf563385917cfdbf950ed28d9387961bd16f82844c6f9b5c430508ec6dc7331ecdf5f81fa3135663316061c1d0b1808f53d
WHIRLPOOL
868539ecf658f9da3574847cb1447dafe422c60a9208de5580cf7f53e4346e9c7d1c6b3e7ea5c684b83e613dd912c5245ffce6a43bc8bd9bf8417a9c7a5f2557
+AUX 4.4/samba4.initd-r1 1103 SHA256
d40c512760bc0cc56629429219e1eadbcee23aa12ec5b3145f679ed644d0912c SHA512
8627b32446afed2cf1238eafc0f154ddb6c16857ee96f959e47f8d485b7317354afe59a08fcb3adbd17da087069cf2b94020a44b9190d597b40afd0b8aedf9a5
WHIRLPOOL
8f446f2f5302582e162c9eefc679b5037df33d988484aa1773eac732740dbed4e43f771ce9ab93c0a0427f9f90db9c760ab281427e229748640924f91eada32e
+AUX netdb-defines.patch 470 SHA256
d4a17891a14d9a4290750097cc28279059e6d971fadf132085e857ed4400d5ed SHA512
1854577d0e4457e27da367a6c7ec0fb5cfd63cefea0a39181c9d6e78cf8d3eb50878cdddeea3daeec955d00263151c2f86ea754ff4276ef98bc52c0276d9ffe8
WHIRLPOOL
261d386c4d4cc8fb015ae26e862064f291966093540d78e9293355db080ff27bcf9fb31664b8f525eff0befa6a47502d687a85506e7c2cf8ad1b84d4dd4e4cd4
AUX nmbd.service 224 SHA256
a5e25c11714206c4fb129333dd45152c5753716c6445cbe78c28275df1a1cb77 SHA512
098dfb270c5a5c29f59b4fd8d51b17931771e25e481124832f1a086677825527e2afa7276e8614e5007fbf044d253ce2eaf3a7caf7461ad5d90d0b1c7f157f9d
WHIRLPOOL
2f7c342a60c09d5e40e968a026aa17d8c2fe3fd032331c7bb26599bb0f8ec8a77c2a3e329498ed16b1602451fd85a8ef076c436e8a092740cfbd01a82ca52e30
-AUX samba-4.2.3-heimdal_compilefix.patch 819 SHA256
6cf93d127aa900c1e9a4fb8a3bdff6054d78a7adb798c6f409feffc13c714ee9 SHA512
0f6ddbf58e5d5b83e3fb9738dd10c2ab0f1ed96fb62f9b4389a40729b3fe2d4af1a5c5bd2d44fa7d568136072b787b6358aeca3026f1acec4f5a6869e74f2536
WHIRLPOOL
882a52598013a40165d87616eaa016139fa89ff218dc43a6e6518123ccc18ca84e4ba275731e10ec762b22f26576eac56ad6b257cfae2e1cbc45f518a0d37007
-AUX samba-4.2.7-pam.patch 1273 SHA256
e1abd99fcf4ff721dafa64c77a60b07962e3e818eaf5d10fecead61a2af81e07 SHA512
5f900ebfdfb15af38814864f7ec8cd52d3525098d6f2017ab2f29d301e6a0e622d2ab37976fbd97180cbfe23c7853e91ab7966655eb46ebd9bdd2951205e46bc
WHIRLPOOL
91e1fc2e49944d1ded93d902fc50437763388a12b8c2eab70e2dcd8124860746c71fa8b4c26e7b43e5ebc2c0fc94c4c005a2c1eb8b9af68e77c9c6cc1d92927c
AUX samba-4.3.9-remove-getpwent_r.patch 2680 SHA256
7956274b412a268339abb63f8e1bd63b5049cd4ab7c6270235d9d0b9bcf6c81a SHA512
0d4fd9862191554dc9c724cec0b94fd19afbfd0c4ed619e4c620c075e849cb3f3d44db1e5f119d890da23a3dd0068d9873703f3d86c47b91310521f37356208b
WHIRLPOOL
a42c91049872ca29dfeb80755b7f99fc3ad81b59395fb2d9a77210f18de402a4ef3a0409edfe9339b3b3e7ee7d3c85fed55f90ce50392c5e3ec2fce8c9f3f498
-AUX samba-4.3.9-remove-rep_strtoull.patch 2088 SHA256
a5a6493252f99d89b9c108a51073e777096e82e22f57c3444dc2cd7df36fe152 SHA512
9f264e300e453466e9be86d44dc90eea69ace58c4c1a4f9d6374bffe99dae3f56b529c19509efa39cffebb7e3aaf1edf1a1828d36e3d412d0b9de7d70e71e3e0
WHIRLPOOL
a33481e663bcddcf7bc0a936d8e67d84850009cbdccf6c14949a244f939d0ea159502915a2ec2f2ee6e357d2dc4a0856a11796e44f22bbde71ff002597337aa4
+AUX samba-4.4.0-pam.patch 895 SHA256
a7f91da7da039346e9497addef7e644ef1290b5915a43fb9cc76200294022eb7 SHA512
5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
WHIRLPOOL
48e4853bb284ba0bf54262a951ae8045075179c51dbb27689a31c0eba61f1ddb707e1adf62e5e67940c239ea7bc4d1691e6eb8d21781fd9fb30cb76a32cc229b
+AUX samba-4.5.1-compile_et_fix.patch 762 SHA256
49039beb8e96139b32c733e876f6dbdfb764dc51fc3b963d5485aad33641628b SHA512
9605751653dcbbce41be807a9b4f8e5f657db6622f843e91c4df9c4b3e4ad621b6e8e3891f2b970208d55a80801355988f253e3c844ca51a658cd6de8c373e24
WHIRLPOOL
93e57f6c5cff7a1b24a71cce6c584f2a12560b38a5841bf888e6f5d8323801b4aa7ac5fe1bf06cdd7739d284509c07f465c03a07de1b9aa03d7c9988a59cb4c2
AUX samba.conf 61 SHA256
e4fc68bc14a44e3c452e767d996ff693d131da317eb513de10d752dd96cb6f12 SHA512
4a75185762c90d110c399215fbfc939d30804b558ffdb11cc68dee6f87a94c86cadbcd63935884db1266cf40fe24fefb75f9067fe4751ad9838d7a43e8973b9e
WHIRLPOOL
ad21bc3738c2ec721ad3be746c66719385390835c7f4da881fc0cc1c982bb6821a56300157b1169d1a35264e44dab1a0c29cd9919455a02a8f4c53c665a4bed3
AUX samba.service 199 SHA256
0ae738fa2a15b476dbca016dfa4e1cf4b8c4a575e13edf518eb70b615c02a059 SHA512
eb277917f15de958f4a0404b66c6d2cc82ae4319b85f2f442489988d523bf92e2a9d23a6051ee693cd4bcfbc67947e8028c59906ad3e537578daf5caee8a6f16
WHIRLPOOL
1132081b63b1e0e1a9342d59493ebfe1d918133a4091e48c42dae7845dcaa24a0b8e7a1183d5a41b0173c3f6dbc17838a9b7a6297fc8ea0775ab150a22ae3151
AUX smbd.service 250 SHA256
e1f5da902cd97891852f6463b2c7eddbc61e7fbd3e3c281028a806319627fc68 SHA512
a54e3c337f7c27766a81f68ad6d8f4eb6ddb1d1aec3303f274e419a49114755bc5dd711701d5e64954ae7153a8be4a7063371af286696c0b81d543b9276703c3
WHIRLPOOL
18b6a57603a41303d207249fdb46cb4f6e887f8b9bd4921dca6b4f28a59951368d6abead2dc9d3be2c09cb2c9f295087ef5f20d121a309791b9031e3fad28b13
AUX smbd.socket 121 SHA256
d62a239cba39ae03dbb7a291843b2c202973341c85d93ffc87b4e78813be44c2 SHA512
2db4a707fcc6ef1928ac010e5e92cdaf0f6ff3ffa8aef918e0db1ce910abfb481d6a19082337f9c8444cd780d1d442fa8df2bb65e6142fc109d29657532572ed
WHIRLPOOL
aef792f27a7cd91ee258b6137015269cf2e6310c24a060acb7c6a97162aaebe37f32f66e46f4399cd1160bcc65e5608da7bc87bf933bccd2ffdfe51a6a7cdd8d
AUX smbd_at.service 145 SHA256
909dddfd80982035739081d86d2c524f6a25440d9c10b8a80626d9b4eee424cd SHA512
e6486c35dfa6f77ad46547a78fcae55fb71e4dad7dc7b4580c2b8c1be232c0a870f56714b2b103a1fd8717298f41347d7178fbebb90f0f2d0324fe5233f0f9f3
WHIRLPOOL
f5ac03a1e7b653458d49fa2c2afe674e9d8f1e5a81e72a5e49781de3e5111bbe23eedc38c78a6f5e7edc4c32300ddaf76caf889de256fc799cf117edcd6ce6fb
AUX winbindd.service 240 SHA256
755036bc419cce90200ac3c04986fbb7cf718c128c2a1288c634658bb779bf3a SHA512
f1ce6d035e8e0fcdc73f14e3b60c9647043777ff6b2a982a81ed07eb4df5ff245a9511e3e4a9d8163f9c8f3fb86d2a39a67621ace68392eb7c2f2e2a55d587f7
WHIRLPOOL
eb4d7f30b4ce3341e3d24a6c05965bdce9ded78a7327b44d3d04d00837d6e8109857b1fb1b78c8325680588cf9abe94158755a962fb8f7e8dac04b336308c268
-DIST samba-4.3.9.tar.gz 20570849 SHA256
1f22c61a7f24c5357a9ef4d10833a2cd161f40f3db03bcbe586d7cd3a56139f3 SHA512
bc90c88d8defd3acec7c671e8ceacec31e3111540aabee7ec6f11cdeaf61bbd993525e2b765e3b50801c8079e1168cf496b3e5e6a56118d6493ae5da60d34c41
WHIRLPOOL
e33efba4bfbaab5278ec62cbadb5f14fe2220d4b4ad1e57a4d26233d8b6bdf4318ad86d839b2638a490a195c04aabb02dafff67bb1e2999fab4f116b3c6367cc
-DIST samba-disable-python-patches-4.3.9.tar.xz 6116 SHA256
83206112e04c375e170e86ea6b29d6dc2c172b55ba9fb89130be14708d758cf5 SHA512
ca8b62337afd1cc6059b9aefc0a3972d18ba90fba3f043d9730f6967e1b80c40bc918b0445b8ae8a1f3df74d3551f90c721df3c0514edccb881ed0b4fc54e1b5
WHIRLPOOL
3aebd6758e5e7dc2920b1e8f8825d2b7b7efac7c5f2d91d5ed6fed75597bfdced1b27d9e2a00385af5df19e5462a4e014df6a7274c0b25a660702268235ef746
-EBUILD samba-4.3.9-r99.ebuild 6777 SHA256
86bbf6488b1b464451c13edccfdbe2e6816b0b43edb1c7dca96fd0dc8bf5180b SHA512
127f29b44831c3e84fdc98c2696a17adc91dcb2505de380ffb79d3d08b7f9ae6b187586de4eb991010fc2fd5639037b55e78bff8fde350931f90a8033e5849e4
WHIRLPOOL
25be0ba555915d7948b60b43fafbe081a217b1a8258add24d9dea8597efbd6e7a73490b67e63eeeb32b91216e133decdac940c4abd3252b858b4cd4b1b075696
+DIST samba-4.5.10.tar.gz 20989431 SHA256
7cb753f5f6d5527ef40d4c1f47dacafb7c876cb304b4906ccb390c6a18477714 SHA512
046bae9c66083a4fe656d6a7b02b64343c66e0ea4925193a898dbda107b5b158d1897f16c36f4c393a30457a49215fa6ef91720367f4946760ec48ce02a4a68a
WHIRLPOOL
2359a40337c2a85c17e3c860a8531c21ec5cf3c180dfd5a1e554f2eb5e10576a8b706464d490e008af441d9ce6a14043112d621d8e140461806c97947362933a
+DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 SHA256
fa0d776e04e3222c0dc4761e376717f4154937cdcb85f4117b8978dfb770a78e SHA512
920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927
WHIRLPOOL
6d55710895435ad012e23f8c252e5276966241014710349ca7fa9cf037e8742030b8e053f7cb71309a0a45f48d2235d55393243bf4d19476a22dd39bb1b7748d
+EBUILD samba-4.5.10-r1.ebuild 7766 SHA256
40acfac0c5339a1d7d2f43b5cf060977e51000061b8400aaf6161bbee4bbc133 SHA512
896e700071adf753ca0dc1951d0afa6379fcb3d4358066037783410ff8f20faa3bf032d0dfef8dc5d82423afa20f4180c041dfb67014877e339fe30b627213ce
WHIRLPOOL
6f6df73c72bdd5f28ec97f4c97fc4618bc3ad79bc064ad36a3b8c84352a7e596b39c7c5294046add38dd5accf67a8f22a2fe56da74fb177738f032c6644ee621
MISC metadata.xml 1287 SHA256
8208635edd9a751dde19da5255939adf639d31fce7cc8a0f9644d873dd389467 SHA512
b79d226bf155dcbdf0ff6dd59180f526d71de48dd032810ffc5209a8232b6b945dd2e18d10898d231c8168ff091f3ee2b7ad0d96d4678fecb4321b78ed6cda5a
WHIRLPOOL
c14a23a123161cfc1b3c6618840b7b5b2c5977a15e558947832dd791cf87fc20461056e90b8d5f84eefa743ed8439b543bb9b400227814bac0d7676248da8e8d
diff --git a/net-fs/samba/samba-4.5.10-r1.ebuild
b/net-fs/samba/samba-4.5.10-r1.ebuild
index c5a9f1e..967aa08 100644
--- a/net-fs/samba/samba-4.5.10-r1.ebuild
+++ b/net-fs/samba/samba-4.5.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,9 +14,9 @@ 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.3.9.tar.xz";
+
https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.5.0_rc1.tar.xz";
[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
DESCRIPTION="Samba Suite Version 4"
HOMEPAGE="http://www.samba.org/";
@@ -24,8 +24,8 @@ LICENSE="GPL-3"
SLOT="0"
-IUSE="acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint
-ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
+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
@@ -42,36 +42,47 @@ MULTILIB_WRAPPED_HEADERS=(
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}]
- sys-libs/readline:=
- virtual/libiconv
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
sys-apps/attr[${MULTILIB_USEDEP}]
+ >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}]
sys-libs/libcap
- >=sys-libs/ldb-1.1.24[${MULTILIB_USEDEP}]
sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
- >=sys-libs/talloc-2.1.3[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.3.7[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.9.25[${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] )
- aio? ( dev-libs/libaio )
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 )
+ 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}] )
- !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd:0= )"
DEPEND="${CDEPEND}
- virtual/pkgconfig"
+ virtual/pkgconfig
+ 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
+ )
+ )"
RDEPEND="${CDEPEND}
client? ( net-fs/cifs-utils[ads?] )
selinux? ( sec-policy/selinux-samba )
@@ -80,19 +91,21 @@ RDEPEND="${CDEPEND}
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.2.3-heimdal_compilefix.patch"
- "${FILESDIR}/${PN}-4.2.7-pam.patch"
- "${FILESDIR}/${P}-remove-getpwent_r.patch"
- "${FILESDIR}/${P}-remove-rep_strtoull.patch"
-
+ "${FILESDIR}/${PN}-4.4.0-pam.patch"
+ "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+ "${FILESDIR}/${PN}-4.3.9-remove-getpwent_r.patch"
+ "${FILESDIR}/netdb-defines.patch"
)
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
WAF_BINARY="${S}/buildtools/bin/waf"
@@ -100,20 +113,10 @@ SHAREDMODS=""
pkg_setup() {
python-single-r1_pkg_setup
- if use aio ; then
- if ! linux_config_exists || ! linux_chkconfig_present AIO; then
- ewarn "You must enable AIO support in your kernel
config, "
- ewarn "to be able to support asynchronous I/O. "
- ewarn "You can find it at"
- ewarn
- ewarn "General Support"
- ewarn " Enable AIO support "
- ewarn
- ewarn "and recompile your kernel..."
- fi
- fi
if use cluster ; then
- SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad"
+ SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+ elif use ads ; then
+ SHAREDMODS="idmap_ad"
fi
}
@@ -121,20 +124,36 @@ src_prepare() {
default
# install the patches from tarball(s)
- eapply "${WORKDIR}/patches/"
+ 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=/etc
- --localstatedir=/var
- --with-modulesdir=/usr/$(get_libdir)/samba
- --with-piddir=/run/${PN}
- --bundled-libraries=NONE
+ --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
@@ -147,25 +166,23 @@ multilib_src_configure() {
$(usex addc '' '--without-ad-dc')
$(use_with addns dnsupdate)
$(use_with ads)
- $(usex ads '--with-shared-modules=idmap_ad' '')
- $(use_with aio aio-support)
- $(use_enable avahi)
$(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)
- $(use_with pam pam_smbpass)
- $(usex pam
"--with-pammodulesdir=/$(get_libdir)/security" '')
+ $(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
@@ -174,17 +191,16 @@ multilib_src_configure() {
--without-ad-dc
--without-dnsupdate
--without-ads
- --without-aio-support
--disable-avahi
--without-cluster-support
--disable-cups
--without-dmapi
--without-fam
--disable-gnutls
+ --without-gpgme
--disable-iprint
$(use_with ldap)
--without-pam
- --without-pam_smbpass
--without-quotas
--without-syslog
--without-systemd
@@ -194,10 +210,14 @@ multilib_src_configure() {
)
fi
- CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
+ 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
@@ -220,6 +240,15 @@ multilib_src_install() {
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
@@ -247,6 +276,6 @@ pkg_postinst() {
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.2.0.html and"
+ elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
}
