Page MenuHomeFreeBSD
Files F109860305

D28528.diff
No OneTemporary
Actions

D28528.diff
View Options

Index: contrib/openpam/CREDITS
===================================================================
--- contrib/openpam/CREDITS
+++ contrib/openpam/CREDITS
@@ -49,5 +49,6 @@
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>
Index: contrib/openpam/HISTORY
===================================================================
--- contrib/openpam/HISTORY
+++ contrib/openpam/HISTORY
@@ -1,3 +1,10 @@
+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
@@ -5,7 +12,7 @@
- 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.
Index: contrib/openpam/LICENSE
===================================================================
--- contrib/openpam/LICENSE
+++ contrib/openpam/LICENSE
@@ -1,6 +1,6 @@
Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-Copyright (c) 2004-2017 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
Index: contrib/openpam/Makefile.in
===================================================================
--- contrib/openpam/Makefile.in
+++ contrib/openpam/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -92,10 +92,10 @@
@WITH_DOC_TRUE@am__append_1 = doc
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 \
@@ -140,7 +140,7 @@
$(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,
@@ -221,9 +221,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -271,6 +271,9 @@
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@
@@ -319,6 +322,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -367,8 +371,8 @@
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)
@@ -512,7 +516,10 @@
-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'`; \
@@ -577,7 +584,7 @@
! -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
@@ -603,7 +610,7 @@
@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
@@ -621,7 +628,7 @@
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*) \
@@ -631,7 +638,7 @@
*.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
Index: contrib/openpam/RELNOTES
===================================================================
--- contrib/openpam/RELNOTES
+++ contrib/openpam/RELNOTES
@@ -1,6 +1,6 @@
- Release notes for OpenPAM Resedacea
- ===================================
+ Release notes for OpenPAM Tabebuia
+ ==================================
OpenPAM is developed primarily on FreeBSD, but is expected to work on
almost any POSIX-like platform that has GNU autotools, GNU make and
Index: contrib/openpam/aclocal.m4
===================================================================
--- contrib/openpam/aclocal.m4
+++ contrib/openpam/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2014 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,7 +20,7 @@
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-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[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.15], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@
# 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.15])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])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-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -332,13 +332,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 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_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -346,49 +345,41 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
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
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -397,18 +388,17 @@
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2014 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,
@@ -495,8 +485,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -563,7 +553,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -605,7 +595,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -626,7 +616,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -647,7 +637,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -655,49 +645,42 @@
# AM_MAKE_INCLUDE()
# -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+ ['0:this is the am__doit target'],
+ [AS_CASE([$s],
+ [BSD], [am__include='.include' am__quote='"'],
+ [am__include='include' am__quote=''])])
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -738,7 +721,7 @@
# Obsolete and "removed" macros, that must however still report explicit
# error messages when used, to smooth transition.
#
-# Copyright (C) 1996-2014 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,
@@ -765,7 +748,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -794,7 +777,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -841,7 +824,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -860,7 +843,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2014 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,
@@ -941,7 +924,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1001,7 +984,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1029,7 +1012,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1048,7 +1031,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1179,6 +1162,7 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([m4/ax_pkg_config.m4])
m4_include([m4/libtool.m4])
m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4])
Index: contrib/openpam/bin/Makefile.in
===================================================================
--- contrib/openpam/bin/Makefile.in
+++ contrib/openpam/bin/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -93,10 +93,10 @@
@WITH_SU_TRUE@am__append_2 = su
subdir = bin
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__DIST_COMMON)
@@ -138,7 +138,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- distdir
+ distdir distdir-am
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -199,9 +199,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -249,6 +249,9 @@
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@
@@ -297,6 +300,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -329,8 +333,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -447,7 +451,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Index: contrib/openpam/bin/openpam_dump_policy/Makefile.in
===================================================================
--- contrib/openpam/bin/openpam_dump_policy/Makefile.in
+++ contrib/openpam/bin/openpam_dump_policy/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -93,10 +93,10 @@
noinst_PROGRAMS = openpam_dump_policy$(EXEEXT)
subdir = bin/openpam_dump_policy
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__DIST_COMMON)
@@ -129,7 +129,8 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/openpam_dump_policy.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -190,9 +191,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -240,6 +241,9 @@
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@
@@ -288,6 +292,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -324,8 +329,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -356,7 +361,13 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dump_policy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dump_policy.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -437,7 +448,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -507,7 +521,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/openpam_dump_policy.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -553,7 +567,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/openpam_dump_policy.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -574,9 +588,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+ clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
+ ctags ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
Index: contrib/openpam/bin/pamtest/Makefile.in
===================================================================
--- contrib/openpam/bin/pamtest/Makefile.in
+++ contrib/openpam/bin/pamtest/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -93,10 +93,10 @@
bin_PROGRAMS = pamtest$(EXEEXT)
subdir = bin/pamtest
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__DIST_COMMON)
@@ -129,7 +129,8 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/pamtest.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -221,9 +222,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -271,6 +272,9 @@
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@
@@ -319,6 +323,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -356,8 +361,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -428,7 +433,13 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pamtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pamtest.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -550,7 +561,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -622,7 +636,7 @@
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/pamtest.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -668,7 +682,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/pamtest.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -691,7 +705,7 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
ctags ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
Index: contrib/openpam/bin/pamtest/pamtest.1
===================================================================
--- contrib/openpam/bin/pamtest/pamtest.1
+++ contrib/openpam/bin/pamtest/pamtest.1
@@ -26,9 +26,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $OpenPAM: pamtest.1 939 2017-04-30 21:36:50Z des $
+.\" $OpenPAM: pamtest.1 947 2019-02-24 20:18:17Z des $
.\"
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAMTEST 1
.Os
.Sh NAME
Index: contrib/openpam/bin/su/Makefile.in
===================================================================
--- contrib/openpam/bin/su/Makefile.in
+++ contrib/openpam/bin/su/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -93,10 +93,10 @@
bin_PROGRAMS = su$(EXEEXT)
subdir = bin/su
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__DIST_COMMON)
@@ -129,7 +129,8 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/su.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -221,9 +222,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -271,6 +272,9 @@
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@
@@ -319,6 +323,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -356,8 +361,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -428,7 +433,13 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/su.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/su.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -550,7 +561,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -622,7 +636,7 @@
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/su.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -668,7 +682,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/su.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -691,7 +705,7 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
ctags ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
Index: contrib/openpam/bin/su/su.1
===================================================================
--- contrib/openpam/bin/su/su.1
+++ contrib/openpam/bin/su/su.1
@@ -26,9 +26,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $OpenPAM: su.1 939 2017-04-30 21:36:50Z des $
+.\" $OpenPAM: su.1 947 2019-02-24 20:18:17Z des $
.\"
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt SU 1
.Os
.Sh NAME
Index: contrib/openpam/compile
===================================================================
--- contrib/openpam/compile
+++ contrib/openpam/compile
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -255,7 +255,8 @@
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
Index: contrib/openpam/config.h.in
===================================================================
--- contrib/openpam/config.h.in
+++ contrib/openpam/config.h.in
@@ -6,6 +6,9 @@
/* Define to 1 if you have the `asprintf' function. */
#undef HAVE_ASPRINTF
+/* Define to 1 if you have cryb-test */
+#undef HAVE_CRYB_TEST
+
/* Define to 1 if you have the <crypt.h> header file. */
#undef HAVE_CRYPT_H
@@ -24,12 +27,6 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define to 1 if you have the `crypt' library (-lcrypt). */
-#undef HAVE_LIBCRYPT
-
-/* Define to 1 if you have the `crypto' library (-lcrypto). */
-#undef HAVE_LIBCRYPTO
-
/* Define to 1 if you have the `dl' library (-ldl). */
#undef HAVE_LIBDL
Index: contrib/openpam/config.sub
===================================================================
--- contrib/openpam/config.sub
+++ contrib/openpam/config.sub
@@ -300,7 +300,7 @@
| ns16k | ns32k \
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
@@ -426,7 +426,7 @@
| or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | powerpcspe-* \
| pyramid-* \
| rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
Index: contrib/openpam/configure
===================================================================
--- contrib/openpam/configure
+++ contrib/openpam/configure
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac OpenPAM: configure.ac 939 2017-04-30 21:36:50Z des .
+# From configure.ac OpenPAM: configure.ac 947 2019-02-24 20:18:17Z des .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenPAM 20170430.
+# Generated by GNU Autoconf 2.69 for OpenPAM 20190224.
#
# Report bugs to <des@des.no>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='OpenPAM'
PACKAGE_TARNAME='openpam'
-PACKAGE_VERSION='20170430'
-PACKAGE_STRING='OpenPAM 20170430'
+PACKAGE_VERSION='20190224'
+PACKAGE_STRING='OpenPAM 20190224'
PACKAGE_BUGREPORT='des@des.no'
PACKAGE_URL='http://www.openpam.org/'
@@ -638,10 +638,12 @@
LIBOBJS
WITH_TEST_FALSE
WITH_TEST_TRUE
+HAVE_CRYB_TEST_FALSE
+HAVE_CRYB_TEST_TRUE
+CRYB_TEST_VERSION
CRYB_TEST_LIBS
+CRYB_TEST_CFLAGS
SYSTEM_LIBPAM
-CRYPTO_LIBS
-CRYPT_LIBS
DL_LIBS
WITH_SYSTEM_LIBPAM_FALSE
WITH_SYSTEM_LIBPAM_TRUE
@@ -657,6 +659,10 @@
CUSTOM_MODULES_DIR_TRUE
OPENPAM_MODULES_DIR
LIB_MAJ
+pkgconfigdir
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
LT_SYS_LIBRARY_PATH
OTOOL64
OTOOL
@@ -695,7 +701,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
OBJEXT
@@ -769,7 +774,8 @@
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -783,6 +789,7 @@
with_gnu_ld
with_sysroot
enable_libtool_lock
+with_pkgconfigdir
enable_debug
enable_unversioned_modules
with_modules_dir
@@ -804,7 +811,12 @@
LIBS
CPPFLAGS
CPP
-LT_SYS_LIBRARY_PATH'
+LT_SYS_LIBRARY_PATH
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+CRYB_TEST_CFLAGS
+CRYB_TEST_LIBS'
# Initialize some variables set by options.
@@ -1345,7 +1357,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures OpenPAM 20170430 to adapt to many kinds of systems.
+\`configure' configures OpenPAM 20190224 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1415,7 +1427,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenPAM 20170430:";;
+ short | recursive ) echo "Configuration of OpenPAM 20190224:";;
esac
cat <<\_ACEOF
@@ -1454,6 +1466,8 @@
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot[=DIR] Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
+ --with-pkgconfigdir installation directory for .pc files
+ [LIBDIR/pkgconfig]
--with-modules-dir=DIR OpenPAM modules directory
--without-doc do not build documentation
--with-pam-unix build sample pam_unix(8) module
@@ -1472,6 +1486,15 @@
CPP C preprocessor
LT_SYS_LIBRARY_PATH
User-defined run-time library search path.
+ PKG_CONFIG path to pkg-config binary
+ PKG_CONFIG_PATH
+ list of directories to prepend to default search path
+ PKG_CONFIG_LIBDIR
+ list of directories to search instead of default search path
+ CRYB_TEST_CFLAGS
+ C compiler flags for cryb-test
+ CRYB_TEST_LIBS
+ linker flags for cryb-test
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1540,7 +1563,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenPAM configure 20170430
+OpenPAM configure 20190224
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1909,7 +1932,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by OpenPAM $as_me 20170430, which was
+It was created by OpenPAM $as_me 20190224, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2259,7 +2282,7 @@
-am__api_version='1.15'
+am__api_version='1.16'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2774,7 +2797,7 @@
# Define the identity of the package.
PACKAGE='openpam'
- VERSION='20170430'
+ VERSION='20190224'
cat >>confdefs.h <<_ACEOF
@@ -2804,8 +2827,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -2856,7 +2879,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -3728,45 +3751,45 @@
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ case $?:`cat confinc.out 2>/dev/null` in #(
+ '0:this is the am__doit target') :
+ case $s in #(
+ BSD) :
+ am__include='.include' am__quote='"' ;; #(
+ *) :
+ am__include='include' am__quote='' ;;
+esac ;; #(
+ *) :
;;
- esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
+esac
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
@@ -12502,6 +12525,144 @@
+# pkg-config
+
+
+
+
+
+ if test x"${PKG_CONFIG}" = x"" ; then
+ for ac_prog in pkgconf pkg-config
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$PKG_CONFIG" && break
+done
+ >/dev/null
+ else
+ # Extract the first word of "${PKG_CONFIG}", so it can be a program name with args.
+set dummy ${PKG_CONFIG}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config or pkgconf" >&5
+$as_echo_n "checking for pkg-config or pkgconf... " >&6; }
+ if test -x "${PKG_CONFIG}" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${PKG_CONFIG}" >&5
+$as_echo "${PKG_CONFIG}" >&6; }
+ case "${PKG_CONFIG}" in
+ *pkgconf)
+ _min_version="1.3.0"
+ ;;
+ *pkg-config)
+ _min_version="0.23"
+ ;;
+ *)
+ _min_version="9.9.error"
+ ;;
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that ${PKG_CONFIG} is at least version ${_min_version}" >&5
+$as_echo_n "checking that ${PKG_CONFIG} is at least version ${_min_version}... " >&6; }
+ _act_version=`"${PKG_CONFIG}" --version`
+ if ! "${PKG_CONFIG}" --atleast-pkgconfig-version="${_min_version}" ; then
+ PKG_CONFIG=""
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_act_version}" >&5
+$as_echo "${_act_version}" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+ if test x"${PKG_CONFIG}" = x"" ; then
+ as_fn_error $? "pkg-config was not found or is too old" "$LINENO" 5
+ fi
+
+# Check whether --with-pkgconfigdir was given.
+if test "${with_pkgconfigdir+set}" = set; then :
+ withval=$with_pkgconfigdir; pkgconfigdir=$withval
+else
+ pkgconfigdir='${libdir}/pkgconfig'
+fi
+
+ pkgconfigdir=$pkgconfigdir
+
+
+
# other programs
@@ -12766,108 +12927,6 @@
LIBS="${saved_LIBS}"
-saved_LIBS="${LIBS}"
-LIBS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-$as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if ${ac_cv_lib_crypt_crypt+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char crypt ();
-int
-main ()
-{
-return crypt ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_crypt_crypt=yes
-else
- ac_cv_lib_crypt_crypt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
-$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCRYPT 1
-_ACEOF
-
- LIBS="-lcrypt $LIBS"
-
-fi
-
-CRYPT_LIBS="${LIBS}"
-LIBS="${saved_LIBS}"
-
-
-saved_LIBS="${LIBS}"
-LIBS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_CTX_init in -lcrypto" >&5
-$as_echo_n "checking for HMAC_CTX_init in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_HMAC_CTX_init+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char HMAC_CTX_init ();
-int
-main ()
-{
-return HMAC_CTX_init ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_crypto_HMAC_CTX_init=yes
-else
- ac_cv_lib_crypto_HMAC_CTX_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_HMAC_CTX_init" >&5
-$as_echo "$ac_cv_lib_crypto_HMAC_CTX_init" >&6; }
-if test "x$ac_cv_lib_crypto_HMAC_CTX_init" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCRYPTO 1
-_ACEOF
-
- LIBS="-lcrypto $LIBS"
-
-fi
-
-CRYPTO_LIBS="${LIBS}"
-LIBS="${saved_LIBS}"
-
-
saved_LIBS="${LIBS}"
LIBS=""
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
@@ -12919,75 +12978,79 @@
LIBS="${saved_LIBS}"
-save_LIBS="${LIBS}"
-LIBS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cryb_test_version" >&5
-$as_echo_n "checking for library containing cryb_test_version... " >&6; }
-if ${ac_cv_search_cryb_test_version+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char cryb_test_version ();
-int
-main ()
-{
-return cryb_test_version ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' cryb-test; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_cryb_test_version=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_cryb_test_version+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_cryb_test_version+:} false; then :
-else
- ac_cv_search_cryb_test_version=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_cryb_test_version" >&5
-$as_echo "$ac_cv_search_cryb_test_version" >&6; }
-ac_res=$ac_cv_search_cryb_test_version
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- CRYB_TEST_LIBS="${LIBS}"
-else
- CRYB_TEST_LIBS=""
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cryb-test library not available, unit tests disabled" >&5
-$as_echo "$as_me: WARNING: cryb-test library not available, unit tests disabled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if cryb-test is installed" >&5
+$as_echo_n "checking if cryb-test is installed... " >&6; }
+ if { { $as_echo "$as_me:${as_lineno-$LINENO}: \"\${PKG_CONFIG}\" --exists --print-errors \"cryb-test\""; } >&5
+ ("${PKG_CONFIG}" --exists --print-errors "cryb-test") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ ax_pc_cv_have_cryb_test=yes
+
+$as_echo "#define HAVE_CRYB_TEST 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking cryb-test version" >&5
+$as_echo_n "checking cryb-test version... " >&6; }
+
+
+
+ ax_pc_cv_cryb_test_version=`"${PKG_CONFIG}" --modversion cryb-test`
+
+ CRYB_TEST_VERSION=$ax_pc_cv_cryb_test_version
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ax_pc_cv_cryb_test_version:-unknown}" >&5
+$as_echo "${ax_pc_cv_cryb_test_version:-unknown}" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking cryb-test compiler flags" >&5
+$as_echo_n "checking cryb-test compiler flags... " >&6; }
+
+
+
+ ax_pc_cv_cryb_test_cflags=`"${PKG_CONFIG}" --cflags cryb-test`
+
+ CRYB_TEST_CFLAGS=$ax_pc_cv_cryb_test_cflags
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ax_pc_cv_cryb_test_cflags:-none}" >&5
+$as_echo "${ax_pc_cv_cryb_test_cflags:-none}" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking cryb-test linker flags" >&5
+$as_echo_n "checking cryb-test linker flags... " >&6; }
+
+
+
+ ax_pc_cv_cryb_test_libs=`"${PKG_CONFIG}" --libs cryb-test`
+
+ CRYB_TEST_LIBS=$ax_pc_cv_cryb_test_libs
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ax_pc_cv_cryb_test_libs:-none}" >&5
+$as_echo "${ax_pc_cv_cryb_test_libs:-none}" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Cryb test framework found, unit tests enabled." >&5
+$as_echo "$as_me: Cryb test framework found, unit tests enabled." >&6;}
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ ax_pc_cv_have_cryb_test=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cryb test framework not found, unit tests disabled." >&5
+$as_echo "$as_me: WARNING: Cryb test framework not found, unit tests disabled." >&2;}
+ fi
+
+ if test x"$ax_pc_cv_have_cryb_test" = x"yes"; then
+ HAVE_CRYB_TEST_TRUE=
+ HAVE_CRYB_TEST_FALSE='#'
+else
+ HAVE_CRYB_TEST_TRUE='#'
+ HAVE_CRYB_TEST_FALSE=
fi
-LIBS="${save_LIBS}"
- if test x"$CRYB_TEST_LIBS" != x"" ; then
+
+ if test x"$CRYB_TEST_LIBS" != x""; then
WITH_TEST_TRUE=
WITH_TEST_FALSE='#'
else
@@ -13176,6 +13239,10 @@
as_fn_error $? "conditional \"WITH_SYSTEM_LIBPAM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_CRYB_TEST_TRUE}" && test -z "${HAVE_CRYB_TEST_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_CRYB_TEST\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${WITH_TEST_TRUE}" && test -z "${WITH_TEST_FALSE}"; then
as_fn_error $? "conditional \"WITH_TEST\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -13577,7 +13644,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by OpenPAM $as_me 20170430, which was
+This file was extended by OpenPAM $as_me 20190224, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13644,7 +13711,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-OpenPAM config.status 20170430
+OpenPAM config.status 20190224
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -13763,7 +13830,7 @@
#
# INIT-COMMANDS
#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
# The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -14679,29 +14746,35 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ case $CONFIG_FILES in #(
+ *\'*) :
+ eval set x "$CONFIG_FILES" ;; #(
+ *) :
+ set x $CONFIG_FILES ;; #(
+ *) :
+ ;;
+esac
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$am_mf" : 'X\(//\)[^/]' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -14719,53 +14792,48 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
+ am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
}
- /^X\(\/\/\)$/{
+ /^X\/\(\/\/\)$/{
s//\1/
q
}
- /^X\(\/\).*/{
+ /^X\/\(\/\).*/{
s//\1/
q
}
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles" >&5
+ (cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. 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).
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ { am_dirpart=; unset am_dirpart;}
+ { am_filepart=; unset am_filepart;}
+ { am_mf=; unset am_mf;}
+ { am_rc=; unset am_rc;}
+ rm -f conftest-deps.mk
}
;;
"libtool":C)
Index: contrib/openpam/configure.ac
===================================================================
--- contrib/openpam/configure.ac
+++ contrib/openpam/configure.ac
@@ -1,8 +1,8 @@
-dnl $OpenPAM: configure.ac 939 2017-04-30 21:36:50Z des $
+dnl $OpenPAM: configure.ac 947 2019-02-24 20:18:17Z des $
AC_PREREQ([2.62])
-AC_REVISION([$OpenPAM: configure.ac 939 2017-04-30 21:36:50Z des $])
-AC_INIT([OpenPAM], [20170430], [des@des.no], [openpam], [http://www.openpam.org/])
+AC_REVISION([$OpenPAM: configure.ac 947 2019-02-24 20:18:17Z des $])
+AC_INIT([OpenPAM], [20190224], [des@des.no], [openpam], [http://www.openpam.org/])
AC_CONFIG_SRCDIR([lib/libpam/pam_start.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign])
@@ -22,6 +22,9 @@
LT_PREREQ([2.2.6])
LT_INIT([disable-static dlopen])
+# pkg-config
+AX_PROG_PKG_CONFIG
+
# other programs
AC_PROG_INSTALL
@@ -100,20 +103,6 @@
LIBS="${saved_LIBS}"
AC_SUBST(DL_LIBS)
-saved_LIBS="${LIBS}"
-LIBS=""
-AC_CHECK_LIB([crypt], [crypt])
-CRYPT_LIBS="${LIBS}"
-LIBS="${saved_LIBS}"
-AC_SUBST(CRYPT_LIBS)
-
-saved_LIBS="${LIBS}"
-LIBS=""
-AC_CHECK_LIB([crypto], [HMAC_CTX_init])
-CRYPTO_LIBS="${LIBS}"
-LIBS="${saved_LIBS}"
-AC_SUBST(CRYPTO_LIBS)
-
saved_LIBS="${LIBS}"
LIBS=""
AC_CHECK_LIB([pam], [pam_start])
@@ -121,17 +110,10 @@
LIBS="${saved_LIBS}"
AC_SUBST(SYSTEM_LIBPAM)
-save_LIBS="${LIBS}"
-LIBS=""
-AC_SEARCH_LIBS([cryb_test_version], [cryb-test], [
- CRYB_TEST_LIBS="${LIBS}"
-], [
- CRYB_TEST_LIBS=""
- AC_MSG_WARN([cryb-test library not available, unit tests disabled])
-])
-LIBS="${save_LIBS}"
-AC_SUBST(CRYB_TEST_LIBS)
-AM_CONDITIONAL([WITH_TEST], [ test x"$CRYB_TEST_LIBS" != x"" ])
+AX_PKG_CONFIG_CHECK([cryb-test],
+ [AC_MSG_NOTICE([Cryb test framework found, unit tests enabled.])],
+ [AC_MSG_WARN([Cryb test framework not found, unit tests disabled.])])
+AM_CONDITIONAL([WITH_TEST], [test x"$CRYB_TEST_LIBS" != x""])
AC_ARG_ENABLE([developer-warnings],
AS_HELP_STRING([--enable-developer-warnings], [enable strict warnings (default is NO)]),
Index: contrib/openpam/depcomp
===================================================================
--- contrib/openpam/depcomp
+++ contrib/openpam/depcomp
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -783,9 +783,9 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
Index: contrib/openpam/doc/Makefile.in
===================================================================
--- contrib/openpam/doc/Makefile.in
+++ contrib/openpam/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -91,10 +91,10 @@
host_triplet = @host@
subdir = doc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__DIST_COMMON)
@@ -136,7 +136,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- distdir
+ distdir distdir-am
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -197,9 +197,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -247,6 +247,9 @@
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@
@@ -295,6 +298,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -327,8 +331,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -445,7 +449,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Index: contrib/openpam/doc/man/Makefile.in
===================================================================
--- contrib/openpam/doc/man/Makefile.in
+++ contrib/openpam/doc/man/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -90,10 +90,10 @@
host_triplet = @host@
subdir = doc/man
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__DIST_COMMON)
@@ -170,9 +170,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -220,6 +220,9 @@
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@
@@ -268,6 +271,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -374,8 +378,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -481,7 +485,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Index: contrib/openpam/doc/man/openpam.3
===================================================================
--- contrib/openpam/doc/man/openpam.3
+++ contrib/openpam/doc/man/openpam.3
@@ -1,5 +1,5 @@
.\" Generated by gendoc.pl
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_borrow_cred.3
===================================================================
--- contrib/openpam/doc/man/openpam_borrow_cred.3
+++ contrib/openpam/doc/man/openpam_borrow_cred.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_borrow_cred.c by gendoc.pl
.\" $OpenPAM: openpam_borrow_cred.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_BORROW_CRED 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_free_data.3
===================================================================
--- contrib/openpam/doc/man/openpam_free_data.3
+++ contrib/openpam/doc/man/openpam_free_data.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_free_data.c by gendoc.pl
.\" $OpenPAM: openpam_free_data.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_FREE_DATA 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_free_envlist.3
===================================================================
--- contrib/openpam/doc/man/openpam_free_envlist.3
+++ contrib/openpam/doc/man/openpam_free_envlist.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_free_envlist.c by gendoc.pl
.\" $OpenPAM: openpam_free_envlist.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_FREE_ENVLIST 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_get_feature.3
===================================================================
--- contrib/openpam/doc/man/openpam_get_feature.3
+++ contrib/openpam/doc/man/openpam_get_feature.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_get_feature.c by gendoc.pl
.\" $OpenPAM: openpam_get_feature.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_GET_FEATURE 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_get_option.3
===================================================================
--- contrib/openpam/doc/man/openpam_get_option.3
+++ contrib/openpam/doc/man/openpam_get_option.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_get_option.c by gendoc.pl
.\" $OpenPAM: openpam_get_option.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_GET_OPTION 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_log.3
===================================================================
--- contrib/openpam/doc/man/openpam_log.3
+++ contrib/openpam/doc/man/openpam_log.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_log.c by gendoc.pl
.\" $OpenPAM: openpam_log.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_LOG 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_nullconv.3
===================================================================
--- contrib/openpam/doc/man/openpam_nullconv.3
+++ contrib/openpam/doc/man/openpam_nullconv.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_nullconv.c by gendoc.pl
.\" $OpenPAM: openpam_nullconv.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_NULLCONV 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_readline.3
===================================================================
--- contrib/openpam/doc/man/openpam_readline.3
+++ contrib/openpam/doc/man/openpam_readline.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_readline.c by gendoc.pl
.\" $OpenPAM: openpam_readline.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_READLINE 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_readlinev.3
===================================================================
--- contrib/openpam/doc/man/openpam_readlinev.3
+++ contrib/openpam/doc/man/openpam_readlinev.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_readlinev.c by gendoc.pl
.\" $OpenPAM: openpam_readlinev.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_READLINEV 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_readword.3
===================================================================
--- contrib/openpam/doc/man/openpam_readword.3
+++ contrib/openpam/doc/man/openpam_readword.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_readword.c by gendoc.pl
.\" $OpenPAM: openpam_readword.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_READWORD 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_restore_cred.3
===================================================================
--- contrib/openpam/doc/man/openpam_restore_cred.3
+++ contrib/openpam/doc/man/openpam_restore_cred.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_restore_cred.c by gendoc.pl
.\" $OpenPAM: openpam_restore_cred.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_RESTORE_CRED 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_set_feature.3
===================================================================
--- contrib/openpam/doc/man/openpam_set_feature.3
+++ contrib/openpam/doc/man/openpam_set_feature.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_set_feature.c by gendoc.pl
.\" $OpenPAM: openpam_set_feature.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_SET_FEATURE 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_set_option.3
===================================================================
--- contrib/openpam/doc/man/openpam_set_option.3
+++ contrib/openpam/doc/man/openpam_set_option.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_set_option.c by gendoc.pl
.\" $OpenPAM: openpam_set_option.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_SET_OPTION 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_straddch.3
===================================================================
--- contrib/openpam/doc/man/openpam_straddch.3
+++ contrib/openpam/doc/man/openpam_straddch.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_straddch.c by gendoc.pl
.\" $OpenPAM: openpam_straddch.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_STRADDCH 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_subst.3
===================================================================
--- contrib/openpam/doc/man/openpam_subst.3
+++ contrib/openpam/doc/man/openpam_subst.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_subst.c by gendoc.pl
.\" $OpenPAM: openpam_subst.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_SUBST 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/openpam_ttyconv.3
===================================================================
--- contrib/openpam/doc/man/openpam_ttyconv.3
+++ contrib/openpam/doc/man/openpam_ttyconv.3
@@ -1,6 +1,6 @@
.\" Generated from openpam_ttyconv.c by gendoc.pl
.\" $OpenPAM: openpam_ttyconv.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt OPENPAM_TTYCONV 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam.3
===================================================================
--- contrib/openpam/doc/man/pam.3
+++ contrib/openpam/doc/man/pam.3
@@ -1,5 +1,5 @@
.\" Generated by gendoc.pl
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam.conf.5
===================================================================
--- contrib/openpam/doc/man/pam.conf.5
+++ contrib/openpam/doc/man/pam.conf.5
@@ -26,9 +26,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $OpenPAM: pam.conf.5 939 2017-04-30 21:36:50Z des $
+.\" $OpenPAM: pam.conf.5 947 2019-02-24 20:18:17Z des $
.\"
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM.CONF 5
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_acct_mgmt.3
===================================================================
--- contrib/openpam/doc/man/pam_acct_mgmt.3
+++ contrib/openpam/doc/man/pam_acct_mgmt.3
@@ -1,6 +1,6 @@
.\" Generated from pam_acct_mgmt.c by gendoc.pl
.\" $OpenPAM: pam_acct_mgmt.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_ACCT_MGMT 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_authenticate.3
===================================================================
--- contrib/openpam/doc/man/pam_authenticate.3
+++ contrib/openpam/doc/man/pam_authenticate.3
@@ -1,6 +1,6 @@
.\" Generated from pam_authenticate.c by gendoc.pl
.\" $OpenPAM: pam_authenticate.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_AUTHENTICATE 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_chauthtok.3
===================================================================
--- contrib/openpam/doc/man/pam_chauthtok.3
+++ contrib/openpam/doc/man/pam_chauthtok.3
@@ -1,6 +1,6 @@
.\" Generated from pam_chauthtok.c by gendoc.pl
.\" $OpenPAM: pam_chauthtok.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_CHAUTHTOK 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_close_session.3
===================================================================
--- contrib/openpam/doc/man/pam_close_session.3
+++ contrib/openpam/doc/man/pam_close_session.3
@@ -1,6 +1,6 @@
.\" Generated from pam_close_session.c by gendoc.pl
.\" $OpenPAM: pam_close_session.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_CLOSE_SESSION 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_conv.3
===================================================================
--- contrib/openpam/doc/man/pam_conv.3
+++ contrib/openpam/doc/man/pam_conv.3
@@ -32,9 +32,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $OpenPAM: pam_conv.3 939 2017-04-30 21:36:50Z des $
+.\" $OpenPAM: pam_conv.3 947 2019-02-24 20:18:17Z des $
.\"
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_CONV 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_end.3
===================================================================
--- contrib/openpam/doc/man/pam_end.3
+++ contrib/openpam/doc/man/pam_end.3
@@ -1,6 +1,6 @@
.\" Generated from pam_end.c by gendoc.pl
.\" $OpenPAM: pam_end.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_END 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_error.3
===================================================================
--- contrib/openpam/doc/man/pam_error.3
+++ contrib/openpam/doc/man/pam_error.3
@@ -1,6 +1,6 @@
.\" Generated from pam_error.c by gendoc.pl
.\" $OpenPAM: pam_error.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_ERROR 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_get_authtok.3
===================================================================
--- contrib/openpam/doc/man/pam_get_authtok.3
+++ contrib/openpam/doc/man/pam_get_authtok.3
@@ -1,6 +1,6 @@
.\" Generated from pam_get_authtok.c by gendoc.pl
.\" $OpenPAM: pam_get_authtok.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_GET_AUTHTOK 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_get_data.3
===================================================================
--- contrib/openpam/doc/man/pam_get_data.3
+++ contrib/openpam/doc/man/pam_get_data.3
@@ -1,6 +1,6 @@
.\" Generated from pam_get_data.c by gendoc.pl
.\" $OpenPAM: pam_get_data.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_GET_DATA 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_get_item.3
===================================================================
--- contrib/openpam/doc/man/pam_get_item.3
+++ contrib/openpam/doc/man/pam_get_item.3
@@ -1,6 +1,6 @@
.\" Generated from pam_get_item.c by gendoc.pl
.\" $OpenPAM: pam_get_item.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_GET_ITEM 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_get_user.3
===================================================================
--- contrib/openpam/doc/man/pam_get_user.3
+++ contrib/openpam/doc/man/pam_get_user.3
@@ -1,6 +1,6 @@
.\" Generated from pam_get_user.c by gendoc.pl
.\" $OpenPAM: pam_get_user.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_GET_USER 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_getenv.3
===================================================================
--- contrib/openpam/doc/man/pam_getenv.3
+++ contrib/openpam/doc/man/pam_getenv.3
@@ -1,6 +1,6 @@
.\" Generated from pam_getenv.c by gendoc.pl
-.\" $OpenPAM: pam_getenv.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.\" $OpenPAM: pam_getenv.c 944 2019-02-22 09:49:12Z des $
+.Dd February 24, 2019
.Dt PAM_GETENV 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_getenvlist.3
===================================================================
--- contrib/openpam/doc/man/pam_getenvlist.3
+++ contrib/openpam/doc/man/pam_getenvlist.3
@@ -1,6 +1,6 @@
.\" Generated from pam_getenvlist.c by gendoc.pl
.\" $OpenPAM: pam_getenvlist.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_GETENVLIST 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_info.3
===================================================================
--- contrib/openpam/doc/man/pam_info.3
+++ contrib/openpam/doc/man/pam_info.3
@@ -1,6 +1,6 @@
.\" Generated from pam_info.c by gendoc.pl
.\" $OpenPAM: pam_info.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_INFO 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_open_session.3
===================================================================
--- contrib/openpam/doc/man/pam_open_session.3
+++ contrib/openpam/doc/man/pam_open_session.3
@@ -1,6 +1,6 @@
.\" Generated from pam_open_session.c by gendoc.pl
.\" $OpenPAM: pam_open_session.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_OPEN_SESSION 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_prompt.3
===================================================================
--- contrib/openpam/doc/man/pam_prompt.3
+++ contrib/openpam/doc/man/pam_prompt.3
@@ -1,6 +1,6 @@
.\" Generated from pam_prompt.c by gendoc.pl
.\" $OpenPAM: pam_prompt.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_PROMPT 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_putenv.3
===================================================================
--- contrib/openpam/doc/man/pam_putenv.3
+++ contrib/openpam/doc/man/pam_putenv.3
@@ -1,6 +1,6 @@
.\" Generated from pam_putenv.c by gendoc.pl
.\" $OpenPAM: pam_putenv.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_PUTENV 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_set_data.3
===================================================================
--- contrib/openpam/doc/man/pam_set_data.3
+++ contrib/openpam/doc/man/pam_set_data.3
@@ -1,6 +1,6 @@
.\" Generated from pam_set_data.c by gendoc.pl
.\" $OpenPAM: pam_set_data.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_SET_DATA 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_set_item.3
===================================================================
--- contrib/openpam/doc/man/pam_set_item.3
+++ contrib/openpam/doc/man/pam_set_item.3
@@ -1,6 +1,6 @@
.\" Generated from pam_set_item.c by gendoc.pl
.\" $OpenPAM: pam_set_item.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_SET_ITEM 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_setcred.3
===================================================================
--- contrib/openpam/doc/man/pam_setcred.3
+++ contrib/openpam/doc/man/pam_setcred.3
@@ -1,6 +1,6 @@
.\" Generated from pam_setcred.c by gendoc.pl
.\" $OpenPAM: pam_setcred.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_SETCRED 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_setenv.3
===================================================================
--- contrib/openpam/doc/man/pam_setenv.3
+++ contrib/openpam/doc/man/pam_setenv.3
@@ -1,6 +1,6 @@
.\" Generated from pam_setenv.c by gendoc.pl
.\" $OpenPAM: pam_setenv.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_SETENV 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_sm_acct_mgmt.3
===================================================================
--- contrib/openpam/doc/man/pam_sm_acct_mgmt.3
+++ contrib/openpam/doc/man/pam_sm_acct_mgmt.3
@@ -1,6 +1,6 @@
.\" Generated from pam_sm_acct_mgmt.c by gendoc.pl
.\" $OpenPAM: pam_sm_acct_mgmt.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_SM_ACCT_MGMT 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_sm_authenticate.3
===================================================================
--- contrib/openpam/doc/man/pam_sm_authenticate.3
+++ contrib/openpam/doc/man/pam_sm_authenticate.3
@@ -1,6 +1,6 @@
.\" Generated from pam_sm_authenticate.c by gendoc.pl
.\" $OpenPAM: pam_sm_authenticate.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_SM_AUTHENTICATE 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_sm_chauthtok.3
===================================================================
--- contrib/openpam/doc/man/pam_sm_chauthtok.3
+++ contrib/openpam/doc/man/pam_sm_chauthtok.3
@@ -1,6 +1,6 @@
.\" Generated from pam_sm_chauthtok.c by gendoc.pl
.\" $OpenPAM: pam_sm_chauthtok.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_SM_CHAUTHTOK 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_sm_close_session.3
===================================================================
--- contrib/openpam/doc/man/pam_sm_close_session.3
+++ contrib/openpam/doc/man/pam_sm_close_session.3
@@ -1,6 +1,6 @@
.\" Generated from pam_sm_close_session.c by gendoc.pl
.\" $OpenPAM: pam_sm_close_session.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_SM_CLOSE_SESSION 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_sm_open_session.3
===================================================================
--- contrib/openpam/doc/man/pam_sm_open_session.3
+++ contrib/openpam/doc/man/pam_sm_open_session.3
@@ -1,6 +1,6 @@
.\" Generated from pam_sm_open_session.c by gendoc.pl
.\" $OpenPAM: pam_sm_open_session.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_SM_OPEN_SESSION 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_sm_setcred.3
===================================================================
--- contrib/openpam/doc/man/pam_sm_setcred.3
+++ contrib/openpam/doc/man/pam_sm_setcred.3
@@ -1,6 +1,6 @@
.\" Generated from pam_sm_setcred.c by gendoc.pl
.\" $OpenPAM: pam_sm_setcred.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_SM_SETCRED 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_start.3
===================================================================
--- contrib/openpam/doc/man/pam_start.3
+++ contrib/openpam/doc/man/pam_start.3
@@ -1,6 +1,6 @@
.\" Generated from pam_start.c by gendoc.pl
.\" $OpenPAM: pam_start.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_START 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_strerror.3
===================================================================
--- contrib/openpam/doc/man/pam_strerror.3
+++ contrib/openpam/doc/man/pam_strerror.3
@@ -1,6 +1,6 @@
.\" Generated from pam_strerror.c by gendoc.pl
.\" $OpenPAM: pam_strerror.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_STRERROR 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_verror.3
===================================================================
--- contrib/openpam/doc/man/pam_verror.3
+++ contrib/openpam/doc/man/pam_verror.3
@@ -1,6 +1,6 @@
.\" Generated from pam_verror.c by gendoc.pl
.\" $OpenPAM: pam_verror.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_VERROR 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_vinfo.3
===================================================================
--- contrib/openpam/doc/man/pam_vinfo.3
+++ contrib/openpam/doc/man/pam_vinfo.3
@@ -1,6 +1,6 @@
.\" Generated from pam_vinfo.c by gendoc.pl
.\" $OpenPAM: pam_vinfo.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_VINFO 3
.Os
.Sh NAME
Index: contrib/openpam/doc/man/pam_vprompt.3
===================================================================
--- contrib/openpam/doc/man/pam_vprompt.3
+++ contrib/openpam/doc/man/pam_vprompt.3
@@ -1,6 +1,6 @@
.\" Generated from pam_vprompt.c by gendoc.pl
.\" $OpenPAM: pam_vprompt.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
.Dt PAM_VPROMPT 3
.Os
.Sh NAME
Index: contrib/openpam/include/Makefile.in
===================================================================
--- contrib/openpam/include/Makefile.in
+++ contrib/openpam/include/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -91,10 +91,10 @@
host_triplet = @host@
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__DIST_COMMON)
@@ -136,7 +136,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- distdir
+ distdir distdir-am
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -197,9 +197,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -247,6 +247,9 @@
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@
@@ -295,6 +298,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -327,8 +331,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -445,7 +449,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Index: contrib/openpam/include/security/Makefile.in
===================================================================
--- contrib/openpam/include/security/Makefile.in
+++ contrib/openpam/include/security/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -92,10 +92,10 @@
host_triplet = @host@
subdir = include/security
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(security_HEADERS) \
@@ -186,9 +186,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -236,6 +236,9 @@
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@
@@ -284,6 +287,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -325,8 +329,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -417,7 +421,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Index: contrib/openpam/include/security/openpam_version.h
===================================================================
--- contrib/openpam/include/security/openpam_version.h
+++ contrib/openpam/include/security/openpam_version.h
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 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
@@ -32,14 +32,14 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $OpenPAM: openpam_version.h 938 2017-04-30 21:34:42Z des $
+ * $OpenPAM: openpam_version.h 945 2019-02-22 09:52:46Z des $
*/
#ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED
#define SECURITY_OPENPAM_VERSION_H_INCLUDED
#define OPENPAM
-#define OPENPAM_VERSION 20170430
-#define OPENPAM_RELEASE "Resedacea"
+#define OPENPAM_VERSION 20190224
+#define OPENPAM_RELEASE "Tabebuia"
#endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */
Index: contrib/openpam/install-sh
===================================================================
--- contrib/openpam/install-sh
+++ contrib/openpam/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2016-01-11.22; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -496,6 +496,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
Index: contrib/openpam/lib/Makefile.in
===================================================================
--- contrib/openpam/lib/Makefile.in
+++ contrib/openpam/lib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -92,10 +92,10 @@
@WITH_SYSTEM_LIBPAM_FALSE@am__append_1 = libpam
subdir = lib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__DIST_COMMON)
@@ -137,7 +137,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- distdir
+ distdir distdir-am
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -198,9 +198,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -248,6 +248,9 @@
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@
@@ -296,6 +299,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -328,8 +332,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -446,7 +450,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Index: contrib/openpam/lib/libpam/Makefile.in
===================================================================
--- contrib/openpam/lib/libpam/Makefile.in
+++ contrib/openpam/lib/libpam/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -93,10 +93,10 @@
host_triplet = @host@
subdir = lib/libpam
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(noinst_HEADERS) \
@@ -178,7 +178,48 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/openpam_asprintf.Plo \
+ ./$(DEPDIR)/openpam_borrow_cred.Plo \
+ ./$(DEPDIR)/openpam_check_owner_perms.Plo \
+ ./$(DEPDIR)/openpam_configure.Plo \
+ ./$(DEPDIR)/openpam_constants.Plo \
+ ./$(DEPDIR)/openpam_dispatch.Plo \
+ ./$(DEPDIR)/openpam_dynamic.Plo \
+ ./$(DEPDIR)/openpam_features.Plo \
+ ./$(DEPDIR)/openpam_findenv.Plo \
+ ./$(DEPDIR)/openpam_free_data.Plo \
+ ./$(DEPDIR)/openpam_free_envlist.Plo \
+ ./$(DEPDIR)/openpam_get_feature.Plo \
+ ./$(DEPDIR)/openpam_get_option.Plo \
+ ./$(DEPDIR)/openpam_load.Plo ./$(DEPDIR)/openpam_log.Plo \
+ ./$(DEPDIR)/openpam_nullconv.Plo \
+ ./$(DEPDIR)/openpam_readline.Plo \
+ ./$(DEPDIR)/openpam_readlinev.Plo \
+ ./$(DEPDIR)/openpam_readword.Plo \
+ ./$(DEPDIR)/openpam_restore_cred.Plo \
+ ./$(DEPDIR)/openpam_set_feature.Plo \
+ ./$(DEPDIR)/openpam_set_option.Plo \
+ ./$(DEPDIR)/openpam_static.Plo \
+ ./$(DEPDIR)/openpam_straddch.Plo \
+ ./$(DEPDIR)/openpam_strlcat.Plo \
+ ./$(DEPDIR)/openpam_strlcpy.Plo \
+ ./$(DEPDIR)/openpam_strlset.Plo ./$(DEPDIR)/openpam_subst.Plo \
+ ./$(DEPDIR)/openpam_ttyconv.Plo \
+ ./$(DEPDIR)/openpam_vasprintf.Plo \
+ ./$(DEPDIR)/pam_acct_mgmt.Plo ./$(DEPDIR)/pam_authenticate.Plo \
+ ./$(DEPDIR)/pam_chauthtok.Plo \
+ ./$(DEPDIR)/pam_close_session.Plo ./$(DEPDIR)/pam_end.Plo \
+ ./$(DEPDIR)/pam_error.Plo ./$(DEPDIR)/pam_get_authtok.Plo \
+ ./$(DEPDIR)/pam_get_data.Plo ./$(DEPDIR)/pam_get_item.Plo \
+ ./$(DEPDIR)/pam_get_user.Plo ./$(DEPDIR)/pam_getenv.Plo \
+ ./$(DEPDIR)/pam_getenvlist.Plo ./$(DEPDIR)/pam_info.Plo \
+ ./$(DEPDIR)/pam_open_session.Plo ./$(DEPDIR)/pam_prompt.Plo \
+ ./$(DEPDIR)/pam_putenv.Plo ./$(DEPDIR)/pam_set_data.Plo \
+ ./$(DEPDIR)/pam_set_item.Plo ./$(DEPDIR)/pam_setcred.Plo \
+ ./$(DEPDIR)/pam_setenv.Plo ./$(DEPDIR)/pam_start.Plo \
+ ./$(DEPDIR)/pam_strerror.Plo ./$(DEPDIR)/pam_verror.Plo \
+ ./$(DEPDIR)/pam_vinfo.Plo ./$(DEPDIR)/pam_vprompt.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -240,9 +281,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -290,6 +331,9 @@
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@
@@ -338,6 +382,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -467,8 +512,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -524,61 +569,67 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_asprintf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_borrow_cred.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_check_owner_perms.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_configure.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_constants.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dispatch.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dynamic.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_features.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_findenv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_free_data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_free_envlist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_get_feature.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_get_option.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_load.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_log.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_nullconv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readline.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readlinev.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readword.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_restore_cred.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_set_feature.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_set_option.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_static.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_straddch.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlcat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlcpy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_subst.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_ttyconv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_vasprintf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_acct_mgmt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_authenticate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_chauthtok.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_close_session.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_end.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_error.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_authtok.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_item.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_user.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_getenv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_getenvlist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_info.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_open_session.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_prompt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_putenv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_set_data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_set_item.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_setcred.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_setenv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_start.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_strerror.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_verror.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_vinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_vprompt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_asprintf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_borrow_cred.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_check_owner_perms.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_configure.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_constants.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dispatch.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dynamic.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_features.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_findenv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_free_data.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_free_envlist.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_get_feature.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_get_option.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_load.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_log.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_nullconv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readline.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readlinev.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readword.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_restore_cred.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_set_feature.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_set_option.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_static.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_straddch.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlcat.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlcpy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlset.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_subst.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_ttyconv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_vasprintf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_acct_mgmt.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_authenticate.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_chauthtok.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_close_session.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_end.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_error.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_authtok.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_data.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_item.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_user.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_getenv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_getenvlist.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_info.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_open_session.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_prompt.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_putenv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_set_data.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_set_item.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_setcred.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_setenv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_start.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_strerror.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_verror.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_vinfo.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_vprompt.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -659,7 +710,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -732,7 +786,61 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/openpam_asprintf.Plo
+ -rm -f ./$(DEPDIR)/openpam_borrow_cred.Plo
+ -rm -f ./$(DEPDIR)/openpam_check_owner_perms.Plo
+ -rm -f ./$(DEPDIR)/openpam_configure.Plo
+ -rm -f ./$(DEPDIR)/openpam_constants.Plo
+ -rm -f ./$(DEPDIR)/openpam_dispatch.Plo
+ -rm -f ./$(DEPDIR)/openpam_dynamic.Plo
+ -rm -f ./$(DEPDIR)/openpam_features.Plo
+ -rm -f ./$(DEPDIR)/openpam_findenv.Plo
+ -rm -f ./$(DEPDIR)/openpam_free_data.Plo
+ -rm -f ./$(DEPDIR)/openpam_free_envlist.Plo
+ -rm -f ./$(DEPDIR)/openpam_get_feature.Plo
+ -rm -f ./$(DEPDIR)/openpam_get_option.Plo
+ -rm -f ./$(DEPDIR)/openpam_load.Plo
+ -rm -f ./$(DEPDIR)/openpam_log.Plo
+ -rm -f ./$(DEPDIR)/openpam_nullconv.Plo
+ -rm -f ./$(DEPDIR)/openpam_readline.Plo
+ -rm -f ./$(DEPDIR)/openpam_readlinev.Plo
+ -rm -f ./$(DEPDIR)/openpam_readword.Plo
+ -rm -f ./$(DEPDIR)/openpam_restore_cred.Plo
+ -rm -f ./$(DEPDIR)/openpam_set_feature.Plo
+ -rm -f ./$(DEPDIR)/openpam_set_option.Plo
+ -rm -f ./$(DEPDIR)/openpam_static.Plo
+ -rm -f ./$(DEPDIR)/openpam_straddch.Plo
+ -rm -f ./$(DEPDIR)/openpam_strlcat.Plo
+ -rm -f ./$(DEPDIR)/openpam_strlcpy.Plo
+ -rm -f ./$(DEPDIR)/openpam_strlset.Plo
+ -rm -f ./$(DEPDIR)/openpam_subst.Plo
+ -rm -f ./$(DEPDIR)/openpam_ttyconv.Plo
+ -rm -f ./$(DEPDIR)/openpam_vasprintf.Plo
+ -rm -f ./$(DEPDIR)/pam_acct_mgmt.Plo
+ -rm -f ./$(DEPDIR)/pam_authenticate.Plo
+ -rm -f ./$(DEPDIR)/pam_chauthtok.Plo
+ -rm -f ./$(DEPDIR)/pam_close_session.Plo
+ -rm -f ./$(DEPDIR)/pam_end.Plo
+ -rm -f ./$(DEPDIR)/pam_error.Plo
+ -rm -f ./$(DEPDIR)/pam_get_authtok.Plo
+ -rm -f ./$(DEPDIR)/pam_get_data.Plo
+ -rm -f ./$(DEPDIR)/pam_get_item.Plo
+ -rm -f ./$(DEPDIR)/pam_get_user.Plo
+ -rm -f ./$(DEPDIR)/pam_getenv.Plo
+ -rm -f ./$(DEPDIR)/pam_getenvlist.Plo
+ -rm -f ./$(DEPDIR)/pam_info.Plo
+ -rm -f ./$(DEPDIR)/pam_open_session.Plo
+ -rm -f ./$(DEPDIR)/pam_prompt.Plo
+ -rm -f ./$(DEPDIR)/pam_putenv.Plo
+ -rm -f ./$(DEPDIR)/pam_set_data.Plo
+ -rm -f ./$(DEPDIR)/pam_set_item.Plo
+ -rm -f ./$(DEPDIR)/pam_setcred.Plo
+ -rm -f ./$(DEPDIR)/pam_setenv.Plo
+ -rm -f ./$(DEPDIR)/pam_start.Plo
+ -rm -f ./$(DEPDIR)/pam_strerror.Plo
+ -rm -f ./$(DEPDIR)/pam_verror.Plo
+ -rm -f ./$(DEPDIR)/pam_vinfo.Plo
+ -rm -f ./$(DEPDIR)/pam_vprompt.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -778,7 +886,61 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/openpam_asprintf.Plo
+ -rm -f ./$(DEPDIR)/openpam_borrow_cred.Plo
+ -rm -f ./$(DEPDIR)/openpam_check_owner_perms.Plo
+ -rm -f ./$(DEPDIR)/openpam_configure.Plo
+ -rm -f ./$(DEPDIR)/openpam_constants.Plo
+ -rm -f ./$(DEPDIR)/openpam_dispatch.Plo
+ -rm -f ./$(DEPDIR)/openpam_dynamic.Plo
+ -rm -f ./$(DEPDIR)/openpam_features.Plo
+ -rm -f ./$(DEPDIR)/openpam_findenv.Plo
+ -rm -f ./$(DEPDIR)/openpam_free_data.Plo
+ -rm -f ./$(DEPDIR)/openpam_free_envlist.Plo
+ -rm -f ./$(DEPDIR)/openpam_get_feature.Plo
+ -rm -f ./$(DEPDIR)/openpam_get_option.Plo
+ -rm -f ./$(DEPDIR)/openpam_load.Plo
+ -rm -f ./$(DEPDIR)/openpam_log.Plo
+ -rm -f ./$(DEPDIR)/openpam_nullconv.Plo
+ -rm -f ./$(DEPDIR)/openpam_readline.Plo
+ -rm -f ./$(DEPDIR)/openpam_readlinev.Plo
+ -rm -f ./$(DEPDIR)/openpam_readword.Plo
+ -rm -f ./$(DEPDIR)/openpam_restore_cred.Plo
+ -rm -f ./$(DEPDIR)/openpam_set_feature.Plo
+ -rm -f ./$(DEPDIR)/openpam_set_option.Plo
+ -rm -f ./$(DEPDIR)/openpam_static.Plo
+ -rm -f ./$(DEPDIR)/openpam_straddch.Plo
+ -rm -f ./$(DEPDIR)/openpam_strlcat.Plo
+ -rm -f ./$(DEPDIR)/openpam_strlcpy.Plo
+ -rm -f ./$(DEPDIR)/openpam_strlset.Plo
+ -rm -f ./$(DEPDIR)/openpam_subst.Plo
+ -rm -f ./$(DEPDIR)/openpam_ttyconv.Plo
+ -rm -f ./$(DEPDIR)/openpam_vasprintf.Plo
+ -rm -f ./$(DEPDIR)/pam_acct_mgmt.Plo
+ -rm -f ./$(DEPDIR)/pam_authenticate.Plo
+ -rm -f ./$(DEPDIR)/pam_chauthtok.Plo
+ -rm -f ./$(DEPDIR)/pam_close_session.Plo
+ -rm -f ./$(DEPDIR)/pam_end.Plo
+ -rm -f ./$(DEPDIR)/pam_error.Plo
+ -rm -f ./$(DEPDIR)/pam_get_authtok.Plo
+ -rm -f ./$(DEPDIR)/pam_get_data.Plo
+ -rm -f ./$(DEPDIR)/pam_get_item.Plo
+ -rm -f ./$(DEPDIR)/pam_get_user.Plo
+ -rm -f ./$(DEPDIR)/pam_getenv.Plo
+ -rm -f ./$(DEPDIR)/pam_getenvlist.Plo
+ -rm -f ./$(DEPDIR)/pam_info.Plo
+ -rm -f ./$(DEPDIR)/pam_open_session.Plo
+ -rm -f ./$(DEPDIR)/pam_prompt.Plo
+ -rm -f ./$(DEPDIR)/pam_putenv.Plo
+ -rm -f ./$(DEPDIR)/pam_set_data.Plo
+ -rm -f ./$(DEPDIR)/pam_set_item.Plo
+ -rm -f ./$(DEPDIR)/pam_setcred.Plo
+ -rm -f ./$(DEPDIR)/pam_setenv.Plo
+ -rm -f ./$(DEPDIR)/pam_start.Plo
+ -rm -f ./$(DEPDIR)/pam_strerror.Plo
+ -rm -f ./$(DEPDIR)/pam_verror.Plo
+ -rm -f ./$(DEPDIR)/pam_vinfo.Plo
+ -rm -f ./$(DEPDIR)/pam_vprompt.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -799,9 +961,9 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+ clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \
+ ctags ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
Index: contrib/openpam/lib/libpam/pam_getenv.c
===================================================================
--- contrib/openpam/lib/libpam/pam_getenv.c
+++ contrib/openpam/lib/libpam/pam_getenv.c
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 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
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $OpenPAM: pam_getenv.c 938 2017-04-30 21:34:42Z des $
+ * $OpenPAM: pam_getenv.c 944 2019-02-22 09:49:12Z des $
*/
#ifdef HAVE_CONFIG_H
@@ -58,19 +58,20 @@
pam_getenv(pam_handle_t *pamh,
const char *name)
{
- char *str;
+ size_t len;
int i;
ENTERS(name);
- if (strchr(name, '=') != NULL) {
- errno = EINVAL;
- RETURNS(NULL);
+ for (len = 0; name[len] != '\0'; ++len) {
+ if (name[len] == '=') {
+ errno = EINVAL;
+ RETURNS(NULL);
+ }
}
- if ((i = openpam_findenv(pamh, name, strlen(name))) < 0)
+ if ((i = openpam_findenv(pamh, name, len)) < 0)
RETURNS(NULL);
- if ((str = strchr(pamh->env[i], '=')) == NULL)
- RETURNS("");
- RETURNS(str);
+ /* assert(pamh->env[i][len] == '='); */
+ RETURNS(pamh->env[i] + len + 1);
}
/**
Index: contrib/openpam/m4/ax_pkg_config.m4
===================================================================
--- /dev/null
+++ contrib/openpam/m4/ax_pkg_config.m4
@@ -0,0 +1,157 @@
+dnl -*- autoconf -*-
+dnl
+dnl Copyright (c) 2017 The University of Oslo
+dnl All rights reserved.
+dnl
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted provided that the following conditions
+dnl are met:
+dnl 1. Redistributions of source code must retain the above copyright
+dnl notice, this list of conditions and the following disclaimer.
+dnl 2. Redistributions in binary form must reproduce the above copyright
+dnl notice, this list of conditions and the following disclaimer in the
+dnl documentation and/or other materials provided with the distribution.
+dnl 3. The name of the author may not be used to endorse or promote
+dnl products derived from this software without specific prior written
+dnl permission.
+dnl
+dnl THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+dnl ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+dnl IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+dnl ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+dnl FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+dnl OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+dnl HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+dnl LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+dnl OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+dnl SUCH DAMAGE.
+dnl
+
+m4_define([AX_PKG_CONFIG_MACROS_VERSION], [0.20170404])
+
+dnl
+dnl AX_PROG_PKG_CONFIG([min-version])
+dnl ---------------------------------
+dnl
+dnl Verify that pkgconf or pkg-config are present.
+dnl
+AC_DEFUN([AX_PROG_PKG_CONFIG], [
+ m4_pattern_forbid([^AX_PKG_CONFIG_[A-Z_]+$])
+ AC_ARG_VAR([PKG_CONFIG], [path to pkg-config binary])
+ AC_ARG_VAR([PKG_CONFIG_PATH], [list of directories to prepend to default search path])
+ AC_ARG_VAR([PKG_CONFIG_LIBDIR], [list of directories to search instead of default search path])
+ if test x"${PKG_CONFIG}" = x"" ; then
+ AC_PATH_PROGS([PKG_CONFIG], [pkgconf pkg-config]) >/dev/null
+ else
+ AC_PATH_PROG([PKG_CONFIG], [${PKG_CONFIG}])
+ fi
+ AC_MSG_CHECKING([for pkg-config or pkgconf])
+ if test -x "${PKG_CONFIG}" ; then
+ AC_MSG_RESULT([${PKG_CONFIG}])
+ case "${PKG_CONFIG}" in
+ *pkgconf)
+ _min_version="m4_default([$1], [1.3.0])"
+ ;;
+ *pkg-config)
+ _min_version="m4_default([$1], [0.23])"
+ ;;
+ *)
+ _min_version="9.9.error"
+ ;;
+ esac
+ AC_MSG_CHECKING([that ${PKG_CONFIG} is at least version ${_min_version}])
+ _act_version=`"${PKG_CONFIG}" --version`
+ if ! "${PKG_CONFIG}" --atleast-pkgconfig-version="${_min_version}" ; then
+ PKG_CONFIG=""
+ fi
+ AC_MSG_RESULT([${_act_version}])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+ if test x"${PKG_CONFIG}" = x"" ; then
+ AC_MSG_ERROR([pkg-config was not found or is too old])
+ fi
+ AC_ARG_WITH([pkgconfigdir],
+ AS_HELP_STRING([--with-pkgconfigdir],
+ [installation directory for .pc files @<:@LIBDIR/pkgconfig@:>@]),
+ [pkgconfigdir=$withval], [pkgconfigdir='${libdir}/pkgconfig'])
+ AC_SUBST([pkgconfigdir], [$pkgconfigdir])
+])
+
+dnl
+dnl AX_PKG_CONFIG_VAR(package-name, var-name)
+dnl -----------------------------------------
+dnl
+dnl Retrieve specific pkg-config variables for the specified package.
+dnl
+AC_DEFUN([AX_PKG_CONFIG_VAR], [
+ AC_REQUIRE([AX_PROG_PKG_CONFIG])
+ m4_define([_p], AS_TR_SH([m4_tolower([$1])]))
+ m4_case([$2],
+ [version], [ax_pc_cv_[]_p[]_version=`"${PKG_CONFIG}" --modversion [$1]`],
+ [cflags], [ax_pc_cv_[]_p[]_cflags=`"${PKG_CONFIG}" --cflags [$1]`],
+ [libs], [ax_pc_cv_[]_p[]_libs=`"${PKG_CONFIG}" --libs [$1]`],
+ [ax_pc_cv_[]_p[]_[$2]=`"${PKG_CONFIG}" --variable=[$2] [$1]`])
+])
+
+dnl
+dnl AX_PKG_CONFIG_CHECK(package-name,
+dnl [action-if-found], [action-if-not-found])
+dnl -------------------------------------------
+dnl
+dnl Check if the specified package is installed. If it is, define
+dnl HAVE_PACKAGE, PACKAGE_VERSION, PACKAGE_CFLAGS and PACKAGE_LIBS.
+dnl The specified actions are performed in addition to the standard
+dnl actions.
+dnl
+AC_DEFUN([AX_PKG_CONFIG_CHECK], [
+ AC_REQUIRE([AX_PROG_PKG_CONFIG])
+ m4_define([_P], AS_TR_SH([m4_toupper([$1])]))
+ m4_define([_p], AS_TR_SH([m4_tolower([$1])]))
+ AC_ARG_VAR(_P[_CFLAGS], [C compiler flags for $1])
+ AC_ARG_VAR(_P[_LIBS], [linker flags for $1])
+ AC_MSG_CHECKING([if $1 is installed])
+ if AC_RUN_LOG(["${PKG_CONFIG}" --exists --print-errors "$1"]) ; then
+ AC_MSG_RESULT([yes])
+ [ax_pc_cv_have_]_p=yes
+ AC_DEFINE([HAVE_]_P, [1], [Define to 1 if you have $1])
+dnl
+ AC_MSG_CHECKING([$1 version])
+ AX_PKG_CONFIG_VAR([$1], [version])
+ AC_SUBST(_P[_VERSION], [$ax_pc_cv_]_p[_version])
+ AC_MSG_RESULT([${ax_pc_cv_]_p[_version:-unknown}])
+dnl
+ AC_MSG_CHECKING([$1 compiler flags])
+ AX_PKG_CONFIG_VAR([$1], [cflags])
+ AC_SUBST(_P[_CFLAGS], [$ax_pc_cv_]_p[_cflags])
+ AC_MSG_RESULT([${ax_pc_cv_]_p[_cflags:-none}])
+dnl
+ AC_MSG_CHECKING([$1 linker flags])
+ AX_PKG_CONFIG_VAR([$1], [libs])
+ AC_SUBST(_P[_LIBS], [$ax_pc_cv_]_p[_libs])
+ AC_MSG_RESULT([${ax_pc_cv_]_p[_libs:-none}])
+dnl
+ m4_default([$2], [:])
+ else
+ AC_MSG_RESULT([no])
+ [ax_pc_cv_have_]_p=no
+ m4_default([$3], [:])
+ fi
+ m4_ifdef([AM_CONDITIONAL], [
+ AM_CONDITIONAL([HAVE_]_P, [test x"$ax_pc_cv_have_]_p[" = x"yes"])
+ ])
+])
+
+dnl
+dnl AX_PKG_CONFIG_REQUIRE(package-name)
+dnl -----------------------------------
+dnl
+dnl As above, but fail if the package is not installed.
+dnl
+AC_DEFUN([AX_PKG_CONFIG_REQUIRE], [
+ AX_PKG_CONFIG_CHECK([$1], [], [
+ AC_MSG_ERROR([cannot proceed without $1])
+ ])
+])
Index: contrib/openpam/misc/Makefile.in
===================================================================
--- contrib/openpam/misc/Makefile.in
+++ contrib/openpam/misc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -90,10 +90,10 @@
host_triplet = @host@
subdir = misc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__DIST_COMMON)
@@ -138,9 +138,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -188,6 +188,9 @@
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@
@@ -236,6 +239,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -268,8 +272,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -297,7 +301,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Index: contrib/openpam/missing
===================================================================
--- contrib/openpam/missing
+++ contrib/openpam/missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,9 +207,9 @@
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
Index: contrib/openpam/modules/Makefile.in
===================================================================
--- contrib/openpam/modules/Makefile.in
+++ contrib/openpam/modules/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -92,10 +92,10 @@
@WITH_PAM_UNIX_TRUE@am__append_1 = pam_unix
subdir = modules
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__DIST_COMMON)
@@ -137,7 +137,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- distdir
+ distdir distdir-am
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -198,9 +198,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -248,6 +248,9 @@
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@
@@ -296,6 +299,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -328,8 +332,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -446,7 +450,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Index: contrib/openpam/modules/pam_deny/Makefile.in
===================================================================
--- contrib/openpam/modules/pam_deny/Makefile.in
+++ contrib/openpam/modules/pam_deny/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -92,10 +92,10 @@
host_triplet = @host@
subdir = modules/pam_deny
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__DIST_COMMON)
@@ -159,7 +159,8 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/pam_deny.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -220,9 +221,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -270,6 +271,9 @@
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@
@@ -318,6 +322,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -360,8 +365,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -417,7 +422,13 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_deny.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_deny.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -498,7 +509,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -571,7 +585,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/pam_deny.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -617,7 +631,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/pam_deny.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -638,19 +652,20 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-moduleLTLIBRARIES cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir 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-moduleLTLIBRARIES \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+ clean-generic clean-libtool clean-moduleLTLIBRARIES \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir 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-moduleLTLIBRARIES install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am \
uninstall-moduleLTLIBRARIES
.PRECIOUS: Makefile
Index: contrib/openpam/modules/pam_permit/Makefile.in
===================================================================
--- contrib/openpam/modules/pam_permit/Makefile.in
+++ contrib/openpam/modules/pam_permit/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -92,10 +92,10 @@
host_triplet = @host@
subdir = modules/pam_permit
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__DIST_COMMON)
@@ -159,7 +159,8 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/pam_permit.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -220,9 +221,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -270,6 +271,9 @@
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@
@@ -318,6 +322,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -360,8 +365,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -417,7 +422,13 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_permit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_permit.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -498,7 +509,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -571,7 +585,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/pam_permit.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -617,7 +631,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/pam_permit.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -638,19 +652,20 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-moduleLTLIBRARIES cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir 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-moduleLTLIBRARIES \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+ clean-generic clean-libtool clean-moduleLTLIBRARIES \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir 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-moduleLTLIBRARIES install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am \
uninstall-moduleLTLIBRARIES
.PRECIOUS: Makefile
Index: contrib/openpam/modules/pam_return/Makefile.in
===================================================================
--- contrib/openpam/modules/pam_return/Makefile.in
+++ contrib/openpam/modules/pam_return/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -92,10 +92,10 @@
host_triplet = @host@
subdir = modules/pam_return
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__DIST_COMMON)
@@ -159,7 +159,8 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/pam_return.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -220,9 +221,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -270,6 +271,9 @@
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@
@@ -318,6 +322,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -360,8 +365,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -417,7 +422,13 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_return.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_return.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -498,7 +509,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -571,7 +585,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/pam_return.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -617,7 +631,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/pam_return.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -638,19 +652,20 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-moduleLTLIBRARIES cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir 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-moduleLTLIBRARIES \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+ clean-generic clean-libtool clean-moduleLTLIBRARIES \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir 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-moduleLTLIBRARIES install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am \
uninstall-moduleLTLIBRARIES
.PRECIOUS: Makefile
Index: contrib/openpam/modules/pam_unix/Makefile.in
===================================================================
--- contrib/openpam/modules/pam_unix/Makefile.in
+++ contrib/openpam/modules/pam_unix/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,
@@ -92,10 +92,10 @@
host_triplet = @host@
subdir = modules/pam_unix
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__DIST_COMMON)
@@ -133,8 +133,7 @@
am__installdirs = "$(DESTDIR)$(moduledir)"
LTLIBRARIES = $(module_LTLIBRARIES)
am__DEPENDENCIES_1 =
-@WITH_SYSTEM_LIBPAM_FALSE@pam_unix_la_DEPENDENCIES = $(top_builddir)/lib/libpam/libpam.la \
-@WITH_SYSTEM_LIBPAM_FALSE@ $(am__DEPENDENCIES_1)
+@WITH_SYSTEM_LIBPAM_FALSE@pam_unix_la_DEPENDENCIES = $(top_builddir)/lib/libpam/libpam.la
@WITH_SYSTEM_LIBPAM_TRUE@pam_unix_la_DEPENDENCIES = \
@WITH_SYSTEM_LIBPAM_TRUE@ $(am__DEPENDENCIES_1)
am_pam_unix_la_OBJECTS = pam_unix.lo
@@ -160,7 +159,8 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/pam_unix.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -221,9 +221,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -271,6 +271,9 @@
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@
@@ -319,6 +322,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -361,8 +365,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -418,7 +422,13 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -499,7 +509,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -572,7 +585,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/pam_unix.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -618,7 +631,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/pam_unix.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -639,19 +652,20 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-moduleLTLIBRARIES cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir 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-moduleLTLIBRARIES \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+ clean-generic clean-libtool clean-moduleLTLIBRARIES \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir 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-moduleLTLIBRARIES install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am \
uninstall-moduleLTLIBRARIES
.PRECIOUS: Makefile
Index: contrib/openpam/t/Makefile.am
===================================================================
--- contrib/openpam/t/Makefile.am
+++ contrib/openpam/t/Makefile.am
@@ -1,25 +1,26 @@
-# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
+# $OpenPAM: Makefile.am 943 2019-02-20 13:23:51Z des $
if WITH_TEST
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam \
+ $(CRYB_TEST_CFLAGS)
AM_TESTS_ENVIRONMENT = \
PAM_RETURN_SO=$(abs_top_builddir)/modules/pam_return/.libs/pam_return.so
-noinst_HEADERS = t_pam_conv.h
-
# tests
TESTS =
TESTS += t_openpam_ctype
TESTS += t_openpam_dispatch
TESTS += t_openpam_readword
TESTS += t_openpam_readlinev
+TESTS += t_pam_env
check_PROGRAMS = $(TESTS)
# libt - common support code
check_LIBRARIES = libt.a
-libt_a_SOURCES = t_pam_conv.c
+libt_a_SOURCES = t_pam_conv.c t_pam_err.c
+noinst_HEADERS = t_pam_conv.h t_pam_err.h
# link with libpam and test framework
LDADD = $(CRYB_TEST_LIBS) libt.a
Index: contrib/openpam/t/Makefile.in
===================================================================
--- contrib/openpam/t/Makefile.in
+++ contrib/openpam/t/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 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,7 +14,7 @@
@SET_MAKE@
-# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
+# $OpenPAM: Makefile.am 943 2019-02-20 13:23:51Z des $
VPATH = @srcdir@
am__is_gnu_make = { \
@@ -93,16 +93,17 @@
@WITH_TEST_TRUE@TESTS = t_openpam_ctype$(EXEEXT) \
@WITH_TEST_TRUE@ t_openpam_dispatch$(EXEEXT) \
@WITH_TEST_TRUE@ t_openpam_readword$(EXEEXT) \
-@WITH_TEST_TRUE@ t_openpam_readlinev$(EXEEXT)
+@WITH_TEST_TRUE@ t_openpam_readlinev$(EXEEXT) \
+@WITH_TEST_TRUE@ t_pam_env$(EXEEXT)
@WITH_TEST_TRUE@check_PROGRAMS = $(am__EXEEXT_1)
@WITH_SYSTEM_LIBPAM_TRUE@@WITH_TEST_TRUE@am__append_1 = $(SYSTEM_LIBPAM)
@WITH_SYSTEM_LIBPAM_FALSE@@WITH_TEST_TRUE@am__append_2 = $(top_builddir)/lib/libpam/libpam.la
subdir = t
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__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 $(am__noinst_HEADERS_DIST) \
@@ -111,6 +112,11 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+@WITH_TEST_TRUE@am__EXEEXT_1 = t_openpam_ctype$(EXEEXT) \
+@WITH_TEST_TRUE@ t_openpam_dispatch$(EXEEXT) \
+@WITH_TEST_TRUE@ t_openpam_readword$(EXEEXT) \
+@WITH_TEST_TRUE@ t_openpam_readlinev$(EXEEXT) \
+@WITH_TEST_TRUE@ t_pam_env$(EXEEXT)
ARFLAGS = cru
AM_V_AR = $(am__v_AR_@AM_V@)
am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
@@ -118,13 +124,10 @@
am__v_AR_1 =
libt_a_AR = $(AR) $(ARFLAGS)
libt_a_LIBADD =
-am__libt_a_SOURCES_DIST = t_pam_conv.c
-@WITH_TEST_TRUE@am_libt_a_OBJECTS = t_pam_conv.$(OBJEXT)
+am__libt_a_SOURCES_DIST = t_pam_conv.c t_pam_err.c
+@WITH_TEST_TRUE@am_libt_a_OBJECTS = t_pam_conv.$(OBJEXT) \
+@WITH_TEST_TRUE@ t_pam_err.$(OBJEXT)
libt_a_OBJECTS = $(am_libt_a_OBJECTS)
-@WITH_TEST_TRUE@am__EXEEXT_1 = t_openpam_ctype$(EXEEXT) \
-@WITH_TEST_TRUE@ t_openpam_dispatch$(EXEEXT) \
-@WITH_TEST_TRUE@ t_openpam_readword$(EXEEXT) \
-@WITH_TEST_TRUE@ t_openpam_readlinev$(EXEEXT)
t_openpam_ctype_SOURCES = t_openpam_ctype.c
t_openpam_ctype_OBJECTS = t_openpam_ctype.$(OBJEXT)
t_openpam_ctype_LDADD = $(LDADD)
@@ -154,6 +157,11 @@
@WITH_TEST_TRUE@t_openpam_readword_DEPENDENCIES = \
@WITH_TEST_TRUE@ $(am__DEPENDENCIES_1) libt.a \
@WITH_TEST_TRUE@ $(am__DEPENDENCIES_2) $(am__append_2)
+t_pam_env_SOURCES = t_pam_env.c
+t_pam_env_OBJECTS = t_pam_env.$(OBJEXT)
+t_pam_env_LDADD = $(LDADD)
+@WITH_TEST_TRUE@t_pam_env_DEPENDENCIES = $(am__DEPENDENCIES_1) libt.a \
+@WITH_TEST_TRUE@ $(am__DEPENDENCIES_2) $(am__append_2)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -168,7 +176,12 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/t_openpam_ctype.Po \
+ ./$(DEPDIR)/t_openpam_dispatch.Po \
+ ./$(DEPDIR)/t_openpam_readlinev.Po \
+ ./$(DEPDIR)/t_openpam_readword.Po ./$(DEPDIR)/t_pam_conv.Po \
+ ./$(DEPDIR)/t_pam_env.Po ./$(DEPDIR)/t_pam_err.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -189,16 +202,16 @@
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(libt_a_SOURCES) t_openpam_ctype.c t_openpam_dispatch.c \
- t_openpam_readlinev.c t_openpam_readword.c
+ t_openpam_readlinev.c t_openpam_readword.c t_pam_env.c
DIST_SOURCES = $(am__libt_a_SOURCES_DIST) t_openpam_ctype.c \
t_openpam_dispatch.c t_openpam_readlinev.c \
- t_openpam_readword.c
+ t_openpam_readword.c t_pam_env.c
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
-am__noinst_HEADERS_DIST = t_pam_conv.h
+am__noinst_HEADERS_DIST = t_pam_conv.h t_pam_err.h
HEADERS = $(noinst_HEADERS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
@@ -439,9 +452,9 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -489,6 +502,9 @@
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@
@@ -537,6 +553,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -548,15 +565,17 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@WITH_TEST_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
+@WITH_TEST_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam \
+@WITH_TEST_TRUE@ $(CRYB_TEST_CFLAGS)
+
@WITH_TEST_TRUE@AM_TESTS_ENVIRONMENT = \
@WITH_TEST_TRUE@ PAM_RETURN_SO=$(abs_top_builddir)/modules/pam_return/.libs/pam_return.so
-@WITH_TEST_TRUE@noinst_HEADERS = t_pam_conv.h
# libt - common support code
@WITH_TEST_TRUE@check_LIBRARIES = libt.a
-@WITH_TEST_TRUE@libt_a_SOURCES = t_pam_conv.c
+@WITH_TEST_TRUE@libt_a_SOURCES = t_pam_conv.c t_pam_err.c
+@WITH_TEST_TRUE@noinst_HEADERS = t_pam_conv.h t_pam_err.h
# link with libpam and test framework
@WITH_TEST_TRUE@LDADD = $(CRYB_TEST_LIBS) libt.a $(am__append_1) \
@@ -582,8 +601,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -595,14 +614,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-clean-checkLIBRARIES:
- -test -z "$(check_LIBRARIES)" || rm -f $(check_LIBRARIES)
-
-libt.a: $(libt_a_OBJECTS) $(libt_a_DEPENDENCIES) $(EXTRA_libt_a_DEPENDENCIES)
- $(AM_V_at)-rm -f libt.a
- $(AM_V_AR)$(libt_a_AR) libt.a $(libt_a_OBJECTS) $(libt_a_LIBADD)
- $(AM_V_at)$(RANLIB) libt.a
-
clean-checkPROGRAMS:
@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \
@@ -612,6 +623,14 @@
echo " rm -f" $$list; \
rm -f $$list
+clean-checkLIBRARIES:
+ -test -z "$(check_LIBRARIES)" || rm -f $(check_LIBRARIES)
+
+libt.a: $(libt_a_OBJECTS) $(libt_a_DEPENDENCIES) $(EXTRA_libt_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libt.a
+ $(AM_V_AR)$(libt_a_AR) libt.a $(libt_a_OBJECTS) $(libt_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libt.a
+
t_openpam_ctype$(EXEEXT): $(t_openpam_ctype_OBJECTS) $(t_openpam_ctype_DEPENDENCIES) $(EXTRA_t_openpam_ctype_DEPENDENCIES)
@rm -f t_openpam_ctype$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(t_openpam_ctype_OBJECTS) $(t_openpam_ctype_LDADD) $(LIBS)
@@ -628,17 +647,29 @@
@rm -f t_openpam_readword$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(t_openpam_readword_OBJECTS) $(t_openpam_readword_LDADD) $(LIBS)
+t_pam_env$(EXEEXT): $(t_pam_env_OBJECTS) $(t_pam_env_DEPENDENCIES) $(EXTRA_t_pam_env_DEPENDENCIES)
+ @rm -f t_pam_env$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_pam_env_OBJECTS) $(t_pam_env_LDADD) $(LIBS)
+
mostlyclean-compile:
-rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_ctype.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_dispatch.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_readlinev.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_readword.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pam_conv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_ctype.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_dispatch.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_readlinev.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_readword.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pam_conv.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pam_env.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pam_err.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -839,7 +870,7 @@
fi; \
$$success || exit 1
-check-TESTS:
+check-TESTS: $(check_PROGRAMS) $(check_LIBRARIES)
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -849,7 +880,7 @@
log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
-recheck: all $(check_LIBRARIES) $(check_PROGRAMS)
+recheck: all $(check_PROGRAMS) $(check_LIBRARIES)
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
@@ -888,6 +919,13 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
+t_pam_env.log: t_pam_env$(EXEEXT)
+ @p='t_pam_env$(EXEEXT)'; \
+ b='t_pam_env'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
.test.log:
@p='$<'; \
$(am__set_b); \
@@ -903,7 +941,10 @@
@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -934,7 +975,7 @@
fi; \
done
check-am: all-am
- $(MAKE) $(AM_MAKEFLAGS) $(check_LIBRARIES) $(check_PROGRAMS)
+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_LIBRARIES)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
all-am: Makefile $(HEADERS)
@@ -978,7 +1019,13 @@
clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/t_openpam_ctype.Po
+ -rm -f ./$(DEPDIR)/t_openpam_dispatch.Po
+ -rm -f ./$(DEPDIR)/t_openpam_readlinev.Po
+ -rm -f ./$(DEPDIR)/t_openpam_readword.Po
+ -rm -f ./$(DEPDIR)/t_pam_conv.Po
+ -rm -f ./$(DEPDIR)/t_pam_env.Po
+ -rm -f ./$(DEPDIR)/t_pam_err.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1024,7 +1071,13 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/t_openpam_ctype.Po
+ -rm -f ./$(DEPDIR)/t_openpam_dispatch.Po
+ -rm -f ./$(DEPDIR)/t_openpam_readlinev.Po
+ -rm -f ./$(DEPDIR)/t_openpam_readword.Po
+ -rm -f ./$(DEPDIR)/t_pam_conv.Po
+ -rm -f ./$(DEPDIR)/t_pam_env.Po
+ -rm -f ./$(DEPDIR)/t_pam_err.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1045,20 +1098,20 @@
.MAKE: check-am install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
- clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \
- clean-libtool cscopelist-am ctags ctags-am distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir 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 \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am recheck tags tags-am uninstall \
- uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
+ check-am clean clean-checkLIBRARIES clean-checkPROGRAMS \
+ clean-generic clean-libtool cscopelist-am ctags ctags-am \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir 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 maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ recheck tags tags-am uninstall uninstall-am
.PRECIOUS: Makefile
Index: contrib/openpam/t/t_pam_env.c
===================================================================
--- /dev/null
+++ contrib/openpam/t/t_pam_env.c
@@ -0,0 +1,202 @@
+/*-
+ * Copyright (c) 2019 Dag-Erling Smørgrav
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $OpenPAM$
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdint.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <cryb/test.h>
+
+#include <security/pam_appl.h>
+#include <security/openpam.h>
+
+#include "t_pam_err.h"
+
+#define T_ENV_NAME "MAGIC_WORDS"
+#define T_ENV_VALUE "SQUEAMISH OSSIFRAGE"
+#define T_ENV_NAMEVALUE T_ENV_NAME "=" T_ENV_VALUE
+
+struct pam_conv t_null_pamc;
+
+
+/***************************************************************************
+ * Tests
+ */
+
+static int
+t_env_empty(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
+{
+ pam_handle_t *pamh;
+ char **envlist;
+ int pam_err, ret;
+
+ ret = 1;
+ pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh);
+ t_assert(pam_err == PAM_SUCCESS);
+ envlist = pam_getenvlist(pamh);
+ ret &= t_is_not_null(envlist);
+ if (envlist != NULL) {
+ ret &= t_is_null(*envlist);
+ openpam_free_envlist(envlist);
+ }
+ pam_end(pamh, pam_err);
+ return (ret);
+}
+
+static int
+t_putenv_simple(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
+{
+ pam_handle_t *pamh;
+ char **envlist;
+ int pam_err, ret;
+
+ ret = 1;
+ pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh);
+ t_assert(pam_err == PAM_SUCCESS);
+ pam_err = pam_putenv(pamh, T_ENV_NAMEVALUE);
+ ret &= t_compare_pam_err(PAM_SUCCESS, pam_err);
+ envlist = pam_getenvlist(pamh);
+ ret &= t_is_not_null(envlist);
+ if (envlist != NULL) {
+ ret &= t_compare_str(T_ENV_NAMEVALUE, envlist[0])
+ & t_is_null(envlist[1]);
+ openpam_free_envlist(envlist);
+ }
+ pam_end(pamh, pam_err);
+ return (ret);
+}
+
+static int
+t_setenv_simple(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
+{
+ pam_handle_t *pamh;
+ char **envlist;
+ int pam_err, ret;
+
+ ret = 1;
+ pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh);
+ t_assert(pam_err == PAM_SUCCESS);
+ pam_err = pam_setenv(pamh, T_ENV_NAME, T_ENV_VALUE, 0);
+ ret &= t_compare_pam_err(PAM_SUCCESS, pam_err);
+ envlist = pam_getenvlist(pamh);
+ ret &= t_is_not_null(envlist);
+ if (envlist != NULL) {
+ ret &= t_compare_str(T_ENV_NAMEVALUE, envlist[0])
+ & t_is_null(envlist[1]);
+ openpam_free_envlist(envlist);
+ }
+ pam_end(pamh, pam_err);
+ return (ret);
+}
+
+static int
+t_getenv_empty(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
+{
+ pam_handle_t *pamh;
+ const char *value;
+ int pam_err, ret;
+
+ ret = 1;
+ pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh);
+ t_assert(pam_err == PAM_SUCCESS);
+ value = pam_getenv(pamh, T_ENV_NAME);
+ ret &= t_compare_str(NULL, value);
+ pam_end(pamh, pam_err);
+ return (ret);
+}
+
+static int
+t_getenv_simple_miss(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
+{
+ pam_handle_t *pamh;
+ const char *value;
+ int pam_err, ret;
+
+ ret = 1;
+ pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh);
+ t_assert(pam_err == PAM_SUCCESS);
+ pam_err = pam_setenv(pamh, T_ENV_NAME, T_ENV_VALUE, 0);
+ t_assert(pam_err == PAM_SUCCESS);
+ value = pam_getenv(pamh, "XYZZY");
+ ret &= t_compare_str(NULL, value);
+ pam_end(pamh, pam_err);
+ return (ret);
+}
+
+static int
+t_getenv_simple_hit(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
+{
+ pam_handle_t *pamh;
+ const char *value;
+ int pam_err, ret;
+
+ ret = 1;
+ pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh);
+ t_assert(pam_err == PAM_SUCCESS);
+ pam_err = pam_setenv(pamh, T_ENV_NAME, T_ENV_VALUE, 0);
+ t_assert(pam_err == PAM_SUCCESS);
+ value = pam_getenv(pamh, T_ENV_NAME);
+ ret &= t_compare_str(T_ENV_VALUE, value);
+ pam_end(pamh, pam_err);
+ return (ret);
+}
+
+
+/***************************************************************************
+ * Boilerplate
+ */
+
+static int
+t_prepare(int argc CRYB_UNUSED, char *argv[] CRYB_UNUSED)
+{
+
+ openpam_set_feature(OPENPAM_FALLBACK_TO_OTHER, 0);
+
+ t_add_test(t_env_empty, NULL, "initially empty");
+ t_add_test(t_putenv_simple, NULL, "put - simple");
+ t_add_test(t_setenv_simple, NULL, "set - simple");
+ t_add_test(t_getenv_empty, NULL, "get - empty");
+ t_add_test(t_getenv_simple_miss, NULL, "get - simple (miss)");
+ t_add_test(t_getenv_simple_hit, NULL, "get - simple (hit)");
+
+ return (0);
+}
+
+int
+main(int argc, char *argv[])
+{
+
+ t_main(t_prepare, NULL, argc, argv);
+}
Index: contrib/openpam/t/t_pam_err.h
===================================================================
--- /dev/null
+++ contrib/openpam/t/t_pam_err.h
@@ -0,0 +1,44 @@
+/*-
+ * Copyright (c) 2019 Dag-Erling Smørgrav
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $OpenPAM$
+ */
+
+#ifndef T_PAM_ERR_H_INCLUDED
+#define T_PAM_ERR_H_INCLUDED
+
+int t_compare_pam_err(int, int);
+
+static inline int
+t_pam_success(int received)
+{
+
+ return t_compare_pam_err(PAM_SUCCESS, received);
+}
+
+#endif
Index: contrib/openpam/t/t_pam_err.c
===================================================================
--- /dev/null
+++ contrib/openpam/t/t_pam_err.c
@@ -0,0 +1,63 @@
+/*-
+ * Copyright (c) 2019 Dag-Erling Smørgrav
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $OpenPAM$
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdint.h>
+#include <unistd.h>
+
+#include <cryb/test.h>
+
+#include <security/pam_appl.h>
+#include <security/openpam.h>
+
+#include "openpam_impl.h"
+
+#include "t_pam_err.h"
+
+int
+t_compare_pam_err(int expected, int received)
+{
+
+ if (expected == received)
+ return (1);
+ if (expected >= 0 && expected < PAM_NUM_ERRORS)
+ t_printv("expected %s, ", pam_err_name[expected]);
+ else
+ t_printv("expected %d, ", expected);
+ if (received >= 0 && received < PAM_NUM_ERRORS)
+ t_printv("received %s\n", pam_err_name[received]);
+ else
+ t_printv("received %d\n", received);
+ return (0);
+}
Index: contrib/openpam/test-driver
===================================================================
--- contrib/openpam/test-driver
+++ contrib/openpam/test-driver
@@ -1,9 +1,9 @@
#! /bin/sh
# test-driver - basic testsuite driver script.
-scriptversion=2013-07-13.22; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -143,6 +143,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 11, 11:06 AM (11 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16593942
Default Alt Text
D28528.diff (197 KB)

Event Timeline