Date: Thu, 20 Mar 2014 10:56:05 +0000 (UTC) From: Dag-Erling Smørgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r263421 - 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/openp... Message-ID: <201403201056.s2KAu5HX075855@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Thu Mar 20 10:56:05 2014 New Revision: 263421 URL: http://svnweb.freebsd.org/changeset/base/263421 Log: MFH (r254407, r254960, r255371): misc cleanup MFH (r255386): make libssh private MFH (r255369, r255376, r255393, r262530): import OpenPAM Nummularia Added: stable/9/contrib/openpam/lib/libpam/ - copied from r255369, head/contrib/openpam/lib/libpam/ - copied unchanged from r255376, head/contrib/openpam/lib/libpam/openpam_asprintf.c - copied unchanged from r255376, head/contrib/openpam/lib/libpam/openpam_asprintf.h - copied unchanged from r255376, head/contrib/openpam/lib/libpam/openpam_cred.h - copied unchanged from r255376, head/contrib/openpam/lib/libpam/openpam_dlfunc.h - copied unchanged from r255376, head/contrib/openpam/lib/libpam/openpam_strlcat.c - copied unchanged from r255376, head/contrib/openpam/lib/libpam/openpam_strlcpy.c - copied unchanged from r255376, head/contrib/openpam/lib/libpam/openpam_vasprintf.c - copied unchanged from r255376, head/contrib/openpam/lib/libpam/openpam_vasprintf.h stable/9/contrib/openpam/m4/ - copied from r255376, head/contrib/openpam/m4/ - copied unchanged from r255376, head/contrib/openpam/mkpkgng.in - copied unchanged from r255376, head/contrib/openpam/t/t_file.c stable/9/contrib/openpam/t/t_openpam_ctype.c - copied unchanged from r262530, head/contrib/openpam/t/t_openpam_ctype.c stable/9/contrib/openpam/test-driver - copied unchanged from r255376, head/contrib/openpam/test-driver Directory Properties: stable/9/contrib/openpam/lib/libpam/openpam_asprintf.c (props changed) stable/9/contrib/openpam/lib/libpam/openpam_asprintf.h (props changed) stable/9/contrib/openpam/lib/libpam/openpam_cred.h (props changed) stable/9/contrib/openpam/lib/libpam/openpam_dlfunc.h (props changed) stable/9/contrib/openpam/lib/libpam/openpam_strlcat.c (props changed) stable/9/contrib/openpam/lib/libpam/openpam_strlcpy.c (props changed) stable/9/contrib/openpam/lib/libpam/openpam_vasprintf.c (props changed) stable/9/contrib/openpam/lib/libpam/openpam_vasprintf.h (props changed) stable/9/contrib/openpam/mkpkgng.in (props changed) stable/9/contrib/openpam/t/t_file.c (props changed) Replaced: stable/9/contrib/openpam/lib/Makefile.am (contents, props changed) - copied, changed from r255376, head/contrib/openpam/lib/Makefile.am - copied unchanged from r255376, head/contrib/openpam/lib/Makefile.in Directory Properties: stable/9/contrib/openpam/lib/Makefile.in (props changed) Deleted: stable/9/contrib/openpam/FREEBSD-vendor stable/9/contrib/openpam/lib/openpam_borrow_cred.c stable/9/contrib/openpam/lib/openpam_check_owner_perms.c stable/9/contrib/openpam/lib/openpam_configure.c stable/9/contrib/openpam/lib/openpam_constants.c stable/9/contrib/openpam/lib/openpam_constants.h stable/9/contrib/openpam/lib/openpam_ctype.h stable/9/contrib/openpam/lib/openpam_debug.h stable/9/contrib/openpam/lib/openpam_dispatch.c stable/9/contrib/openpam/lib/openpam_dynamic.c stable/9/contrib/openpam/lib/openpam_features.c stable/9/contrib/openpam/lib/openpam_features.h 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_feature.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_readlinev.c stable/9/contrib/openpam/lib/openpam_readword.c stable/9/contrib/openpam/lib/openpam_restore_cred.c stable/9/contrib/openpam/lib/openpam_set_feature.c stable/9/contrib/openpam/lib/openpam_set_option.c stable/9/contrib/openpam/lib/openpam_static.c stable/9/contrib/openpam/lib/openpam_straddch.c stable/9/contrib/openpam/lib/openpam_strlcat.h stable/9/contrib/openpam/lib/openpam_strlcmp.h stable/9/contrib/openpam/lib/openpam_strlcpy.h stable/9/contrib/openpam/lib/openpam_subst.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/lib/libpam/libpam/pam_std_option.c Modified: stable/9/ObsoleteFiles.inc (contents, props changed) stable/9/contrib/openpam/CREDITS stable/9/contrib/openpam/HISTORY stable/9/contrib/openpam/INSTALL 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/TODO stable/9/contrib/openpam/aclocal.m4 stable/9/contrib/openpam/autogen.sh stable/9/contrib/openpam/bin/Makefile.am stable/9/contrib/openpam/bin/Makefile.in stable/9/contrib/openpam/bin/openpam_dump_policy/Makefile.am stable/9/contrib/openpam/bin/openpam_dump_policy/Makefile.in stable/9/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c stable/9/contrib/openpam/bin/pamtest/Makefile.am stable/9/contrib/openpam/bin/pamtest/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.1 stable/9/contrib/openpam/bin/su/su.c stable/9/contrib/openpam/compile stable/9/contrib/openpam/config.guess stable/9/contrib/openpam/config.h.in stable/9/contrib/openpam/config.sub stable/9/contrib/openpam/configure stable/9/contrib/openpam/configure.ac stable/9/contrib/openpam/depcomp stable/9/contrib/openpam/doc/Makefile.am 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.man 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_feature.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_readlinev.3 stable/9/contrib/openpam/doc/man/openpam_readword.3 stable/9/contrib/openpam/doc/man/openpam_restore_cred.3 stable/9/contrib/openpam/doc/man/openpam_set_feature.3 stable/9/contrib/openpam/doc/man/openpam_set_option.3 stable/9/contrib/openpam/doc/man/openpam_straddch.3 stable/9/contrib/openpam/doc/man/openpam_subst.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.man 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.am stable/9/contrib/openpam/include/Makefile.in stable/9/contrib/openpam/include/security/Makefile.am stable/9/contrib/openpam/include/security/Makefile.in stable/9/contrib/openpam/include/security/openpam.h stable/9/contrib/openpam/include/security/openpam_attr.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/libpam/Makefile.am stable/9/contrib/openpam/lib/libpam/Makefile.in stable/9/contrib/openpam/lib/libpam/openpam_borrow_cred.c stable/9/contrib/openpam/lib/libpam/openpam_check_owner_perms.c stable/9/contrib/openpam/lib/libpam/openpam_configure.c stable/9/contrib/openpam/lib/libpam/openpam_constants.c stable/9/contrib/openpam/lib/libpam/openpam_constants.h stable/9/contrib/openpam/lib/libpam/openpam_ctype.h stable/9/contrib/openpam/lib/libpam/openpam_debug.h stable/9/contrib/openpam/lib/libpam/openpam_dispatch.c stable/9/contrib/openpam/lib/libpam/openpam_dynamic.c stable/9/contrib/openpam/lib/libpam/openpam_features.c stable/9/contrib/openpam/lib/libpam/openpam_features.h stable/9/contrib/openpam/lib/libpam/openpam_findenv.c stable/9/contrib/openpam/lib/libpam/openpam_free_data.c stable/9/contrib/openpam/lib/libpam/openpam_free_envlist.c stable/9/contrib/openpam/lib/libpam/openpam_get_feature.c stable/9/contrib/openpam/lib/libpam/openpam_get_option.c stable/9/contrib/openpam/lib/libpam/openpam_impl.h stable/9/contrib/openpam/lib/libpam/openpam_load.c stable/9/contrib/openpam/lib/libpam/openpam_log.c stable/9/contrib/openpam/lib/libpam/openpam_nullconv.c stable/9/contrib/openpam/lib/libpam/openpam_readline.c stable/9/contrib/openpam/lib/libpam/openpam_readlinev.c stable/9/contrib/openpam/lib/libpam/openpam_readword.c stable/9/contrib/openpam/lib/libpam/openpam_restore_cred.c stable/9/contrib/openpam/lib/libpam/openpam_set_feature.c stable/9/contrib/openpam/lib/libpam/openpam_set_option.c stable/9/contrib/openpam/lib/libpam/openpam_static.c stable/9/contrib/openpam/lib/libpam/openpam_straddch.c stable/9/contrib/openpam/lib/libpam/openpam_strlcat.h stable/9/contrib/openpam/lib/libpam/openpam_strlcmp.h stable/9/contrib/openpam/lib/libpam/openpam_strlcpy.h stable/9/contrib/openpam/lib/libpam/openpam_subst.c stable/9/contrib/openpam/lib/libpam/openpam_ttyconv.c stable/9/contrib/openpam/lib/libpam/pam_acct_mgmt.c stable/9/contrib/openpam/lib/libpam/pam_authenticate.c stable/9/contrib/openpam/lib/libpam/pam_authenticate_secondary.c stable/9/contrib/openpam/lib/libpam/pam_chauthtok.c stable/9/contrib/openpam/lib/libpam/pam_close_session.c stable/9/contrib/openpam/lib/libpam/pam_end.c stable/9/contrib/openpam/lib/libpam/pam_error.c stable/9/contrib/openpam/lib/libpam/pam_get_authtok.c stable/9/contrib/openpam/lib/libpam/pam_get_data.c stable/9/contrib/openpam/lib/libpam/pam_get_item.c stable/9/contrib/openpam/lib/libpam/pam_get_mapped_authtok.c stable/9/contrib/openpam/lib/libpam/pam_get_mapped_username.c stable/9/contrib/openpam/lib/libpam/pam_get_user.c stable/9/contrib/openpam/lib/libpam/pam_getenv.c stable/9/contrib/openpam/lib/libpam/pam_getenvlist.c stable/9/contrib/openpam/lib/libpam/pam_info.c stable/9/contrib/openpam/lib/libpam/pam_open_session.c stable/9/contrib/openpam/lib/libpam/pam_prompt.c stable/9/contrib/openpam/lib/libpam/pam_putenv.c stable/9/contrib/openpam/lib/libpam/pam_set_data.c stable/9/contrib/openpam/lib/libpam/pam_set_item.c stable/9/contrib/openpam/lib/libpam/pam_set_mapped_authtok.c stable/9/contrib/openpam/lib/libpam/pam_set_mapped_username.c stable/9/contrib/openpam/lib/libpam/pam_setcred.c stable/9/contrib/openpam/lib/libpam/pam_setenv.c stable/9/contrib/openpam/lib/libpam/pam_sm_acct_mgmt.c stable/9/contrib/openpam/lib/libpam/pam_sm_authenticate.c stable/9/contrib/openpam/lib/libpam/pam_sm_authenticate_secondary.c stable/9/contrib/openpam/lib/libpam/pam_sm_chauthtok.c stable/9/contrib/openpam/lib/libpam/pam_sm_close_session.c stable/9/contrib/openpam/lib/libpam/pam_sm_get_mapped_authtok.c stable/9/contrib/openpam/lib/libpam/pam_sm_get_mapped_username.c stable/9/contrib/openpam/lib/libpam/pam_sm_open_session.c stable/9/contrib/openpam/lib/libpam/pam_sm_set_mapped_authtok.c stable/9/contrib/openpam/lib/libpam/pam_sm_set_mapped_username.c stable/9/contrib/openpam/lib/libpam/pam_sm_setcred.c stable/9/contrib/openpam/lib/libpam/pam_start.c stable/9/contrib/openpam/lib/libpam/pam_strerror.c stable/9/contrib/openpam/lib/libpam/pam_verror.c stable/9/contrib/openpam/lib/libpam/pam_vinfo.c stable/9/contrib/openpam/lib/libpam/pam_vprompt.c stable/9/contrib/openpam/misc/gendoc.pl stable/9/contrib/openpam/missing stable/9/contrib/openpam/modules/Makefile.am stable/9/contrib/openpam/modules/Makefile.in stable/9/contrib/openpam/modules/pam_deny/Makefile.am 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.am 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/contrib/openpam/pamgdb.in stable/9/contrib/openpam/t/Makefile.am stable/9/contrib/openpam/t/Makefile.in stable/9/contrib/openpam/t/t.h stable/9/contrib/openpam/t/t_main.c stable/9/contrib/openpam/t/t_openpam_readlinev.c stable/9/contrib/openpam/t/t_openpam_readword.c stable/9/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c stable/9/lib/libpam/libpam/Makefile stable/9/lib/libpam/modules/pam_passwdqc/Makefile stable/9/lib/libpam/modules/pam_ssh/Makefile stable/9/secure/lib/libssh/Makefile stable/9/secure/libexec/sftp-server/Makefile stable/9/secure/libexec/ssh-keysign/Makefile stable/9/secure/libexec/ssh-pkcs11-helper/Makefile stable/9/secure/usr.bin/scp/Makefile stable/9/secure/usr.bin/sftp/Makefile stable/9/secure/usr.bin/ssh-add/Makefile stable/9/secure/usr.bin/ssh-agent/Makefile stable/9/secure/usr.bin/ssh-keygen/Makefile stable/9/secure/usr.bin/ssh-keyscan/Makefile stable/9/secure/usr.bin/ssh/Makefile stable/9/secure/usr.sbin/sshd/Makefile stable/9/share/mk/bsd.libnames.mk Directory Properties: stable/9/ (props changed) stable/9/contrib/ (props changed) stable/9/contrib/openpam/ (props changed) stable/9/lib/ (props changed) stable/9/lib/libpam/ (props changed) stable/9/secure/lib/libssh/ (props changed) stable/9/secure/libexec/ssh-keysign/ (props changed) stable/9/secure/usr.bin/ssh/ (props changed) stable/9/secure/usr.sbin/sshd/ (props changed) stable/9/share/ (props changed) stable/9/share/mk/ (props changed) Modified: stable/9/ObsoleteFiles.inc ============================================================================== --- stable/9/ObsoleteFiles.inc Thu Mar 20 09:20:37 2014 (r263420) +++ stable/9/ObsoleteFiles.inc Thu Mar 20 10:56:05 2014 (r263421) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20140314: libssh becomes private +OLD_LIBS+=usr/lib/libssh.so.5 +OLD_LIBS+=usr/lib32/libssh.so.5 # 20131109: extattr(2) mlinks fixed OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz Modified: stable/9/contrib/openpam/CREDITS ============================================================================== --- stable/9/contrib/openpam/CREDITS Thu Mar 20 09:20:37 2014 (r263420) +++ stable/9/contrib/openpam/CREDITS Thu Mar 20 10:56:05 2014 (r263421) @@ -1,4 +1,6 @@ + _Ἀπόδοτε οὖν τὰ Καίσαρος Καίσαρι καὶ τὰ τοῦ Θεοῦ τῷ Θεῷ_ + The OpenPAM library was developed for the FreeBSD Project by ThinkSec AS and Network Associates Laboratories, the Security Research Division of Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 @@ -21,13 +23,15 @@ ideas: Don Lewis <truckman@freebsd.org> Emmanuel Dreyfus <manu@netbsd.org> Eric Melville <eric@freebsd.org> + Espen Grøndahl <espegro@usit.uio.no> Gary Winiger <gary.winiger@sun.com> Gleb Smirnoff <glebius@freebsd.org> Hubert Feyrer <hubert@feyrer.de> Jason Evans <jasone@freebsd.org> Joe Marcus Clarke <marcus@freebsd.org> - Juli Mallett <jmallett@freebsd.org> Jörg Sonnenberger <joerg@britannica.bec.de> + Juli Mallett <jmallett@freebsd.org> + Larry Baird <lab@gta.com> Maëlle Lesage <lesage.maelle@gmail.com> Mark Murray <markm@freebsd.org> Matthias Drochner <drochner@netbsd.org> @@ -43,4 +47,4 @@ ideas: Wojciech A. Koszek <wkoszek@freebsd.org> Yar Tikhiy <yar@freebsd.org> -$Id: CREDITS 587 2012-04-08 11:12:10Z des $ +$Id: CREDITS 648 2013-03-05 17:54:27Z des $ Modified: stable/9/contrib/openpam/HISTORY ============================================================================== --- stable/9/contrib/openpam/HISTORY Thu Mar 20 09:20:37 2014 (r263420) +++ stable/9/contrib/openpam/HISTORY Thu Mar 20 10:56:05 2014 (r263421) @@ -1,3 +1,30 @@ +OpenPAM Nummularia 2013-09-07 + + - ENHANCE: Rewrite the dynamic loader to improve readability and + reliability. Modules can now be listed without the ".so" suffix in + the policy file; OpenPAM will automatically add it, just like it + will automatically add the version number if required. + + - ENHANCE: Allow openpam_straddch(3) to be called without a character + so it can be used to preallocate a string. + + - ENHANCE: Improve portability by adding simple asprintf(3) and + vasprintf(3) implementations for platforms that don't have them. + + - ENHANCE: Move the libpam sources into a separate subdirectory. + + - ENHANCE: Substantial documentation improvements. + + - BUGFIX: When openpam_readword(3) encountered an opening quote, it + would set the first byte in the buffer to '\0', discarding all + existing text and, unless the buffer was empty to begin with, all + subsequent text as well. This went unnoticed because none of the + unit tests for quoted strings had any text preceding the opening + quote. + + - BUGFIX: make --with-modules-dir work the way it was meant to work + (but never did). +============================================================================ OpenPAM Micrampelis 2012-05-26 - FEATURE: Add an openpam_readword(3) function which reads the next @@ -401,4 +428,4 @@ OpenPAM Calamite 2002-02-09 First (beta) release. ============================================================================ -$Id: HISTORY 609 2012-05-26 13:57:45Z des $ +$Id: HISTORY 737 2013-09-07 12:53:55Z des $ Modified: stable/9/contrib/openpam/INSTALL ============================================================================== --- stable/9/contrib/openpam/INSTALL Thu Mar 20 09:20:37 2014 (r263420) +++ stable/9/contrib/openpam/INSTALL Thu Mar 20 10:56:05 2014 (r263421) @@ -55,4 +55,4 @@ # make install -$Id: INSTALL 388 2006-04-12 10:31:52Z des $ +$Id: INSTALL 648 2013-03-05 17:54:27Z des $ Modified: stable/9/contrib/openpam/LICENSE ============================================================================== --- stable/9/contrib/openpam/LICENSE Thu Mar 20 09:20:37 2014 (r263420) +++ stable/9/contrib/openpam/LICENSE Thu Mar 20 10:56:05 2014 (r263421) @@ -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 546 2012-03-31 23:13:20Z des $ +$Id: LICENSE 648 2013-03-05 17:54:27Z des $ Modified: stable/9/contrib/openpam/Makefile.am ============================================================================== --- stable/9/contrib/openpam/Makefile.am Thu Mar 20 09:20:37 2014 (r263420) +++ stable/9/contrib/openpam/Makefile.am Thu Mar 20 10:56:05 2014 (r263421) @@ -1,4 +1,4 @@ -# $Id: Makefile.am 549 2012-04-01 20:38:30Z des $ +# $Id: Makefile.am 623 2013-02-25 07:24:51Z des $ ACLOCAL_AMFLAGS = -I m4 Modified: stable/9/contrib/openpam/Makefile.in ============================================================================== --- stable/9/contrib/openpam/Makefile.in Thu Mar 20 09:20:37 2014 (r263420) +++ stable/9/contrib/openpam/Makefile.in Thu Mar 20 10:56:05 2014 (r263421) @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 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. @@ -15,8 +14,53 @@ @SET_MAKE@ -# $Id: Makefile.am 549 2012-04-01 20:38:30Z des $ +# $Id: Makefile.am 623 2013-02-25 07:24:51Z des $ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,44 +81,91 @@ build_triplet = @build@ host_triplet = @host@ @WITH_DOC_TRUE@am__append_1 = doc subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/pamgdb.in $(top_srcdir)/configure INSTALL TODO \ - config.guess config.sub depcomp install-sh ltmain.sh missing +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in $(srcdir)/pamgdb.in $(srcdir)/mkpkgng.in \ + INSTALL README TODO compile config.guess config.sub depcomp \ + install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(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 config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = pamgdb +CONFIG_CLEAN_FILES = pamgdb mkpkgng CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-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_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-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 \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac 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 +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope 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)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -102,10 +193,14 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -116,6 +211,7 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYPTO_LIBS = @CRYPTO_LIBS@ CRYPT_LIBS = @CRYPT_LIBS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -237,7 +333,7 @@ all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -273,10 +369,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -290,6 +384,8 @@ distclean-hdr: -rm -f config.h stamp-h1 pamgdb: $(top_builddir)/config.status $(srcdir)/pamgdb.in cd $(top_builddir) && $(SHELL) ./config.status $@ +mkpkgng: $(top_builddir)/config.status $(srcdir)/mkpkgng.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -301,22 +397,25 @@ distclean-libtool: -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. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (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): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -331,57 +430,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(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" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -397,12 +451,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -414,15 +463,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -431,9 +476,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -469,13 +536,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -504,36 +568,42 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -544,8 +614,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -555,9 +625,9 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -565,6 +635,7 @@ distcheck: dist && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -588,13 +659,21 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -625,10 +704,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -710,24 +794,24 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.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-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 \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-lzip 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-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 mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. Modified: stable/9/contrib/openpam/README ============================================================================== --- stable/9/contrib/openpam/README Thu Mar 20 09:20:37 2014 (r263420) +++ stable/9/contrib/openpam/README Thu Mar 20 10:56:05 2014 (r263421) @@ -24,4 +24,4 @@ These are some of OpenPAM's features: Please direct bug reports and inquiries to <des@des.no>. -$Id: README 424 2009-10-29 17:10:22Z des $ +$Id: README 648 2013-03-05 17:54:27Z des $ Modified: stable/9/contrib/openpam/RELNOTES ============================================================================== --- stable/9/contrib/openpam/RELNOTES Thu Mar 20 09:20:37 2014 (r263420) +++ stable/9/contrib/openpam/RELNOTES Thu Mar 20 10:56:05 2014 (r263421) @@ -1,27 +1,24 @@ - Release notes for OpenPAM Micrampelis - ===================================== + Release notes for OpenPAM Nummularia + ==================================== 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 -a Perl script from specially marked-up comments in the source files -themselves, which minimizes the chance that any of them should be out -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. It also includes a command-line application -(pamtest) which can be used to test policies and modules. +The distribution consists of the following components: -Unit tests for limited portions of the library can be found in the t -subdirectory. + - The PAM library itself, with complete API documentation. + + - Sample modules (pam_permit, pam_deny and pam_unix) and a sample + application (su) which demonstrate how to use PAM. + + - A test application (pamtest) which can be used to test policies and + modules. + + - Unit tests for limited portions of the libraries. Please direct bug reports and inquiries to <des@des.no>. -$Id: RELNOTES 609 2012-05-26 13:57:45Z des $ +$Id: RELNOTES 741 2013-09-07 13:34:02Z des $ Modified: stable/9/contrib/openpam/TODO ============================================================================== --- stable/9/contrib/openpam/TODO Thu Mar 20 09:20:37 2014 (r263420) +++ stable/9/contrib/openpam/TODO Thu Mar 20 10:56:05 2014 (r263421) @@ -1,13 +1,17 @@ Before the next release: - - Complete the transition from PAM_LOG_DEBUG to PAM_LOG_LIBDEBUG. + - Rewrite openpam_ttyconv(3). + - mostly done, needs review. -Whenever: + - Fix try_first_pass / use_first_pass (pam_get_authtok() code & + documentation are slightly incorrect, OpenPAM's pam_unix(8) is + incorrect, all FreeBSD modules are broken) - - 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. + - Add loop detection to openpam_load_chain(). - - Rewrite the module-loading code. + - Look into the possibility of implementing a version of (or a + wrapper for) openpam_log() which respects the PAM_SILENT flag and + the no_warn module option. This would eliminate the need for + FreeBSD's _pam_verbose_error(). -$Id: TODO 592 2012-04-08 13:19:51Z des $ +$Id: TODO 736 2013-09-07 12:52:42Z des $ Modified: stable/9/contrib/openpam/aclocal.m4 ============================================================================== --- stable/9/contrib/openpam/aclocal.m4 Thu Mar 20 09:20:37 2014 (r263420) +++ stable/9/contrib/openpam/aclocal.m4 Thu Mar 20 10:56:05 2014 (r263421) @@ -1,8612 +1,26 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# 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 -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -m4_define([_LT_COPYING], [dnl -# 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 part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it 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. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -]) - -# serial 57 LT_INIT - - -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) - - -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) - - -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl - -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl - -_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) - -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT - -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -]) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl - -_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl -dnl -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl -m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_WITH_SYSROOT])dnl - -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -]) -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403201056.s2KAu5HX075855>