Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Oct 2015 20:15:57 -0700
From:      Adrian Chadd <adrian.chadd@gmail.com>
To:        Baptiste Daroussin <bapt@freebsd.org>
Cc:        "src-committers@freebsd.org" <src-committers@freebsd.org>,  "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,  "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
Subject:   Re: svn commit: r289087 - in head: etc etc/dma libexec libexec/dma libexec/dma-mbox-create libexec/dma/dma libexec/dma/dma-mbox-create share/examples share/examples/dma
Message-ID:  <CAJ-VmomPBeGjEYWJgUJ-E=eDkdQKV=0sA%2BvMSyZuyEir-CmhfA@mail.gmail.com>
In-Reply-To: <201510092209.t99M9iPx025401@repo.freebsd.org>
References:  <201510092209.t99M9iPx025401@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
I think this broke being able to do installworld as non-root

21:03 <@adrian> ===> libexec/dma/dmagent (installconfig)
21:03 <@adrian> install:
/home/adrian/work/freebsd/head-embedded/src/../root/mips_ap/etc/dma/dma.conf:
chown/chgrp: Operation not permitted
21:03 <@adrian> *** Error code 71



-a


On 9 October 2015 at 15:09, Baptiste Daroussin <bapt@freebsd.org> wrote:
> Author: bapt
> Date: Fri Oct  9 22:09:44 2015
> New Revision: 289087
> URL: https://svnweb.freebsd.org/changeset/base/289087
>
> Log:
>   Move all the dma(8) components into one single directory
>
>   Simplifying maintainance and options (only one place to deal with MK_DMAGENT)
>
>   This also makes packaging base less intrusive by getting a single point where
>   to add tags.
>
> Added:
>   head/libexec/dma/Makefile.inc   (contents, props changed)
>   head/libexec/dma/dma/
>   head/libexec/dma/dma-mbox-create/
>      - copied from r289057, head/libexec/dma-mbox-create/
>   head/libexec/dma/dma/Makefile
>      - copied, changed from r289057, head/libexec/dma/Makefile
>   head/libexec/dma/dma/dma.conf
>      - copied unchanged from r289057, head/etc/dma/dma.conf
>   head/libexec/dma/dma/mailer.conf
>      - copied unchanged from r289057, head/share/examples/dma/mailer.conf
> Deleted:
>   head/etc/dma/
>   head/libexec/dma-mbox-create/
>   head/libexec/dma/Makefile
>   head/share/examples/dma/
> Modified:
>   head/etc/Makefile
>   head/libexec/Makefile
>   head/libexec/dma/dma-mbox-create/Makefile
>   head/share/examples/Makefile
>
> Modified: head/etc/Makefile
> ==============================================================================
> --- head/etc/Makefile   Fri Oct  9 22:05:31 2015        (r289086)
> +++ head/etc/Makefile   Fri Oct  9 22:09:44 2015        (r289087)
> @@ -239,9 +239,6 @@ distribution:
>  .endif
>         ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
>         ${_+_}cd ${.CURDIR}/devd; ${MAKE} install
> -.if ${MK_DMAGENT} != "no"
> -       ${_+_}cd ${.CURDIR}/dma; ${MAKE} install
> -.endif
>         ${_+_}cd ${.CURDIR}/gss; ${MAKE} install
>         ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
>  .if ${MK_PKGBOOTSTRAP} != "no"
>
> Modified: head/libexec/Makefile
> ==============================================================================
> --- head/libexec/Makefile       Fri Oct  9 22:05:31 2015        (r289086)
> +++ head/libexec/Makefile       Fri Oct  9 22:09:44 2015        (r289087)
> @@ -8,7 +8,6 @@ SUBDIR= ${_atf} \
>         ${_casper} \
>         ${_comsat} \
>         ${_dma} \
> -       ${_dma-mbox-create} \
>         getty \
>         ${_mail.local} \
>         ${_mknetid} \
> @@ -56,7 +55,6 @@ _comsat=      comsat
>
>  .if ${MK_DMAGENT} != "no"
>  _dma=          dma
> -_dma-mbox-create=      dma-mbox-create
>  .endif
>
>  .if ${MK_NIS} != "no"
>
> Added: head/libexec/dma/Makefile.inc
> ==============================================================================
> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
> +++ head/libexec/dma/Makefile.inc       Fri Oct  9 22:09:44 2015        (r289087)
> @@ -0,0 +1,13 @@
> +# $FreeBSD$
> +
> +.sinclude "${.CURDIR}/../../Makefile.inc"
> +DMA_SOURCES=   ${.CURDIR}/../../../contrib/dma
> +.PATH: ${DMA_SOURCES}
> +
> +CFLAGS=        -I${DMA_SOURCES} \
> +       -DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME \
> +       -DCONF_PATH='"/etc/dma"' \
> +       -DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"' \
> +       -DDMA_ROOT_USER='"mailnull"' \
> +       -DDMA_GROUP='"mail"'
> +BINGRP=        mail
>
> Modified: head/libexec/dma/dma-mbox-create/Makefile
> ==============================================================================
> --- head/libexec/dma-mbox-create/Makefile       Thu Oct  8 21:52:20 2015        (r289057)
> +++ head/libexec/dma/dma-mbox-create/Makefile   Fri Oct  9 22:09:44 2015        (r289087)
> @@ -1,18 +1,10 @@
>  # $FreeBSD$
>
> -.PATH: ${.CURDIR}/../../contrib/dma
> -
> -CFLAGS=        -I${.CURDIR}/../../contrib/dma \
> -       -DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME \
> -       -DCONF_PATH='"/etc/dma"' \
> -       -DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"'
> -
>  MAN=
>
>  WARNS= 2
>
>  PROG=  dma-mbox-create
> -BINGRP=        mail
>  BINMODE=       4554
>
>  .include <bsd.prog.mk>
>
> Copied and modified: head/libexec/dma/dma/Makefile (from r289057, head/libexec/dma/Makefile)
> ==============================================================================
> --- head/libexec/dma/Makefile   Thu Oct  8 21:52:20 2015        (r289057, copy source)
> +++ head/libexec/dma/dma/Makefile       Fri Oct  9 22:09:44 2015        (r289087)
> @@ -1,13 +1,5 @@
>  # $FreeBSD$
>
> -.PATH: ${.CURDIR}/../../contrib/dma
> -
> -CFLAGS=        -I${.CURDIR}/../../contrib/dma \
> -       -DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME \
> -       -DCONF_PATH='"/etc/dma"' \
> -       -DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"' \
> -       -DDMA_ROOT_USER='"mailnull"' \
> -       -DDMA_GROUP='"mail"'
>  LIBADD=        ssl crypto
>
>  PROG=  dma
> @@ -24,10 +16,13 @@ SRCS=       aliases_parse.y \
>         spool.c \
>         util.c
>  MAN8=  dma.8
> +CONFS= dma.conf
> +CONFSDIR=      ${ETCDIR}/dma
>  YFLAGS+=       -i
>  CLEANFILES=    aliases_parse.i
> +FILES= mailer.conf
> +FILESDIR=      ${SHAREDIR}/examples/dma
>
> -BINGRP=        mail
>  BINMODE=       2555
>
>  .include <bsd.compiler.mk>
>
> Copied: head/libexec/dma/dma/dma.conf (from r289057, head/etc/dma/dma.conf)
> ==============================================================================
> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
> +++ head/libexec/dma/dma/dma.conf       Fri Oct  9 22:09:44 2015        (r289087, copy of r289057, head/etc/dma/dma.conf)
> @@ -0,0 +1,64 @@
> +# $FreeBSD$
> +#
> +# Your smarthost (also called relayhost).  Leave blank if you don't want
> +# smarthost support.
> +#SMARTHOST
> +
> +# Use this SMTP port.  Most users will be fine with the default (25)
> +#PORT 25
> +
> +# Path to your alias file.  Just stay with the default.
> +#ALIASES /etc/aliases
> +
> +# Path to your spooldir.  Just stay with the default.
> +#SPOOLDIR /var/spool/dma
> +
> +# SMTP authentication
> +#AUTHPATH /etc/dma/auth.conf
> +
> +# Uncomment if yout want TLS/SSL support
> +#SECURETRANSFER
> +
> +# Uncomment if you want STARTTLS support (only used in combination with
> +# SECURETRANSFER)
> +#STARTTLS
> +
> +# Uncomment if you have specified STARTTLS above and it should be allowed
> +# to fail ("opportunistic TLS", use an encrypted connection when available
> +# but allow an unencrypted one to servers that do not support it)
> +#OPPORTUNISTIC_TLS
> +
> +# Path to your local SSL certificate
> +#CERTFILE
> +
> +# If you want to use plain text SMTP login without using encryption, change
> +# the SECURE entry below to INSECURE.  Otherwise plain login will only work
> +# over a secure connection.  Use this option with caution.
> +#SECURE
> +
> +# Uncomment if you want to defer your mails.  This is useful if you are
> +# behind a dialup line.  You have to submit your mails manually with dma -q
> +#DEFER
> +
> +# Uncomment if you want the bounce message to include the complete original
> +# message, not just the headers.
> +#FULLBOUNCE
> +
> +# The internet hostname dma uses to identify the host.
> +# If not set or empty, the result of gethostname(2) is used.
> +# If MAILNAME is an absolute path to a file, the first line of this file
> +# will be used as the hostname.
> +#MAILNAME mail.example.net
> +
> +# Masquerade envelope from addresses with this address/hostname.
> +# Use this if mails are not accepted by destination mail servers because
> +# your sender domain is invalid.
> +# By default, MASQUERADE is not set.
> +# Format: MASQUERADE [user@][host]
> +# Examples:
> +# MASQUERADE john@  on host "hamlet" will send all mails as john@hamlet
> +# MASQUERADE percolator  will send mails as $username@percolator, e.g. fish@percolator
> +# MASQUERADE herb@ert  will send all mails as herb@ert
> +
> +# Directly forward the mail to the SMARTHOST bypassing aliases and local delivery
> +#NULLCLIENT
>
> Copied: head/libexec/dma/dma/mailer.conf (from r289057, head/share/examples/dma/mailer.conf)
> ==============================================================================
> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
> +++ head/libexec/dma/dma/mailer.conf    Fri Oct  9 22:09:44 2015        (r289087, copy of r289057, head/share/examples/dma/mailer.conf)
> @@ -0,0 +1,5 @@
> +# $FreeBSD$
> +
> +sendmail  /usr/libexec/dma
> +send-mail /usr/libexec/dma
> +mailq     /usr/libexec/dma
>
> Modified: head/share/examples/Makefile
> ==============================================================================
> --- head/share/examples/Makefile        Fri Oct  9 22:05:31 2015        (r289086)
> +++ head/share/examples/Makefile        Fri Oct  9 22:09:44 2015        (r289087)
> @@ -255,9 +255,6 @@ SUBDIR+=ipfilter
>  .if ${MK_PF} != "no"
>  SUBDIR+=pf
>  .endif
> -.if ${MK_DMAGENT} != "no"
> -SUBDIR+=dma
> -.endif
>  .endif
>
>  .if ${MK_TESTS} != "no"
>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ-VmomPBeGjEYWJgUJ-E=eDkdQKV=0sA%2BvMSyZuyEir-CmhfA>