From owner-p4-projects@FreeBSD.ORG Sat Nov 8 13:44:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC1F316A4D0; Sat, 8 Nov 2003 13:44:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 90A5516A4CE for ; Sat, 8 Nov 2003 13:44:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16C0C43FF2 for ; Sat, 8 Nov 2003 13:44:42 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA8LigXJ009302 for ; Sat, 8 Nov 2003 13:44:42 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA8Lif1Y009299 for perforce@freebsd.org; Sat, 8 Nov 2003 13:44:41 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 8 Nov 2003 13:44:41 -0800 (PST) Message-Id: <200311082144.hA8Lif1Y009299@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 41755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2003 21:44:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=41755 Change 41755 by peter@peter_overcee on 2003/11/08 13:44:21 IFC @41750 Affected files ... .. //depot/projects/hammer/bin/rm/rm.c#4 integrate .. //depot/projects/hammer/etc/mac.conf#3 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#11 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#13 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/unwind.c#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_spinlock.c#7 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#34 integrate .. //depot/projects/hammer/share/examples/cvsup/refuse#5 integrate .. //depot/projects/hammer/share/examples/cvsup/refuse.README#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#9 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/wd.4#2 integrate .. //depot/projects/hammer/share/man/man4/rl.4#7 integrate .. //depot/projects/hammer/share/man/man7/hier.7#9 integrate .. //depot/projects/hammer/share/man/man9/pfind.9#2 integrate .. //depot/projects/hammer/share/man/man9/pgfind.9#2 integrate .. //depot/projects/hammer/share/security/Makefile#2 integrate .. //depot/projects/hammer/share/security/Makefile.inc#2 delete .. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#8 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#13 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_signal.h#4 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#5 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#13 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/uvisor.c#8 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#6 integrate Differences ... ==== //depot/projects/hammer/bin/rm/rm.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.43 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.44 2003/11/08 09:55:16 bde Exp $"); #include #include @@ -384,7 +384,7 @@ goto err; bsize = MAX(fsb.f_iosize, 1024); if ((buf = malloc(bsize)) == NULL) - err(1, "malloc"); + err(1, "%s: malloc", file); #define PASS(byte) { \ memset(buf, byte, bsize); \ @@ -409,6 +409,8 @@ err: eval = 1; if (buf) free(buf); + if (fd != -1) + close(fd); warn("%s", file); } ==== //depot/projects/hammer/etc/mac.conf#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/mac.conf,v 1.2 2003/04/20 03:09:35 rwatson Exp $ +# $FreeBSD: src/etc/mac.conf,v 1.3 2003/11/08 17:51:50 rwatson Exp $ # # TrustedBSD MAC userland policy configuration file. Kernel modules # export label information, and mac.conf indicates to userland @@ -11,7 +11,7 @@ # Default label set to be used by simple MAC applications # -default_file_labels ?biba,?mls,?sebsd -default_ifnet_labels ?biba,?mls,?sebsd -default_process_labels ?biba,?mls,?partition,?sebsd +default_file_labels ?biba,?lomac,?mls,?sebsd +default_ifnet_labels ?biba,?lomac,?mls,?sebsd +default_process_labels ?biba,?lomac,?mls,?partition,?sebsd ==== //depot/projects/hammer/etc/mtree/BSD.local.dist#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.102 2003/11/05 23:39:02 davidxu Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.103 2003/11/08 05:18:25 davidxu Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -454,7 +454,7 @@ zh_CN.GB18030 .. zh_CN.GB2312 - .. + .. zh_CN.GBK .. zh_TW.Big5 ==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.284 2003/11/08 00:41:41 rwatson Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.285 2003/11/08 05:18:25 davidxu Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -518,7 +518,7 @@ zh_CN.GB18030 .. zh_CN.GB2312 - .. + .. zh_CN.GBK .. zh_TW.Big5 @@ -852,7 +852,7 @@ zh_CN.GB18030 .. zh_CN.GB2312 - .. + .. zh_CN.GBK .. zh_TW.Big5 ==== //depot/projects/hammer/lib/libc/ia64/gen/unwind.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/ia64/gen/unwind.c,v 1.1 2002/04/13 04:06:34 marcel Exp $ + * $FreeBSD: src/lib/libc/ia64/gen/unwind.c,v 1.2 2003/11/08 05:29:49 marcel Exp $ */ #include @@ -57,6 +57,7 @@ char *p, *p_top; struct ia64_unwind_entry *unw, *res; register unsigned long gp __asm__("gp"); /* XXX assumes gcc */ + unsigned long reloc, vaddr; size_t l, m, r; if (!dladdr(pc, &info)) @@ -71,6 +72,7 @@ assert(ehdr->e_machine == EM_IA_64); #endif + reloc = (ehdr->e_type == ET_DYN) ? (uintptr_t)info.dli_fbase : 0; *pgp = gp; *pseg = 0UL; res = NULL; @@ -79,29 +81,30 @@ p_top = p + ehdr->e_phnum * ehdr->e_phentsize; while (p < p_top) { phdr = (Elf_Phdr*)p; + vaddr = phdr->p_vaddr + reloc; switch (phdr->p_type) { case PT_DYNAMIC: - dyn = (Elf_Dyn*)phdr->p_vaddr; + dyn = (Elf_Dyn*)vaddr; while (dyn->d_tag != DT_NULL) { if (dyn->d_tag == DT_PLTGOT) { - *pgp = dyn->d_un.d_ptr; + *pgp = dyn->d_un.d_ptr + reloc; break; } dyn++; } break; case PT_LOAD: - if (pc >= (void*)phdr->p_vaddr && - pc < (void*)(phdr->p_vaddr + phdr->p_memsz)) - *pseg = phdr->p_vaddr; + if (pc >= (void*)vaddr && + pc < (void*)(vaddr + phdr->p_memsz)) + *pseg = vaddr; break; case PT_IA_64_UNWIND: #if SANITY assert(*pseg != 0UL); assert(res == NULL); #endif - unw = (struct ia64_unwind_entry*)phdr->p_vaddr; + unw = (struct ia64_unwind_entry*)vaddr; l = 0; r = phdr->p_memsz / sizeof(struct ia64_unwind_entry); while (l < r) { ==== //depot/projects/hammer/lib/libpthread/thread/thr_spinlock.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_spinlock.c,v 1.17 2003/11/04 19:59:22 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_spinlock.c,v 1.18 2003/11/08 06:07:04 davidxu Exp $ * */ @@ -45,7 +45,7 @@ struct spinlock_extra { spinlock_t *owner; struct lock lock; - kse_critical_t crit; + struct pthread *crit; }; static void init_spinlock(spinlock_t *lck); @@ -64,12 +64,11 @@ _spinunlock(spinlock_t *lck) { struct spinlock_extra *extra; - kse_critical_t crit; + struct pthread *curthr = _get_curthread(); extra = (struct spinlock_extra *)lck->fname; - crit = extra->crit; - KSE_LOCK_RELEASE(_get_curkse(), &extra->lock); - _kse_critical_leave(crit); + THR_ASSERT(extra->crit == curthr, "_spinunlock called without owned."); + THR_LOCK_RELEASE(curthr, &extra->lock); } @@ -82,8 +81,8 @@ void _spinlock(spinlock_t *lck) { - struct spinlock_extra *extra; - kse_critical_t crit; + struct spinlock_extra *extra; + struct pthread *curthr; THR_ASSERT(__isthreaded != 0, "Spinlock called when not threaded."); THR_ASSERT(initialized != 0, "Spinlocks not initialized."); @@ -91,12 +90,12 @@ * Try to grab the lock and loop if another thread grabs * it before we do. */ - crit = _kse_critical_enter(); + curthr = _get_curthread(); if (lck->fname == NULL) init_spinlock(lck); extra = (struct spinlock_extra *)lck->fname; - KSE_LOCK_ACQUIRE(_get_curkse(), &extra->lock); - extra->crit = crit; + THR_LOCK_ACQUIRE(curthr, &extra->lock); + extra->crit = curthr; } /* @@ -118,15 +117,15 @@ static void init_spinlock(spinlock_t *lck) { - struct kse *curkse = _get_curkse(); + struct pthread *curthr = _get_curthread(); - KSE_LOCK_ACQUIRE(curkse, &spinlock_static_lock); + THR_LOCK_ACQUIRE(curthr, &spinlock_static_lock); if ((lck->fname == NULL) && (spinlock_count < MAX_SPINLOCKS)) { lck->fname = (char *)&extra[spinlock_count]; extra[spinlock_count].owner = lck; spinlock_count++; } - KSE_LOCK_RELEASE(curkse, &spinlock_static_lock); + THR_LOCK_RELEASE(curthr, &spinlock_static_lock); THR_ASSERT(lck->fname != NULL, "Exceeded max spinlocks"); } @@ -137,19 +136,19 @@ if (initialized != 0) { _lock_reinit(&spinlock_static_lock, LCK_ADAPTIVE, - _kse_lock_wait, _kse_lock_wakeup); + _thr_lock_wait, _thr_lock_wakeup); for (i = 0; i < spinlock_count; i++) { _lock_reinit(&extra[i].lock, LCK_ADAPTIVE, - _kse_lock_wait, _kse_lock_wakeup); + _thr_lock_wait, _thr_lock_wakeup); } spinlock_count = 0; } else { if (_lock_init(&spinlock_static_lock, LCK_ADAPTIVE, - _kse_lock_wait, _kse_lock_wakeup) != 0) + _thr_lock_wait, _thr_lock_wakeup) != 0) PANIC("Cannot initialize spinlock_static_lock"); for (i = 0; i < MAX_SPINLOCKS; i++) { if (_lock_init(&extra[i].lock, LCK_ADAPTIVE, - _kse_lock_wait, _kse_lock_wakeup) != 0) + _thr_lock_wait, _thr_lock_wakeup) != 0) PANIC("Cannot initialize spinlock extra"); } initialized = 1; ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#34 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.192 2003/11/07 23:03:02 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.193 2003/11/08 17:38:11 bmah Exp $ Supported Devices @@ -190,14 +190,6 @@ Ultra-320 SCSI controllers based on the Adaptec AIC7901, AIC7901A, and AIC7902 Ultra320 controller chips (&man.ahd.4; driver) - - - Adaptec 29320, 29320A, 29320B, 29320LP - - - Adaptec 39320, 39320D - - Adaptec FSA family RAID controllers (&man.aac.4; driver) @@ -363,7 +355,7 @@ - Mylex DAC960 and DAC1100 RAID controllers with 2.x, 3.x, 4.x + Mylex DAC-family RAID controllers with 2.x, 3.x, 4.x and 5.x firmware (&man.mlx.4; driver) @@ -379,25 +371,8 @@ - Mylex PCI to SCSI RAID controllers with 6.x firmware + Mylex AcceleRAID/eXtremeRAID family PCI to SCSI RAID controllers with 6.x firmware (&man.mly.4; driver) - - - AcceleRAID 160 - - - AcceleRAID 170 - - - AcceleRAID 352 - - - eXtremeRAID 2000 - - - eXtremeRAID 3000 - - Compatible Mylex controllers not listed should work, but @@ -508,19 +483,7 @@ - Parallel to SCSI interfaces (&man.vpo.4; driver) - - - AIC 7110 SCSI controller (built-in to Iomega ZIP drive) - - - Iomega Jaz Traveller interface - - - Iomega MatchMaker SCSI interface (built-in to Iomega - ZIP+ drive) - - + Adaptec AIC-7110 Parallel to SCSI interfaces (&man.vpo.4; driver) Compaq Intelligent Drive Array Controllers @@ -911,48 +874,6 @@ driver) RealTek 8129/8139 Fast Ethernet NICs (&man.rl.4; driver) - - - Accton Cheetah EN1207D (MPX 5030/5038; - RealTek 8139 clone) - - - Allied Telesyn AT2550 - - - Allied Telesyn AT2500TX - - - D-Link DFE-530TX+, DFE-538TX - - - Farallon NetLINE 10/100 PCI - - - Genius GF100TXR (RTL8139) - - - KTX-9130TX 10/100 Fast Ethernet - - - NDC Communications NE100TX-E - - - Netronix Inc. EA-1210 NetEther 10/100 - - - OvisLink LEF-8129TX - - - OvisLink LEF-8139TX - - - SMC EZ Card 10/100 PCI 1211-TX - - - SOHO(PRAGMATIC) UE-1211C (PCI) - - Lite-On 82c168/82c169 PNIC Fast Ethernet NICs (&man.dc.4; driver) @@ -2090,29 +2011,6 @@ Camera and Video Capture Devices Brooktree Bt848/849/878/879-based frame grabbers (&man.bktr.4; driver) - - - AverMedia cards - - - Hauppauge Wincast TV and WinTV boards (PCI) - - - Intel Smart Video Recorder III - - - Miro PC TV - - - STB TV PCI - - - Video Highway XTreme - - - VideoLogic Captivator PCI - - Connectix QuickCam Cortex1 frame grabber (ctx driver) @@ -2211,42 +2109,8 @@ interface (&man.ehci.4; driver) Hubs - - - Andromeda hub - - - MacAlly self powered hub (4 ports) - - - NEC hub - - Keyboards (&man.ukbd.4; driver) - - - Apple iMac keyboard - - - BTC BTC7935 keyboard with PS/2 mouse port - - - Cherry G81-3504 keyboard - - - Logitech M2452 keyboard - - - MacAlly iKey keyboard - - - Microsoft keyboard - - - Sun Microsystems Type 6 USB keyboard - - Miscellaneous @@ -2284,47 +2148,6 @@ Mice (&man.ums.4; driver) - - - Agiler Mouse 29UO - - - Apple iMac Mouse - - - Belkin Mouse - - - Chic mouse - - - Cypress mouse - - - Genius Niche mouse - - - Kensington Mouse-in-a-Box - - - Logitech wheel mouse (3 buttons) - - - Logitech PS/2 / USB mouse (3 buttons) - - - MacAlly mouse (3 buttons) - - - Microsoft IntelliMouse (3 buttons) - - - Sun Microsystems Type 6 USB Mouse - - - Trust Ami Mouse (3 buttons) - - Printers and parallel printer conversion cables (&man.ulpt.4; driver) @@ -2386,17 +2209,6 @@ Scanners (through SANE) (&man.uscanner.4; driver) - - - Perfection 636U - - - Seiko Epson GT-7700U, 7600U - - - HP ScanJet 4100C, 5200C, 6300C - - Storage (&man.umass.4; driver) ==== //depot/projects/hammer/share/examples/cvsup/refuse#5 (text+ko) ==== @@ -1,4 +1,3 @@ -src/etc/sendmail/freebsd.mc* doc/da_* doc/de_* doc/es_* ==== //depot/projects/hammer/share/examples/cvsup/refuse.README#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/share/examples/cvsup/refuse.README,v 1.9 2003/09/12 09:09:49 ceri Exp $ +$FreeBSD: src/share/examples/cvsup/refuse.README,v 1.10 2003/11/08 17:19:50 gshapiro Exp $ This describes the "refuse" file found in this directory. The explanation cannot be put inside the file itself because: @@ -16,11 +16,9 @@ directory; i.e., it is "/usr/sup". If you have changed your base directory, your sup directory is /path/to/base/sup. -Use the following pattern if you have modified -/usr/src/etc/sendmail/freebsd.mc to reflect your local configuration, -and you do not want CVSup to overwrite it: - - src/etc/sendmail/freebsd.mc* +This file used to contain /usr/src/etc/sendmail/freebsd.mc in case +you modified that file. However, this was removed as it can break +buildworld. Modify /etc/mail/`hostname`.mc instead. If you are an English speaker and don't wish to receive the foreign-language documentation or ports, use the following patterns: ==== //depot/projects/hammer/share/man/man4/man4.i386/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.149 2003/10/23 05:26:44 hmp Exp $ +# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.150 2003/11/08 10:28:31 rushani Exp $ MAN= aic.4 alpm.4 amdpm.4 apm.4 ar.4 asc.4 \ cs.4 cx.4 cy.4 \ @@ -14,6 +14,7 @@ MLINKS=pae.4 PAE.4 MLINKS+=spkr.4 speaker.4 MLINKS+=sbni.4 if_sbni.4 +MLINKS+=wd.4 wdc.4 MANSUBDIR=/i386 ==== //depot/projects/hammer/share/man/man4/man4.i386/wd.4#2 (text+ko) ==== @@ -24,13 +24,14 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/wd.4,v 1.24 2002/01/21 12:36:12 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/wd.4,v 1.25 2003/11/08 10:28:31 rushani Exp $ .\" .Dd August 31, 1994 .Dt WD 4 i386 .Os .Sh NAME -.Nm wd +.Nm wd , +.Nm wdc .Nd generic WD100x/IDE disk controller driver .Sh SYNOPSIS .Cd "device wdc0 at isa? port IO_WD1 irq 14" Op flags Ar flags ==== //depot/projects/hammer/share/man/man4/rl.4#7 (text+ko) ==== @@ -28,22 +28,22 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/rl.4,v 1.29 2003/09/14 23:38:42 hmp Exp $ +.\" $FreeBSD: src/share/man/man4/rl.4,v 1.33 2003/11/08 17:31:49 bmah Exp $ .\" .Dd November 4, 1998 .Dt RL 4 .Os .Sh NAME .Nm rl -.Nd RealTek 8129/8139 fast ethernet device driver +.Nd RealTek 8129/8139 Fast Ethernet device driver .Sh SYNOPSIS .Cd "device miibus" .Cd "device rl" .Sh DESCRIPTION The .Nm -driver provides support for PCI ethernet adapters and embedded -controllers based on the RealTek 8129 and 8139 fast ethernet controller +driver provides support for PCI Ethernet adapters and embedded +controllers based on the RealTek 8129 and 8139 Fast Ethernet controller chips, including the following: .Pp .Bl -bullet -compact -offset indent @@ -54,55 +54,55 @@ .It Allied Telesyn AT2500TX .It -Farallon NetLINE 10/100 PCI +Belkin F5D5000 +.It +Compaq HNE-300 +.It +CompUSA no-name 10/100 PCI Ethernet NIC +.It +Corega FEther CB-TXD .It -Genius GF100TXR, +Corega FEtherII CB-TXD .It -NDC Communications NE100TX-E +D-Link DFE-530TX+ .It -OvisLink LEF-8129TX +D-Link DFE-538TX (same as 530+?) .It -OvisLink LEF-8139TX, +D-Link DFE-690TXD .It -Netronix Inc. EA-1210 NetEther 10/100 +Edimax EP-4103DL CardBus .It -KTX-9130TX 10/100 Fast Ethernet, +Encore ENL832-TX 10/100 M PCI .It -Encore ENL832-TX 10/100 M PCI, +Farallon NetLINE 10/100 PCI .It -Longshine LCS-8038TX-R +Genius GF100TXR, .It -SMC EZ Card 10/100 PCI 1211-TX +GigaFast Ethernet EE100-AXP .It -Compaq HNE-300 +KTX-9130TX 10/100 Fast Ethernet .It LevelOne FPC-0106TX .It -Edimax EP-4103DL CardBus +Longshine LCS-8038TX-R .It -Nortel Networks 10/100BaseTX +NDC Communications NE100TX-E .It -D-Link DFE-690TXD +Netronix Inc. EA-1210 NetEther 10/100 .It -D-Link DFE-530TX+ +Nortel Networks 10/100BaseTX .It -D-Link DFE-538TX (same as 530+?) +OvisLink LEF-8129TX .It -Corega FEther CB-TXD -.It -Corega FEtherII CB-TXD +OvisLink LEF-8139TX .It Peppercon AG ROL-F .It Planex FNW-3800-TX .It -Accton EN1207D +SMC EZ Card 10/100 PCI 1211-TX .It -GigaFast Ethernet EE100-AXP -.It -CompUSA no-name 10/100 PCI ethernet NIC -.It -Belkin F5D5000 +SOHO(PRAGMATIC) UE-1211C .El .Pp The RealTek 8129/8139 series controllers use bus master DMA but do not use a @@ -152,7 +152,7 @@ .Ar half-duplex modes. .It 100baseTX -Set 100Mbps (fast ethernet) operation. +Set 100Mbps (Fast Ethernet) operation. The .Ar mediaopt option can also be used to select either ==== //depot/projects/hammer/share/man/man7/hier.7#9 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.88 2003/10/30 21:25:37 fjoe Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.89 2003/11/08 18:01:44 rwatson Exp $ .\" .Dd June 5, 1993 .Dt HIER 7 @@ -528,6 +528,9 @@ pcvt documentation and etc examples; see .Xr pcvt 4 +.It Pa security/ +data files for security policies such as +.Xr mac_lomac 4 .It Pa sendmail/ .Xr sendmail 8 configuration files ==== //depot/projects/hammer/share/man/man9/pfind.9#2 (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/man9/pfind.9,v 1.2 2001/12/26 23:14:04 davidc Exp $ +.\" $FreeBSD: src/share/man/man9/pfind.9,v 1.3 2003/11/08 13:41:22 jkoshy Exp $ .\" .Dd July 11, 2001 .Os @@ -81,6 +81,8 @@ structure on success and a .Dv NULL on failure. +.Sh SEE ALSO +.Xr pgfind 9 .Sh AUTHORS This man page was written by .An Evan Sarmiento Aq kaworu@sektor7.ath.cx . ==== //depot/projects/hammer/share/man/man9/pgfind.9#2 (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/man9/pgfind.9,v 1.3 2002/02/28 07:06:31 davidc Exp $ +.\" $FreeBSD: src/share/man/man9/pgfind.9,v 1.4 2003/11/08 13:41:22 jkoshy Exp $ .\" .Dd August 8, 2001 .Os @@ -58,6 +58,8 @@ on failure or a pointer to a .Vt pgrp structure on successful completion. +.Sh SEE ALSO +.Xr pfind 9 .Sh AUTHORS This man page was written by .An Evan Sarmiento Aq kaworu@sektor7.ath.cx . ==== //depot/projects/hammer/share/security/Makefile#2 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/share/security/Makefile,v 1.1 2003/11/08 00:40:25 rwatson Exp $ +# $FreeBSD: src/share/security/Makefile,v 1.2 2003/11/08 17:56:53 rwatson Exp $ FILES= lomac-policy.contexts NOOBJ= noobj FILESDIR= ${BINDIR}/security +.include "${.CURDIR}/../Makefile.inc" .include ==== //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.5 2003/11/08 03:33:38 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.6 2003/11/08 07:43:44 peter Exp $"); #include "opt_compat.h" @@ -558,3 +558,44 @@ PROC_UNLOCK(p); return (EJUSTRETURN); } + +/* + * Clear registers on exec + */ +void +ia32_setregs(td, entry, stack, ps_strings) + struct thread *td; + u_long entry; + u_long stack; + u_long ps_strings; +{ + struct trapframe *regs = td->td_frame; + struct pcb *pcb = td->td_pcb; + + wrmsr(MSR_FSBASE, 0); + wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */ + pcb->pcb_fsbase = 0; + pcb->pcb_gsbase = 0; + load_ds(_udatasel); + load_es(_udatasel); + load_fs(_udatasel); + load_gs(_udatasel); + pcb->pcb_ds = _udatasel; + pcb->pcb_es = _udatasel; + pcb->pcb_fs = _udatasel; + pcb->pcb_gs = _udatasel; + + bzero((char *)regs, sizeof(struct trapframe)); + regs->tf_rip = entry; + regs->tf_rsp = stack; + regs->tf_rflags = PSL_USER | (regs->tf_rflags & PSL_T); + regs->tf_ss = _udatasel; + regs->tf_cs = _ucode32sel; + regs->tf_rbx = ps_strings; + load_cr0(rcr0() | CR0_MP | CR0_TS); + fpstate_drop(td); + + /* Return via doreti so that we can change to a different %cs */ + pcb->pcb_flags |= PCB_FULLCTX; + td->td_retval[1] = 0; +} ==== //depot/projects/hammer/sys/cam/cam_periph.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.55 2003/10/27 06:15:54 ken Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.56 2003/11/08 10:56:57 scottl Exp $"); #include #include @@ -969,13 +969,13 @@ if (sense_key != SSD_KEY_NO_SENSE) { saved_ccb->ccb_h.status |= CAM_AUTOSNS_VALID; +#if 0 xpt_print_path(saved_ccb->ccb_h.path); printf("Recovered Sense\n"); -#if 0 scsi_sense_print(&saved_ccb->csio); -#endif cam_error_print(saved_ccb, CAM_ESF_ALL, CAM_EPF_ALL); +#endif xpt_done_ccb = TRUE; } } ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.13 2003/11/07 20:30:30 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.25 2003/11/07 20:29:53 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.14 2003/11/08 07:31:49 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.13 2003/11/07 20:30:30 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.25 2003/11/07 20:29:53 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.14 2003/11/08 07:31:49 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp */ #define FREEBSD32_SYS_syscall 0 @@ -67,7 +67,7 @@ /* 63 is obsolete ogetkerninfo */ /* 64 is obsolete ogetpagesize */ /* 65 is obsolete omsync */ - /* 66 is obsolete ovfork */ +#define FREEBSD32_SYS_vfork 66 /* 67 is obsolete vread */ /* 68 is obsolete vwrite */ #define FREEBSD32_SYS_sbrk 69 ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.4 2003/11/07 20:30:30 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.25 2003/11/07 20:29:53 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.5 2003/11/08 07:31:49 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp */ const char *freebsd32_syscallnames[] = { @@ -73,7 +73,7 @@ "obs_ogetkerninfo", /* 63 = obsolete ogetkerninfo */ "obs_ogetpagesize", /* 64 = obsolete ogetpagesize */ "obs_omsync", /* 65 = obsolete omsync */ - "obs_ovfork", /* 66 = obsolete ovfork */ + "vfork", /* 66 = vfork */ "obs_vread", /* 67 = obsolete vread */ "obs_vwrite", /* 68 = obsolete vwrite */ "sbrk", /* 69 = sbrk */ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.14 2003/11/07 20:30:30 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.25 2003/11/07 20:29:53 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.15 2003/11/08 07:31:49 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp >>> TRUNCATED FOR MAIL (1000 lines) <<<