pam: update to current stable

Upgraded sys-libs/pam to version 1.1.5 on amd64, arm, x86

BUG=chromium-os:21782
TEST=build_packges+build_image for x86-alex boots & can login on console
TEST=`emerge-amd64-generic pam` works
TEST=`emerge-arm-generic pam` works

Change-Id: Iee0f40ba40599996b6b3e09def3c74c96cbf3f9c
Reviewed-on: https://gerrit.chromium.org/gerrit/28497
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger 2012-07-26 12:58:24 -04:00 committed by Gerrit
parent f1a610deaf
commit 839da12832
5 changed files with 55 additions and 30 deletions

View File

@ -1,15 +0,0 @@
DEFINED_PHASES=compile configure install postinst preinst prepare setup test
DEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 ) >=sys-devel/libtool-2 sys-devel/flex nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Linux-PAM (Pluggable Authentication Modules)
EAPI=3
HOMEPAGE=http://www.kernel.org/pub/linux/libs/pam/
IUSE=cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug berkdb
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
LICENSE=|| ( BSD GPL-2 )
PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
PROVIDE=virtual/pam
RDEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 ) !sys-auth/pam_userdb
SLOT=0
SRC_URI=mirror://kernel/linux/libs/pam/library/Linux-PAM-1.1.3.tar.bz2 mirror://kernel/linux/libs/pam/documentation/Linux-PAM-1.1.3-docs.tar.bz2
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d db-use 8d7baa3efc7c38c7d5c5e7353c5460dc eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e pam 3f746974e1cc47cabe3bd488c08cdc8e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed
_md5_=5306dc34e6f621fa907aefdb7f52323a

View File

@ -0,0 +1,14 @@
DEFINED_PHASES=compile configure install postinst preinst prepare setup test
DEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) ) >=sys-devel/libtool-2 sys-devel/flex nls? ( sys-devel/gettext ) virtual/pkgconfig
DESCRIPTION=Linux-PAM (Pluggable Authentication Modules)
EAPI=4
HOMEPAGE=https://fedorahosted.org/linux-pam/
IUSE=cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug berkdb nis
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
LICENSE=|| ( BSD GPL-2 )
PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
RDEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) ) !sys-auth/openpam !sys-auth/pam_userdb
SLOT=0
SRC_URI=https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-1.1.5.tar.bz2 https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-1.1.5-docs.tar.bz2
_eclasses_=db-use 8d7baa3efc7c38c7d5c5e7353c5460dc eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e pam 3f746974e1cc47cabe3bd488c08cdc8e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed
_md5_=fea68a694a7fab904ed38795a05d0b0c

View File

@ -1,2 +1,2 @@
DIST Linux-PAM-1.1.3-docs.tar.bz2 495577 RMD160 d080055e8b2e2c213293e42d42d64082cd112915 SHA1 88024b6c99f1d5e9da1d12f7c04ca97779125d56 SHA256 4afc3c02f295ed1a3e09876da7eb8738ce48a3c8ea1bc0861e4999730489df12
DIST Linux-PAM-1.1.3.tar.bz2 1132898 RMD160 626d8deabe5fb8fcc333b3b52fe5653e901bf352 SHA1 97d36d2b9af3211b4818ea8e6fcc6893ca1b6722 SHA256 17b268789b935a76e736a1150210dd12f156972973e79347668f828d43632652
DIST Linux-PAM-1.1.5-docs.tar.bz2 498228 RMD160 1cd6e49a8d69a3f35179210b6b060d0767c9b2fa SHA1 5a34185fd7749a8adfb61e617708304fa9cabea4 SHA256 e4b10ffebe2e5cc355bd37c4e17a2288eb90d1396b06961738a7e7ef848c754c
DIST Linux-PAM-1.1.5.tar.bz2 1123524 RMD160 00a313e890892ad85fb69c828cfaef8c2c00cf94 SHA1 662a769f66708c3b9b5a41d62802ed69bf489e09 SHA256 65def4df04254dc4c5156859d36c34ad6d7afbcf3adbf2780530ebc4dbf2a116

View File

@ -0,0 +1,20 @@
--- a/modules/pam_unix/pam_unix_acct.c 2011-06-21 11:04:56.000000000 +0200
+++ b/modules/pam_unix/pam_unix_acct.c 2012-07-05 16:04:35.643727485 +0200
@@ -41,6 +41,7 @@
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
+#include <sys/resource.h>
#include <syslog.h>
#include <pwd.h>
#include <shadow.h>
--- a/modules/pam_unix/pam_unix_passwd.c 2012-07-16 11:49:25.954638105 -0500
+++ b/modules/pam_unix/pam_unix_passwd.c 2012-07-16 11:50:04.408635441 -0500
@@ -46,6 +46,7 @@
#include <unistd.h>
#include <errno.h>
#include <sys/types.h>
+#include <sys/resource.h>
#include <pwd.h>
#include <syslog.h>
#include <shadow.h>

View File

@ -1,44 +1,47 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.3.ebuild,v 1.13 2010/12/30 18:15:23 flameeyes Exp $
# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.5.ebuild,v 1.9 2012/07/05 16:17:52 flameeyes Exp $
EAPI="3"
EAPI="4"
inherit libtool multilib eutils pam toolchain-funcs flag-o-matic db-use autotools
inherit libtool multilib eutils pam toolchain-funcs flag-o-matic db-use
MY_PN="Linux-PAM"
MY_P="${MY_PN}-${PV}"
HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
HOMEPAGE="https://fedorahosted.org/linux-pam/"
DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
SRC_URI="mirror://kernel/linux/libs/pam/library/${MY_P}.tar.bz2
mirror://kernel/linux/libs/pam/documentation/${MY_P}-docs.tar.bz2"
SRC_URI="https://fedorahosted.org/releases/l/i/linux-pam/${MY_P}.tar.bz2
https://fedorahosted.org/releases/l/i/linux-pam/${MY_P}-docs.tar.bz2"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug berkdb"
IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug berkdb nis"
RDEPEND="nls? ( virtual/libintl )
cracklib? ( >=sys-libs/cracklib-2.8.3 )
audit? ( sys-process/audit )
selinux? ( >=sys-libs/libselinux-1.28 )
berkdb? ( sys-libs/db )
elibc_glibc? ( >=sys-libs/glibc-2.7 )"
elibc_glibc? (
>=sys-libs/glibc-2.7
nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )
)"
DEPEND="${RDEPEND}
>=sys-devel/libtool-2
sys-devel/flex
nls? ( sys-devel/gettext )"
nls? ( sys-devel/gettext )
virtual/pkgconfig"
PDEPEND="sys-auth/pambase
vim-syntax? ( app-vim/pam-syntax )"
RDEPEND="${RDEPEND}
!sys-auth/openpam
!sys-auth/pam_userdb"
S="${WORKDIR}/${MY_P}"
PROVIDE="virtual/pam"
check_old_modules() {
local retval="0"
@ -80,6 +83,8 @@ pkg_setup() {
}
src_prepare() {
epatch "${FILESDIR}"/${MY_P}+glibc-2.16.patch
elibtoolize
}
@ -109,6 +114,7 @@ src_configure() {
$(use_enable audit) \
$(use_enable debug) \
$(use_enable berkdb db) \
$(use_enable nis) \
--with-db-uniquename=-$(db_findver sys-libs/db) \
--disable-prelude \
${myconf}
@ -141,7 +147,7 @@ src_install() {
fi
done
dodoc CHANGELOG ChangeLog README AUTHORS Copyright NEWS || die
dodoc CHANGELOG ChangeLog README AUTHORS Copyright NEWS
docinto modules
for dir in modules/pam_*; do