Use "usex" from eutils.eclass for defining "varvalue". Support for pam_systemd.so wrt #372229 by Michał Górny.

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

5 files changed, 158 insertions, 10 deletions

diff --git a/sys-auth/pambase/ChangeLog b/sys-auth/pambase/ChangeLog
index cdbbc79132e4..b67720591c6d 100644
--- a/sys-auth/pambase/ChangeLog
+++ b/sys-auth/pambase/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/pambase
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.111 2012/05/19 21:34:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.112 2012/06/19 07:55:53 ssuominen Exp $
+
+*pambase-20120417-r1 (19 Jun 2012)
+
+  19 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +pambase-20120417-r1.ebuild, +files/pambase-20120417-systemd.patch,
+  metadata.xml:
+  Use `usex` from eutils.eclass for defining "varvalue". Support for
+  pam_systemd.so wrt #372229 by Michał Górny.
 
   19 May 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   pambase-20101024-r2.ebuild, pambase-20120417.ebuild:
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 280d7a97c677..c1d3684cf9b7 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pambase-20120417-systemd.patch 608 RMD160 d15e0a74975c9c9466e34da42a87f4b99a5da464 SHA1 6ce06bc4ce0814acdb5370c4d932af2fac6732ad SHA256 888f05068801f11cb49988a3da64f658782f0056410fdb7d68d240a7d1f619ff
 DIST pambase-20101024.tar.bz2 3201 RMD160 3b0c5950a7e2cafd3fe93a5663b35e851d5975bf SHA1 89bca8e926290518192f5728aab8794f028931f5 SHA256 89d60dd598d3da0ce1d1bcd7dc325f6c55002a1d4a7d27f9bb024f6732e9fba4
 DIST pambase-20120417.tar.bz2 3361 RMD160 1f82a6f724a80bf4937dabb3de81b17cd461c07f SHA1 2c2da9e1f273d99dd2592401e8ac69119a3f50d5 SHA256 3fde3ff7714b3722b45545da36fdde6ca95a55d1b0a8cfb23666ec0de3ec5871
 EBUILD pambase-20101024-r2.ebuild 2991 RMD160 1714a36e1b05eaca3297f919cbf7406e6a8f40c5 SHA1 995122dc3b0a490b3b542795ffc82e3cb6b34fb3 SHA256 6dc6d63bef5780e88319ef24a7ffce565591b78bb83ec3a8adf12d37be318093
+EBUILD pambase-20120417-r1.ebuild 3244 RMD160 666dcc05287fc89cfc8b359649110676883d2c74 SHA1 7ac24366c1dfede74c547aca1052a99086b326f8 SHA256 e17c7d2110ec15b0d44bbdd287fddf556dfc381714bb0c265b3c9b7b60ec5818
 EBUILD pambase-20120417.ebuild 3070 RMD160 6663423dcfc74e6ca8f35a4111b74969a70a5717 SHA1 f565c2bf0aeac6a48b5e51b4483e79690dc8985e SHA256 9e5f2943848324fab271b9b907d127feb3ea3caa6b5d9dc9b7cc666c63e08d57
-MISC ChangeLog 16431 RMD160 d56ee00c8ee569770be3345bec1d63fa751a95fd SHA1 8176521801fc8e8a64419d8210fda6dee7694e26 SHA256 23bb063d46ca5887f361c5499ed95da91d396219ff35bcf8e4e68947f27003f9
-MISC metadata.xml 3655 RMD160 349ef157cfa70dafe98ae09c444ac0fbcfbee30d SHA1 f8f65df1878659b8e241be06b9af12f12a339e77 SHA256 cb0bb4f50809bcb1f71011b7af43b18d909d0acdaf98c5585adaf31025ba370e
+MISC ChangeLog 16725 RMD160 f6b17b9469f20876254b44176e208325c282b131 SHA1 f01a5d3f8a640e2b7d94c3091d36a8af017a72b3 SHA256 db1668d5f3efa0972b39127746990f2352cd3b32f3a6d03b2203ffeb3dfd3551
+MISC metadata.xml 3794 RMD160 720320812d86442c3766e21686802d22f8378dbe SHA1 271dc4bea343c54052af8ce194ffb9637009eff5 SHA256 fbddb3cd938b849feff7cc84fdad0d0b67b905a3ae97526047287208b098392c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPuBJUAAoJEBzRPIrUMBNC9aoH/1O71vzPxM5OKlhW2NWrwN1n
-t6rkPJ57YNaaUW/ARKyVLVKsZ3n9FxDQ0kJdU7zSY03+EGpCwE/l/x4VXKAC9iUJ
-o59jtoVoznIcObdpSD0IwHuY7FjcKE0FfrUwN4COlgYiJkI5b3v8hU0PiKT4yM2P
-E8anZE4MBIPHM0xdxT4MrL7gOsMP89kbx9uOElFa5pc2gnVucvlSFaFq8K4frnnR
-+Xk4bNLn/TXK1HCVJt99NBSHK3aKayfhQROFtDJcEHw6ZRyw3z2ZrVt1c9t5QO44
-5A5tGM1RNO6/fvN2Mthv8Zqetch1y24PO2ceHIdp95z2X5I1am6u5tqLgsm1aQs=
-=z7BK
+iQEcBAEBAgAGBQJP4C99AAoJEEdUh39IaPFN9gwH/3hvMPy9AYGl3JN3XRlfIy6N
+1T6FDCIg9f+kTrMTwOh8Ltb5PyT1BzM4eWsQze3EiQS0lkYO4+hqj8Qo6WDOb+1z
+3vrk07GwT5KleFPeF1fYWR8MvCJnai0fy4vNo9NDZcrULBT5s2UmjxWO7qITUI3b
+E/WJhIXRboXDUB74p2gLlMennPyJhMotOtkL2Uw+1Vt4dHB+fAncwKYnlf1jW8ld
+cSecnja0gfSv67ifkQOLB3Kl7W3DvmDakmY0GzxuYpkFO4n2GacCVwN1vflg7KB6
+0fOG4wQS0tfceRyL4r4rGFWHTHZW9bN/Rfkkr8NXBE+hwYRkVThyMbzEHhQolhA=
+=zi6y
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pambase/files/pambase-20120417-systemd.patch b/sys-auth/pambase/files/pambase-20120417-systemd.patch
new file mode 100644
index 000000000000..047fb41c8592
--- /dev/null
+++ b/sys-auth/pambase/files/pambase-20120417-systemd.patch
@@ -0,0 +1,29 @@
+http://bugs.gentoo.org/372229
+
+--- Makefile
++++ Makefile
+@@ -28,6 +28,10 @@
+ PAMFLAGS += -DHAVE_CONSOLEKIT=1
+ endif
+ 
++ifeq "$(SYSTEMD)" "yes"
++PAMFLAGS += -DHAVE_SYSTEMD=1
++endif
++
+ ifeq "$(GNOME_KEYRING)" "yes"
+ PAMFLAGS += -DHAVE_GNOME_KEYRING=1
+ endif
+--- system-login.in
++++ system-login.in
+@@ -45,7 +45,10 @@
+ #endif
+ session		include		system-auth
+ #if HAVE_CONSOLEKIT
+-session		optional	pam_ck_connector.so nox11
++-session	optional	pam_ck_connector.so nox11
++#endif
++#if HAVE_SYSTEMD
++-session	optional	pam_systemd.so
+ #endif
+ #if HAVE_GNOME_KEYRING
+ session		optional	pam_gnome_keyring.so auto_start
diff --git a/sys-auth/pambase/metadata.xml b/sys-auth/pambase/metadata.xml
index 533769a0a0cf..7a35775161d9 100644
--- a/sys-auth/pambase/metadata.xml
+++ b/sys-auth/pambase/metadata.xml
@@ -17,6 +17,10 @@
       allows for console logins to make use of ConsoleKit
       authorization.
     </flag>
+    <flag name="systemd">
+      Use pam_systemd module to register user sessions in the systemd
+      control group hierarchy.
+    </flag>
     <flag name="gnome-keyring">
       Enable pam_gnome_keyring module on system login stack. This
       enables proper Gnome Keyring access to logins, whether they are
diff --git a/sys-auth/pambase/pambase-20120417-r1.ebuild b/sys-auth/pambase/pambase-20120417-r1.ebuild
new file mode 100644
index 000000000000..d195f121e813
--- /dev/null
+++ b/sys-auth/pambase/pambase-20120417-r1.ebuild
@@ -0,0 +1,105 @@
+# 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-20120417-r1.ebuild,v 1.1 2012/06/19 07:55:53 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
+	http://dev.gentoo.org/~phajdan.jr/${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="consolekit cracklib debug gnome-keyring minimal mktemp pam_krb5 pam_ssh passwdqc selinux +sha512 systemd"
+
+RESTRICT=binchecks
+
+MIN_PAM_REQ=1.1.3
+
+RDEPEND="
+	|| (
+		>=sys-libs/pam-${MIN_PAM_REQ}
+		( sys-auth/openpam || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) )
+		)
+	consolekit? ( >=sys-auth/consolekit-0.4.5_p2012[pam] )
+	cracklib? ( >=sys-libs/pam-${MIN_PAM_REQ}[cracklib] )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.32[pam] )
+	mktemp? ( sys-auth/pam_mktemp )
+	pam_krb5? (
+		>=sys-libs/pam-${MIN_PAM_REQ}
+		>=sys-auth/pam_krb5-4.3
+		)
+	pam_ssh? ( sys-auth/pam_ssh )
+	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
+	selinux? ( >=sys-libs/pam-${MIN_PAM_REQ}[selinux] )
+	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
+	systemd? ( >=sys-apps/systemd-44-r1[pam] )
+	!<sys-apps/shadow-4.1.5-r1
+	!<sys-freebsd/freebsd-pam-modules-6.2-r1
+	!<sys-libs/pam-0.99.9.0-r1"
+DEPEND="app-portage/portage-utils"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-systemd.patch
+}
+
+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=$(usex $usename)
+		echo "${varname}=${varvalue}"
+	}
+
+	emake \
+		GIT=true \
+		$(use_var debug) \
+		$(use_var cracklib) \
+		$(use_var passwdqc) \
+		$(use_var consolekit) \
+		$(use_var systemd) \
+		$(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_test() { :; }
+
+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
+}