Fixing automagic dependency on pam, bug #489770

Package-Manager: portage-2.2.24

2 files changed, 40 insertions, 12 deletions

diff --git a/net-fs/samba/files/samba-4.2.7-pam.patch b/net-fs/samba/files/samba-4.2.7-pam.patch
new file mode 100644
index 000000000000..0777baeb58b6
--- /dev/null
+++ b/net-fs/samba/files/samba-4.2.7-pam.patch
@@ -0,0 +1,36 @@
+--- /tmp/samba-4.2.7/source3/wscript	2015-07-14 12:54:24.000000000 +0200
++++ source3/wscript	2016-01-05 22:48:50.669250837 +0100
+@@ -853,11 +853,11 @@
+         if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'):
+             conf.env.with_iconv = False
+         if conf.env.with_iconv:
+             conf.DEFINE('HAVE_ICONV', 1)
+ 
+-    if Options.options.with_pam:
++    if Options.options.with_pam != False:
+         use_pam=True
+         conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h')
+         if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'):
+             Logs.warn("--with-pam=yes but pam_appl.h not found")
+             use_pam=False
+@@ -926,10 +926,20 @@
+             msg="Checking whether PAM_RADIO_TYPE is available");
+         if use_pam:
+             conf.DEFINE('WITH_PAM', 1)
+             conf.DEFINE('WITH_PAM_MODULES', 1)
+ 
++    else:
++        Logs.warn("PAM disabled")
++        use_pam=False
++        conf.undefine('WITH_PAM')
++        conf.undefine('WITH_PAM_MODULES')
++        conf.undefine('HAVE_SECURITY_PAM_APPL_H')
++        conf.undefine('PAM_RHOST')
++        conf.undefine('PAM_TTY')
++        conf.undefine('HAVE_PAM_PAM_APPL_H')
++
+     if Options.options.with_pam_smbpass:
+         conf.env.with_pam_smbpass = True
+ 
+     seteuid = False
+ 
diff --git a/net-fs/samba/samba-4.2.7.ebuild b/net-fs/samba/samba-4.2.7.ebuild
index 70ac968d2f62..170e737c9672 100644
--- a/net-fs/samba/samba-4.2.7.ebuild
+++ b/net-fs/samba/samba-4.2.7.ebuild
@@ -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
@@ -47,7 +46,6 @@ CDEPEND="${PYTHON_DEPS}
 	>=sys-libs/tevent-0.9.25
 	>=sys-libs/uid_wrapper-1.0.1
 	sys-libs/zlib
-	virtual/pam
 	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
 	aio? ( dev-libs/libaio )
@@ -60,7 +58,8 @@ CDEPEND="${PYTHON_DEPS}
 	ldap? ( net-nds/openldap )
 	system-mitkrb5? ( app-crypt/mit-krb5 )
 	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl] )
-	systemd? ( sys-apps/systemd:0= )"
+	systemd? ( sys-apps/systemd:0= )
+	pam? ( virtual/pam )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
@@ -74,7 +73,8 @@ 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)"
 
@@ -94,14 +94,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() {