From owner-svn-src-all@freebsd.org Wed Jun 1 20:13:25 2016 Return-Path: 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 13C3AB6131A; Wed, 1 Jun 2016 20:13:25 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id F1CD61D5C; Wed, 1 Jun 2016 20:13:24 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id EB6D01065; Wed, 1 Jun 2016 20:13:24 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id B961C1D349; Wed, 1 Jun 2016 20:13:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id wtWljMjPi-tI; Wed, 1 Jun 2016 20:13:22 +0000 (UTC) Subject: Re: svn commit: r301163 - in head: etc libexec/dma/dmagent DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 8C4EE1D342 To: Glen Barber , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201606012006.u51K6t0d012285@repo.freebsd.org> From: Bryan Drewery Organization: FreeBSD Message-ID: <0933c625-d329-6c4c-88ba-093ad955d475@FreeBSD.org> Date: Wed, 1 Jun 2016 13:13:20 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 MIME-Version: 1.0 In-Reply-To: <201606012006.u51K6t0d012285@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2016 20:13:25 -0000 On 6/1/16 1:06 PM, Glen Barber wrote: > Author: gjb > Date: Wed Jun 1 20:06:55 2016 > New Revision: 301163 > URL: https://svnweb.freebsd.org/changeset/base/301163 > > Log: > Implement a hack to re-enable installation of the dma.conf. > > The 'CONFS' entries in share/mk/bsd.confs.mk explicitly check > for the 'installconfig', but does not behave properly with the > 'distribute' target. > This just moves something out of installconfig, leaving it apparently still broken. Please revert this and r301137 and lets fix this properly. I'm pretty surprised by this. > This seems to be related to the previously-reported issues > with files within /etc in the past. > > Reported by: Ben Woods > Sponsored by: The FreeBSD Foundation > > Modified: > head/etc/Makefile > head/libexec/dma/dmagent/Makefile > > Modified: head/etc/Makefile > ============================================================================== > --- head/etc/Makefile Wed Jun 1 20:04:24 2016 (r301162) > +++ head/etc/Makefile Wed Jun 1 20:06:55 2016 (r301163) > @@ -309,6 +309,10 @@ distribution: > cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ > ${PPPCNF} ${DESTDIR}/etc/ppp > .endif > +.if ${MK_DMAGENT} != "no" > + cd ${.CURDIR}/../libexec/dma/dmagent; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ > + dma.conf ${DESTDIR}/etc/dma > +.endif > .if ${MK_MAIL} != "no" > cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ > ${ETCMAIL} ${DESTDIR}/etc/mail > > Modified: head/libexec/dma/dmagent/Makefile > ============================================================================== > --- head/libexec/dma/dmagent/Makefile Wed Jun 1 20:04:24 2016 (r301162) > +++ head/libexec/dma/dmagent/Makefile Wed Jun 1 20:06:55 2016 (r301163) > @@ -18,8 +18,6 @@ SRCS= aliases_parse.y \ > spool.c \ > util.c > MAN8= dma.8 > -CONFS= dma.conf > -CONFSDIR= ${CONFDIR}/dma > YFLAGS+= -i > CLEANFILES= aliases_parse.i > FILES= mailer.conf > -- Regards, Bryan Drewery