src - FreeBSD source tree

diff options


context:
space:
mode:

author	Alan Somers <asomers@FreeBSD.org>	2019-06-20 15:56:08 +0000
committer	Alan Somers <asomers@FreeBSD.org>	2019-06-20 15:56:08 +0000
commit	e532a99901e26d3961f8f5c0e4969fce86f09456 (patch)
tree	9f1f766c1938ed162a3e5e3d0995132f43da7ea2 /etc
parent	84879e46c2bea842c3ad7b1b8b26aeb81946f5a8 (diff)
parent	8bd416a216a817cafd1af55e3d7694de327b05a5 (diff)
download	src-e532a99901e26d3961f8f5c0e4969fce86f09456.tar.gz src-e532a99901e26d3961f8f5c0e4969fce86f09456.zip

MFHead @349234

Sponsored by: The FreeBSD Foundation

Notes

Notes: svn path=/projects/fuse2/; revision=349236

Diffstat (limited to 'etc')

-rw-r--r--

etc/Makefile

-rw-r--r--

etc/mtree/BSD.debug.dist

-rw-r--r--

etc/mtree/BSD.include.dist

-rw-r--r--

etc/mtree/BSD.tests.dist

-rw-r--r--

etc/mtree/BSD.usr.dist

-rw-r--r--

etc/mtree/BSD.var.dist

-rw-r--r--

etc/sendmail/Makefile

7 files changed, 35 insertions, 25 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 7ee9eca7eb18..e2cac7446e1c 100644
--- a/etc/Makefile
+++ b/etc/Makefile

@@ -59,7 +59,8 @@ distribution:

${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt

.if ${MK_UNBOUND} != "no"

if [ ! -e ${DESTDIR}/etc/unbound ]; then \

- ${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \

+ ${INSTALL_SYMLINK} -T "package=unbound" \

+ ../var/unbound ${DESTDIR}/etc/unbound; \

.endif

.if ${MK_SENDMAIL} != "no"

@@ -68,26 +69,29 @@ distribution:

.if ${MK_KERBEROS} != "no"

cd ${.CURDIR}/root; \

${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \

+ -T "package=runtime" \

dot.k5login ${DESTDIR}/root/.k5login;

.endif

.if ${MK_MAIL} != "no"

cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \

- ${ETCMAIL} ${DESTDIR}/etc/mail

+ -T "package=runtime" ${ETCMAIL} ${DESTDIR}/etc/mail

if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \

! -f ${DESTDIR}/etc/aliases ]; then \

- ${INSTALL_SYMLINK} mail/aliases ${DESTDIR}/etc/aliases; \

+ ${INSTALL_SYMLINK} -T "package=runtime" \

+ mail/aliases ${DESTDIR}/etc/aliases; \

.endif

.if ${MK_LOCATE} != "no"

- ${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \

- ${DESTDIR}/var/db/locate.database

+ ${INSTALL} -o nobody -g ${BINGRP} -m 644 -T "package=runtime"\

+ /dev/null ${DESTDIR}/var/db/locate.database

.endif

cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \

- ${FREEBSD} ${DESTDIR}/

+ -T "package=runtime" ${FREEBSD} ${DESTDIR}/

.if ${MK_BOOT} != "no"

.if exists(${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints)

${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \

+ -T "package=runtime" \

${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints \

${DESTDIR}/boot/device.hints

.endif

diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index d7bf660d3011..24803568396d 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist

@@ -31,7 +31,7 @@

lib

clang

- 8.0.0

+ 8.0.1

lib

freebsd

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 088eb80766d5..b0e305558f1a 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist

@@ -152,6 +152,8 @@

ppbus

+ pwm

+ ..

smbus

speaker

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index b3c059cd52df..3cc5d3908952 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist

@@ -722,6 +722,8 @@

+ devrandom

+ ..

dtrace

fifo

diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index c4c78368436f..0aac2f915fa1 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist

@@ -37,7 +37,7 @@

aout

clang

- 8.0.0

+ 8.0.1

include

sanitizer

diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 3b694908f00c..8fefae055046 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist

@@ -3,7 +3,7 @@

# Please see the file src/etc/mtree/README before making changes to this file.

-/set type=dir uname=root gname=wheel mode=0755

+/set type=dir uname=root gname=wheel mode=0755 tags=package=runtime

account

@@ -32,7 +32,7 @@

crash

- cron tags=package=runtime

+ cron

tabs mode=0700

@@ -59,21 +59,21 @@

- empty mode=0555 flags=schg tags=package=runtime

+ empty mode=0555 flags=schg

games gname=games mode=0775

heimdal mode=0700

- log tags=package=runtime

+ log

- mail gname=mail mode=0775 tags=package=runtime

+ mail gname=mail mode=0775

msgs uname=daemon

preserve

- run tags=package=runtime

+ run

dhclient

ppp gname=network mode=0770

@@ -84,14 +84,16 @@

rwho gname=daemon mode=0775

spool

- dma uname=root gname=mail mode=0770

+ clientmqueue uname=smmsp gname=smmsp mode=0770 tags=package=sendmail

+ ..

+ dma uname=root gname=mail mode=0770 tags=package=dma

lock uname=uucp gname=dialer mode=0775

/set gname=daemon

lpd

- mqueue

+ mqueue tags=package=sendmail

opielocks mode=0700

@@ -101,7 +103,7 @@

/set gname=wheel

- tmp mode=01777 tags=package=runtime

+ tmp mode=01777

vi.recover mode=01777

diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile
index 2692d55fdc0a..82260b7af398 100644
--- a/etc/sendmail/Makefile
+++ b/etc/sendmail/Makefile

@@ -64,29 +64,29 @@ ${mc:T:R}.cf: ${mc}

all: ${ALL}

distribution:

- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \

+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "package=sendmail" \

${.CURDIR}/freebsd.mc freebsd.cf ${DESTDIR}/etc/mail

- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \

+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 -T "package=sendmail" \

${.CURDIR}/freebsd.submit.mc freebsd.submit.cf ${DESTDIR}/etc/mail

- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \

+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 -T "package=sendmail" \

${SMDIR}/helpfile ${DESTDIR}/etc/mail

.if defined(INSTALL_CF)

- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \

+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "package=sendmail" \

${INSTALL_CF} ${DEST_CF}

.else

- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \

+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "package=sendmail" \

freebsd.cf ${DEST_CF}

.endif

.if defined(SENDMAIL_ADDITIONAL_CF)

- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \

+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "package=sendmail" \

${SENDMAIL_ADDITIONAL_CF} ${DESTDIR}/etc/mail

.endif

.if !defined(SENDMAIL_SET_USER_ID)

.if defined(INSTALL_SUBMIT_CF)

- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \

+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 -T "package=sendmail" \

${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF}

.else

- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \

+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 -T "package=sendmail" \

freebsd.submit.cf ${DEST_SUBMIT_CF}

.endif