From owner-svn-src-vendor@FreeBSD.ORG Sun Dec 18 17:08:41 2011 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC299106566C; Sun, 18 Dec 2011 17:08:41 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A71618FC0C; Sun, 18 Dec 2011 17:08:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBIH8fa8017855; Sun, 18 Dec 2011 17:08:41 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBIH8fcN017845; Sun, 18 Dec 2011 17:08:41 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201112181708.pBIH8fcN017845@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sun, 18 Dec 2011 17:08:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228690 - in vendor/openpam/dist: . bin bin/pamtest bin/su doc doc/man include include/security lib misc modules modules/pam_deny modules/pam_permit modules/pam_unix X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Dec 2011 17:08:41 -0000 Author: des Date: Sun Dec 18 17:08:40 2011 New Revision: 228690 URL: http://svn.freebsd.org/changeset/base/228690 Log: Vendor import of OpenPAM Lycopsida. Added: vendor/openpam/dist/bin/pamtest/ vendor/openpam/dist/bin/pamtest/Makefile.am vendor/openpam/dist/bin/pamtest/Makefile.in vendor/openpam/dist/bin/pamtest/pamtest.1 vendor/openpam/dist/bin/pamtest/pamtest.c vendor/openpam/dist/bin/su/su.1 vendor/openpam/dist/doc/man/openpam_subst.3 vendor/openpam/dist/lib/openpam_check_owner_perms.c vendor/openpam/dist/lib/openpam_constants.c vendor/openpam/dist/lib/openpam_constants.h vendor/openpam/dist/lib/openpam_debug.h vendor/openpam/dist/lib/openpam_strlcmp.h vendor/openpam/dist/lib/openpam_strlcpy.h vendor/openpam/dist/lib/openpam_subst.c Modified: vendor/openpam/dist/CREDITS vendor/openpam/dist/HISTORY vendor/openpam/dist/LICENSE vendor/openpam/dist/Makefile.am vendor/openpam/dist/Makefile.in vendor/openpam/dist/README vendor/openpam/dist/RELNOTES vendor/openpam/dist/aclocal.m4 vendor/openpam/dist/bin/Makefile.am vendor/openpam/dist/bin/Makefile.in vendor/openpam/dist/bin/su/Makefile.am vendor/openpam/dist/bin/su/Makefile.in vendor/openpam/dist/bin/su/su.c vendor/openpam/dist/config.h.in vendor/openpam/dist/configure vendor/openpam/dist/configure.ac vendor/openpam/dist/depcomp vendor/openpam/dist/doc/Makefile.in vendor/openpam/dist/doc/man/Makefile.am vendor/openpam/dist/doc/man/Makefile.in vendor/openpam/dist/doc/man/openpam.3 vendor/openpam/dist/doc/man/openpam_borrow_cred.3 vendor/openpam/dist/doc/man/openpam_free_data.3 vendor/openpam/dist/doc/man/openpam_free_envlist.3 vendor/openpam/dist/doc/man/openpam_get_option.3 vendor/openpam/dist/doc/man/openpam_log.3 vendor/openpam/dist/doc/man/openpam_nullconv.3 vendor/openpam/dist/doc/man/openpam_readline.3 vendor/openpam/dist/doc/man/openpam_restore_cred.3 vendor/openpam/dist/doc/man/openpam_set_option.3 vendor/openpam/dist/doc/man/openpam_ttyconv.3 vendor/openpam/dist/doc/man/pam.3 vendor/openpam/dist/doc/man/pam.conf.5 vendor/openpam/dist/doc/man/pam_acct_mgmt.3 vendor/openpam/dist/doc/man/pam_authenticate.3 vendor/openpam/dist/doc/man/pam_chauthtok.3 vendor/openpam/dist/doc/man/pam_close_session.3 vendor/openpam/dist/doc/man/pam_conv.3 vendor/openpam/dist/doc/man/pam_end.3 vendor/openpam/dist/doc/man/pam_error.3 vendor/openpam/dist/doc/man/pam_get_authtok.3 vendor/openpam/dist/doc/man/pam_get_data.3 vendor/openpam/dist/doc/man/pam_get_item.3 vendor/openpam/dist/doc/man/pam_get_user.3 vendor/openpam/dist/doc/man/pam_getenv.3 vendor/openpam/dist/doc/man/pam_getenvlist.3 vendor/openpam/dist/doc/man/pam_info.3 vendor/openpam/dist/doc/man/pam_open_session.3 vendor/openpam/dist/doc/man/pam_prompt.3 vendor/openpam/dist/doc/man/pam_putenv.3 vendor/openpam/dist/doc/man/pam_set_data.3 vendor/openpam/dist/doc/man/pam_set_item.3 vendor/openpam/dist/doc/man/pam_setcred.3 vendor/openpam/dist/doc/man/pam_setenv.3 vendor/openpam/dist/doc/man/pam_sm_acct_mgmt.3 vendor/openpam/dist/doc/man/pam_sm_authenticate.3 vendor/openpam/dist/doc/man/pam_sm_chauthtok.3 vendor/openpam/dist/doc/man/pam_sm_close_session.3 vendor/openpam/dist/doc/man/pam_sm_open_session.3 vendor/openpam/dist/doc/man/pam_sm_setcred.3 vendor/openpam/dist/doc/man/pam_start.3 vendor/openpam/dist/doc/man/pam_strerror.3 vendor/openpam/dist/doc/man/pam_verror.3 vendor/openpam/dist/doc/man/pam_vinfo.3 vendor/openpam/dist/doc/man/pam_vprompt.3 vendor/openpam/dist/include/Makefile.in vendor/openpam/dist/include/security/Makefile.in vendor/openpam/dist/include/security/openpam.h vendor/openpam/dist/include/security/openpam_version.h vendor/openpam/dist/include/security/pam_appl.h vendor/openpam/dist/include/security/pam_constants.h vendor/openpam/dist/include/security/pam_modules.h vendor/openpam/dist/include/security/pam_types.h vendor/openpam/dist/install-sh vendor/openpam/dist/lib/Makefile.am vendor/openpam/dist/lib/Makefile.in vendor/openpam/dist/lib/openpam_borrow_cred.c vendor/openpam/dist/lib/openpam_configure.c vendor/openpam/dist/lib/openpam_dispatch.c vendor/openpam/dist/lib/openpam_dynamic.c vendor/openpam/dist/lib/openpam_findenv.c vendor/openpam/dist/lib/openpam_free_data.c vendor/openpam/dist/lib/openpam_free_envlist.c vendor/openpam/dist/lib/openpam_get_option.c vendor/openpam/dist/lib/openpam_impl.h vendor/openpam/dist/lib/openpam_load.c vendor/openpam/dist/lib/openpam_log.c vendor/openpam/dist/lib/openpam_nullconv.c vendor/openpam/dist/lib/openpam_readline.c vendor/openpam/dist/lib/openpam_restore_cred.c vendor/openpam/dist/lib/openpam_set_option.c vendor/openpam/dist/lib/openpam_static.c vendor/openpam/dist/lib/openpam_ttyconv.c vendor/openpam/dist/lib/pam_acct_mgmt.c vendor/openpam/dist/lib/pam_authenticate.c vendor/openpam/dist/lib/pam_authenticate_secondary.c vendor/openpam/dist/lib/pam_chauthtok.c vendor/openpam/dist/lib/pam_close_session.c vendor/openpam/dist/lib/pam_end.c vendor/openpam/dist/lib/pam_error.c vendor/openpam/dist/lib/pam_get_authtok.c vendor/openpam/dist/lib/pam_get_data.c vendor/openpam/dist/lib/pam_get_item.c vendor/openpam/dist/lib/pam_get_mapped_authtok.c vendor/openpam/dist/lib/pam_get_mapped_username.c vendor/openpam/dist/lib/pam_get_user.c vendor/openpam/dist/lib/pam_getenv.c vendor/openpam/dist/lib/pam_getenvlist.c vendor/openpam/dist/lib/pam_info.c vendor/openpam/dist/lib/pam_open_session.c vendor/openpam/dist/lib/pam_prompt.c vendor/openpam/dist/lib/pam_putenv.c vendor/openpam/dist/lib/pam_set_data.c vendor/openpam/dist/lib/pam_set_item.c vendor/openpam/dist/lib/pam_set_mapped_authtok.c vendor/openpam/dist/lib/pam_set_mapped_username.c vendor/openpam/dist/lib/pam_setcred.c vendor/openpam/dist/lib/pam_setenv.c vendor/openpam/dist/lib/pam_sm_acct_mgmt.c vendor/openpam/dist/lib/pam_sm_authenticate.c vendor/openpam/dist/lib/pam_sm_authenticate_secondary.c vendor/openpam/dist/lib/pam_sm_chauthtok.c vendor/openpam/dist/lib/pam_sm_close_session.c vendor/openpam/dist/lib/pam_sm_get_mapped_authtok.c vendor/openpam/dist/lib/pam_sm_get_mapped_username.c vendor/openpam/dist/lib/pam_sm_open_session.c vendor/openpam/dist/lib/pam_sm_set_mapped_authtok.c vendor/openpam/dist/lib/pam_sm_set_mapped_username.c vendor/openpam/dist/lib/pam_sm_setcred.c vendor/openpam/dist/lib/pam_start.c vendor/openpam/dist/lib/pam_strerror.c vendor/openpam/dist/lib/pam_verror.c vendor/openpam/dist/lib/pam_vinfo.c vendor/openpam/dist/lib/pam_vprompt.c vendor/openpam/dist/ltmain.sh vendor/openpam/dist/misc/gendoc.pl vendor/openpam/dist/missing vendor/openpam/dist/modules/Makefile.in vendor/openpam/dist/modules/pam_deny/Makefile.in vendor/openpam/dist/modules/pam_deny/pam_deny.c vendor/openpam/dist/modules/pam_permit/Makefile.in vendor/openpam/dist/modules/pam_permit/pam_permit.c vendor/openpam/dist/modules/pam_unix/Makefile.am vendor/openpam/dist/modules/pam_unix/Makefile.in vendor/openpam/dist/modules/pam_unix/pam_unix.c Modified: vendor/openpam/dist/CREDITS ============================================================================== --- vendor/openpam/dist/CREDITS Sun Dec 18 16:53:21 2011 (r228689) +++ vendor/openpam/dist/CREDITS Sun Dec 18 17:08:40 2011 (r228690) @@ -6,10 +6,11 @@ Network Associates, Inc. under DARPA/SP Principal design and development by: - Dag-Erling Smørgrav + Dag-Erling Smørgrav -The following persons (in no particular order) have contributed, directly -or indirectly, with patches, criticism, suggestions, or ideas: +The following persons (in alphabetical order) have contributed, +directly or indirectly, with patches, criticism, suggestions, or +ideas: Andrew Morgan Brian Fundakowski Feldman @@ -20,18 +21,21 @@ or indirectly, with patches, criticism, Emmanuel Dreyfus Eric Melville Gary Winiger + Hubert Feyrer Joe Marcus Clarke Juli Mallett - Hubert Feyrer + Jörg Sonnenberger Mark Murray Mike Petullo Mikhail Teterin - Mikko Työläjärvi + Mikko Työläjärvi + Nick Hibma Robert Watson Ruslan Ermilov + Sebastian Krahmer Solar Designer Takanori Saneto Wojciech A. Koszek Yar Tikhiy -$Id: CREDITS 400 2007-10-24 15:04:23Z des $ +$Id: CREDITS 498 2011-11-21 16:27:04Z des $ Modified: vendor/openpam/dist/HISTORY ============================================================================== --- vendor/openpam/dist/HISTORY Sun Dec 18 16:53:21 2011 (r228689) +++ vendor/openpam/dist/HISTORY Sun Dec 18 17:08:40 2011 (r228690) @@ -1,3 +1,29 @@ +OpenPAM Lycopsida 2011-12-18 + + - ENHANCE: removed static build autodetection, which didn't work + anyway. Use an explicit, user-specified preprocessor variable + instead. + + - ENHANCE: cleaned up the documentation a bit. + + - ENHANCE: added openpam_subst(3), allowing certain PAM items to be + embedded in strings such as prompts. Apply it to the prompts used + by pam_get_user(3) and pam_get_authtok(3). + + - ENHANCE: added support for the user_prompt, authtok_prompt and + oldauthtok_prompt module options, which override the prompts passed + by the module to pam_set_user(3) and pam_get_authtok(3). + + - ENHANCE: rewrote the policy parser to support quoted option values. + + - ENHANCE: added pamtest(1), a tool for testing modules and policies. + + - ENHANCE: added code to check the ownership and permissions of a + module before loading it. + + - ENHANCE: added / improved input validation in many cases, including + the policy file and some function arguments. +============================================================================ OpenPAM Hydrangea 2007-12-21 - ENHANCE: when compiling with GCC, mark up API functions with GCC @@ -21,7 +47,7 @@ OpenPAM Hydrangea 2007-12-21 contexts), since the module cache was the only part of OpenPAM that was not thread-safe. ============================================================================ -OpenPAM Figwort 2005-06-16 +OpenPAM Figwort 2005-06-16 - BUGFIX: Correct several small signedness and initialization bugs discovered during review by the NetBSD team. @@ -327,4 +353,4 @@ OpenPAM Calamite 2002-02-09 First (beta) release. ============================================================================ -$Id: HISTORY 409 2007-12-21 11:38:50Z des $ +$Id: HISTORY 504 2011-12-18 14:11:12Z des $ Modified: vendor/openpam/dist/LICENSE ============================================================================== --- vendor/openpam/dist/LICENSE Sun Dec 18 16:53:21 2011 (r228689) +++ vendor/openpam/dist/LICENSE Sun Dec 18 17:08:40 2011 (r228690) @@ -1,6 +1,6 @@ Copyright (c) 2002-2003 Networks Associates Technology, Inc. -Copyright (c) 2004-2007 Dag-Erling Smørgrav +Copyright (c) 2004-2011 Dag-Erling Smørgrav All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,4 +32,4 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$Id: LICENSE 408 2007-12-21 11:36:24Z des $ +$Id: LICENSE 437 2011-09-13 12:00:13Z des $ Modified: vendor/openpam/dist/Makefile.am ============================================================================== --- vendor/openpam/dist/Makefile.am Sun Dec 18 16:53:21 2011 (r228689) +++ vendor/openpam/dist/Makefile.am Sun Dec 18 17:08:40 2011 (r228690) @@ -1,4 +1,6 @@ -# $Id: Makefile.am 395 2007-06-03 20:26:18Z des $ +# $Id: Makefile.am 428 2010-03-09 17:32:17Z des $ + +ACLOCAL_AMFLAGS = -I m4 SUBDIRS = lib bin modules include Modified: vendor/openpam/dist/Makefile.in ============================================================================== --- vendor/openpam/dist/Makefile.in Sun Dec 18 16:53:21 2011 (r228689) +++ vendor/openpam/dist/Makefile.in Sun Dec 18 17:08:40 2011 (r228690) @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,16 +15,13 @@ @SET_MAKE@ -# $Id: Makefile.am 395 2007-06-03 20:26:18Z des $ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ +# $Id: Makefile.am 428 2010-03-09 17:32:17Z des $ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -37,30 +35,36 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ @WITH_DOC_TRUE@am__append_1 = doc +subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure INSTALL compile config.guess \ - config.sub depcomp install-sh ltmain.sh missing -subdir = . + $(top_srcdir)/configure INSTALL config.guess config.sub \ + depcomp install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags DIST_SUBDIRS = lib bin modules include doc @@ -68,16 +72,39 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } + { test ! -d "$(distdir)" \ + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr "$(distdir)"; }; } +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -90,42 +117,50 @@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CRYPT_LIBS = @CRYPT_LIBS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DL_LIBS = @DL_LIBS@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_MAJ = @LIB_MAJ@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ @@ -134,19 +169,13 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -WITH_DOC_FALSE = @WITH_DOC_FALSE@ -WITH_DOC_TRUE = @WITH_DOC_TRUE@ -WITH_PAM_UNIX_FALSE = @WITH_PAM_UNIX_FALSE@ -WITH_PAM_UNIX_TRUE = @WITH_PAM_UNIX_TRUE@ -WITH_SU_FALSE = @WITH_SU_FALSE@ -WITH_SU_TRUE = @WITH_SU_TRUE@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -158,6 +187,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -185,12 +215,13 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +ACLOCAL_AMFLAGS = -I m4 SUBDIRS = lib bin modules include $(am__append_1) EXTRA_DIST = \ CREDITS \ @@ -212,15 +243,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -236,21 +267,22 @@ $(top_builddir)/config.status: $(top_src $(SHELL) ./config.status --recheck $(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config.h.in: $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -264,8 +296,7 @@ clean-libtool: -rm -rf .libs _libs distclean-libtool: - -rm -f libtool -uninstall-info-am: + -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -274,7 +305,7 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -291,16 +322,15 @@ $(RECURSIVE_TARGETS): else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ +$(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -326,16 +356,16 @@ maintainer-clean-recursive: else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -343,14 +373,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -362,93 +392,114 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/misc - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) @@ -457,6 +508,14 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -480,13 +539,17 @@ dist dist-all: distdir distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -494,9 +557,11 @@ distcheck: dist mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ @@ -518,13 +583,15 @@ distcheck: dist && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @cd $(distuninstallcheck_dir) \ + @$(am__cd) '$(distuninstallcheck_dir)' \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ @@ -566,6 +633,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -586,18 +654,38 @@ dvi-am: html: html-recursive +html-am: + info: info-recursive info-am: install-data-am: +install-dvi: install-dvi-recursive + +install-dvi-am: + install-exec-am: +install-html: install-html-recursive + +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -618,24 +706,27 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ + ctags-recursive install-am install-strip tags-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Modified: vendor/openpam/dist/README ============================================================================== --- vendor/openpam/dist/README Sun Dec 18 16:53:21 2011 (r228689) +++ vendor/openpam/dist/README Sun Dec 18 17:08:40 2011 (r228690) @@ -22,6 +22,6 @@ These are some of OpenPAM's features: /usr/local/etc/pam.d/ and /usr/local/etc/pam.conf, in that order; this will be made configurable in a future release. -Please direct bug reports and inquiries to des@freebsd.org. +Please direct bug reports and inquiries to . -$Id: README 320 2006-02-16 20:33:19Z des $ +$Id: README 424 2009-10-29 17:10:22Z des $ Modified: vendor/openpam/dist/RELNOTES ============================================================================== --- vendor/openpam/dist/RELNOTES Sun Dec 18 16:53:21 2011 (r228689) +++ vendor/openpam/dist/RELNOTES Sun Dec 18 17:08:40 2011 (r228690) @@ -1,13 +1,11 @@ - Release notes for OpenPAM Hydrangea + Release notes for OpenPAM Lycopsida =================================== -This release corresponds to the code used in FreeBSD-CURRENT as of the -release date. It has also been tested on several other platforms, and -is expected to work on almost any POSIX-like platform that has GNU -autotools, GNU make and the GNU compiler suite installed. One notable -exception is MacOS X, which ships with a very weird, heavily modified -version of GCC. +This release corresponds to the code used in FreeBSD HEAD as of the +release date, and is also expected to work on almost any POSIX-like +platform that has GNU autotools, GNU make and the GNU compiler suite +installed. The library itself is complete. Documentation exists in the form of man pages for the library functions. These man pages are generated by @@ -18,12 +16,9 @@ of date. The distribution also includes three sample modules (pam_deny, pam_permit and pam_unix) and a sample application (su). These are not intended for actual use, but rather to serve as examples for module or -application developers. +application developers. It also includes a command-line application +(pamtest) which can be used to test policies and modules. -NOTE: to the person who sent me MacOS patches in July 2002: I have -lost your name and email address. Please contact me so I can give you -proper credit for your contribution. +Please direct bug reports and inquiries to . -Please direct bug reports and inquiries to . - -$Id: RELNOTES 404 2007-11-28 12:31:04Z des $ +$Id: RELNOTES 506 2011-12-18 14:25:12Z des $ Modified: vendor/openpam/dist/aclocal.m4 ============================================================================== --- vendor/openpam/dist/aclocal.m4 Sun Dec 18 16:53:21 2011 (r228689) +++ vendor/openpam/dist/aclocal.m4 Sun Dec 18 17:08:40 2011 (r228690) @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,103 +11,206 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +m4_define([_LT_COPYING], [dnl +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +]) -# serial 51 AC_PROG_LIBTOOL +# serial 57 LT_INIT -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. -m4_ifdef([AC_PROVIDE_IFELSE], - [], - [m4_define([AC_PROVIDE_IFELSE], - [m4_ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun([LT_PREREQ], +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, + [m4_default([$3], + [m4_fatal([Libtool version $1 or higher is required], + 63)])], + [$2])]) -# AC_PROG_LIBTOOL -# --------------- -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX - ])]) -dnl And a similar setup for Fortran 77 support - AC_PROVIDE_IFELSE([AC_PROG_F77], - [AC_LIBTOOL_F77], - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -])]) - -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -])])# AC_PROG_LIBTOOL +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun([_LT_CHECK_BUILDDIR], +[case `pwd` in + *\ * | *\ *) + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +esac +]) -# _AC_PROG_LIBTOOL -# ---------------- -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl +# LT_INIT([OPTIONS]) +# ------------------ +AC_DEFUN([LT_INIT], +[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +AC_BEFORE([$0], [LT_LANG])dnl +AC_BEFORE([$0], [LT_OUTPUT])dnl +AC_BEFORE([$0], [LTDL_INIT])dnl +m4_require([_LT_CHECK_BUILDDIR])dnl + +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE([LTOPTIONS_VERSION])dnl +AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl +m4_require([_LT_PROG_LTMAIN])dnl + +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-vendor@FreeBSD.ORG Sun Dec 18 17:11:19 2011 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 618DC106564A; Sun, 18 Dec 2011 17:11:19 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 363838FC0C; Sun, 18 Dec 2011 17:11:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBIHBJg6017995; Sun, 18 Dec 2011 17:11:19 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBIHBII9017994; Sun, 18 Dec 2011 17:11:19 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201112181711.pBIHBII9017994@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sun, 18 Dec 2011 17:11:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228691 - vendor/openpam/LYCOPSIDA X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Dec 2011 17:11:19 -0000 Author: des Date: Sun Dec 18 17:11:18 2011 New Revision: 228691 URL: http://svn.freebsd.org/changeset/base/228691 Log: Tag OpenPAM Lycopsida Added: vendor/openpam/LYCOPSIDA/ - copied from r228690, vendor/openpam/dist/ From owner-svn-src-vendor@FreeBSD.ORG Tue Dec 20 22:47:57 2011 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 896EA106566C; Tue, 20 Dec 2011 22:47:57 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 701A68FC0A; Tue, 20 Dec 2011 22:47:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBKMlv2K038703; Tue, 20 Dec 2011 22:47:57 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBKMlvYv038696; Tue, 20 Dec 2011 22:47:57 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201112202247.pBKMlvYv038696@svn.freebsd.org> From: Martin Matuska Date: Tue, 20 Dec 2011 22:47:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228753 - in vendor/libarchive: . dist dist/build dist/build/autoconf dist/build/cmake dist/build/pkgconfig dist/contrib dist/contrib/psota-benchmark dist/contrib/shar dist/cpio dist/cp... X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 22:47:57 -0000 Author: mm Date: Tue Dec 20 22:47:56 2011 New Revision: 228753 URL: http://svn.freebsd.org/changeset/base/228753 Log: Vendor import of libarchive (release/2.8, r3824) Obtained from: http://libarchive.googlecode.com/svn/release/2.8 Added: vendor/libarchive/ vendor/libarchive/dist/ vendor/libarchive/dist/CMakeLists.txt vendor/libarchive/dist/COPYING vendor/libarchive/dist/CTestConfig.cmake vendor/libarchive/dist/INSTALL vendor/libarchive/dist/Makefile.am vendor/libarchive/dist/NEWS vendor/libarchive/dist/README vendor/libarchive/dist/build/ vendor/libarchive/dist/build/autoconf/ vendor/libarchive/dist/build/autoconf/check_stdcall_func.m4 vendor/libarchive/dist/build/autoconf/la_uid_t.m4 vendor/libarchive/dist/build/autogen.sh (contents, props changed) vendor/libarchive/dist/build/bump-version.sh vendor/libarchive/dist/build/clean.sh vendor/libarchive/dist/build/cmake/ vendor/libarchive/dist/build/cmake/AddTest28.cmake vendor/libarchive/dist/build/cmake/CheckFileOffsetBits.c vendor/libarchive/dist/build/cmake/CheckFileOffsetBits.cmake vendor/libarchive/dist/build/cmake/CheckFuncs.cmake vendor/libarchive/dist/build/cmake/CheckFuncs_stub.c.in vendor/libarchive/dist/build/cmake/CheckHeaderDirent.cmake vendor/libarchive/dist/build/cmake/CheckStructMember.cmake vendor/libarchive/dist/build/cmake/CheckTypeExists.cmake vendor/libarchive/dist/build/cmake/FindLZMA.cmake vendor/libarchive/dist/build/cmake/config.h.in vendor/libarchive/dist/build/pkgconfig/ vendor/libarchive/dist/build/pkgconfig/libarchive.pc.in vendor/libarchive/dist/build/version vendor/libarchive/dist/configure.ac vendor/libarchive/dist/contrib/ vendor/libarchive/dist/contrib/README vendor/libarchive/dist/contrib/libarchive.1aix53.spec vendor/libarchive/dist/contrib/libarchive.spec vendor/libarchive/dist/contrib/libarchive_autodetect-st_lib_archive.m4 vendor/libarchive/dist/contrib/psota-benchmark/ vendor/libarchive/dist/contrib/psota-benchmark/results.txt vendor/libarchive/dist/contrib/psota-benchmark/tcp.sh vendor/libarchive/dist/contrib/shar/ vendor/libarchive/dist/contrib/shar/Makefile vendor/libarchive/dist/contrib/shar/shar.1 vendor/libarchive/dist/contrib/shar/shar.c vendor/libarchive/dist/contrib/shar/tree.c vendor/libarchive/dist/contrib/shar/tree.h vendor/libarchive/dist/contrib/shar/tree_config.h vendor/libarchive/dist/contrib/untar.c vendor/libarchive/dist/cpio/ vendor/libarchive/dist/cpio/CMakeLists.txt vendor/libarchive/dist/cpio/bsdcpio.1 vendor/libarchive/dist/cpio/cmdline.c vendor/libarchive/dist/cpio/config_freebsd.h vendor/libarchive/dist/cpio/cpio.c vendor/libarchive/dist/cpio/cpio.h vendor/libarchive/dist/cpio/cpio_platform.h vendor/libarchive/dist/cpio/cpio_windows.c vendor/libarchive/dist/cpio/cpio_windows.h vendor/libarchive/dist/cpio/test/ vendor/libarchive/dist/cpio/test/CMakeLists.txt vendor/libarchive/dist/cpio/test/main.c vendor/libarchive/dist/cpio/test/test.h vendor/libarchive/dist/cpio/test/test_0.c vendor/libarchive/dist/cpio/test/test_basic.c vendor/libarchive/dist/cpio/test/test_cmdline.c vendor/libarchive/dist/cpio/test/test_format_newc.c vendor/libarchive/dist/cpio/test/test_gcpio_compat.c vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref.bin.uu vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref.crc.uu vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref.newc.uu vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref.ustar.uu vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref_nosym.bin.uu vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref_nosym.crc.uu vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref_nosym.newc.uu vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref_nosym.ustar.uu vendor/libarchive/dist/cpio/test/test_option_B_upper.c vendor/libarchive/dist/cpio/test/test_option_C_upper.c vendor/libarchive/dist/cpio/test/test_option_J_upper.c vendor/libarchive/dist/cpio/test/test_option_L_upper.c vendor/libarchive/dist/cpio/test/test_option_Z_upper.c vendor/libarchive/dist/cpio/test/test_option_a.c vendor/libarchive/dist/cpio/test/test_option_c.c vendor/libarchive/dist/cpio/test/test_option_d.c vendor/libarchive/dist/cpio/test/test_option_f.c vendor/libarchive/dist/cpio/test/test_option_f.cpio.uu vendor/libarchive/dist/cpio/test/test_option_help.c vendor/libarchive/dist/cpio/test/test_option_l.c vendor/libarchive/dist/cpio/test/test_option_lzma.c vendor/libarchive/dist/cpio/test/test_option_m.c vendor/libarchive/dist/cpio/test/test_option_m.cpio.uu vendor/libarchive/dist/cpio/test/test_option_t.c vendor/libarchive/dist/cpio/test/test_option_t.cpio.uu vendor/libarchive/dist/cpio/test/test_option_t.stdout.uu vendor/libarchive/dist/cpio/test/test_option_tv.stdout.uu vendor/libarchive/dist/cpio/test/test_option_u.c vendor/libarchive/dist/cpio/test/test_option_version.c vendor/libarchive/dist/cpio/test/test_option_y.c vendor/libarchive/dist/cpio/test/test_option_z.c vendor/libarchive/dist/cpio/test/test_owner_parse.c vendor/libarchive/dist/cpio/test/test_passthrough_dotdot.c vendor/libarchive/dist/cpio/test/test_passthrough_reverse.c vendor/libarchive/dist/cpio/test/test_pathmatch.c vendor/libarchive/dist/doc/ vendor/libarchive/dist/doc/html/ vendor/libarchive/dist/doc/man/ vendor/libarchive/dist/doc/mdoc2man.awk vendor/libarchive/dist/doc/mdoc2wiki.awk vendor/libarchive/dist/doc/pdf/ vendor/libarchive/dist/doc/text/ vendor/libarchive/dist/doc/update.sh vendor/libarchive/dist/doc/wiki/ vendor/libarchive/dist/examples/ vendor/libarchive/dist/examples/minitar/ vendor/libarchive/dist/examples/minitar/Makefile vendor/libarchive/dist/examples/minitar/README vendor/libarchive/dist/examples/minitar/minitar.c vendor/libarchive/dist/examples/minitar/tree.c vendor/libarchive/dist/examples/minitar/tree.h vendor/libarchive/dist/examples/tarfilter.c vendor/libarchive/dist/examples/untar.c vendor/libarchive/dist/libarchive/ vendor/libarchive/dist/libarchive/CMakeLists.txt vendor/libarchive/dist/libarchive/archive.h vendor/libarchive/dist/libarchive/archive_check_magic.c vendor/libarchive/dist/libarchive/archive_crc32.h vendor/libarchive/dist/libarchive/archive_endian.h vendor/libarchive/dist/libarchive/archive_entry.3 vendor/libarchive/dist/libarchive/archive_entry.c vendor/libarchive/dist/libarchive/archive_entry.h vendor/libarchive/dist/libarchive/archive_entry_copy_bhfi.c vendor/libarchive/dist/libarchive/archive_entry_copy_stat.c vendor/libarchive/dist/libarchive/archive_entry_link_resolver.c vendor/libarchive/dist/libarchive/archive_entry_private.h vendor/libarchive/dist/libarchive/archive_entry_stat.c vendor/libarchive/dist/libarchive/archive_entry_strmode.c vendor/libarchive/dist/libarchive/archive_entry_xattr.c vendor/libarchive/dist/libarchive/archive_hash.h vendor/libarchive/dist/libarchive/archive_platform.h vendor/libarchive/dist/libarchive/archive_private.h vendor/libarchive/dist/libarchive/archive_read.3 vendor/libarchive/dist/libarchive/archive_read.c vendor/libarchive/dist/libarchive/archive_read_data_into_fd.c vendor/libarchive/dist/libarchive/archive_read_disk.3 vendor/libarchive/dist/libarchive/archive_read_disk.c vendor/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c vendor/libarchive/dist/libarchive/archive_read_disk_private.h vendor/libarchive/dist/libarchive/archive_read_disk_set_standard_lookup.c vendor/libarchive/dist/libarchive/archive_read_extract.c vendor/libarchive/dist/libarchive/archive_read_open_fd.c vendor/libarchive/dist/libarchive/archive_read_open_file.c vendor/libarchive/dist/libarchive/archive_read_open_filename.c vendor/libarchive/dist/libarchive/archive_read_open_memory.c vendor/libarchive/dist/libarchive/archive_read_private.h vendor/libarchive/dist/libarchive/archive_read_support_compression_all.c vendor/libarchive/dist/libarchive/archive_read_support_compression_bzip2.c vendor/libarchive/dist/libarchive/archive_read_support_compression_compress.c vendor/libarchive/dist/libarchive/archive_read_support_compression_gzip.c vendor/libarchive/dist/libarchive/archive_read_support_compression_none.c vendor/libarchive/dist/libarchive/archive_read_support_compression_program.c vendor/libarchive/dist/libarchive/archive_read_support_compression_rpm.c vendor/libarchive/dist/libarchive/archive_read_support_compression_uu.c vendor/libarchive/dist/libarchive/archive_read_support_compression_xz.c vendor/libarchive/dist/libarchive/archive_read_support_format_all.c vendor/libarchive/dist/libarchive/archive_read_support_format_ar.c vendor/libarchive/dist/libarchive/archive_read_support_format_cpio.c vendor/libarchive/dist/libarchive/archive_read_support_format_empty.c vendor/libarchive/dist/libarchive/archive_read_support_format_iso9660.c vendor/libarchive/dist/libarchive/archive_read_support_format_mtree.c vendor/libarchive/dist/libarchive/archive_read_support_format_raw.c vendor/libarchive/dist/libarchive/archive_read_support_format_tar.c vendor/libarchive/dist/libarchive/archive_read_support_format_xar.c vendor/libarchive/dist/libarchive/archive_read_support_format_zip.c vendor/libarchive/dist/libarchive/archive_string.c vendor/libarchive/dist/libarchive/archive_string.h vendor/libarchive/dist/libarchive/archive_string_sprintf.c vendor/libarchive/dist/libarchive/archive_util.3 vendor/libarchive/dist/libarchive/archive_util.c vendor/libarchive/dist/libarchive/archive_virtual.c vendor/libarchive/dist/libarchive/archive_windows.c vendor/libarchive/dist/libarchive/archive_windows.h vendor/libarchive/dist/libarchive/archive_write.3 vendor/libarchive/dist/libarchive/archive_write.c vendor/libarchive/dist/libarchive/archive_write_disk.3 vendor/libarchive/dist/libarchive/archive_write_disk.c vendor/libarchive/dist/libarchive/archive_write_disk_private.h vendor/libarchive/dist/libarchive/archive_write_disk_set_standard_lookup.c vendor/libarchive/dist/libarchive/archive_write_open_fd.c vendor/libarchive/dist/libarchive/archive_write_open_file.c vendor/libarchive/dist/libarchive/archive_write_open_filename.c vendor/libarchive/dist/libarchive/archive_write_open_memory.c vendor/libarchive/dist/libarchive/archive_write_private.h vendor/libarchive/dist/libarchive/archive_write_set_compression_bzip2.c vendor/libarchive/dist/libarchive/archive_write_set_compression_compress.c vendor/libarchive/dist/libarchive/archive_write_set_compression_gzip.c vendor/libarchive/dist/libarchive/archive_write_set_compression_none.c vendor/libarchive/dist/libarchive/archive_write_set_compression_program.c vendor/libarchive/dist/libarchive/archive_write_set_compression_xz.c vendor/libarchive/dist/libarchive/archive_write_set_format.c vendor/libarchive/dist/libarchive/archive_write_set_format_ar.c vendor/libarchive/dist/libarchive/archive_write_set_format_by_name.c vendor/libarchive/dist/libarchive/archive_write_set_format_cpio.c vendor/libarchive/dist/libarchive/archive_write_set_format_cpio_newc.c vendor/libarchive/dist/libarchive/archive_write_set_format_mtree.c vendor/libarchive/dist/libarchive/archive_write_set_format_pax.c vendor/libarchive/dist/libarchive/archive_write_set_format_shar.c vendor/libarchive/dist/libarchive/archive_write_set_format_ustar.c vendor/libarchive/dist/libarchive/archive_write_set_format_zip.c vendor/libarchive/dist/libarchive/config_freebsd.h vendor/libarchive/dist/libarchive/cpio.5 vendor/libarchive/dist/libarchive/filter_fork.c vendor/libarchive/dist/libarchive/filter_fork.h vendor/libarchive/dist/libarchive/filter_fork_windows.c vendor/libarchive/dist/libarchive/libarchive-formats.5 vendor/libarchive/dist/libarchive/libarchive.3 vendor/libarchive/dist/libarchive/libarchive_internals.3 vendor/libarchive/dist/libarchive/mtree.5 vendor/libarchive/dist/libarchive/tar.5 vendor/libarchive/dist/libarchive/test/ vendor/libarchive/dist/libarchive/test/.cvsignore vendor/libarchive/dist/libarchive/test/CMakeLists.txt vendor/libarchive/dist/libarchive/test/README vendor/libarchive/dist/libarchive/test/main.c vendor/libarchive/dist/libarchive/test/read_open_memory.c vendor/libarchive/dist/libarchive/test/test.h vendor/libarchive/dist/libarchive/test/test_acl_basic.c vendor/libarchive/dist/libarchive/test/test_acl_freebsd.c vendor/libarchive/dist/libarchive/test/test_acl_pax.c vendor/libarchive/dist/libarchive/test/test_archive_api_feature.c vendor/libarchive/dist/libarchive/test/test_bad_fd.c vendor/libarchive/dist/libarchive/test/test_compat_bzip2.c vendor/libarchive/dist/libarchive/test/test_compat_bzip2_1.tbz.uu vendor/libarchive/dist/libarchive/test/test_compat_bzip2_2.tbz.uu vendor/libarchive/dist/libarchive/test/test_compat_cpio.c vendor/libarchive/dist/libarchive/test/test_compat_cpio_1.cpio.uu vendor/libarchive/dist/libarchive/test/test_compat_gtar.c vendor/libarchive/dist/libarchive/test/test_compat_gtar_1.tar.uu vendor/libarchive/dist/libarchive/test/test_compat_gzip.c vendor/libarchive/dist/libarchive/test/test_compat_gzip_1.tgz.uu vendor/libarchive/dist/libarchive/test/test_compat_gzip_2.tgz.uu vendor/libarchive/dist/libarchive/test/test_compat_lzma.c vendor/libarchive/dist/libarchive/test/test_compat_lzma_1.tlz.uu vendor/libarchive/dist/libarchive/test/test_compat_lzma_2.tlz.uu vendor/libarchive/dist/libarchive/test/test_compat_lzma_3.tlz.uu vendor/libarchive/dist/libarchive/test/test_compat_solaris_tar_acl.c vendor/libarchive/dist/libarchive/test/test_compat_solaris_tar_acl.tar.uu vendor/libarchive/dist/libarchive/test/test_compat_tar_hardlink.c vendor/libarchive/dist/libarchive/test/test_compat_tar_hardlink_1.tar.uu vendor/libarchive/dist/libarchive/test/test_compat_xz.c vendor/libarchive/dist/libarchive/test/test_compat_xz_1.txz.uu vendor/libarchive/dist/libarchive/test/test_compat_zip.c vendor/libarchive/dist/libarchive/test/test_compat_zip_1.zip.uu vendor/libarchive/dist/libarchive/test/test_empty_write.c vendor/libarchive/dist/libarchive/test/test_entry.c vendor/libarchive/dist/libarchive/test/test_entry_strmode.c vendor/libarchive/dist/libarchive/test/test_extattr_freebsd.c vendor/libarchive/dist/libarchive/test/test_fuzz.c vendor/libarchive/dist/libarchive/test/test_fuzz_1.iso.Z.uu vendor/libarchive/dist/libarchive/test/test_link_resolver.c vendor/libarchive/dist/libarchive/test/test_open_failure.c vendor/libarchive/dist/libarchive/test/test_open_fd.c vendor/libarchive/dist/libarchive/test/test_open_file.c vendor/libarchive/dist/libarchive/test/test_open_filename.c vendor/libarchive/dist/libarchive/test/test_pax_filename_encoding.c vendor/libarchive/dist/libarchive/test/test_pax_filename_encoding.tar.uu vendor/libarchive/dist/libarchive/test/test_read_compress_program.c vendor/libarchive/dist/libarchive/test/test_read_data_large.c vendor/libarchive/dist/libarchive/test/test_read_disk.c vendor/libarchive/dist/libarchive/test/test_read_disk_entry_from_file.c vendor/libarchive/dist/libarchive/test/test_read_extract.c vendor/libarchive/dist/libarchive/test/test_read_file_nonexistent.c vendor/libarchive/dist/libarchive/test/test_read_format_ar.ar.uu vendor/libarchive/dist/libarchive/test/test_read_format_ar.c vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin.c vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_Z.c vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_be.c vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_be.cpio.uu vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_bz2.c vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_gz.c vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_lzma.c vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_xz.c vendor/libarchive/dist/libarchive/test/test_read_format_cpio_odc.c vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.rpm.uu vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4_gzip.c vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.rpm.uu vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4c_Z.c vendor/libarchive/dist/libarchive/test/test_read_format_empty.c vendor/libarchive/dist/libarchive/test/test_read_format_gtar_gz.c vendor/libarchive/dist/libarchive/test/test_read_format_gtar_lzma.c vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse.c vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu vendor/libarchive/dist/libarchive/test/test_read_format_iso.iso.Z.uu vendor/libarchive/dist/libarchive/test/test_read_format_iso_2.iso.Z.uu vendor/libarchive/dist/libarchive/test/test_read_format_iso_Z.c vendor/libarchive/dist/libarchive/test/test_read_format_iso_joliet.iso.Z.uu vendor/libarchive/dist/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu vendor/libarchive/dist/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu vendor/libarchive/dist/libarchive/test/test_read_format_iso_multi_extent.c vendor/libarchive/dist/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu vendor/libarchive/dist/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu vendor/libarchive/dist/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu vendor/libarchive/dist/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu vendor/libarchive/dist/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu vendor/libarchive/dist/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu vendor/libarchive/dist/libarchive/test/test_read_format_isojoliet_bz2.c vendor/libarchive/dist/libarchive/test/test_read_format_isojoliet_long.c vendor/libarchive/dist/libarchive/test/test_read_format_isojoliet_rr.c vendor/libarchive/dist/libarchive/test/test_read_format_isorr_bz2.c vendor/libarchive/dist/libarchive/test/test_read_format_isorr_ce.c vendor/libarchive/dist/libarchive/test/test_read_format_isorr_new_bz2.c vendor/libarchive/dist/libarchive/test/test_read_format_isorr_rr_moved.c vendor/libarchive/dist/libarchive/test/test_read_format_isozisofs_bz2.c vendor/libarchive/dist/libarchive/test/test_read_format_mtree.c vendor/libarchive/dist/libarchive/test/test_read_format_mtree.mtree.uu vendor/libarchive/dist/libarchive/test/test_read_format_pax_bz2.c vendor/libarchive/dist/libarchive/test/test_read_format_raw.c vendor/libarchive/dist/libarchive/test/test_read_format_raw.data.Z.uu vendor/libarchive/dist/libarchive/test/test_read_format_raw.data.uu vendor/libarchive/dist/libarchive/test/test_read_format_tar.c vendor/libarchive/dist/libarchive/test/test_read_format_tar_empty_filename.c vendor/libarchive/dist/libarchive/test/test_read_format_tar_empty_filename.tar.uu vendor/libarchive/dist/libarchive/test/test_read_format_tbz.c vendor/libarchive/dist/libarchive/test/test_read_format_tgz.c vendor/libarchive/dist/libarchive/test/test_read_format_tlz.c vendor/libarchive/dist/libarchive/test/test_read_format_txz.c vendor/libarchive/dist/libarchive/test/test_read_format_tz.c vendor/libarchive/dist/libarchive/test/test_read_format_xar.c vendor/libarchive/dist/libarchive/test/test_read_format_zip.c vendor/libarchive/dist/libarchive/test/test_read_format_zip.zip.uu vendor/libarchive/dist/libarchive/test/test_read_large.c vendor/libarchive/dist/libarchive/test/test_read_pax_truncated.c vendor/libarchive/dist/libarchive/test/test_read_position.c vendor/libarchive/dist/libarchive/test/test_read_truncated.c vendor/libarchive/dist/libarchive/test/test_read_uu.c vendor/libarchive/dist/libarchive/test/test_tar_filenames.c vendor/libarchive/dist/libarchive/test/test_tar_large.c vendor/libarchive/dist/libarchive/test/test_ustar_filenames.c vendor/libarchive/dist/libarchive/test/test_write_compress.c vendor/libarchive/dist/libarchive/test/test_write_compress_bzip2.c vendor/libarchive/dist/libarchive/test/test_write_compress_gzip.c vendor/libarchive/dist/libarchive/test/test_write_compress_lzma.c vendor/libarchive/dist/libarchive/test/test_write_compress_program.c vendor/libarchive/dist/libarchive/test/test_write_compress_xz.c vendor/libarchive/dist/libarchive/test/test_write_disk.c vendor/libarchive/dist/libarchive/test/test_write_disk_failures.c vendor/libarchive/dist/libarchive/test/test_write_disk_hardlink.c vendor/libarchive/dist/libarchive/test/test_write_disk_perms.c vendor/libarchive/dist/libarchive/test/test_write_disk_secure.c vendor/libarchive/dist/libarchive/test/test_write_disk_sparse.c vendor/libarchive/dist/libarchive/test/test_write_disk_symlink.c vendor/libarchive/dist/libarchive/test/test_write_disk_times.c vendor/libarchive/dist/libarchive/test/test_write_format_ar.c vendor/libarchive/dist/libarchive/test/test_write_format_cpio.c vendor/libarchive/dist/libarchive/test/test_write_format_cpio_empty.c vendor/libarchive/dist/libarchive/test/test_write_format_cpio_newc.c vendor/libarchive/dist/libarchive/test/test_write_format_cpio_odc.c vendor/libarchive/dist/libarchive/test/test_write_format_mtree.c vendor/libarchive/dist/libarchive/test/test_write_format_pax.c vendor/libarchive/dist/libarchive/test/test_write_format_shar_empty.c vendor/libarchive/dist/libarchive/test/test_write_format_tar.c vendor/libarchive/dist/libarchive/test/test_write_format_tar_empty.c vendor/libarchive/dist/libarchive/test/test_write_format_tar_ustar.c vendor/libarchive/dist/libarchive/test/test_write_format_zip.c vendor/libarchive/dist/libarchive/test/test_write_format_zip_empty.c vendor/libarchive/dist/libarchive/test/test_write_format_zip_no_compression.c vendor/libarchive/dist/libarchive/test/test_write_open_memory.c vendor/libarchive/dist/libarchive_fe/ vendor/libarchive/dist/libarchive_fe/err.c vendor/libarchive/dist/libarchive_fe/err.h vendor/libarchive/dist/libarchive_fe/lafe_platform.h vendor/libarchive/dist/libarchive_fe/line_reader.c vendor/libarchive/dist/libarchive_fe/line_reader.h vendor/libarchive/dist/libarchive_fe/matching.c vendor/libarchive/dist/libarchive_fe/matching.h vendor/libarchive/dist/libarchive_fe/pathmatch.c vendor/libarchive/dist/libarchive_fe/pathmatch.h vendor/libarchive/dist/tar/ vendor/libarchive/dist/tar/CMakeLists.txt vendor/libarchive/dist/tar/bsdtar.1 vendor/libarchive/dist/tar/bsdtar.c vendor/libarchive/dist/tar/bsdtar.h vendor/libarchive/dist/tar/bsdtar_platform.h vendor/libarchive/dist/tar/bsdtar_windows.c vendor/libarchive/dist/tar/bsdtar_windows.h vendor/libarchive/dist/tar/cmdline.c vendor/libarchive/dist/tar/config_freebsd.h vendor/libarchive/dist/tar/getdate.c vendor/libarchive/dist/tar/read.c vendor/libarchive/dist/tar/subst.c vendor/libarchive/dist/tar/test/ vendor/libarchive/dist/tar/test/CMakeLists.txt vendor/libarchive/dist/tar/test/main.c vendor/libarchive/dist/tar/test/test.h vendor/libarchive/dist/tar/test/test_0.c vendor/libarchive/dist/tar/test/test_basic.c vendor/libarchive/dist/tar/test/test_copy.c vendor/libarchive/dist/tar/test/test_empty_mtree.c vendor/libarchive/dist/tar/test/test_getdate.c vendor/libarchive/dist/tar/test/test_help.c vendor/libarchive/dist/tar/test/test_option_T_upper.c vendor/libarchive/dist/tar/test/test_option_q.c vendor/libarchive/dist/tar/test/test_option_r.c vendor/libarchive/dist/tar/test/test_option_s.c vendor/libarchive/dist/tar/test/test_patterns.c vendor/libarchive/dist/tar/test/test_patterns_2.tar.uu vendor/libarchive/dist/tar/test/test_patterns_3.tar.uu vendor/libarchive/dist/tar/test/test_patterns_4.tar.uu vendor/libarchive/dist/tar/test/test_stdio.c vendor/libarchive/dist/tar/test/test_strip_components.c vendor/libarchive/dist/tar/test/test_symlink_dir.c vendor/libarchive/dist/tar/test/test_version.c vendor/libarchive/dist/tar/test/test_windows.c vendor/libarchive/dist/tar/tree.c vendor/libarchive/dist/tar/tree.h vendor/libarchive/dist/tar/util.c vendor/libarchive/dist/tar/write.c Added: vendor/libarchive/dist/CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/libarchive/dist/CMakeLists.txt Tue Dec 20 22:47:56 2011 (r228753) @@ -0,0 +1,873 @@ +# +# +PROJECT(libarchive C) +# +CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR) +SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake") +if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${libarchive_BINARY_DIR}/bin) +endif() + +# +# Version - read from 'version' file. +# +FILE(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/build/version _version) +STRING(REGEX REPLACE + "^([0-9])[0-9][0-9][0-9][0-9][0-9][0-9][a-z]?$" "\\1" _major ${_version}) +STRING(REGEX REPLACE + "^[0-9]([0-9][0-9][0-9])[0-9][0-9][0-9][a-z]?$" "\\1" _minor ${_version}) +STRING(REGEX REPLACE + "^[0-9][0-9][0-9][0-9]([0-9][0-9][0-9])[a-z]?$" "\\1" _revision ${_version}) +STRING(REGEX REPLACE + "^[0-9][0-9][0-9][0-9][0-9][0-9][0-9]([a-z]?)$" "\\1" _quality ${_version}) +SET(_version_number ${_major}${_minor}${_revision}) +STRING(REGEX REPLACE "[0]*([^0][0-9]*)$" "\\1" _minor ${_minor}) +STRING(REGEX REPLACE "[0]*([^0][0-9]*)$" "\\1" _revision ${_revision}) +# +SET(VERSION "${_major}.${_minor}.${_revision}${_quality}") +SET(BSDCPIO_VERSION_STRING "${VERSION}") +SET(BSDTAR_VERSION_STRING "${VERSION}") +SET(LIBARCHIVE_VERSION_NUMBER "${_version_number}") +SET(LIBARCHIVE_VERSION_STRING "${VERSION}") +# Shared library number +SET(SOVERSION 8) + +# Enable CTest/CDash support +include(CTest) + +# Provide ADD_TEST_28 macro to approximate CMake 2.8 ADD_TEST(NAME). +# TODO: Require CMake 2.8 and drop this workaround (perhaps late 2010). +INCLUDE(AddTest28) + +OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON) +OPTION(ENABLE_TAR "Enable tar building" ON) +OPTION(ENABLE_TAR_SHARED "Enable dynamic build of tar" OFF) +OPTION(ENABLE_CPIO "Enable cpio building" ON) +OPTION(ENABLE_CPIO_SHARED "Enable dynamic build of cpio" OFF) +OPTION(ENABLE_XATTR "Enable extended attribute support" ON) +OPTION(ENABLE_ACL "Enable ACL support" ON) +OPTION(ENABLE_TEST "Enable unit and regression tests" ON) + +IF(ENABLE_TEST) + ENABLE_TESTING() +ENDIF(ENABLE_TEST) +IF(WIN32 AND NOT CYGWIN) + # Currently, dynamic build only. + SET(ENABLE_TAR_SHARED ON) + SET(ENABLE_CPIO_SHARED ON) +ENDIF(WIN32 AND NOT CYGWIN) + +IF(WIN32) + SET(_WIN32_WINNT 0x0500 CACHE INTERNAL "Setting _WIN32_WINNT to 0x0500 for Windows 2000 APIs") + SET(WINVER 0x0500 CACHE INTERNAL "Setting WINVER to 0x0500 for Windows 2000 APIs") +ENDIF(WIN32) + +# +INCLUDE(CheckCSourceRuns) +INCLUDE(CheckFileOffsetBits) +INCLUDE(CheckFuncs) +INCLUDE(CheckHeaderDirent) +INCLUDE(CheckIncludeFile) +INCLUDE(CheckIncludeFiles) +INCLUDE(CheckLibraryExists) +INCLUDE(CheckStructMember) +INCLUDE(CheckSymbolExists) +INCLUDE(CheckTypeExists) +INCLUDE(CheckTypeSize) + +# +# Generate list.h +# +MACRO (GENERATE_LIST_H _listfile _cmlist __list_sources) + SET(_argv ${ARGV}) + # Remove _listfile and _cmlist from _argv + LIST(REMOVE_AT _argv 0 1) + IF (NOT EXISTS "${_listfile}" OR + ${_cmlist} IS_NEWER_THAN "${_listfile}") + + MESSAGE(STATUS "Generating ${_listfile}") + FILE(WRITE ${_listfile} "") + FOREACH (testfile ${_argv}) + IF (testfile MATCHES "^test_[^/]+[.]c$") + FILE(STRINGS ${testfile} testvar REGEX "^DEFINE_TEST") + FOREACH (deftest ${testvar}) + FILE(APPEND ${_listfile} "${deftest}\n") + ENDFOREACH (deftest) + ENDIF (testfile MATCHES "^test_[^/]+[.]c$") + ENDFOREACH (testfile) + + ENDIF (NOT EXISTS "${_listfile}" OR + ${_cmlist} IS_NEWER_THAN "${_listfile}") +ENDMACRO (GENERATE_LIST_H) +# +# Generate installation rules for man pages. +# +MACRO (INSTALL_MAN __mans) + FOREACH (_man ${ARGV}) + STRING(REGEX REPLACE "^.+[.]([1-9])" "\\1" _mansect ${_man}) + INSTALL(FILES ${_man} DESTINATION "share/man/man${_mansect}") + ENDFOREACH (_man) +ENDMACRO (INSTALL_MAN __mans) + +# +# Check compress/decompress libraries +# +IF(WIN32 AND NOT CMAKE_CL_64 AND NOT CYGWIN) + # GnuWin32 is only for Win32, not Win64. + SET(__GNUWIN32PATH "C:/Program Files/GnuWin32") +ENDIF(WIN32 AND NOT CMAKE_CL_64 AND NOT CYGWIN) +IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}") + # You have to add a path availabel DLL file into PATH environment variable. + # Maybe DLL path is "C:/Program Files/GnuWin32/bin". + # The zlib and the bzip2 Setup program have installed programs and DLLs into + # "C:/Program Files/GnuWin32" by default. + # This is convenience setting for Windows. + SET(CMAKE_PREFIX_PATH ${__GNUWIN32PATH} $(CMAKE_PREFIX_PATH)) + # + # If you didn't use Setup program or installed into nonstandard path, + # cmake cannot find out your zlib or bzip2 libraries and include files, + # you should execute cmake with -DCMAKE_PREFIX_PATH option. + # e.g. + # cmake -DCMAKE_PREFIX_PATH= + # + # If compiling error occured in zconf.h, You may need patch to zconf.h. + #--- zconf.h.orig 2005-07-21 00:40:26.000000000 + #+++ zconf.h 2009-01-19 11:39:10.093750000 + #@@ -286,7 +286,7 @@ + # + # #if 1 /* HAVE_UNISTD_H -- this line is updated by ./configure */ + # # include /* for off_t */ + #-# include /* for SEEK_* and off_t */ + #+# include /* for SEEK_* and off_t */ + # # ifdef VMS + # # include /* for off_t */ + # # endif +ENDIF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}") + +SET(ADDITIONAL_LIBS "") +# +# Find ZLIB +# +FIND_PACKAGE(ZLIB) +IF(ZLIB_FOUND) + SET(HAVE_LIBZ 1) + SET(HAVE_ZLIB_H 1) + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES}) + IF(WIN32 AND NOT CYGWIN) + SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR}) + SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES}) + CHECK_C_SOURCE_Runs( + "#ifndef ZLIB_WINAPI\n#define ZLIB_WINAPI\n#endif\n#include \nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }" + ZLIB_WINAPI) + ENDIF(WIN32 AND NOT CYGWIN) +ENDIF(ZLIB_FOUND) +MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR) +MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY) +# +# Find BZip2 +# +FIND_PACKAGE(BZip2) +IF(BZIP2_FOUND) + SET(HAVE_LIBBZ2 1) + SET(HAVE_BZLIB_H 1) + INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${BZIP2_LIBRARIES}) +ENDIF(BZIP2_FOUND) +MARK_AS_ADVANCED(CLEAR BZIP2_INCLUDE_DIR) +MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARY) +# +# Find LZMA +# +FIND_PACKAGE(LZMA) +IF(LZMA_FOUND) + SET(HAVE_LIBLZMA 1) + SET(HAVE_LZMA_H 1) + INCLUDE_DIRECTORIES(${LZMA_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${LZMA_LIBRARIES}) + MARK_AS_ADVANCED(CLEAR LZMA_INCLUDE_DIR) + MARK_AS_ADVANCED(CLEAR LZMA_LIBRARY) +ELSEIF(LZMADEC_FOUND) + SET(HAVE_LIBLZMADEC 1) + SET(HAVE_LZMADEC_H 1) + INCLUDE_DIRECTORIES(${LZMADEC_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${LZMADEC_LIBRARIES}) + MARK_AS_ADVANCED(CLEAR LZMADEC_INCLUDE_DIR) + MARK_AS_ADVANCED(CLEAR LZMADEC_LIBRARY) +ELSE(LZMA_FOUND) + MARK_AS_ADVANCED(CLEAR LZMA_INCLUDE_DIR) + MARK_AS_ADVANCED(CLEAR LZMA_LIBRARY) +ENDIF(LZMA_FOUND) + +# +# Check headers +# +CHECK_HEADER_DIRENT() + +SET(INCLUDES "") +MACRO (LA_CHECK_INCLUDE_FILE header var) + CHECK_INCLUDE_FILES("${INCLUDES};${header}" ${var}) + IF (${var}) + SET(INCLUDES ${INCLUDES} ${header}) + ENDIF (${var}) +ENDMACRO (LA_CHECK_INCLUDE_FILE) + +# Some FreeBSD headers assume sys/types.h was already included. +LA_CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H) + +# Alphabetize the rest unless there's a compelling reason +LA_CHECK_INCLUDE_FILE("acl/libacl.h" HAVE_ACL_LIBACL_H) +LA_CHECK_INCLUDE_FILE("ctype.h" HAVE_CTYPE_H) +LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) +LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) +LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H) +LA_CHECK_INCLUDE_FILE("ext2fs/ext2_fs.h" HAVE_EXT2FS_EXT2_FS_H) +LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H) +LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H) +LA_CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) +LA_CHECK_INCLUDE_FILE("io.h" HAVE_IO_H) +LA_CHECK_INCLUDE_FILE("langinfo.h" HAVE_LANGINFO_H) +LA_CHECK_INCLUDE_FILE("limits.h" HAVE_LIMITS_H) +LA_CHECK_INCLUDE_FILE("linux/fs.h" HAVE_LINUX_FS_H) +LA_CHECK_INCLUDE_FILE("locale.h" HAVE_LOCALE_H) +LA_CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H) +LA_CHECK_INCLUDE_FILE("paths.h" HAVE_PATHS_H) +LA_CHECK_INCLUDE_FILE("poll.h" HAVE_POLL_H) +LA_CHECK_INCLUDE_FILE("process.h" HAVE_PROCESS_H) +LA_CHECK_INCLUDE_FILE("pwd.h" HAVE_PWD_H) +LA_CHECK_INCLUDE_FILE("regex.h" HAVE_REGEX_H) +LA_CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H) +LA_CHECK_INCLUDE_FILE("stdarg.h" HAVE_STDARG_H) +LA_CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H) +LA_CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H) +LA_CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H) +LA_CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H) +LA_CHECK_INCLUDE_FILE("sys/acl.h" HAVE_SYS_ACL_H) +LA_CHECK_INCLUDE_FILE("sys/cdefs.h" HAVE_SYS_CDEFS_H) +LA_CHECK_INCLUDE_FILE("sys/ioctl.h" HAVE_SYS_IOCTL_H) +LA_CHECK_INCLUDE_FILE("sys/mkdev.h" HAVE_SYS_MKDEV_H) +LA_CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H) +LA_CHECK_INCLUDE_FILE("sys/poll.h" HAVE_SYS_POLL_H) +LA_CHECK_INCLUDE_FILE("sys/select.h" HAVE_SYS_SELECT_H) +LA_CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H) +LA_CHECK_INCLUDE_FILE("sys/time.h" HAVE_SYS_TIME_H) +LA_CHECK_INCLUDE_FILE("sys/utime.h" HAVE_SYS_UTIME_H) +LA_CHECK_INCLUDE_FILE("sys/wait.h" HAVE_SYS_WAIT_H) +LA_CHECK_INCLUDE_FILE("time.h" HAVE_TIME_H) +LA_CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) +LA_CHECK_INCLUDE_FILE("utime.h" HAVE_UTIME_H) +LA_CHECK_INCLUDE_FILE("wchar.h" HAVE_WCHAR_H) +LA_CHECK_INCLUDE_FILE("wctype.h" HAVE_WCTYPE_H) +LA_CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H) + + +# +# Some headers require extra includes when they're available. +# + +# +# Find OpenSSL +# +IF(ENABLE_OPENSSL) + FIND_PACKAGE(OpenSSL) +ENDIF() + +# FreeBSD libmd +CHECK_LIBRARY_EXISTS(md "MD5Init" "" LIBMD_FOUND) +IF(LIBMD_FOUND) + SET(CMAKE_REQUIRED_LIBRARIES "md") + FIND_LIBRARY(LIBMD_LIBRARY NAMES md) + LIST(APPEND ADDITIONAL_LIBS ${LIBMD_LIBRARY}) +ENDIF(LIBMD_FOUND) + +# +# How to prove that HASH functions, which have several names on various +# platforms, can be mapped to archive_{hash name}_init, +# archive_{hash name}_update and archive_{hash name}_final through +# archive_hash.h +# +MACRO(CHECK_MD HASH IMPLEMENTATIONS) + IF(HAVE_SYS_TYPES_H) + SET(HASH_HEADER_CONFIG "#define HAVE_SYS_TYPES_H 1\n") + ELSE(HAVE_SYS_TYPES_H) + SET(HASH_HEADER_CONFIG "") + ENDIF(HAVE_SYS_TYPES_H) + + FOREACH(IMPLEMENTATION ${IMPLEMENTATIONS}) + IF(NOT DEFINED ARCHIVE_HASH_${HASH}_${IMPLEMENTATION}) + STRING(TOLOWER "${HASH}" lower_hash) + STRING(TOUPPER "${HASH}" hash) + + SET(HASH_REQUIRED_INCLUDES) + SET(TRY_HASH_REQUIRED_INCLUDES + "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_CURRENT_SOURCE_DIR}/libarchive") + SET(HASH_REQUIRED_LIBS) + SET(TRY_HASH_REQUIRED_LIBS) + IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + SET(HASH_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) + SET(TRY_HASH_REQUIRED_INCLUDES + "${TRY_HASH_REQUIRED_INCLUDES};${OPENSSL_INCLUDE_DIR}") + SET(HASH_REQUIRED_LIBS ${OPENSSL_LIBRARIES}) + SET(TRY_HASH_REQUIRED_LIBS + "-DLINK_LIBRARIES:STRING=${OPENSSL_LIBRARIES}") + ELSEIF("${IMPLEMENTATION}" MATCHES "^LIBMD$" AND LIBMD_FOUND) + SET(TRY_HASH_REQUIRED_LIBS + "-DLINK_LIBRARIES:STRING=${LIBMD_LIBRARY}") + ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + + SET(SOURCE "#define ${hash}_COMPILE_TEST +#define ARCHIVE_HASH_${hash}_${IMPLEMENTATION} +#define __LIBARCHIVE_BUILD +${HASH_HEADER_CONFIG} +#include \"archive_hash.h\" + +int +main(int argc, char **argv) +{ + archive_${lower_hash}_ctx ctx; + + archive_${lower_hash}_init(&ctx); + archive_${lower_hash}_update(&ctx, *argv, argc); + archive_${lower_hash}_final(&ctx, *argv); + return 0; +} +") + + FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_hash_md.c" "${SOURCE}") + MESSAGE(STATUS "Checking support for ARCHIVE_HASH_${HASH}_${IMPLEMENTATION}") + + TRY_COMPILE(ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_hash_md.c + CMAKE_FLAGS + "${TRY_HASH_REQUIRED_LIBS}" + "${TRY_HASH_REQUIRED_INCLUDES}" + OUTPUT_VARIABLE OUTPUT) + + IF (ARCHIVE_HASH_${HASH}_${IMPLEMENTATION}) + MESSAGE(STATUS "Checking support for ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} -- found") + IF (HASH_REQUIRED_INCLUDES) + INCLUDE_DIRECTORIES(${HASH_REQUIRED_INCLUDES}) + ENDIF (HASH_REQUIRED_INCLUDES) + IF (HASH_REQUIRED_LIBS) + LIST(APPEND ADDITIONAL_LIBS ${HASH_REQUIRED_LIBS}) + LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS) + ENDIF (HASH_REQUIRED_LIBS) + BREAK() + ENDIF (ARCHIVE_HASH_${HASH}_${IMPLEMENTATION}) + + MESSAGE(STATUS "Checking support for ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} -- not found") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Checking support for ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} failed with the following output:\n" + "${OUTPUT}\n" + "Source file was:\n${SOURCE}\n") + ELSE(NOT DEFINED ARCHIVE_HASH_${HASH}_${IMPLEMENTATION}) + IF(ARCHIVE_HASH_${HASH}_${IMPLEMENTATION}) + BREAK() + ENDIF(ARCHIVE_HASH_${HASH}_${IMPLEMENTATION}) + ENDIF(NOT DEFINED ARCHIVE_HASH_${HASH}_${IMPLEMENTATION}) + ENDFOREACH(IMPLEMENTATION) +ENDMACRO(CHECK_MD HASH IMPLEMENTATIONS) + +# +# HASH functions on Windows is defined at archive_windows.c, thus we do not +# need the test what the functions can be mapped to archive_{hash name}_init, +# archive_{hash name}_update and archive_{hash name}_final. +# The functions on Windows use CALG_{hash name} macro to create a crypt object +# and then we need to know what CALG_{hash name} macros is available to show +# ARCHIVE_HASH_{hash name}_WIN macros because Windows 2000 and earlier version +# of Windows XP do not support SHA256, SHA384 and SHA512. +# +MACRO(CHECK_HASH_WIN HASH_LIST) + IF(WIN32 AND NOT CYGWIN) + FOREACH(HASH ${HASH_LIST}) + IF(NOT DEFINED ARCHIVE_HASH_${HASH}_WIN) + STRING(TOUPPER "${HASH}" hash) + SET(ALGID "") + IF ("${HASH}" MATCHES "^MD5$") + SET(ALGID "CALG_MD5") + ENDIF ("${HASH}" MATCHES "^MD5$") + IF ("${HASH}" MATCHES "^SHA1$") + SET(ALGID "CALG_SHA1") + ENDIF ("${HASH}" MATCHES "^SHA1$") + IF ("${HASH}" MATCHES "^SHA256$") + SET(ALGID "CALG_SHA_256") + ENDIF ("${HASH}" MATCHES "^SHA256$") + IF ("${HASH}" MATCHES "^SHA384$") + SET(ALGID "CALG_SHA_384") + ENDIF ("${HASH}" MATCHES "^SHA384$") + IF ("${HASH}" MATCHES "^SHA512$") + SET(ALGID "CALG_SHA_512") + ENDIF ("${HASH}" MATCHES "^SHA512$") + + SET(SOURCE "#define ${hash}_COMPILE_TEST +#define _WIN32_WINNT ${_WIN32_WINNT} +#define WINVER ${WINVER} +#include +#include + +int +main(int argc, char **argv) +{ + return ${ALGID}; +} +") + SET(SOURCE_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_hash_win.c") + + FILE(WRITE "${SOURCE_FILE}" "${SOURCE}") + MESSAGE(STATUS "Checking support for ARCHIVE_HASH_${HASH}_WIN") + + TRY_COMPILE(ARCHIVE_HASH_${HASH}_WIN + ${CMAKE_BINARY_DIR} + ${SOURCE_FILE} + CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_CURRENT_SOURCE_DIR}/libarchive" + OUTPUT_VARIABLE OUTPUT) + + IF (ARCHIVE_HASH_${HASH}_WIN) + MESSAGE(STATUS + "Checking support for ARCHIVE_HASH_${HASH}_WIN -- found") + ELSE (ARCHIVE_HASH_${HASH}_WIN) + MESSAGE(STATUS + "Checking support for ARCHIVE_HASH_${HASH}_WIN -- not found") + FILE(APPEND + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Checking support for ARCHIVE_HASH_${HASH}_WIN failed with the following output:\n" + "${OUTPUT}\n" + "Source file was:\n${SOURCE}\n") + ENDIF (ARCHIVE_HASH_${HASH}_WIN) + + ENDIF(NOT DEFINED ARCHIVE_HASH_${HASH}_WIN) + ENDFOREACH(HASH) + ENDIF(WIN32 AND NOT CYGWIN) +ENDMACRO(CHECK_HASH_WIN HASH_LIST) + +# +# Check MD5/RMD160/SHA support +# +CHECK_MD(MD5 "LIBC;LIBMD;LIBSYSTEM;OPENSSL") +CHECK_MD(RMD160 "LIBC;OPENSSL") +CHECK_MD(SHA1 "LIBC;LIBMD;LIBSYSTEM;OPENSSL") +CHECK_MD(SHA256 "LIBC;LIBC2;LIBC3;LIBMD;LIBSYSTEM;OPENSSL") +CHECK_MD(SHA384 "LIBC;LIBC2;LIBC3;LIBSYSTEM;OPENSSL") +CHECK_MD(SHA512 "LIBC;LIBC2;LIBC3;LIBMD;LIBSYSTEM;OPENSSL") +CHECK_HASH_WIN("MD5;SHA1;SHA256;SHA384;SHA512") + +# +# Find Libxml2 +# +FIND_PACKAGE(LibXml2) +IF(LIBXML2_FOUND) + INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${LIBXML2_LIBRARIES}) + SET(HAVE_LIBXML2 1) + # libxml2's include files use iconv.h + # We need a directory path of iconv.h so that it won't fail to check + # "libxml/xmlreader.h". + FIND_PATH(ICONV_INCLUDE_DIR iconv.h) + INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR}) + SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}) + CHECK_INCLUDE_FILES("libxml/xmlreader.h" HAVE_LIBXML_XMLREADER_H) + SET(CMAKE_REQUIRED_INCLUDES "") +ELSE(LIBXML2_FOUND) + # + # Find Expat + # + FIND_PACKAGE(EXPAT) + IF(EXPAT_FOUND) + INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${EXPAT_LIBRARIES}) + SET(HAVE_LIBEXPAT 1) + LA_CHECK_INCLUDE_FILE("expat.h" HAVE_EXPAT_H) + ENDIF(EXPAT_FOUND) +ENDIF(LIBXML2_FOUND) + +# +# Check functions +# +CHECK_SYMBOL_EXISTS(CreateHardLinkA "windows.h" HAVE_CREATEHARDLINKA) +CHECK_SYMBOL_EXISTS(CreateHardLinkW "windows.h" HAVE_CREATEHARDLINKW) +CHECK_SYMBOL_EXISTS(_CrtSetReportMode "crtdbg.h" HAVE__CrtSetReportMode) +CHECK_FUNCTION_EXISTS_GLIBC(chflags HAVE_CHFLAGS) +CHECK_FUNCTION_EXISTS_GLIBC(chown HAVE_CHOWN) +CHECK_FUNCTION_EXISTS_GLIBC(chroot HAVE_CHROOT) +CHECK_FUNCTION_EXISTS_GLIBC(fchdir HAVE_FCHDIR) +CHECK_FUNCTION_EXISTS_GLIBC(fchflags HAVE_FCHFLAGS) +CHECK_FUNCTION_EXISTS_GLIBC(fchmod HAVE_FCHMOD) +CHECK_FUNCTION_EXISTS_GLIBC(fchown HAVE_FCHOWN) +CHECK_FUNCTION_EXISTS_GLIBC(fcntl HAVE_FCNTL) +CHECK_FUNCTION_EXISTS_GLIBC(fork HAVE_FORK) +CHECK_FUNCTION_EXISTS_GLIBC(fstat HAVE_FSTAT) +CHECK_FUNCTION_EXISTS_GLIBC(ftruncate HAVE_FTRUNCATE) +CHECK_FUNCTION_EXISTS_GLIBC(futimens HAVE_FUTIMENS) +CHECK_FUNCTION_EXISTS_GLIBC(futimes HAVE_FUTIMES) +CHECK_FUNCTION_EXISTS_GLIBC(geteuid HAVE_GETEUID) +CHECK_FUNCTION_EXISTS_GLIBC(getgrgid_r HAVE_GETGRGID_R) +CHECK_FUNCTION_EXISTS_GLIBC(getgrnam_r HAVE_GETGRNAM_R) +CHECK_FUNCTION_EXISTS_GLIBC(getpwnam_r HAVE_GETPWNAM_R) +CHECK_FUNCTION_EXISTS_GLIBC(getpwuid_r HAVE_GETPWUID_R) +CHECK_FUNCTION_EXISTS_GLIBC(getpid HAVE_GETPID) +CHECK_FUNCTION_EXISTS_GLIBC(lchflags HAVE_LCHFLAGS) +CHECK_FUNCTION_EXISTS_GLIBC(lchmod HAVE_LCHMOD) +CHECK_FUNCTION_EXISTS_GLIBC(lchown HAVE_LCHOWN) +CHECK_FUNCTION_EXISTS_GLIBC(link HAVE_LINK) +CHECK_FUNCTION_EXISTS_GLIBC(lstat HAVE_LSTAT) +CHECK_FUNCTION_EXISTS_GLIBC(lutimes HAVE_LUTIMES) +CHECK_FUNCTION_EXISTS_GLIBC(memmove HAVE_MEMMOVE) +CHECK_FUNCTION_EXISTS_GLIBC(mkdir HAVE_MKDIR) +CHECK_FUNCTION_EXISTS_GLIBC(mkfifo HAVE_MKFIFO) +CHECK_FUNCTION_EXISTS_GLIBC(mknod HAVE_MKNOD) +CHECK_FUNCTION_EXISTS_GLIBC(nl_langinfo HAVE_NL_LANGINFO) +CHECK_FUNCTION_EXISTS_GLIBC(pipe HAVE_PIPE) +CHECK_FUNCTION_EXISTS_GLIBC(poll HAVE_POLL) +CHECK_FUNCTION_EXISTS_GLIBC(readlink HAVE_READLINK) +CHECK_FUNCTION_EXISTS_GLIBC(select HAVE_SELECT) +CHECK_FUNCTION_EXISTS_GLIBC(setenv HAVE_SETENV) +CHECK_FUNCTION_EXISTS_GLIBC(setlocale HAVE_SETLOCALE) +CHECK_FUNCTION_EXISTS_GLIBC(sigaction HAVE_SIGACTION) +CHECK_FUNCTION_EXISTS_GLIBC(strchr HAVE_STRCHR) +CHECK_FUNCTION_EXISTS_GLIBC(strdup HAVE_STRDUP) +CHECK_FUNCTION_EXISTS_GLIBC(strerror HAVE_STRERROR) +CHECK_FUNCTION_EXISTS_GLIBC(strncpy_s HAVE_STRNCPY_S) +CHECK_FUNCTION_EXISTS_GLIBC(strrchr HAVE_STRRCHR) +CHECK_FUNCTION_EXISTS_GLIBC(symlink HAVE_SYMLINK) +CHECK_FUNCTION_EXISTS_GLIBC(timegm HAVE_TIMEGM) +CHECK_FUNCTION_EXISTS_GLIBC(tzset HAVE_TZSET) +CHECK_FUNCTION_EXISTS_GLIBC(unsetenv HAVE_UNSETENV) +CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME) +CHECK_FUNCTION_EXISTS_GLIBC(utimes HAVE_UTIMES) +CHECK_FUNCTION_EXISTS_GLIBC(utimensat HAVE_UTIMENSAT) +CHECK_FUNCTION_EXISTS_GLIBC(vfork HAVE_VFORK) +CHECK_FUNCTION_EXISTS_GLIBC(wcrtomb HAVE_WCRTOMB) +CHECK_FUNCTION_EXISTS_GLIBC(wcscmp HAVE_WCSCMP) +CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY) +CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN) +CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB) +CHECK_SYMBOL_EXISTS(wmemcmp "wchar.h" HAVE_WMEMCMP) +CHECK_SYMBOL_EXISTS(wmemcpy "wchar.h" HAVE_WMEMCPY) + +SET(CMAKE_REQUIRED_LIBRARIES "") +CHECK_SYMBOL_EXISTS(fseeko "stdio.h" HAVE_FSEEKO) +CHECK_SYMBOL_EXISTS(strerror_r "string.h" HAVE_STRERROR_R) +CHECK_SYMBOL_EXISTS(strftime "time.h" HAVE_STRFTIME) +CHECK_SYMBOL_EXISTS(vprintf "stdio.h" HAVE_VPRINTF) +CHECK_SYMBOL_EXISTS(cygwin_conv_path "sys/cygwin.h" HAVE_CYGWIN_CONV_PATH) + +CHECK_SYMBOL_EXISTS(major "sys/mkdev.h" MAJOR_IN_MKDEV) +CHECK_SYMBOL_EXISTS(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) + +IF(HAVE_STRERROR_R) + SET(HAVE_DECL_STRERROR_R 1) +ENDIF(HAVE_STRERROR_R) + +# +# Check defines +# +SET(headers "limits.h") +IF(HAVE_STDINT_H) + LIST(APPEND headers "stdint.h") +ENDIF(HAVE_STDINT_H) +IF(HAVE_INTTYPES_H) + LIST(APPEND headers "inttypes.h") +ENDIF(HAVE_INTTYPES_H) +CHECK_SYMBOL_EXISTS(EFTYPE "errno.h" HAVE_EFTYPE) +CHECK_SYMBOL_EXISTS(EILSEQ "errno.h" HAVE_EILSEQ) +CHECK_SYMBOL_EXISTS(D_MD_ORDER "langinfo.h" HAVE_D_MD_ORDER) +CHECK_SYMBOL_EXISTS(optarg "unistd.h" HAVE_DECL_OPTARG) +CHECK_SYMBOL_EXISTS(optind "unistd.h" HAVE_DECL_OPTIND) +CHECK_SYMBOL_EXISTS(INT64_MAX "${headers}" HAVE_DECL_INT64_MAX) +CHECK_SYMBOL_EXISTS(INT64_MIN "${headers}" HAVE_DECL_INT64_MIN) +CHECK_SYMBOL_EXISTS(UINT32_MAX "${headers}" HAVE_DECL_UINT32_MAX) +CHECK_SYMBOL_EXISTS(UINT64_MAX "${headers}" HAVE_DECL_UINT64_MAX) +CHECK_SYMBOL_EXISTS(SIZE_MAX "${headers}" HAVE_DECL_SIZE_MAX) +CHECK_SYMBOL_EXISTS(SSIZE_MAX "limits.h" HAVE_DECL_SSIZE_MAX) + +# +# Check struct members +# +# Check for birthtime in struct stat +CHECK_STRUCT_MEMBER("struct stat" st_birthtime + "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_BIRTHTIME) + +# Check for high-resolution timestamps in struct stat +CHECK_STRUCT_MEMBER("struct stat" st_birthtimespec.tv_nsec + "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC) +CHECK_STRUCT_MEMBER("struct stat" st_mtimespec.tv_nsec + "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC) +CHECK_STRUCT_MEMBER("struct stat" st_mtim.tv_nsec + "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC) +CHECK_STRUCT_MEMBER("struct stat" st_mtime_n + "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_MTIME_N) +CHECK_STRUCT_MEMBER("struct stat" st_umtime + "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_UMTIME) +CHECK_STRUCT_MEMBER("struct stat" st_mtime_usec + "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_MTIME_USEC) +# Check for block size support in struct stat +CHECK_STRUCT_MEMBER("struct stat" st_blksize + "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_BLKSIZE) +# Check for st_flags in struct stat (BSD fflags) +CHECK_STRUCT_MEMBER("struct stat" st_flags + "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_FLAGS) +# +# +CHECK_STRUCT_MEMBER("struct tm" tm_sec + "sys/types.h;sys/time.h;time.h" TIME_WITH_SYS_TIME) + +# +# Check for integer types +# +# XXX There must be a way to make this simpler XXXX +# +CHECK_TYPE_SIZE("long long int" LONG_LONG_INT) +CHECK_TYPE_SIZE("unsigned long long" UNSIGNED_LONG_LONG) +CHECK_TYPE_SIZE("unsigned long long int" UNSIGNED_LONG_LONG_INT) + +# +CHECK_TYPE_SIZE(dev_t DEV_T) +IF(NOT HAVE_DEV_T) + IF(MSVC) + SET(dev_t "unsigned int") + ENDIF(MSVC) +ENDIF(NOT HAVE_DEV_T) +# +CHECK_TYPE_SIZE(gid_t GID_T) +IF(NOT HAVE_GID_T) + IF(WIN32) + SET(gid_t "short") + ELSE(WIN32) + SET(gid_t "unsigned int") + ENDIF(WIN32) +ENDIF(NOT HAVE_GID_T) +# +CHECK_TYPE_SIZE(id_t ID_T) +IF(NOT HAVE_ID_T) + IF(WIN32) + SET(id_t "short") + ELSE(WIN32) + SET(id_t "unsigned int") + ENDIF(WIN32) +ENDIF(NOT HAVE_ID_T) +# +CHECK_TYPE_SIZE(int32_t INT32_T) +IF(NOT HAVE_INT32_T) + SET(int32_t "int") +ENDIF(NOT HAVE_INT32_T) +# +CHECK_TYPE_SIZE(int64_t INT64_T) +IF(NOT HAVE_INT64_T) + IF(WIN32) + SET(int64_t __int64) + ENDIF(WIN32) +ENDIF(NOT HAVE_INT64_T) +# +CHECK_TYPE_SIZE(intmax_t INTMAX_T) +IF(NOT HAVE_INTMAX_T) + SET(intmax_t "int64_t") +ENDIF(NOT HAVE_INTMAX_T) +# +CHECK_TYPE_SIZE(mode_t MODE_T) +IF(NOT HAVE_MODE_T) + IF(WIN32) + SET(mode_t "unsigned short") + ELSE(WIN32) + SET(mode_t "int") + ENDIF(WIN32) +ENDIF(NOT HAVE_MODE_T) +# +CHECK_TYPE_SIZE(off_t OFF_T) +IF(NOT HAVE_OFF_T) + SET(off_t "__int64") +ENDIF(NOT HAVE_OFF_T) +# +CHECK_TYPE_SIZE(size_t SIZE_T) +IF(NOT HAVE_SIZE_T) + IF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8) + SET(size_t "uint64_t") + ELSE("${CMAKE_SIZEOF_VOID_P}" EQUAL 8) + SET(size_t "uint32_t") + ENDIF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8) +ENDIF(NOT HAVE_SIZE_T) +# +CHECK_TYPE_SIZE(ssize_t SSIZE_T) +IF(NOT HAVE_SSIZE_T) + IF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8) + SET(ssize_t "int64_t") + ELSE("${CMAKE_SIZEOF_VOID_P}" EQUAL 8) + SET(ssize_t "long") + ENDIF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8) +ENDIF(NOT HAVE_SSIZE_T) +# +CHECK_TYPE_SIZE(uid_t UID_T) +IF(NOT HAVE_UID_T) + IF(WIN32) + SET(uid_t "short") + ELSE(WIN32) + SET(uid_t "unsigned int") + ENDIF(WIN32) +ENDIF(NOT HAVE_UID_T) +# +CHECK_TYPE_SIZE(pid_t PID_T) +IF(NOT HAVE_PID_T) + IF(WIN32) + SET(pid_t "int") + ELSE(WIN32) + MESSAGE(FATAL_ERROR "pid_t doesn't exist on this platform?") + ENDIF(WIN32) +ENDIF(NOT HAVE_PID_T) +# +CHECK_TYPE_SIZE(uint16_t UINT16_T) +IF(NOT HAVE_UINT16_T) + SET(uint16_t "unsigned short") +ENDIF(NOT HAVE_UINT16_T) +# +CHECK_TYPE_SIZE(uint32_t UINT32_T) +IF(NOT HAVE_UINT32_T) + SET(uint32_t "unsigned int") +ENDIF(NOT HAVE_UINT32_T) +# +CHECK_TYPE_SIZE(uint64_t UINT64_T) +IF(NOT HAVE_UINT64_T) + IF(WIN32) + SET(uint64_t "unsigned __int64") + ENDIF(WIN32) +ENDIF(NOT HAVE_UINT64_T) +# +CHECK_TYPE_SIZE(uintmax_t UINTMAX_T) +IF(NOT HAVE_UINTMAX_T) + SET(uintmax_t "uint64_t") +ENDIF(NOT HAVE_UINTMAX_T) +# +CHECK_TYPE_SIZE(intptr_t INTPTR_T) +IF(NOT HAVE_INTPTR_T) + IF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8) + SET(intptr_t "int64_t") + ELSE() + SET(intptr_t "int32_t") + ENDIF() +ENDIF(NOT HAVE_INTPTR_T) +# +CHECK_TYPE_SIZE(uintptr_t UINTPTR_T) +IF(NOT HAVE_UINTPTR_T) + IF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8) + SET(uintptr_t "uint64_t") + ELSE() + SET(uintptr_t "uint32_t") + ENDIF() +ENDIF(NOT HAVE_UINTPTR_T) +# +CHECK_TYPE_SIZE(wchar_t SIZEOF_WCHAR_T) +IF(HAVE_SIZEOF_WCHAR_T) + SET(HAVE_WCHAR_T 1) +ENDIF(HAVE_SIZEOF_WCHAR_T) +# +# Check if _FILE_OFFSET_BITS macro needed for large files +# +CHECK_FILE_OFFSET_BITS() + + + +# +# Check for Extended Attribute libraries, headers, and functions +# +IF(ENABLE_XATTR) + LA_CHECK_INCLUDE_FILE(attr/xattr.h HAVE_ATTR_XATTR_H) + LA_CHECK_INCLUDE_FILE(sys/xattr.h HAVE_SYS_XATTR_H) + LA_CHECK_INCLUDE_FILE(sys/extattr.h HAVE_SYS_EXTATTR_H) + CHECK_LIBRARY_EXISTS(attr "setxattr" "" HAVE_ATTR_LIB) + IF(HAVE_ATTR_LIB) + SET(CMAKE_REQUIRED_LIBRARIES "attr") + ENDIF(HAVE_ATTR_LIB) + CHECK_SYMBOL_EXISTS(EXTATTR_NAMESPACE_USER "sys/types.h;sys/extattr.h" HAVE_DECL_EXTATTR_NAMESPACE_USER) + CHECK_FUNCTION_EXISTS_GLIBC(extattr_get_file HAVE_EXTATTR_GET_FILE) + CHECK_FUNCTION_EXISTS_GLIBC(extattr_list_file HAVE_EXTATTR_LIST_FILE) + CHECK_FUNCTION_EXISTS_GLIBC(extattr_set_fd HAVE_EXTATTR_SET_FD) + CHECK_FUNCTION_EXISTS_GLIBC(extattr_set_file HAVE_EXTATTR_SET_FILE) + CHECK_FUNCTION_EXISTS_GLIBC(fsetxattr HAVE_FSETXATTR) + CHECK_FUNCTION_EXISTS_GLIBC(getxattr HAVE_GETXATTR) + CHECK_FUNCTION_EXISTS_GLIBC(lgetxattr HAVE_LGETXATTR) + CHECK_FUNCTION_EXISTS_GLIBC(listxattr HAVE_LISTXATTR) + CHECK_FUNCTION_EXISTS_GLIBC(llistxattr HAVE_LLISTXATTR) + CHECK_FUNCTION_EXISTS_GLIBC(lsetxattr HAVE_LSETXATTR) +ENDIF(ENABLE_XATTR) + +# +# Check for ACL libraries, headers, and functions +# +# The ACL support in libarchive is written against the POSIX1e draft, +# which was never officially approved and varies quite a bit across +# platforms. Worse, some systems have completely non-POSIX acl functions, +# which makes the following checks rather more complex than I would like. +# +IF(ENABLE_ACL) + CHECK_LIBRARY_EXISTS(acl "acl_get_file" "" HAVE_ACL_LIB) + IF(HAVE_ACL_LIB) + SET(CMAKE_REQUIRED_LIBRARIES "acl") + FIND_LIBRARY(ACL_LIBRARY NAMES acl) + LIST(APPEND ADDITIONAL_LIBS ${ACL_LIBRARY}) + ENDIF(HAVE_ACL_LIB) + # + CHECK_FUNCTION_EXISTS_GLIBC(acl_create_entry HAVE_ACL_CREATE_ENTRY) + CHECK_FUNCTION_EXISTS_GLIBC(acl_init HAVE_ACL_INIT) + CHECK_FUNCTION_EXISTS_GLIBC(acl_set_fd HAVE_ACL_SET_FD) + CHECK_FUNCTION_EXISTS_GLIBC(acl_set_fd_np HAVE_ACL_SET_FD_NP) + CHECK_FUNCTION_EXISTS_GLIBC(acl_set_file HAVE_ACL_SET_FILE) + CHECK_TYPE_EXISTS(acl_permset_t "${INCLUDES}" HAVE_ACL_PERMSET_T) + + # The "acl_get_perm()" function was omitted from the POSIX draft. + # (It's a pretty obvious oversight; otherwise, there's no way to + # test for specific permissions in a permset.) Linux uses the obvious + # name, FreeBSD adds _np to mark it as "non-Posix extension." + # Test for both as a double-check that we really have POSIX-style ACL support. + CHECK_SYMBOL_EXISTS(acl_get_perm "${INCLUDES}" HAVE_ACL_GET_PERM) + CHECK_SYMBOL_EXISTS(acl_get_perm_np "${INCLUDES}" HAVE_ACL_GET_PERM_NP) + CHECK_SYMBOL_EXISTS(acl_get_link "${INCLUDES}" HAVE_ACL_GET_LINK) + CHECK_SYMBOL_EXISTS(acl_get_link_np "${INCLUDES}" HAVE_ACL_GET_LINK_NP) + + # MacOS has an acl.h that isn't POSIX. It can be detected by + # checking for ACL_USER + CHECK_SYMBOL_EXISTS(ACL_USER "${INCLUDES}" HAVE_ACL_USER) +ENDIF(ENABLE_ACL) + +# Generate "config.h" from "build/cmake/config.h.in" +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/config.h) +INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) +ADD_DEFINITIONS(-DHAVE_CONFIG_H) + +# +# Register installation of PDF documents. +# +IF(WIN32 AND NOT CYGWIN) + # + # On Windows platform, It's better that we install PDF documents + # on one's computer. + # These PDF documents are available in the release package. + # + IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/doc/pdf) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/pdf + DESTINATION share/man + FILES_MATCHING PATTERN "*.pdf" + ) + ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/doc/pdf) +ENDIF(WIN32 AND NOT CYGWIN) +# +# +# +INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/libarchive) +# +IF(MSVC) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) +ENDIF(MSVC) +# Especially for early development, we want to be a little +# aggressive about diagnosing build problems; this can get +# relaxed somewhat in final shipping versions. +IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$") + ADD_DEFINITIONS(-Wall -Werror) +ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$") + +IF(ENABLE_TEST) +ADD_CUSTOM_TARGET(run_all_tests) +ENDIF(ENABLE_TEST) + +add_subdirectory(libarchive) +add_subdirectory(tar) +add_subdirectory(cpio) Added: vendor/libarchive/dist/COPYING ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/libarchive/dist/COPYING Tue Dec 20 22:47:56 2011 (r228753) @@ -0,0 +1,60 @@ +The libarchive distribution as a whole is Copyright by Tim Kientzle +and is subject to the copyright notice reproduced at the bottom of +this file. + +Each individual file in this distribution should have a clear +copyright/licensing statement at the beginning of the file. If any do +not, please let me know and I will rectify it. The following is +intended to summarize the copyright status of the individual files; +the actual statements in the files are controlling. + +* Except as listed below, all C sources (including .c and .h files) + and documentation files are subject to the copyright notice reproduced + at the bottom of this file. + +* The following source files are also subject in whole or in part to + a 3-clause UC Regents copyright; please read the individual source + files for details: + libarchive/archive_entry.c + libarchive/archive_read_support_compression_compress.c + libarchive/archive_write_set_compression_compress.c + libarchive/mtree.5 + tar/matching.c + +* The following source files are in the public domain: + tar/getdate.c + +* The build files---including Makefiles, configure scripts, + and auxiliary scripts used as part of the compile process---have + widely varying licensing terms. Please check individual files before + distributing them to see if those restrictions apply to you. + +I intend for all new source code to use the license below and hope over +time to replace code with other licenses with new implementations that +do use the license below. The varying licensing of the build scripts +seems to be an unavoidable mess. + + +Copyright (c) 2003-2009 +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 + in this position and unchanged. +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. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) 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. Added: vendor/libarchive/dist/CTestConfig.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/libarchive/dist/CTestConfig.cmake Tue Dec 20 22:47:56 2011 (r228753) @@ -0,0 +1,11 @@ +# TODO: This file should be moved into the build/cmake directory... + +# The libarchive CDash page appears at +# http://my.cdash.org/index.php?project=libarchive +set(CTEST_PROJECT_NAME "libarchive") +set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC") + +set(CTEST_DROP_METHOD "http") +set(CTEST_DROP_SITE "my.cdash.org") +set(CTEST_DROP_LOCATION "/submit.php?project=libarchive") +set(CTEST_DROP_SITE_CDASH TRUE) Added: vendor/libarchive/dist/INSTALL ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/libarchive/dist/INSTALL Tue Dec 20 22:47:56 2011 (r228753) @@ -0,0 +1,30 @@ +More complete build documentation is available on the libarchive +Wiki: http://libarchive.googlecode.com/ + +On most Unix-like systems, you should be able to install libarchive, +bsdtar, and bsdcpio using the following common steps: + ./configure + make + make install + +If you need to customize the target directories or otherwise adjust +the build setting, use + ./configure --help +to list the configure options. + +If you are developing libarchive and need to update the +configure script and other build files: + /bin/sh build/autogen.sh + +To create a distribution, please use the 'distcheck' target: + /bin/sh build/autogen.sh && ./configure && make distcheck + +On non-Unix-like systems, use the "cmake" utility (available from +http://cmake.org/) to generate suitable build files for your platform. +Cmake requires the name of the directory containing CmakeLists.txt and +the "generator" to use for your build environment. For example, to +build with Xcode on Mac OS, you can use the following command: + cmake -G "Xcode" ~/libarchive-download-dir/ +The result will be appropriate makefiles, solution files, or project +files that can be used with the corresponding development tool. +See the libarchive Wiki or the cmake site for further documentation. \ No newline at end of file Added: vendor/libarchive/dist/Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/libarchive/dist/Makefile.am Tue Dec 20 22:47:56 2011 (r228753) @@ -0,0 +1,630 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS= foreign subdir-objects +ACLOCAL_AMFLAGS = -I build/autoconf + +# +# What to build and install +# +lib_LTLIBRARIES= libarchive.la +noinst_LTLIBRARIES= libarchive_fe.la *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-vendor@FreeBSD.ORG Wed Dec 21 09:08:42 2011 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 444BC106566B; Wed, 21 Dec 2011 09:08:42 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2F3E88FC12; Wed, 21 Dec 2011 09:08:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBL98gCo058339; Wed, 21 Dec 2011 09:08:42 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBL98g6P058338; Wed, 21 Dec 2011 09:08:42 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201112210908.pBL98g6P058338@svn.freebsd.org> From: Martin Matuska Date: Wed, 21 Dec 2011 09:08:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228759 - in vendor/libarchive/dist: . build build/autoconf build/cmake build/pkgconfig contrib contrib/psota-benchmark contrib/shar cpio cpio/test doc examples examples/minitar libarch... X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Dec 2011 09:08:42 -0000 Author: mm Date: Wed Dec 21 09:08:41 2011 New Revision: 228759 URL: http://svn.freebsd.org/changeset/base/228759 Log: Set svn:eol-style property to native for all text files in vendor/libarchive Modified: Directory Properties: vendor/libarchive/dist/CMakeLists.txt (props changed) vendor/libarchive/dist/COPYING (props changed) vendor/libarchive/dist/CTestConfig.cmake (props changed) vendor/libarchive/dist/INSTALL (props changed) vendor/libarchive/dist/Makefile.am (props changed) vendor/libarchive/dist/NEWS (props changed) vendor/libarchive/dist/README (props changed) vendor/libarchive/dist/build/autoconf/check_stdcall_func.m4 (props changed) vendor/libarchive/dist/build/autoconf/la_uid_t.m4 (props changed) vendor/libarchive/dist/build/autogen.sh (props changed) vendor/libarchive/dist/build/bump-version.sh (props changed) vendor/libarchive/dist/build/clean.sh (props changed) vendor/libarchive/dist/build/cmake/AddTest28.cmake (props changed) vendor/libarchive/dist/build/cmake/CheckFileOffsetBits.c (props changed) vendor/libarchive/dist/build/cmake/CheckFileOffsetBits.cmake (props changed) vendor/libarchive/dist/build/cmake/CheckFuncs.cmake (props changed) vendor/libarchive/dist/build/cmake/CheckFuncs_stub.c.in (props changed) vendor/libarchive/dist/build/cmake/CheckHeaderDirent.cmake (props changed) vendor/libarchive/dist/build/cmake/CheckStructMember.cmake (props changed) vendor/libarchive/dist/build/cmake/CheckTypeExists.cmake (props changed) vendor/libarchive/dist/build/cmake/FindLZMA.cmake (props changed) vendor/libarchive/dist/build/cmake/config.h.in (props changed) vendor/libarchive/dist/build/pkgconfig/libarchive.pc.in (props changed) vendor/libarchive/dist/build/version (props changed) vendor/libarchive/dist/configure.ac (props changed) vendor/libarchive/dist/contrib/README (props changed) vendor/libarchive/dist/contrib/libarchive.1aix53.spec (props changed) vendor/libarchive/dist/contrib/libarchive.spec (props changed) vendor/libarchive/dist/contrib/libarchive_autodetect-st_lib_archive.m4 (props changed) vendor/libarchive/dist/contrib/psota-benchmark/results.txt (props changed) vendor/libarchive/dist/contrib/psota-benchmark/tcp.sh (props changed) vendor/libarchive/dist/contrib/shar/Makefile (props changed) vendor/libarchive/dist/contrib/shar/shar.1 (props changed) vendor/libarchive/dist/contrib/shar/shar.c (props changed) vendor/libarchive/dist/contrib/shar/tree.c (props changed) vendor/libarchive/dist/contrib/shar/tree.h (props changed) vendor/libarchive/dist/contrib/shar/tree_config.h (props changed) vendor/libarchive/dist/contrib/untar.c (props changed) vendor/libarchive/dist/cpio/CMakeLists.txt (props changed) vendor/libarchive/dist/cpio/bsdcpio.1 (props changed) vendor/libarchive/dist/cpio/cmdline.c (props changed) vendor/libarchive/dist/cpio/config_freebsd.h (props changed) vendor/libarchive/dist/cpio/cpio.c (props changed) vendor/libarchive/dist/cpio/cpio.h (props changed) vendor/libarchive/dist/cpio/cpio_platform.h (props changed) vendor/libarchive/dist/cpio/cpio_windows.c (props changed) vendor/libarchive/dist/cpio/cpio_windows.h (props changed) vendor/libarchive/dist/cpio/test/CMakeLists.txt (props changed) vendor/libarchive/dist/cpio/test/main.c (props changed) vendor/libarchive/dist/cpio/test/test.h (props changed) vendor/libarchive/dist/cpio/test/test_0.c (props changed) vendor/libarchive/dist/cpio/test/test_basic.c (props changed) vendor/libarchive/dist/cpio/test/test_cmdline.c (props changed) vendor/libarchive/dist/cpio/test/test_format_newc.c (props changed) vendor/libarchive/dist/cpio/test/test_gcpio_compat.c (props changed) vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref.bin.uu (props changed) vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref.crc.uu (props changed) vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref.newc.uu (props changed) vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref.ustar.uu (props changed) vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref_nosym.bin.uu (props changed) vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref_nosym.crc.uu (props changed) vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref_nosym.newc.uu (props changed) vendor/libarchive/dist/cpio/test/test_gcpio_compat_ref_nosym.ustar.uu (props changed) vendor/libarchive/dist/cpio/test/test_option_B_upper.c (props changed) vendor/libarchive/dist/cpio/test/test_option_C_upper.c (props changed) vendor/libarchive/dist/cpio/test/test_option_J_upper.c (props changed) vendor/libarchive/dist/cpio/test/test_option_L_upper.c (props changed) vendor/libarchive/dist/cpio/test/test_option_Z_upper.c (props changed) vendor/libarchive/dist/cpio/test/test_option_a.c (props changed) vendor/libarchive/dist/cpio/test/test_option_c.c (props changed) vendor/libarchive/dist/cpio/test/test_option_d.c (props changed) vendor/libarchive/dist/cpio/test/test_option_f.c (props changed) vendor/libarchive/dist/cpio/test/test_option_f.cpio.uu (props changed) vendor/libarchive/dist/cpio/test/test_option_help.c (props changed) vendor/libarchive/dist/cpio/test/test_option_l.c (props changed) vendor/libarchive/dist/cpio/test/test_option_lzma.c (props changed) vendor/libarchive/dist/cpio/test/test_option_m.c (props changed) vendor/libarchive/dist/cpio/test/test_option_m.cpio.uu (props changed) vendor/libarchive/dist/cpio/test/test_option_t.c (props changed) vendor/libarchive/dist/cpio/test/test_option_t.cpio.uu (props changed) vendor/libarchive/dist/cpio/test/test_option_t.stdout.uu (props changed) vendor/libarchive/dist/cpio/test/test_option_tv.stdout.uu (props changed) vendor/libarchive/dist/cpio/test/test_option_u.c (props changed) vendor/libarchive/dist/cpio/test/test_option_version.c (props changed) vendor/libarchive/dist/cpio/test/test_option_y.c (props changed) vendor/libarchive/dist/cpio/test/test_option_z.c (props changed) vendor/libarchive/dist/cpio/test/test_owner_parse.c (props changed) vendor/libarchive/dist/cpio/test/test_passthrough_dotdot.c (props changed) vendor/libarchive/dist/cpio/test/test_passthrough_reverse.c (props changed) vendor/libarchive/dist/cpio/test/test_pathmatch.c (props changed) vendor/libarchive/dist/doc/mdoc2man.awk (props changed) vendor/libarchive/dist/doc/mdoc2wiki.awk (props changed) vendor/libarchive/dist/doc/update.sh (props changed) vendor/libarchive/dist/examples/minitar/Makefile (props changed) vendor/libarchive/dist/examples/minitar/README (props changed) vendor/libarchive/dist/examples/minitar/minitar.c (props changed) vendor/libarchive/dist/examples/minitar/tree.c (props changed) vendor/libarchive/dist/examples/minitar/tree.h (props changed) vendor/libarchive/dist/examples/tarfilter.c (props changed) vendor/libarchive/dist/examples/untar.c (props changed) vendor/libarchive/dist/libarchive/CMakeLists.txt (props changed) vendor/libarchive/dist/libarchive/archive.h (props changed) vendor/libarchive/dist/libarchive/archive_check_magic.c (props changed) vendor/libarchive/dist/libarchive/archive_crc32.h (props changed) vendor/libarchive/dist/libarchive/archive_endian.h (props changed) vendor/libarchive/dist/libarchive/archive_entry.3 (props changed) vendor/libarchive/dist/libarchive/archive_entry.c (props changed) vendor/libarchive/dist/libarchive/archive_entry.h (props changed) vendor/libarchive/dist/libarchive/archive_entry_copy_bhfi.c (props changed) vendor/libarchive/dist/libarchive/archive_entry_copy_stat.c (props changed) vendor/libarchive/dist/libarchive/archive_entry_link_resolver.c (props changed) vendor/libarchive/dist/libarchive/archive_entry_private.h (props changed) vendor/libarchive/dist/libarchive/archive_entry_stat.c (props changed) vendor/libarchive/dist/libarchive/archive_entry_strmode.c (props changed) vendor/libarchive/dist/libarchive/archive_entry_xattr.c (props changed) vendor/libarchive/dist/libarchive/archive_hash.h (props changed) vendor/libarchive/dist/libarchive/archive_platform.h (props changed) vendor/libarchive/dist/libarchive/archive_private.h (props changed) vendor/libarchive/dist/libarchive/archive_read.3 (props changed) vendor/libarchive/dist/libarchive/archive_read.c (props changed) vendor/libarchive/dist/libarchive/archive_read_data_into_fd.c (props changed) vendor/libarchive/dist/libarchive/archive_read_disk.3 (props changed) vendor/libarchive/dist/libarchive/archive_read_disk.c (props changed) vendor/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c (props changed) vendor/libarchive/dist/libarchive/archive_read_disk_private.h (props changed) vendor/libarchive/dist/libarchive/archive_read_disk_set_standard_lookup.c (props changed) vendor/libarchive/dist/libarchive/archive_read_extract.c (props changed) vendor/libarchive/dist/libarchive/archive_read_open_fd.c (props changed) vendor/libarchive/dist/libarchive/archive_read_open_file.c (props changed) vendor/libarchive/dist/libarchive/archive_read_open_filename.c (props changed) vendor/libarchive/dist/libarchive/archive_read_open_memory.c (props changed) vendor/libarchive/dist/libarchive/archive_read_private.h (props changed) vendor/libarchive/dist/libarchive/archive_read_support_compression_all.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_compression_bzip2.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_compression_compress.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_compression_gzip.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_compression_none.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_compression_program.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_compression_rpm.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_compression_uu.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_compression_xz.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_format_all.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_format_ar.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_format_cpio.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_format_empty.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_format_iso9660.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_format_mtree.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_format_raw.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_format_tar.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_format_xar.c (props changed) vendor/libarchive/dist/libarchive/archive_read_support_format_zip.c (props changed) vendor/libarchive/dist/libarchive/archive_string.c (props changed) vendor/libarchive/dist/libarchive/archive_string.h (props changed) vendor/libarchive/dist/libarchive/archive_string_sprintf.c (props changed) vendor/libarchive/dist/libarchive/archive_util.3 (props changed) vendor/libarchive/dist/libarchive/archive_util.c (props changed) vendor/libarchive/dist/libarchive/archive_virtual.c (props changed) vendor/libarchive/dist/libarchive/archive_windows.c (props changed) vendor/libarchive/dist/libarchive/archive_windows.h (props changed) vendor/libarchive/dist/libarchive/archive_write.3 (props changed) vendor/libarchive/dist/libarchive/archive_write.c (props changed) vendor/libarchive/dist/libarchive/archive_write_disk.3 (props changed) vendor/libarchive/dist/libarchive/archive_write_disk.c (props changed) vendor/libarchive/dist/libarchive/archive_write_disk_private.h (props changed) vendor/libarchive/dist/libarchive/archive_write_disk_set_standard_lookup.c (props changed) vendor/libarchive/dist/libarchive/archive_write_open_fd.c (props changed) vendor/libarchive/dist/libarchive/archive_write_open_file.c (props changed) vendor/libarchive/dist/libarchive/archive_write_open_filename.c (props changed) vendor/libarchive/dist/libarchive/archive_write_open_memory.c (props changed) vendor/libarchive/dist/libarchive/archive_write_private.h (props changed) vendor/libarchive/dist/libarchive/archive_write_set_compression_bzip2.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_compression_compress.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_compression_gzip.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_compression_none.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_compression_program.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_compression_xz.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_format.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_format_ar.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_format_by_name.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_format_cpio.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_format_cpio_newc.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_format_mtree.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_format_pax.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_format_shar.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_format_ustar.c (props changed) vendor/libarchive/dist/libarchive/archive_write_set_format_zip.c (props changed) vendor/libarchive/dist/libarchive/config_freebsd.h (props changed) vendor/libarchive/dist/libarchive/cpio.5 (props changed) vendor/libarchive/dist/libarchive/filter_fork.c (props changed) vendor/libarchive/dist/libarchive/filter_fork.h (props changed) vendor/libarchive/dist/libarchive/filter_fork_windows.c (props changed) vendor/libarchive/dist/libarchive/libarchive-formats.5 (props changed) vendor/libarchive/dist/libarchive/libarchive.3 (props changed) vendor/libarchive/dist/libarchive/libarchive_internals.3 (props changed) vendor/libarchive/dist/libarchive/mtree.5 (props changed) vendor/libarchive/dist/libarchive/tar.5 (props changed) vendor/libarchive/dist/libarchive/test/.cvsignore (props changed) vendor/libarchive/dist/libarchive/test/CMakeLists.txt (props changed) vendor/libarchive/dist/libarchive/test/README (props changed) vendor/libarchive/dist/libarchive/test/main.c (props changed) vendor/libarchive/dist/libarchive/test/read_open_memory.c (props changed) vendor/libarchive/dist/libarchive/test/test.h (props changed) vendor/libarchive/dist/libarchive/test/test_acl_basic.c (props changed) vendor/libarchive/dist/libarchive/test/test_acl_freebsd.c (props changed) vendor/libarchive/dist/libarchive/test/test_acl_pax.c (props changed) vendor/libarchive/dist/libarchive/test/test_archive_api_feature.c (props changed) vendor/libarchive/dist/libarchive/test/test_bad_fd.c (props changed) vendor/libarchive/dist/libarchive/test/test_compat_bzip2.c (props changed) vendor/libarchive/dist/libarchive/test/test_compat_bzip2_1.tbz.uu (props changed) vendor/libarchive/dist/libarchive/test/test_compat_bzip2_2.tbz.uu (props changed) vendor/libarchive/dist/libarchive/test/test_compat_cpio.c (props changed) vendor/libarchive/dist/libarchive/test/test_compat_cpio_1.cpio.uu (props changed) vendor/libarchive/dist/libarchive/test/test_compat_gtar.c (props changed) vendor/libarchive/dist/libarchive/test/test_compat_gtar_1.tar.uu (props changed) vendor/libarchive/dist/libarchive/test/test_compat_gzip.c (props changed) vendor/libarchive/dist/libarchive/test/test_compat_gzip_1.tgz.uu (props changed) vendor/libarchive/dist/libarchive/test/test_compat_gzip_2.tgz.uu (props changed) vendor/libarchive/dist/libarchive/test/test_compat_lzma.c (props changed) vendor/libarchive/dist/libarchive/test/test_compat_lzma_1.tlz.uu (props changed) vendor/libarchive/dist/libarchive/test/test_compat_lzma_2.tlz.uu (props changed) vendor/libarchive/dist/libarchive/test/test_compat_lzma_3.tlz.uu (props changed) vendor/libarchive/dist/libarchive/test/test_compat_solaris_tar_acl.c (props changed) vendor/libarchive/dist/libarchive/test/test_compat_solaris_tar_acl.tar.uu (props changed) vendor/libarchive/dist/libarchive/test/test_compat_tar_hardlink.c (props changed) vendor/libarchive/dist/libarchive/test/test_compat_tar_hardlink_1.tar.uu (props changed) vendor/libarchive/dist/libarchive/test/test_compat_xz.c (props changed) vendor/libarchive/dist/libarchive/test/test_compat_xz_1.txz.uu (props changed) vendor/libarchive/dist/libarchive/test/test_compat_zip.c (props changed) vendor/libarchive/dist/libarchive/test/test_compat_zip_1.zip.uu (props changed) vendor/libarchive/dist/libarchive/test/test_empty_write.c (props changed) vendor/libarchive/dist/libarchive/test/test_entry.c (props changed) vendor/libarchive/dist/libarchive/test/test_entry_strmode.c (props changed) vendor/libarchive/dist/libarchive/test/test_extattr_freebsd.c (props changed) vendor/libarchive/dist/libarchive/test/test_fuzz.c (props changed) vendor/libarchive/dist/libarchive/test/test_fuzz_1.iso.Z.uu (props changed) vendor/libarchive/dist/libarchive/test/test_link_resolver.c (props changed) vendor/libarchive/dist/libarchive/test/test_open_failure.c (props changed) vendor/libarchive/dist/libarchive/test/test_open_fd.c (props changed) vendor/libarchive/dist/libarchive/test/test_open_file.c (props changed) vendor/libarchive/dist/libarchive/test/test_open_filename.c (props changed) vendor/libarchive/dist/libarchive/test/test_pax_filename_encoding.c (props changed) vendor/libarchive/dist/libarchive/test/test_pax_filename_encoding.tar.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_compress_program.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_data_large.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_disk.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_disk_entry_from_file.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_extract.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_file_nonexistent.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_ar.ar.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_ar.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_Z.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_be.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_be.cpio.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_bz2.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_gz.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_lzma.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_xz.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_odc.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.rpm.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4_gzip.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.rpm.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4c_Z.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_empty.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_gtar_gz.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_gtar_lzma.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_iso.iso.Z.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_iso_2.iso.Z.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_iso_Z.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_iso_joliet.iso.Z.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_iso_multi_extent.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_isojoliet_bz2.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_isojoliet_long.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_isojoliet_rr.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_isorr_bz2.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_isorr_ce.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_isorr_new_bz2.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_isorr_rr_moved.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_isozisofs_bz2.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_mtree.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_mtree.mtree.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_pax_bz2.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_raw.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_raw.data.Z.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_raw.data.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_tar.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_tar_empty_filename.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_tar_empty_filename.tar.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_tbz.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_tgz.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_tlz.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_txz.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_tz.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_xar.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_zip.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_format_zip.zip.uu (props changed) vendor/libarchive/dist/libarchive/test/test_read_large.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_pax_truncated.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_position.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_truncated.c (props changed) vendor/libarchive/dist/libarchive/test/test_read_uu.c (props changed) vendor/libarchive/dist/libarchive/test/test_tar_filenames.c (props changed) vendor/libarchive/dist/libarchive/test/test_tar_large.c (props changed) vendor/libarchive/dist/libarchive/test/test_ustar_filenames.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_compress.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_compress_bzip2.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_compress_gzip.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_compress_lzma.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_compress_program.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_compress_xz.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_disk.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_disk_failures.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_disk_hardlink.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_disk_perms.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_disk_secure.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_disk_sparse.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_disk_symlink.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_disk_times.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_format_ar.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_format_cpio.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_format_cpio_empty.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_format_cpio_newc.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_format_cpio_odc.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_format_mtree.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_format_pax.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_format_shar_empty.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_format_tar.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_format_tar_empty.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_format_tar_ustar.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_format_zip.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_format_zip_empty.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_format_zip_no_compression.c (props changed) vendor/libarchive/dist/libarchive/test/test_write_open_memory.c (props changed) vendor/libarchive/dist/libarchive_fe/err.c (props changed) vendor/libarchive/dist/libarchive_fe/err.h (props changed) vendor/libarchive/dist/libarchive_fe/lafe_platform.h (props changed) vendor/libarchive/dist/libarchive_fe/line_reader.c (props changed) vendor/libarchive/dist/libarchive_fe/line_reader.h (props changed) vendor/libarchive/dist/libarchive_fe/matching.c (props changed) vendor/libarchive/dist/libarchive_fe/matching.h (props changed) vendor/libarchive/dist/libarchive_fe/pathmatch.c (props changed) vendor/libarchive/dist/libarchive_fe/pathmatch.h (props changed) vendor/libarchive/dist/tar/CMakeLists.txt (props changed) vendor/libarchive/dist/tar/bsdtar.1 (props changed) vendor/libarchive/dist/tar/bsdtar.c (props changed) vendor/libarchive/dist/tar/bsdtar.h (props changed) vendor/libarchive/dist/tar/bsdtar_platform.h (props changed) vendor/libarchive/dist/tar/bsdtar_windows.c (props changed) vendor/libarchive/dist/tar/bsdtar_windows.h (props changed) vendor/libarchive/dist/tar/cmdline.c (props changed) vendor/libarchive/dist/tar/config_freebsd.h (props changed) vendor/libarchive/dist/tar/getdate.c (props changed) vendor/libarchive/dist/tar/read.c (props changed) vendor/libarchive/dist/tar/subst.c (props changed) vendor/libarchive/dist/tar/test/CMakeLists.txt (props changed) vendor/libarchive/dist/tar/test/main.c (props changed) vendor/libarchive/dist/tar/test/test.h (props changed) vendor/libarchive/dist/tar/test/test_0.c (props changed) vendor/libarchive/dist/tar/test/test_basic.c (props changed) vendor/libarchive/dist/tar/test/test_copy.c (props changed) vendor/libarchive/dist/tar/test/test_empty_mtree.c (props changed) vendor/libarchive/dist/tar/test/test_getdate.c (props changed) vendor/libarchive/dist/tar/test/test_help.c (props changed) vendor/libarchive/dist/tar/test/test_option_T_upper.c (props changed) vendor/libarchive/dist/tar/test/test_option_q.c (props changed) vendor/libarchive/dist/tar/test/test_option_r.c (props changed) vendor/libarchive/dist/tar/test/test_option_s.c (props changed) vendor/libarchive/dist/tar/test/test_patterns.c (props changed) vendor/libarchive/dist/tar/test/test_patterns_2.tar.uu (props changed) vendor/libarchive/dist/tar/test/test_patterns_3.tar.uu (props changed) vendor/libarchive/dist/tar/test/test_patterns_4.tar.uu (props changed) vendor/libarchive/dist/tar/test/test_stdio.c (props changed) vendor/libarchive/dist/tar/test/test_strip_components.c (props changed) vendor/libarchive/dist/tar/test/test_symlink_dir.c (props changed) vendor/libarchive/dist/tar/test/test_version.c (props changed) vendor/libarchive/dist/tar/test/test_windows.c (props changed) vendor/libarchive/dist/tar/tree.c (props changed) vendor/libarchive/dist/tar/tree.h (props changed) vendor/libarchive/dist/tar/util.c (props changed) vendor/libarchive/dist/tar/write.c (props changed) From owner-svn-src-vendor@FreeBSD.ORG Thu Dec 22 18:10:15 2011 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BCBF3106564A; Thu, 22 Dec 2011 18:10:15 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ABBD78FC27; Thu, 22 Dec 2011 18:10:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBMIAFkX028055; Thu, 22 Dec 2011 18:10:15 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBMIAFlo028054; Thu, 22 Dec 2011 18:10:15 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201112221810.pBMIAFlo028054@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Thu, 22 Dec 2011 18:10:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228809 - vendor/openpam/dist/lib X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2011 18:10:15 -0000 Author: des Date: Thu Dec 22 18:10:15 2011 New Revision: 228809 URL: http://svn.freebsd.org/changeset/base/228809 Log: Merge upstream r509: don't log an error in the common case (ENOENT). Modified: vendor/openpam/dist/lib/openpam_check_owner_perms.c Modified: vendor/openpam/dist/lib/openpam_check_owner_perms.c ============================================================================== --- vendor/openpam/dist/lib/openpam_check_owner_perms.c Thu Dec 22 16:40:35 2011 (r228808) +++ vendor/openpam/dist/lib/openpam_check_owner_perms.c Thu Dec 22 18:10:15 2011 (r228809) @@ -104,9 +104,11 @@ openpam_check_path_owner_perms(const cha len = strlen(pathbuf); while (len > 0) { if (stat(pathbuf, &sb) != 0) { - serrno = errno; - openpam_log(PAM_LOG_ERROR, "%s: %m", pathbuf); - errno = serrno; + if (errno != ENOENT) { + serrno = errno; + openpam_log(PAM_LOG_ERROR, "%s: %m", pathbuf); + errno = serrno; + } return (-1); } if ((sb.st_uid != root && sb.st_uid != arbitrator) || From owner-svn-src-vendor@FreeBSD.ORG Thu Dec 22 18:22:21 2011 Return-Path: Delivered-To: svn-src-vendor@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 453FD106566C; Thu, 22 Dec 2011 18:22:21 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.64.117]) by mx1.freebsd.org (Postfix) with ESMTP id B74638FC1D; Thu, 22 Dec 2011 18:22:20 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.5/8.14.5) with ESMTP id pBMIMJUH092830; Thu, 22 Dec 2011 22:22:19 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.5/8.14.5/Submit) id pBMIMJvd092829; Thu, 22 Dec 2011 22:22:19 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Thu, 22 Dec 2011 22:22:19 +0400 From: Gleb Smirnoff To: Dag-Erling Smorgrav Message-ID: <20111222182219.GS80057@FreeBSD.org> References: <201112221810.pBMIAFlo028054@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: <201112221810.pBMIAFlo028054@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-vendor@FreeBSD.org Subject: Re: svn commit: r228809 - vendor/openpam/dist/lib X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2011 18:22:21 -0000 Dag-Erling, On Thu, Dec 22, 2011 at 06:10:15PM +0000, Dag-Erling Smorgrav wrote: D> Author: des D> Date: Thu Dec 22 18:10:15 2011 D> New Revision: 228809 D> URL: http://svn.freebsd.org/changeset/base/228809 D> D> Log: D> Merge upstream r509: don't log an error in the common case (ENOENT). D> D> Modified: D> vendor/openpam/dist/lib/openpam_check_owner_perms.c D> D> Modified: vendor/openpam/dist/lib/openpam_check_owner_perms.c D> ============================================================================== D> --- vendor/openpam/dist/lib/openpam_check_owner_perms.c Thu Dec 22 16:40:35 2011 (r228808) D> +++ vendor/openpam/dist/lib/openpam_check_owner_perms.c Thu Dec 22 18:10:15 2011 (r228809) D> @@ -104,9 +104,11 @@ openpam_check_path_owner_perms(const cha D> len = strlen(pathbuf); D> while (len > 0) { D> if (stat(pathbuf, &sb) != 0) { D> - serrno = errno; D> - openpam_log(PAM_LOG_ERROR, "%s: %m", pathbuf); D> - errno = serrno; D> + if (errno != ENOENT) { D> + serrno = errno; D> + openpam_log(PAM_LOG_ERROR, "%s: %m", pathbuf); D> + errno = serrno; D> + } D> return (-1); D> } D> if ((sb.st_uid != root && sb.st_uid != arbitrator) || I haven't yet tested this, but code looks like it is not going to print anything in a case I don't have /usr/local/bin/pam_foo.so, while purpose of the patch is to avoid logging of failure to open /usr/local/bin/pam_foo.so.5. Although openpam_dynamic() will do some logging of errno value, the name of the failed file won't be logged. If I got a lot of modules configured, then I can't figure out which one is ENOENT. IMHO, some no_log flag should be passed down from the try_dlopen() to fix the issue correctly. -- Totus tuus, Glebius. From owner-svn-src-vendor@FreeBSD.ORG Thu Dec 22 18:38:57 2011 Return-Path: Delivered-To: svn-src-vendor@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94019106564A for ; Thu, 22 Dec 2011 18:38:57 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 4A2FE8FC13 for ; Thu, 22 Dec 2011 18:38:57 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 87E546DEF; Thu, 22 Dec 2011 18:33:30 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id 68A5281D2; Thu, 22 Dec 2011 19:33:30 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Gleb Smirnoff References: <201112221810.pBMIAFlo028054@svn.freebsd.org> <20111222182219.GS80057@FreeBSD.org> <86bor0sbra.fsf@ds4.des.no> Date: Thu, 22 Dec 2011 19:33:30 +0100 In-Reply-To: <86bor0sbra.fsf@ds4.des.no> ("Dag-Erling =?utf-8?Q?Sm=C3=B8rg?= =?utf-8?Q?rav=22's?= message of "Thu, 22 Dec 2011 19:27:05 +0100") Message-ID: <867h1osbgl.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-vendor@FreeBSD.org Subject: Re: svn commit: r228809 - vendor/openpam/dist/lib X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2011 18:38:57 -0000 Actually, there is no good general solution, because the rtld does not set errno. Here's what I came up with: Index: openpam_dynamic.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- openpam_dynamic.c (revision 509) +++ openpam_dynamic.c (working copy) @@ -63,10 +63,15 @@ static void * try_dlopen(const char *modfn) { + void *dlh; =20 if (openpam_check_path_owner_perms(modfn) !=3D 0) return (NULL); - return (dlopen(modfn, RTLD_NOW)); + if ((dlh =3D dlopen(modfn, RTLD_NOW)) =3D=3D NULL) { + openpam_log(PAM_LOG_DEBUG, "%s: %s", modfn, dlerror()); + errno =3D 0; + } + return (dlh); } =20=20=20=20=20 /* @@ -124,7 +129,8 @@ dlclose(dlh); FREE(module); err: - openpam_log(PAM_LOG_ERROR, "%m"); + if (errno !=3D 0) + openpam_log(PAM_LOG_ERROR, "%s: %m", path); return (NULL); } =20 I'll wait for your feedback before I commit it. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-vendor@FreeBSD.ORG Thu Dec 22 18:40:07 2011 Return-Path: Delivered-To: svn-src-vendor@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 16945106564A; Thu, 22 Dec 2011 18:40:07 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.64.117]) by mx1.freebsd.org (Postfix) with ESMTP id 7C1798FC12; Thu, 22 Dec 2011 18:40:06 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.5/8.14.5) with ESMTP id pBMIcj69092963; Thu, 22 Dec 2011 22:38:45 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.5/8.14.5/Submit) id pBMIcjxX092962; Thu, 22 Dec 2011 22:38:45 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Thu, 22 Dec 2011 22:38:45 +0400 From: Gleb Smirnoff To: Dag-Erling Sm??rgrav Message-ID: <20111222183845.GT80057@FreeBSD.org> References: <201112221810.pBMIAFlo028054@svn.freebsd.org> <20111222182219.GS80057@FreeBSD.org> <86bor0sbra.fsf@ds4.des.no> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: <86bor0sbra.fsf@ds4.des.no> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-vendor@FreeBSD.org Subject: Re: svn commit: r228809 - vendor/openpam/dist/lib X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2011 18:40:07 -0000 On Thu, Dec 22, 2011 at 07:27:05PM +0100, Dag-Erling Sm??rgrav wrote: D> Gleb Smirnoff writes: D> > I haven't yet tested this, but code looks like it is not going to print D> > anything in a case I don't have /usr/local/bin/pam_foo.so, while purpose D> > of the patch is to avoid logging of failure to open D> > /usr/local/bin/pam_foo.so.5. D> > D> > Although openpam_dynamic() will do some logging of errno value, the name D> > of the failed file won't be logged. If I got a lot of modules configured, D> > then I can't figure out which one is ENOENT. D> > D> > IMHO, some no_log flag should be passed down from the try_dlopen() to fix D> > the issue correctly. D> D> Index: openpam_dynamic.c D> =================================================================== D> --- openpam_dynamic.c (revision 509) D> +++ openpam_dynamic.c (working copy) D> @@ -124,7 +124,7 @@ D> dlclose(dlh); D> FREE(module); D> err: D> - openpam_log(PAM_LOG_ERROR, "%m"); D> + openpam_log(PAM_LOG_ERROR, "%s: %m", path); D> return (NULL); D> } If you don't mind, I'd prefer printing vpath here. Looks like in some cases the path may be not absolute, and informing user of open failure is more useful when an exact path where open failed is logged. This would require shifting FREE(vpath) down the function, I hope this isn't a problem. -- Totus tuus, Glebius. From owner-svn-src-vendor@FreeBSD.ORG Thu Dec 22 18:44:01 2011 Return-Path: Delivered-To: svn-src-vendor@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63E24106564A for ; Thu, 22 Dec 2011 18:44:01 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id ACA958FC12 for ; Thu, 22 Dec 2011 18:44:00 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 984696DE1; Thu, 22 Dec 2011 18:27:05 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id 57C8F81BB; Thu, 22 Dec 2011 19:27:05 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Gleb Smirnoff References: <201112221810.pBMIAFlo028054@svn.freebsd.org> <20111222182219.GS80057@FreeBSD.org> Date: Thu, 22 Dec 2011 19:27:05 +0100 In-Reply-To: <20111222182219.GS80057@FreeBSD.org> (Gleb Smirnoff's message of "Thu, 22 Dec 2011 22:22:19 +0400") Message-ID: <86bor0sbra.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-vendor@FreeBSD.org Subject: Re: svn commit: r228809 - vendor/openpam/dist/lib X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2011 18:44:01 -0000 Gleb Smirnoff writes: > I haven't yet tested this, but code looks like it is not going to print > anything in a case I don't have /usr/local/bin/pam_foo.so, while purpose > of the patch is to avoid logging of failure to open > /usr/local/bin/pam_foo.so.5. > > Although openpam_dynamic() will do some logging of errno value, the name > of the failed file won't be logged. If I got a lot of modules configured, > then I can't figure out which one is ENOENT. > > IMHO, some no_log flag should be passed down from the try_dlopen() to fix > the issue correctly. Index: openpam_dynamic.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- openpam_dynamic.c (revision 509) +++ openpam_dynamic.c (working copy) @@ -124,7 +124,7 @@ dlclose(dlh); FREE(module); err: - openpam_log(PAM_LOG_ERROR, "%m"); + openpam_log(PAM_LOG_ERROR, "%s: %m", path); return (NULL); } =20 DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-vendor@FreeBSD.ORG Thu Dec 22 18:44:16 2011 Return-Path: Delivered-To: svn-src-vendor@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E7DB106564A; Thu, 22 Dec 2011 18:44:16 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.64.117]) by mx1.freebsd.org (Postfix) with ESMTP id A488A8FC16; Thu, 22 Dec 2011 18:44:15 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.5/8.14.5) with ESMTP id pBMIgwMI092987; Thu, 22 Dec 2011 22:42:58 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.5/8.14.5/Submit) id pBMIgwQG092986; Thu, 22 Dec 2011 22:42:58 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Thu, 22 Dec 2011 22:42:58 +0400 From: Gleb Smirnoff To: Dag-Erling Sm??rgrav Message-ID: <20111222184258.GU80057@FreeBSD.org> References: <201112221810.pBMIAFlo028054@svn.freebsd.org> <20111222182219.GS80057@FreeBSD.org> <86bor0sbra.fsf@ds4.des.no> <867h1osbgl.fsf@ds4.des.no> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: <867h1osbgl.fsf@ds4.des.no> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-vendor@FreeBSD.org Subject: Re: svn commit: r228809 - vendor/openpam/dist/lib X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2011 18:44:16 -0000 On Thu, Dec 22, 2011 at 07:33:30PM +0100, Dag-Erling Sm??rgrav wrote: D> Actually, there is no good general solution, because the rtld does not D> set errno. Here's what I came up with: D> D> Index: openpam_dynamic.c D> =================================================================== D> --- openpam_dynamic.c (revision 509) D> +++ openpam_dynamic.c (working copy) D> @@ -63,10 +63,15 @@ D> static void * D> try_dlopen(const char *modfn) D> { D> + void *dlh; D> D> if (openpam_check_path_owner_perms(modfn) != 0) D> return (NULL); D> - return (dlopen(modfn, RTLD_NOW)); D> + if ((dlh = dlopen(modfn, RTLD_NOW)) == NULL) { D> + openpam_log(PAM_LOG_DEBUG, "%s: %s", modfn, dlerror()); D> + errno = 0; D> + } D> + return (dlh); D> } Why not PAM_LOG_ERROR? D> /* D> @@ -124,7 +129,8 @@ D> dlclose(dlh); D> FREE(module); D> err: D> - openpam_log(PAM_LOG_ERROR, "%m"); D> + if (errno != 0) D> + openpam_log(PAM_LOG_ERROR, "%s: %m", path); D> return (NULL); D> } I think vpath is better choice here, as explained in previous mail D> I'll wait for your feedback before I commit it. Thanks! -- Totus tuus, Glebius. From owner-svn-src-vendor@FreeBSD.ORG Thu Dec 22 19:34:39 2011 Return-Path: Delivered-To: svn-src-vendor@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 946A2106564A; Thu, 22 Dec 2011 19:34:39 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 1937A8FC12; Thu, 22 Dec 2011 19:34:38 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 85E406E27; Thu, 22 Dec 2011 19:34:32 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id 30A2081DE; Thu, 22 Dec 2011 20:34:30 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Gleb Smirnoff References: <201112221810.pBMIAFlo028054@svn.freebsd.org> <20111222182219.GS80057@FreeBSD.org> <86bor0sbra.fsf@ds4.des.no> <867h1osbgl.fsf@ds4.des.no> <20111222184258.GU80057@FreeBSD.org> Date: Thu, 22 Dec 2011 20:34:29 +0100 In-Reply-To: <20111222184258.GU80057@FreeBSD.org> (Gleb Smirnoff's message of "Thu, 22 Dec 2011 22:42:58 +0400") Message-ID: <8639ccs8my.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-vendor@FreeBSD.org Subject: Re: svn commit: r228809 - vendor/openpam/dist/lib X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2011 19:34:39 -0000 Gleb Smirnoff writes: > "Dag-Erling Sm=C3=B8rgrav" writes: > > @@ -63,10 +63,15 @@ > > static void * > > try_dlopen(const char *modfn) > > { > > + void *dlh; > >=20=20 > > if (openpam_check_path_owner_perms(modfn) !=3D 0) > > return (NULL); > > - return (dlopen(modfn, RTLD_NOW)); > > + if ((dlh =3D dlopen(modfn, RTLD_NOW)) =3D=3D NULL) { > > + openpam_log(PAM_LOG_DEBUG, "%s: %s", modfn, dlerror()); > > + errno =3D 0; > > + } > > + return (dlh); > > } > > Why not PAM_LOG_ERROR? copy-paste mistake > > /* > > @@ -124,7 +129,8 @@ > > dlclose(dlh); > > FREE(module); > > err: > > - openpam_log(PAM_LOG_ERROR, "%m"); > > + if (errno !=3D 0) > > + openpam_log(PAM_LOG_ERROR, "%s: %m", path); > > return (NULL); > > } > > I think vpath is better choice here, as explained in previous mail At this point, vpath is either NULL or garbage. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-vendor@FreeBSD.ORG Thu Dec 22 19:52:12 2011 Return-Path: Delivered-To: svn-src-vendor@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F8F4106566C; Thu, 22 Dec 2011 19:52:12 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.64.117]) by mx1.freebsd.org (Postfix) with ESMTP id 8E96B8FC12; Thu, 22 Dec 2011 19:52:11 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.5/8.14.5) with ESMTP id pBMJoraA093532; Thu, 22 Dec 2011 23:50:53 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.5/8.14.5/Submit) id pBMJorKB093531; Thu, 22 Dec 2011 23:50:53 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Thu, 22 Dec 2011 23:50:53 +0400 From: Gleb Smirnoff To: Dag-Erling Sm??rgrav Message-ID: <20111222195053.GA80057@FreeBSD.org> References: <201112221810.pBMIAFlo028054@svn.freebsd.org> <20111222182219.GS80057@FreeBSD.org> <86bor0sbra.fsf@ds4.des.no> <867h1osbgl.fsf@ds4.des.no> <20111222184258.GU80057@FreeBSD.org> <8639ccs8my.fsf@ds4.des.no> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="5L6AZ1aJH5mDrqCQ" Content-Disposition: inline In-Reply-To: <8639ccs8my.fsf@ds4.des.no> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-vendor@FreeBSD.org Subject: Re: svn commit: r228809 - vendor/openpam/dist/lib X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2011 19:52:12 -0000 --5L6AZ1aJH5mDrqCQ Content-Type: text/plain; charset=koi8-r Content-Disposition: inline On Thu, Dec 22, 2011 at 08:34:29PM +0100, Dag-Erling Sm??rgrav wrote: D> > > /* D> > > @@ -124,7 +129,8 @@ D> > > dlclose(dlh); D> > > FREE(module); D> > > err: D> > > - openpam_log(PAM_LOG_ERROR, "%m"); D> > > + if (errno != 0) D> > > + openpam_log(PAM_LOG_ERROR, "%s: %m", path); D> > > return (NULL); D> > > } D> > D> > I think vpath is better choice here, as explained in previous mail D> D> At this point, vpath is either NULL or garbage. Here is my variant attached. It is silent on success, printing these on failure: Dec 22 23:49:39 projcarp1 sshd[3208]: in openpam_dynamic(): /usr/local/lib/pam_ldap.so: No such file or directory Dec 22 23:49:39 projcarp1 sshd[3208]: in openpam_load_module(): no /usr/local/lib/pam_ldap.so found -- Totus tuus, Glebius. --5L6AZ1aJH5mDrqCQ Content-Type: text/x-diff; charset=koi8-r Content-Disposition: attachment; filename="openpam_dynamic.c.diff" Index: openpam_dynamic.c =================================================================== --- openpam_dynamic.c (revision 228816) +++ openpam_dynamic.c (working copy) @@ -63,12 +63,17 @@ static void * try_dlopen(const char *modfn) { + void *dlh; if (openpam_check_path_owner_perms(modfn) != 0) return (NULL); - return (dlopen(modfn, RTLD_NOW)); + if ((dlh = dlopen(modfn, RTLD_NOW)) == NULL) { + openpam_log(PAM_LOG_ERROR, "%s: %s", modfn, dlerror()); + errno = 0; + } + return (dlh); } - + /* * OpenPAM internal * @@ -83,7 +88,7 @@ const char *prefix; char *vpath; void *dlh; - int i, serrno; + int i; dlh = NULL; @@ -100,9 +105,6 @@ *strrchr(vpath, '.') = '\0'; dlh = try_dlopen(vpath); } - serrno = errno; - FREE(vpath); - errno = serrno; if (dlh == NULL) goto err; if ((module = calloc(1, sizeof *module)) == NULL) @@ -118,13 +120,16 @@ openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s", path, pam_sm_func_name[i], dlerror()); } + FREE(vpath); return (module); buf_err: if (dlh != NULL) dlclose(dlh); FREE(module); err: - openpam_log(PAM_LOG_ERROR, "%m"); + if (errno != 0) + openpam_log(PAM_LOG_ERROR, "%s: %m", path); + FREE(vpath); return (NULL); } --5L6AZ1aJH5mDrqCQ-- From owner-svn-src-vendor@FreeBSD.ORG Thu Dec 22 19:58:59 2011 Return-Path: Delivered-To: svn-src-vendor@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EFC5A106566B; Thu, 22 Dec 2011 19:58:59 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.64.117]) by mx1.freebsd.org (Postfix) with ESMTP id 6DC9C8FC12; Thu, 22 Dec 2011 19:58:59 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.5/8.14.5) with ESMTP id pBMJvfxS093598; Thu, 22 Dec 2011 23:57:41 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.5/8.14.5/Submit) id pBMJvf7S093597; Thu, 22 Dec 2011 23:57:41 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Thu, 22 Dec 2011 23:57:41 +0400 From: Gleb Smirnoff To: Dag-Erling Sm??rgrav Message-ID: <20111222195741.GB80057@FreeBSD.org> References: <201112221810.pBMIAFlo028054@svn.freebsd.org> <20111222182219.GS80057@FreeBSD.org> <86bor0sbra.fsf@ds4.des.no> <867h1osbgl.fsf@ds4.des.no> <20111222184258.GU80057@FreeBSD.org> <8639ccs8my.fsf@ds4.des.no> <20111222195053.GA80057@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="7J16OGEJ/mt06A90" Content-Disposition: inline In-Reply-To: <20111222195053.GA80057@FreeBSD.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-vendor@FreeBSD.org Subject: Re: svn commit: r228809 - vendor/openpam/dist/lib X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2011 19:59:00 -0000 --7J16OGEJ/mt06A90 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline On Thu, Dec 22, 2011 at 11:50:53PM +0400, Gleb Smirnoff wrote: T> Here is my variant attached. Sorry, this one is correct. -- Totus tuus, Glebius. --7J16OGEJ/mt06A90 Content-Type: text/x-diff; charset=koi8-r Content-Disposition: attachment; filename="openpam_dynamic.c.diff" Index: openpam_dynamic.c =================================================================== --- openpam_dynamic.c (revision 228816) +++ openpam_dynamic.c (working copy) @@ -63,12 +63,17 @@ static void * try_dlopen(const char *modfn) { + void *dlh; if (openpam_check_path_owner_perms(modfn) != 0) return (NULL); - return (dlopen(modfn, RTLD_NOW)); + if ((dlh = dlopen(modfn, RTLD_NOW)) == NULL) { + openpam_log(PAM_LOG_ERROR, "%s: %s", modfn, dlerror()); + errno = 0; + } + return (dlh); } - + /* * OpenPAM internal * @@ -83,7 +88,7 @@ const char *prefix; char *vpath; void *dlh; - int i, serrno; + int i; dlh = NULL; @@ -100,9 +105,6 @@ *strrchr(vpath, '.') = '\0'; dlh = try_dlopen(vpath); } - serrno = errno; - FREE(vpath); - errno = serrno; if (dlh == NULL) goto err; if ((module = calloc(1, sizeof *module)) == NULL) @@ -118,13 +120,16 @@ openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s", path, pam_sm_func_name[i], dlerror()); } + FREE(vpath); return (module); buf_err: if (dlh != NULL) dlclose(dlh); FREE(module); err: - openpam_log(PAM_LOG_ERROR, "%m"); + if (errno != 0) + openpam_log(PAM_LOG_ERROR, "%s: %m", vpath); + FREE(vpath); return (NULL); } --7J16OGEJ/mt06A90--