commit: d45fb80f0cd301303103f4532016a5d6f044254a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 10 13:05:01 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 13:05:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d45fb80f
net-fs/samba: Bump to versions 4.7.10, 4.8.5 and 4.9.0_rc5
Removed old.
Package-Manager: Portage-2.3.49, Repoman-2.3.10
net-fs/samba/Manifest | 4 +-
...{samba-4.9.0_rc2.ebuild => samba-4.7.10.ebuild} | 115 +++++++++++++--------
.../{samba-4.9.0_rc2.ebuild => samba-4.8.5.ebuild} | 18 ++--
...mba-4.9.0_rc2.ebuild => samba-4.9.0_rc5.ebuild} | 2 +-
4 files changed, 85 insertions(+), 54 deletions(-)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 74764c5f68e..6aa885b7dab 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -4,9 +4,11 @@ DIST samba-4.5.16.tar.gz 21024396 BLAKE2B
e737559fb748044076608fa233700eb54c7e1c
DIST samba-4.6.15.tar.gz 21175479 BLAKE2B
40751be51e5ae1368b66d5e0919092935749a749dbb469dd503864acb9d5caf1c26c0894ac3a5294ed8b2c79de31366d80f1b565bffb4f18a7ba659872748feb
SHA512
7b55e305c41380ba6dd4df94bdd88aa2d4ebbe27ec258331c04a9610ee820e4c290a3dfdcd04fa89e100b115a674380881699d6cd565f08d753d1b23036c4986
DIST samba-4.6.16.tar.gz 21184221 BLAKE2B
93c2a666edadf1cf6277f6ec202f629be6badec6151dff0b4faed7e9541c6b0c20776ea1c2f536ca9ae1056e153929a312f7c8b06aa92adebf0758cca7cebf6b
SHA512
e51d34a5a21d40e18b221ac2d150eb5d0a72cf14b3fdbaa11ab621dc173067c8c73764c748148907f6e5633b5afc68b691b673fb6cbffb3b77e1b7281dabebc4
DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B
99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222
SHA512
c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb
+DIST samba-4.7.10.tar.gz 16911799 BLAKE2B
e8ee8763c9843d048589cb17c1b78a3e3983ff8766b2981a7da0c2e6f8425a85c97f2619a9a8259a94ccd07d7aa55bb9bf928261959c04eb0b7fdfe318fc2433
SHA512
4165cf9ec1c6355d0832fb4e17939f8f1544802e6e144d51a4f6030ad54660bb468b586d3db488f5e13f3d451fe4e2af94b748d2432da62ce256eb2467d3a51c
DIST samba-4.7.7.tar.gz 16875059 BLAKE2B
05ecf13562e847070498e923df0cc85836b2fb98d4618942f60e4f28d6c5110b382cfe494e6578bbc06e14052c5d87b0f542ada186e4f132375c4360eaa8bb9f
SHA512
78f180f602f08ab9e3000ae016f667e44f059a865b606c21e18857efb89af469c2cb2f9c1316e658badf1a1f41826ba87ccb23f38dc31fe82bf9e5b8fb93daad
DIST samba-4.7.9.tar.gz 16907301 BLAKE2B
c5e1e7422c271893ad6bc8fbaa1c17161e221d2eb9eb7cc370d52cf3d5dd4b54b023419f9dd72476ead8da306b6a530c4fc2529efad8eab26100157ffe23b5a4
SHA512
7e7e3c611e69fef904d13503752cafb7a259dd02b0be9a73d3b31ef82d701006da47e60a68dc19abb5343aa27ee4b210aa5d9bb2c1962932835dcbccba9b4f4a
DIST samba-4.8.3.tar.gz 17680660 BLAKE2B
ee2c37eb935b3545eec8975d2427e55cf0dcdc8f9725e7549ffd42f8069e2b1ee65178895c173cd694442aac0a888d661837edeb8990e948b021a69e3078106f
SHA512
0dd035f5f2cfc5f47f2e9b9e295548ecce73014f01e9539d9cc639f27b00e1e71a57acb018da70e70d3761281246933b6935be151df1bd35e539d6d338686217
DIST samba-4.8.4.tar.gz 17700008 BLAKE2B
134d074b9e5d8d17c094791cd3274c31c2f458ba5a8b17a6bc2c5be60f5bf01f3220947ee14f477711cf239c9be5ce2067fefe27ad18b2b4c2f183698dd202d9
SHA512
a3ad651717df5a441064693412965a66bb3d7927baa4ca5625b0948d7253af74eaf05c7e75e6c07853186513df38a925019616cd6439a96e9828b04cd8c5350d
-DIST samba-4.9.0rc2.tar.gz 17983386 BLAKE2B
664a2aff22a877687a7b203e5621d84f58e665c61d3fb8d09a26dcf75fe4fd166fe6be8c310b0380bd7b180ee27a21776809a1699dc7dc43cec086d1ba4a0ab0
SHA512
a9b15de66314e8dc24def7257ad0bce741b4bf2ff89e18fe56d211c18b84094d3cbc5c5cc80140f78dce134059886e96a3def4341b83093c57c7f19224771591
+DIST samba-4.8.5.tar.gz 17715401 BLAKE2B
fc1aef2f5362fff1870abe40eebfe932f5ca347e65d1a2502ee19c9fce8cbf71e3f4181a18056d8d6b3e92d2515f946e3dc746b00f2398d91f88b1172e91cd43
SHA512
23a88c48214c3bf4cbc135cb84873bb8d12f32187ccbda47b02495fa4a12458f103de5e968e8f9a5958c116f618332cfffbf54d084e4f1e363fbf079b897e3a0
+DIST samba-4.9.0rc5.tar.gz 18016839 BLAKE2B
015b87d1356dcb3f7546cbfa268d61c7546ea16d31bde38ea53634122c34c89ca33d0902f6a5ca51452fc8661ebdddbd9ec0a22b8875e6b1e92801b1a4192d15
SHA512
c95378718f5080da9b472714dab51755e924fe871edf8cb262195e04cb9ecdbec20093e7e24f9e917c53b986ac96a041e86cf1572710454718756068b49fb18d
DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B
0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0
SHA512
c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
diff --git a/net-fs/samba/samba-4.9.0_rc2.ebuild
b/net-fs/samba/samba-4.7.10.ebuild
similarity index 75%
copy from net-fs/samba/samba-4.9.0_rc2.ebuild
copy to net-fs/samba/samba-4.7.10.ebuild
index 433482590e7..c2d8e417223 100644
--- a/net-fs/samba/samba-4.9.0_rc2.ebuild
+++ b/net-fs/samba/samba-4.7.10.ebuild
@@ -5,7 +5,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE='threads(+),xml(+)'
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
MY_PV="${PV/_rc/rc}"
MY_P="${PN}-${MY_PV}"
@@ -15,7 +15,7 @@ SRC_PATH="stable"
SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86"
DESCRIPTION="Samba Suite Version 4"
HOMEPAGE="https://www.samba.org/";
@@ -23,8 +23,8 @@ LICENSE="GPL-3"
SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
iprint json ldap
-pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test
winbind zeroconf"
+IUSE="acl addc addns ads ceph client cluster cups debug 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
@@ -49,14 +49,14 @@ CDEPEND="
>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
net-libs/libnsl:=[${MULTILIB_USEDEP}]
sys-apps/attr[${MULTILIB_USEDEP}]
-
>=sys-libs/ldb-1.4.1[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-
<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+
>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+
<sys-libs/ldb-1.3.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
sys-libs/libcap
sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
sys-libs/readline:0=
- >=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tdb-1.3.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
virtual/libiconv
pam? ( virtual/pam )
@@ -79,7 +79,6 @@ CDEPEND="
>=net-libs/gnutls-1.4.0
)
gpg? ( app-crypt/gpgme )
- json? ( dev-libs/jansson )
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}] )
@@ -89,8 +88,8 @@ DEPEND="${CDEPEND}
${PYTHON_DEPS}
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
- net-libs/libtirpc[${MULTILIB_USEDEP}]
virtual/pkgconfig
+ net-libs/libtirpc[${MULTILIB_USEDEP}]
|| (
net-libs/rpcsvc-proto
<sys-libs/glibc-2.26[rpc(+)]
@@ -111,9 +110,9 @@ RDEPEND="${CDEPEND}
"
REQUIRED_USE="
- addc? ( python gnutls json winbind )
+ addc? ( python gnutls )
addns? ( python )
- ads? ( acl gnutls ldap winbind )
+ ads? ( acl gnutls ldap )
cluster? ( ads )
gpg? ( addc )
test? ( python )
@@ -132,6 +131,8 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+ "${FILESDIR}"/talloc-disable-python.patch
+ "${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -178,7 +179,8 @@ multilib_src_configure() {
bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
fi
- local myconf=(
+ local myconf=()
+ myconf=(
--enable-fhs
--sysconfdir="${EPREFIX}/etc"
--localstatedir="${EPREFIX}/var"
@@ -190,33 +192,61 @@ multilib_src_configure() {
--disable-rpath-install
--nopyc
--nopyo
- $(multilib_native_use_with acl acl-support)
- $(multilib_native_usex addc '' '--without-ad-dc')
- $(multilib_native_use_with addns dnsupdate)
- $(multilib_native_use_with ads)
- $(multilib_native_use_enable ceph cephfs)
- $(multilib_native_use_with cluster cluster-support)
- $(multilib_native_use_enable cups)
- $(multilib_native_use_with dmapi)
- $(multilib_native_use_with fam)
- $(multilib_native_use_with gpg gpgme)
- $(multilib_native_use_with json json-audit)
- $(multilib_native_use_enable iprint)
- $(multilib_native_use_with pam)
- $(multilib_native_usex pam
"--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
- $(multilib_native_use_with quota quotas)
- $(multilib_native_use_with syslog)
- $(multilib_native_use_with systemd)
- $(multilib_native_use_with winbind)
- $(multilib_native_usex python '' '--disable-python')
- $(multilib_native_use_enable zeroconf avahi)
- $(multilib_native_usex test '--enable-selftest' '')
- $(usex system-mitkrb5 '--with-system-mitkrb5' '')
- $(use_enable gnutls)
- $(use_with debug lttng)
- $(use_with ldap)
)
- multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS}
)
+ 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_enable ceph cephfs)
+ $(use_with cluster cluster-support)
+ $(use_enable cups)
+ $(use_with debug lttng)
+ $(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
+ --disable-cephfs
+ --without-cluster-support
+ --disable-cups
+ --without-dmapi
+ --without-fam
+ --disable-gnutls
+ --without-gpgme
+ --disable-iprint
+ $(use_with ldap)
+ $(use_with debug lttng)
+ --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[@]}
@@ -230,9 +260,9 @@ multilib_src_install() {
waf-utils_src_install
# Make all .so files executable
- find "${ED}" -type f -name "*.so" -exec chmod +x {} +
+ find "${D}" -type f -name "*.so" -exec chmod +x {} +
- if multilib_is_native_abi ; then
+ if multilib_is_native_abi; then
# install ldap schema for server (bug #491002)
if use ldap ; then
insinto /etc/openldap/schema
@@ -284,5 +314,6 @@ pkg_postinst() {
elog "For further information and migration steps make sure to read "
elog "https://samba.org/samba/history/${P}.html "
+ elog "https://samba.org/samba/history/${PN}-4.5.0.html and"
elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
}
diff --git a/net-fs/samba/samba-4.9.0_rc2.ebuild
b/net-fs/samba/samba-4.8.5.ebuild
similarity index 93%
copy from net-fs/samba/samba-4.9.0_rc2.ebuild
copy to net-fs/samba/samba-4.8.5.ebuild
index 433482590e7..8cc6add5409 100644
--- a/net-fs/samba/samba-4.9.0_rc2.ebuild
+++ b/net-fs/samba/samba-4.8.5.ebuild
@@ -23,8 +23,8 @@ LICENSE="GPL-3"
SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
iprint json ldap
-pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test
winbind zeroconf"
+IUSE="acl addc addns ads ceph client cluster cups debug 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
@@ -49,14 +49,14 @@ CDEPEND="
>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
net-libs/libnsl:=[${MULTILIB_USEDEP}]
sys-apps/attr[${MULTILIB_USEDEP}]
-
>=sys-libs/ldb-1.4.1[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-
<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+
>=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+
<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
sys-libs/libcap
sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
sys-libs/readline:0=
- >=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
virtual/libiconv
pam? ( virtual/pam )
@@ -79,7 +79,6 @@ CDEPEND="
>=net-libs/gnutls-1.4.0
)
gpg? ( app-crypt/gpgme )
- json? ( dev-libs/jansson )
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}] )
@@ -111,7 +110,7 @@ RDEPEND="${CDEPEND}
"
REQUIRED_USE="
- addc? ( python gnutls json winbind )
+ addc? ( python gnutls winbind )
addns? ( python )
ads? ( acl gnutls ldap winbind )
cluster? ( ads )
@@ -200,7 +199,6 @@ multilib_src_configure() {
$(multilib_native_use_with dmapi)
$(multilib_native_use_with fam)
$(multilib_native_use_with gpg gpgme)
- $(multilib_native_use_with json json-audit)
$(multilib_native_use_enable iprint)
$(multilib_native_use_with pam)
$(multilib_native_usex pam
"--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
diff --git a/net-fs/samba/samba-4.9.0_rc2.ebuild
b/net-fs/samba/samba-4.9.0_rc5.ebuild
similarity index 99%
rename from net-fs/samba/samba-4.9.0_rc2.ebuild
rename to net-fs/samba/samba-4.9.0_rc5.ebuild
index 433482590e7..8dc0be1a1c8 100644
--- a/net-fs/samba/samba-4.9.0_rc2.ebuild
+++ b/net-fs/samba/samba-4.9.0_rc5.ebuild
@@ -49,7 +49,7 @@ CDEPEND="
>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
net-libs/libnsl:=[${MULTILIB_USEDEP}]
sys-apps/attr[${MULTILIB_USEDEP}]
-
>=sys-libs/ldb-1.4.1[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+
>=sys-libs/ldb-1.4.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
sys-libs/libcap
sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
