From: Samuli Suominen <ssuominen@gentoo.org>
Date: Sat, 22 Oct 2011 01:12:25 +0000 (+0000)
Subject: Remove nox11 argument from pam_ck_connector.so wrt #342345
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3e3c3d5827e8ba9c118ee844882d49f5322e106c;p=gentoo.git

Remove nox11 argument from pam_ck_connector.so wrt #342345

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

diff --git a/sys-auth/pambase/ChangeLog b/sys-auth/pambase/ChangeLog
index b8224ccf6a98..72e753ac08a0 100644
--- a/sys-auth/pambase/ChangeLog
+++ b/sys-auth/pambase/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/pambase
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.102 2010/11/28 16:04:45 constanze Exp $
+# 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 $
+
+*pambase-20101024-r1 (22 Oct 2011)
+
+  22 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +pambase-20101024-r1.ebuild:
+  Remove nox11 argument from pam_ck_connector.so wrt #342345
 
   28 Nov 2010; Constanze Hausner <constanze@gentoo.org>
   pambase-20090620.1-r1.ebuild, pambase-20100310.ebuild,
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index e8089b340133..3bb4f12851e4 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.ebuild 3013 RMD160 cf45250af5bed6f1d9e0efe8389616956daea52f SHA1 b8613eed82a3b59080d16be1496626e58d110d2f SHA256 5936b0822652bab1e681c2a8e403f9d54368cee95a76ec189399a866c1779c2d
-MISC ChangeLog 15019 RMD160 d8635009de7edf8131db3067c4f58bb5ea810b6a SHA1 15b202e56def0a5720c39087e72568f90f6649b7 SHA256 fc24b10e1f02759af1ce1e7726cc8b82eab5691192062ef6c0c79239c79f1546
+MISC ChangeLog 15202 RMD160 5973172a8273eb3bbcfe6a36de168e0a4a274daa SHA1 e827f2be2dd6f39109f3fd4155e294b1bbf1d304 SHA256 0948e7e1f4dea2215cccaeac211f87fd0b9306de6dcac94cc111e01db35904c0
 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
+-----END PGP SIGNATURE-----
diff --git a/sys-auth/pambase/pambase-20101024-r1.ebuild b/sys-auth/pambase/pambase-20101024-r1.ebuild
new file mode 100644
index 000000000000..bcdc49d63da8
--- /dev/null
+++ b/sys-auth/pambase/pambase-20101024-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20101024-r1.ebuild,v 1.1 2011/10/22 01:12:25 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_prepare() {
+	sed -i -e '/pam_ck_connector/s: nox11::' system-login.in || die #342345
+}
+
+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
+}