From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A69841388BF for ; Wed, 6 Jan 2016 12:30:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1782E080C; Wed, 6 Jan 2016 12:30:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86250E080C for ; Wed, 6 Jan 2016 12:30:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5785F34098F for ; Wed, 6 Jan 2016 12:30:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08BD1A91 for ; Wed, 6 Jan 2016 12:30:15 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1452083408.f9742b65fa670d936a7dbd459b4c685c95bb936b.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/samba/samba-4.2.7.ebuild net-fs/samba/samba-4.3.3.ebuild X-VCS-Directories: net-fs/samba/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: f9742b65fa670d936a7dbd459b4c685c95bb936b X-VCS-Branch: master Date: Wed, 6 Jan 2016 12:30:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cf7af03a-7276-4987-b7e5-c200ebb3d8ea X-Archives-Hash: 36dd555a49e635eeb536c0e1b09401a1 commit: f9742b65fa670d936a7dbd459b4c685c95bb936b Author: Lars Wendler gentoo org> AuthorDate: Wed Jan 6 12:30:08 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Jan 6 12:30:08 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9742b65 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 gentoo.org> net-fs/samba/samba-4.2.7.ebuild | 8 +++++--- 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 170e737..f80127c 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 a6497de..e71e35f 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() {