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

2015-10-12 Thread Slawa Olhovchenkov 
On Mon, Oct 12, 2015 at 03:28:58AM -0700, Peter Wemm wrote:

> On Saturday, October 10, 2015 04:44:23 PM Baptiste Daroussin wrote:
> > On Fri, Oct 09, 2015 at 08:15:57PM -0700, Adrian Chadd wrote:
> > > 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.co
> > > nf: chown/chgrp: Operation not permitted
> > > 21:03 <@adrian> *** Error code 71
> > 
> > Fixed in r289115
> > 
> > Bapt
> 
> You've broken etcupdate with this, and also the freebsd cluster.
> 
> # etcupdate status
> Warnings:
>   Non-empty directory remains: /etc/dma
> 
> You also made it delete ppp.conf:
>   D /etc/ppp/ppp.conf
>   D /etc/ppp
> 
> Deleting people's config files is not good.

About etcupdate:

# ls -l /var/db/etcupdate/current
total 17
-r--r--r--   1 root  wheel  6197 Aug 27 10:20 COPYRIGHT
drwxr-xr-x   2 root  wheel 3 Aug 27 10:20 boot
drwxr-xr-x  17 root  wheel89 Aug 27 10:20 etc
drwxr-xr-x   2 root  wheel 6 Aug 27 10:20 root
lrwxr-xr-x   1 root  wheel11 Dec  8  2014 sys -> usr/src/sys
drwxr-xr-x   3 root  wheel 3 Dec  8  2014 usr
drwxr-xr-x   3 root  wheel 3 Dec  8  2014 var

I think symlink 'sys' is  unnecessary.

As `usr/share` too:

# ls -l /var/db/etcupdate/current/usr/share
total 5
drwxr-xr-x  4 root  wheel  5 Dec  8  2014 man
drwxr-xr-x  2 root  wheel  4 Dec  8  2014 nls
drwxr-xr-x  3 root  wheel  3 Dec  8  2014 openssl



___
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"

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

2015-10-12 Thread Peter Wemm 
On Saturday, October 10, 2015 04:44:23 PM Baptiste Daroussin wrote:
> On Fri, Oct 09, 2015 at 08:15:57PM -0700, Adrian Chadd wrote:
> > 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.co
> > nf: chown/chgrp: Operation not permitted
> > 21:03 <@adrian> *** Error code 71
> 
> Fixed in r289115
> 
> Bapt

You've broken etcupdate with this, and also the freebsd cluster.

# etcupdate status
Warnings:
  Non-empty directory remains: /etc/dma

You also made it delete ppp.conf:
  D /etc/ppp/ppp.conf
  D /etc/ppp

Deleting people's config files is not good.

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

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

2015-10-12 Thread Baptiste Daroussin 
On Mon, Oct 12, 2015 at 02:24:52PM +0200, Baptiste Daroussin wrote:
> On Mon, Oct 12, 2015 at 02:02:39PM +0200, Baptiste Daroussin wrote:
> > On Mon, Oct 12, 2015 at 03:28:58AM -0700, Peter Wemm wrote:
> > > On Saturday, October 10, 2015 04:44:23 PM Baptiste Daroussin wrote:
> > > > On Fri, Oct 09, 2015 at 08:15:57PM -0700, Adrian Chadd wrote:
> > > > > 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.co
> > > > > nf: chown/chgrp: Operation not permitted
> > > > > 21:03 <@adrian> *** Error code 71
> > > > 
> > > > Fixed in r289115
> > > > 
> > > > Bapt
> > > 
> > > You've broken etcupdate with this, and also the freebsd cluster.
> > > 
> > > # etcupdate status
> > > Warnings:
> > >   Non-empty directory remains: /etc/dma
> > > 
> > > You also made it delete ppp.conf:
> > >   D /etc/ppp/ppp.conf
> > >   D /etc/ppp
> > > 
> > > Deleting people's config files is not good.
> > 
> > Hu, make installconfig is hooked to make distribution, etcupdate is calling 
> > make
> > distribution to retrive the list of configurations files so it should get 
> > the
> > config for ppp.
> > 
> > Let me look into the etcupdate to see what is wrong with it.
> > 
> > Best regards,
> > Bapt
> 
> 
> 
> After checking I can confirm that etcupdate properly get the config:
> 
> etcupdate build something.tar
> tar tvf something.tar  | grep ppp.conf
> -rw---  0 root   wheel1144 Oct 12 14:23 ./etc/ppp/ppp.conf
> 
> 
> Am I missing something?

I compared the tarball from before and after my change and there is no
differences.

I Compared: r289000 and r289183

Bapt


signature.asc
Description: PGP signature

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

2015-10-12 Thread Baptiste Daroussin 
On Mon, Oct 12, 2015 at 03:28:58AM -0700, Peter Wemm wrote:
> On Saturday, October 10, 2015 04:44:23 PM Baptiste Daroussin wrote:
> > On Fri, Oct 09, 2015 at 08:15:57PM -0700, Adrian Chadd wrote:
> > > 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.co
> > > nf: chown/chgrp: Operation not permitted
> > > 21:03 <@adrian> *** Error code 71
> > 
> > Fixed in r289115
> > 
> > Bapt
> 
> You've broken etcupdate with this, and also the freebsd cluster.
> 
> # etcupdate status
> Warnings:
>   Non-empty directory remains: /etc/dma
> 
> You also made it delete ppp.conf:
>   D /etc/ppp/ppp.conf
>   D /etc/ppp
> 
> Deleting people's config files is not good.

Hu, make installconfig is hooked to make distribution, etcupdate is calling make
distribution to retrive the list of configurations files so it should get the
config for ppp.

Let me look into the etcupdate to see what is wrong with it.

Best regards,
Bapt


signature.asc
Description: PGP signature

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

2015-10-12 Thread Baptiste Daroussin 
On Mon, Oct 12, 2015 at 02:02:39PM +0200, Baptiste Daroussin wrote:
> On Mon, Oct 12, 2015 at 03:28:58AM -0700, Peter Wemm wrote:
> > On Saturday, October 10, 2015 04:44:23 PM Baptiste Daroussin wrote:
> > > On Fri, Oct 09, 2015 at 08:15:57PM -0700, Adrian Chadd wrote:
> > > > 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.co
> > > > nf: chown/chgrp: Operation not permitted
> > > > 21:03 <@adrian> *** Error code 71
> > > 
> > > Fixed in r289115
> > > 
> > > Bapt
> > 
> > You've broken etcupdate with this, and also the freebsd cluster.
> > 
> > # etcupdate status
> > Warnings:
> >   Non-empty directory remains: /etc/dma
> > 
> > You also made it delete ppp.conf:
> >   D /etc/ppp/ppp.conf
> >   D /etc/ppp
> > 
> > Deleting people's config files is not good.
> 
> Hu, make installconfig is hooked to make distribution, etcupdate is calling 
> make
> distribution to retrive the list of configurations files so it should get the
> config for ppp.
> 
> Let me look into the etcupdate to see what is wrong with it.
> 
> Best regards,
> Bapt



After checking I can confirm that etcupdate properly get the config:

etcupdate build something.tar
tar tvf something.tar  | grep ppp.conf
-rw---  0 root   wheel1144 Oct 12 14:23 ./etc/ppp/ppp.conf


Am I missing something?

Best regards,
Bapt


signature.asc
Description: PGP signature

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

2015-10-10 Thread Baptiste Daroussin 
On Fri, Oct 09, 2015 at 08:15:57PM -0700, Adrian Chadd wrote:
> 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
> 
Fixed in r289115

Bapt


signature.asc
Description: PGP signature

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

2015-10-09 Thread Baptiste Daroussin 
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 

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 

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)
+++

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

2015-10-09 Thread Adrian Chadd 
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  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 
>
> 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"' \
> -