From 314f5106ccffb0ab69e316e96be62c0166711758 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 11 Jul 2009 19:21:34 -0400 Subject: [PATCH] pam: Updated (1.0.4 -> 1.1.0) --- base/pam/Linux-PAM-1.1.0-lastlog-fix.patch | 29 +++++++++++++++ base/pam/fix-empty-libcrypt.patch | 28 ++++++++++++++ base/pam/hack-survive_autoconf.patch.cross | 43 ---------------------- base/pam/pam.desc | 6 +-- 4 files changed, 60 insertions(+), 46 deletions(-) create mode 100644 base/pam/Linux-PAM-1.1.0-lastlog-fix.patch create mode 100644 base/pam/fix-empty-libcrypt.patch delete mode 100644 base/pam/hack-survive_autoconf.patch.cross diff --git a/base/pam/Linux-PAM-1.1.0-lastlog-fix.patch b/base/pam/Linux-PAM-1.1.0-lastlog-fix.patch new file mode 100644 index 000000000..b81973d8e --- /dev/null +++ b/base/pam/Linux-PAM-1.1.0-lastlog-fix.patch @@ -0,0 +1,29 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../pam/Linux-PAM-1.1.0-lastlog-fix.patch +# Copyright (C) 2009 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +http://bugs.gentoo.org/attachment.cgi?id=195319 + +--- 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/base/pam/fix-empty-libcrypt.patch b/base/pam/fix-empty-libcrypt.patch new file mode 100644 index 000000000..3c6047f92 --- /dev/null +++ b/base/pam/fix-empty-libcrypt.patch @@ -0,0 +1,28 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../pam/fix-empty-libcrypt.patch +# Copyright (C) 2009 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./configure.in.orig 2009-07-11 19:02:52.000000000 -0400 ++++ ./configure.in 2009-07-11 19:03:53.000000000 -0400 +@@ -363,6 +363,9 @@ + AC_CHECK_HEADERS(xcrypt.h crypt.h) + BACKUP_LIBS=$LIBS + AC_SEARCH_LIBS([crypt],[xcrypt crypt], LIBCRYPT="-l$ac_lib", LIBCRYPT="") ++if test "x$LIBCRYPT" = "x-l"; then ++ LIBCRYPT=-lcrypt ++fi + AC_CHECK_FUNCS(crypt_r crypt_gensalt_rn) + LIBS=$BACKUP_LIBS + AC_SUBST(LIBCRYPT) diff --git a/base/pam/hack-survive_autoconf.patch.cross b/base/pam/hack-survive_autoconf.patch.cross deleted file mode 100644 index 7a82b5cad..000000000 --- a/base/pam/hack-survive_autoconf.patch.cross +++ /dev/null @@ -1,43 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../pam/hack-survive_autoconf.patch.cross -# Copyright (C) 2009 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -when make is called it calls auto* automatically because our version is -newer than the one used by them. -sadly the definition of LIBCRYPT relies on ac_lib which is not present -when ac_cv_search_crypt is cached - ---- ./configure.in.orig 2009-04-10 22:53:41.000000000 +0300 -+++ ./configure.in 2009-04-10 22:55:02.000000000 +0300 -@@ -358,7 +358,7 @@ - [test "x$HAVE_AUDIT_TTY_STATUS" = xyes]) - - BACKUP_LIBS=$LIBS --AC_SEARCH_LIBS([crypt],[xcrypt crypt], LIBCRYPT="-l$ac_lib", LIBCRYPT="") -+AC_SEARCH_LIBS([crypt],[xcrypt crypt], [test "$ac_res" = "none required" || LIBCRYPT="$ac_res"], LIBCRYPT="") - AC_CHECK_FUNCS(crypt_r) - LIBS=$BACKUP_LIBS - AC_SUBST(LIBCRYPT) ---- ./configure.orig 2009-03-02 17:12:08.000000000 +0200 -+++ ./configure 2009-04-10 22:55:25.000000000 +0300 -@@ -14863,7 +14863,7 @@ - ac_res=$ac_cv_search_crypt - if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -- LIBCRYPT="-l$ac_lib" -+ test "$ac_res" = "none required" || LIBCRYPT="$ac_res" - else - LIBCRYPT="" - fi diff --git a/base/pam/pam.desc b/base/pam/pam.desc index 240538916..8d5b469d5 100644 --- a/base/pam/pam.desc +++ b/base/pam/pam.desc @@ -33,8 +33,8 @@ [L] GPL [S] Stable -[V] 1.0.4 +[V] 1.1.0 [P] X -1-3-5---9 178.700 -[D] 2263058124 Linux-PAM-1.0.4.tar.bz2 http://www.kernel.org/pub/linux/libs/pam/library/ -[D] 2229718865 Linux-PAM-1.0.4-docs.tar.bz2 http://www.kernel.org/pub/linux/libs/pam//documentation/ +[D] 2442111205 Linux-PAM-1.1.0.tar.bz2 http://www.kernel.org/pub/linux/libs/pam/library/ +[D] 1987007875 Linux-PAM-1.1.0-docs.tar.bz2 http://www.kernel.org/pub/linux/libs/pam//documentation/