summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-06-21 09:31:20 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-06-21 09:31:20 +0000
commit6dde6faade82964ee9780f71fcc36e7516761abb (patch)
treea733b0804075c39ff8546e0cb8e4eadd4e3d1224 /sys-libs
parentVersion bump (diff)
downloadgentoo-2-6dde6faade82964ee9780f71fcc36e7516761abb.tar.gz
gentoo-2-6dde6faade82964ee9780f71fcc36e7516761abb.tar.bz2
gentoo-2-6dde6faade82964ee9780f71fcc36e7516761abb.zip
Add a patch to fix building with nls USE flag disabled, see bug #274856.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/pam/ChangeLog6
-rw-r--r--sys-libs/pam/files/Linux-PAM-1.1.0-nonls.patch11
-rw-r--r--sys-libs/pam/pam-1.1.0.ebuild5
3 files changed, 20 insertions, 2 deletions
diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index dc3912e36fe1..2dbd60c28185 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/pam
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.241 2009/06/20 20:24:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.242 2009/06/21 09:31:20 flameeyes Exp $
+
+ 21 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> pam-1.1.0.ebuild,
+ +files/Linux-PAM-1.1.0-nonls.patch:
+ Add a patch to fix building with nls USE flag disabled, see bug #274856.
20 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> pam-1.0.4.ebuild,
pam-1.1.0.ebuild:
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.0-nonls.patch b/sys-libs/pam/files/Linux-PAM-1.1.0-nonls.patch
new file mode 100644
index 000000000000..d52b6a080f24
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-1.1.0-nonls.patch
@@ -0,0 +1,11 @@
+--- Linux-PAM-1.1.0/modules/pam_lastlog/pam_lastlog.c.orig
++++ Linux-PAM-1.1.0/modules/pam_lastlog/pam_lastlog.c
+@@ -471,7 +471,7 @@ last_login_failed(pam_handle_t *pamh, in
+ failed),
+ failed);
+ #else
+- if (daysleft == 1)
++ if (failed == 1)
+ retval = asprintf(&line,
+ _("There was %d failed login attempt since the last successful login."),
+ failed);
diff --git a/sys-libs/pam/pam-1.1.0.ebuild b/sys-libs/pam/pam-1.1.0.ebuild
index cf9b70aa349e..8ae0091ed4e4 100644
--- a/sys-libs/pam/pam-1.1.0.ebuild
+++ b/sys-libs/pam/pam-1.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.0.ebuild,v 1.2 2009/06/20 20:24:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.0.ebuild,v 1.3 2009/06/21 09:31:20 flameeyes Exp $
inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic
@@ -86,6 +86,9 @@ src_unpack() {
# Fix building with debug USE flag enabled
epatch "${FILESDIR}/${MY_PN}-1.1.0-debug.patch"
+ # Fix building with nls USE flag disabled
+ epatch "${FILESDIR}/${MY_PN}-1.1.0-nonls.patch"
+
# Remove libtool-2 libtool macros, see bug 261167
rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."