From owner-svn-src-all@freebsd.org Thu Sep 13 05:00:03 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC71B10A57C6; Thu, 13 Sep 2018 05:00:02 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7884C800D4; Thu, 13 Sep 2018 05:00:02 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from auth1-smtp.messagingengine.com (auth1-smtp.messagingengine.com [66.111.4.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: brd/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 555081A078; Thu, 13 Sep 2018 05:00:02 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailauth.nyi.internal (Postfix) with ESMTP id 12B5921DC1; Thu, 13 Sep 2018 01:00:02 -0400 (EDT) Received: from web6 ([10.202.2.216]) by compute5.internal (MEProxy); Thu, 13 Sep 2018 01:00:02 -0400 X-ME-Proxy: X-ME-Sender: Received: by mailuser.nyi.internal (Postfix, from userid 99) id 79C8A413F; Thu, 13 Sep 2018 01:00:01 -0400 (EDT) Message-Id: <1536814801.4117299.1506445672.3D775C79@webmail.messagingengine.com> From: Brad Davis To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" X-Mailer: MessagingEngine.com Webmail Interface - ajax-1234af23 Subject: Re: svn commit: r338621 - in head: etc etc/pam.d lib/libpam lib/libpam/pam.d Date: Wed, 12 Sep 2018 23:00:01 -0600 In-Reply-To: <201809130408.w8D48m3s031573@repo.freebsd.org> References: <201809130408.w8D48m3s031573@repo.freebsd.org> X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2018 05:00:03 -0000 On Wed, Sep 12, 2018, at 10:08 PM, Brad Davis wrote: > Author: brd > Date: Thu Sep 13 04:08:48 2018 > New Revision: 338621 > URL: https://svnweb.freebsd.org/changeset/base/338621 > > Log: > Move all pam related config to lib/libpam/ > > Approved by: re (rgrimes), will (mentor), des > Differential Revision: https://reviews.freebsd.org/D17122 > > Added: > head/lib/libpam/pam.d/ > - copied from r338620, head/etc/pam.d/ > Deleted: > head/etc/pam.d/ > Modified: > head/etc/Makefile > head/lib/libpam/Makefile > head/lib/libpam/pam.d/Makefile > > Modified: head/etc/Makefile > ============================================================================== > --- head/etc/Makefile Wed Sep 12 19:41:16 2018 (r338620) > +++ head/etc/Makefile Thu Sep 13 04:08:48 2018 (r338621) > @@ -121,7 +121,6 @@ distribution: > ${_+_}cd ${.CURDIR}/mtree; ${MAKE} install > ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap > ${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt > - ${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install > .if ${MK_UNBOUND} != "no" > if [ ! -e ${DESTDIR}/etc/unbound ]; then \ > ${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \ > > Modified: head/lib/libpam/Makefile > ============================================================================== > --- head/lib/libpam/Makefile Wed Sep 12 19:41:16 2018 (r338620) > +++ head/lib/libpam/Makefile Thu Sep 13 04:08:48 2018 (r338621) > @@ -25,7 +25,7 @@ > # $FreeBSD$ > > # The modules link in libpam. They build the static modules as well. > -SUBDIR+= libpam modules > +SUBDIR+= libpam modules pam.d > SUBDIR_DEPEND_modules= libpam > SUBDIR+= static_libpam > SUBDIR_DEPEND_static_libpam= modules > > Modified: head/lib/libpam/pam.d/Makefile > ============================================================================== > --- head/etc/pam.d/Makefile Wed Sep 12 19:41:16 2018 (r338620) > +++ head/lib/libpam/pam.d/Makefile Thu Sep 13 04:08:48 2018 (r338621) > @@ -4,9 +4,8 @@ > > NO_OBJ= > > -FILESGROUPS= FILES > - > -FILES= README \ > +CONFGROUPS= CONFS > +CONFS= README \ > cron \ > imap \ > login \ > @@ -15,34 +14,26 @@ FILES= README \ > sshd su system \ > xdm > > -FILESDIR= /etc/pam.d > -FILESMODE= 644 > +CONFDIR= /etc/pam.d > +CONFSMODE_README= 444 > > .if ${MK_AT} != "no" > -FILESGROUPS+= AT > +CONFGROUPS+= AT > AT+= atrun > ATPACKAGE+= at > -ATDIR= ${FILESDIR} > -ATMODE= ${FILESMODE} > .endif > > .if ${MK_FTP} != "no" > -FILESGROUPS+= FTP > +CONFGROUPS+= FTP > FTP+= ftpd > FTPPACKAGE+= ftp > -FTPDIR= ${FILESDIR} > -FTPMODE= ${FILESMODE} > LINKS= ${FILESDIR}/ftpd ${FILESDIR}/ftp ^^^ this is broken durning install, I have a patch out to re@. Sorry for the breakage. Regards, Brad Davis