From nobody Mon Jul 3 15:14:58 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QvqGp5rktz4lDWG; Mon, 3 Jul 2023 15:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QvqGp5BZqz4519; Mon, 3 Jul 2023 15:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688397298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GhUn9Vpk/58joqzV9c8osLE42rDxdwxhpiV0gdH0tbc=; b=XoimvH6nwusjN+dietx8zXvCW9fNOVL3srIV2/6JPdo8yFOWySjSmh1fAFcUjTJ4pVjPBH KyxPeYtUZpXkZhC1GCrRODGCmTfnPd5v2CqLPdifMmTWZUF8Wplq0CrGT10HJMrT/z/HLR jYvNvCciPaRVGkjBxesMhM8s2Muue6J/Ci4TAwhCO7YyY810VYMVwAc41ddZMvMjUBJmhf tioLcL1hpfejT7aOXPdOd2DJokjW1OzILAjjdmrygwGbPEIRJjcrts3LNNMqRfHEanB5Yh PKiugP3UPvB0BWTi6fAjOGu3MaEucgCUx0JYg4ZfBXzGnCbm2QXlo1oxuW1dfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688397298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GhUn9Vpk/58joqzV9c8osLE42rDxdwxhpiV0gdH0tbc=; b=mnFiLdoRAgTH8UqrG6NlvJyu5Q0qtlonOyjHmzDVxO3GnjzL9MXJaIn3FNeHxOLh8f0yrZ sSndtLeToPXiveRymPUH+CLKR7HhxXJq4yNErQTGN41CKvLnPo+jTGvnASdD39OGJ0s7Nh srbqraHA/UySXkfVw3lFoopLz4zXMs4NEJSIqfApS4KGQvNxgZPzuMmu0Nd0Llo7jQeZBC 7JoIIKqZsYu+KT5pUCGCaVtUyA1FNZHUJQkj4SX2nnXHILzHNcevBtvu93W7/chTmpZ+dW ceFZvQ9uel8AU4LDy1vS9jDQ65qGMI9DZyh5bIldNOsELmGxzqzegyneAafPCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688397298; a=rsa-sha256; cv=none; b=dX2gcDDJC6EEJYeyoBj74H0IHevauFN55BN6Qs+pauoM6XtwiUAyPDtSZ8zbiMQoIkujX5 OuP81tGoHEGi33vK3yR1rxdTefRl3nbX88txht7aQhvf8s2A4reRB0VEruhNzIJc9T1+8n 0IrIJfUI2q3Pp52lfl7V49y+x+mgDAkJaVA0QDSEoRHu/szpNiYTsuSUmIb+m4stZoeyS4 jhWElNimNnVO1eDIAh7IAwehUUcaaVgVoQd7KWQLKd2fG5cDn3Nf40V3HohwPyeoY4fQHc kq9Ue4j5/+7kkMn1msTOvYT0IzejDqqHcdkTeTSvv5eMpQr+c6V02ByS/ExbLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QvqGp4FW8zvGP; Mon, 3 Jul 2023 15:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 363FEwXx017955; Mon, 3 Jul 2023 15:14:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 363FEwf3017953; Mon, 3 Jul 2023 15:14:58 GMT (envelope-from git) Date: Mon, 3 Jul 2023 15:14:58 GMT Message-Id: <202307031514.363FEwf3017953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: a86b5f4f063e - stable/13 - Upgrade to OpenPAM Ximenia. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a86b5f4f063e146597ee1f851c279d772d09afe9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a86b5f4f063e146597ee1f851c279d772d09afe9 commit a86b5f4f063e146597ee1f851c279d772d09afe9 Author: Dag-Erling Smørgrav AuthorDate: 2023-06-27 17:03:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-07-03 15:13:11 +0000 Upgrade to OpenPAM Ximenia. Merge commit '5894a4142a9d5ae5f7f6bee1f46237a3d20d0b5b' (cherry picked from commit 3ba4c8c81a28de3e00ccf6d7f92c6f8e58bef456) --- contrib/openpam/CREDITS | 1 + contrib/openpam/HISTORY | 11 + contrib/openpam/LICENSE | 2 +- contrib/openpam/Makefile.am | 31 +- contrib/openpam/Makefile.in | 99 +- contrib/openpam/RELNOTES | 4 +- contrib/openpam/aclocal.m4 | 119 +- contrib/openpam/autogen.sh | 3 - contrib/openpam/bin/Makefile.am | 2 - contrib/openpam/bin/Makefile.in | 29 +- .../openpam/bin/openpam_dump_policy/Makefile.am | 2 - .../openpam/bin/openpam_dump_policy/Makefile.in | 29 +- .../bin/openpam_dump_policy/openpam_dump_policy.c | 2 - contrib/openpam/bin/pamtest/Makefile.am | 2 - contrib/openpam/bin/pamtest/Makefile.in | 29 +- contrib/openpam/bin/pamtest/pamtest.1 | 4 +- contrib/openpam/bin/pamtest/pamtest.c | 2 - contrib/openpam/bin/su/Makefile.am | 2 - contrib/openpam/bin/su/Makefile.in | 29 +- contrib/openpam/bin/su/su.1 | 4 +- contrib/openpam/bin/su/su.c | 2 - contrib/openpam/compile | 6 +- contrib/openpam/config.guess | 747 +- contrib/openpam/config.h.in | 114 +- contrib/openpam/config.sub | 1674 +- contrib/openpam/configure | 23391 +++++++++++-------- contrib/openpam/configure.ac | 55 +- contrib/openpam/depcomp | 2 +- contrib/openpam/doc/Makefile.am | 2 - contrib/openpam/doc/Makefile.in | 29 +- contrib/openpam/doc/man/Makefile.am | 2 - contrib/openpam/doc/man/Makefile.in | 27 +- contrib/openpam/doc/man/openpam.3 | 5 +- contrib/openpam/doc/man/openpam.man | 3 - contrib/openpam/doc/man/openpam_borrow_cred.3 | 3 +- contrib/openpam/doc/man/openpam_free_data.3 | 3 +- contrib/openpam/doc/man/openpam_free_envlist.3 | 3 +- contrib/openpam/doc/man/openpam_get_feature.3 | 3 +- contrib/openpam/doc/man/openpam_get_option.3 | 3 +- contrib/openpam/doc/man/openpam_log.3 | 3 +- contrib/openpam/doc/man/openpam_nullconv.3 | 3 +- contrib/openpam/doc/man/openpam_readline.3 | 3 +- contrib/openpam/doc/man/openpam_readlinev.3 | 3 +- contrib/openpam/doc/man/openpam_readword.3 | 3 +- contrib/openpam/doc/man/openpam_restore_cred.3 | 3 +- contrib/openpam/doc/man/openpam_set_feature.3 | 3 +- contrib/openpam/doc/man/openpam_set_option.3 | 3 +- contrib/openpam/doc/man/openpam_straddch.3 | 3 +- contrib/openpam/doc/man/openpam_subst.3 | 3 +- contrib/openpam/doc/man/openpam_ttyconv.3 | 3 +- contrib/openpam/doc/man/pam.3 | 5 +- contrib/openpam/doc/man/pam.conf.5 | 4 +- contrib/openpam/doc/man/pam.man | 3 - contrib/openpam/doc/man/pam_acct_mgmt.3 | 3 +- contrib/openpam/doc/man/pam_authenticate.3 | 3 +- contrib/openpam/doc/man/pam_chauthtok.3 | 3 +- contrib/openpam/doc/man/pam_close_session.3 | 3 +- contrib/openpam/doc/man/pam_conv.3 | 4 +- contrib/openpam/doc/man/pam_end.3 | 3 +- contrib/openpam/doc/man/pam_error.3 | 3 +- contrib/openpam/doc/man/pam_get_authtok.3 | 3 +- contrib/openpam/doc/man/pam_get_data.3 | 3 +- contrib/openpam/doc/man/pam_get_item.3 | 3 +- contrib/openpam/doc/man/pam_get_user.3 | 3 +- contrib/openpam/doc/man/pam_getenv.3 | 3 +- contrib/openpam/doc/man/pam_getenvlist.3 | 3 +- contrib/openpam/doc/man/pam_info.3 | 3 +- contrib/openpam/doc/man/pam_open_session.3 | 3 +- contrib/openpam/doc/man/pam_prompt.3 | 3 +- contrib/openpam/doc/man/pam_putenv.3 | 3 +- contrib/openpam/doc/man/pam_set_data.3 | 3 +- contrib/openpam/doc/man/pam_set_item.3 | 3 +- contrib/openpam/doc/man/pam_setcred.3 | 3 +- contrib/openpam/doc/man/pam_setenv.3 | 3 +- contrib/openpam/doc/man/pam_sm_acct_mgmt.3 | 3 +- contrib/openpam/doc/man/pam_sm_authenticate.3 | 3 +- contrib/openpam/doc/man/pam_sm_chauthtok.3 | 3 +- contrib/openpam/doc/man/pam_sm_close_session.3 | 3 +- contrib/openpam/doc/man/pam_sm_open_session.3 | 3 +- contrib/openpam/doc/man/pam_sm_setcred.3 | 3 +- contrib/openpam/doc/man/pam_start.3 | 3 +- contrib/openpam/doc/man/pam_strerror.3 | 3 +- contrib/openpam/doc/man/pam_verror.3 | 3 +- contrib/openpam/doc/man/pam_vinfo.3 | 3 +- contrib/openpam/doc/man/pam_vprompt.3 | 3 +- contrib/openpam/freebsd/Makefile.in | 33 + contrib/openpam/include/Makefile.am | 2 - contrib/openpam/include/Makefile.in | 29 +- contrib/openpam/include/security/Makefile.am | 2 - contrib/openpam/include/security/Makefile.in | 29 +- contrib/openpam/include/security/openpam.h | 2 - contrib/openpam/include/security/openpam_attr.h | 4 - contrib/openpam/include/security/openpam_version.h | 8 +- contrib/openpam/include/security/pam_appl.h | 2 - contrib/openpam/include/security/pam_constants.h | 2 - contrib/openpam/include/security/pam_modules.h | 2 - contrib/openpam/include/security/pam_types.h | 2 - contrib/openpam/install-sh | 172 +- contrib/openpam/lib/Makefile.am | 2 - contrib/openpam/lib/Makefile.in | 29 +- contrib/openpam/lib/libpam/Makefile.am | 2 - contrib/openpam/lib/libpam/Makefile.in | 29 +- contrib/openpam/lib/libpam/openpam_asprintf.c | 2 - contrib/openpam/lib/libpam/openpam_asprintf.h | 2 - contrib/openpam/lib/libpam/openpam_borrow_cred.c | 2 - .../openpam/lib/libpam/openpam_check_owner_perms.c | 2 - contrib/openpam/lib/libpam/openpam_configure.c | 2 - contrib/openpam/lib/libpam/openpam_constants.c | 2 - contrib/openpam/lib/libpam/openpam_constants.h | 2 - contrib/openpam/lib/libpam/openpam_cred.h | 2 - contrib/openpam/lib/libpam/openpam_ctype.h | 2 - contrib/openpam/lib/libpam/openpam_debug.h | 2 - contrib/openpam/lib/libpam/openpam_dispatch.c | 2 - contrib/openpam/lib/libpam/openpam_dlfunc.h | 2 - contrib/openpam/lib/libpam/openpam_dynamic.c | 2 - contrib/openpam/lib/libpam/openpam_features.c | 2 - contrib/openpam/lib/libpam/openpam_features.h | 2 - contrib/openpam/lib/libpam/openpam_findenv.c | 2 - contrib/openpam/lib/libpam/openpam_free_data.c | 2 - contrib/openpam/lib/libpam/openpam_free_envlist.c | 2 - contrib/openpam/lib/libpam/openpam_get_feature.c | 2 - contrib/openpam/lib/libpam/openpam_get_option.c | 2 - contrib/openpam/lib/libpam/openpam_impl.h | 2 - contrib/openpam/lib/libpam/openpam_load.c | 2 - contrib/openpam/lib/libpam/openpam_log.c | 2 - contrib/openpam/lib/libpam/openpam_nullconv.c | 2 - contrib/openpam/lib/libpam/openpam_readline.c | 2 - contrib/openpam/lib/libpam/openpam_readlinev.c | 4 - contrib/openpam/lib/libpam/openpam_readword.c | 3 - contrib/openpam/lib/libpam/openpam_restore_cred.c | 2 - contrib/openpam/lib/libpam/openpam_set_feature.c | 2 - contrib/openpam/lib/libpam/openpam_set_option.c | 5 +- contrib/openpam/lib/libpam/openpam_static.c | 2 - contrib/openpam/lib/libpam/openpam_straddch.c | 4 - contrib/openpam/lib/libpam/openpam_strlcat.c | 2 - contrib/openpam/lib/libpam/openpam_strlcat.h | 2 - contrib/openpam/lib/libpam/openpam_strlcmp.h | 2 - contrib/openpam/lib/libpam/openpam_strlcpy.c | 2 - contrib/openpam/lib/libpam/openpam_strlcpy.h | 2 - contrib/openpam/lib/libpam/openpam_strlset.c | 2 - contrib/openpam/lib/libpam/openpam_strlset.h | 2 - contrib/openpam/lib/libpam/openpam_subst.c | 7 +- contrib/openpam/lib/libpam/openpam_ttyconv.c | 2 - contrib/openpam/lib/libpam/openpam_vasprintf.c | 2 - contrib/openpam/lib/libpam/openpam_vasprintf.h | 2 - contrib/openpam/lib/libpam/pam_acct_mgmt.c | 2 - contrib/openpam/lib/libpam/pam_authenticate.c | 2 - .../lib/libpam/pam_authenticate_secondary.c | 2 - contrib/openpam/lib/libpam/pam_chauthtok.c | 2 - contrib/openpam/lib/libpam/pam_close_session.c | 2 - contrib/openpam/lib/libpam/pam_end.c | 2 - contrib/openpam/lib/libpam/pam_error.c | 2 - contrib/openpam/lib/libpam/pam_get_authtok.c | 2 - contrib/openpam/lib/libpam/pam_get_data.c | 2 - contrib/openpam/lib/libpam/pam_get_item.c | 2 - .../openpam/lib/libpam/pam_get_mapped_authtok.c | 2 - .../openpam/lib/libpam/pam_get_mapped_username.c | 2 - contrib/openpam/lib/libpam/pam_get_user.c | 2 - contrib/openpam/lib/libpam/pam_getenv.c | 2 - contrib/openpam/lib/libpam/pam_getenvlist.c | 2 - contrib/openpam/lib/libpam/pam_info.c | 2 - contrib/openpam/lib/libpam/pam_open_session.c | 2 - contrib/openpam/lib/libpam/pam_prompt.c | 2 - contrib/openpam/lib/libpam/pam_putenv.c | 2 - contrib/openpam/lib/libpam/pam_set_data.c | 2 - contrib/openpam/lib/libpam/pam_set_item.c | 2 - .../openpam/lib/libpam/pam_set_mapped_authtok.c | 2 - .../openpam/lib/libpam/pam_set_mapped_username.c | 2 - contrib/openpam/lib/libpam/pam_setcred.c | 2 - contrib/openpam/lib/libpam/pam_setenv.c | 2 - contrib/openpam/lib/libpam/pam_sm_acct_mgmt.c | 2 - contrib/openpam/lib/libpam/pam_sm_authenticate.c | 2 - .../lib/libpam/pam_sm_authenticate_secondary.c | 2 - contrib/openpam/lib/libpam/pam_sm_chauthtok.c | 2 - contrib/openpam/lib/libpam/pam_sm_close_session.c | 2 - .../openpam/lib/libpam/pam_sm_get_mapped_authtok.c | 2 - .../lib/libpam/pam_sm_get_mapped_username.c | 2 - contrib/openpam/lib/libpam/pam_sm_open_session.c | 2 - .../openpam/lib/libpam/pam_sm_set_mapped_authtok.c | 2 - .../lib/libpam/pam_sm_set_mapped_username.c | 2 - contrib/openpam/lib/libpam/pam_sm_setcred.c | 2 - contrib/openpam/lib/libpam/pam_start.c | 2 - contrib/openpam/lib/libpam/pam_strerror.c | 2 - contrib/openpam/lib/libpam/pam_verror.c | 2 - contrib/openpam/lib/libpam/pam_vinfo.c | 2 - contrib/openpam/lib/libpam/pam_vprompt.c | 2 - contrib/openpam/ltmain.sh | 855 +- contrib/openpam/m4/ax_compiler_vendor.m4 | 117 + contrib/openpam/m4/libtool.m4 | 227 +- contrib/openpam/m4/ltoptions.m4 | 4 +- contrib/openpam/m4/ltsugar.m4 | 2 +- contrib/openpam/m4/ltversion.m4 | 13 +- contrib/openpam/m4/lt~obsolete.m4 | 4 +- contrib/openpam/misc/Makefile.am | 2 +- contrib/openpam/misc/Makefile.in | 34 +- contrib/openpam/misc/coverage.sh.in | 33 - contrib/openpam/misc/gendoc.pl | 2 - contrib/openpam/missing | 2 +- contrib/openpam/mkpkgng.in | 177 - contrib/openpam/modules/Makefile.am | 2 - contrib/openpam/modules/Makefile.in | 29 +- contrib/openpam/modules/pam_deny/Makefile.am | 2 - contrib/openpam/modules/pam_deny/Makefile.in | 29 +- contrib/openpam/modules/pam_deny/pam_deny.c | 2 - contrib/openpam/modules/pam_permit/Makefile.am | 2 - contrib/openpam/modules/pam_permit/Makefile.in | 29 +- contrib/openpam/modules/pam_permit/pam_permit.c | 2 - contrib/openpam/modules/pam_return/Makefile.am | 2 - contrib/openpam/modules/pam_return/Makefile.in | 29 +- contrib/openpam/modules/pam_return/pam_return.c | 2 - contrib/openpam/modules/pam_unix/Makefile.am | 2 - contrib/openpam/modules/pam_unix/Makefile.in | 29 +- contrib/openpam/modules/pam_unix/pam_unix.c | 2 - contrib/openpam/t/Makefile.am | 4 +- contrib/openpam/t/Makefile.in | 87 +- contrib/openpam/t/t_openpam_ctype.c | 2 - contrib/openpam/t/t_openpam_dispatch.c | 2 - contrib/openpam/t/t_openpam_readlinev.c | 2 - contrib/openpam/t/t_openpam_readword.c | 2 - contrib/openpam/t/t_openpam_straddch.c | 183 + contrib/openpam/t/t_openpam_subst.c | 105 + contrib/openpam/t/t_pam_conv.c | 2 - contrib/openpam/t/t_pam_conv.h | 2 - contrib/openpam/t/t_pam_env.c | 2 - contrib/openpam/t/t_pam_err.c | 2 - contrib/openpam/t/t_pam_err.h | 2 - contrib/openpam/test-driver | 25 +- 227 files changed, 17395 insertions(+), 11816 deletions(-) diff --git a/contrib/openpam/CREDITS b/contrib/openpam/CREDITS index a560f9e12c1f..7dd4356fa824 100644 --- a/contrib/openpam/CREDITS +++ b/contrib/openpam/CREDITS @@ -45,6 +45,7 @@ ideas: Mikko Työläjärvi Nick Hibma Patrick Bihan-Faou + Robert Morris Robert Watson Ruslan Ermilov Sebastian Krahmer diff --git a/contrib/openpam/HISTORY b/contrib/openpam/HISTORY index 98032d7e5973..659c2ec430ff 100644 --- a/contrib/openpam/HISTORY +++ b/contrib/openpam/HISTORY @@ -1,3 +1,14 @@ +OpenPAM Ximenia 2023-06-27 + + - BUGFIX: Fix race condition in openpam_ttyconv(3) when used with + expect scripts. + + - BUGFIX: In openpam_set_option(3), when removing an option, properly + decrement the option count. + + - BUGFIX: In openpam_subst(3), avoid incrementing past the end of the + template. +============================================================================ OpenPAM Tabebuia 2019-02-24 - BUGFIX: Fix off-by-one bug in pam_getenv(3) which was introduced in diff --git a/contrib/openpam/LICENSE b/contrib/openpam/LICENSE index 879b34bc7beb..8c7e42564955 100644 --- a/contrib/openpam/LICENSE +++ b/contrib/openpam/LICENSE @@ -1,6 +1,6 @@ Copyright (c) 2002-2003 Networks Associates Technology, Inc. -Copyright (c) 2004-2019 Dag-Erling Smørgrav +Copyright (c) 2004-2023 Dag-Erling Smørgrav All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and diff --git a/contrib/openpam/Makefile.am b/contrib/openpam/Makefile.am index 6355cefcd5bc..89ec3a3cfa34 100644 --- a/contrib/openpam/Makefile.am +++ b/contrib/openpam/Makefile.am @@ -1,5 +1,3 @@ -# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ - ACLOCAL_AMFLAGS = -I m4 SUBDIRS = misc include lib bin modules @@ -19,3 +17,32 @@ EXTRA_DIST = \ RELNOTES \ autogen.sh \ misc/gendoc.pl + +if WITH_CODE_COVERAGE +covdir = @abs_top_builddir@/cov +coverage: coverage-clean all coverage-prepare coverage-run coverage-report +coverage-clean: + -rm -rf "${covdir}" +coverage-prepare: + mkdir "${covdir}" +if CLANG_CODE_COVERAGE +profdata = ${covdir}/@PACKAGE@.profdata +# hardcoding libpam.so here is horrible, need to find a better solution +coverage-run: + LLVM_PROFILE_FILE="${covdir}/@PACKAGE@.%p.raw" \ + ${MAKE} -C "@abs_top_builddir@" check +coverage-report: + llvm-profdata@clang_ver@ merge \ + --sparse "${covdir}/@PACKAGE@".*.raw -o "${profdata}" + llvm-cov@clang_ver@ show \ + --format=html --tab-size=8 \ + --output-dir="${covdir}" \ + --instr-profile="${profdata}" \ + --object "@abs_top_builddir@/lib/libpam/.libs/libpam.so" + @echo "coverage report: file://${covdir}/index.html" +endif +else +coverage: + echo "code coverage is not enabled." >&2 + false +endif diff --git a/contrib/openpam/Makefile.in b/contrib/openpam/Makefile.in index 05483ef6562d..50e7b492db11 100644 --- a/contrib/openpam/Makefile.in +++ b/contrib/openpam/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,8 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -92,10 +90,11 @@ host_triplet = @host@ @WITH_DOC_TRUE@am__append_1 = doc subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ - $(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__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ + $(top_srcdir)/m4/ax_pkg_config.m4 $(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) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -104,7 +103,7 @@ 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 = mkpkgng +CONFIG_CLEAN_FILES = freebsd/Makefile CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -141,8 +140,8 @@ am__recursive_targets = \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +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. @@ -159,13 +158,10 @@ am__define_uniq_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 = misc include lib bin modules doc t am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/mkpkgng.in INSTALL README TODO compile config.guess \ - config.sub install-sh ltmain.sh missing + $(top_srcdir)/freebsd/Makefile.in INSTALL README TODO compile \ + config.guess config.sub depcomp install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -204,6 +200,8 @@ am__relativize = \ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -224,6 +222,12 @@ CPPFLAGS = @CPPFLAGS@ CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -235,8 +239,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -287,6 +293,7 @@ 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_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -300,6 +307,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ +clang_ver = @clang_ver@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -326,6 +334,7 @@ pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -346,6 +355,8 @@ EXTRA_DIST = \ autogen.sh \ misc/gendoc.pl +@WITH_CODE_COVERAGE_TRUE@covdir = @abs_top_builddir@/cov +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@profdata = ${covdir}/@PACKAGE@.profdata all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -398,7 +409,7 @@ $(srcdir)/config.h.in: $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 -mkpkgng: $(top_builddir)/config.status $(srcdir)/mkpkgng.in +freebsd/Makefile: $(top_builddir)/config.status $(top_srcdir)/freebsd/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: @@ -515,7 +526,6 @@ cscopelist-am: $(am__tagged_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: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -599,6 +609,10 @@ dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -641,6 +655,8 @@ distcheck: dist eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -656,7 +672,7 @@ distcheck: dist $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -818,21 +834,42 @@ uninstall-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 + dist-xz dist-zip dist-zstd 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 .PRECIOUS: Makefile +@WITH_CODE_COVERAGE_TRUE@coverage: coverage-clean all coverage-prepare coverage-run coverage-report +@WITH_CODE_COVERAGE_TRUE@coverage-clean: +@WITH_CODE_COVERAGE_TRUE@ -rm -rf "${covdir}" +@WITH_CODE_COVERAGE_TRUE@coverage-prepare: +@WITH_CODE_COVERAGE_TRUE@ mkdir "${covdir}" +# hardcoding libpam.so here is horrible, need to find a better solution +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@coverage-run: +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ LLVM_PROFILE_FILE="${covdir}/@PACKAGE@.%p.raw" \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ ${MAKE} -C "@abs_top_builddir@" check +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@coverage-report: +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ llvm-profdata@clang_ver@ merge \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --sparse "${covdir}/@PACKAGE@".*.raw -o "${profdata}" +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ llvm-cov@clang_ver@ show \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --format=html --tab-size=8 \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --output-dir="${covdir}" \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --instr-profile="${profdata}" \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --object "@abs_top_builddir@/lib/libpam/.libs/libpam.so" +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ @echo "coverage report: file://${covdir}/index.html" +@WITH_CODE_COVERAGE_FALSE@coverage: +@WITH_CODE_COVERAGE_FALSE@ echo "code coverage is not enabled." >&2 +@WITH_CODE_COVERAGE_FALSE@ false # 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. diff --git a/contrib/openpam/RELNOTES b/contrib/openpam/RELNOTES index 895370ae8774..3bbd7bb19721 100644 --- a/contrib/openpam/RELNOTES +++ b/contrib/openpam/RELNOTES @@ -1,6 +1,6 @@ - Release notes for OpenPAM Tabebuia - ================================== + Release notes for OpenPAM Ximenia + ================================= OpenPAM is developed primarily on FreeBSD, but is expected to work on almost any POSIX-like platform that has GNU autotools, GNU make and diff --git a/contrib/openpam/aclocal.m4 b/contrib/openpam/aclocal.m4 index 005a0f19d170..109e73063233 100644 --- a/contrib/openpam/aclocal.m4 +++ b/contrib/openpam/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,13 +14,13 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, +[m4_warning([this file was generated for autoconf 2.71. 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'.])]) -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], +m4_if([$1], [1.16.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -108,9 +108,46 @@ AC_DEFUN([AM_AUX_DIR_EXPAND], am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) +# AM_COND_IF -*- Autoconf -*- + +# Copyright (C) 2008-2021 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. + +# _AM_COND_IF +# _AM_COND_ELSE +# _AM_COND_ENDIF +# -------------- +# These macros are only used for tracing. +m4_define([_AM_COND_IF]) +m4_define([_AM_COND_ELSE]) +m4_define([_AM_COND_ENDIF]) + +# AM_COND_IF(COND, [IF-TRUE], [IF-FALSE]) +# --------------------------------------- +# If the shell condition COND is true, execute IF-TRUE, otherwise execute +# IF-FALSE. Allow automake to learn about conditional instantiating macros +# (the AC_CONFIG_FOOS). +AC_DEFUN([AM_COND_IF], +[m4_ifndef([_AM_COND_VALUE_$1], + [m4_fatal([$0: no such condition "$1"])])dnl +_AM_COND_IF([$1])dnl +if test -z "$$1_TRUE"; then : + m4_n([$2])[]dnl +m4_ifval([$3], +[_AM_COND_ELSE([$1])dnl +else + $3 +])dnl +_AM_COND_ENDIF([$1])dnl +fi[]dnl +]) + # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +178,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,7 +369,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -371,7 +408,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -398,7 +437,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -426,6 +465,10 @@ m4_defn([AC_PROG_CC]) # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl +m4_ifdef([_$0_ALREADY_INIT], + [m4_fatal([$0 expanded multiple times +]m4_defn([_$0_ALREADY_INIT]))], + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -462,7 +505,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl @@ -514,6 +557,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [m4_define([AC_PROG_OBJCXX], m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi +AC_SUBST([CTAGS]) +if test -z "$ETAGS"; then + ETAGS=etags +fi +AC_SUBST([ETAGS]) +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi +AC_SUBST([CSCOPE]) + AC_REQUIRE([AM_SILENT_RULES])dnl dnl The testsuite driver may need to know about EXEEXT, so add the dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This @@ -595,7 +652,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -616,7 +673,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -637,7 +694,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -680,7 +737,7 @@ AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -701,12 +758,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -721,7 +773,7 @@ fi # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -748,7 +800,7 @@ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -777,7 +829,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -824,7 +876,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -843,7 +895,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -924,7 +976,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -984,7 +1036,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1012,7 +1064,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1031,7 +1083,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1162,6 +1214,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_compiler_vendor.m4]) m4_include([m4/ax_pkg_config.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) diff --git a/contrib/openpam/autogen.sh b/contrib/openpam/autogen.sh index 4573429d4ee9..92213e71d82c 100755 --- a/contrib/openpam/autogen.sh +++ b/contrib/openpam/autogen.sh @@ -1,7 +1,4 @@ #!/bin/sh -# -# $OpenPAM: autogen.sh 938 2017-04-30 21:34:42Z des $ -# libtoolize --copy --force aclocal -I m4 diff --git a/contrib/openpam/bin/Makefile.am b/contrib/openpam/bin/Makefile.am index ce57b7a74ab7..420748808ad2 100644 --- a/contrib/openpam/bin/Makefile.am +++ b/contrib/openpam/bin/Makefile.am @@ -1,5 +1,3 @@ -# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ - SUBDIRS = openpam_dump_policy if WITH_PAMTEST diff --git a/contrib/openpam/bin/Makefile.in b/contrib/openpam/bin/Makefile.in index 05e3166a03ee..8bc8aa6f51d1 100644 --- a/contrib/openpam/bin/Makefile.in +++ b/contrib/openpam/bin/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,8 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -93,10 +91,11 @@ host_triplet = @host@ @WITH_SU_TRUE@am__append_2 = su subdir = bin ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ - $(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__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ + $(top_srcdir)/m4/ax_pkg_config.m4 $(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) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -156,8 +155,6 @@ am__define_uniq_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 DIST_SUBDIRS = openpam_dump_policy pamtest su am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -202,6 +199,12 @@ CPPFLAGS = @CPPFLAGS@ CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ *** 38391 LINES SKIPPED ***