Date: Wed, 1 May 2002 00:25:47 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10575 for review Message-ID: <200205010725.g417Plr96999@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10575 Change 10575 by peter@peter_daintree on 2002/05/01 00:24:55 IFC @10574 Affected files ... ... //depot/projects/ia64/games/fortune/datfiles/fortunes#13 integrate ... //depot/projects/ia64/games/fortune/datfiles/fortunes2#7 integrate ... //depot/projects/ia64/release/alpha/drivers.conf#2 integrate ... //depot/projects/ia64/release/i386/drivers.conf#2 integrate ... //depot/projects/ia64/release/pc98/drivers.conf#3 integrate ... //depot/projects/ia64/release/scripts/driver-remove.pl#3 integrate ... //depot/projects/ia64/sbin/fdisk/fdisk.c#7 integrate ... //depot/projects/ia64/sbin/ipfw/ipfw.8#4 integrate ... //depot/projects/ia64/sbin/nfsd/nfsd.c#5 integrate ... //depot/projects/ia64/share/man/man5/drivers.conf.5#3 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/Makefile#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#34 integrate ... //depot/projects/ia64/usr.bin/truss/alpha-fbsd.c#2 integrate Differences ... ==== //depot/projects/ia64/games/fortune/datfiles/fortunes#13 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.87 2002/04/30 10:13:42 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.88 2002/05/01 06:20:57 mph Exp $ % -- Gifts for Children -- @@ -13815,7 +13815,7 @@ the heat received by radiation, i.e., Heaven loses 50 times as much heat as the Earth by radiation. Using the Stefan-Boltzmann law for radiation, (_H/_E)^4 = 50, where _E is the absolute temperature of the -earth (-300K), gives _H as 798K (525C). The exact temperature of Hell +earth (~300K), gives _H as 798K (525C). The exact temperature of Hell cannot be computed ... [However] Revelations 21:8 says "But the fearful, and unbelieving ... shall have their part in the lake which burneth with fire and brimstone." A lake of molten brimstone means ==== //depot/projects/ia64/games/fortune/datfiles/fortunes2#7 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.39 2002/04/29 06:26:12 jmallett Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.40 2002/05/01 06:20:57 mph Exp $ % ======================================================================= @@ -45377,7 +45377,7 @@ the heat lost by radiation is just equal to the heat received by radiation, i.e., Heaven loses fifty times as much heat as the Earth by radiation. Using the Stefan-Boltzmann law for radiation, (H/E)^4 = 50, where E is the absolute -temperature of the earth (-300K), gives H as 798K (525C). The exact +temperature of the earth (~300K), gives H as 798K (525C). The exact temperature of Hell cannot be computed, but it must be less than 444.6C, the temperature at which brimstone or sulphur changes from a liquid to a gas. Revelations 21:8 says "But the fearful, and unbelieving ... shall have their ==== //depot/projects/ia64/release/alpha/drivers.conf#2 (text+ko) ==== @@ -24,12 +24,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/alpha/drivers.conf,v 1.1 2002/03/30 03:35:58 murray Exp $ +# $FreeBSD: src/release/alpha/drivers.conf,v 1.2 2002/05/01 05:05:31 murray Exp $ # # drv: driver name in kernel config file # filename: filename of kernel module (without .ko) # floppy: 2 (mfsroot.flp), 3 (drivers.flp - not implemented yet) -# type: disk/floppy/network/cdrom/tape/any (currently not used) +# type: 'options' (for a kernel option) or anything else for a driver # description: short description of the driver # ==== //depot/projects/ia64/release/i386/drivers.conf#2 (text+ko) ==== @@ -24,13 +24,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/i386/drivers.conf,v 1.3 2001/10/23 22:56:41 jhb Exp $ +# $FreeBSD: src/release/i386/drivers.conf,v 1.5 2002/05/01 05:05:31 murray Exp $ # # drv: driver name in kernel config file # filename: filename of kernel module (without .ko) # floppy: 2 (mfsroot.flp), 3 (drivers.flp - not implemented yet) -# type: disk/floppy/network/cdrom/tape/any (currently not used) +# type: 'options' (for a kernel option) or anything else for a driver # description: short description of the driver # @@ -55,3 +55,6 @@ wb if_wb 2 network "Winbond W89C840F PCI ethernet card" wi if_wi 2 network "Lucent WaveLAN/IEEE 802.11 PCMCIA card" xl if_xl 2 network "3COM 3c90x / 3c90xB PCI ethernet card" +SYSVSHM sysvshm 2 options "SYSV-style shared memory" +SYSVMSG sysvmsg 2 options "SYSV-style message queues" +SYSVSEM sysvsem 2 options "SYSV-style semaphores" ==== //depot/projects/ia64/release/pc98/drivers.conf#3 (text+ko) ==== @@ -24,13 +24,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/pc98/drivers.conf,v 1.3 2002/03/05 11:53:56 nyan Exp $ +# $FreeBSD: src/release/pc98/drivers.conf,v 1.4 2002/05/01 05:05:31 murray Exp $ # # drv: driver name in kernel config file # filename: filename of kernel module (without .ko) # floppy: 2 (mfsroot.flp), 3 (drivers.flp - not implemented yet) -# type: disk/floppy/network/cdrom/tape/any (currently not used) +# type: 'options' (for a kernel option) or anything else for a driver # description: short description of the driver # ==== //depot/projects/ia64/release/scripts/driver-remove.pl#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/scripts/driver-remove.pl,v 1.2 2002/04/22 13:44:24 des Exp $ +# $FreeBSD: src/release/scripts/driver-remove.pl,v 1.3 2002/05/01 04:54:35 murray Exp $ # if ($#ARGV != 1) { @@ -39,7 +39,11 @@ while (<CONFIG>) { s/#.*$//; if (/^(\w+)\s+(\w+)\s+(\d+)\s+(\w+)\s+\"(.*)\"\s*$/) { - $drivers{$1} = 1; + if ($4 eq "options") { + $options{$1} = 1; + } else { + $drivers{$1} = 1; + } } } close CONFIG; @@ -47,6 +51,7 @@ open BOOTMFS, "< $bootmfs" or die "Cannot open $bootmfs.\n"; while (<BOOTMFS>) { next if (/^device\s+(\w+)/ && $drivers{$1}); + next if (/^options\s+(\w+)/ && $options{$1}); push @bootmfs, $_; } close BOOTMFS; ==== //depot/projects/ia64/sbin/fdisk/fdisk.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.58 2002/04/28 01:52:17 grog Exp $"; + "$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.59 2002/05/01 06:48:29 peter Exp $"; #endif /* not lint */ #include <sys/disklabel.h> ==== //depot/projects/ia64/sbin/ipfw/ipfw.8#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.101 2002/01/10 15:41:06 ru Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.102 2002/05/01 06:29:09 cjc Exp $ .\" .Dd May 31, 2001 .Dt IPFW 8 @@ -1052,9 +1052,20 @@ .Sh FINE POINTS .Bl -bullet .It -There is one kind of packet that the firewall will always -discard, that is a TCP packet's fragment with a fragment offset of -one. +There are circumstances where fragmented datagrams are unconditionally +dropped. +TCP packets are dropped if they do not contain at least 20 bytes of +TCP header, UDP packets are dropped if they do not contain a full 8 +byte UDP header, and ICMP packets are dropped if they do not contain +4 bytes of ICMP header, enough to specify the ICMP type, code, and +checksum. +These packets are simply logged as +.Dq pullup failed +since there may not be enough good data in the packet to produce a +meaningful log entry. +.It +Another type of packet is unconditionally dropped, a TCP packet with a +fragment offset of one. This is a valid packet, but it only has one use, to try to circumvent firewalls. When logging is enabled, these packets are ==== //depot/projects/ia64/sbin/nfsd/nfsd.c#5 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)nfsd.c 8.9 (Berkeley) 3/29/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/nfsd/nfsd.c,v 1.23 2002/03/26 17:37:59 pb Exp $"; + "$FreeBSD: src/sbin/nfsd/nfsd.c,v 1.24 2002/05/01 06:49:43 peter Exp $"; #endif /* not lint */ #include <sys/param.h> ==== //depot/projects/ia64/share/man/man5/drivers.conf.5#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/drivers.conf.5,v 1.3 2002/03/28 12:57:47 dd Exp $ +.\" $FreeBSD: src/share/man/man5/drivers.conf.5,v 1.4 2002/05/01 05:02:56 murray Exp $ .\" .Dd March 23, 2002 .Dt DRIVERS.CONF 5 @@ -61,7 +61,7 @@ .Pp The first field, .Ar driver , -is the name of the driver in the kernel configuration file. +is the name of the driver or option in the kernel configuration file. This is used by .Pa driver-remove.pl to remove drivers from the boot floppy kernel configuration @@ -85,7 +85,9 @@ The fourth field, .Ar type , specifies the driver category. -This field is currently unused. +If set to 'options', then this module is assumed to add the +functionality of a kernel option. +Otherwise, this module is assumed to represent a device driver. .Pp The fifth field, .Ar description , ==== //depot/projects/ia64/sys/dev/aic7xxx/aicasm/Makefile#5 (text+ko) ==== @@ -1,6 +1,6 @@ # $Id$ # -# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.11 2002/04/24 16:24:43 gibbs Exp $ +# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.12 2002/05/01 06:50:59 peter Exp $ PROG= aicasm ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#34 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.100 2002/04/30 02:29:00 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.101 2002/05/01 06:52:08 peter Exp $ */ #include "opt_compat.h" ==== //depot/projects/ia64/usr.bin/truss/alpha-fbsd.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.bin/truss/alpha-fbsd.c,v 1.5 2001/10/22 02:02:00 des Exp $"; + "$FreeBSD: src/usr.bin/truss/alpha-fbsd.c,v 1.6 2002/05/01 06:23:48 peter Exp $"; #endif /* not lint */ /* @@ -50,7 +50,6 @@ #include <sys/syscall.h> #include <machine/reg.h> -#include <machine/psl.h> #include <err.h> #include <errno.h> To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205010725.g417Plr96999>