src - FreeBSD source tree

diff options


context:
space:
mode:

author	Dimitry Andric <dim@FreeBSD.org>	2014-12-18 18:44:22 +0000
committer	Dimitry Andric <dim@FreeBSD.org>	2014-12-18 18:44:22 +0000
commit	e65720e1ac61514414de80e262fc7111ead4dc4d (patch)
tree	9c2c63f2bf4893179b56fdd2a1648bfd800231e4 /etc
parent	580210532a470c2535767d68db9db32a345e0475 (diff)
parent	b9a2a3f1cf7320a3fb2df655be2060c234be0e9c (diff)
download	src-e65720e1ac61514414de80e262fc7111ead4dc4d.tar.gz src-e65720e1ac61514414de80e262fc7111ead4dc4d.zip

Merge ^/head r275759 through r275911.

Notes

Notes: svn path=/projects/clang350-import/; revision=275912

Diffstat (limited to 'etc')

-rw-r--r--

etc/Makefile

-rw-r--r--

etc/devd/usb.conf

-rw-r--r--

etc/mtree/BSD.include.dist

-rw-r--r--

etc/mtree/BSD.tests.dist

598

-rw-r--r--

etc/mtree/BSD.usr.dist

5 files changed, 372 insertions, 327 deletions

diff --git a/etc/Makefile b/etc/Makefile
index ff70cc12ad0b..76db02a0cb26 100644
--- a/etc/Makefile
+++ b/etc/Makefile

@@ -333,7 +333,7 @@ MTREES+= mtree/BSD.debug.dist /usr/lib

MTREES+= mtree/BSD.groff.dist /usr

.endif

.if ${MK_TESTS} != "no"

-MTREES+= mtree/BSD.tests.dist /usr

+MTREES+= mtree/BSD.tests.dist ${TESTSBASE}

.endif

.if ${MK_SENDMAIL} != "no"

MTREES+= mtree/BSD.sendmail.dist /

@@ -349,6 +349,7 @@ distrib-dirs: ${MTREES:N/*}

shift; \

d=${DESTDIR}$$1; \

shift; \

+ test -d $$d || mkdir -p $$d; \

${ECHO} ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} \

-f $$m -p $$d; \

${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \

@@ -362,6 +363,7 @@ distrib-dirs: ${MTREES:N/*}

test "$$d" == "/" && d=""; \

d=${DISTBASE}$$d; \

shift; \

+ test -d $$d || mkdir -p $$d; \

${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \

"sed s#^\.#.$$d# | ${METALOG.add}" ; \

${MTREE_CMD:N-W} -C -f $$m -K uname,gname | sed s#^\.#.$$d# | \

diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf
index 7828a8561cfe..9baa070cf840 100644
--- a/etc/devd/usb.conf
+++ b/etc/devd/usb.conf

@@ -1017,7 +1017,23 @@ nomatch 32 {

match "bus" "uhub[0-9]+";

match "mode" "host";

match "vendor" "0x056e";

- match "product" "(0x200c|0x4002|0x4005|0x400b|0x4010)";

+ match "product" "(0x200c|0x4002|0x4005)";

+ action "kldload -n if_aue";

+};

+nomatch 32 {

+ match "bus" "uhub[0-9]+";

+ match "mode" "host";

+ match "vendor" "0x056e";

+ match "product" "0x4008";

+ action "kldload -n if_urtwn";

+};

+nomatch 32 {

+ match "bus" "uhub[0-9]+";

+ match "mode" "host";

+ match "vendor" "0x056e";

+ match "product" "(0x400b|0x4010)";

action "kldload -n if_aue";

};

@@ -1177,7 +1193,7 @@ nomatch 32 {

match "bus" "uhub[0-9]+";

match "mode" "host";

match "vendor" "0x05c6";

- match "product" "(0x1000|0x6000|0x6613|0x9000|0x9204|0x9205)";

+ match "product" "(0x1000|0x6000|0x6500|0x6613|0x9000|0x9204|0x9205)";

action "kldload -n u3g";

};

@@ -2545,7 +2561,7 @@ nomatch 32 {

match "bus" "uhub[0-9]+";

match "mode" "host";

match "vendor" "0x0bda";

- match "product" "(0x8176|0x8176|0x8177|0x8178|0x8179|0x817a|0x817b|0x817c|0x817d|0x817e)";

+ match "product" "(0x8176|0x8176|0x8177|0x8178|0x8179|0x817a|0x817b|0x817c|0x817d|0x817e|0x817f)";

action "kldload -n if_urtwn";

};

@@ -3617,7 +3633,7 @@ nomatch 32 {

match "bus" "uhub[0-9]+";

match "mode" "host";

match "vendor" "0x12d1";

- match "product" "(0x1001|0x1003|0x1004|0x1401|0x1402|0x1403|0x1404|0x1405|0x1406|0x1407|0x1408|0x1409|0x140a|0x140b|0x140c|0x140d|0x140e|0x140f|0x1410|0x1411|0x1412|0x1413|0x1414|0x1415|0x1416|0x1417|0x1418|0x1419|0x141a|0x141b|0x141c|0x141d|0x141e|0x141f|0x1420|0x1421|0x1422|0x1423|0x1424|0x1425|0x1426|0x1427|0x1428|0x1429|0x142a|0x142b|0x142c|0x142d|0x142e|0x142f|0x1430|0x1431|0x1432|0x1433|0x1434|0x1435|0x1436|0x1437|0x1438|0x1439|0x143a|0x143b|0x143c|0x143d|0x143e|0x143f|0x1446|0x1464|0x1465|0x14ac|0x14c9|0x14d1|0x14fe|0x1505|0x1506|0x1520|0x1521)";

+ match "product" "(0x1001|0x1003|0x1004|0x1401|0x1402|0x1403|0x1404|0x1405|0x1406|0x1407|0x1408|0x1409|0x140a|0x140b|0x140c|0x140d|0x140e|0x140f|0x1410|0x1411|0x1412|0x1413|0x1414|0x1415|0x1416|0x1417|0x1418|0x1419|0x141a|0x141b|0x141c|0x141d|0x141e|0x141f|0x1420|0x1421|0x1422|0x1423|0x1424|0x1425|0x1426|0x1427|0x1428|0x1429|0x142a|0x142b|0x142c|0x142d|0x142e|0x142f|0x1430|0x1431|0x1432|0x1433|0x1434|0x1435|0x1436|0x1437|0x1438|0x1439|0x143a|0x143b|0x143c|0x143d|0x143e|0x143f|0x1446|0x1464|0x1465|0x14ac|0x14c9|0x14cf|0x14d1|0x14fe|0x1505|0x1506|0x1520|0x1521|0x1526)";

action "kldload -n u3g";

};

@@ -4489,7 +4505,15 @@ nomatch 32 {

match "bus" "uhub[0-9]+";

match "mode" "host";

match "vendor" "0x19d2";

- match "product" "(0x0001|0x0002|0x0003|0x0004|0x0005|0x0006|0x0007|0x0008|0x0009|0x000a|0x000b|0x000c|0x000d|0x000e|0x000f|0x0010|0x0011|0x0012|0x0013|0x0014|0x0015|0x0016|0x0017|0x0018|0x0019|0x0020|0x0021|0x0022|0x0023|0x0024|0x0025|0x0026|0x0027|0x0028|0x0029|0x0030|0x0031|0x0032|0x0033|0x0037|0x0039|0x0042|0x0043|0x0048|0x0049|0x0051|0x0052|0x0053|0x0054|0x0055|0x0057|0x0058|0x0059|0x0060|0x0061|0x0062|0x0063|0x0064|0x0066|0x0069|0x0070|0x0073|0x0076|0x0078|0x0082|0x0086|0x0117|0x1179|0x2000|0x2002|0x2003|0xfff1|0xfff5|0xfffe)";

+ match "product" "(0x0001|0x0002|0x0003|0x0004|0x0005|0x0006|0x0007|0x0008|0x0009|0x000a|0x000b|0x000c|0x000d|0x000e|0x000f|0x0010|0x0011|0x0012|0x0013|0x0014|0x0015|0x0016|0x0017|0x0018|0x0019|0x0020|0x0021|0x0022|0x0023|0x0024|0x0025|0x0026|0x0027|0x0028|0x0029|0x0030|0x0031|0x0032|0x0033|0x0037|0x0039|0x0042|0x0043|0x0048|0x0049|0x0051|0x0052|0x0053|0x0054|0x0055|0x0057|0x0058|0x0059|0x0060|0x0061|0x0062|0x0063|0x0064|0x0066|0x0069|0x0070|0x0073|0x0076|0x0078|0x0082|0x0086|0x0117|0x1179|0x1181|0x1514|0x1516|0x2000|0x2002|0x2003|0xffdd|0xffde|0xfff1|0xfff5|0xfffe)";

+ action "kldload -n u3g";

+};

+nomatch 32 {

+ match "bus" "uhub[0-9]+";

+ match "mode" "host";

+ match "vendor" "0x19f5";

+ match "product" "0x9909";

action "kldload -n u3g";

};

@@ -4609,7 +4633,7 @@ nomatch 32 {

match "bus" "uhub[0-9]+";

match "mode" "host";

match "vendor" "0x1cf1";

- match "product" "(0x0001|0x0004|0x0022)";

+ match "product" "(0x0001|0x0004|0x001c|0x0022)";

action "kldload -n uftdi";

};

@@ -4697,7 +4721,7 @@ nomatch 32 {

match "bus" "uhub[0-9]+";

match "mode" "host";

match "vendor" "0x2001";

- match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d|0x330f)";

+ match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d|0x330f|0x3310)";

action "kldload -n if_urtwn";

};

@@ -4897,7 +4921,23 @@ nomatch 32 {

match "bus" "uhub[0-9]+";

match "mode" "host";

match "vendor" "0x20f4";

- match "product" "(0x624d|0x648b)";

+ match "product" "0x624d";

+ action "kldload -n if_urtwn";

+};

+nomatch 32 {

+ match "bus" "uhub[0-9]+";

+ match "mode" "host";

+ match "vendor" "0x20f4";

+ match "product" "0x646b";

+ action "kldload -n if_rsu";

+};

+nomatch 32 {

+ match "bus" "uhub[0-9]+";

+ match "mode" "host";

+ match "vendor" "0x20f4";

+ match "product" "0x648b";

action "kldload -n if_urtwn";

};

@@ -5294,6 +5334,16 @@ nomatch 32 {

nomatch 32 {

match "bus" "uhub[0-9]+";

match "mode" "host";

+ match "vendor" "0x0830";

+ match "intclass" "0x02";

+ match "intsubclass" "0x02";

+ match "intprotocol" "0xff";

+ action "kldload -n if_urndis";

+};

+nomatch 32 {

+ match "bus" "uhub[0-9]+";

+ match "mode" "host";

match "vendor" "0x0a5c";

match "intclass" "0xff";

match "intsubclass" "0x01";

@@ -5305,6 +5355,16 @@ nomatch 32 {

match "bus" "uhub[0-9]+";

match "mode" "host";

match "vendor" "0x12d1";

+ match "intclass" "0x02";

+ match "intsubclass" "0x02";

+ match "intprotocol" "0xff";

+ action "kldload -n umodem";

+};

+nomatch 32 {

+ match "bus" "uhub[0-9]+";

+ match "mode" "host";

+ match "vendor" "0x12d1";

match "intclass" "0xff";

match "intsubclass" "0x02";

match "intprotocol" "0x16";

@@ -5352,15 +5412,6 @@ nomatch 32 {

nomatch 32 {

match "bus" "uhub[0-9]+";

match "mode" "host";

- match "intclass" "0x02";

- match "intsubclass" "0x02";

- match "intprotocol" "0xff";

- action "kldload -n umodem";

-};

-nomatch 32 {

- match "bus" "uhub[0-9]+";

- match "mode" "host";

match "intclass" "0x03";

match "intsubclass" "0x01";

match "intprotocol" "0x01";

@@ -5501,5 +5552,5 @@ nomatch 32 {

action "kldload -n umass";

};

-# 2643 USB entries processed

+# 2658 USB entries processed

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 0a4eada108d7..6cadb8fd70d3 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist

@@ -9,6 +9,10 @@

arpa

+ atf-c

+ ..

+ atf-c++

+ ..

bsm

bsnmp

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 5285fe3c3f2b..2708568bc785 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist

@@ -5,410 +5,392 @@

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

- include

- atf-c

+ bin

+ chown

- atf-c++

+ date

- ..

- share

- atf

+ mv

- doc

- atf

- ..

- pjdfstest

- ..

+ pax

- ..

- tests

- bin

- chown

+ pkill

+ ..

+ sh

+ builtins

- date

+ errors

- mv

+ execution

- pax

+ expansion

- pkill

+ parameters

- sh

- builtins

- ..

- errors

- ..

- execution

- ..

- expansion

- ..

- parameters

- ..

- parser

- ..

- set-e

- ..

+ parser

- sleep

- ..

- test

+ set-e

- cddl

- lib

- ..

- sbin

- ..

- usr.bin

- ..

- usr.sbin

- ..

+ sleep

+ ..

+ test

+ ..

+ cddl

+ lib

- etc

+ sbin

- games

+ usr.bin

- gnu

- lib

- ..

- usr.bin

- diff

- ..

+ usr.sbin

+ ..

+ etc

+ ..

+ games

+ ..

+ gnu

lib

- atf

- libatf-c

- detail

- ..

- libatf-c++

- detail

- ..

- test-programs

- ..

+ ..

+ usr.bin

+ diff

- libc

- c063

- ..

- db

- ..

- gen

- execve

- ..

- posix_spawn

- ..

+ ..

+ lib

+ atf

+ libatf-c

+ detail

- hash

- data

- ..

+ ..

+ libatf-c++

+ detail

- inet

+ ..

+ test-programs

+ ..

+ libc

+ c063

+ ..

+ db

+ ..

+ gen

+ execve

- locale

+ posix_spawn

- net

- getaddrinfo

- data

- ..

+ ..

+ hash

+ data

- regex

+ ..

+ inet

+ ..

+ locale

+ ..

+ net

+ getaddrinfo

data

- ssp

- ..

- stdio

- ..

- stdlib

- ..

- string

- ..

- sys

- ..

- time

- ..

- tls

- dso

- ..

- termios

- ..

- ttyio

+ ..

+ regex

+ data

- libcrypt

+ ssp

- libmp

+ stdio

- libnv

+ stdlib

- libpam

+ string

- libproc

+ sys

- librt

+ time

- libthr

- dlopen

+ tls

+ dso

- libutil

+ termios

- msun

+ ttyio

+ libcrypt

+ ..

+ libmp

+ ..

+ libnv

+ ..

+ libpam

+ ..

+ libproc

+ ..

+ librt

+ ..

+ libthr

+ dlopen

+ ..

+ libutil

+ ..

+ msun

+ ..

+ libexec

+ atf

+ atf-check

+ ..

+ atf-sh

+ ..

+ rtld-elf

+ ..

+ sbin

+ dhclient

+ ..

+ devd

+ ..

+ growfs

+ ..

+ mdconfig

+ ..

+ secure

+ lib

+ ..

libexec

- atf

- atf-check

+ ..

+ usr.bin

+ ..

+ usr.sbin

+ ..

+ share

+ examples

+ tests

+ atf

- atf-sh

+ plain

- rtld-elf

- ..

- sbin

- dhclient

+ ..

+ sys

+ kern

+ ..

+ netinet

+ ..

+ opencrypto

+ ..

+ pjdfstest

+ chflags

+ ..

+ chmod

- devd

+ chown

- growfs

+ ftruncate

- mdconfig

+ granular

- ..

- secure

- lib

+ link

- libexec

+ mkdir

- usr.bin

+ mkfifo

- usr.sbin

+ mknod

- ..

- share

- examples

- tests

- atf

- ..

- plain

- ..

+ open

- ..

- sys

- kern

+ rename

- netinet

+ rmdir

- opencrypto

+ symlink

- pjdfstest

- chflags

+ truncate

+ ..

+ unlink

+ ..

+ usr.bin

+ apply

+ ..

+ basename

+ ..

+ bmake

+ archives

+ fmt_44bsd

- chmod

+ fmt_44bsd_mod

- chown

+ fmt_oldbsd

- ftruncate

+ ..

+ basic

+ t0

- granular

+ t1

- link

+ t2

- mkdir

+ t3

- mkfifo

+ ..

+ execution

+ ellipsis

- mknod

+ empty

- open

+ joberr

- rename

+ plus

- rmdir

+ ..

+ shell

+ builtin

- symlink

+ meta

- truncate

+ path

- unlink

+ path_select

- ..

- usr.bin

- apply

- ..

- basename

- ..

- bmake

- archives

- fmt_44bsd

- ..

- fmt_44bsd_mod

- ..

- fmt_oldbsd

- ..

+ replace

+ ..

+ select

+ ..

+ suffixes

basic

- t0

- ..

- t1

- ..

- t2

- ..

- t3

- ..

- execution

- ellipsis

- ..

- empty

- ..

- joberr

- ..

- plus

- ..

+ src_wild1

- shell

- builtin

- ..

- meta

- ..

- path

- ..

- path_select

- ..

- replace

- ..

- select

- ..

+ src_wild2

- suffixes

- basic

- ..

- src_wild1

- ..

- src_wild2

- ..

+ ..

+ syntax

+ directive-t0

- syntax

- directive-t0

- ..

- enl

- ..

- funny-targets

- ..

- semi

- ..

+ enl

- sysmk

- t0

- 2

- 1

- ..

- mk

- ..

- t1

- 2

- 1

- ..

- mk

+ funny-targets

+ ..

+ semi

+ ..

+ sysmk

+ t0

+ 2

+ 1

- t2

- 2

- 1

- ..

- mk

- ..

+ mk

- variables

- modifier_M

+ t1

+ 2

+ 1

+ ..

- modifier_t

+ mk

- opt_V

+ ..

+ t2

+ 2

+ 1

+ ..

- t0

+ mk

- calendar

- ..

- cmp

- ..

- comm

- ..

- cut

- ..

- dirname

- ..

- file2c

- ..

- grep

- ..

- gzip

- ..

- join

- ..

- jot

- ..

- lastcomm

- ..

- m4

- ..

- mkimg

- ..

- ncal

- ..

- printf

- ..

- sed

- regress.multitest.out

+ variables

+ modifier_M

- ..

- timeout

- ..

- tr

- ..

- truncate

- ..

- units

- ..

- uudecode

- ..

- uuencode

- ..

- xargs

- ..

- yacc

+ modifier_t

+ ..

+ opt_V

+ ..

+ t0

- usr.sbin

- etcupdate

- ..

- newsyslog

- ..

- nmtree

- ..

- pw

+ calendar

+ ..

+ cmp

+ ..

+ comm

+ ..

+ cut

+ ..

+ dirname

+ ..

+ file2c

+ ..

+ grep

+ ..

+ gzip

+ ..

+ join

+ ..

+ jot

+ ..

+ lastcomm

+ ..

+ m4

+ ..

+ mkimg

+ ..

+ ncal

+ ..

+ printf

+ ..

+ sed

+ regress.multitest.out

- sa

+ ..

+ timeout

+ ..

+ tr

+ ..

+ truncate

+ ..

+ units

+ ..

+ uudecode

+ ..

+ uuencode

+ ..

+ xargs

+ ..

+ yacc

+ usr.sbin

+ etcupdate

+ ..

+ newsyslog

+ ..

+ nmtree

+ ..

+ pw

+ ..

+ sa

+ ..

# vim: set expandtab ts=4 sw=4:

diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 977cf754d451..c24d5c4e606b 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist

@@ -126,6 +126,8 @@

sbin

+ atf

+ ..

bsdconfig

media

@@ -169,6 +171,8 @@

doc

IPv6

+ atf

+ ..

atm

legal

@@ -189,6 +193,8 @@

papers

+ pjdfstest

+ ..

psd

01.cacm