PERFORCE change 129072 for review

Peter Wemm peter at FreeBSD.org
Wed Nov 14 15:29:00 PST 2007 

http://perforce.freebsd.org/chv.cgi?CH=129072

Change 129072 by peter at peter_daintree on 2007/11/14 23:28:55

	IFC @129071

Affected files ...

.. //depot/projects/hammer/ObsoleteFiles.inc#39 integrate
.. //depot/projects/hammer/bin/ps/ps.c#22 integrate
.. //depot/projects/hammer/contrib/less/FREEBSD-upgrade#1 branch
.. //depot/projects/hammer/etc/Makefile#60 integrate
.. //depot/projects/hammer/etc/defaults/Makefile#7 integrate
.. //depot/projects/hammer/etc/defaults/pccard.conf#18 delete
.. //depot/projects/hammer/etc/freebsd-update.conf#2 integrate
.. //depot/projects/hammer/etc/mtree/BSD.usr.dist#40 integrate
.. //depot/projects/hammer/etc/pf.conf#4 delete
.. //depot/projects/hammer/etc/rc.d/hostapd#2 integrate
.. //depot/projects/hammer/release/Makefile#95 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#24 integrate
.. //depot/projects/hammer/release/picobsd/bridge/PICOBSD#6 integrate
.. //depot/projects/hammer/release/picobsd/bridge/crunch.conf#9 integrate
.. //depot/projects/hammer/release/picobsd/build/Makefile.conf#2 integrate
.. //depot/projects/hammer/release/picobsd/build/picobsd#7 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/login/Makefile#6 integrate
.. //depot/projects/hammer/release/scripts/src-install.sh#5 integrate
.. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#20 integrate
.. //depot/projects/hammer/share/doc/legal/Makefile#2 integrate
.. //depot/projects/hammer/share/examples/pf/Makefile#4 integrate
.. //depot/projects/hammer/share/examples/pf/ackpri#2 integrate
.. //depot/projects/hammer/share/examples/pf/faq-example1#2 integrate
.. //depot/projects/hammer/share/examples/pf/faq-example2#2 integrate
.. //depot/projects/hammer/share/examples/pf/faq-example3#2 integrate
.. //depot/projects/hammer/share/examples/pf/pf.conf#1 branch
.. //depot/projects/hammer/share/examples/pf/queue1#2 integrate
.. //depot/projects/hammer/share/examples/pf/queue2#2 integrate
.. //depot/projects/hammer/share/examples/pf/queue3#2 integrate
.. //depot/projects/hammer/share/examples/pf/queue4#2 integrate
.. //depot/projects/hammer/share/examples/pf/spamd#2 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#98 integrate
.. //depot/projects/hammer/share/man/man4/asmc.4#1 branch
.. //depot/projects/hammer/share/man/man4/ipw.4#14 integrate
.. //depot/projects/hammer/share/man/man4/iwi.4#16 integrate
.. //depot/projects/hammer/share/man/man4/wlan.4#11 integrate
.. //depot/projects/hammer/share/man/man4/wpi.4#1 branch
.. //depot/projects/hammer/share/man/man5/freebsd-update.conf.5#2 integrate
.. //depot/projects/hammer/share/man/man7/tuning.7#17 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#73 integrate
.. //depot/projects/hammer/share/man/man9/locking.9#5 integrate
.. //depot/projects/hammer/share/man/man9/rmlock.9#1 branch
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#99 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#90 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#104 integrate
.. //depot/projects/hammer/sys/arm/arm/cpufunc.c#16 integrate
.. //depot/projects/hammer/sys/arm/arm/trap.c#22 integrate
.. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#28 integrate
.. //depot/projects/hammer/sys/boot/common/loader.8#29 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#14 integrate
.. //depot/projects/hammer/sys/conf/files#163 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#98 integrate
.. //depot/projects/hammer/sys/conf/files.i386#84 integrate
.. //depot/projects/hammer/sys/conf/files.pc98#63 integrate
.. //depot/projects/hammer/sys/conf/kmod.mk#65 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#42 integrate
.. //depot/projects/hammer/sys/dev/agp/agp.c#1 branch
.. //depot/projects/hammer/sys/dev/agp/agp_ali.c#1 branch
.. //depot/projects/hammer/sys/dev/agp/agp_amd.c#1 branch
.. //depot/projects/hammer/sys/dev/agp/agp_amd64.c#1 branch
.. //depot/projects/hammer/sys/dev/agp/agp_ati.c#1 branch
.. //depot/projects/hammer/sys/dev/agp/agp_i810.c#1 branch
.. //depot/projects/hammer/sys/dev/agp/agp_if.m#1 branch
.. //depot/projects/hammer/sys/dev/agp/agp_intel.c#1 branch
.. //depot/projects/hammer/sys/dev/agp/agp_nvidia.c#1 branch
.. //depot/projects/hammer/sys/dev/agp/agp_sis.c#1 branch
.. //depot/projects/hammer/sys/dev/agp/agp_via.c#1 branch
.. //depot/projects/hammer/sys/dev/agp/agppriv.h#1 branch
.. //depot/projects/hammer/sys/dev/agp/agpreg.h#1 branch
.. //depot/projects/hammer/sys/dev/agp/agpvar.h#1 branch
.. //depot/projects/hammer/sys/dev/asmc/asmc.c#1 branch
.. //depot/projects/hammer/sys/dev/asmc/asmcvar.h#1 branch
.. //depot/projects/hammer/sys/dev/drm/drmP.h#16 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_agpsupport.c#7 integrate
.. //depot/projects/hammer/sys/dev/esp/esp_sbus.c#13 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#62 integrate
.. //depot/projects/hammer/sys/dev/re/if_re.c#51 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#17 integrate
.. //depot/projects/hammer/sys/dev/usb/if_axe.c#37 integrate
.. //depot/projects/hammer/sys/dev/usb/if_axereg.h#14 integrate
.. //depot/projects/hammer/sys/dev/usb/if_zyd.c#5 integrate
.. //depot/projects/hammer/sys/dev/usb/if_zydreg.h#3 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#21 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#90 integrate
.. //depot/projects/hammer/sys/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_ihash.c#6 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#8 integrate
.. //depot/projects/hammer/sys/i386/bios/apm.c#15 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#94 integrate
.. //depot/projects/hammer/sys/i386/i386/locore.s#18 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#81 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#71 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#100 integrate
.. //depot/projects/hammer/sys/i386/i386/trap.c#56 integrate
.. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#60 integrate
.. //depot/projects/hammer/sys/i386/include/pmap.h#33 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#65 integrate
.. //depot/projects/hammer/sys/ia64/ia64/trap.c#42 integrate
.. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#34 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#43 integrate
.. //depot/projects/hammer/sys/kern/kern_clock.c#41 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#74 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#67 integrate
.. //depot/projects/hammer/sys/kern/kern_kse.c#39 integrate
.. //depot/projects/hammer/sys/kern/kern_ktrace.c#34 integrate
.. //depot/projects/hammer/sys/kern/kern_lock.c#30 integrate
.. //depot/projects/hammer/sys/kern/kern_mutex.c#49 integrate
.. //depot/projects/hammer/sys/kern/kern_rmlock.c#1 branch
.. //depot/projects/hammer/sys/kern/kern_rwlock.c#12 integrate
.. //depot/projects/hammer/sys/kern/kern_switch.c#59 integrate
.. //depot/projects/hammer/sys/kern/kern_sx.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#63 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#100 integrate
.. //depot/projects/hammer/sys/kern/p1003_1b.c#4 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#54 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#86 integrate
.. //depot/projects/hammer/sys/kern/subr_lock.c#8 integrate
.. //depot/projects/hammer/sys/kern/subr_pcpu.c#6 integrate
.. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#26 integrate
.. //depot/projects/hammer/sys/kern/subr_smp.c#32 integrate
.. //depot/projects/hammer/sys/kern/subr_trap.c#40 integrate
.. //depot/projects/hammer/sys/kern/subr_turnstile.c#26 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#65 integrate
.. //depot/projects/hammer/sys/kern/sys_generic.c#35 integrate
.. //depot/projects/hammer/sys/kern/sys_process.c#42 integrate
.. //depot/projects/hammer/sys/kern/tty_pty.c#35 integrate
.. //depot/projects/hammer/sys/modules/Makefile#118 integrate
.. //depot/projects/hammer/sys/modules/agp/Makefile#11 integrate
.. //depot/projects/hammer/sys/modules/asmc/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/wpi/Makefile#2 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211.h#15 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ht.c#5 integrate
.. //depot/projects/hammer/sys/netgraph/netgraph.h#31 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#51 integrate
.. //depot/projects/hammer/sys/netinet/sctp_indata.c#17 integrate
.. //depot/projects/hammer/sys/netinet/sctputil.c#21 integrate
.. //depot/projects/hammer/sys/netipsec/keysock.c#15 integrate
.. //depot/projects/hammer/sys/pc98/pc98/machdep.c#20 integrate
.. //depot/projects/hammer/sys/pci/agp.c#23 delete
.. //depot/projects/hammer/sys/pci/agp_ali.c#15 delete
.. //depot/projects/hammer/sys/pci/agp_amd.c#15 delete
.. //depot/projects/hammer/sys/pci/agp_amd64.c#14 delete
.. //depot/projects/hammer/sys/pci/agp_ati.c#5 delete
.. //depot/projects/hammer/sys/pci/agp_i810.c#26 delete
.. //depot/projects/hammer/sys/pci/agp_if.m#4 delete
.. //depot/projects/hammer/sys/pci/agp_intel.c#21 delete
.. //depot/projects/hammer/sys/pci/agp_nvidia.c#9 delete
.. //depot/projects/hammer/sys/pci/agp_sis.c#19 delete
.. //depot/projects/hammer/sys/pci/agp_via.c#21 delete
.. //depot/projects/hammer/sys/pci/agppriv.h#6 delete
.. //depot/projects/hammer/sys/pci/agpreg.h#16 delete
.. //depot/projects/hammer/sys/pci/agpvar.h#3 delete
.. //depot/projects/hammer/sys/pci/nfsmb.c#5 integrate
.. //depot/projects/hammer/sys/powerpc/include/md_var.h#8 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/clock.c#13 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#47 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/trap.c#25 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#31 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#26 integrate
.. //depot/projects/hammer/sys/sun4v/include/pcpu.h#5 integrate
.. //depot/projects/hammer/sys/sun4v/sun4v/trap.c#4 integrate
.. //depot/projects/hammer/sys/sun4v/sun4v/vm_machdep.c#4 integrate
.. //depot/projects/hammer/sys/sys/_rmlock.h#1 branch
.. //depot/projects/hammer/sys/sys/lock.h#20 integrate
.. //depot/projects/hammer/sys/sys/malloc.h#14 integrate
.. //depot/projects/hammer/sys/sys/param.h#96 integrate
.. //depot/projects/hammer/sys/sys/pcpu.h#13 integrate
.. //depot/projects/hammer/sys/sys/proc.h#110 integrate
.. //depot/projects/hammer/sys/sys/rmlock.h#1 branch
.. //depot/projects/hammer/sys/sys/smp.h#14 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#32 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_balloc.c#12 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_inode.c#19 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#49 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#46 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#45 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_bmap.c#12 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#18 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#50 integrate
.. //depot/projects/hammer/sys/vm/vm_kern.c#27 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#66 integrate
.. //depot/projects/hammer/sys/vm/vm_map.h#22 integrate
.. //depot/projects/hammer/tools/regression/priv/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/priv/main.c#3 integrate
.. //depot/projects/hammer/tools/regression/priv/main.h#3 integrate
.. //depot/projects/hammer/tools/regression/priv/priv_netinet_ipsec.c#1 branch
.. //depot/projects/hammer/tools/sched/schedgraph.py#8 integrate
.. //depot/projects/hammer/usr.bin/du/du.c#16 integrate
.. //depot/projects/hammer/usr.bin/killall/killall.1#9 integrate
.. //depot/projects/hammer/usr.bin/killall/killall.c#11 integrate
.. //depot/projects/hammer/usr.bin/mail/aux.c#3 integrate
.. //depot/projects/hammer/usr.bin/mail/cmd1.c#2 integrate
.. //depot/projects/hammer/usr.bin/mail/lex.c#4 integrate
.. //depot/projects/hammer/usr.bin/mail/list.c#2 integrate
.. //depot/projects/hammer/usr.bin/mail/main.c#4 integrate
.. //depot/projects/hammer/usr.bin/sed/main.c#11 integrate
.. //depot/projects/hammer/usr.bin/tee/tee.1#3 integrate
.. //depot/projects/hammer/usr.bin/write/write.c#4 integrate
.. //depot/projects/hammer/usr.sbin/freebsd-update/freebsd-update.8#2 integrate
.. //depot/projects/hammer/usr.sbin/freebsd-update/freebsd-update.sh#5 integrate
.. //depot/projects/hammer/usr.sbin/pciconf/cap.c#4 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/add.h#6 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#21 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/perform.c#9 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#15 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/delete/perform.c#4 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#15 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/updating/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/updating/main.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/updating/pathnames.h#2 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/version/version.h#6 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#31 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/dist.h#12 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#45 integrate
.. //depot/projects/hammer/usr.sbin/wpa/hostapd/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Makefile#11 integrate

Differences ...

==== //depot/projects/hammer/ObsoleteFiles.inc#39 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.116 2007/10/30 11:37:37 bushman Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20071108: Removed very crunch OLDCARD support file
+OLD_FILES+=etc/defaults/pccard.conf
 # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
 OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd

==== //depot/projects/hammer/bin/ps/ps.c#22 (text+ko) ====

@@ -47,7 +47,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.113 2007/11/08 22:31:28 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -74,6 +74,8 @@
 
 #include "ps.h"
 
+#define	_PATH_PTS	"/dev/pts/"
+
 #define	W_SEP	" \t"		/* "Whitespace" list separators */
 #define	T_SEP	","		/* "Terminate-element" list separators */
 
@@ -706,9 +708,9 @@
 
 /*-
  * The user can specify a device via one of three formats:
- *     1) fully qualified, e.g.:     /dev/ttyp0 /dev/console
- *     2) missing "/dev", e.g.:      ttyp0      console
- *     3) two-letters, e.g.:         p0         co
+ *     1) fully qualified, e.g.:     /dev/ttyp0 /dev/console	/dev/pts/0
+ *     2) missing "/dev", e.g.:      ttyp0      console		pts/0
+ *     3) two-letters, e.g.:         p0         co		0
  *        (matching letters that would be seen in the "TT" column)
  */
 static int
@@ -716,10 +718,11 @@
 {
 	const char *ttypath;
 	struct stat sb;
-	char pathbuf[PATH_MAX], pathbuf2[PATH_MAX];
+	char pathbuf[PATH_MAX], pathbuf2[PATH_MAX], pathbuf3[PATH_MAX];
 
 	ttypath = NULL;
 	pathbuf2[0] = '\0';
+	pathbuf3[0] = '\0';
 	switch (*elem) {
 	case '/':
 		ttypath = elem;
@@ -736,6 +739,8 @@
 		ttypath = pathbuf;
 		if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0)
 			break;
+		if (strncmp(pathbuf, _PATH_PTS, strlen(_PATH_PTS)) == 0)
+			break;
 		if (strcmp(pathbuf, _PATH_CONSOLE) == 0)
 			break;
 		/* Check to see if /dev/tty${elem} exists */
@@ -746,21 +751,30 @@
 			ttypath = NULL;	
 			break;
 		}
+		/* Check to see if /dev/pts/${elem} exists */
+		strlcpy(pathbuf3, _PATH_PTS, sizeof(pathbuf3));
+		strlcat(pathbuf3, elem, sizeof(pathbuf3));
+		if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) {
+			/* No need to repeat stat() && S_ISCHR() checks */
+			ttypath = NULL;	
+			break;
+		}
 		break;
 	}
 	if (ttypath) {
 		if (stat(ttypath, &sb) == -1) {
-			if (pathbuf2[0] != '\0')
-				warn("%s and %s", pathbuf2, ttypath);
+			if (pathbuf3[0] != '\0')
+				warn("%s, %s, and %s", pathbuf3, pathbuf2,
+				    ttypath);
 			else
 				warn("%s", ttypath);
 			optfatal = 1;
 			return (0);
 		}
 		if (!S_ISCHR(sb.st_mode)) {
-			if (pathbuf2[0] != '\0')
-				warnx("%s and %s: Not a terminal", pathbuf2,
-				    ttypath);
+			if (pathbuf3[0] != '\0')
+				warnx("%s, %s, and %s: Not a terminal",
+				    pathbuf3, pathbuf2, ttypath);
 			else
 				warnx("%s: Not a terminal", ttypath);
 			optfatal = 1;

==== //depot/projects/hammer/etc/Makefile#60 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.364 2007/10/29 07:37:08 yar Exp $
+# $FreeBSD: src/etc/Makefile,v 1.365 2007/11/11 01:16:51 mlaier Exp $
 
 .include <bsd.own.mk>
 
@@ -14,7 +14,7 @@
 	hosts hosts.allow hosts.equiv hosts.lpd \
 	inetd.conf libalias.conf login.access login.conf mac.conf motd \
 	netconfig network.subr networks newsyslog.conf nsswitch.conf \
-	portsnap.conf pf.conf pf.os phones profile protocols \
+	portsnap.conf pf.os phones profile protocols \
 	rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
 	rc.sendmail rc.shutdown \
 	rc.subr remote rpc services shells \

==== //depot/projects/hammer/etc/defaults/Makefile#7 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/etc/defaults/Makefile,v 1.7 2005/12/09 15:19:31 ru Exp $
+# $FreeBSD: src/etc/defaults/Makefile,v 1.8 2007/11/08 17:41:35 imp Exp $
 
-FILES=	bluetooth.device.conf devfs.rules pccard.conf periodic.conf rc.conf
+FILES=	bluetooth.device.conf devfs.rules periodic.conf rc.conf
 NO_OBJ=
 FILESDIR= /etc/defaults
 

==== //depot/projects/hammer/etc/freebsd-update.conf#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/freebsd-update.conf,v 1.1 2006/08/31 09:51:33 cperciva Exp $
+# $FreeBSD: src/etc/freebsd-update.conf,v 1.2 2007/11/12 04:47:57 cperciva Exp $
 
 # Trusted keyprint.  Changing this is a Bad Idea unless you've received
 # a PGP-signed email from <security-officer at FreeBSD.org> telling you to
@@ -23,9 +23,13 @@
 
 # Paths which start with anything matching an entry in an UpdateIfUnmodified
 # statement will only be updated if the contents of the file have not been
-# modified by the user.
+# modified by the user (unless changes are merged; see below).
 UpdateIfUnmodified /etc/ /var/
 
+# When upgrading to a new FreeBSD release, files which match MergeChanges
+# will have any local changes merged into the version from the new release.
+MergeChanges /etc/ /var/named/etc/
+
 ### Default configuration options:
 
 # Directory in which to store downloaded updates and temporary
@@ -46,3 +50,9 @@
 # FreeBSD Update retain this modified metadata when installing a new version
 # of that file?
 # KeepModifiedMetadata yes
+
+# When upgrading between releases, should the list of Components be
+# read strictly (StrictComponents yes) or merely as a list of components
+# which *might* be installed of which FreeBSD Update should figure out
+# which actually are installed and upgrade those (StrictComponents no)?
+# StrictComponents no

==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#40 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.329 2007/07/25 13:37:33 scottl Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.332 2007/11/10 22:47:46 sam Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -80,6 +80,8 @@
                 ..
                 intel_iwi
                 ..
+                intel_wpi
+                ..
             ..
             ncurses
             ..
@@ -212,6 +214,8 @@
             ..
             find_interface
             ..
+            hostapd
+            ..
             ibcs2
             ..
             ipfilter
@@ -304,6 +308,8 @@
             ..
             tcsh
             ..
+            wpa_supplicant
+            ..
         ..
         games
             fortune

==== //depot/projects/hammer/etc/rc.d/hostapd#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/hostapd,v 1.1 2006/02/03 01:35:36 flz Exp $
+# $FreeBSD: src/etc/rc.d/hostapd,v 1.2 2007/11/14 21:19:15 brix Exp $
 #
 
 # PROVIDE: hostapd
@@ -14,9 +14,11 @@
 rcvar=`set_rcvar`
 
 conf_file="/etc/${name}.conf"
+pidfile="/var/run/${name}.pid"
 
-command_args="-B ${conf_file}"
+command_args="-P ${pidfile} -B ${conf_file}"
 required_files="${conf_file}"
+extra_commands="reload"
 
 load_rc_config ${name}
 run_rc_command "$1"

==== //depot/projects/hammer/release/Makefile#95 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.925 2007/10/11 04:28:07 kensmith Exp $
+# $FreeBSD: src/release/Makefile,v 1.926 2007/11/09 15:32:04 nyan Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -741,10 +741,6 @@
 		ln -sf /stand $$dir; \
 	  done )
 	cp ${RD}/trees/base/sbin/dhclient-script ${RD}/mfsfd/stand
-.if ${TARGET} == "pc98"
-	cp ${.CURDIR}/../etc/defaults/pccard.conf \
-	    ${RD}/mfsfd/etc/defaults/pccard.conf
-.endif
 	cp ${.CURDIR}/../etc/master.passwd ${RD}/mfsfd/etc/master.passwd
 	cp ${RD}/trees/base/etc/*pwd.db ${RD}/mfsfd/etc/
 	( for F in defaults/rc.conf netconfig protocols ; do \

==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 (text+ko) ====

@@ -18,7 +18,7 @@
 
   <corpauthor>The &os; Documentation Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.326 2007/09/26 21:30:50 brueffer Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.327 2007/11/13 16:27:29 brueffer Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -793,6 +793,9 @@
     <para>[&arch.i386;] NCR / AT&amp;T / Lucent Technologies WaveLan T1-speed
     ISA/radio LAN cards (&man.wl.4; driver)</para>
 
+    <para>[&arch.i386;, &arch.amd64;] Intel PRO/Wireless 3945ABG MiniPCI
+      network adapters (&man.wpi.4; driver)</para>
+
     &hwlist.zyd;
 
   </sect2>

==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#24 (text+ko) ====

@@ -20,7 +20,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1073 2007/11/05 00:24:05 gshapiro Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1074 2007/11/11 17:16:55 gshapiro Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -210,7 +210,7 @@
       4.1.23 to 4.1.28.</para>
 
     <para><application>sendmail</application> has been updated from
-      8.14.1 to 8.14.2.</para>
+      8.14.1 to 8.14.2.  &merged;</para>
 
   </sect2>
 

==== //depot/projects/hammer/release/picobsd/bridge/PICOBSD#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.19 2006/09/18 06:34:51 marck Exp $
+# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.20 2007/11/14 05:42:53 luigi Exp $
 #
 # Line starting with #PicoBSD contains PicoBSD build parameters
 #marker         def_sz  init    MFS_inodes      floppy_inodes
@@ -7,7 +7,6 @@
 options MD_ROOT_SIZE=3200      # same as def_sz
 
 hints	"PICOBSD.hints"
-machine		i386
 cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU

==== //depot/projects/hammer/release/picobsd/bridge/crunch.conf#9 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.21 2006/11/22 00:33:19 rodrigc Exp $
+# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.22 2007/11/14 05:42:53 luigi Exp $
 #
 # configuration file for "bridge" floppy.
 # Depending on your needs, almost surely you will need to
@@ -177,6 +177,7 @@
 libs -lufs     # used by mount
 ### ee uses ncurses instead of curses
 libs -ledit -lutil -lmd -lcrypt -lmp -lm -lkvm
-libs -lmytinfo -lz -lpcap -lwrap
+# libs -lmytinfo
+libs -lz -lpcap -lwrap
 libs -ltermcap -lgnuregex # -lcurses
 libs -lgeom

==== //depot/projects/hammer/release/picobsd/build/Makefile.conf#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/picobsd/build/Makefile.conf,v 1.18 2001/11/01 16:17:37 luigi Exp $
+# $FreeBSD: src/release/picobsd/build/Makefile.conf,v 1.19 2007/11/14 05:42:53 luigi Exp $
 #
 # Makefile for building PICOBSD kernels and running crunchgen
 #
@@ -9,6 +9,7 @@
 # When building a kernel, also need ${name} from the environment
 # and CONFIG may indicate an alternate config program
 
+BINMAKE?=make
 SRC?=/usr/src
 CONFIG?=config
 MODULES?=-DNO_MODULES	# do not build them as a default
@@ -38,11 +39,11 @@
 ${KERNFILE}: ${COMPILE} do_a_make_in_the_kernel_directory_anyways
 
 do_a_make_in_the_kernel_directory_anyways:
-	(cd ${COMPILE}; make KERNEL=kernel ${MODULES} )
+	(cd ${COMPILE}; ${BINMAKE} KERNEL=kernel ${MODULES} )
 
 ${COMPILE}: ${CONF}/${CONFFILE}
 	(cd ${CONF}; ${CONFIG} -d ${COMPILE} ${CONFFILE}; \
-	cd ${COMPILE}; make KERNEL=kernel ${MODULES} depend )
+	cd ${COMPILE}; ${BINMAKE} KERNEL=kernel ${MODULES} depend )
 
 ${CONF}/${CONFFILE}: PICOBSD
 	# -mkdir -p ${CONF}		# XXX not needed yet.

==== //depot/projects/hammer/release/picobsd/build/picobsd#7 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD: src/release/picobsd/build/picobsd,v 1.39 2006/05/17 09:33:06 phk Exp $
+# $FreeBSD: src/release/picobsd/build/picobsd,v 1.41 2007/11/14 07:38:22 luigi Exp $
 # This file requires sysutils/makefs to run
 #
 # The new PicoBSD build script. Invoked as
@@ -75,19 +75,17 @@
 # log something on stdout if verbose.
 o_verbose=0	# this needs to be here!
 log() {
-    if [ ${o_verbose} -gt 0 ] ; then
-	printf "\n*** %s\n" "$*"
-	if [ ${o_verbose}  -gt 1 ] ; then
-	    read -p "=== Press enter to continue" foo
-	fi
-    fi
+    local foo
+    [ ${o_verbose} -gt 0 ] && printf "\n*** %s\n" "$*"
+    [ ${o_verbose}  -gt 1 ] && read -p "=== Press enter to continue" foo
+    return 0
 }
 
 logverbose() {
     local foo
-
     printf "\n*** %s\n" "$*"
     read -p "=== Press enter to continue" foo
+    return 0
 }
 
 set_defaults() {
@@ -164,6 +162,7 @@
     )
 }
 
+# entry for 4.x and earlier trees
 create_includes_and_libraries() {
     local e i
 
@@ -208,33 +207,32 @@
 
 # set_type <type> looks in user or system directories for the floppy type
 # specified as first argument, and sets variables according to the config.
-# file. Also sets MY_TREE and BUILDDIR and SITE
+# file. Sets THETYPE, SITE, name, MY_TREE and BUILDDIR
 
 set_type() {
     local a i
 
-    log "set_type()"
+    log "set_type() : Type '$1' site '$2'"
     THETYPE=$1
     SITE=$2
     a=$1
+    name=""	# clear in case of errors
     for i in ${c_startdir}/${a} ${PICO_TREE}/${a} ; do
 	log "set_type: checking $i"
-	if [ -d $i -a -f $i/PICOBSD -a -f $i/crunch.conf ] ; then
-	    set -- `cat $i/PICOBSD | \
+	[ -d $i -a -f $i/PICOBSD -a -f $i/crunch.conf ] || continue
+	set -- `cat $i/PICOBSD | \
 	    awk '/^#PicoBSD/ {print $2, $3, $4, $5, $6}'`
-	    if [ "$1" != "" ]; then
-		MFS_SIZE=$1 ; init_name=$2
-		mfs_inodes=$3 ; fd_inodes=$4
-		name=`(cd $i ; pwd) `
-		name=`basename $name`
-		MY_TREE=$i
-		BUILDDIR=${c_startdir}/build_dir-${name}
-		log "Matching file $name in $i"
-		return ;
-	    fi
-	fi
+	[ x"$1" != "x" ] || continue
+	MFS_SIZE=$1 ; init_name=$2
+	mfs_inodes=$3 ; fd_inodes=$4
+	name=`(cd $i ; pwd) `
+	name=`basename $name`
+	MY_TREE=$i
+	BUILDDIR=${c_startdir}/build_dir-${name}
+	log "Matching file $name in $i"
+	return ;
     done
-    echo "Type $a NOT FOUND"
+    logverbose "Type $a NOT FOUND"
 }
 
 clean_tree() {
@@ -280,10 +278,9 @@
     log "PICO_OBJ is ${PICO_OBJ}"
 
     if [ ${OSVERSION} -ge 500035 ] ; then
-	MAKEOBJDIRPREFIX=${l_objtree}
-	export MAKEOBJDIRPREFIX
-	log `cd ${SRC}; make -f Makefile.inc1 -V WMAKEENV`
-	eval export `cd ${SRC}; make -f Makefile.inc1 -V WMAKEENV`
+	export MAKEOBJDIRPREFIX=${l_objtree}
+	eval "export BINMAKE=\"`cd ${SRC}; make -f Makefile -V BINMAKE`\""
+	eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V WMAKEENV`
     fi
     # create build directory and subtree
     mkdir -p ${BUILDDIR}/crunch
@@ -304,12 +301,16 @@
     local z msg
 
     log "build_package()"
-    touch build.status
+    rm -rf build.status
     echo "##############################################" >>build.status
     echo "## `date` ">>build.status
     echo "##############################################" >>build.status
     for z in bridge dial router net isp ; do
 	set_type ${z}
+        if [ "${name}" = "" ] ; then
+	    echo "*** TYPE=${z} not found" >>build.status
+	    continue
+	fi
 	echo "---------------------------------------------">>build.status
 	echo "Building TYPE=${z}, SIZE=${MFS_SIZE}" >>build.status
 	msg="(ok)"	# error message
@@ -454,16 +455,14 @@
 
 #-------------------------------------------------------------------
 
-# invoke the Makefile to compile the kernel.
+# invoke the picobsd Makefile to compile the kernel.
+# if MODULES is set (value is irrelevant) the makefile will build modules.
 do_kernel() {		# OK
     log "do_kernel() Preparing kernel \"$name\" in $MY_TREE"
     (cd $MY_TREE; export name SRC BUILDDIR # used in this makefile ;
 	# export CONFIG
-	if [ "${o_do_modules}" = "yes" ] ; then
-		MODULES=""
-		export MODULES
-	fi
-	make -m ${SRC}/share/mk -v -f ${PICO_TREE}/build/Makefile.conf ) || \
+	[ "${o_do_modules}" = "yes" ] && export MODULES=""
+	${BINMAKE} -v -f ${PICO_TREE}/build/Makefile.conf ) || \
 	fail $? missing_kernel
 }
 
@@ -491,8 +490,8 @@
 
     excl=${MY_TREE}/floppy.tree.exclude
     if [ -f ${excl} ] ; then
+	log "Files excluded from generic tree: `echo;cat ${excl}`"
 	excl="--exclude-from ${excl}"
-	log "Files excluded from generic tree: `echo;cat ${excl}`"
     else
 	excl=""
     fi
@@ -561,13 +560,13 @@
     log "Making and installing crunch1 from `pwd` src ${SRC}..."
     a=${BUILDDIR}/crunch1.conf
     ( export BUILDDIR SRC MY_TREE PICO_OBJ ;
-	make -m ${SRC}/share/mk \
+	${BINMAKE} \
 		-v -f ${PICO_TREE}/build/Makefile.conf ${BUILDDIR}/crunch.mk )
     log "Libs are ${LIBS} "
     export SRC # used by crunch.mk
     # export LIBS CFLAGS
     log "Now make -f crunch.mk"
-    make -m ${SRC}/share/mk ${o_makeopts} -f ${BUILDDIR}/crunch.mk
+    ${BINMAKE} ${o_makeopts} -f ${BUILDDIR}/crunch.mk
     strip --remove-section=.note --remove-section=.comment crunch1
     mv crunch1 ${dst}/stand/crunch
     chmod 555 ${dst}/stand/crunch
@@ -824,7 +823,8 @@
 # arguments.
 
 set_defaults
-while [ true ]; do
+args=""
+while [ x"$1" != x ]; do
     case $1 in
     --src)	# set the source path instead of /usr/src
 	SRC=`(cd $2; pwd)`
@@ -865,23 +865,22 @@
 	o_makeopts="-d l" # be verbose
 	;;
     *)
-	break ;
+	args="$args $1"			# accumulate args
 	;;
 
     esac
     shift
 done
 set_build_parameters	# things that depend on ${SRC}
-set_type $1 $2		# type and site, respectively
 
 # If $1="package", it creates a neat set of floppies
+set -- ${args}
+[ "$1" = "package" ] && build_package
+
+set_type $args		# type and site, respectively
 
-if [ "$1" = "package" ] ; then
-    build_package
-fi
-if [ "${o_interactive}" != "NO" ] ; then
-    main_dialog
-fi
+[ "${o_interactive}" != "NO" ] && main_dialog
+
 if [ "${o_clean}" = "YES" ] ; then
     clean_tree
 else

==== //depot/projects/hammer/release/picobsd/tinyware/login/Makefile#6 (text+ko) ====

@@ -1,15 +1,15 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD: src/release/picobsd/tinyware/login/Makefile,v 1.5 2006/03/17 18:54:30 ru Exp $
+# $FreeBSD: src/release/picobsd/tinyware/login/Makefile,v 1.6 2007/11/14 05:42:54 luigi Exp $
 
 .include <bsd.own.mk>
 
 .PATH: ${.CURDIR}/../../../../usr.bin/login
 
 PROG=	login
-SRCS=	pico-login.c login_access.c login_fbtab.c
-MAN=	login.1 login.access.5
+SRCS=	pico-login.c login_fbtab.c
+MAN=	login.1
 
-CFLAGS+=-DLOGIN_ACCESS -DLOGALL
+CFLAGS+=-DLOGALL
 
 DPADD=	${LIBUTIL} ${LIBCRYPT}
 LDADD=	-lutil -lcrypt

==== //depot/projects/hammer/release/scripts/src-install.sh#5 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/release/scripts/src-install.sh,v 1.11 2007/06/28 18:26:35 jhb Exp $
+# $FreeBSD: src/release/scripts/src-install.sh,v 1.12 2007/11/09 08:50:02 ru Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
@@ -11,8 +11,8 @@
 	echo "You must specify which components of src to extract"
 	echo "possible subcomponents are:"
 	echo
-	echo "base bin cddl contrib crypto etc games gnu include krb5 lib"
-	echo "libexec release rescue sbin secure share sys tools ubin"
+	echo "base bin cddl compat contrib crypto etc games gnu include krb5"
+	echo "lib libexec release rescue sbin secure share sys tools ubin"
 	echo "usbin"
 	echo
 	echo "You may also specify all to extract all subcomponents."
@@ -20,7 +20,7 @@
 fi
 
 if [ "$1" = "all" ]; then
-	dists="base bin cddl contrib crypto etc games gnu include krb5 lib libexec release rescue sbin secure share sys tools ubin usbin"
+	dists="base bin cddl compat contrib crypto etc games gnu include krb5 lib libexec release rescue sbin secure share sys tools ubin usbin"
 else
 	dists="$*"
 fi

==== //depot/projects/hammer/sbin/mdconfig/mdconfig.8#20 (text+ko) ====

@@ -39,9 +39,9 @@
 .\"     @(#)vnconfig.8	8.1 (Berkeley) 6/5/93
 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29
 .\"
-.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.37 2007/05/18 13:57:17 keramida Exp $
+.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.40 2007/11/11 08:14:22 keramida Exp $
 .\"
-.Dd May 18, 2007
+.Dd November 11, 2007
 .Dt MDCONFIG 8
 .Os
 .Sh NAME
@@ -96,7 +96,7 @@
 .It Cm vnode
 A file specified with
 .Fl f Ar file
-becomes the backingstore for this memory disk.
+becomes the backing store for this memory disk.
 .It Cm swap
 Swap space is used to back this memory disk.
 .El
@@ -185,7 +185,7 @@
 .Pa /dev/md4
 with
 .Pa /tmp/boot.flp
-as backing:
+as backing storage:
 .Pp
 .Dl mdconfig -a -t vnode -f /tmp/boot.flp -u 4
 .Pp
@@ -194,7 +194,9 @@
 .Pp
 .Dl mdconfig -d -u 4
 .Pp
-To create and mount a 128MByte swap backed file system on
+To create a 128MByte swap backed disk, initialize an
+.Xr ffs 7
+file system on it, and mount it on
 .Pa /tmp :
 .Bd -literal -offset indent
 mdconfig -a -t swap -s 128M -u 10
@@ -203,10 +205,10 @@
 chmod 1777 /tmp
 .Ed
 .Pp
-To create a 5MB file-backed disk (
-.Fl -a
+To create a 5MB file-backed disk
+.Ns ( Fl a
 and
-.Fl -t Ar vnode
+.Fl t Ar vnode
 are implied):
 .Bd -literal -offset indent
 dd if=/dev/zero of=somebackingfile bs=1k count=5k
@@ -216,13 +218,21 @@
 mount /dev/md0c /mnt
 .Ed
 .Pp
-To mount an ISO 9660 CD image file:
+To create an
+.Xr md 4
+device out of an ISO 9660 CD image file
+.Ns ( Fl a
+and
+.Fl t Ar vnode
+are implied), using the first available
+.Xr md 4
+device, and then mount the new memory disk:
 .Bd -literal -offset indent
-mdconfig -a -t vnode -u 10 -f cdimage.iso
-mount_cd9660 /dev/md10 /mnt
+mount -t cd9660 /dev/`mdconfig -f cdimage.iso` /mnt
 .Ed
 .Sh SEE ALSO
 .Xr md 4 ,
+.Xr ffs 7 ,
 .Xr bsdlabel 8 ,
 .Xr fdisk 8 ,
 .Xr mdmfs 8 ,

==== //depot/projects/hammer/share/doc/legal/Makefile#2 (text+ko) ====

@@ -1,6 +1,7 @@
-# $FreeBSD: src/share/doc/legal/Makefile,v 1.1 2007/03/02 11:42:54 flz Exp $
+# $FreeBSD: src/share/doc/legal/Makefile,v 1.2 2007/11/08 22:09:35 benjsc Exp $
 
 SUBDIR=	intel_ipw \
-	intel_iwi
+	intel_iwi \
+	intel_wpi
 
 .include <bsd.subdir.mk>

==== //depot/projects/hammer/share/examples/pf/Makefile#4 (text+ko) ====

@@ -1,9 +1,10 @@
-# $FreeBSD: src/share/examples/pf/Makefile,v 1.3 2004/12/21 08:46:53 ru Exp $
+# $FreeBSD: src/share/examples/pf/Makefile,v 1.4 2007/11/11 01:16:51 mlaier Exp $
 
 NO_OBJ=
 
 FILES=	faq-example1 faq-example2 faq-example3 \
 	ackpri queue1 queue2 queue3 queue4 \
+	pf.conf \
 	spamd
 
 FILESDIR=	${SHAREDIR}/examples/pf

==== //depot/projects/hammer/share/examples/pf/ackpri#2 (text+ko) ====

@@ -1,5 +1,5 @@
-# $FreeBSD: src/share/examples/pf/ackpri,v 1.1 2004/09/14 01:07:18 mlaier Exp $
-# $OpenBSD: ackpri,v 1.2 2003/03/10 14:24:33 henning Exp $
+# $FreeBSD: src/share/examples/pf/ackpri,v 1.2 2007/11/11 01:16:51 mlaier Exp $
+# $OpenBSD: ackpri,v 1.3 2006/10/07 04:48:01 mcbride Exp $
 
 # Use a simple priority queue to prioritize empty (no payload) TCP ACKs,
 # which dramatically improves throughput on (asymmetric) links when the
@@ -25,9 +25,7 @@
 queue q_pri priority 7
 queue q_def priority 1 priq(default)
 
-pass out on $ext_if proto tcp from $ext_if to any flags S/SA \
-	keep state queue (q_def, q_pri)
+pass out on $ext_if proto tcp from $ext_if to any queue (q_def, q_pri)
 
-pass in  on $ext_if proto tcp from any to $ext_if flags S/SA \
-	keep state queue (q_def, q_pri)
+pass in  on $ext_if proto tcp from any to $ext_if queue (q_def, q_pri)
 

==== //depot/projects/hammer/share/examples/pf/faq-example1#2 (text+ko) ====

@@ -1,5 +1,5 @@
-# $FreeBSD: src/share/examples/pf/faq-example1,v 1.1 2004/09/14 01:07:18 mlaier Exp $
-# $OpenBSD: faq-example1,v 1.2 2003/08/06 16:04:45 henning Exp $
+# $FreeBSD: src/share/examples/pf/faq-example1,v 1.2 2007/11/11 01:16:51 mlaier Exp $

>>> TRUNCATED FOR MAIL (1000 lines) <<<

More information about the p4-projects mailing list