From owner-svn-src-stable@FreeBSD.ORG Fri Mar 1 19:42:53 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 086B8C84; Fri, 1 Mar 2013 19:42:53 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CBE9E11ED; Fri, 1 Mar 2013 19:42:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r21JgqVT065737; Fri, 1 Mar 2013 19:42:52 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r21JgpOO065726; Fri, 1 Mar 2013 19:42:51 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201303011942.r21JgpOO065726@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Fri, 1 Mar 2013 19:42:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r247568 - in stable/9: contrib/openpam contrib/openpam/bin contrib/openpam/bin/openpam_dump_policy contrib/openpam/bin/pamtest contrib/openpam/bin/su contrib/openpam/doc contrib/openpam... X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Mar 2013 19:42:53 -0000 Author: des Date: Fri Mar 1 19:42:50 2013 New Revision: 247568 URL: http://svnweb.freebsd.org/changeset/base/247568 Log: Pull in OpenPAM Micrampelis from head. Also merge a few minor module changes, most importantly support for ECDSA keys in pam_ssh. Added: stable/9/contrib/openpam/TODO - copied unchanged from r236109, head/contrib/openpam/TODO stable/9/contrib/openpam/bin/openpam_dump_policy/ - copied from r236109, head/contrib/openpam/bin/openpam_dump_policy/ stable/9/contrib/openpam/bin/pamtest/ - copied from r228692, head/contrib/openpam/bin/pamtest/ stable/9/contrib/openpam/bin/su/su.1 - copied, changed from r228692, head/contrib/openpam/bin/su/su.1 stable/9/contrib/openpam/doc/man/openpam_get_feature.3 - copied unchanged from r236109, head/contrib/openpam/doc/man/openpam_get_feature.3 stable/9/contrib/openpam/doc/man/openpam_readlinev.3 - copied unchanged from r236109, head/contrib/openpam/doc/man/openpam_readlinev.3 stable/9/contrib/openpam/doc/man/openpam_readword.3 - copied unchanged from r236109, head/contrib/openpam/doc/man/openpam_readword.3 stable/9/contrib/openpam/doc/man/openpam_set_feature.3 - copied unchanged from r236109, head/contrib/openpam/doc/man/openpam_set_feature.3 stable/9/contrib/openpam/doc/man/openpam_straddch.3 - copied unchanged from r236109, head/contrib/openpam/doc/man/openpam_straddch.3 stable/9/contrib/openpam/doc/man/openpam_subst.3 - copied, changed from r228692, head/contrib/openpam/doc/man/openpam_subst.3 stable/9/contrib/openpam/lib/openpam_check_owner_perms.c - copied, changed from r228692, head/contrib/openpam/lib/openpam_check_owner_perms.c stable/9/contrib/openpam/lib/openpam_constants.c - copied unchanged from r228692, head/contrib/openpam/lib/openpam_constants.c stable/9/contrib/openpam/lib/openpam_constants.h - copied, changed from r228692, head/contrib/openpam/lib/openpam_constants.h stable/9/contrib/openpam/lib/openpam_ctype.h - copied unchanged from r236109, head/contrib/openpam/lib/openpam_ctype.h stable/9/contrib/openpam/lib/openpam_debug.h - copied, changed from r228692, head/contrib/openpam/lib/openpam_debug.h stable/9/contrib/openpam/lib/openpam_features.c - copied unchanged from r236109, head/contrib/openpam/lib/openpam_features.c stable/9/contrib/openpam/lib/openpam_features.h - copied unchanged from r236109, head/contrib/openpam/lib/openpam_features.h stable/9/contrib/openpam/lib/openpam_get_feature.c - copied unchanged from r236109, head/contrib/openpam/lib/openpam_get_feature.c stable/9/contrib/openpam/lib/openpam_readlinev.c - copied unchanged from r236109, head/contrib/openpam/lib/openpam_readlinev.c stable/9/contrib/openpam/lib/openpam_readword.c - copied unchanged from r236109, head/contrib/openpam/lib/openpam_readword.c stable/9/contrib/openpam/lib/openpam_set_feature.c - copied unchanged from r236109, head/contrib/openpam/lib/openpam_set_feature.c stable/9/contrib/openpam/lib/openpam_straddch.c - copied unchanged from r236109, head/contrib/openpam/lib/openpam_straddch.c stable/9/contrib/openpam/lib/openpam_strlcat.h - copied unchanged from r236109, head/contrib/openpam/lib/openpam_strlcat.h stable/9/contrib/openpam/lib/openpam_strlcmp.h - copied, changed from r228692, head/contrib/openpam/lib/openpam_strlcmp.h stable/9/contrib/openpam/lib/openpam_strlcpy.h - copied, changed from r228692, head/contrib/openpam/lib/openpam_strlcpy.h stable/9/contrib/openpam/lib/openpam_subst.c - copied, changed from r228692, head/contrib/openpam/lib/openpam_subst.c stable/9/contrib/openpam/pamgdb.in - copied unchanged from r236109, head/contrib/openpam/pamgdb.in stable/9/contrib/openpam/t/ - copied from r236109, head/contrib/openpam/t/ Modified: stable/9/contrib/openpam/CREDITS stable/9/contrib/openpam/HISTORY stable/9/contrib/openpam/LICENSE stable/9/contrib/openpam/Makefile.am stable/9/contrib/openpam/Makefile.in stable/9/contrib/openpam/README stable/9/contrib/openpam/RELNOTES stable/9/contrib/openpam/aclocal.m4 stable/9/contrib/openpam/bin/Makefile.am stable/9/contrib/openpam/bin/Makefile.in stable/9/contrib/openpam/bin/pamtest/pamtest.1 stable/9/contrib/openpam/bin/pamtest/pamtest.c stable/9/contrib/openpam/bin/su/Makefile.am stable/9/contrib/openpam/bin/su/Makefile.in stable/9/contrib/openpam/bin/su/su.c stable/9/contrib/openpam/config.h.in stable/9/contrib/openpam/configure stable/9/contrib/openpam/configure.ac stable/9/contrib/openpam/depcomp stable/9/contrib/openpam/doc/Makefile.in stable/9/contrib/openpam/doc/man/Makefile.am stable/9/contrib/openpam/doc/man/Makefile.in stable/9/contrib/openpam/doc/man/openpam.3 stable/9/contrib/openpam/doc/man/openpam_borrow_cred.3 stable/9/contrib/openpam/doc/man/openpam_free_data.3 stable/9/contrib/openpam/doc/man/openpam_free_envlist.3 stable/9/contrib/openpam/doc/man/openpam_get_option.3 stable/9/contrib/openpam/doc/man/openpam_log.3 stable/9/contrib/openpam/doc/man/openpam_nullconv.3 stable/9/contrib/openpam/doc/man/openpam_readline.3 stable/9/contrib/openpam/doc/man/openpam_restore_cred.3 stable/9/contrib/openpam/doc/man/openpam_set_option.3 stable/9/contrib/openpam/doc/man/openpam_ttyconv.3 stable/9/contrib/openpam/doc/man/pam.3 stable/9/contrib/openpam/doc/man/pam.conf.5 stable/9/contrib/openpam/doc/man/pam_acct_mgmt.3 stable/9/contrib/openpam/doc/man/pam_authenticate.3 stable/9/contrib/openpam/doc/man/pam_chauthtok.3 stable/9/contrib/openpam/doc/man/pam_close_session.3 stable/9/contrib/openpam/doc/man/pam_conv.3 stable/9/contrib/openpam/doc/man/pam_end.3 stable/9/contrib/openpam/doc/man/pam_error.3 stable/9/contrib/openpam/doc/man/pam_get_authtok.3 stable/9/contrib/openpam/doc/man/pam_get_data.3 stable/9/contrib/openpam/doc/man/pam_get_item.3 stable/9/contrib/openpam/doc/man/pam_get_user.3 stable/9/contrib/openpam/doc/man/pam_getenv.3 stable/9/contrib/openpam/doc/man/pam_getenvlist.3 stable/9/contrib/openpam/doc/man/pam_info.3 stable/9/contrib/openpam/doc/man/pam_open_session.3 stable/9/contrib/openpam/doc/man/pam_prompt.3 stable/9/contrib/openpam/doc/man/pam_putenv.3 stable/9/contrib/openpam/doc/man/pam_set_data.3 stable/9/contrib/openpam/doc/man/pam_set_item.3 stable/9/contrib/openpam/doc/man/pam_setcred.3 stable/9/contrib/openpam/doc/man/pam_setenv.3 stable/9/contrib/openpam/doc/man/pam_sm_acct_mgmt.3 stable/9/contrib/openpam/doc/man/pam_sm_authenticate.3 stable/9/contrib/openpam/doc/man/pam_sm_chauthtok.3 stable/9/contrib/openpam/doc/man/pam_sm_close_session.3 stable/9/contrib/openpam/doc/man/pam_sm_open_session.3 stable/9/contrib/openpam/doc/man/pam_sm_setcred.3 stable/9/contrib/openpam/doc/man/pam_start.3 stable/9/contrib/openpam/doc/man/pam_strerror.3 stable/9/contrib/openpam/doc/man/pam_verror.3 stable/9/contrib/openpam/doc/man/pam_vinfo.3 stable/9/contrib/openpam/doc/man/pam_vprompt.3 stable/9/contrib/openpam/include/Makefile.in stable/9/contrib/openpam/include/security/Makefile.in stable/9/contrib/openpam/include/security/openpam.h stable/9/contrib/openpam/include/security/openpam_version.h stable/9/contrib/openpam/include/security/pam_appl.h stable/9/contrib/openpam/include/security/pam_constants.h stable/9/contrib/openpam/include/security/pam_modules.h stable/9/contrib/openpam/include/security/pam_types.h stable/9/contrib/openpam/install-sh stable/9/contrib/openpam/lib/Makefile.am stable/9/contrib/openpam/lib/Makefile.in stable/9/contrib/openpam/lib/openpam_borrow_cred.c stable/9/contrib/openpam/lib/openpam_configure.c stable/9/contrib/openpam/lib/openpam_dispatch.c stable/9/contrib/openpam/lib/openpam_dynamic.c stable/9/contrib/openpam/lib/openpam_findenv.c stable/9/contrib/openpam/lib/openpam_free_data.c stable/9/contrib/openpam/lib/openpam_free_envlist.c stable/9/contrib/openpam/lib/openpam_get_option.c stable/9/contrib/openpam/lib/openpam_impl.h stable/9/contrib/openpam/lib/openpam_load.c stable/9/contrib/openpam/lib/openpam_log.c stable/9/contrib/openpam/lib/openpam_nullconv.c stable/9/contrib/openpam/lib/openpam_readline.c stable/9/contrib/openpam/lib/openpam_restore_cred.c stable/9/contrib/openpam/lib/openpam_set_option.c stable/9/contrib/openpam/lib/openpam_static.c stable/9/contrib/openpam/lib/openpam_ttyconv.c stable/9/contrib/openpam/lib/pam_acct_mgmt.c stable/9/contrib/openpam/lib/pam_authenticate.c stable/9/contrib/openpam/lib/pam_authenticate_secondary.c stable/9/contrib/openpam/lib/pam_chauthtok.c stable/9/contrib/openpam/lib/pam_close_session.c stable/9/contrib/openpam/lib/pam_end.c stable/9/contrib/openpam/lib/pam_error.c stable/9/contrib/openpam/lib/pam_get_authtok.c stable/9/contrib/openpam/lib/pam_get_data.c stable/9/contrib/openpam/lib/pam_get_item.c stable/9/contrib/openpam/lib/pam_get_mapped_authtok.c stable/9/contrib/openpam/lib/pam_get_mapped_username.c stable/9/contrib/openpam/lib/pam_get_user.c stable/9/contrib/openpam/lib/pam_getenv.c stable/9/contrib/openpam/lib/pam_getenvlist.c stable/9/contrib/openpam/lib/pam_info.c stable/9/contrib/openpam/lib/pam_open_session.c stable/9/contrib/openpam/lib/pam_prompt.c stable/9/contrib/openpam/lib/pam_putenv.c stable/9/contrib/openpam/lib/pam_set_data.c stable/9/contrib/openpam/lib/pam_set_item.c stable/9/contrib/openpam/lib/pam_set_mapped_authtok.c stable/9/contrib/openpam/lib/pam_set_mapped_username.c stable/9/contrib/openpam/lib/pam_setcred.c stable/9/contrib/openpam/lib/pam_setenv.c stable/9/contrib/openpam/lib/pam_sm_acct_mgmt.c stable/9/contrib/openpam/lib/pam_sm_authenticate.c stable/9/contrib/openpam/lib/pam_sm_authenticate_secondary.c stable/9/contrib/openpam/lib/pam_sm_chauthtok.c stable/9/contrib/openpam/lib/pam_sm_close_session.c stable/9/contrib/openpam/lib/pam_sm_get_mapped_authtok.c stable/9/contrib/openpam/lib/pam_sm_get_mapped_username.c stable/9/contrib/openpam/lib/pam_sm_open_session.c stable/9/contrib/openpam/lib/pam_sm_set_mapped_authtok.c stable/9/contrib/openpam/lib/pam_sm_set_mapped_username.c stable/9/contrib/openpam/lib/pam_sm_setcred.c stable/9/contrib/openpam/lib/pam_start.c stable/9/contrib/openpam/lib/pam_strerror.c stable/9/contrib/openpam/lib/pam_verror.c stable/9/contrib/openpam/lib/pam_vinfo.c stable/9/contrib/openpam/lib/pam_vprompt.c stable/9/contrib/openpam/ltmain.sh stable/9/contrib/openpam/misc/gendoc.pl stable/9/contrib/openpam/missing stable/9/contrib/openpam/modules/Makefile.in stable/9/contrib/openpam/modules/pam_deny/Makefile.in stable/9/contrib/openpam/modules/pam_deny/pam_deny.c stable/9/contrib/openpam/modules/pam_permit/Makefile.in stable/9/contrib/openpam/modules/pam_permit/pam_permit.c stable/9/contrib/openpam/modules/pam_unix/Makefile.am stable/9/contrib/openpam/modules/pam_unix/Makefile.in stable/9/contrib/openpam/modules/pam_unix/pam_unix.c stable/9/lib/libpam/libpam/Makefile stable/9/lib/libpam/modules/pam_radius/pam_radius.c stable/9/lib/libpam/modules/pam_ssh/pam_ssh.8 stable/9/lib/libpam/modules/pam_ssh/pam_ssh.c stable/9/lib/libpam/modules/pam_unix/Makefile stable/9/lib/libpam/modules/pam_unix/pam_unix.8 stable/9/lib/libpam/modules/pam_unix/pam_unix.c Directory Properties: stable/9/contrib/openpam/ (props changed) stable/9/lib/libpam/ (props changed) Modified: stable/9/contrib/openpam/CREDITS ============================================================================== --- stable/9/contrib/openpam/CREDITS Fri Mar 1 19:40:02 2013 (r247567) +++ stable/9/contrib/openpam/CREDITS Fri Mar 1 19:42:50 2013 (r247568) @@ -6,32 +6,41 @@ Network Associates, Inc. under DARPA/SP Principal design and development by: - Dag-Erling Smørgrav + Dag-Erling Smørgrav -The following persons (in no particular order) have contributed, directly -or indirectly, with patches, criticism, suggestions, or ideas: +The following persons (in alphabetical order) have contributed, +directly or indirectly, with patches, criticism, suggestions, or +ideas: Andrew Morgan Brian Fundakowski Feldman Christos Zoulas Daniel Richard G. - Darren J. Moffat + Darren J. Moffat Dmitry V. Levin + Don Lewis Emmanuel Dreyfus Eric Melville - Gary Winiger + Gary Winiger + Gleb Smirnoff + Hubert Feyrer + Jason Evans Joe Marcus Clarke Juli Mallett - Hubert Feyrer + Jörg Sonnenberger + Maëlle Lesage Mark Murray + Matthias Drochner Mike Petullo Mikhail Teterin - Mikko Työläjärvi + Mikko Työläjärvi + Nick Hibma Robert Watson Ruslan Ermilov + Sebastian Krahmer Solar Designer Takanori Saneto Wojciech A. Koszek Yar Tikhiy -$Id: CREDITS 400 2007-10-24 15:04:23Z des $ +$Id: CREDITS 587 2012-04-08 11:12:10Z des $ Modified: stable/9/contrib/openpam/HISTORY ============================================================================== --- stable/9/contrib/openpam/HISTORY Fri Mar 1 19:40:02 2013 (r247567) +++ stable/9/contrib/openpam/HISTORY Fri Mar 1 19:42:50 2013 (r247568) @@ -1,3 +1,77 @@ +OpenPAM Micrampelis 2012-05-26 + + - FEATURE: Add an openpam_readword(3) function which reads the next + word from an input stream, applying shell quoting and escaping + rules. Add numerous unit tests for openpam_readword(3). + + - FEATURE: Add an openpam_readlinev(3) function which uses the + openpam_readword(3) function to read words from an input stream one + at a time until it reaches an unquoted, unescaped newline, and + returns an array of those words. Add several unit tests for + openpam_readlinev(3). + + - FEATURE: Add a PAM_HOST item which pam_start(3) initializes to the + machine's hostname. This was implemented in Lycopsida but + inadvertantly left out of the release notes. + + - FEATURE: In pam_get_authtok(3), if neither the application nor the + module have specified a prompt and PAM_HOST and PAM_RHOST are both + defined but not equal, use a different default prompt that includes + PAM_USER and PAM_HOST. + + - ENHANCE: Rewrite the policy parser to used openpam_readlinev(), + which greatly simplifies the code. + + - ENHANCE: The previous implementation of the policy parser relied on + the openpam_readline(3) function, which (by design) munges + whitespace and understands neither quotes nor backslash escapes. + As a result of the aforementioned rewrite, whitespace, quotes and + backslash escapes in policy files are now handled in a consistent + and predictable manner. + + - ENHANCE: On platforms that have it, use fdlopen(3) to load modules. + This closes the race between the ownership / permission check and + the dlopen(3) call. + + - ENHANCE: Reduce the amount of pointless error messages generated + while searching for a module. + + - ENHANCE: Numerous documentation improvements, both in content and + formatting. + + - BUGFIX: A patch incorporated in Lycopsida inadvertantly changed + OpenPAM's behavior when several policies exist for the same + service, from ignoring all but the first to concatenating them all. + Revert to the original behavior. + + - BUGFIX: Plug a memory leak in the policy parser. +============================================================================ +OpenPAM Lycopsida 2011-12-18 + + - ENHANCE: removed static build autodetection, which didn't work + anyway. Use an explicit, user-specified preprocessor variable + instead. + + - ENHANCE: cleaned up the documentation a bit. + + - ENHANCE: added openpam_subst(3), allowing certain PAM items to be + embedded in strings such as prompts. Apply it to the prompts used + by pam_get_user(3) and pam_get_authtok(3). + + - ENHANCE: added support for the user_prompt, authtok_prompt and + oldauthtok_prompt module options, which override the prompts passed + by the module to pam_set_user(3) and pam_get_authtok(3). + + - ENHANCE: rewrote the policy parser to support quoted option values. + + - ENHANCE: added pamtest(1), a tool for testing modules and policies. + + - ENHANCE: added code to check the ownership and permissions of a + module before loading it. + + - ENHANCE: added / improved input validation in many cases, including + the policy file and some function arguments. +============================================================================ OpenPAM Hydrangea 2007-12-21 - ENHANCE: when compiling with GCC, mark up API functions with GCC @@ -21,7 +95,7 @@ OpenPAM Hydrangea 2007-12-21 contexts), since the module cache was the only part of OpenPAM that was not thread-safe. ============================================================================ -OpenPAM Figwort 2005-06-16 +OpenPAM Figwort 2005-06-16 - BUGFIX: Correct several small signedness and initialization bugs discovered during review by the NetBSD team. @@ -243,7 +317,7 @@ OpenPAM Cinchona 2002-04-08 - ENHANCE: Add openpam_free_data(), a generic cleanup function for pam_set_data() consumers. ============================================================================ -OpenPAM Centaury 2002-03-14 +OpenPAM Centaury 2002-03-14 - BUGFIX: Add missing #include to openpam_log.c. @@ -282,7 +356,7 @@ OpenPAM Celandine 2002-03-05 module with the same version number as the library itself to one with no version number at all. ============================================================================ -OpenPAM Cantaloupe 2002-02-22 +OpenPAM Cantaloupe 2002-02-22 - BUGFIX: The proper use of PAM_SYMBOL_ERR is to indicate an invalid argument to pam_[gs]et_item(3), not to indicate dlsym(3) failures. @@ -312,7 +386,7 @@ OpenPAM Cantaloupe 2002-02-22 - ENHANCE: openpam_get_authtok() now respects the echo_pass, try_first_pass, and use_first_pass options. ============================================================================ -OpenPAM Caliopsis 2002-02-13 +OpenPAM Caliopsis 2002-02-13 Fixed a number of bugs in the previous release, including: - a number of bugs in and related to pam_[gs]et_item(3) @@ -323,8 +397,8 @@ Fixed a number of bugs in the previous r - missing 'continue' in openpam_dispatch.c caused successes to be counted as failures ============================================================================ -OpenPAM Calamite 2002-02-09 +OpenPAM Calamite 2002-02-09 First (beta) release. ============================================================================ -$Id: HISTORY 409 2007-12-21 11:38:50Z des $ +$Id: HISTORY 609 2012-05-26 13:57:45Z des $ Modified: stable/9/contrib/openpam/LICENSE ============================================================================== --- stable/9/contrib/openpam/LICENSE Fri Mar 1 19:40:02 2013 (r247567) +++ stable/9/contrib/openpam/LICENSE Fri Mar 1 19:42:50 2013 (r247568) @@ -1,6 +1,6 @@ Copyright (c) 2002-2003 Networks Associates Technology, Inc. -Copyright (c) 2004-2007 Dag-Erling Smørgrav +Copyright (c) 2004-2012 Dag-Erling Smørgrav All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,4 +32,4 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$Id: LICENSE 408 2007-12-21 11:36:24Z des $ +$Id: LICENSE 546 2012-03-31 23:13:20Z des $ Modified: stable/9/contrib/openpam/Makefile.am ============================================================================== --- stable/9/contrib/openpam/Makefile.am Fri Mar 1 19:40:02 2013 (r247567) +++ stable/9/contrib/openpam/Makefile.am Fri Mar 1 19:42:50 2013 (r247568) @@ -1,4 +1,6 @@ -# $Id: Makefile.am 395 2007-06-03 20:26:18Z des $ +# $Id: Makefile.am 549 2012-04-01 20:38:30Z des $ + +ACLOCAL_AMFLAGS = -I m4 SUBDIRS = lib bin modules include @@ -6,6 +8,8 @@ if WITH_DOC SUBDIRS += doc endif +SUBDIRS += t + EXTRA_DIST = \ CREDITS \ HISTORY \ Modified: stable/9/contrib/openpam/Makefile.in ============================================================================== --- stable/9/contrib/openpam/Makefile.in Fri Mar 1 19:40:02 2013 (r247567) +++ stable/9/contrib/openpam/Makefile.in Fri Mar 1 19:42:50 2013 (r247568) @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,16 +15,13 @@ @SET_MAKE@ -# $Id: Makefile.am 395 2007-06-03 20:26:18Z des $ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ +# $Id: Makefile.am 549 2012-04-01 20:38:30Z des $ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -37,47 +35,76 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ @WITH_DOC_TRUE@am__append_1 = doc +subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure INSTALL compile config.guess \ - config.sub depcomp install-sh ltmain.sh missing -subdir = . + $(srcdir)/pamgdb.in $(top_srcdir)/configure INSTALL TODO \ + config.guess config.sub depcomp install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = pamgdb +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = lib bin modules include doc +DIST_SUBDIRS = lib bin modules include doc t DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } + { test ! -d "$(distdir)" \ + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr "$(distdir)"; }; } +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -90,42 +117,50 @@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CRYPT_LIBS = @CRYPT_LIBS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DL_LIBS = @DL_LIBS@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_MAJ = @LIB_MAJ@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ @@ -134,19 +169,13 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -WITH_DOC_FALSE = @WITH_DOC_FALSE@ -WITH_DOC_TRUE = @WITH_DOC_TRUE@ -WITH_PAM_UNIX_FALSE = @WITH_PAM_UNIX_FALSE@ -WITH_PAM_UNIX_TRUE = @WITH_PAM_UNIX_TRUE@ -WITH_SU_FALSE = @WITH_SU_FALSE@ -WITH_SU_TRUE = @WITH_SU_TRUE@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -158,6 +187,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -185,13 +215,14 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -SUBDIRS = lib bin modules include $(am__append_1) +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +ACLOCAL_AMFLAGS = -I m4 +SUBDIRS = lib bin modules include $(am__append_1) t EXTRA_DIST = \ CREDITS \ HISTORY \ @@ -212,15 +243,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -236,26 +267,29 @@ $(top_builddir)/config.status: $(top_src $(SHELL) ./config.status --recheck $(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config.h.in: $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ distclean-hdr: -rm -f config.h stamp-h1 +pamgdb: $(top_builddir)/config.status $(srcdir)/pamgdb.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -264,8 +298,7 @@ clean-libtool: -rm -rf .libs _libs distclean-libtool: - -rm -f libtool -uninstall-info-am: + -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -274,7 +307,7 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -291,16 +324,15 @@ $(RECURSIVE_TARGETS): else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ +$(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -326,16 +358,16 @@ maintainer-clean-recursive: else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -343,14 +375,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -362,93 +394,114 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/misc - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) @@ -457,6 +510,14 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -480,13 +541,17 @@ dist dist-all: distdir distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -494,9 +559,11 @@ distcheck: dist mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ @@ -518,13 +585,15 @@ distcheck: dist && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @cd $(distuninstallcheck_dir) \ + @$(am__cd) '$(distuninstallcheck_dir)' \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ @@ -566,6 +635,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -586,18 +656,38 @@ dvi-am: html: html-recursive +html-am: + info: info-recursive info-am: install-data-am: +install-dvi: install-dvi-recursive + +install-dvi-am: + install-exec-am: +install-html: install-html-recursive + +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -618,24 +708,27 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ + ctags-recursive install-am install-strip tags-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Modified: stable/9/contrib/openpam/README ============================================================================== --- stable/9/contrib/openpam/README Fri Mar 1 19:40:02 2013 (r247567) +++ stable/9/contrib/openpam/README Fri Mar 1 19:42:50 2013 (r247568) @@ -22,6 +22,6 @@ These are some of OpenPAM's features: /usr/local/etc/pam.d/ and /usr/local/etc/pam.conf, in that order; this will be made configurable in a future release. -Please direct bug reports and inquiries to des@freebsd.org. +Please direct bug reports and inquiries to . -$Id: README 320 2006-02-16 20:33:19Z des $ +$Id: README 424 2009-10-29 17:10:22Z des $ Modified: stable/9/contrib/openpam/RELNOTES ============================================================================== --- stable/9/contrib/openpam/RELNOTES Fri Mar 1 19:40:02 2013 (r247567) +++ stable/9/contrib/openpam/RELNOTES Fri Mar 1 19:42:50 2013 (r247568) @@ -1,13 +1,11 @@ - Release notes for OpenPAM Hydrangea - =================================== + Release notes for OpenPAM Micrampelis + ===================================== -This release corresponds to the code used in FreeBSD-CURRENT as of the -release date. It has also been tested on several other platforms, and -is expected to work on almost any POSIX-like platform that has GNU -autotools, GNU make and the GNU compiler suite installed. One notable -exception is MacOS X, which ships with a very weird, heavily modified -version of GCC. +This release corresponds to the code used in FreeBSD HEAD as of the +release date, and is also expected to work on almost any POSIX-like +platform that has GNU autotools, GNU make and the GNU compiler suite +installed. The library itself is complete. Documentation exists in the form of man pages for the library functions. These man pages are generated by @@ -18,12 +16,12 @@ of date. The distribution also includes three sample modules (pam_deny, pam_permit and pam_unix) and a sample application (su). These are not intended for actual use, but rather to serve as examples for module or -application developers. +application developers. It also includes a command-line application +(pamtest) which can be used to test policies and modules. -NOTE: to the person who sent me MacOS patches in July 2002: I have -lost your name and email address. Please contact me so I can give you -proper credit for your contribution. +Unit tests for limited portions of the library can be found in the t +subdirectory. -Please direct bug reports and inquiries to . +Please direct bug reports and inquiries to . -$Id: RELNOTES 404 2007-11-28 12:31:04Z des $ +$Id: RELNOTES 609 2012-05-26 13:57:45Z des $ Copied: stable/9/contrib/openpam/TODO (from r236109, head/contrib/openpam/TODO) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/contrib/openpam/TODO Fri Mar 1 19:42:50 2013 (r247568, copy of r236109, head/contrib/openpam/TODO) @@ -0,0 +1,13 @@ +Before the next release: + + - Complete the transition from PAM_LOG_DEBUG to PAM_LOG_LIBDEBUG. + +Whenever: + + - Implement mechanism to enable / disable optional features. Use it + to disable strict error checking so pamtest and unit tests can do + things that we don't allow in production. + + - Rewrite the module-loading code. + +$Id: TODO 592 2012-04-08 13:19:51Z des $ Modified: stable/9/contrib/openpam/aclocal.m4 ============================================================================== --- stable/9/contrib/openpam/aclocal.m4 Fri Mar 1 19:40:02 2013 (r247567) +++ stable/9/contrib/openpam/aclocal.m4 Fri Mar 1 19:42:50 2013 (r247568) @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,103 +11,208 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is free software; the Free Software Foundation gives *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***