PERFORCE change 128274 for review
Kip Macy
kmacy at FreeBSD.org
Sun Oct 28 21:32:13 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=128274
Change 128274 by kmacy at entropy_kmacy_xen31 on 2007/10/29 04:31:54
IFC #128267
Affected files ...
.. //depot/projects/xen31/ObsoleteFiles.inc#3 integrate
.. //depot/projects/xen31/bin/ps/extern.h#2 integrate
.. //depot/projects/xen31/bin/ps/keyword.c#2 integrate
.. //depot/projects/xen31/bin/ps/print.c#2 integrate
.. //depot/projects/xen31/bin/ps/ps.c#2 integrate
.. //depot/projects/xen31/contrib/one-true-awk/FIXES#2 integrate
.. //depot/projects/xen31/contrib/one-true-awk/FREEBSD-upgrade#2 integrate
.. //depot/projects/xen31/contrib/one-true-awk/lib.c#2 integrate
.. //depot/projects/xen31/contrib/one-true-awk/tran.c#2 integrate
.. //depot/projects/xen31/etc/rc.d/Makefile#2 integrate
.. //depot/projects/xen31/etc/rc.d/amd#2 integrate
.. //depot/projects/xen31/etc/rc.d/nfslocking#2 delete
.. //depot/projects/xen31/games/fortune/datfiles/fortunes#2 integrate
.. //depot/projects/xen31/include/_ctype.h#2 integrate
.. //depot/projects/xen31/include/pthread_np.h#2 integrate
.. //depot/projects/xen31/lib/Makefile#2 integrate
.. //depot/projects/xen31/lib/libarchive/archive_read_support_compression_none.c#2 integrate
.. //depot/projects/xen31/lib/libkvm/kvm_proc.c#2 integrate
.. //depot/projects/xen31/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate
.. //depot/projects/xen31/rescue/rescue/Makefile#2 integrate
.. //depot/projects/xen31/sbin/ipfw/ipfw2.c#2 integrate
.. //depot/projects/xen31/sbin/route/route.c#2 integrate
.. //depot/projects/xen31/share/man/man5/rc.conf.5#2 integrate
.. //depot/projects/xen31/share/man/man8/rc.subr.8#2 integrate
.. //depot/projects/xen31/share/man/man9/Makefile#2 integrate
.. //depot/projects/xen31/share/man/man9/kproc.9#2 integrate
.. //depot/projects/xen31/share/man/man9/kthread.9#2 integrate
.. //depot/projects/xen31/share/misc/committers-doc.dot#2 integrate
.. //depot/projects/xen31/share/misc/committers-src.dot#2 integrate
.. //depot/projects/xen31/share/misc/pci_vendors#2 integrate
.. //depot/projects/xen31/share/mk/sys.mk#2 integrate
.. //depot/projects/xen31/sys/amd64/amd64/local_apic.c#2 integrate
.. //depot/projects/xen31/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/xen31/sys/amd64/amd64/nexus.c#2 integrate
.. //depot/projects/xen31/sys/amd64/conf/DEFAULTS#2 integrate
.. //depot/projects/xen31/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/xen31/sys/amd64/include/clock.h#2 integrate
.. //depot/projects/xen31/sys/amd64/include/pc/bios.h#2 integrate
.. //depot/projects/xen31/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/xen31/sys/arm/at91/at91rm92reg.h#2 integrate
.. //depot/projects/xen31/sys/arm/at91/kb920x_machdep.c#3 integrate
.. //depot/projects/xen31/sys/arm/at91/std.at91#2 integrate
.. //depot/projects/xen31/sys/arm/at91/std.kb920x#2 integrate
.. //depot/projects/xen31/sys/boot/arm/at91/boot2/boot2.c#2 integrate
.. //depot/projects/xen31/sys/boot/arm/at91/libat91/eeprom.c#2 integrate
.. //depot/projects/xen31/sys/boot/arm/at91/libat91/emac.c#2 integrate
.. //depot/projects/xen31/sys/boot/arm/at91/libat91/emac_init.c#2 integrate
.. //depot/projects/xen31/sys/boot/arm/at91/libat91/lib.h#2 integrate
.. //depot/projects/xen31/sys/boot/common/ufsread.c#3 integrate
.. //depot/projects/xen31/sys/boot/i386/boot2/boot2.c#3 integrate
.. //depot/projects/xen31/sys/boot/i386/gptboot/Makefile#2 integrate
.. //depot/projects/xen31/sys/boot/i386/gptboot/gptboot.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/libi386/biosdisk.c#3 integrate
.. //depot/projects/xen31/sys/boot/i386/libi386/biosmem.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/libi386/biossmap.c#2 integrate
.. //depot/projects/xen31/sys/boot/pc98/libpc98/biosdisk.c#3 integrate
.. //depot/projects/xen31/sys/conf/files#2 integrate
.. //depot/projects/xen31/sys/conf/files.amd64#2 integrate
.. //depot/projects/xen31/sys/conf/files.arm#2 integrate
.. //depot/projects/xen31/sys/conf/files.ia64#2 integrate
.. //depot/projects/xen31/sys/conf/files.pc98#2 integrate
.. //depot/projects/xen31/sys/conf/files.powerpc#2 integrate
.. //depot/projects/xen31/sys/conf/files.sun4v#2 integrate
.. //depot/projects/xen31/sys/conf/options.arm#2 integrate
.. //depot/projects/xen31/sys/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/xen31/sys/ddb/db_examine.c#2 integrate
.. //depot/projects/xen31/sys/dev/acpi_support/acpi_ibm.c#2 integrate
.. //depot/projects/xen31/sys/dev/acpica/acpi_ec.c#2 integrate
.. //depot/projects/xen31/sys/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/xen31/sys/dev/acpica/acpi_pci_link.c#2 integrate
.. //depot/projects/xen31/sys/dev/ata/ata-chipset.c#2 integrate
.. //depot/projects/xen31/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/xen31/sys/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/xen31/sys/dev/ata/atapi-cd.h#2 integrate
.. //depot/projects/xen31/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/xen31/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/xen31/sys/dev/mii/rgephyreg.h#2 integrate
.. //depot/projects/xen31/sys/dev/nvram/nvram.c#1 branch
.. //depot/projects/xen31/sys/dev/pci/pci_user.c#3 integrate
.. //depot/projects/xen31/sys/dev/sound/pcm/ac97.c#2 integrate
.. //depot/projects/xen31/sys/dev/sound/pcm/ac97_patch.c#2 integrate
.. //depot/projects/xen31/sys/fs/msdosfs/denode.h#2 integrate
.. //depot/projects/xen31/sys/fs/msdosfs/msdosfs_fat.c#2 integrate
.. //depot/projects/xen31/sys/geom/geom_io.c#2 integrate
.. //depot/projects/xen31/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/xen31/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/xen31/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/xen31/sys/i386/include/clock.h#2 integrate
.. //depot/projects/xen31/sys/i386/include/pc/bios.h#2 integrate
.. //depot/projects/xen31/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/xen31/sys/kern/init_main.c#3 integrate
.. //depot/projects/xen31/sys/kern/kern_exit.c#3 integrate
.. //depot/projects/xen31/sys/kern/kern_idle.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_intr.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_kthread.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_mbuf.c#3 integrate
.. //depot/projects/xen31/sys/kern/kern_shutdown.c#3 integrate
.. //depot/projects/xen31/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/xen31/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/xen31/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/xen31/sys/modules/Makefile#2 integrate
.. //depot/projects/xen31/sys/modules/geom/Makefile#2 integrate
.. //depot/projects/xen31/sys/modules/nvram/Makefile#1 branch
.. //depot/projects/xen31/sys/net/if_disc.c#2 integrate
.. //depot/projects/xen31/sys/net/if_loop.c#2 integrate
.. //depot/projects/xen31/sys/netatalk/aarp.c#2 integrate
.. //depot/projects/xen31/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/xen31/sys/netinet/if_ether.c#2 integrate
.. //depot/projects/xen31/sys/netinet/igmp.c#2 integrate
.. //depot/projects/xen31/sys/netinet/ip_fw2.c#3 integrate
.. //depot/projects/xen31/sys/netinet/ip_icmp.c#3 integrate
.. //depot/projects/xen31/sys/netinet/tcp_syncache.c#3 integrate
.. //depot/projects/xen31/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/xen31/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/xen31/sys/nfsserver/nfs_srvsock.c#2 integrate
.. //depot/projects/xen31/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/xen31/sys/security/audit/audit.c#2 integrate
.. //depot/projects/xen31/sys/security/audit/audit.h#2 integrate
.. //depot/projects/xen31/sys/security/audit/audit_bsm.c#3 integrate
.. //depot/projects/xen31/sys/security/audit/audit_pipe.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_atalk.c#1 branch
.. //depot/projects/xen31/sys/security/mac/mac_framework.h#3 integrate
.. //depot/projects/xen31/sys/security/mac/mac_inet.c#3 integrate
.. //depot/projects/xen31/sys/security/mac/mac_inet6.c#1 branch
.. //depot/projects/xen31/sys/security/mac/mac_internal.h#3 integrate
.. //depot/projects/xen31/sys/security/mac/mac_net.c#3 integrate
.. //depot/projects/xen31/sys/security/mac/mac_policy.h#3 integrate
.. //depot/projects/xen31/sys/security/mac/mac_process.c#3 integrate
.. //depot/projects/xen31/sys/security/mac/mac_vfs.c#3 integrate
.. //depot/projects/xen31/sys/security/mac_biba/mac_biba.c#3 integrate
.. //depot/projects/xen31/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate
.. //depot/projects/xen31/sys/security/mac_ifoff/mac_ifoff.c#3 integrate
.. //depot/projects/xen31/sys/security/mac_lomac/mac_lomac.c#3 integrate
.. //depot/projects/xen31/sys/security/mac_mls/mac_mls.c#3 integrate
.. //depot/projects/xen31/sys/security/mac_none/mac_none.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_partition/mac_partition.c#3 integrate
.. //depot/projects/xen31/sys/security/mac_portacl/mac_portacl.c#3 integrate
.. //depot/projects/xen31/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate
.. //depot/projects/xen31/sys/security/mac_stub/mac_stub.c#3 integrate
.. //depot/projects/xen31/sys/security/mac_test/mac_test.c#3 integrate
.. //depot/projects/xen31/sys/sparc64/isa/isa.c#2 integrate
.. //depot/projects/xen31/sys/sys/kthread.h#2 integrate
.. //depot/projects/xen31/sys/sys/param.h#3 integrate
.. //depot/projects/xen31/sys/sys/proc.h#2 integrate
.. //depot/projects/xen31/sys/vm/vm_page.c#2 integrate
.. //depot/projects/xen31/tools/regression/geom_eli/init-a.t#2 integrate
.. //depot/projects/xen31/tools/regression/geom_eli/init.t#2 integrate
.. //depot/projects/xen31/tools/regression/geom_eli/integrity-copy.t#2 integrate
.. //depot/projects/xen31/tools/regression/geom_eli/integrity-data.t#2 integrate
.. //depot/projects/xen31/tools/regression/geom_eli/integrity-hmac.t#2 integrate
.. //depot/projects/xen31/tools/regression/geom_eli/onetime-a.t#2 integrate
.. //depot/projects/xen31/tools/regression/geom_eli/onetime.t#2 integrate
.. //depot/projects/xen31/usr.bin/awk/Makefile#2 integrate
.. //depot/projects/xen31/usr.bin/awk/lib.c.diff#2 delete
.. //depot/projects/xen31/usr.bin/awk/tran.c.diff#2 delete
.. //depot/projects/xen31/usr.bin/calendar/calendars/calendar.freebsd#2 integrate
.. //depot/projects/xen31/usr.bin/top/machine.c#2 integrate
.. //depot/projects/xen31/usr.sbin/crunch/crunchgen/crunched_main.c#2 integrate
.. //depot/projects/xen31/usr.sbin/devinfo/devinfo.c#2 integrate
.. //depot/projects/xen31/usr.sbin/mountd/mountd.c#2 integrate
.. //depot/projects/xen31/usr.sbin/pciconf/cap.c#2 integrate
.. //depot/projects/xen31/usr.sbin/pkg_install/version/perform.c#2 integrate
.. //depot/projects/xen31/usr.sbin/wpa/hostapd/hostapd.8#2 integrate
Differences ...
==== //depot/projects/xen31/ObsoleteFiles.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.114 2007/10/22 12:31:23 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm 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.
#
+# 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
OLD_FILES+=etc/rc.d/cached
OLD_FILES+=usr/sbin/cached
==== //depot/projects/xen31/bin/ps/extern.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.3 (Berkeley) 4/2/94
- * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $
+ * $FreeBSD: src/bin/ps/extern.h,v 1.38 2007/10/26 08:00:40 julian Exp $
*/
struct kinfo;
@@ -39,7 +39,7 @@
extern int cflag, eval, fscale, nlistread, rawcpu;
extern unsigned long mempages;
extern time_t now;
-extern int sumrusage, termwidth, totwidth;
+extern int showthreads, sumrusage, termwidth, totwidth;
extern STAILQ_HEAD(velisthead, varent) varlist;
__BEGIN_DECLS
@@ -78,6 +78,7 @@
void showkey(void);
void started(KINFO *, VARENT *);
void state(KINFO *, VARENT *);
+void tdnam(KINFO *, VARENT *);
void tdev(KINFO *, VARENT *);
void tname(KINFO *, VARENT *);
void ucomm(KINFO *, VARENT *);
==== //depot/projects/xen31/bin/ps/keyword.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.76 2006/04/06 03:24:31 gad Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.78 2007/10/28 17:10:36 julian Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -186,6 +186,7 @@
{"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid),
UINT, UIDFMT, 0},
{"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0},
+ {"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0},
{"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0},
{"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT,
PIDFMT, 0},
==== //depot/projects/xen31/bin/ps/print.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.96 2007/10/26 08:00:40 julian Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -129,9 +129,11 @@
v = ve->var;
if (cflag) {
/* If it is the last field, then don't pad */
- if (STAILQ_NEXT(ve, next_ve) == NULL)
+ if (STAILQ_NEXT(ve, next_ve) == NULL) {
(void)printf("%s", k->ki_p->ki_comm);
- else
+ if (showthreads && k->ki_p->ki_numthreads > 1)
+ printf("/%s", k->ki_p->ki_ocomm);
+ } else
(void)printf("%-*s", v->width, k->ki_p->ki_comm);
return;
}
@@ -178,13 +180,28 @@
VAR *v;
v = ve->var;
- if (STAILQ_NEXT(ve, next_ve) == NULL) /* last field, don't pad */
+ if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field, don't pad */
(void)printf("%s", k->ki_p->ki_comm);
- else
+ if (showthreads && k->ki_p->ki_numthreads > 1)
+ printf("/%s", k->ki_p->ki_ocomm);
+ } else
(void)printf("%-*s", v->width, k->ki_p->ki_comm);
}
void
+tdnam(KINFO *k, VARENT *ve)
+{
+ VAR *v;
+
+ v = ve->var;
+ if (showthreads && k->ki_p->ki_numthreads > 1)
+ (void)printf("%-*s", v->width, k->ki_p->ki_ocomm);
+ else
+ (void)printf("%-*s", v->width, " " );
+
+}
+
+void
logname(KINFO *k, VARENT *ve)
{
VAR *v;
==== //depot/projects/xen31/bin/ps/ps.c#2 (text+ko) ====
@@ -47,7 +47,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -98,6 +98,7 @@
int sumrusage; /* -S */
int termwidth; /* Width of the screen (0 == infinity). */
int totwidth; /* Calculated-width of requested variables. */
+int showthreads; /* will threads be shown? */
struct velisthead varlist = STAILQ_HEAD_INITIALIZER(varlist);
@@ -175,7 +176,7 @@
char *cols;
int all, ch, elem, flag, _fmt, i, lineno;
int nentries, nkept, nselectors;
- int prtheader, showthreads, wflag, what, xkeep, xkeep_implied;
+ int prtheader, wflag, what, xkeep, xkeep_implied;
char errbuf[_POSIX2_LINE_MAX];
(void) setlocale(LC_ALL, "");
==== //depot/projects/xen31/contrib/one-true-awk/FIXES#2 (text+ko) ====
@@ -25,6 +25,14 @@
This file lists all bug fixes, changes, etc., made since the AWK book
was sent to the printers in August, 1987.
+Oct 23, 2007:
+ minor fix in lib.c: increase inputFS to 100, change malloc
+ for fields to n+1.
+
+ fixed memory fault caused by out of order test in setsval.
+
+ thanks to david o'brien, freebsd, for both fixes.
+
May 1, 2007:
fiddle in makefile to fix for BSD make; thanks to igor sobrado.
==== //depot/projects/xen31/contrib/one-true-awk/FREEBSD-upgrade#2 (text+ko) ====
@@ -1,12 +1,12 @@
-# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.10 2007/06/05 15:34:40 rafan Exp $
+# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.11 2007/10/25 12:38:34 obrien Exp $
Import of the 2005/04/24 version of the "one true awk", as described
in "The AWK Programming Language", by Al Aho, Brian Kernighan, and
Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X).
-Original sources were taken from the Brian Kernighan's home page
-(http://cm.bell-labs.com/who/bwk/) and include bug fixes up thru
-May 01, 2007.
+Original sources were taken from the Brian Kernighan's AWK page
+http://www.cs.princeton.edu/~bwk/btl.mirror
+and include bug fixes up thru Oct 23, 2007.
The following files were removed for this import:
@@ -21,4 +21,4 @@
The vendor import was done by:
- cvs import src/contrib/one-true-awk BELL_LABS bwk_20070501
+ cvs import src/contrib/one-true-awk BELL_LABS bwk_20071023
==== //depot/projects/xen31/contrib/one-true-awk/lib.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
int fieldssize = RECSIZE;
Cell **fldtab; /* pointers to Cells */
-char inputFS[10] = " ";
+char inputFS[100] = " ";
#define MAXFLD 2
int nfields = MAXFLD; /* last allocated slot for $i */
@@ -58,7 +58,7 @@
void recinit(unsigned int n)
{
if ( (record = (char *) malloc(n)) == NULL
- || (fields = (char *) malloc(n)) == NULL
+ || (fields = (char *) malloc(n+1)) == NULL
|| (fldtab = (Cell **) malloc((nfields+1) * sizeof(Cell *))) == NULL
|| (fldtab[0] = (Cell *) malloc(sizeof(Cell))) == NULL )
FATAL("out of space for $0 and fields");
==== //depot/projects/xen31/contrib/one-true-awk/tran.c#2 (text+ko) ====
@@ -332,10 +332,10 @@
donerec = 1;
}
t = tostring(s); /* in case it's self-assign */
+ if (freeable(vp))
+ xfree(vp->sval);
vp->tval &= ~NUM;
vp->tval |= STR;
- if (freeable(vp))
- xfree(vp->sval);
vp->tval &= ~DONTFREE;
dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n",
vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) );
==== //depot/projects/xen31/etc/rc.d/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.86 2007/10/15 20:00:18 netchild Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $
.include <bsd.own.mk>
@@ -25,7 +25,7 @@
mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
named natd netif netoptions \
network_ipv6 newsyslog nfsclient nfsd \
- nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \
+ nfsserver nisdomain nsswitch ntpd ntpdate \
othermta \
pf pflog pfsync \
powerd power_profile ppp pppoed pwcheck \
==== //depot/projects/xen31/etc/rc.d/amd#2 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
-# $FreeBSD: src/etc/rc.d/amd,v 1.19 2007/10/19 22:55:42 mtm Exp $
+# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $
#
# PROVIDE: amd
@@ -47,7 +47,7 @@
;;
*)
rc_flags="-p ${rc_flags}"
- command_args=" > /var/run/amd.pid 2> /dev/null"
+ command_args="> /var/run/amd.pid 2> /dev/null"
;;
esac
return 0
==== //depot/projects/xen31/games/fortune/datfiles/fortunes#2 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.243 2007/10/21 05:16:52 dougb Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.244 2007/10/28 07:02:10 dougb Exp $
%
=======================================================================
@@ -16494,10 +16494,10 @@
you through times of no dope.
-- Gilbert Shelton
%
-Dorothy: But how can you talk without a brain?
-Scarecrow: Well, I don't know... but some people
- without brains do an awful lot of talking.
- -- The Wizard of Oz
+Dorothy: How can you talk if you haven't got a brain?
+Scarecrow: I don't know. But some people without brains do an
+ awful lot of talking, don't they?
+ -- Judy Garland and Ray Bolger, "The Wizard of Oz"
%
Double!
%
@@ -20094,8 +20094,6 @@
think not, my friend, I think not.
-- Arthur Naiman, "Every Goy's Guide to Yiddish"
%
-"Gee, Toto, I don't think we are in Kansas anymore."
-%
GEMINI (May 21 - June 20)
A day to take the initiative. Put the garbage out, for
instance, and pick up the stuff at the dry cleaners. Watch
@@ -22013,7 +22011,7 @@
Guernsey cows? It's gonna be the herd shot 'round the world.
%
Hearts will never be practical until they can be made unbreakable.
- -- The Wizard of Oz
+ -- Frank Morgan as The Wizard, "The Wizard of Oz"
%
Heaven and earth were created all together in the same instant,
on October 23rd, 4004 B.C. at nine o'clock in the morning.
@@ -23447,6 +23445,9 @@
I can't believe that out of 100,000 sperm, you were the quickest.
-- Steven Pearl
%
+I CAN'T come back, I don't know how it works.
+ -- Frank Morgan as The Wizard, "The Wizard of Oz"
+%
I can't complain, but sometimes I still do.
-- Joe Walsh
%
@@ -28015,6 +28016,9 @@
thank everyone for making this night necessary.
-- Yogi Berra at a dinner in his honor
%
+Oh no my dear, I'm a very good man. I'm just a very bad wizard.
+ -- Frank Morgan as The Wizard, "The Wizard of Oz"
+%
I'm all for computer dating, but I
wouldn't want one to marry my sister.
%
@@ -38585,6 +38589,9 @@
%
Pause for storage relocation.
%
+Pay no attention to that man behind the curtain.
+ -- Frank Morgan as The Wizard, "The Wizard of Oz"
+%
paycheck:
The weekly $5.27 that remains after deductions for federal
withholding, state withholding, city withholding, FICA,
@@ -53297,8 +53304,8 @@
TOTD (T-shirt Of The Day):
I'm the person your mother warned you about.
%
-Toto, I don't think we're in Kansas anymore.
- -- Judy Garland, "Wizard of Oz"
+Toto, I have a feeling we're not in Kansas anymore.
+ -- Judy Garland as Dorothy Gale, "The Wizard of Oz"
%
Tourists -- have some fun with New York's hard-boiled cabbies. When you
get to your destination, say to your driver, "Pay? I was hitch-hiking."
@@ -56222,6 +56229,9 @@
%
What will you do if all your problems aren't solved by the time you die?
%
+What would you do with a brain if you had one?
+ -- Judy Garland as Dorothy Gale, "The Wizard of Oz"
+%
What you don't know can hurt you, only you won't know it.
%
What you don't know won't help you much either.
==== //depot/projects/xen31/include/_ctype.h#2 (text+ko) ====
@@ -40,7 +40,7 @@
*
* From @(#)ctype.h 8.4 (Berkeley) 1/21/94
* From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp
- * $FreeBSD: src/include/_ctype.h,v 1.31 2007/10/13 16:28:21 ache Exp $
+ * $FreeBSD: src/include/_ctype.h,v 1.33 2007/10/27 22:32:27 ache Exp $
*/
#ifndef __CTYPE_H_
@@ -126,7 +126,7 @@
static __inline int
__isctype(__ct_rune_t _c, unsigned long _f)
{
- return (_c < 0 || _c >= __mb_sb_limit) ? 0 :
+ return (_c & ~0x7F) ? 0 :
!!(_DefaultRuneLocale.__runetype[_c] & _f);
}
==== //depot/projects/xen31/include/pthread_np.h#2 (text+ko) ====
@@ -10,10 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
+ * 3. Neither the name of the author nor the names of any co-contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -29,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/pthread_np.h,v 1.16 2005/10/04 07:23:56 davidxu Exp $
+ * $FreeBSD: src/include/pthread_np.h,v 1.17 2007/10/29 00:31:54 imp Exp $
*/
#ifndef _PTHREAD_NP_H_
#define _PTHREAD_NP_H_
==== //depot/projects/xen31/lib/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.224 2007/10/09 23:31:10 obrien Exp $
+# $FreeBSD: src/lib/Makefile,v 1.225 2007/10/26 11:07:25 ru Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@
# built are visible:
#
# csu must be built before all shared libaries for ELF.
-# libc must be built before all other shared libraries
+# libc must be built before all other shared libraries.
# libcom_err must be built before libkrb5 and libpam.
# libcrypt must be built before libkrb5 and libpam.
# libkvm must be built before libdevstat.
==== //depot/projects/xen31/lib/libarchive/archive_read_support_compression_none.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.17 2007/05/29 01:00:19 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.18 2007/10/27 22:45:40 kientzle Exp $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -334,7 +334,7 @@
const void* dummy_buffer;
ssize_t bytes_read;
bytes_read = archive_decompressor_none_read_ahead(a,
- &dummy_buffer, request);
+ &dummy_buffer, 1);
if (bytes_read < 0)
return (bytes_read);
if (bytes_read == 0) {
==== //depot/projects/xen31/lib/libkvm/kvm_proc.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.94 2007/09/21 04:11:34 jeff Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.96 2007/10/26 15:25:28 julian Exp $");
/*
* Proc traversal interface for kvm. ps and w are (probably) the exclusive
@@ -120,6 +120,10 @@
kp = &kinfo_proc;
kp->ki_structsize = sizeof(kinfo_proc);
+ /*
+ * Loop on the processes. this is completely broken because we need to be
+ * able to loop on the threads and merge the ones that are the same process some how.
+ */
for (; cnt < maxcnt && p != NULL; p = LIST_NEXT(&proc, p_list)) {
memset(kp, 0, sizeof *kp);
if (KREAD(kd, (u_long)p, &proc)) {
@@ -402,8 +406,11 @@
kp->ki_pri.pri_native = mtd.td_base_pri;
kp->ki_lastcpu = mtd.td_lastcpu;
kp->ki_wchan = mtd.td_wchan;
+ if (mtd.td_name[0] != 0)
+ strlcpy(kp->ki_ocomm, mtd.td_name, MAXCOMLEN);
kp->ki_oncpu = mtd.td_oncpu;
-
+ if (mtd.td_name[0] != '\0')
+ strlcpy(kp->ki_ocomm, mtd.td_name, sizeof(kp->ki_ocomm));
if (!(proc.p_flag & P_SA)) {
kp->ki_pctcpu = 0;
kp->ki_rqindex = 0;
==== //depot/projects/xen31/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 (text+ko) ====
@@ -32,9 +32,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8,v 1.9 2004/07/02 23:52:17 ru Exp $
+.\" $FreeBSD: src/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8,v 1.10 2007/10/26 07:50:11 des Exp $
.\"
-.Dd January 21, 2002
+.Dd October 26, 2007
.Dt PAM_OPIEACCESS 8
.Os
.Sh NAME
@@ -88,7 +88,7 @@
host in
.Pa /etc/opieaccess ,
and the user does not have a file named
-.Pa opiealways
+.Pa \&.opiealways
in his home directory.
.El
.Pp
@@ -115,12 +115,14 @@
was declined.
.El
.Sh FILES
-.Bl -tag -width ".Pa /etc/opieaccess"
+.Bl -tag -width ".Pa $HOME/.opiealways"
.It Pa /etc/opieaccess
List of trusted hosts or networks.
See
.Xr opieaccess 5
for a description of its syntax.
+.It Pa $HOME/.opiealways
+The presence of this file makes OPIE mandatory for the user.
.El
.Sh SEE ALSO
.Xr opie 4 ,
==== //depot/projects/xen31/rescue/rescue/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-#$FreeBSD: src/rescue/rescue/Makefile,v 1.56 2007/07/14 21:49:22 rwatson Exp $
+#$FreeBSD: src/rescue/rescue/Makefile,v 1.57 2007/10/27 18:18:58 yar Exp $
# @(#)Makefile 8.1 (Berkeley) 6/2/93
NO_MAN=
@@ -85,6 +85,10 @@
CRUNCH_ALIAS_rm= unlink
CRUNCH_ALIAS_ed= red
+CRUNCH_PROGS_bin+= pkill
+CRUNCH_SRCDIR_pkill= ${.CURDIR}/../../usr.bin/pkill
+CRUNCH_ALIAS_pkill= pgrep
+
.if ${MK_RCMDS} != "no"
CRUNCH_PROGS_bin+= rcp
.endif
@@ -190,6 +194,8 @@
#
CRUNCH_SRCDIRS+= usr.bin
+CRUNCH_PROGS_usr.bin= head mt sed tail tee
+
CRUNCH_PROGS_usr.bin+= gzip
CRUNCH_ALIAS_gzip= gunzip gzcat zcat
@@ -211,7 +217,10 @@
#
CRUNCH_SRCDIRS+= usr.sbin
-CRUNCH_PROGS_usr.sbin+= chroot
+CRUNCH_PROGS_usr.sbin= chroot
+
+CRUNCH_PROGS_usr.sbin+= chown
+CRUNCH_ALIAS_chown= chgrp
##################################################################
# The following is pretty nearly a generic crunchgen-handling makefile
==== //depot/projects/xen31/sbin/ipfw/ipfw2.c#2 (text+ko) ====
@@ -17,7 +17,7 @@
*
* NEW command line interface for IP firewall facility
*
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.109 2007/10/19 12:48:02 rpaulo Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.110 2007/10/27 22:04:19 maxim Exp $
*/
#include <sys/param.h>
@@ -6226,16 +6226,16 @@
config_pipe(ac, av);
else if (do_nat && _substrcmp(*av, "config") == 0)
config_nat(ac, av);
- else if (_substrcmp(*av, "set") == 0)
- sets_handler(ac, av);
- else if (_substrcmp(*av, "table") == 0)
- table_handler(ac, av);
- else if (_substrcmp(*av, "enable") == 0)
- sysctl_handler(ac, av, 1);
- else if (_substrcmp(*av, "disable") == 0)
- sysctl_handler(ac, av, 0);
- else
- try_next = 1;
+ else if (_substrcmp(*av, "set") == 0)
+ sets_handler(ac, av);
+ else if (_substrcmp(*av, "table") == 0)
+ table_handler(ac, av);
+ else if (_substrcmp(*av, "enable") == 0)
+ sysctl_handler(ac, av, 1);
+ else if (_substrcmp(*av, "disable") == 0)
+ sysctl_handler(ac, av, 0);
+ else
+ try_next = 1;
}
if (use_set || try_next) {
==== //depot/projects/xen31/sbin/route/route.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/route/route.c,v 1.81 2005/09/28 12:12:15 tobez Exp $";
+ "$FreeBSD: src/sbin/route/route.c,v 1.82 2007/10/29 00:08:24 mtm Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -799,28 +799,32 @@
rtm_addrs |= RTA_NETMASK;
if (net == 0)
mask = addr = 0;
- else if (net < 128) {
- addr = net << IN_CLASSA_NSHIFT;
- mask = IN_CLASSA_NET;
- } else if (net < 65536) {
- addr = net << IN_CLASSB_NSHIFT;
- mask = IN_CLASSB_NET;
- } else if (net < 16777216L) {
- addr = net << IN_CLASSC_NSHIFT;
- mask = IN_CLASSC_NET;
- } else {
- addr = net;
- if ((addr & IN_CLASSA_HOST) == 0)
- mask = IN_CLASSA_NET;
- else if ((addr & IN_CLASSB_HOST) == 0)
- mask = IN_CLASSB_NET;
- else if ((addr & IN_CLASSC_HOST) == 0)
- mask = IN_CLASSC_NET;
+ else {
+ if (net <= 0xff)
+ addr = net << IN_CLASSA_NSHIFT;
+ else if (net <= 0xffff)
+ addr = net << IN_CLASSB_NSHIFT;
+ else if (net <= 0xffffff)
+ addr = net << IN_CLASSC_NSHIFT;
else
- mask = -1;
+ addr = net;
+
+ if (bits != 0)
+ mask = 0xffffffff << (32 - bits);
+ else {
+ if (IN_CLASSA(addr))
+ mask = IN_CLASSA_NET;
+ else if (IN_CLASSB(addr))
+ mask = IN_CLASSB_NET;
+ else if (IN_CLASSC(addr))
+ mask = IN_CLASSC_NET;
+ else if (IN_MULTICAST(addr))
+ mask = IN_CLASSD_NET;
+ else
+ mask = 0xffffffff;
+ }
+ addr &= mask;
}
- if (bits)
- mask = 0xffffffff << (32 - bits);
sin->sin_addr.s_addr = htonl(addr);
sin = &so_mask.sin;
sin->sin_addr.s_addr = htonl(mask);
==== //depot/projects/xen31/share/man/man5/rc.conf.5#2 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.330 2007/10/15 20:00:20 netchild Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.331 2007/10/28 13:33:25 miwi Exp $
.\"
-.Dd September 3, 2007
+.Dd October 27, 2007
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -1127,7 +1127,9 @@
ifconfig_ed0="DHCP"
.Ed
.Pp
-Also, if your interface needs WPA authentication, it is possible to add
+Also, if you want to configure your wireless interface with
+.Xr wpa_supplicant 8
+for use with WPA, EAP/LEAP or WEP, you need to add
.Dq Li WPA
to the
.Va ifconfig_ Ns Aq Ar interface
==== //depot/projects/xen31/share/man/man8/rc.subr.8#2 (text+ko) ====
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man8/rc.subr.8,v 1.18 2007/05/18 12:04:41 mtm Exp $
+.\" $FreeBSD: src/share/man/man8/rc.subr.8,v 1.19 2007/10/26 09:38:54 yar Exp $
.\"
.Dd May 18, 2007
.Dt RC.SUBR 8
@@ -218,6 +218,11 @@
.Ar var
is not set correctly.
The values are case insensitive.
+.Sy Note :
+.Ar var
+should be a variable name, not its value;
+.Ic checkyesno
+will expand the variable by itself.
.It Ic check_pidfile Ar pidfile procname Op Ar interpreter
Parses the first word of the first line of
.Ar pidfile
@@ -836,20 +841,17 @@
.It Ic stop_boot Op Ar always
Prevent booting to multiuser mode.
If the
-.Sy autoboot
-variable is
-.Sq yes ,
+.Va autoboot
+variable is set to
+.Ql yes ,
or
-.Ar always
-is
-.Sq true ,
-then a
-.Sy SIGTERM
+.Ic checkyesno Ar always
+indicates a truth value, then a
+.Dv SIGTERM
signal is sent to the parent
-process (which is assumed to be
-.Xr rc 8 ).
-Otherwise, the shell exits with status
-.Li 1 .
+process, which is assumed to be
+.Xr rc 8 .
+Otherwise, the shell exits with a non-zero status.
.It Ic set_rcvar Op Ar base
Set the variable name required to start a service.
In
==== //depot/projects/xen31/share/man/man9/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.312 2007/10/15 20:00:20 netchild Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.314 2007/10/26 16:50:21 julian Exp $
MAN= accept_filter.9 \
accf_data.9 \
@@ -129,6 +129,7 @@
kernacc.9 \
kernel_mount.9 \
kobj.9 \
+ kproc.9 \
kqueue.9 \
kthread.9 \
ktr.9 \
@@ -603,8 +604,8 @@
hash.9 hash32_strn.9 \
hash.9 hash32_strne.9
MLINKS+=hashinit.9 hashdestroy.9 \
- hashinit.9 phashinit.9 \
- hashinit.9 hashinit_flags.9
+ hashinit.9 hashinit_flags.9 \
+ hashinit.9 phashinit.9
MLINKS+=ieee80211.9 ieee80211_attach.9 \
ieee80211.9 ieee80211_chan2ieee.9 \
ieee80211.9 ieee80211_chan2mode.9 \
@@ -674,6 +675,13 @@
kobj.9 kobj_create.9 \
kobj.9 kobj_delete.9 \
kobj.9 kobj_init.9
+MLINKS+=kproc.9 kproc_create.9 \
+ kproc.9 kproc_exit.9 \
+ kproc.9 kproc_resume,.9 \
+ kproc.9 kproc_shutdown.9 \
+ kproc.9 kproc_start.9 \
+ kproc.9 kproc_suspend.9 \
+ kproc.9 kproc_suspend_check.9
MLINKS+=kqueue.9 knlist_add.9 \
kqueue.9 knlist_clear.9 \
kqueue.9 knlist_delete.9 \
@@ -688,11 +696,11 @@
kqueue.9 kqfd_register.9 \
kqueue.9 kqueue_add_filteropts.9 \
kqueue.9 kqueue_del_filteropts.9
-MLINKS+=kthread.9 kproc_shutdown.9 \
- kthread.9 kproc_start.9 \
- kthread.9 kthread_create.9 \
+MLINKS+=kthread.9 kthread_add.9 \
kthread.9 kthread_exit.9 \
kthread.9 kthread_resume.9 \
+ kthread.9 kthread_shutdown.9 \
+ kthread.9 kthread_start.9 \
kthread.9 kthread_suspend.9 \
kthread.9 kthread_suspend_check.9
MLINKS+=ktr.9 CTR0.9 \
@@ -1034,8 +1042,8 @@
socket.9 socreate.9 \
socket.9 sogetopt.9 \
socket.9 soreceive.9 \
+ socket.9 sosend.9 \
socket.9 sosetopt.9 \
- socket.9 sosend.9 \
socket.9 soshutdown.9
MLINKS+=spl.9 spl0.9 \
spl.9 splbio.9 \
@@ -1061,13 +1069,13 @@
sx.9 sx_downgrade.9 \
sx.9 sx_init.9 \
sx.9 sx_init_flags.9 \
+ sx.9 sx_sleep.9 \
sx.9 sx_slock.9 \
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list