Date: Wed, 12 Jun 2019 01:53:15 +0000 (UTC) From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r348980 - in stable/11: contrib/openpam contrib/openpam/bin contrib/openpam/bin/openpam_dump_policy contrib/openpam/bin/pamtest contrib/openpam/bin/su contrib/openpam/doc contrib/openpa... Message-ID: <201906120153.x5C1rFlk080113@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Wed Jun 12 01:53:14 2019 New Revision: 348980 URL: https://svnweb.freebsd.org/changeset/base/348980 Log: MFH (r313975, r315909, r317827, r344533): upgrade to latest OpenPAM Approved by: re (gjb) Added: stable/11/contrib/openpam/m4/ - copied from r313975, head/contrib/openpam/m4/ stable/11/contrib/openpam/m4/ax_pkg_config.m4 - copied unchanged from r344533, head/contrib/openpam/m4/ax_pkg_config.m4 stable/11/contrib/openpam/misc/Makefile.am - copied unchanged from r313975, head/contrib/openpam/misc/Makefile.am stable/11/contrib/openpam/misc/Makefile.in - copied, changed from r313975, head/contrib/openpam/misc/Makefile.in stable/11/contrib/openpam/misc/coverage.sh.in - copied unchanged from r313975, head/contrib/openpam/misc/coverage.sh.in stable/11/contrib/openpam/misc/coverity.sh.in - copied unchanged from r313975, head/contrib/openpam/misc/coverity.sh.in stable/11/contrib/openpam/modules/pam_return/ - copied from r313975, head/contrib/openpam/modules/pam_return/ stable/11/contrib/openpam/t/t_openpam_dispatch.c - copied, changed from r313975, head/contrib/openpam/t/t_openpam_dispatch.c stable/11/contrib/openpam/t/t_pam_conv.c - copied, changed from r313975, head/contrib/openpam/t/t_pam_conv.c stable/11/contrib/openpam/t/t_pam_conv.h - copied, changed from r313975, head/contrib/openpam/t/t_pam_conv.h stable/11/contrib/openpam/t/t_pam_env.c - copied unchanged from r344533, head/contrib/openpam/t/t_pam_env.c stable/11/contrib/openpam/t/t_pam_err.c - copied unchanged from r344533, head/contrib/openpam/t/t_pam_err.c stable/11/contrib/openpam/t/t_pam_err.h - copied unchanged from r344533, head/contrib/openpam/t/t_pam_err.h Deleted: stable/11/contrib/openpam/pamgdb.in stable/11/contrib/openpam/t/t.h stable/11/contrib/openpam/t/t_file.c stable/11/contrib/openpam/t/t_main.c stable/11/lib/libpam/libpam/tests/ Modified: stable/11/contrib/openpam/CREDITS stable/11/contrib/openpam/HISTORY stable/11/contrib/openpam/LICENSE stable/11/contrib/openpam/Makefile.am stable/11/contrib/openpam/Makefile.in stable/11/contrib/openpam/README stable/11/contrib/openpam/RELNOTES stable/11/contrib/openpam/TODO stable/11/contrib/openpam/aclocal.m4 stable/11/contrib/openpam/autogen.sh stable/11/contrib/openpam/bin/Makefile.am stable/11/contrib/openpam/bin/Makefile.in stable/11/contrib/openpam/bin/openpam_dump_policy/Makefile.am stable/11/contrib/openpam/bin/openpam_dump_policy/Makefile.in stable/11/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c stable/11/contrib/openpam/bin/pamtest/Makefile.am stable/11/contrib/openpam/bin/pamtest/Makefile.in stable/11/contrib/openpam/bin/pamtest/pamtest.1 stable/11/contrib/openpam/bin/pamtest/pamtest.c stable/11/contrib/openpam/bin/su/Makefile.am stable/11/contrib/openpam/bin/su/Makefile.in stable/11/contrib/openpam/bin/su/su.1 stable/11/contrib/openpam/bin/su/su.c stable/11/contrib/openpam/compile stable/11/contrib/openpam/config.guess stable/11/contrib/openpam/config.h.in stable/11/contrib/openpam/config.sub stable/11/contrib/openpam/configure stable/11/contrib/openpam/configure.ac stable/11/contrib/openpam/depcomp stable/11/contrib/openpam/doc/Makefile.am stable/11/contrib/openpam/doc/Makefile.in stable/11/contrib/openpam/doc/man/Makefile.am stable/11/contrib/openpam/doc/man/Makefile.in stable/11/contrib/openpam/doc/man/openpam.3 stable/11/contrib/openpam/doc/man/openpam.man stable/11/contrib/openpam/doc/man/openpam_borrow_cred.3 stable/11/contrib/openpam/doc/man/openpam_free_data.3 stable/11/contrib/openpam/doc/man/openpam_free_envlist.3 stable/11/contrib/openpam/doc/man/openpam_get_feature.3 stable/11/contrib/openpam/doc/man/openpam_get_option.3 stable/11/contrib/openpam/doc/man/openpam_log.3 stable/11/contrib/openpam/doc/man/openpam_nullconv.3 stable/11/contrib/openpam/doc/man/openpam_readline.3 stable/11/contrib/openpam/doc/man/openpam_readlinev.3 stable/11/contrib/openpam/doc/man/openpam_readword.3 stable/11/contrib/openpam/doc/man/openpam_restore_cred.3 stable/11/contrib/openpam/doc/man/openpam_set_feature.3 stable/11/contrib/openpam/doc/man/openpam_set_option.3 stable/11/contrib/openpam/doc/man/openpam_straddch.3 stable/11/contrib/openpam/doc/man/openpam_subst.3 stable/11/contrib/openpam/doc/man/openpam_ttyconv.3 stable/11/contrib/openpam/doc/man/pam.3 stable/11/contrib/openpam/doc/man/pam.conf.5 stable/11/contrib/openpam/doc/man/pam.man stable/11/contrib/openpam/doc/man/pam_acct_mgmt.3 stable/11/contrib/openpam/doc/man/pam_authenticate.3 stable/11/contrib/openpam/doc/man/pam_chauthtok.3 stable/11/contrib/openpam/doc/man/pam_close_session.3 stable/11/contrib/openpam/doc/man/pam_conv.3 stable/11/contrib/openpam/doc/man/pam_end.3 stable/11/contrib/openpam/doc/man/pam_error.3 stable/11/contrib/openpam/doc/man/pam_get_authtok.3 stable/11/contrib/openpam/doc/man/pam_get_data.3 stable/11/contrib/openpam/doc/man/pam_get_item.3 stable/11/contrib/openpam/doc/man/pam_get_user.3 stable/11/contrib/openpam/doc/man/pam_getenv.3 stable/11/contrib/openpam/doc/man/pam_getenvlist.3 stable/11/contrib/openpam/doc/man/pam_info.3 stable/11/contrib/openpam/doc/man/pam_open_session.3 stable/11/contrib/openpam/doc/man/pam_prompt.3 stable/11/contrib/openpam/doc/man/pam_putenv.3 stable/11/contrib/openpam/doc/man/pam_set_data.3 stable/11/contrib/openpam/doc/man/pam_set_item.3 stable/11/contrib/openpam/doc/man/pam_setcred.3 stable/11/contrib/openpam/doc/man/pam_setenv.3 stable/11/contrib/openpam/doc/man/pam_sm_acct_mgmt.3 stable/11/contrib/openpam/doc/man/pam_sm_authenticate.3 stable/11/contrib/openpam/doc/man/pam_sm_chauthtok.3 stable/11/contrib/openpam/doc/man/pam_sm_close_session.3 stable/11/contrib/openpam/doc/man/pam_sm_open_session.3 stable/11/contrib/openpam/doc/man/pam_sm_setcred.3 stable/11/contrib/openpam/doc/man/pam_start.3 stable/11/contrib/openpam/doc/man/pam_strerror.3 stable/11/contrib/openpam/doc/man/pam_verror.3 stable/11/contrib/openpam/doc/man/pam_vinfo.3 stable/11/contrib/openpam/doc/man/pam_vprompt.3 stable/11/contrib/openpam/include/Makefile.am stable/11/contrib/openpam/include/Makefile.in stable/11/contrib/openpam/include/security/Makefile.am stable/11/contrib/openpam/include/security/Makefile.in stable/11/contrib/openpam/include/security/openpam.h stable/11/contrib/openpam/include/security/openpam_attr.h stable/11/contrib/openpam/include/security/openpam_version.h stable/11/contrib/openpam/include/security/pam_appl.h stable/11/contrib/openpam/include/security/pam_constants.h stable/11/contrib/openpam/include/security/pam_modules.h stable/11/contrib/openpam/include/security/pam_types.h stable/11/contrib/openpam/install-sh stable/11/contrib/openpam/lib/Makefile.am stable/11/contrib/openpam/lib/Makefile.in stable/11/contrib/openpam/lib/libpam/Makefile.am stable/11/contrib/openpam/lib/libpam/Makefile.in stable/11/contrib/openpam/lib/libpam/openpam_asprintf.c stable/11/contrib/openpam/lib/libpam/openpam_asprintf.h stable/11/contrib/openpam/lib/libpam/openpam_borrow_cred.c stable/11/contrib/openpam/lib/libpam/openpam_check_owner_perms.c stable/11/contrib/openpam/lib/libpam/openpam_configure.c stable/11/contrib/openpam/lib/libpam/openpam_constants.c stable/11/contrib/openpam/lib/libpam/openpam_constants.h stable/11/contrib/openpam/lib/libpam/openpam_cred.h stable/11/contrib/openpam/lib/libpam/openpam_ctype.h stable/11/contrib/openpam/lib/libpam/openpam_debug.h stable/11/contrib/openpam/lib/libpam/openpam_dispatch.c stable/11/contrib/openpam/lib/libpam/openpam_dlfunc.h stable/11/contrib/openpam/lib/libpam/openpam_dynamic.c stable/11/contrib/openpam/lib/libpam/openpam_features.c stable/11/contrib/openpam/lib/libpam/openpam_features.h stable/11/contrib/openpam/lib/libpam/openpam_findenv.c stable/11/contrib/openpam/lib/libpam/openpam_free_data.c stable/11/contrib/openpam/lib/libpam/openpam_free_envlist.c stable/11/contrib/openpam/lib/libpam/openpam_get_feature.c stable/11/contrib/openpam/lib/libpam/openpam_get_option.c stable/11/contrib/openpam/lib/libpam/openpam_impl.h stable/11/contrib/openpam/lib/libpam/openpam_load.c stable/11/contrib/openpam/lib/libpam/openpam_log.c stable/11/contrib/openpam/lib/libpam/openpam_nullconv.c stable/11/contrib/openpam/lib/libpam/openpam_readline.c stable/11/contrib/openpam/lib/libpam/openpam_readlinev.c stable/11/contrib/openpam/lib/libpam/openpam_readword.c stable/11/contrib/openpam/lib/libpam/openpam_restore_cred.c stable/11/contrib/openpam/lib/libpam/openpam_set_feature.c stable/11/contrib/openpam/lib/libpam/openpam_set_option.c stable/11/contrib/openpam/lib/libpam/openpam_static.c stable/11/contrib/openpam/lib/libpam/openpam_straddch.c stable/11/contrib/openpam/lib/libpam/openpam_strlcat.c stable/11/contrib/openpam/lib/libpam/openpam_strlcat.h stable/11/contrib/openpam/lib/libpam/openpam_strlcmp.h stable/11/contrib/openpam/lib/libpam/openpam_strlcpy.c stable/11/contrib/openpam/lib/libpam/openpam_strlcpy.h stable/11/contrib/openpam/lib/libpam/openpam_strlset.c stable/11/contrib/openpam/lib/libpam/openpam_strlset.h stable/11/contrib/openpam/lib/libpam/openpam_subst.c stable/11/contrib/openpam/lib/libpam/openpam_ttyconv.c stable/11/contrib/openpam/lib/libpam/openpam_vasprintf.c stable/11/contrib/openpam/lib/libpam/openpam_vasprintf.h stable/11/contrib/openpam/lib/libpam/pam_acct_mgmt.c stable/11/contrib/openpam/lib/libpam/pam_authenticate.c stable/11/contrib/openpam/lib/libpam/pam_authenticate_secondary.c stable/11/contrib/openpam/lib/libpam/pam_chauthtok.c stable/11/contrib/openpam/lib/libpam/pam_close_session.c stable/11/contrib/openpam/lib/libpam/pam_end.c stable/11/contrib/openpam/lib/libpam/pam_error.c stable/11/contrib/openpam/lib/libpam/pam_get_authtok.c stable/11/contrib/openpam/lib/libpam/pam_get_data.c stable/11/contrib/openpam/lib/libpam/pam_get_item.c stable/11/contrib/openpam/lib/libpam/pam_get_mapped_authtok.c stable/11/contrib/openpam/lib/libpam/pam_get_mapped_username.c stable/11/contrib/openpam/lib/libpam/pam_get_user.c stable/11/contrib/openpam/lib/libpam/pam_getenv.c stable/11/contrib/openpam/lib/libpam/pam_getenvlist.c stable/11/contrib/openpam/lib/libpam/pam_info.c stable/11/contrib/openpam/lib/libpam/pam_open_session.c stable/11/contrib/openpam/lib/libpam/pam_prompt.c stable/11/contrib/openpam/lib/libpam/pam_putenv.c stable/11/contrib/openpam/lib/libpam/pam_set_data.c stable/11/contrib/openpam/lib/libpam/pam_set_item.c stable/11/contrib/openpam/lib/libpam/pam_set_mapped_authtok.c stable/11/contrib/openpam/lib/libpam/pam_set_mapped_username.c stable/11/contrib/openpam/lib/libpam/pam_setcred.c stable/11/contrib/openpam/lib/libpam/pam_setenv.c stable/11/contrib/openpam/lib/libpam/pam_sm_acct_mgmt.c stable/11/contrib/openpam/lib/libpam/pam_sm_authenticate.c stable/11/contrib/openpam/lib/libpam/pam_sm_authenticate_secondary.c stable/11/contrib/openpam/lib/libpam/pam_sm_chauthtok.c stable/11/contrib/openpam/lib/libpam/pam_sm_close_session.c stable/11/contrib/openpam/lib/libpam/pam_sm_get_mapped_authtok.c stable/11/contrib/openpam/lib/libpam/pam_sm_get_mapped_username.c stable/11/contrib/openpam/lib/libpam/pam_sm_open_session.c stable/11/contrib/openpam/lib/libpam/pam_sm_set_mapped_authtok.c stable/11/contrib/openpam/lib/libpam/pam_sm_set_mapped_username.c stable/11/contrib/openpam/lib/libpam/pam_sm_setcred.c stable/11/contrib/openpam/lib/libpam/pam_start.c stable/11/contrib/openpam/lib/libpam/pam_strerror.c stable/11/contrib/openpam/lib/libpam/pam_verror.c stable/11/contrib/openpam/lib/libpam/pam_vinfo.c stable/11/contrib/openpam/lib/libpam/pam_vprompt.c stable/11/contrib/openpam/ltmain.sh stable/11/contrib/openpam/misc/gendoc.pl stable/11/contrib/openpam/missing stable/11/contrib/openpam/mkpkgng.in stable/11/contrib/openpam/modules/Makefile.am stable/11/contrib/openpam/modules/Makefile.in stable/11/contrib/openpam/modules/pam_deny/Makefile.am stable/11/contrib/openpam/modules/pam_deny/Makefile.in stable/11/contrib/openpam/modules/pam_deny/pam_deny.c stable/11/contrib/openpam/modules/pam_permit/Makefile.am stable/11/contrib/openpam/modules/pam_permit/Makefile.in stable/11/contrib/openpam/modules/pam_permit/pam_permit.c stable/11/contrib/openpam/modules/pam_return/Makefile.am stable/11/contrib/openpam/modules/pam_return/Makefile.in stable/11/contrib/openpam/modules/pam_return/pam_return.c stable/11/contrib/openpam/modules/pam_unix/Makefile.am stable/11/contrib/openpam/modules/pam_unix/Makefile.in stable/11/contrib/openpam/modules/pam_unix/pam_unix.c stable/11/contrib/openpam/t/Makefile.am stable/11/contrib/openpam/t/Makefile.in stable/11/contrib/openpam/t/t_openpam_ctype.c stable/11/contrib/openpam/t/t_openpam_readlinev.c stable/11/contrib/openpam/t/t_openpam_readword.c stable/11/contrib/openpam/test-driver stable/11/lib/libpam/libpam/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/openpam/CREDITS ============================================================================== --- stable/11/contrib/openpam/CREDITS Wed Jun 12 00:03:00 2019 (r348979) +++ stable/11/contrib/openpam/CREDITS Wed Jun 12 01:53:14 2019 (r348980) @@ -43,10 +43,12 @@ ideas: Mikhail Teterin <mi@aldan.algebra.com> Mikko Työläjärvi <mbsd@pacbell.net> Nick Hibma <nick@van-laarhoven.org> + Patrick Bihan-Faou <patrick-fbsd@mindstep.com> Robert Watson <rwatson@freebsd.org> Ruslan Ermilov <ru@freebsd.org> Sebastian Krahmer <sebastian.krahmer@gmail.com> Solar Designer <solar@openwall.com> Takanori Saneto <sanewo@ba2.so-net.ne.jp> + Tim Creech <tcreech@tcreech.com> Wojciech A. Koszek <wkoszek@freebsd.org> Yar Tikhiy <yar@freebsd.org> Modified: stable/11/contrib/openpam/HISTORY ============================================================================== --- stable/11/contrib/openpam/HISTORY Wed Jun 12 00:03:00 2019 (r348979) +++ stable/11/contrib/openpam/HISTORY Wed Jun 12 01:53:14 2019 (r348980) @@ -1,3 +1,49 @@ +OpenPAM Tabebuia 2019-02-24 + + - BUGFIX: Fix off-by-one bug in pam_getenv(3) which was introduced in + OpenPAM Radula. + + - ENHANCE: Add unit tests for pam_{get,put,set}env(3). +============================================================================ +OpenPAM Resedacea 2017-04-30 + + - BUGFIX: Reinstore the NULL check in pam_end(3) which was removed in + OpenPAM Radula, as it breaks common error-handling constructs. + + - BUGFIX: Return PAM_SYMBOL_ERR instead of PAM_SYSTEM_ERR from the + dispatcher when the required service function could not be found. + + - ENHANCE: Introduce the PAM_BAD_HANDLE error code for when pamh is + NULL in API functions that have a NULL check. + + - ENHANCE: Introduce the PAM_BAD_ITEM, PAM_BAD_FEATURE and + PAM_BAD_CONSTANT error codes for situations where we previously + incorrectly used PAM_SYMBOL_ERR to denote that an invalid constant + had been passed to an API function. + + - ENHANCE: Improve the RETURN VALUES section in API man pages, + especially for functions that cannot fail, which were incorrectly + documented as returning -1 on failure. +============================================================================ +OpenPAM Radula 2017-02-19 + + - BUGFIX: Fix an inverted test which prevented pam_get_authtok(3) and + pam_get_user(3) from using application-provided custom prompts. + + - BUGFIX: Plug a memory leak in pam_set_item(3). + + - BUGFIX: Plug a potential memory leak in openpam_readlinev(3). + + - BUGFIX: In openpam_readword(3), support line continuations within + whitespace. + + - ENHANCE: Add a feature flag to control fallback to "other" policy. + + - ENHANCE: Add a pam_return(8) module which returns an arbitrary + code specified in the module options. + + - ENHANCE: More and better unit tests. +============================================================================ OpenPAM Ourouparia 2014-09-12 - ENHANCE: When executing a chain, require at least one service Modified: stable/11/contrib/openpam/LICENSE ============================================================================== --- stable/11/contrib/openpam/LICENSE Wed Jun 12 00:03:00 2019 (r348979) +++ stable/11/contrib/openpam/LICENSE Wed Jun 12 01:53:14 2019 (r348980) @@ -1,6 +1,6 @@ Copyright (c) 2002-2003 Networks Associates Technology, Inc. -Copyright (c) 2004-2012 Dag-Erling Smørgrav +Copyright (c) 2004-2019 Dag-Erling Smørgrav All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and Modified: stable/11/contrib/openpam/Makefile.am ============================================================================== --- stable/11/contrib/openpam/Makefile.am Wed Jun 12 00:03:00 2019 (r348979) +++ stable/11/contrib/openpam/Makefile.am Wed Jun 12 01:53:14 2019 (r348980) @@ -1,8 +1,8 @@ -# $Id: Makefile.am 816 2014-09-12 07:50:22Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = lib bin modules include +SUBDIRS = misc include lib bin modules if WITH_DOC SUBDIRS += doc Modified: stable/11/contrib/openpam/Makefile.in ============================================================================== --- stable/11/contrib/openpam/Makefile.in Wed Jun 12 00:03:00 2019 (r348979) +++ stable/11/contrib/openpam/Makefile.in Wed Jun 12 01:53:14 2019 (r348980) @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,9 +14,19 @@ @SET_MAKE@ -# $Id: Makefile.am 816 2014-09-12 07:50:22Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,20 +91,20 @@ build_triplet = @build@ host_triplet = @host@ @WITH_DOC_TRUE@am__append_1 = doc subdir = . -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 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/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 \ + $(am__configure_deps) $(am__DIST_COMMON) 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 mkpkgng +CONFIG_CLEAN_FILES = mkpkgng CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -130,7 +140,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck + cscope distdir distdir-am 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, @@ -152,7 +162,10 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags CSCOPE = cscope -DIST_SUBDIRS = lib bin modules include doc t +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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -208,8 +221,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ +CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -238,6 +252,7 @@ LIB_MAJ = @LIB_MAJ@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -256,11 +271,15 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEM_LIBPAM = @SYSTEM_LIBPAM@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -303,6 +322,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -315,7 +335,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = lib bin modules include $(am__append_1) t +SUBDIRS = misc include lib bin modules $(am__append_1) t EXTRA_DIST = \ CREDITS \ HISTORY \ @@ -345,15 +365,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__c echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -379,8 +398,6 @@ $(srcdir)/config.h.in: $(am__configure_deps) 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 $@ @@ -499,7 +516,10 @@ 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) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -564,7 +584,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -580,17 +600,17 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @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 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives 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 + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -608,7 +628,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -618,22 +638,23 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -809,6 +830,8 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. Modified: stable/11/contrib/openpam/README ============================================================================== --- stable/11/contrib/openpam/README Wed Jun 12 00:03:00 2019 (r348979) +++ stable/11/contrib/openpam/README Wed Jun 12 01:53:14 2019 (r348980) @@ -7,19 +7,4 @@ implementations disagree, OpenPAM tries to remain comp Solaris, at the expense of XSSO conformance and Linux-PAM compatibility. -These are some of OpenPAM's features: - - - Implements the complete PAM API as described in the original PAM - paper and in OSF-RFC 86.0; this corresponds to the full XSSO API - except for mappings and secondary authentication. Also - implements some extensions found in Solaris 9. - - - Extends the API with several useful and time-saving functions. - - - Performs strict checking of return values from service modules. - - - Reads configuration from /etc/pam.d/, /etc/pam.conf, - /usr/local/etc/pam.d/ and /usr/local/etc/pam.conf, in that order; - this will be made configurable in a future release. - Please direct bug reports and inquiries to <des@des.no>. Modified: stable/11/contrib/openpam/RELNOTES ============================================================================== --- stable/11/contrib/openpam/RELNOTES Wed Jun 12 00:03:00 2019 (r348979) +++ stable/11/contrib/openpam/RELNOTES Wed Jun 12 01:53:14 2019 (r348980) @@ -1,22 +1,21 @@ - Release notes for OpenPAM Ourouparia - ==================================== + Release notes for OpenPAM Tabebuia + ================================== -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. +OpenPAM is developed primarily on FreeBSD, but is expected to work on +almost any POSIX-like platform that has GNU autotools, GNU make and +the GNU compiler suite installed. -The distribution consists of the following components: +The OpenPAM distribution consists of the following components: - 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. + application (su) which demonstrate how to use the PAM library. - A test application (pamtest) which can be used to test policies and modules. - - Unit tests for limited portions of the libraries. + - Unit tests for limited portions of the library. Please direct bug reports and inquiries to <des@des.no>. Modified: stable/11/contrib/openpam/TODO ============================================================================== --- stable/11/contrib/openpam/TODO Wed Jun 12 00:03:00 2019 (r348979) +++ stable/11/contrib/openpam/TODO Wed Jun 12 01:53:14 2019 (r348980) @@ -1,15 +1,9 @@ -Before the next release: +- 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) - - Rewrite openpam_ttyconv(3). - - mostly done, needs review. +- Add loop detection to openpam_load_chain(). - - 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) +- Complete unit tests for openpam_dispatch(). - - Add loop detection to openpam_load_chain(). - - - 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(). +- Stop using PAM_SYMBOL_ERR incorrectly. Modified: stable/11/contrib/openpam/aclocal.m4 ============================================================================== --- stable/11/contrib/openpam/aclocal.m4 Wed Jun 12 00:03:00 2019 (r348979) +++ stable/11/contrib/openpam/aclocal.m4 Wed Jun 12 01:53:14 2019 (r348980) @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,8595 +20,8 @@ You have another version of autoconf. It may work, bu 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) 2002-2018 Free Software Foundation, Inc. # -# 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 - -_LT_CHECK_OBJDIR - -m4_require([_LT_TAG_COMPILER])dnl - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC - fi - ;; -esac - -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_LT_CONFIG_COMMANDS -])# _LT_SETUP - - -# _LT_PREPARE_SED_QUOTE_VARS -# -------------------------- -# Define a few sed substitution that help us do robust quoting. -m4_defun([_LT_PREPARE_SED_QUOTE_VARS], -[# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -]) - -# _LT_PROG_LTMAIN -# --------------- -# Note that this code is called both from `configure', and `config.status' -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, -# so we pass a copy along to make sure it has a sensible value anyway. -m4_defun([_LT_PROG_LTMAIN], -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" -])# _LT_PROG_LTMAIN - - - -# So that we can recreate a full libtool script including additional -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' -# label. - - -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) - - -# _LT_CONFIG_LIBTOOL([COMMANDS]) -# ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) - - -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) - - -# _LT_FORMAT_COMMENT([COMMENT]) -# ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - - - - - -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) -]) - - -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - - -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) - - -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) - - -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) - - -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) - - -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[m4_assert([$# <= 2])dnl -_$0(m4_quote(m4_default([$1], [[, ]])), - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -m4_define([_lt_decl_varnames_tagged], -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) - - -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) - - -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -# ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME -# must have a single quote delimited value for this to work. -m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) - - -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -# -# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAGS -# ---------------- -# Output comment and list of tags supported by the script -m4_defun([_LT_LIBTOOL_TAGS], -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl -]) - - -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: -# -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -]) - - -# _LT_LIBTOOL_CONFIG_VARS -# ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -# section) are produced by _LT_LIBTOOL_TAG_VARS. -m4_defun([_LT_LIBTOOL_CONFIG_VARS], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - - -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - - -# _LT_CONFIG_COMMANDS -# ------------------- -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -# variables for single and double quote escaping we saved from calls -# to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS - - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$[]1 -_LTECHO_EOF' -} - -# Quote evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906120153.x5C1rFlk080113>