imported freebsd49

kame · Nov 5, 2003 · cf6cf36 · cf6cf36
1 parent 8a4fcd6
commit cf6cf36
Show file tree

Hide file tree

Showing 10 changed files with 394 additions and 89 deletions.
diff --git a/freebsd4/etc/mtree/BSD.local.dist b/freebsd4/etc/mtree/BSD.local.dist
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.55.2.19 2002/08/17 19:11:15 ache Exp $
+# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.55.2.22 2003/08/21 17:34:43 mtm Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -218,6 +218,54 @@
         ..
         mann
         ..
+        ru.KOI8-R
+/set uname=man
+            cat1
+            ..
+            cat2
+            ..
+            cat3
+            ..
+            cat4
+            ..
+            cat5
+            ..
+            cat6
+            ..
+            cat7
+            ..
+            cat8
+            ..
+            cat9
+            ..
+            catl
+            ..
+            catn
+            ..
+/set uname=root
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+            manl
+            ..
+            mann
+            ..
+        ..
     ..
     sbin
     ..
@@ -249,6 +297,8 @@
             ..
             af_ZA.ISO8859-15
             ..
+            am_ET.UTF-8
+            ..
             bg_BG.CP1251
             ..
             cs_CZ.ISO8859-2
@@ -383,6 +433,8 @@
             ..
             ro_RO.ISO8859-2
             ..
+            ru_RU.CP1251
+            ..
             ru_RU.CP866
             ..
             ru_RU.ISO8859-5

diff --git a/freebsd4/etc/mtree/BSD.usr.dist b/freebsd4/etc/mtree/BSD.usr.dist
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.188.2.40 2003/02/14 22:38:14 nectar Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.188.2.44 2003/08/21 17:34:43 mtm Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -445,6 +445,8 @@
             ..
             af_ZA.ISO8859-15
             ..
+            am_ET.UTF-8
+            ..
             bg_BG.CP1251
             ..
             cs_CZ.ISO8859-2
@@ -581,6 +583,8 @@
             ..
             ro_RO.ISO8859-2
             ..
+            ru_RU.CP1251
+            ..
             ru_RU.CP866
             ..
             ru_RU.ISO8859-5
@@ -638,8 +642,6 @@
                 i386
                 ..
             ..
-            catn
-            ..
             en.ISO8859-1    uname=root
                 cat1
                 ..
@@ -671,8 +673,6 @@
                     i386
                     ..
                 ..
-                catn
-                ..
             ..
             ja              uname=root
                 cat1
@@ -693,8 +693,6 @@
                 ..
                 cat9
                 ..
-                catn
-                ..
 /set uname=root
                 man1
                 ..
@@ -714,8 +712,6 @@
                 ..
                 man9
                 ..
-                mann
-                ..
             ..
             man1
             ..
@@ -747,8 +743,6 @@
                 i386
                 ..
             ..
-            mann
-            ..
         ..
         me
         ..
@@ -767,6 +761,8 @@
             ..
             af_ZA.ISO8859-15
             ..
+            am_ET.UTF-8
+            ..
             bg_BG.CP1251
             ..
             cs_CZ.ISO8859-2
@@ -901,6 +897,8 @@
             ..
             ro_RO.ISO8859-2
             ..
+            ru_RU.CP1251
+            ..
             ru_RU.CP866
             ..
             ru_RU.ISO8859-5

diff --git a/freebsd4/etc/rc.network6 b/freebsd4/etc/rc.network6
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.network6,v 1.5.2.23 2002/07/24 18:25:42 ume Exp $
+# $FreeBSD: src/etc/rc.network6,v 1.5.2.24 2003/08/15 09:19:01 ume Exp $
 #
 
 # Note that almost all of the user-configurable behavior is not in this
@@ -319,7 +319,7 @@ network6_interface_setup() {
 		sysctl net.inet6.ip6.accept_rtadv=1
 		set ${rtsol_interfaces}
 		ifconfig $1 up
-		rtsol $1
+		rtsol ${rtsol_flags} $1
 	fi
 
 	for i in $interfaces; do

diff --git a/freebsd4/libexec/tftpd/tftpd.8 b/freebsd4/libexec/tftpd/tftpd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tftpd.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/libexec/tftpd/tftpd.8,v 1.6.2.5 2001/08/16 10:44:21 ru Exp $
+.\" $FreeBSD: src/libexec/tftpd/tftpd.8,v 1.6.2.6 2003/04/06 19:42:56 dwmalone Exp $
 .\"
 .Dd September 14, 2000
 .Dt TFTPD 8
@@ -45,8 +45,9 @@
 .Op Fl u Ar user
 .Op Ar directory ...
 .Sh DESCRIPTION
-.Nm Tftpd
-is a server which supports the
+The
+.Nm
+utility is a server which supports the
 Internet Trivial File Transfer
 Protocol
 .Pq Tn RFC 1350 .
@@ -177,7 +178,7 @@ The user must be specified by name, not a numeric UID.
 .Sh HISTORY
 The
 .Nm
-command appeared in
+utility appeared in
 .Bx 4.2 ;
 the
 .Fl s