Version bump and remove old version. The new version simply improves on the system-services stack to be usable with fcron.

(Portage version: 2.2_rc66/cvs/Linux x86_64)

3 files changed, 99 insertions, 105 deletions

diff --git a/sys-auth/pambase/ChangeLog b/sys-auth/pambase/ChangeLog
index a43ce1f301dd..b83fe45b0b11 100644
--- a/sys-auth/pambase/ChangeLog
+++ b/sys-auth/pambase/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/pambase
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.78 2009/11/21 14:44:46 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.79 2010/03/10 00:37:55 flameeyes Exp $
+
+*pambase-20100310 (10 Mar 2010)
+
+  10 Mar 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -pambase-20081028.ebuild, +pambase-20100310.ebuild:
+  Version bump and remove old version. The new version simply improves on
+  the system-services stack to be usable with fcron.
 
   21 Nov 2009; Raúl Porcel <armin76@gentoo.org>
   pambase-20090620.1-r1.ebuild:
diff --git a/sys-auth/pambase/pambase-20081028.ebuild b/sys-auth/pambase/pambase-20081028.ebuild
deleted file mode 100644
index 8e871f359359..000000000000
--- a/sys-auth/pambase/pambase-20081028.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20081028.ebuild,v 1.8 2009/03/21 02:36:41 jer Exp $
-
-EAPI=1
-
-inherit eutils
-
-DESCRIPTION="PAM base configuration files"
-HOMEPAGE="http://www.gentoo.org/proj/en/base/pam/"
-SRC_URI="http://www.flameeyes.eu/gentoo-distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp ssh +sha512"
-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 )
-	consolekit? ( sys-auth/consolekit )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20 )
-	selinux? ( >=sys-libs/pam-0.99 )
-	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
-	mktemp? ( sys-auth/pam_mktemp )
-	ssh? ( sys-auth/pam_ssh )
-	sha512? ( >=sys-libs/pam-1.0.1 )
-	!<sys-freebsd/freebsd-pam-modules-6.2-r1
-	!<sys-libs/pam-0.99.9.0-r1"
-DEPEND=""
-
-pkg_setup() {
-	if use cracklib && ! built_with_use sys-libs/pam cracklib; then
-		eerror "To enable cracklib support in the main PAM configuration"
-		eerror "you need to enable cracklib USE flag on sys-libs/pam"
-		eerror "first."
-		die "Missing pam_cracklib"
-	fi
-
-	if use selinux && ! built_with_use sys-libs/pam selinux; then
-		eerror "To enable selinux support in the main PAM configuration"
-		eerror "you need to enable selinux USE flag on sys-libs/pam"
-		eerror "first."
-		die "Missing pam_selinux"
-	fi
-
-	if use consolekit && ! built_with_use sys-auth/consolekit pam; then
-		eerror "To enable ConsoleKit support in the main PAM configuration"
-		eerror "you need to enable pam USE flag on sys-auth/consolekit"
-		eerror "first."
-		die "Missing pam_ck_connector"
-	fi
-
-	if use gnome-keyring && ! built_with_use gnome-base/gnome-keyring pam; then
-		eerror "To enable GNOME Keyring support in the main PAM configuration"
-		eerror "you need to enable pam USE flag on gnome-base/gnome-keyring"
-		eerror "first."
-		die "Missing pam_gnome_keyring"
-	fi
-}
-
-src_compile() {
-	has_version sys-libs/pam && implementation="linux-pam"
-	has_version sys-auth/openpam && implementation="openpam"
-
-	emake \
-		GIT=true \
-		DEBUG=$(use debug && echo yes || echo no) \
-		CRACKLIB=$(use cracklib && echo yes || echo no) \
-		PASSWDQC=$(use passwdqc && echo yes || echo no) \
-		CONSOLEKIT=$(use consolekit && echo yes || echo no) \
-		GNOME_KEYRING=$(use gnome-keyring && echo yes || echo no) \
-		SELINUX=$(use selinux && echo yes || echo no) \
-		MKTEMP=$(use mktemp && echo yes || echo no) \
-		PAM_SSH=$(use ssh && echo yes || echo no) \
-		SHA512=$(use sha512 && echo yes || echo no) \
-		IMPLEMENTATION=${implementation} \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake GIT=true DESTDIR="${D}" install || die "emake install failed"
-}
-
-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
-}
diff --git a/sys-auth/pambase/pambase-20100310.ebuild b/sys-auth/pambase/pambase-20100310.ebuild
new file mode 100644
index 000000000000..c7cf7ffb893f
--- /dev/null
+++ b/sys-auth/pambase/pambase-20100310.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20100310.ebuild,v 1.1 2010/03/10 00:37:55 flameeyes Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="PAM base configuration files"
+HOMEPAGE="http://www.gentoo.org/proj/en/base/pam/"
+SRC_URI="http://www.flameeyes.eu/gentoo-distfiles/${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"
+IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp ssh +sha512"
+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 )
+	ssh? ( sys-auth/pam_ssh )
+	sha512? ( >=sys-libs/pam-1.0.1 )
+	!<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 ssh) \
+		$(use_var sha512) \
+		IMPLEMENTATION=${implementation} \
+		LINUX_PAM_VERSION=${linux_pam_version} \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake GIT=true DESTDIR="${D}" install || die "emake install failed"
+}
+
+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
+}