From owner-svn-src-all@freebsd.org  Wed Jun  1 16:45:09 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C914B61DE8;
 Wed,  1 Jun 2016 16:45:09 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1BB2A1759;
 Wed,  1 Jun 2016 16:45:09 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u51Gj8Ow036954;
 Wed, 1 Jun 2016 16:45:08 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u51Gj8RT036952;
 Wed, 1 Jun 2016 16:45:08 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201606011645.u51Gj8RT036952@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 1 Jun 2016 16:45:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r301137 - in head: etc etc/ppp usr.sbin/ppp
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jun 2016 16:45:09 -0000

Author: gjb
Date: Wed Jun  1 16:45:08 2016
New Revision: 301137
URL: https://svnweb.freebsd.org/changeset/base/301137

Log:
  Revert r289096:
  
  Files listed in 'CONFS' are not properly included in new
  installations (missing from base.txz), for reasons I still
  do not fully understand.
  
  This reverts the change excluding /etc/ppp/ppp.conf from
  a new installation.  /etc/dma/dma.conf is also affected,
  but requires a different solution, still being investigated.
  
  Reported by:	Ben Woods
  Sponsored by:	The FreeBSD Foundation

Added:
  head/etc/ppp/
     - copied from r289095, head/etc/ppp/
Deleted:
  head/usr.sbin/ppp/ppp.conf
Modified:
  head/etc/Makefile
  head/usr.sbin/ppp/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Wed Jun  1 16:12:26 2016	(r301136)
+++ head/etc/Makefile	Wed Jun  1 16:45:08 2016	(r301137)
@@ -305,6 +305,10 @@ distribution:
 .endif
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
+.if ${MK_PPP} != "no"
+	cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
+	    ${PPPCNF} ${DESTDIR}/etc/ppp
+.endif
 .if ${MK_MAIL} != "no"
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${ETCMAIL} ${DESTDIR}/etc/mail

Modified: head/usr.sbin/ppp/Makefile
==============================================================================
--- head/usr.sbin/ppp/Makefile	Wed Jun  1 16:12:26 2016	(r301136)
+++ head/usr.sbin/ppp/Makefile	Wed Jun  1 16:45:08 2016	(r301137)
@@ -21,9 +21,6 @@ PPP_NO_PAM=
 PPP_NO_RADIUS=
 PPP_NO_SUID=
 .endif
-CONFS=	ppp.conf
-CONFSDIR=	${CONFDIR}/ppp
-CONFSMODE=	600
 
 .if ${MK_ATM} == "no"
 PPP_NO_ATM=