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
 .endif
 
 .if ${MK_TELNET} != "no"
-FILESGROUPS+=  TELNET
+CONFGROUPS+=   TELNET
 TELNET+=       telnetd
 TELNETPACKAGE+=        telnet
-TELNETDIR=     ${FILESDIR}
-TELNETMODE=    ${FILESMODE}
 .endif
-
-FILESMODE_README=      444
 
 .include <bsd.prog.mk>
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to