Permalink
Browse files

Sync with netbsd-4.

  • Loading branch information...
1 parent 52c9cc9 commit e4728b81d8c92061a2e0dbf70b5efb0aa6f4e74e skrll committed Sep 15, 2008
Showing with 719 additions and 715 deletions.
  1. +6 −4 crypto/dist/heimdal/lib/krb5/crypto.c
  2. +16 −1 dist/ipf/ip_fil.c
  3. +12 −5 dist/ipf/lib/printnat.c
  4. +1 −1 dist/ipf/test/regress/n12
  5. +10 −4 dist/ipf/tools/ipnat_y.y
  6. +3 −3 distrib/notes/acorn32/prep.RISCOS
  7. +4 −4 distrib/notes/alpha/hardware
  8. +13 −13 distrib/notes/alpha/install
  9. +2 −6 distrib/notes/amiga/install
  10. +5 −5 distrib/notes/amiga/prep
  11. +2 −2 distrib/notes/amiga/upgrade
  12. +3 −3 distrib/notes/atari/xfer
  13. +2 −2 distrib/notes/cats/prep
  14. +6 −5 distrib/notes/common/contents
  15. +2 −1 distrib/notes/common/legal.common
  16. +3 −3 distrib/notes/common/macros
  17. +83 −89 distrib/notes/common/main
  18. +10 −10 distrib/notes/common/sysinst
  19. +5 −3 distrib/notes/common/upgrade
  20. +13 −13 distrib/notes/evbarm/install
  21. +30 −30 distrib/notes/evbarm/prep
  22. +5 −5 distrib/notes/evbppc/hardware
  23. +10 −10 distrib/notes/hp300/prep
  24. +11 −11 distrib/notes/hp700/prep
  25. +2 −2 distrib/notes/hpcmips/install
  26. +3 −187 distrib/notes/i386/hardware
  27. +2 −7 distrib/notes/macppc/hardware
  28. +80 −80 distrib/notes/macppc/install
  29. +41 −42 distrib/notes/macppc/prep.OPENFIRMWARE
  30. +2 −2 distrib/notes/mvme68k/hardware
  31. +35 −35 distrib/notes/mvme68k/install
  32. +11 −11 distrib/notes/mvme68k/prep
  33. +3 −3 distrib/notes/mvme68k/xfer
  34. +3 −3 distrib/notes/next68k/prep
  35. +2 −2 distrib/notes/next68k/xfer
  36. +2 −2 distrib/notes/sandpoint/install
  37. +2 −1 distrib/notes/sparc/hardware
  38. +6 −6 distrib/notes/sparc/install
  39. +14 −19 distrib/notes/sparc/prep
  40. +13 −13 distrib/notes/sparc64/install
  41. +17 −17 distrib/notes/sun2/install
  42. +17 −17 distrib/notes/sun3/install
  43. +2 −2 distrib/notes/vax/install
  44. +91 −1 doc/CHANGES-4.1
  45. +1 −1 regress/sys/kern/ipf/regress/n12
  46. +4 −4 regress/sys/kern/ipf/regress/n2
  47. +3 −3 regress/sys/kern/ipf/regress/n5
  48. +2 −2 regress/sys/kern/ipf/regress/ni1.nat
  49. +1 −1 regress/sys/kern/ipf/regress/ni2.nat
  50. +1 −1 regress/sys/kern/ipf/regress/ni4.nat
  51. +34 −2 sys/altq/altq_wfq.c
  52. +2 −1 sys/altq/altq_wfq.h
  53. +15 −1 sys/dist/ipf/netinet/ip_compat.h
  54. +7 −1 sys/dist/ipf/netinet/ip_fil.h
  55. +15 −4 sys/dist/ipf/netinet/ip_nat.c
  56. +4 −2 sys/dist/ipf/netinet/ip_nat.h
  57. +18 −4 sys/dist/ipf/netinet/ip_state.c
  58. +4 −2 usr.sbin/altq/altqd/altq.conf.5
  59. +3 −1 usr.sbin/altq/libaltq/qop_wfq.c
@@ -35,7 +35,7 @@
#include "krb5_locl.h"
__RCSID("$Heimdal: crypto.c,v 1.73.2.4 2004/03/06 16:38:00 lha Exp $"
- "$NetBSD: crypto.c,v 1.13 2004/04/02 14:59:48 lha Exp $");
+ "$NetBSD: crypto.c,v 1.13.12.1 2008/09/15 08:09:55 skrll Exp $");
#undef CRYPTO_DEBUG
#ifdef CRYPTO_DEBUG
@@ -3241,9 +3241,11 @@ seed_something(void)
if (RAND_file_name(seedfile, sizeof(seedfile))) {
fd = open(seedfile, O_RDONLY);
if (fd >= 0) {
- read(fd, buf, sizeof(buf));
- /* Use the full buffer anyway */
- RAND_add(buf, sizeof(buf), 0.0);
+ ssize_t ret;
+ ret = read(fd, buf, sizeof(buf));
+ if (ret > 0)
+ RAND_add(buf, sizeof(buf), 0.0);
+ close(fd);
} else
seedfile[0] = '\0';
} else
View
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil.c,v 1.7.4.1.2.2 2007/09/03 06:53:38 wrstuden Exp $ */
+/* $NetBSD: ip_fil.c,v 1.7.4.1.2.3 2008/09/15 08:09:55 skrll Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
@@ -813,3 +813,18 @@ int ipfsync()
{
return 0;
}
+
+
+u_32_t ipf_random()
+{
+ static int seeded = 0;
+
+ /*
+ * Choose a non-random seed so that "randomness" can be "tested."
+ */
+ if (seeded == 0) {
+ srand(0);
+ seeded = 1;
+ }
+ return rand();
+}
View
@@ -1,4 +1,4 @@
-/* $NetBSD: printnat.c,v 1.1.1.5.4.1.2.1 2007/09/03 06:54:32 wrstuden Exp $ */
+/* $NetBSD: printnat.c,v 1.1.1.5.4.1.2.2 2008/09/15 08:09:55 skrll Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
@@ -13,7 +13,7 @@
#if !defined(lint)
-static const char rcsid[] = "@(#)Id: printnat.c,v 1.22.2.13 2006/12/09 10:37:47 darrenr Exp";
+static const char rcsid[] = "@(#)Id: printnat.c,v 1.22.2.14 2007/09/06 16:40:11 darrenr Exp";
#endif
/*
@@ -136,6 +136,8 @@ int opts;
if (opts & OPT_DEBUG)
printf("\tpmax %u\n", np->in_pmax);
} else {
+ int protoprinted = 0;
+
if (!(np->in_flags & IPN_FILTER)) {
printf("%s/", inet_ntoa(np->in_in[0].in4));
bits = count4bits(np->in_inmsk);
@@ -172,6 +174,7 @@ int opts;
printf(" %.*s/", (int)sizeof(np->in_plabel),
np->in_plabel);
printproto(pr, np->in_p, NULL);
+ protoprinted = 1;
} else if (np->in_redir == NAT_MAPBLK) {
if ((np->in_pmin == 0) &&
(np->in_flags & IPN_AUTOPORTMAP))
@@ -187,6 +190,7 @@ int opts;
printf(" portmap ");
}
printproto(pr, np->in_p, np);
+ protoprinted = 1;
if (np->in_flags & IPN_AUTOPORTMAP) {
printf(" auto");
if (opts & OPT_DEBUG)
@@ -198,9 +202,6 @@ int opts;
printf(" %d:%d", ntohs(np->in_pmin),
ntohs(np->in_pmax));
}
- } else if (np->in_flags & IPN_TCPUDP || np->in_p) {
- putchar(' ');
- printproto(pr, np->in_p, np);
}
if (np->in_flags & IPN_FRAG)
@@ -212,6 +213,12 @@ int opts;
printf(" mssclamp %d", np->in_mssclamp);
if (np->in_tag.ipt_tag[0] != '\0')
printf(" tag %s", np->in_tag.ipt_tag);
+ if (!protoprinted && (np->in_flags & IPN_TCPUDP || np->in_p)) {
+ putchar(' ');
+ printproto(pr, np->in_p, np);
+ }
+ if (np->in_flags & IPN_SEQUENTIAL)
+ printf(" sequential");
printf("\n");
if (opts & OPT_DEBUG) {
struct in_addr nip;
@@ -1 +1 @@
-map le0 192.168.126.0/24 -> 0/32 portmap tcp/udp 10000:20000
+map le0 192.168.126.0/24 -> 0/32 portmap tcp/udp 10000:20000 sequential
View
@@ -1,4 +1,4 @@
-/* $NetBSD: ipnat_y.y,v 1.14.4.1.2.1 2007/09/03 06:54:51 wrstuden Exp $ */
+/* $NetBSD: ipnat_y.y,v 1.14.4.1.2.2 2008/09/15 08:09:56 skrll Exp $ */
/*
* Copyright (C) 2001-2006 by Darren Reed.
@@ -95,7 +95,7 @@ static void setnatproto __P((int));
%token IPNY_MAP IPNY_BIMAP IPNY_FROM IPNY_TO IPNY_MASK IPNY_PORTMAP IPNY_ANY
%token IPNY_ROUNDROBIN IPNY_FRAG IPNY_AGE IPNY_ICMPIDMAP IPNY_PROXY
%token IPNY_TCP IPNY_UDP IPNY_TCPUDP IPNY_STICKY IPNY_MSSCLAMP IPNY_TAG
-%token IPNY_TLATE
+%token IPNY_TLATE IPNY_SEQUENTIAL
%type <port> portspec
%type <num> hexnumber compare range proto
%type <ipa> hostname ipv4
@@ -422,11 +422,11 @@ otherifname:
;
mapport:
- IPNY_PORTMAP tcpudp portspec ':' portspec
+ IPNY_PORTMAP tcpudp portspec ':' portspec randport
{ nat->in_pmin = htons($3);
nat->in_pmax = htons($5);
}
- | IPNY_PORTMAP tcpudp IPNY_AUTO
+ | IPNY_PORTMAP tcpudp IPNY_AUTO randport
{ nat->in_flags |= IPN_AUTOPORTMAP;
nat->in_pmin = htons(1024);
nat->in_pmax = htons(65535);
@@ -446,6 +446,10 @@ mapport:
}
;
+randport:
+ | IPNY_SEQUENTIAL { nat->in_flags |= IPN_SEQUENTIAL; }
+ ;
+
sobject:
saddr
| saddr port portstuff { nat->in_sport = $3.p1;
@@ -519,6 +523,7 @@ rdroptions:
nattag: | IPNY_TAG YY_STR { strncpy(nat->in_tag.ipt_tag, $2,
sizeof(nat->in_tag.ipt_tag));
}
+
rr: | IPNY_ROUNDROBIN { nat->in_flags |= IPN_ROUNDR; }
;
@@ -646,6 +651,7 @@ static wordtab_t yywords[] = {
{ "range", IPNY_RANGE },
{ "rdr", IPNY_RDR },
{ "round-robin",IPNY_ROUNDROBIN },
+ { "sequential", IPNY_SEQUENTIAL },
{ "sticky", IPNY_STICKY },
{ "tag", IPNY_TAG },
{ "tcp", IPNY_TCP },
@@ -1,4 +1,4 @@
- $NetBSD: prep.RISCOS,v 1.15.6.2 2008/01/06 05:00:12 wrstuden Exp $
+ $NetBSD: prep.RISCOS,v 1.15.6.3 2008/09/15 08:09:56 skrll Exp $
These instructions are specific to NetBSD/acorn32 on Acorn RISCOS platforms
(RiscPC/A7000/A7000+/NC's).
@@ -36,7 +36,7 @@ You will need the following RiscOS software:
A program that will unpack sparchives. We recommend that you
get David Pilling's !SparkPlug. A self-extracting version of this
can be found at David Pilling's W3 site
- (http://pilling.users.netlink.co.uk/free.html).
+ (http://www.davidpilling.net/free.html).
A program to report your disk's geometry:
@@ -45,7 +45,7 @@ You will need the following RiscOS software:
Sergio Monesi's fsck suite (a good thing to have around
anyway). Available from:
- http://cdc8g5.cdc.polimi.it/~pel0015/fsck.html
+ http://www.monesi.com/sergio/fsck.html
!Zap (The read disk facility). Available from HENSA.
@@ -1,4 +1,4 @@
-.\" $NetBSD: hardware,v 1.14 2003/07/26 17:06:54 salo Exp $
+.\" $NetBSD: hardware,v 1.14.18.1 2008/09/15 08:09:56 skrll Exp $
.
.Nx*M
\*V runs on most of the
@@ -15,7 +15,7 @@ boot
by the fact that it has a command line interface,
rather than a menu-driven interface.
The SRM prompt is
-.Sq Li \*>\*>\*> .
+.Sq Li \*[Gt]\*[Gt]\*[Gt] .
.Pp
Some platforms have both the SRM console and
the ARC console, and can switch between them, and other platforms have
@@ -279,7 +279,7 @@ DEC DE200,201,202 EtherWORKS II/Turbo ISA Ethernet boards
You should enter the following SRM console command to enable the
le device:
- \*>\*>\*> isacfg -mk -slot ? -dev 0 -handle DE200-LE -irq0 5
+ \*[Gt]\*[Gt]\*[Gt] isacfg -mk -slot ? -dev 0 -handle DE200-LE -irq0 5
-membase0 d0000 -memlen0 10000 -iobase0 300 -etyp 1 -enadev 1
DEC DE203,204,205 EtherWORKS III ISA Ethernet boards
@@ -288,5 +288,5 @@ DEC DE203,204,205 EtherWORKS III ISA Ethernet boards
You should enter the following SRM console command to enable
the device:
- \*>\*>\*> add_de205
+ \*[Gt]\*[Gt]\*[Gt] add_de205
.disp)
@@ -1,4 +1,4 @@
-.\" $NetBSD: install,v 1.31.4.1 2008/01/06 05:00:13 wrstuden Exp $
+.\" $NetBSD: install,v 1.31.4.2 2008/09/15 08:09:56 skrll Exp $
.\"
.\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -168,7 +168,7 @@ is available there as well.
Once the floppy has been made, you simply need to put it in the
drive and type
.Pp
-.Dl \*>\*>\*> Ic "B DVA0"
+.Dl \*[Gt]\*[Gt]\*[Gt] Ic "B DVA0"
.Pp
.It
CD boot
@@ -386,13 +386,13 @@ will not.
.Pp
Once you're set up, you should be able to boot with:
.Pp
-.Dl \*>\*>\*> Ic "boot -proto bootp ewa0"
+.Dl \*[Gt]\*[Gt]\*[Gt] Ic "boot -proto bootp ewa0"
.Pp
You should permanently set your protocol to
.Tn BOOTP
with:
.Pp
-.Dl \*>\*>\*> Ic "set ewa0_protocols bootp"
+.Dl \*[Gt]\*[Gt]\*[Gt] Ic "set ewa0_protocols bootp"
.Pp
The 3000 series of Turbochannel systems and certain other models use
.Em old SRM ,
@@ -419,7 +419,7 @@ boot program.
.It
Example:
.Pp
-.Dl \*>\*>\*> Ic "boot ez0"
+.Dl \*[Gt]\*[Gt]\*[Gt] Ic "boot ez0"
.bullet)
.bullet)
.
@@ -660,7 +660,7 @@ If the host you are getting the data files from is not on the
local network, you will also have to configure a gateway into your system.
Do this with
.Pp
-.Dl # Ic "route add default \*<gateway-IP-address\*>"
+.Dl # Ic "route add default \*[Lt]gateway-IP-address\*[Gt]"
.Pp
One improvement over the good old days is that the resolver is now
present; by configuring
@@ -672,7 +672,7 @@ with the install files via NFS, or download them via FTP.
.Pp
To mount them via nfs, type
.Pp
-.Dl # Ic "mount -t nfs \*<hostname:/path/to/nfs/volume\*> /mnt2"
+.Dl # Ic "mount -t nfs \*[Lt]hostname:/path/to/nfs/volume\*[Gt] /mnt2"
.Pp
If this volume has been exported read-only, you may need the
.Fl r
@@ -688,10 +688,10 @@ A typical session might be:
.Dl # Ic cd /mnt/usr/release
.Dl # Ic ftp ftp.NetBSD.org
.D1 Em "the following commands are given to the " Ic ftp Em "program after logging in"
-.Dl ftp\*> Ic "prompt"
-.Dl ftp\*> Ic "cd /pub/NetBSD/NetBSD-\*V/\*M/binary/sets"
-.Dl ftp\*> Ic "mget *"
-.Dl ftp\*> Ic "quit"
+.Dl ftp\*[Gt] Ic "prompt"
+.Dl ftp\*[Gt] Ic "cd /pub/NetBSD/NetBSD-\*V/\*M/binary/sets"
+.Dl ftp\*[Gt] Ic "mget *"
+.Dl ftp\*[Gt] Ic "quit"
.Pp
Feel free, of course, to leave off the sets that you don't need
if you don't plan to install everything.
@@ -749,12 +749,12 @@ you created, but typically the commands are:
.Dl # Ic "halt"
.Pp
You should now be at the SRM console's
-.Li \*>\*>\*>
+.Li \*[Gt]\*[Gt]\*[Gt]
prompt and can reboot
into the new configuration (possibly after an optional power cycle)
with a command such as:
.Pp
-.Dl \*>\*>\*> Ic "boot dka0"
+.Dl \*[Gt]\*[Gt]\*[Gt] Ic "boot dka0"
.Pp
This command might be:
.Ic "boot dka100"
@@ -1,4 +1,4 @@
-.\" $NetBSD: install,v 1.32 2002/08/16 12:01:39 is Exp $
+.\" $NetBSD: install,v 1.32.18.1 2008/09/15 08:09:56 skrll Exp $
.\"
.\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -109,11 +109,7 @@ option to enable the use of all memory segments.
You should see the screen clear and some information about
your system as the kernel configures the hardware.
Note which hard disk device(s) are configured
-.Po
-.Li sd0 ,
-.Li sd1 ,
-etc.
-.Pc
+.Pq Li sd0 , Li sd1 , No etc.
Then you will be prompted for a root device.
At this time type
.Li sd0b ,
View
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.26 2002/06/29 09:36:23 lukem Exp $
+.\" $NetBSD: prep,v 1.26.18.1 2008/09/15 08:09:56 skrll Exp $
.
You will need an
.Tn AmigaDOS
@@ -209,9 +209,9 @@ On
.Tn AmigaDOS ,
the command:
.Pp
-.Dl Ic "xstreamtodev --input=miniroot.fs --rdb-name=\*<swap partition\*>"
+.Dl Ic "xstreamtodev --input=miniroot.fs --rdb-name=\*[Lt]swap partition\*[Gt]"
.Pp
-where \*<swap partition\*> is the name you gave to the
+where \*[Lt]swap partition\*[Gt] is the name you gave to the
.Nx
partition to be used for swapping.
If
@@ -221,11 +221,11 @@ to determine the SCSI driver device name or the unit number
of the specified partition, you may also need to include the
option
.Pp
-.Dl Ic --device=\*<driver.name\*>
+.Dl Ic --device=\*[Lt]driver.name\*[Gt]
.Pp
and/or
.Pp
-.Dl Ic --unit=\*<SCSI unit number\*>
+.Dl Ic --unit=\*[Lt]SCSI unit number\*[Gt]
.Pp
To transfer the miniroot using
.Nx ,
@@ -1,4 +1,4 @@
-.\" $NetBSD: upgrade,v 1.25 2004/02/21 18:23:21 snj Exp $
+.\" $NetBSD: upgrade,v 1.25.18.1 2008/09/15 08:09:56 skrll Exp $
.\"
.\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -128,7 +128,7 @@ machines, use this instead:
.Pp
.Dl Ic "netbsd -bn2"
.Pp
-
+.
.Ss2 Once your kernel boots
.
You should see the screen clear and some information about
Oops, something went wrong.

0 comments on commit e4728b8

Please sign in to comment.