From owner-svn-src-head@FreeBSD.ORG Sat Sep 7 18:46:37 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D277071E; Sat, 7 Sep 2013 18:46:37 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BD11E2E80; Sat, 7 Sep 2013 18:46:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r87Ikbpv097230; Sat, 7 Sep 2013 18:46:37 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r87IkZeT097217; Sat, 7 Sep 2013 18:46:35 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309071846.r87IkZeT097217@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sat, 7 Sep 2013 18:46:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255369 - in head: contrib/openpam contrib/openpam/bin/openpam_dump_policy contrib/openpam/bin/pamtest contrib/openpam/bin/su contrib/openpam/doc/man contrib/openpam/lib contrib/openpam... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Sep 2013 18:46:37 -0000 Author: des Date: Sat Sep 7 18:46:35 2013 New Revision: 255369 URL: http://svnweb.freebsd.org/changeset/base/255369 Log: MFV (r255364): move the code around in preparation for Nummularia. Added: head/contrib/openpam/lib/libpam/ - copied from r255364, vendor/openpam/dist/lib/libpam/ Deleted: head/contrib/openpam/lib/Makefile.am head/contrib/openpam/lib/Makefile.in head/contrib/openpam/lib/openpam_borrow_cred.c head/contrib/openpam/lib/openpam_check_owner_perms.c head/contrib/openpam/lib/openpam_configure.c head/contrib/openpam/lib/openpam_constants.c head/contrib/openpam/lib/openpam_constants.h head/contrib/openpam/lib/openpam_ctype.h head/contrib/openpam/lib/openpam_debug.h head/contrib/openpam/lib/openpam_dispatch.c head/contrib/openpam/lib/openpam_dynamic.c head/contrib/openpam/lib/openpam_features.c head/contrib/openpam/lib/openpam_features.h head/contrib/openpam/lib/openpam_findenv.c head/contrib/openpam/lib/openpam_free_data.c head/contrib/openpam/lib/openpam_free_envlist.c head/contrib/openpam/lib/openpam_get_feature.c head/contrib/openpam/lib/openpam_get_option.c head/contrib/openpam/lib/openpam_impl.h head/contrib/openpam/lib/openpam_load.c head/contrib/openpam/lib/openpam_log.c head/contrib/openpam/lib/openpam_nullconv.c head/contrib/openpam/lib/openpam_readline.c head/contrib/openpam/lib/openpam_readlinev.c head/contrib/openpam/lib/openpam_readword.c head/contrib/openpam/lib/openpam_restore_cred.c head/contrib/openpam/lib/openpam_set_feature.c head/contrib/openpam/lib/openpam_set_option.c head/contrib/openpam/lib/openpam_static.c head/contrib/openpam/lib/openpam_straddch.c head/contrib/openpam/lib/openpam_strlcat.h head/contrib/openpam/lib/openpam_strlcmp.h head/contrib/openpam/lib/openpam_strlcpy.h head/contrib/openpam/lib/openpam_subst.c head/contrib/openpam/lib/openpam_ttyconv.c head/contrib/openpam/lib/pam_acct_mgmt.c head/contrib/openpam/lib/pam_authenticate.c head/contrib/openpam/lib/pam_authenticate_secondary.c head/contrib/openpam/lib/pam_chauthtok.c head/contrib/openpam/lib/pam_close_session.c head/contrib/openpam/lib/pam_end.c head/contrib/openpam/lib/pam_error.c head/contrib/openpam/lib/pam_get_authtok.c head/contrib/openpam/lib/pam_get_data.c head/contrib/openpam/lib/pam_get_item.c head/contrib/openpam/lib/pam_get_mapped_authtok.c head/contrib/openpam/lib/pam_get_mapped_username.c head/contrib/openpam/lib/pam_get_user.c head/contrib/openpam/lib/pam_getenv.c head/contrib/openpam/lib/pam_getenvlist.c head/contrib/openpam/lib/pam_info.c head/contrib/openpam/lib/pam_open_session.c head/contrib/openpam/lib/pam_prompt.c head/contrib/openpam/lib/pam_putenv.c head/contrib/openpam/lib/pam_set_data.c head/contrib/openpam/lib/pam_set_item.c head/contrib/openpam/lib/pam_set_mapped_authtok.c head/contrib/openpam/lib/pam_set_mapped_username.c head/contrib/openpam/lib/pam_setcred.c head/contrib/openpam/lib/pam_setenv.c head/contrib/openpam/lib/pam_sm_acct_mgmt.c head/contrib/openpam/lib/pam_sm_authenticate.c head/contrib/openpam/lib/pam_sm_authenticate_secondary.c head/contrib/openpam/lib/pam_sm_chauthtok.c head/contrib/openpam/lib/pam_sm_close_session.c head/contrib/openpam/lib/pam_sm_get_mapped_authtok.c head/contrib/openpam/lib/pam_sm_get_mapped_username.c head/contrib/openpam/lib/pam_sm_open_session.c head/contrib/openpam/lib/pam_sm_set_mapped_authtok.c head/contrib/openpam/lib/pam_sm_set_mapped_username.c head/contrib/openpam/lib/pam_sm_setcred.c head/contrib/openpam/lib/pam_start.c head/contrib/openpam/lib/pam_strerror.c head/contrib/openpam/lib/pam_verror.c head/contrib/openpam/lib/pam_vinfo.c head/contrib/openpam/lib/pam_vprompt.c Modified: head/contrib/openpam/Makefile.am head/contrib/openpam/bin/openpam_dump_policy/Makefile.am head/contrib/openpam/bin/pamtest/Makefile.am head/contrib/openpam/bin/su/Makefile.am head/contrib/openpam/configure.ac head/contrib/openpam/doc/man/Makefile.am head/contrib/openpam/modules/pam_deny/Makefile.am head/contrib/openpam/modules/pam_permit/Makefile.am head/contrib/openpam/modules/pam_unix/Makefile.am head/lib/libpam/libpam/Makefile Directory Properties: head/contrib/openpam/ (props changed) Modified: head/contrib/openpam/Makefile.am ============================================================================== --- head/contrib/openpam/Makefile.am Sat Sep 7 18:26:16 2013 (r255368) +++ head/contrib/openpam/Makefile.am Sat Sep 7 18:46:35 2013 (r255369) @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = lib bin modules include +SUBDIRS = lib/libpam bin modules include if WITH_DOC SUBDIRS += doc Modified: head/contrib/openpam/bin/openpam_dump_policy/Makefile.am ============================================================================== --- head/contrib/openpam/bin/openpam_dump_policy/Makefile.am Sat Sep 7 18:26:16 2013 (r255368) +++ head/contrib/openpam/bin/openpam_dump_policy/Makefile.am Sat Sep 7 18:46:35 2013 (r255369) @@ -1,7 +1,7 @@ # $Id: Makefile.am 538 2012-03-31 17:04:29Z des $ -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam noinst_PROGRAMS = openpam_dump_policy openpam_dump_policy_SOURCES = openpam_dump_policy.c -openpam_dump_policy_LDADD = $(top_builddir)/lib/libpam.la +openpam_dump_policy_LDADD = $(top_builddir)/lib/libpam/libpam.la Modified: head/contrib/openpam/bin/pamtest/Makefile.am ============================================================================== --- head/contrib/openpam/bin/pamtest/Makefile.am Sat Sep 7 18:26:16 2013 (r255368) +++ head/contrib/openpam/bin/pamtest/Makefile.am Sat Sep 7 18:46:35 2013 (r255369) @@ -4,6 +4,6 @@ INCLUDES = -I$(top_srcdir)/include bin_PROGRAMS = pamtest pamtest_SOURCES = pamtest.c -pamtest_LDADD = $(top_builddir)/lib/libpam.la +pamtest_LDADD = $(top_builddir)/lib/libpam/libpam.la dist_man1_MANS = pamtest.1 Modified: head/contrib/openpam/bin/su/Makefile.am ============================================================================== --- head/contrib/openpam/bin/su/Makefile.am Sat Sep 7 18:26:16 2013 (r255368) +++ head/contrib/openpam/bin/su/Makefile.am Sat Sep 7 18:46:35 2013 (r255369) @@ -4,6 +4,6 @@ INCLUDES = -I$(top_srcdir)/include bin_PROGRAMS = su su_SOURCES = su.c -su_LDADD = $(top_builddir)/lib/libpam.la +su_LDADD = $(top_builddir)/lib/libpam/libpam.la dist_man1_MANS = su.1 Modified: head/contrib/openpam/configure.ac ============================================================================== --- head/contrib/openpam/configure.ac Sat Sep 7 18:26:16 2013 (r255368) +++ head/contrib/openpam/configure.ac Sat Sep 7 18:46:35 2013 (r255369) @@ -3,7 +3,7 @@ dnl $Id: configure.ac 610 2012-05-26 14: AC_PREREQ([2.62]) AC_REVISION([$Id: configure.ac 610 2012-05-26 14:03:45Z des $]) AC_INIT([OpenPAM], [20120526], [des@des.no]) -AC_CONFIG_SRCDIR([lib/pam_start.c]) +AC_CONFIG_SRCDIR([lib/libpam/pam_start.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign]) AM_CONFIG_HEADER([config.h]) @@ -119,7 +119,7 @@ AC_CONFIG_FILES([ doc/man/Makefile include/Makefile include/security/Makefile - lib/Makefile + lib/libpam/Makefile modules/Makefile modules/pam_deny/Makefile modules/pam_permit/Makefile Modified: head/contrib/openpam/doc/man/Makefile.am ============================================================================== --- head/contrib/openpam/doc/man/Makefile.am Sat Sep 7 18:26:16 2013 (r255368) +++ head/contrib/openpam/doc/man/Makefile.am Sat Sep 7 18:46:35 2013 (r255369) @@ -73,7 +73,7 @@ CLEANFILES = $(ALLCMAN) openpam.3 pam.3 GENDOC = $(top_srcdir)/misc/gendoc.pl -LIBSRCDIR = $(top_srcdir)/lib +LIBSRCDIR = $(top_srcdir)/lib/libpam VPATH = $(LIBSRCDIR) $(srcdir) Modified: head/contrib/openpam/modules/pam_deny/Makefile.am ============================================================================== --- head/contrib/openpam/modules/pam_deny/Makefile.am Sat Sep 7 18:26:16 2013 (r255368) +++ head/contrib/openpam/modules/pam_deny/Makefile.am Sat Sep 7 18:46:35 2013 (r255369) @@ -7,4 +7,4 @@ pkglib_LTLIBRARIES = pam_deny.la pam_deny_la_SOURCES = pam_deny.c pam_deny_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ -pam_deny_la_LIBADD = $(top_builddir)/lib/libpam.la +pam_deny_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la Modified: head/contrib/openpam/modules/pam_permit/Makefile.am ============================================================================== --- head/contrib/openpam/modules/pam_permit/Makefile.am Sat Sep 7 18:26:16 2013 (r255368) +++ head/contrib/openpam/modules/pam_permit/Makefile.am Sat Sep 7 18:46:35 2013 (r255369) @@ -7,4 +7,4 @@ pkglib_LTLIBRARIES = pam_permit.la pam_permit_la_SOURCES = pam_permit.c pam_permit_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ -pam_permit_la_LIBADD = $(top_builddir)/lib/libpam.la +pam_permit_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la Modified: head/contrib/openpam/modules/pam_unix/Makefile.am ============================================================================== --- head/contrib/openpam/modules/pam_unix/Makefile.am Sat Sep 7 18:26:16 2013 (r255368) +++ head/contrib/openpam/modules/pam_unix/Makefile.am Sat Sep 7 18:46:35 2013 (r255369) @@ -8,5 +8,5 @@ pkglib_LTLIBRARIES = pam_unix.la pam_unix_la_SOURCES = pam_unix.c pam_unix_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ -pam_unix_la_LIBADD = $(top_builddir)/lib/libpam.la @CRYPT_LIBS@ +pam_unix_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la @CRYPT_LIBS@ endif Modified: head/lib/libpam/libpam/Makefile ============================================================================== --- head/lib/libpam/libpam/Makefile Sat Sep 7 18:26:16 2013 (r255368) +++ head/lib/libpam/libpam/Makefile Sat Sep 7 18:46:35 2013 (r255369) @@ -36,7 +36,7 @@ # $FreeBSD$ OPENPAM= ${.CURDIR}/../../../contrib/openpam -.PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man +.PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man LIB= pam NO_PROFILE=