Restore "nox11" as pam_ck_connector.so argument because most of the display managers in tree, including XDM and SLIM, has native ConsoleKit support now.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 113 insertions, 10 deletions

diff --git a/sys-auth/pambase/ChangeLog b/sys-auth/pambase/ChangeLog
index 72e753ac08a0..e2f6a1d9ee6b 100644
--- a/sys-auth/pambase/ChangeLog
+++ b/sys-auth/pambase/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/pambase
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.103 2011/10/22 01:12:25 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.104 2012/01/28 07:54:54 ssuominen Exp $
+
+*pambase-20101024-r2 (28 Jan 2012)
+
+  28 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +pambase-20101024-r2.ebuild:
+  Restore "nox11" as pam_ck_connector.so argument because most of the display
+  managers in tree, including XDM and SLIM, has native ConsoleKit support now.
 
 *pambase-20101024-r1 (22 Oct 2011)
 
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 3bb4f12851e4..b706e32debce 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -3,17 +3,18 @@ Hash: SHA1
 
 DIST pambase-20101024.tar.bz2 3201 RMD160 3b0c5950a7e2cafd3fe93a5663b35e851d5975bf SHA1 89bca8e926290518192f5728aab8794f028931f5 SHA256 89d60dd598d3da0ce1d1bcd7dc325f6c55002a1d4a7d27f9bb024f6732e9fba4
 EBUILD pambase-20101024-r1.ebuild 3065 RMD160 11b79c68a6cdea7959f9bd7361cc9eaabe08b70b SHA1 d400fc70fdcf5f29ab341bc55c4b39dfb1c4f264 SHA256 487c0003bfb80feff2cb88b2cf7c663e7e6ddc8c9ccd366d1378571106ce78f1
+EBUILD pambase-20101024-r2.ebuild 2972 RMD160 8fc0291166955a266e702c1ab45f591b7fcb0c17 SHA1 fe7fbf9ac50f7fe58c63da4bfe5327573fcd76db SHA256 c21514ebd7a3aa85c6873a278b03016df137e25c1f73654addae77b341dd3881
 EBUILD pambase-20101024.ebuild 3013 RMD160 cf45250af5bed6f1d9e0efe8389616956daea52f SHA1 b8613eed82a3b59080d16be1496626e58d110d2f SHA256 5936b0822652bab1e681c2a8e403f9d54368cee95a76ec189399a866c1779c2d
-MISC ChangeLog 15202 RMD160 5973172a8273eb3bbcfe6a36de168e0a4a274daa SHA1 e827f2be2dd6f39109f3fd4155e294b1bbf1d304 SHA256 0948e7e1f4dea2215cccaeac211f87fd0b9306de6dcac94cc111e01db35904c0
+MISC ChangeLog 15481 RMD160 4d3c9415d57a7730d41be5fcc62fc3b0310ba970 SHA1 ac2f9ab99cc96d754ebf2944687c6b14f94198af SHA256 b394a0647499e137657dc2daef4ed7aff03c77ba5f7734bc35af880938dee7da
 MISC metadata.xml 3655 RMD160 349ef157cfa70dafe98ae09c444ac0fbcfbee30d SHA1 f8f65df1878659b8e241be06b9af12f12a339e77 SHA256 cb0bb4f50809bcb1f71011b7af43b18d909d0acdaf98c5585adaf31025ba370e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOohhUAAoJEEdUh39IaPFNxv0H/2p/dZuE9mrBnraTPFgSv5ov
-hLPr8WGFsSOn+58MoPzM7+wRJkxRqNXaBJtkv/lA4uepd4AfhBIwkXyhWiOGIfxI
-QMAOoVGK++rpckUaLL8mfm6xnHEOh9Xi7E7kbH7M+jnN36OD1npwApXqSTngVsVm
-UTYy3slb1E6ewcjS9+EyEHoiWDDei7CxpKkofvMORDH2gbDFsNg+rqa8cj0EcmJA
-ryNcq2jWykzUEuQSdimDGtM8OFI6Hx+0RC4tiMfVBMG6/sX485Mxd7rr03c9icEe
-rB5vMYhNdkow1e+1QJOxoUby+uuK3wEHVvZx/k9IvPycsp/RT0n0Er2dzJ30UFo=
-=51LQ
+iQEcBAEBAgAGBQJPI6lJAAoJEEdUh39IaPFN21kH/1RHpKlVQNZphI8iKlqdQ0k9
+CPFd1eKf6IuUgPRCBFqC5n8XSpfN+AJ62JHZNg0MqU8+qGyivXvqKKrGPrIX7am2
+F2yKXeI0iw3d21U/mIvEA65adKzLj6SSKsJzEubHX6fnR5+cximtfs2lJyFjrqQB
++EFpb02i4ZRr/s0WVEOHWrCwkIN0S2hO3qoZaTFEs4STpcIrq01IUddnEQKcdbmv
+hs3clUuvx0HAqpKRXPB/jiGDuwDTOdpwLyHlLrGZj3yaASy1GQQ18tSD6zs6Cpra
+pRIF33zpL5pOQuZKqb2BCd1XqO+flAJ4Q7ed55TZIDp8JOASVclYKiEHIy94Jh4=
+=mqpD
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pambase/pambase-20101024-r2.ebuild b/sys-auth/pambase/pambase-20101024-r2.ebuild
new file mode 100644
index 000000000000..fbf40087addf
--- /dev/null
+++ b/sys-auth/pambase/pambase-20101024-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20101024-r2.ebuild,v 1.1 2012/01/28 07:54:54 ssuominen Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="PAM base configuration files"
+HOMEPAGE="http://www.gentoo.org/proj/en/base/pam/"
+SRC_URI="http://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp pam_ssh +sha512 pam_krb5 minimal"
+RESTRICT="binchecks"
+
+RDEPEND="
+	|| (
+		>=sys-libs/pam-0.99.9.0-r1
+		( sys-auth/openpam
+		  || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules )
+		)
+	)
+	cracklib? ( >=sys-libs/pam-0.99[cracklib] )
+	consolekit? ( >=sys-auth/consolekit-0.3[pam] )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20[pam] )
+	selinux? ( >=sys-libs/pam-0.99[selinux] )
+	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
+	mktemp? ( sys-auth/pam_mktemp )
+	pam_ssh? ( sys-auth/pam_ssh )
+	sha512? ( >=sys-libs/pam-1.0.1 )
+	pam_krb5? (
+		>=sys-libs/pam-1.1.0
+		>=sys-auth/pam_krb5-4.3
+	)
+	!<sys-freebsd/freebsd-pam-modules-6.2-r1
+	!<sys-libs/pam-0.99.9.0-r1"
+DEPEND="app-portage/portage-utils"
+
+src_compile() {
+	local implementation=
+	local linux_pam_version=
+	if has_version sys-libs/pam; then
+		implementation="linux-pam"
+		local ver_str=$(qatom `best_version sys-libs/pam` | cut -d ' ' -f 3)
+		linux_pam_version=$(printf "0x%02x%02x%02x" ${ver_str//\./ })
+	elif has_version sys-auth/openpam; then
+		implementation="openpam"
+	else
+		die "PAM implementation not identified"
+	fi
+
+	use_var() {
+		local varname=$(echo $1 | tr [a-z] [A-Z])
+		local usename=${2-$(echo $1 | tr [A-Z] [a-z])}
+		local varvalue=$(use $usename && echo yes || echo no)
+		echo "${varname}=${varvalue}"
+	}
+
+	emake \
+		GIT=true \
+		$(use_var debug) \
+		$(use_var cracklib) \
+		$(use_var passwdqc) \
+		$(use_var consolekit) \
+		$(use_var GNOME_KEYRING gnome-keyring) \
+		$(use_var selinux) \
+		$(use_var mktemp) \
+		$(use_var PAM_SSH pam_ssh) \
+		$(use_var sha512) \
+		$(use_var KRB5 pam_krb5) \
+		$(use_var minimal) \
+		IMPLEMENTATION=${implementation} \
+		LINUX_PAM_VERSION=${linux_pam_version}
+}
+
+src_install() {
+	emake GIT=true DESTDIR="${ED}" install
+}
+
+pkg_postinst() {
+	if use sha512; then
+		elog "Starting from version 20080801, pambase optionally enables"
+		elog "SHA512-hashed passwords. For this to work, you need sys-libs/pam-1.0.1"
+		elog "built against sys-libs/glibc-2.7 or later."
+		elog "If you don't have support for this, it will automatically fallback"
+		elog "to MD5-hashed passwords, just like before."
+		elog
+		elog "Please note that the change only affects the newly-changed passwords"
+		elog "and that SHA512-hashed passwords will not work on earlier versions"
+		elog "of glibc or Linux-PAM."
+	fi
+}