diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2016-01-06 13:30:08 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2016-01-06 13:30:08 +0100 |
| commit | f9742b65fa670d936a7dbd459b4c685c95bb936b (patch) | |
| tree | 63bf4bdffa3535cbacae0c8ce64673f71306b830 | |
| parent | net-proxy/haproxy: Version bump to 1.6.3 (diff) | |
| download | gentoo-f9742b65fa670d936a7dbd459b4c685c95bb936b.tar.gz gentoo-f9742b65fa670d936a7dbd459b4c685c95bb936b.tar.bz2 gentoo-f9742b65fa670d936a7dbd459b4c685c95bb936b.zip | |
net-fs/samba: Fixing automagic dependency on pam for samba-4.3.x (bug #489770)
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
| -rw-r--r-- | net-fs/samba/samba-4.2.7.ebuild | 8 | ||||
| -rw-r--r-- | net-fs/samba/samba-4.3.3.ebuild | 16 |
2 files changed, 10 insertions, 14 deletions
diff --git a/net-fs/samba/samba-4.2.7.ebuild b/net-fs/samba/samba-4.2.7.ebuild index 170e737c9672..f80127c86b89 100644 --- a/net-fs/samba/samba-4.2.7.ebuild +++ b/net-fs/samba/samba-4.2.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -73,8 +73,10 @@ REQUIRED_USE="addc? ( gnutls !system-mitkrb5 ) S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" \ - "${FILESDIR}/${PN}-4.2.7-pam.patch") +PATCHES=( + "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" + "${FILESDIR}/${PN}-4.2.7-pam.patch" +) CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" diff --git a/net-fs/samba/samba-4.3.3.ebuild b/net-fs/samba/samba-4.3.3.ebuild index a6497de3833d..e71e35f19c3f 100644 --- a/net-fs/samba/samba-4.3.3.ebuild +++ b/net-fs/samba/samba-4.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -28,7 +28,6 @@ IUSE="acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind" # sys-apps/attr is an automagic dependency (see bug #489748) -# sys-libs/pam is an automagic dependency (see bug #489770) CDEPEND="${PYTHON_DEPS} dev-libs/iniparser:0 dev-libs/popt @@ -73,7 +72,10 @@ REQUIRED_USE="addc? ( gnutls !system-mitkrb5 ) S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" + "${FILESDIR}/${PN}-4.2.7-pam.patch" +) CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" @@ -93,14 +95,6 @@ pkg_setup() { ewarn "and recompile your kernel..." fi fi - if ! use pam ; then - ewarn "You have pam USE flag disabled!" - ewarn "Unfortunately we still have to hard depend on virtual/pam as samba upstream" - ewarn "still unconditionally links libauth4-samba4.so library to libpam.so once being" - ewarn "found on the sytem." - ewarn "Disabling the pam USE flag only disables installation of samba's pam authenti-" - ewarn "cation modules." - fi } src_prepare() { |