From owner-p4-projects@FreeBSD.ORG Sun Feb 7 14:36:24 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF983106568B; Sun, 7 Feb 2010 14:36:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75343106566B for ; Sun, 7 Feb 2010 14:36:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 63DB58FC15 for ; Sun, 7 Feb 2010 14:36:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o17EaNWp032537 for ; Sun, 7 Feb 2010 14:36:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o17EaNEm032535 for perforce@freebsd.org; Sun, 7 Feb 2010 14:36:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 7 Feb 2010 14:36:23 GMT Message-Id: <201002071436.o17EaNEm032535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174444 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 14:36:24 -0000 http://p4web.freebsd.org/chv.cgi?CH=174444 Change 174444 by hselasky@hselasky_laptop001 on 2010/02/07 14:35:26 LibUSB: - add new API function. Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb.3#21 edit .. //depot/projects/usb/src/lib/libusb/libusb.h#13 edit .. //depot/projects/usb/src/lib/libusb/libusb10.c#22 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb.3#21 (text+ko) ==== @@ -72,6 +72,15 @@ . .Pp . +.Ft const char * +.Fn libusb_strerror "int code" +Get ASCII representation of the error given by the +.Fa code +argument. +. +. +.Pp +. .Ft void .Fn libusb_set_debug "libusb_context *ctx" "int level" Set debug to the ==== //depot/projects/usb/src/lib/libusb/libusb.h#13 (text+ko) ==== @@ -301,6 +301,7 @@ /* Library initialisation */ void libusb_set_debug(libusb_context * ctx, int level); +const char *libusb_strerror(int code); int libusb_init(libusb_context ** context); void libusb_exit(struct libusb_context *ctx); ==== //depot/projects/usb/src/lib/libusb/libusb10.c#22 (text+ko) ==== @@ -1372,3 +1372,9 @@ return (le16toh(x)); } +const char * +libusb_strerror(int code) +{ + /* TODO */ + return ("Unknown error"); +} From owner-p4-projects@FreeBSD.ORG Sun Feb 7 18:56:01 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8BDD1065676; Sun, 7 Feb 2010 18:56:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 651BB1065670 for ; Sun, 7 Feb 2010 18:56:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4B2368FC14 for ; Sun, 7 Feb 2010 18:56:00 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o17Iu0UT067615 for ; Sun, 7 Feb 2010 18:56:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o17Iu0Co067612 for perforce@freebsd.org; Sun, 7 Feb 2010 18:56:00 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 7 Feb 2010 18:56:00 GMT Message-Id: <201002071856.o17Iu0Co067612@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 18:56:01 -0000 http://p4web.freebsd.org/chv.cgi?CH=174455 Change 174455 by hselasky@hselasky_laptop001 on 2010/02/07 18:55:49 USB controller: - workaround for hardware bug - patch by: HPS @ PR: usb/143294 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#48 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#16 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#48 (text+ko) ==== @@ -92,15 +92,23 @@ #if USB_DEBUG static int ehcidebug = 0; static int ehcinohighspeed = 0; +static int ehciiaadbug = 0; +static int ehcilostintrbug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci"); SYSCTL_INT(_hw_usb_ehci, OID_AUTO, debug, CTLFLAG_RW, &ehcidebug, 0, "Debug level"); SYSCTL_INT(_hw_usb_ehci, OID_AUTO, no_hs, CTLFLAG_RW, &ehcinohighspeed, 0, "Disable High Speed USB"); +SYSCTL_INT(_hw_usb_ehci, OID_AUTO, iaadbug, CTLFLAG_RW, + &ehciiaadbug, 0, "Enable doorbell bug workaround"); +SYSCTL_INT(_hw_usb_ehci, OID_AUTO, lostintrbug, CTLFLAG_RW, + &ehcilostintrbug, 0, "Enable lost interrupt bug workaround"); TUNABLE_INT("hw.usb.ehci.debug", &ehcidebug); TUNABLE_INT("hw.usb.ehci.no_hs", &ehcinohighspeed); +TUNABLE_INT("hw.usb.ehci.iaadbug", &ehciiaadbug); +TUNABLE_INT("hw.usb.ehci.lostintrbug", &ehcilostintrbug); static void ehci_dump_regs(ehci_softc_t *sc); static void ehci_dump_sqh(ehci_softc_t *sc, ehci_qh_t *sqh); @@ -251,6 +259,10 @@ usb_callout_init_mtx(&sc->sc_tmo_poll, &sc->sc_bus.bus_mtx, 0); #if USB_DEBUG + if (ehciiaadbug) + sc->sc_flags |= EHCI_SCFLG_IAADBUG; + if (ehcilostintrbug) + sc->sc_flags |= EHCI_SCFLG_LOSTINTRBUG; if (ehcidebug > 2) { ehci_dump_regs(sc); } @@ -2280,6 +2292,13 @@ /* put transfer on interrupt queue */ ehci_transfer_intr_enqueue(xfer); + /* + * XXX Certain nVidia chipsets choke when using the IAAD + * feature too frequently. + */ + if (sc->sc_flags & EHCI_SCFLG_IAADBUG) + return; + /* XXX Performance quirk: Some Host Controllers have a too low * interrupt rate. Issue an IAAD to stimulate the Host * Controller after queueing the BULK transfer. ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#16 (text+ko) ==== @@ -350,6 +350,7 @@ #define EHCI_SCFLG_BIGEMMIO 0x0010 /* big-endian byte order MMIO */ #define EHCI_SCFLG_TT 0x0020 /* transaction translator present */ #define EHCI_SCFLG_LOSTINTRBUG 0x0040 /* workaround for VIA / ATI chipsets */ +#define EHCI_SCFLG_IAADBUG 0x0080 /* workaround for nVidia chipsets */ uint8_t sc_offs; /* offset to operational registers */ uint8_t sc_doorbell_disable; /* set on doorbell failure */ ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#25 (text+ko) ==== @@ -466,6 +466,19 @@ break; } + /* Doorbell feature workaround */ + switch (pci_get_vendor(self)) { + case PCI_EHCI_VENDORID_NVIDIA: + case PCI_EHCI_VENDORID_NVIDIA2: + sc->sc_flags |= EHCI_SCFLG_IAADBUG; + if (bootverbose) + device_printf(self, + "Doorbell workaround enabled\n"); + break; + default: + break; + } + err = ehci_init(sc); if (!err) { err = device_probe_and_attach(sc->sc_bus.bdev); From owner-p4-projects@FreeBSD.ORG Mon Feb 8 18:26:37 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5294410656A3; Mon, 8 Feb 2010 18:26:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 16FF1106568B for ; Mon, 8 Feb 2010 18:26:37 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 055378FC19 for ; Mon, 8 Feb 2010 18:26:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o18IQa8x059373 for ; Mon, 8 Feb 2010 18:26:36 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o18IQaES059371 for perforce@freebsd.org; Mon, 8 Feb 2010 18:26:36 GMT (envelope-from trasz@freebsd.org) Date: Mon, 8 Feb 2010 18:26:36 GMT Message-Id: <201002081826.o18IQaES059371@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 18:26:37 -0000 http://p4web.freebsd.org/chv.cgi?CH=174474 Change 174474 by trasz@trasz_victim on 2010/02/08 18:26:15 Prevent foot shooting by using HRL-enabled world without HRL-enabled kernel. Affected files ... .. //depot/projects/soc2009/trasz_limits/lib/libutil/login_class.c#5 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/lib/libutil/login_class.c#5 (text+ko) ==== @@ -425,6 +425,7 @@ quad_t p; mode_t mymask; login_cap_t *llc = NULL; + sig_t prevsig; struct rtprio rtp; int error; @@ -512,13 +513,21 @@ return (-1); } - if (lc != NULL && lc->lc_class != NULL) { + if (lc != NULL && lc->lc_class != NULL && (flags & LOGIN_SETLOGINCLASS)) { /* Inform the kernel about current login class */ - if ((flags & LOGIN_SETLOGINCLASS) && - setloginclass(lc->lc_class) != 0) { + /* + * XXX: This is a workaround to fail gracefully in case the kernel + * does not support setloginclass(2). + */ + prevsig = signal(SIGSYS, SIG_IGN); + error = setloginclass(lc->lc_class); + signal(SIGSYS, prevsig); + if (error != 0) { syslog(LOG_ERR, "setloginclass(%s): %m", lc->lc_class); +#ifdef notyet login_close(llc); return (-1); +#endif } } From owner-p4-projects@FreeBSD.ORG Mon Feb 8 20:48:00 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD1C21065676; Mon, 8 Feb 2010 20:48:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 710CA106566B for ; Mon, 8 Feb 2010 20:48:00 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E0A28FC17 for ; Mon, 8 Feb 2010 20:48:00 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o18Km04d082254 for ; Mon, 8 Feb 2010 20:48:00 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o18Km0b8082252 for perforce@freebsd.org; Mon, 8 Feb 2010 20:48:00 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 8 Feb 2010 20:48:00 GMT Message-Id: <201002082048.o18Km0b8082252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174489 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 20:48:00 -0000 http://p4web.freebsd.org/chv.cgi?CH=174489 Change 174489 by rene@rene_self on 2010/02/08 20:47:00 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#49 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#37 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/dcbsdcon/bejtlich-networksecurity.sbv#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#30 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#12 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#18 integrate .. //depot/projects/docproj_nl/share/pgpkeys/bschmidt.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#32 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#29 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#30 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#25 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#31 integrate .. //depot/projects/docproj_nl/www/en/security/security.sgml#9 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#17 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.hardware.xml#4 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#15 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#66 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#49 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + + &a.bmah; ( - 2009) + + + &a.koitsu; (2006 - 2008) @@ -708,10 +712,6 @@ Andrew L. Moore (1993 - 1995) - - - Bruce A. Mah ( - 2009) - @@ -720,6 +720,13 @@ + &a.svn-src-stable-8.name; + /usr/src + All changes to the stable/8 + branch of the src Subversion repository + + + &a.svn-src-stable-other.name; /usr/src All changes to the ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -314,7 +314,7 @@ Abort To help the FreeBSD kernel distinguish between a FreeBSD ELF - binary from a Linux binary, use the &man.brandelf.1; + binary and a Linux binary, use the &man.brandelf.1; utility. &prompt.user; brandelf -t Linux my-linux-elf-binary ==== //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/dcbsdcon/bejtlich-networksecurity.sbv#2 (text+ko) ==== @@ -87,7 +87,7 @@ the last year it’s been an exciting ride 0:01:22.110,0:01:25.230 -the ads general electric we get three hundred thousand users +the ads General Electric we get three hundred thousand users 0:01:25.230,0:01:28.360 um just a few security issues as you might @@ -137,11 +137,11 @@ 0:01:56.320,0:01:59.179 what I’m going to describe isn’t exactly what I do -with general electric +with General Electric 0:01:59.179,0:02:02.390 -or at least it's not officially what I do at general -electric +or at least it's not officially what I do at General +Electric 0:02:02.390,0:02:06.950 but you can imagine that I just don’t come up with @@ -234,7 +234,7 @@ how’s your blood pressure 0:03:25.719,0:03:27.940 -well it’s under one hundred and twenty over eighty +well it’s under 120 over 80 0:03:27.940,0:03:29.659 that's sort of one data point @@ -393,13 +393,13 @@ on a peer-to-peer network somewhere 0:05:22.669,0:05:25.949 -that's that's an ouput that means you had a failure somewhere +that's an ouput that means you had a failure somewhere 0:05:25.949,0:05:28.069 do you have a system or network that’s unavailable 0:05:28.069,0:05:29.720 -due to a Ddos attack +due to a DDoS attack 0:05:29.720,0:05:31.060 these are all outputs so @@ -412,7 +412,7 @@ these can influence these 0:05:36.459,0:05:40.539 -these are the things that I I care about +these are the things that I care about 0:05:40.539,0:05:44.129 and just to step a @@ -442,8 +442,8 @@ lots of discussions about 0:06:01.030,0:06:05.289 -you made this change and you get a five percent difference -or you made this change and you get a ten percent difference +you made this change and you get a 5% difference +or you made this change and you get a 10% difference 0:06:05.289,0:06:07.019 none of that happens in security @@ -606,7 +606,7 @@ I in relation to where the bad guys are 0:07:57.409,0:08:02.359 -then you make a decision like okay is there’s a bad guy +then you make a decision like okay there’s a bad guy I better roll over and shoot it down 0:08:02.359,0:08:04.269 @@ -663,7 +663,7 @@ of security period 0:08:45.120,0:08:49.830 -my aplogies to my European friends this +my apologies to my European friends this is the football poll security 0:08:49.830,0:08:54.710 @@ -701,20 +701,20 @@ something different 0:09:15.680,0:09:19.650 -and I first started thinking about this in 2000 2001 +and I first started thinking about this in 2000-2001 0:09:19.650,0:09:21.800 where there were some guys in Finland 0:09:21.800,0:09:27.060 -who did this huge innumeration they were doing some of the +who did this huge enumeration they were doing some of the first fuzzing work against SMTP 0:09:27.060,0:09:27.849 -it was called the +it was called 0:09:27.849,0:09:29.000 -protos toolkit +The Protos Toolkit 0:09:29.000,0:09:32.140 and they did all this work in and they found that @@ -779,7 +779,7 @@ their rights and their privacy 0:10:13.750,0:10:15.100 -and meanwhie you got like +and meanwhile you got like 0:10:15.100,0:10:16.899 Romanians and Russians and Chinese and @@ -893,7 +893,7 @@ don’t complain 0:11:49.920,0:11:50.850 -So anwyay wow +So anyway wow 0:11:50.850,0:11:51.909 that came out of nowhere @@ -974,13 +974,13 @@ I apply some instrumentation 0:12:41.280,0:12:43.620 -and then I collect analyse and escalate +and then I collect analyze and escalate 0:12:43.620,0:12:46.000 %uh collect meaning I get the information 0:12:46.000,0:12:48.420 -analyse I look at it figure out what it means +analyze I look at it figure out what it means 0:12:48.420,0:12:48.889 escalate @@ -1125,7 +1125,7 @@ 0:14:38.570,0:14:42.620 that's like trying to make things more secure -have been trying to do that for like twenty years +have been trying to do that for like 20 years 0:14:42.620,0:14:44.240 it just doesn't work @@ -1199,7 +1199,7 @@ blog 0:15:40.870,0:15:44.800 -and %uh he's he's a fellow employee with +and %uh he's a fellow employee with me is that we always considering this because 0:15:44.800,0:15:45.380 @@ -1218,7 +1218,7 @@ is an SSL encrypted pipe 0:15:53.530,0:15:58.430 -%um it doesn't help me too much to inpsect it at the +%um it doesn't help me too much to inspect it at the network level right 0:15:58.430,0:16:00.129 @@ -1232,10 +1232,10 @@ 0:16:04.650,0:16:10.110 try getting good logs out of any of the cloud buyers -it is absolutely horrible they they don't +it is absolutely horrible they don't 0:16:10.110,0:16:14.150 -they don't want to store them they don't want +want to store them they don't want to provide you the data in any format that’s useful 0:16:14.150,0:16:17.710 @@ -1268,7 +1268,7 @@ so forth 0:16:36.600,0:16:38.400 -virtualisation is obviously an issue +virtualization is obviously an issue 0:16:38.400,0:16:40.100 %um if you think about @@ -1318,7 +1318,7 @@ I mean it could be 0:17:09.490,0:17:11.390 -somewhere else in the united states obviously but for +somewhere else in the United States obviously but for 0:17:11.390,0:17:14.449 the most part like if someone were to compromise @@ -1512,10 +1512,10 @@ the first network based IDS that taught 0:19:33.490,0:19:35.400 -he wrote it in UC Davis in ‘89 +he wrote it in UC Davis in 1989 0:19:35.400,0:19:39.520 -so this is wow that’s twenty years I feel +so this is wow that’s 20 years I feel freaking old right now 0:19:39.520,0:19:39.979 @@ -1540,7 +1540,7 @@ 0:19:50.470,0:19:56.750 and they call them network forensic appliances -and they charge you fifty thousand dollars +and they charge you 50,000 dollars 0:19:56.750,0:20:02.110 for the enterprise that’s right @@ -1578,7 +1578,7 @@ so I learned from people who invented this stuff 0:20:27.480,0:20:30.779 -you know wow that's like fifteen years ago +you know wow that's like 15 years ago 0:20:30.779,0:20:35.279 alright so why network censors @@ -1752,13 +1752,13 @@ you're not surfing 0:23:03.019,0:23:06.370 -MySpace on your Windows server +MySpace on your Windows Server 0:23:06.370,0:23:08.070 -right well you’re not on a Windows server +right well you’re not on a Windows Server 0:23:08.070,0:23:13.590 -but well you can admin on a Windows server +but well you can admin on a Windows Server but you know what I mean 0:23:13.590,0:23:16.710 @@ -1872,7 +1872,7 @@ what a user platform is telling me 0:24:35.180,0:24:35.980 -so if I’m +so 0:24:35.980,0:24:37.799 if I’m on a user platform @@ -1897,7 +1897,7 @@ so this is why I like 0:24:51.120,0:24:54.020 -to itroduce these sorts of devices +to introduce these sorts of devices 0:24:54.020,0:24:55.070 let me talk a little bit @@ -2075,7 +2075,7 @@ is not an Intel system 0:27:04.310,0:27:06.940 -it's a Mac mini +it's a Mac Mini 0:27:06.940,0:27:08.550 and it’s running Debian on top @@ -2348,7 +2348,7 @@ 0:31:06.470,0:31:11.210 he did a concert once actually he didn't -do a concert he attended somebody else’s concert +do a concert he attended somebody's else concert 0:31:11.210,0:31:15.190 and I don't know who it was like Johnny Cash or something @@ -2419,8 +2419,8 @@ right at this point he’s got two options he can either ignore it 0:32:05.940,0:32:10.240 -or he can satisfy his fifteen minute SOA that his customer -pays three thousand dollars a month +or he can satisfy his 15 minute SOA that his customer +pays $3,000 a month 0:32:10.240,0:32:10.860 for @@ -2543,10 +2543,10 @@ intruders in China 0:33:39.509,0:33:41.049 -who had writtten their own +who had written their own 0:33:41.049,0:33:44.010 -virtualisation platform on top of Solaris +virtualization platform on top of Solaris 0:33:44.010,0:33:46.159 who were doing stuff we were like holy cow @@ -2755,7 +2755,7 @@ 0:36:20.819,0:36:23.099 yes I’m an ISP what happens when I get stuff from -Massachussetts or California and they’re going you can’t do that +Massachusetts or California and they’re going you can’t do that 0:36:27.329,0:36:28.269 yes okay so there’s two things @@ -2855,7 +2855,7 @@ you could literally walk out of here 0:37:48.249,0:37:50.619 -go into the freeBSD ports tree find a SGUIL ports +go into the FreeBSD ports tree find a SGUIL ports 0:37:52.119,0:37:54.840 do your make I mean the ports are a little ugh @@ -3029,7 +3029,7 @@ where the result was 0:40:14.779,0:40:16.179 -UID zero +UID 0 0:40:16.179,0:40:19.529 is that good or is that bad I mean you’d probably say that sounds bad @@ -3271,7 +3271,7 @@ 0:43:29.130,0:43:33.189 can we release so we're trying to work -out those I think it'll be resolved postively +out those I think it'll be resolved positively 0:43:33.189,0:43:35.119 because we're GE’s actually fairly pro-open-source @@ -3456,10 +3456,10 @@ so whereas 0:46:24.309,0:46:26.510 -five years ago it might have been like ninety percent +five years ago it might have been like 90% 0:46:26.510,0:46:28.619 -these days it's like twenty five percent +these days it's like 25% 0:46:28.619,0:46:35.619 so they probably can pull in a certain percentage @@ -3496,8 +3496,8 @@ my last budget 0:47:11.769,0:47:15.319 -I could only spend about twenty five hundred -to three grand per sensor +I could only spend about 2,500 +to 3,000 per sensor 0:47:15.319,0:47:18.949 which limited me to about one to @@ -3700,7 +3700,7 @@ and the reason I do this approach is because it’s cheap 0:50:10.190,0:50:14.099 -you know twenty five hundred dollar commodity hardware +you know twenty $500 commodity hardware open source software 0:50:14.099,0:50:15.820 @@ -3771,7 +3771,7 @@ as far as FreeBSD goes specifically 0:51:10.930,0:51:14.229 -there’s som like minor things that make my +there’s some like minor things that make my life better 0:51:14.229,0:51:18.349 @@ -3814,7 +3814,7 @@ you can track performance with the what was it 0:51:40.109,0:51:41.609 -net stat dash B +netstat -B 0:51:41.609,0:51:42.400 capital B @@ -4213,14 +4213,14 @@ California he's using the UUnet 0:57:35.449,0:57:38.170 -the Uunet blocker however they’re signing they’re signing +the UUnet blocker however they’re signing they’re signing the IPs 0:57:38.170,0:57:41.390 -it's just all over the place we're blocking Uunet +it's just all over the place we're blocking UUnet 0:57:41.390,0:57:43.799 -all of Uunet to the air force +all of UUnet to the air force 0:57:43.799,0:57:44.790 so @@ -4343,7 +4343,7 @@ one you’re researcher or two you have a lot of time on your hands 0:59:32.119,0:59:36.039 -because I have like a network of three hundred thousand +because I have like a network of 300,000 honey pots 0:59:36.039,0:59:38.479 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#30 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.496 2010/01/28 14:55:44 uqs Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.497 2010/02/06 18:08:09 bschmidt Exp $ --> aaron@FreeBSD.org"> @@ -160,6 +160,8 @@ bsam@FreeBSD.org"> +bschmidt@FreeBSD.org"> + bsd@FreeBSD.org"> bushman@FreeBSD.org"> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#12 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -435,6 +435,10 @@ SVN commit messages for only the 7-stable src tree"> svn-src-stable-7"> + +SVN commit messages for only the 8-stable src tree"> +svn-src-stable-8"> + SVN commit messages for the old stable src trees"> svn-src-stable-other"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#18 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -9,6 +9,11 @@ &pgpkey.ariff; + + &a.tabthorpe; + &pgpkey.tabthorpe; + + &a.shaun; &pgpkey.shaun; @@ -34,9 +39,9 @@ &pgpkey.anholt; - - &a.mat; - &pgpkey.mat; + + &a.mva; + &pgpkey.mva; @@ -44,6 +49,11 @@ &pgpkey.araujo; + + &a.mat; + &pgpkey.mat; + + &a.asami; &pgpkey.asami; @@ -84,16 +94,6 @@ &pgpkey.dougb; - - &a.bvs; - &pgpkey.bvs; - - - - &a.garga; - &pgpkey.garga; - - &a.kib; &pgpkey.kib; @@ -119,17 +119,27 @@ &pgpkey.mbr; + + &a.bvs; + &pgpkey.bvs; + + &a.novel; &pgpkey.novel; + + &a.garga; + &pgpkey.garga; + + &a.alexbl; &pgpkey.alexbl; - + &a.harti; &pgpkey.harti; @@ -144,6 +154,11 @@ &pgpkey.makc; + + &a.jmb; + &pgpkey.jmb; + + &a.antoine; &pgpkey.antoine; @@ -154,16 +169,6 @@ &pgpkey.db; - - &a.jmb; - &pgpkey.jmb; - - - - &a.brucec; - &pgpkey.brucec; - - &a.brueffer; &pgpkey.brueffer; @@ -206,6 +211,11 @@ --> + + &a.dchagin; + &pgpkey.dchagin; + + &a.perky; &pgpkey.perky; @@ -255,12 +265,17 @@ &a.nik; &pgpkey.nik; - + &a.benjsc; &pgpkey.benjsc; + + &a.brucec; + &pgpkey.brucec; + + &a.aaron; &pgpkey.aaron; @@ -376,16 +391,6 @@ &pgpkey.lioux; - - &a.lippe; - &pgpkey.lippe; - - - - &a.fabient; - &pgpkey.fabient; - - &a.fanf; &pgpkey.fanf; @@ -466,6 +471,11 @@ &pgpkey.dhartmei; + + &a.ehaupt; + &pgpkey.ehaupt; + + &a.jhay; &pgpkey.jhay; @@ -506,6 +516,11 @@ &pgpkey.mux; + + &a.dhn; + &pgpkey.dhn; + + &a.pho; &pgpkey.pho; @@ -537,8 +552,8 @@ - &a.versus; - &pgpkey.versus; + &a.versus; + &pgpkey.versus; @@ -546,6 +561,11 @@ &pgpkey.weongyo; + + &a.jinmei; + &pgpkey.jinmei; + + &a.ahze; &pgpkey.ahze; @@ -581,11 +601,6 @@ &pgpkey.kris; - - &a.skreuzer; - &pgpkey.skreuzer; - - &a.fjoe; &pgpkey.fjoe; @@ -617,8 +632,8 @@ - &a.maxim; - &pgpkey.maxim; + &a.maxim; + &pgpkey.maxim; @@ -631,6 +646,11 @@ &pgpkey.wkoszek; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 8 21:09:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BF501065672; Mon, 8 Feb 2010 21:09:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4850F106566B for ; Mon, 8 Feb 2010 21:09:22 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3672C8FC08 for ; Mon, 8 Feb 2010 21:09:22 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o18L9MPK084843 for ; Mon, 8 Feb 2010 21:09:22 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o18L9L59084841 for perforce@freebsd.org; Mon, 8 Feb 2010 21:09:21 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 8 Feb 2010 21:09:21 GMT Message-Id: <201002082109.o18L9L59084841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174492 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 21:09:22 -0000 http://p4web.freebsd.org/chv.cgi?CH=174492 Change 174492 by rene@rene_self on 2010/02/08 21:08:32 MFen handbook: * eresources 1.199 -> 1.200 * linuxemu 1.139 -> 1.140 (SRCID bump only) * mailing-lists.ent 1.68 -> 1.69 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#24 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#11 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#16 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#24 (text+ko) ==== @@ -2,11 +2,10 @@ The FreeBSD Dutch Documentation Project $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.20 2009/06/10 06:34:09 rene Exp $ - $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.35 2006/08/25 10:44:57 remko Exp $ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml - %SRCID% 1.199 + %SRCID% 1.200 --> @@ -884,6 +883,16 @@ + &a.svn-src-stable-8.name; + + /usr/src + + Alle veranderingen aan de + stable/8-tak van het + src-Subversion-repository + + + &a.svn-src-stable-other.name; /usr/src ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#11 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v 1.13 2009/09/01 20:08:53 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml - %SRCID% 1.139 + %SRCID% 1.140 --> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#16 (text+ko) ==== @@ -2,11 +2,10 @@ Namen van FreeBSD mailinglijsten en gerelateerde software. $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.17 2009/04/22 21:35:02 rene Exp $ - $FreeBSDnl: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.21 2006/08/25 10:40:41 remko Exp $ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/share/sgml/mailing-lists.ent - %SRCID% 1.68 + %SRCID% 1.69 --> @@ -440,6 +439,10 @@ SVN-commitberichten voor alleen de 7-stable-src-structuur"> svn-src-stable-7"> + +SVN-commitberichten voor alleen de 8-stable-src-structuur"> +svn-src-stable-8"> + SVN-commitberichten van de oude stable-src-structuren"> svn-src-stable-other"> From owner-p4-projects@FreeBSD.ORG Tue Feb 9 15:59:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E478C1065679; Tue, 9 Feb 2010 15:59:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A93911065672 for ; Tue, 9 Feb 2010 15:59:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 975418FC08 for ; Tue, 9 Feb 2010 15:59:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o19FxL1T029638 for ; Tue, 9 Feb 2010 15:59:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o19FxLuw029636 for perforce@freebsd.org; Tue, 9 Feb 2010 15:59:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 9 Feb 2010 15:59:21 GMT Message-Id: <201002091559.o19FxLuw029636@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174516 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2010 15:59:22 -0000 http://p4web.freebsd.org/chv.cgi?CH=174516 Change 174516 by hselasky@hselasky_laptop001 on 2010/02/09 15:59:14 USB modem: - make umodem more tolerant for devices which modem descriptors are misplaced. - reported by: Erick Wales - patch by: HPS Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#21 (text+ko) ==== @@ -312,11 +312,16 @@ 0 - 1, UDESCSUB_CDC_UNION, 0 - 1); if ((cud == NULL) || (cud->bLength < sizeof(*cud))) { - device_printf(dev, "no CM or union descriptor\n"); - goto detach; + device_printf(dev, "Missing descriptor. " + "Assuming data interface is next.\n"); + if (sc->sc_ctrl_iface_no == 0xFF) + goto detach; + else + sc->sc_data_iface_no = + sc->sc_ctrl_iface_no + 1; + } else { + sc->sc_data_iface_no = cud->bSlaveInterface[0]; } - - sc->sc_data_iface_no = cud->bSlaveInterface[0]; } else { sc->sc_data_iface_no = cmd->bDataInterface; } From owner-p4-projects@FreeBSD.ORG Tue Feb 9 16:34:57 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92CF91065676; Tue, 9 Feb 2010 16:34:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55BA41065672 for ; Tue, 9 Feb 2010 16:34:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 430F68FC25 for ; Tue, 9 Feb 2010 16:34:57 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o19GYvvQ033187 for ; Tue, 9 Feb 2010 16:34:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o19GYv36033185 for perforce@freebsd.org; Tue, 9 Feb 2010 16:34:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 9 Feb 2010 16:34:57 GMT Message-Id: <201002091634.o19GYv36033185@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2010 16:34:57 -0000 http://p4web.freebsd.org/chv.cgi?CH=174517 Change 174517 by rwatson@rwatson_cinnamon on 2010/02/09 16:34:09 Update TODO. Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#21 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#21 (text+ko) ==== @@ -37,9 +37,9 @@ - Review poll/select/kqueue behavior, and in particular decide if/how we want CAP_EVENT to work. -- UNIX domain socket passing of file descriptors may need modification to - take into account indirectly referenced descriptors hung off of - capabilities in its GC routine. +- UNIX domain socket garbage collection doesn't know how to follow the + linkage from a capability to the underlying file descriptor, which can lead + to premature garbage collection of in-use items. - Consider moving to per-class capability masks, such as CAP_SOCK_FOO, and a per-class mask identifying possible rights. @@ -68,4 +68,7 @@ - It would be nice if we didn't need -rdynamic; can we export just _capstart? Should we add more information (a capability entry point) to ELF? -- Fix handling of DFLAG_PASSABLE. +- Fix handling of DFLAG_PASSABLE: need to propagate !passable state up from + non-passible objects, such as capability-wrapped kqueues. + +- gzip -c fails. From owner-p4-projects@FreeBSD.ORG Thu Feb 11 16:14:03 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5172F1065695; Thu, 11 Feb 2010 16:14:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 17134106568B for ; Thu, 11 Feb 2010 16:14:03 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 04EA18FC15 for ; Thu, 11 Feb 2010 16:14:03 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1BGE2u7028116 for ; Thu, 11 Feb 2010 16:14:02 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1BGE2KT028114 for perforce@freebsd.org; Thu, 11 Feb 2010 16:14:02 GMT (envelope-from anchie@FreeBSD.org) Date: Thu, 11 Feb 2010 16:14:02 GMT Message-Id: <201002111614.o1BGE2KT028114@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174592 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Feb 2010 16:14:03 -0000 http://p4web.freebsd.org/chv.cgi?CH=174592 Change 174592 by anchie@anchie_malimis on 2010/02/11 16:13:53 Minor bug fix. Affected files ... .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os_specific.h#6 edit Differences ... ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/os_specific.h#6 (text+ko) ==== @@ -36,8 +36,7 @@ #include #include -/* extern void snd_recv_pkt(struct sbuff *, int, int, void *); */ -extern void snd_recv_pkt(struct sbuff *, int, int); +extern void snd_recv_pkt(struct sbuff *, int, int, void *); extern int os_specific_add_addr(struct in6_addr *, int, int, uint32_t, uint32_t); From owner-p4-projects@FreeBSD.ORG Thu Feb 11 18:01:51 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26D021065698; Thu, 11 Feb 2010 18:01:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF8891065696 for ; Thu, 11 Feb 2010 18:01:50 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCF208FC16 for ; Thu, 11 Feb 2010 18:01:50 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1BI1o29048049 for ; Thu, 11 Feb 2010 18:01:50 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1BI1oHa048047 for perforce@freebsd.org; Thu, 11 Feb 2010 18:01:50 GMT (envelope-from anchie@FreeBSD.org) Date: Thu, 11 Feb 2010 18:01:50 GMT Message-Id: <201002111801.o1BI1oHa048047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Feb 2010 18:01:51 -0000 http://p4web.freebsd.org/chv.cgi?CH=174594 Change 174594 by anchie@anchie_malimis on 2010/02/11 18:01:39 Two small, but important bugfixes: => Outgoing packets that were not m_tagged with ND_PACKET_OUTGOING tag were generating EOPNOTSUPP before the packet managed to reach the if_output() because of the return EOPNOTSUPP was placed on the wrong place. => Incoming packets, other then ND/SeND packets, in icmp6_input() did not reach icmp6_rip6_input() because of wrong if condition. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#29 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#21 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#32 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#29 (text+ko) ==== @@ -941,8 +941,7 @@ } /* deliver the packet to appropriate sockets */ - if (send_input_hook == NULL) - icmp6_rip6_input(&m, *offp); + icmp6_rip6_input(&m, *offp); return IPPROTO_DONE; ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#21 (text+ko) ==== @@ -1903,10 +1903,8 @@ skip = 1; nd_type = (unsigned short *)(mtag + 1); send_input_hook(m, ifp, SND_OUT, ip6len); - } else - error = EOPNOTSUPP; - - return error; + return error; + } } /* ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#32 (text+ko) ==== @@ -55,7 +55,6 @@ struct sockaddr_in6 dst; struct icmp6_hdr *icmp6; int icmp6len; - int offp; /* * Receive incoming (SEND-protected) or outgoing traffic @@ -113,9 +112,6 @@ return (ENOSYS); } - offp = sizeof (struct ip6_hdr); - icmp6_rip6_input(&m, offp); - /* * No error returned from nd6_??_input() so the only thing * we can do is to pretend that it worked. From owner-p4-projects@FreeBSD.ORG Thu Feb 11 20:00:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FFC71065679; Thu, 11 Feb 2010 20:00:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13E78106566B for ; Thu, 11 Feb 2010 20:00:15 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F37028FC0C for ; Thu, 11 Feb 2010 20:00:14 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1BK0EQQ059660 for ; Thu, 11 Feb 2010 20:00:14 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1BK0DsC059658 for perforce@freebsd.org; Thu, 11 Feb 2010 20:00:13 GMT (envelope-from peter@wemm.org) Date: Thu, 11 Feb 2010 20:00:13 GMT Message-Id: <201002112000.o1BK0DsC059658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174606 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Feb 2010 20:00:15 -0000 http://p4web.freebsd.org/chv.cgi?CH=174606 Change 174606 by peter@peter_daintree on 2010/02/11 19:59:16 IFC @174600 Affected files ... .. //depot/projects/hammer/bin/ls/ls.c#21 integrate .. //depot/projects/hammer/bin/pax/Makefile#5 integrate .. //depot/projects/hammer/bin/pax/cpio.h#3 integrate .. //depot/projects/hammer/bin/pax/tar.h#3 integrate .. //depot/projects/hammer/bin/pkill/pkill.c#7 integrate .. //depot/projects/hammer/bin/ps/ps.c#26 integrate .. //depot/projects/hammer/bin/sh/main.c#11 integrate .. //depot/projects/hammer/bin/sh/var.c#19 integrate .. //depot/projects/hammer/contrib/csup/Makefile#4 integrate .. //depot/projects/hammer/contrib/csup/TODO#4 integrate .. //depot/projects/hammer/contrib/csup/auth.c#1 branch .. //depot/projects/hammer/contrib/csup/auth.h#1 branch .. //depot/projects/hammer/contrib/csup/config.h#3 integrate .. //depot/projects/hammer/contrib/csup/cpasswd.1#1 branch .. //depot/projects/hammer/contrib/csup/cpasswd.sh#1 branch .. //depot/projects/hammer/contrib/csup/csup.1#4 integrate .. //depot/projects/hammer/contrib/csup/main.c#3 integrate .. //depot/projects/hammer/contrib/csup/proto.c#5 integrate .. //depot/projects/hammer/contrib/netcat/FREEBSD-vendor#5 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#104 integrate .. //depot/projects/hammer/etc/network.subr#34 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#71 integrate .. //depot/projects/hammer/etc/rc.d/ipfw#21 integrate .. //depot/projects/hammer/etc/rc.d/ntpdate#15 integrate .. //depot/projects/hammer/etc/rc.d/rtsold#3 branch .. //depot/projects/hammer/etc/services#19 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#92 integrate .. //depot/projects/hammer/games/grdc/grdc.c#4 integrate .. //depot/projects/hammer/games/morse/Makefile#3 integrate .. //depot/projects/hammer/games/morse/morse.c#9 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc#6 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile.alpha#3 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.alpha#8 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#12 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.alpha#7 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/libopcodes/Makefile.alpha#2 delete .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#38 integrate .. //depot/projects/hammer/lib/Makefile#81 integrate .. //depot/projects/hammer/lib/libc/gen/devname.c#5 integrate .. //depot/projects/hammer/lib/libc/gen/getutxent.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/rand48.3#5 integrate .. //depot/projects/hammer/lib/libc/mips/sys/ptrace.S#2 integrate .. //depot/projects/hammer/lib/libc/net/sctp_opt_info.3#5 integrate .. //depot/projects/hammer/lib/libc/net/sctp_recvmsg.3#5 integrate .. //depot/projects/hammer/lib/libc/net/sctp_send.3#6 integrate .. //depot/projects/hammer/lib/libc/net/sctp_sendmsg.3#6 integrate .. //depot/projects/hammer/lib/libc/net/sctp_sys_calls.c#10 integrate .. //depot/projects/hammer/lib/libc/nls/msgcat.c#10 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac.3#10 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#23 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#55 integrate .. //depot/projects/hammer/lib/libc/stdlib/ql.h#1 branch .. //depot/projects/hammer/lib/libc/stdlib/qr.h#1 branch .. //depot/projects/hammer/lib/libc/stdlib/strfmon.c#10 integrate .. //depot/projects/hammer/lib/libc/string/memccpy.3#3 integrate .. //depot/projects/hammer/lib/libc/string/memchr.3#6 integrate .. //depot/projects/hammer/lib/libc/string/memcmp.3#4 integrate .. //depot/projects/hammer/lib/libc/string/memset.3#4 integrate .. //depot/projects/hammer/lib/libc/string/strndup.c#2 integrate .. //depot/projects/hammer/lib/libc/sys/ptrace.2#12 integrate .. //depot/projects/hammer/lib/libc/sys/shm_open.2#2 integrate .. //depot/projects/hammer/lib/libefi/Makefile#1 branch .. //depot/projects/hammer/lib/libefi/efi_getvar.c#1 branch .. //depot/projects/hammer/lib/libefi/efi_nextvarname.c#1 branch .. //depot/projects/hammer/lib/libefi/efi_setvar.c#1 branch .. //depot/projects/hammer/lib/libefi/libefi.3#1 branch .. //depot/projects/hammer/lib/libefi/libefi.c#1 branch .. //depot/projects/hammer/lib/libefi/libefi.h#1 branch .. //depot/projects/hammer/lib/libefi/libefi_int.h#1 branch .. //depot/projects/hammer/lib/libgpib/Makefile#10 integrate .. //depot/projects/hammer/lib/libgpib/gpib.3#1 branch .. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.c#12 integrate .. //depot/projects/hammer/lib/libufs/Makefile#12 integrate .. //depot/projects/hammer/lib/libufs/cgroup.c#4 integrate .. //depot/projects/hammer/lib/libufs/sblock.c#5 integrate .. //depot/projects/hammer/lib/libusb/libusb.h#4 integrate .. //depot/projects/hammer/lib/libusb/libusb10.c#4 integrate .. //depot/projects/hammer/lib/libusb/libusb10_desc.c#4 integrate .. //depot/projects/hammer/lib/libusb/libusb10_io.c#4 integrate .. //depot/projects/hammer/lib/libusb/libusb20.3#4 integrate .. //depot/projects/hammer/lib/libusb/libusb20.c#6 integrate .. //depot/projects/hammer/lib/libusb/libusb20.h#5 integrate .. //depot/projects/hammer/lib/libusb/libusb20_compat01.c#4 integrate .. //depot/projects/hammer/lib/libusb/libusb20_desc.c#3 integrate .. //depot/projects/hammer/lib/libusb/libusb20_int.h#5 integrate .. //depot/projects/hammer/lib/libusb/libusb20_ugen20.c#6 integrate .. //depot/projects/hammer/lib/libusb/usb.h#2 integrate .. //depot/projects/hammer/lib/msun/amd64/fenv.c#5 integrate .. //depot/projects/hammer/lib/msun/amd64/fenv.h#5 integrate .. //depot/projects/hammer/lib/msun/i387/fenv.c#4 integrate .. //depot/projects/hammer/lib/msun/i387/fenv.h#5 integrate .. //depot/projects/hammer/libexec/ftpd/logwtmp.c#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#21 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#43 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.c#17 integrate .. //depot/projects/hammer/sbin/dump/itime.c#6 integrate .. //depot/projects/hammer/sbin/dump/main.c#18 integrate .. //depot/projects/hammer/sbin/geom/class/multipath/geom_multipath.c#3 integrate .. //depot/projects/hammer/sbin/growfs/growfs.c#17 integrate .. //depot/projects/hammer/sbin/ifconfig/ifcarp.c#2 integrate .. //depot/projects/hammer/sbin/iscontrol/iscontrol.h#3 integrate .. //depot/projects/hammer/sbin/iscontrol/pdu.c#3 integrate .. //depot/projects/hammer/sbin/mknod/mknod.8#12 integrate .. //depot/projects/hammer/sbin/mknod/mknod.c#4 integrate .. //depot/projects/hammer/sbin/mount/mount.8#32 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#24 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#27 integrate .. //depot/projects/hammer/sbin/newfs/newfs.c#20 integrate .. //depot/projects/hammer/sbin/newfs/newfs.h#12 integrate .. //depot/projects/hammer/sbin/restore/Makefile#6 integrate .. //depot/projects/hammer/sbin/restore/dirs.c#11 integrate .. //depot/projects/hammer/sbin/restore/extern.h#5 integrate .. //depot/projects/hammer/sbin/restore/interactive.c#11 integrate .. //depot/projects/hammer/sbin/restore/tape.c#11 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.8#16 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.c#28 integrate .. //depot/projects/hammer/sbin/tunefs/tunefs.c#10 integrate .. //depot/projects/hammer/sbin/umount/umount.c#14 integrate .. //depot/projects/hammer/share/examples/kld/cdev/test/Makefile#5 integrate .. //depot/projects/hammer/share/examples/kld/syscall/test/Makefile#6 integrate .. //depot/projects/hammer/share/man/man4/Makefile#129 integrate .. //depot/projects/hammer/share/man/man4/acpi_asus.4#4 integrate .. //depot/projects/hammer/share/man/man4/acpi_fujitsu.4#2 integrate .. //depot/projects/hammer/share/man/man4/acpi_hp.4#3 integrate .. //depot/projects/hammer/share/man/man4/acpi_ibm.4#2 integrate .. //depot/projects/hammer/share/man/man4/acpi_panasonic.4#3 integrate .. //depot/projects/hammer/share/man/man4/acpi_sony.4#2 integrate .. //depot/projects/hammer/share/man/man4/acpi_toshiba.4#2 integrate .. //depot/projects/hammer/share/man/man4/acpi_wmi.4#3 integrate .. //depot/projects/hammer/share/man/man4/ahci.4#3 integrate .. //depot/projects/hammer/share/man/man4/alpm.4#1 branch .. //depot/projects/hammer/share/man/man4/amdpm.4#1 branch .. //depot/projects/hammer/share/man/man4/gpib.4#2 integrate .. //depot/projects/hammer/share/man/man4/io.4#2 integrate .. //depot/projects/hammer/share/man/man4/iwn.4#7 integrate .. //depot/projects/hammer/share/man/man4/iwnfw.4#4 integrate .. //depot/projects/hammer/share/man/man4/linux.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#42 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/alpm.4#2 delete .. //depot/projects/hammer/share/man/man4/man4.i386/amdpm.4#4 delete .. //depot/projects/hammer/share/man/man4/man4.i386/mcd.4#7 delete .. //depot/projects/hammer/share/man/man4/man4.i386/padlock.4#6 delete .. //depot/projects/hammer/share/man/man4/man4.i386/pcf.4#2 delete .. //depot/projects/hammer/share/man/man4/man4.i386/scd.4#7 delete .. //depot/projects/hammer/share/man/man4/man4.i386/viapm.4#3 delete .. //depot/projects/hammer/share/man/man4/mcd.4#1 branch .. //depot/projects/hammer/share/man/man4/ndis.4#4 integrate .. //depot/projects/hammer/share/man/man4/nvram.4#2 integrate .. //depot/projects/hammer/share/man/man4/padlock.4#1 branch .. //depot/projects/hammer/share/man/man4/pcf.4#1 branch .. //depot/projects/hammer/share/man/man4/pcii.4#2 integrate .. //depot/projects/hammer/share/man/man4/run.4#1 branch .. //depot/projects/hammer/share/man/man4/scd.4#1 branch .. //depot/projects/hammer/share/man/man4/sctp.4#4 integrate .. //depot/projects/hammer/share/man/man4/tnt4882.4#2 integrate .. //depot/projects/hammer/share/man/man4/viapm.4#1 branch .. //depot/projects/hammer/share/man/man4/vr.4#17 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#102 integrate .. //depot/projects/hammer/share/man/man5/tmpfs.5#4 integrate .. //depot/projects/hammer/share/man/man8/rc.subr.8#15 integrate .. //depot/projects/hammer/share/man/man9/VFS.9#7 integrate .. //depot/projects/hammer/share/man/man9/alloc_unr.9#4 integrate .. //depot/projects/hammer/share/man/man9/locking.9#6 integrate .. //depot/projects/hammer/share/man/man9/mtx_pool.9#7 integrate .. //depot/projects/hammer/share/man/man9/vnode.9#9 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#25 integrate .. //depot/projects/hammer/share/zoneinfo/Makefile#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/msi.c#11 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#128 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#126 integrate .. //depot/projects/hammer/sys/amd64/conf/XENHVM#5 integrate .. //depot/projects/hammer/sys/arm/arm/db_trace.c#15 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#60 integrate .. //depot/projects/hammer/sys/arm/conf/AVILA#23 integrate .. //depot/projects/hammer/sys/arm/conf/BWCT#10 integrate .. //depot/projects/hammer/sys/arm/conf/CAMBRIA#9 integrate .. //depot/projects/hammer/sys/arm/conf/CNS11XXNAS#2 integrate .. //depot/projects/hammer/sys/arm/conf/CRB#10 integrate .. //depot/projects/hammer/sys/arm/conf/DB-78XXX#6 integrate .. //depot/projects/hammer/sys/arm/conf/DB-88F5XXX#6 integrate .. //depot/projects/hammer/sys/arm/conf/DB-88F6XXX#6 integrate .. //depot/projects/hammer/sys/arm/conf/EP80219#11 integrate .. //depot/projects/hammer/sys/arm/conf/GUMSTIX#6 integrate .. //depot/projects/hammer/sys/arm/conf/HL200#12 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#21 integrate .. //depot/projects/hammer/sys/arm/conf/KB920X#17 integrate .. //depot/projects/hammer/sys/arm/conf/NSLU#8 integrate .. //depot/projects/hammer/sys/arm/conf/SIMICS#18 integrate .. //depot/projects/hammer/sys/arm/conf/SKYEYE#11 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/cambria_fled.c#2 integrate .. //depot/projects/hammer/sys/cam/ata/ata_all.c#6 integrate .. //depot/projects/hammer/sys/cam/ata/ata_da.c#6 integrate .. //depot/projects/hammer/sys/cam/ata/ata_pmp.c#3 integrate .. //depot/projects/hammer/sys/cam/ata/ata_xpt.c#6 integrate .. //depot/projects/hammer/sys/cam/cam.c#10 integrate .. //depot/projects/hammer/sys/cam/cam.h#7 integrate .. //depot/projects/hammer/sys/cam/cam_ccb.h#13 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#32 integrate .. //depot/projects/hammer/sys/cam/cam_periph.h#10 integrate .. //depot/projects/hammer/sys/cam/cam_queue.h#5 integrate .. //depot/projects/hammer/sys/cam/cam_sim.c#9 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#48 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.h#8 integrate .. //depot/projects/hammer/sys/cam/cam_xpt_internal.h#5 integrate .. //depot/projects/hammer/sys/cam/cam_xpt_periph.h#6 integrate .. //depot/projects/hammer/sys/cam/cam_xpt_sim.h#5 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_all.c#20 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#34 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ch.c#18 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#56 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_low.c#14 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_pass.c#17 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_xpt.c#4 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#6 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#3 delete .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#3 delete .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#70 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#40 integrate .. //depot/projects/hammer/sys/compat/svr4/syscalls.master#9 integrate .. //depot/projects/hammer/sys/conf/NOTES#171 integrate .. //depot/projects/hammer/sys/conf/files#209 integrate .. //depot/projects/hammer/sys/conf/files.amd64#118 integrate .. //depot/projects/hammer/sys/conf/files.i386#110 integrate .. //depot/projects/hammer/sys/conf/files.ia64#50 integrate .. //depot/projects/hammer/sys/conf/files.mips#8 integrate .. //depot/projects/hammer/sys/conf/files.pc98#80 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#54 integrate .. //depot/projects/hammer/sys/contrib/dev/run/LICENSE#1 branch .. //depot/projects/hammer/sys/contrib/dev/run/rt2870.fw.uu#1 branch .. //depot/projects/hammer/sys/dev/acpi_support/acpi_sony.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#95 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#50 integrate .. //depot/projects/hammer/sys/dev/ahci/ahci.c#9 integrate .. //depot/projects/hammer/sys/dev/ahci/ahci.h#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#25 integrate .. //depot/projects/hammer/sys/dev/asr/asr.c#27 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#79 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#57 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#34 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-netcell.c#5 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-siliconimage.c#7 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom_v14.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416.h#4 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#6 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#7 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#4 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9285.ini#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9285v2.ini#1 branch .. //depot/projects/hammer/sys/dev/ath/if_ath.c#78 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#43 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#96 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#58 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#26 integrate .. //depot/projects/hammer/sys/dev/drm/drm_hashtab.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_hashtab.h#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_linux_list.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_memory.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_mm.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_mm.h#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_sman.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_sman.h#1 branch .. //depot/projects/hammer/sys/dev/drm/i915_drv.c#11 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drv.h#11 integrate .. //depot/projects/hammer/sys/dev/drm/via_3d_reg.h#1 branch .. //depot/projects/hammer/sys/dev/drm/via_dma.c#1 branch .. //depot/projects/hammer/sys/dev/drm/via_dmablit.c#1 branch .. //depot/projects/hammer/sys/dev/drm/via_dmablit.h#1 branch .. //depot/projects/hammer/sys/dev/drm/via_drm.h#1 branch .. //depot/projects/hammer/sys/dev/drm/via_drv.c#1 branch .. //depot/projects/hammer/sys/dev/drm/via_drv.h#1 branch .. //depot/projects/hammer/sys/dev/drm/via_irq.c#1 branch .. //depot/projects/hammer/sys/dev/drm/via_map.c#1 branch .. //depot/projects/hammer/sys/dev/drm/via_mm.c#1 branch .. //depot/projects/hammer/sys/dev/drm/via_verifier.c#1 branch .. //depot/projects/hammer/sys/dev/drm/via_verifier.h#1 branch .. //depot/projects/hammer/sys/dev/drm/via_video.c#1 branch .. //depot/projects/hammer/sys/dev/e1000/if_em.c#14 integrate .. //depot/projects/hammer/sys/dev/e1000/if_igb.c#13 integrate .. //depot/projects/hammer/sys/dev/fb/vesa.c#6 integrate .. //depot/projects/hammer/sys/dev/hptiop/hptiop.c#6 integrate .. //depot/projects/hammer/sys/dev/hptrr/hptrr_osm_bsd.c#6 integrate .. //depot/projects/hammer/sys/dev/hptrr/os_bsd.h#3 integrate .. //depot/projects/hammer/sys/dev/ieee488/ibfoo.c#5 integrate .. //depot/projects/hammer/sys/dev/ieee488/pcii.c#8 integrate .. //depot/projects/hammer/sys/dev/ieee488/tnt4882.c#5 integrate .. //depot/projects/hammer/sys/dev/ieee488/tnt4882.h#1 branch .. //depot/projects/hammer/sys/dev/ieee488/upd7210.c#10 integrate .. //depot/projects/hammer/sys/dev/ieee488/upd7210.h#7 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#34 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#38 integrate .. //depot/projects/hammer/sys/dev/isp/isp_library.c#10 integrate .. //depot/projects/hammer/sys/dev/isp/isp_library.h#7 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#33 integrate .. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#23 integrate .. //depot/projects/hammer/sys/dev/isp/ispmbox.h#16 integrate .. //depot/projects/hammer/sys/dev/isp/ispvar.h#22 integrate .. //depot/projects/hammer/sys/dev/mly/mly.c#23 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#24 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.h#7 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#17 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#80 integrate .. //depot/projects/hammer/sys/dev/pci/pcireg.h#26 integrate .. //depot/projects/hammer/sys/dev/pci/pcivar.h#22 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpo.c#16 integrate .. //depot/projects/hammer/sys/dev/siba/siba.c#2 integrate .. //depot/projects/hammer/sys/dev/siba/siba_bwn.c#1 branch .. //depot/projects/hammer/sys/dev/siba/siba_cc.c#2 integrate .. //depot/projects/hammer/sys/dev/siba/siba_core.c#1 branch .. //depot/projects/hammer/sys/dev/siba/siba_ids.h#2 integrate .. //depot/projects/hammer/sys/dev/siba/siba_pcib.c#2 integrate .. //depot/projects/hammer/sys/dev/siba/sibareg.h#2 integrate .. //depot/projects/hammer/sys/dev/siba/sibavar.h#2 integrate .. //depot/projects/hammer/sys/dev/siis/siis.c#6 integrate .. //depot/projects/hammer/sys/dev/siis/siis.h#4 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.c#26 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudioreg.h#8 integrate .. //depot/projects/hammer/sys/dev/trm/trm.c#25 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_cam.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci.h#7 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/quirk/usb_quirk.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/serial/u3g.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/storage/umass.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#129 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_rum.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_run.c#1 branch .. //depot/projects/hammer/sys/dev/usb/wlan/if_runreg.h#1 branch .. //depot/projects/hammer/sys/dev/usb/wlan/if_runvar.h#1 branch .. //depot/projects/hammer/sys/dev/usb/wlan/if_uath.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_zyd.c#8 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#25 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs.h#3 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clbio.c#6 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clnfsiod.c#2 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clsubs.c#4 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clvfsops.c#5 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clvnops.c#8 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfsmount.h#2 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfsnode.h#2 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#19 integrate .. //depot/projects/hammer/sys/geom/geom_redboot.c#3 integrate .. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#19 integrate .. //depot/projects/hammer/sys/geom/virstor/g_virstor.c#4 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#87 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#119 integrate .. //depot/projects/hammer/sys/i386/conf/XEN#8 integrate .. //depot/projects/hammer/sys/i386/i386/i686_mem.c#14 integrate .. //depot/projects/hammer/sys/i386/i386/msi.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#129 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.master#11 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#44 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#45 integrate .. //depot/projects/hammer/sys/ia64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#63 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#38 integrate .. //depot/projects/hammer/sys/kern/makesyscalls.sh#17 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#75 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#52 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#78 integrate .. //depot/projects/hammer/sys/kern/tty_inq.c#5 integrate .. //depot/projects/hammer/sys/kern/tty_outq.c#3 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#48 integrate .. //depot/projects/hammer/sys/mips/atheros/ar71xx_pci.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/asm_octeon.S#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_fau.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_fau.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_fpa.c#3 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_fpa.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_ipd.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_ipd.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_pip.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_pko.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_pko.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_rgmx.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/driveid.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/obiovar.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/octeon_ebt3000_cf.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/octeon_ebt3000_cf.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/octeon_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/cavium/octeon_pcmap_regs.h#3 integrate .. //depot/projects/hammer/sys/mips/conf/ADM5120#7 integrate .. //depot/projects/hammer/sys/mips/conf/ALCHEMY#2 integrate .. //depot/projects/hammer/sys/mips/conf/AR71XX#3 integrate .. //depot/projects/hammer/sys/mips/conf/IDT#8 integrate .. //depot/projects/hammer/sys/mips/conf/MALTA#7 integrate .. //depot/projects/hammer/sys/mips/conf/MALTA64#3 integrate .. //depot/projects/hammer/sys/mips/conf/OCTEON1#3 integrate .. //depot/projects/hammer/sys/mips/conf/OCTEON1-32#4 integrate .. //depot/projects/hammer/sys/mips/conf/QEMU#6 integrate .. //depot/projects/hammer/sys/mips/conf/SENTRY5#8 integrate .. //depot/projects/hammer/sys/mips/conf/SWARM#3 integrate .. //depot/projects/hammer/sys/mips/conf/SWARM_SMP#1 branch .. //depot/projects/hammer/sys/mips/conf/XLR#3 integrate .. //depot/projects/hammer/sys/mips/include/asm.h#3 integrate .. //depot/projects/hammer/sys/mips/include/cpu.h#4 integrate .. //depot/projects/hammer/sys/mips/include/hwfunc.h#3 integrate .. //depot/projects/hammer/sys/mips/include/intr_machdep.h#3 integrate .. //depot/projects/hammer/sys/mips/include/pcpu.h#3 integrate .. //depot/projects/hammer/sys/mips/include/proc.h#3 integrate .. //depot/projects/hammer/sys/mips/include/smp.h#4 integrate .. //depot/projects/hammer/sys/mips/mips/exception.S#5 integrate .. //depot/projects/hammer/sys/mips/mips/genassym.c#3 integrate .. //depot/projects/hammer/sys/mips/mips/intr_machdep.c#6 integrate .. //depot/projects/hammer/sys/mips/mips/locore.S#4 integrate .. //depot/projects/hammer/sys/mips/mips/machdep.c#11 integrate .. //depot/projects/hammer/sys/mips/mips/mp_machdep.c#6 integrate .. //depot/projects/hammer/sys/mips/mips/mpboot.S#1 branch .. //depot/projects/hammer/sys/mips/mips/pmap.c#15 integrate .. //depot/projects/hammer/sys/mips/mips/swtch.S#5 integrate .. //depot/projects/hammer/sys/mips/mips/tick.c#5 integrate .. //depot/projects/hammer/sys/mips/mips/trap.c#6 integrate .. //depot/projects/hammer/sys/mips/rmi/dev/xlr/rge.c#3 integrate .. //depot/projects/hammer/sys/mips/rmi/on_chip.c#2 integrate .. //depot/projects/hammer/sys/mips/rmi/pic.h#3 integrate .. //depot/projects/hammer/sys/mips/rmi/xlr_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_asm.S#2 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_scd.c#2 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_scd.h#2 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_zbbus.c#2 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_zbpci.c#2 integrate .. //depot/projects/hammer/sys/modules/Makefile#150 integrate .. //depot/projects/hammer/sys/modules/ath/Makefile#9 integrate .. //depot/projects/hammer/sys/modules/drm/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/drm/drm/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/drm/via/Makefile#1 branch .. //depot/projects/hammer/sys/modules/runfw/Makefile#1 branch .. //depot/projects/hammer/sys/modules/siba_bwn/Makefile#1 branch .. //depot/projects/hammer/sys/modules/usb/Makefile#17 integrate .. //depot/projects/hammer/sys/modules/usb/run/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_bridge.c#56 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#24 integrate .. //depot/projects/hammer/sys/net/if_lagg.h#8 integrate .. //depot/projects/hammer/sys/net/vnet.c#3 integrate .. //depot/projects/hammer/sys/net/vnet.h#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_adhoc.c#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_tkip.c#15 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_hostap.c#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#30 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_mesh.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_sta.c#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_wds.c#10 integrate .. //depot/projects/hammer/sys/netinet/in.c#48 integrate .. //depot/projects/hammer/sys/netinet/ip.h#13 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#31 integrate .. //depot/projects/hammer/sys/netinet/tcp.h#23 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#23 integrate .. //depot/projects/hammer/sys/nfs/nfs_common.c#12 integrate .. //depot/projects/hammer/sys/nfs/nfs_common.h#6 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_krpc.c#5 integrate .. //depot/projects/hammer/sys/nfsserver/nfs.h#22 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_fha.c#6 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvkrpc.c#8 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#69 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#56 integrate .. //depot/projects/hammer/sys/powerpc/conf/MPC85XX#8 integrate .. //depot/projects/hammer/sys/powerpc/mpc85xx/pci_ocp.c#5 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm.c#22 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#78 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/genassym.c#19 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/swtch.S#12 integrate .. //depot/projects/hammer/sys/sun4v/conf/GENERIC#20 integrate .. //depot/projects/hammer/sys/sun4v/include/bus.h#3 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/bus_machdep.c#4 integrate .. //depot/projects/hammer/sys/sys/ata.h#27 integrate .. //depot/projects/hammer/sys/sys/fbio.h#7 integrate .. //depot/projects/hammer/sys/sys/ptrace.h#13 integrate .. //depot/projects/hammer/sys/teken/teken_scs.h#3 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#41 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#88 integrate .. //depot/projects/hammer/sys/ufs/ffs/fs.h#17 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#80 integrate .. //depot/projects/hammer/tools/build/mk/OptionalObsoleteFiles.inc#18 integrate .. //depot/projects/hammer/tools/regression/bin/sh/parameters/mail1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/parameters/mail2.0#1 branch .. //depot/projects/hammer/usr.bin/Makefile#72 integrate .. //depot/projects/hammer/usr.bin/bc/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/bc/bc.y#2 integrate .. //depot/projects/hammer/usr.bin/bc/extern.h#2 integrate .. //depot/projects/hammer/usr.bin/bc/scan.l#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#75 integrate .. //depot/projects/hammer/usr.bin/cpio/cmdline.c#8 integrate .. //depot/projects/hammer/usr.bin/cpio/cpio.c#12 integrate .. //depot/projects/hammer/usr.bin/cpio/cpio.h#7 integrate .. //depot/projects/hammer/usr.bin/csup/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/dc/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/dc/bcode.c#2 integrate .. //depot/projects/hammer/usr.bin/dc/bcode.h#2 integrate .. //depot/projects/hammer/usr.bin/dc/dc.c#2 integrate .. //depot/projects/hammer/usr.bin/dc/inout.c#2 integrate .. //depot/projects/hammer/usr.bin/dc/mem.c#2 integrate .. //depot/projects/hammer/usr.bin/dc/stack.c#2 integrate .. //depot/projects/hammer/usr.bin/ee/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/ee/nls/pt_BR.ISO8859-1/ee.msg#1 branch .. //depot/projects/hammer/usr.bin/find/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/find/extern.h#8 integrate .. //depot/projects/hammer/usr.bin/find/function.c#16 integrate .. //depot/projects/hammer/usr.bin/find/getdate.y#5 integrate .. //depot/projects/hammer/usr.bin/gcore/extern.h#3 integrate .. //depot/projects/hammer/usr.bin/gcore/gcore.c#6 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#30 integrate .. //depot/projects/hammer/usr.bin/procstat/procstat.1#9 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#34 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#43 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#28 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#20 integrate .. //depot/projects/hammer/usr.bin/tar/cmdline.c#4 integrate .. //depot/projects/hammer/usr.bin/tar/config_freebsd.h#9 integrate .. //depot/projects/hammer/usr.bin/tar/err.c#1 branch .. //depot/projects/hammer/usr.bin/tar/err.h#1 branch .. //depot/projects/hammer/usr.bin/tar/getdate.c#3 integrate .. //depot/projects/hammer/usr.bin/tar/line_reader.c#1 branch .. //depot/projects/hammer/usr.bin/tar/line_reader.h#1 branch .. //depot/projects/hammer/usr.bin/tar/matching.c#16 integrate .. //depot/projects/hammer/usr.bin/tar/matching.h#1 branch .. //depot/projects/hammer/usr.bin/tar/pathmatch.c#1 branch .. //depot/projects/hammer/usr.bin/tar/pathmatch.h#1 branch .. //depot/projects/hammer/usr.bin/tar/read.c#31 integrate .. //depot/projects/hammer/usr.bin/tar/siginfo.c#3 delete .. //depot/projects/hammer/usr.bin/tar/subst.c#4 integrate .. //depot/projects/hammer/usr.bin/tar/util.c#21 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#40 integrate .. //depot/projects/hammer/usr.bin/truss/mips-fbsd.c#4 integrate .. //depot/projects/hammer/usr.bin/uname/uname.1#7 integrate .. //depot/projects/hammer/usr.bin/uname/uname.c#9 integrate .. //depot/projects/hammer/usr.bin/w/w.c#12 integrate .. //depot/projects/hammer/usr.sbin/powerd/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/powerd/powerd.c#17 integrate .. //depot/projects/hammer/usr.sbin/rpcbind/rpcb_svc_com.c#6 integrate .. //depot/projects/hammer/usr.sbin/rpcbind/rpcbind.c#12 integrate .. //depot/projects/hammer/usr.sbin/rpcbind/rpcbind.h#4 integrate .. //depot/projects/hammer/usr.sbin/rpcbind/util.c#4 integrate .. //depot/projects/hammer/usr.sbin/rtsold/rtsold.c#8 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/package.c#6 integrate .. //depot/projects/hammer/usr.sbin/wake/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/wake/wake.8#5 integrate .. //depot/projects/hammer/usr.sbin/wake/wake.c#3 integrate Differences ... ==== //depot/projects/hammer/bin/ls/ls.c#21 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.89 2010/01/24 19:23:07 jh Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.90 2010/02/08 15:42:55 jh Exp $"); #include #include @@ -113,6 +113,7 @@ static int f_listdot; /* list files beginning with . */ static int f_noautodot; /* do not automatically enable -A for root */ int f_longform; /* long listing format */ +static int f_nofollow; /* don't follow symbolic link arguments */ int f_nonprint; /* show unprintables as ? */ static int f_nosort; /* don't sort output */ int f_notabs; /* don't use tab-separated multi-col output */ @@ -234,6 +235,7 @@ break; case 'H': fts_options |= FTS_COMFOLLOW; + f_nofollow = 0; break; case 'G': setenv("CLICOLOR", "", 1); @@ -241,11 +243,13 @@ case 'L': fts_options &= ~FTS_PHYSICAL; fts_options |= FTS_LOGICAL; + f_nofollow = 0; break; case 'P': fts_options &= ~FTS_COMFOLLOW; fts_options &= ~FTS_LOGICAL; fts_options |= FTS_PHYSICAL; + f_nofollow = 1; break; case 'R': f_recursive = 1; @@ -396,10 +400,10 @@ fts_options |= FTS_NOSTAT; /* - * If not -F, -d or -l options, follow any symbolic links listed on + * If not -F, -P, -d or -l options, follow any symbolic links listed on * the command line. */ - if (!f_longform && !f_listdir && (!f_type || f_slash)) + if (!f_nofollow && !f_longform && !f_listdir && (!f_type || f_slash)) fts_options |= FTS_COMFOLLOW; /* ==== //depot/projects/hammer/bin/pax/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/pax/Makefile,v 1.12 2004/05/14 13:31:19 cognet Exp $ +# $FreeBSD: src/bin/pax/Makefile,v 1.14 2010/02/07 17:05:22 imp Exp $ # To install on versions prior to BSD 4.4 the following may have to be # defined with CFLAGS += @@ -33,8 +33,4 @@ #MAN= pax.1 tar.1 cpio.1 #LINKS= ${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio -.if ${MACHINE_ARCH} == "arm" -WARNS?= 3 -.endif - .include ==== //depot/projects/hammer/bin/pax/cpio.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)cpio.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/pax/cpio.h,v 1.7 2004/04/06 20:06:48 markm Exp $ + * $FreeBSD: src/bin/pax/cpio.h,v 1.8 2010/02/07 17:05:22 imp Exp $ */ /* @@ -67,7 +67,7 @@ char c_mtime[11]; /* modification time */ char c_namesize[6]; /* length of pathname */ char c_filesize[11]; /* length of file in bytes */ -} HD_CPIO; +} HD_CPIO __aligned(1); #define MAGIC 070707 /* transportable archive id */ @@ -98,7 +98,7 @@ u_char h_namesize[2]; u_char h_filesize_1[2]; u_char h_filesize_2[2]; -} HD_BCPIO; +} HD_BCPIO __aligned(1); #ifdef _PAX_ /* @@ -136,7 +136,7 @@ char c_rmin[8]; /* special file minor # */ char c_namesize[8]; /* length of pathname */ char c_chksum[8]; /* 0 OR CRC of bytes of FILE data */ -} HD_VCPIO; +} HD_VCPIO __aligned(1); #define VMAGIC 070701 /* sVr4 new portable archive id */ #define VCMAGIC 070702 /* sVr4 new portable archive id CRC */ ==== //depot/projects/hammer/bin/pax/tar.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tar.h 8.2 (Berkeley) 4/18/94 - * $FreeBSD: src/bin/pax/tar.h,v 1.7 2004/04/06 20:06:49 markm Exp $ + * $FreeBSD: src/bin/pax/tar.h,v 1.8 2010/02/07 17:05:22 imp Exp $ */ /* @@ -96,7 +96,7 @@ char chksum[CHK_LEN]; /* checksum */ char linkflag; /* norm, hard, or sym. */ char linkname[TNMSZ]; /* linked to name */ -} HD_TAR; +} HD_TAR __aligned(1); #ifdef _PAX_ /* @@ -142,4 +142,4 @@ char devmajor[8]; /* major device number */ char devminor[8]; /* minor device number */ char prefix[TPFSZ]; /* linked to name */ -} HD_USTAR; +} HD_USTAR __aligned(1); ==== //depot/projects/hammer/bin/pkill/pkill.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.7 2010/01/04 10:50:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.8 2010/02/08 21:23:48 brucec Exp $"); #include #include @@ -180,7 +180,8 @@ debug_opt = 0; pidfile = NULL; pidfilelock = 0; - execf = coref = _PATH_DEVNULL; + execf = NULL; + coref = _PATH_DEVNULL; while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:ad:fg:ij:lnos:t:u:vx")) != -1) switch (ch) { ==== //depot/projects/hammer/bin/ps/ps.c#26 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.117 2009/07/23 10:20:12 brian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.118 2010/02/08 21:23:48 brucec Exp $"); #include #include @@ -212,7 +212,8 @@ init_list(&sesslist, addelem_pid, sizeof(pid_t), "session id"); init_list(&ttylist, addelem_tty, sizeof(dev_t), "tty"); init_list(&uidlist, addelem_uid, sizeof(uid_t), "user"); - memf = nlistf = _PATH_DEVNULL; + memf = _PATH_DEVNULL; + nlistf = NULL; while ((ch = getopt(argc, argv, PS_ARGS)) != -1) switch (ch) { case 'A': ==== //depot/projects/hammer/bin/sh/main.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.36 2009/12/27 18:04:05 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.37 2010/02/06 22:57:24 jilles Exp $"); #include #include @@ -157,6 +157,8 @@ out2fmt_flush("sh: cannot determine working directory\n"); if (getpwd() != NULL) setvar ("PWD", getpwd(), VEXPORT); + if (iflag) + chkmail(1); if (argv[0] && argv[0][0] == '-') { state = 1; read_profile("/etc/profile"); ==== //depot/projects/hammer/bin/sh/var.c#19 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.44 2009/12/27 18:32:44 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.45 2010/02/06 22:57:24 jilles Exp $"); #include #include @@ -337,8 +337,13 @@ /* * We could roll this to a function, to handle it as * a regular variable function callback, but why bother? + * + * Note: this assumes iflag is not set to 1 initially. + * As part of init(), this is called before arguments + * are looked at. */ - if (vp == &vmpath || (vp == &vmail && ! mpathset())) + if ((vp == &vmpath || (vp == &vmail && ! mpathset())) && + iflag == 1) chkmail(1); if ((vp->flags & VEXPORT) && localevar(s)) { change_env(s, 1); ==== //depot/projects/hammer/contrib/csup/Makefile#4 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/contrib/csup/Makefile,v 1.2 2009/01/05 15:18:16 lulf Exp $ +# $FreeBSD: src/contrib/csup/Makefile,v 1.3 2010/02/02 05:57:42 lulf Exp $ PREFIX?= /usr/local BINDIR?= ${PREFIX}/bin @@ -7,7 +7,7 @@ UNAME!= /usr/bin/uname -s PROG= csup -SRCS= attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ +SRCS= attrstack.c auth.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \ pathcomp.c proto.c status.c stream.c threads.c token.l updater.c \ rcsfile.c rcsparse.c lex.rcs.c rsyncfile.c @@ -42,4 +42,7 @@ DPADD= ${LIBCRYPTO} ${LIBZ} LDADD= -lcrypto -lz +SCRIPTS= cpasswd.sh +MAN= csup.1 cpasswd.1 + .include ==== //depot/projects/hammer/contrib/csup/TODO#4 (text) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/csup/TODO,v 1.2 2009/01/05 15:18:16 lulf Exp $ +$FreeBSD: src/contrib/csup/TODO,v 1.3 2010/02/02 05:57:42 lulf Exp $ BUGS: @@ -17,7 +17,6 @@ MISSING FEATURES: -- Add support for authentication. - Add support for shell commands sent by the server. - Add missing support for various CVSup options : -D, -a (requires authentication support), -e and -E (requires shell commands support) ==== //depot/projects/hammer/contrib/csup/config.h#3 (text) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/config.h,v 1.1.1.2 2006/03/14 03:51:12 mux Exp $ + * $FreeBSD: src/contrib/csup/config.h,v 1.2 2010/02/02 05:57:42 lulf Exp $ */ #ifndef _CONFIG_H_ #define _CONFIG_H_ @@ -108,6 +108,7 @@ struct chan *chan1; struct stream *server; fattr_support_t fasupport; + int reqauth; }; struct config *config_init(const char *, struct coll *, int); ==== //depot/projects/hammer/contrib/csup/csup.1#4 (text) ==== @@ -22,7 +22,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $Id: cvsup.1,v 1.70 2003/03/04 18:23:46 jdp Exp $ -.\" $FreeBSD: src/contrib/csup/csup.1,v 1.2 2009/01/07 18:37:07 lulf Exp $ +.\" $FreeBSD: src/contrib/csup/csup.1,v 1.3 2010/02/02 05:57:42 lulf Exp $ .\" .Dd February 1, 2006 .Os FreeBSD @@ -32,7 +32,7 @@ .Nd network distribution package for CVS repositories .Sh SYNOPSIS .Nm -.Op Fl 146ksvzZ +.Op Fl 146aksvzZ .Op Fl A Ar addr .Op Fl b Ar base .Op Fl c Ar collDir @@ -106,6 +106,12 @@ Forces .Nm to use IPv6 addresses only. +.It Fl a +Requires the server to authenticate itself (prove its identity) to +the client. If authentication of the server fails, the update is +canceled. See +.Sx AUTHENTICATION , +below. .It Fl A Ar addr Specifies a local address to bind to when connecting to the server. The local address might be a hostname or a numeric host address string @@ -793,6 +799,102 @@ .It .Pa /bar/stool/src-all/refuse.cvs:RELENG_3 .El +.Sh AUTHENTICATION +.Nm +implements an optional authentication mechanism which can be used by the +client and server to verify each other's identities. +Public CVSup servers normally do not enable authentication. +.Nm +users may ignore this section unless they have been informed +that authentication is required by the administrator of their server. +.Pp +The authentication subsystem uses a +challenge-response protocol which is immune to packet sniffing and +replay attacks. No passwords are sent over the network in either +direction. Both the client and the server can independently verify +the identities of each other. +.Pp +The file +.Li $ Ns Ev HOME Ns Pa /.csup/auth +holds the information used for authentication. This file contains a +record for each server that the client is allowed to access. Each +record occupies one line in the file. Lines beginning with +.Ql # +are ignored, as are lines containing only white space. White space is +significant everywhere else in the file. Fields are separated by +.Ql \&: +characters. +.Pp +Each record of the file has the following form: +.Bd -literal -offset indent +.Sm off +.Xo Ar serverName No : Ar clientName No : +.Ar password No : Ar comment +.Xc +.Sm on +.Ed +.Pp +All fields must be present even if some of them are empty. +.Ar ServerName +is the name of the server to which the record applies. By convention, +it is the canonical fully-qualified domain name of the server, e.g., +.Ql CVSup177.FreeBSD.ORG . +This must agree with the server's own idea of its name. The name is +case-insensitive. +.Pp +.Ar ClientName +is the name the client uses to gain access to the server. By +convention, e-mail addresses are used for all client names, e.g., +.Ql BillyJoe@FreeBSD.ORG . +Client names are case-insensitive. +.Pp +.Ar Password +is a secret string of characters that the client uses to prove its +identity. It may not contain any +.Ql \&: +or newline characters. +.Pp +.Ar Comment +may contain any additional information to identify the record. It +is not interpreted by the program. +.Pp +To set up authentication for a given server, one must perform the +following steps: +.Bl -enum +.It +Obtain the official +.Ar serverName +from the administrator of the server or from some other source. +.It +Choose an appropriate +.Ar clientName . +It should be in the form of a valid e-mail address, to make it easy +for the server administrator to contact the user if necessary. +.It +Choose an arbitrary secret +.Ar password . +.It +Run the +.Nm cpasswd +utility, and type in the +.Ar password +when prompted for it. The utility will print out a line to send +to the server administrator, and instruct you how to modify your +.Li $ Ns Ev HOME Ns Pa /.csup/auth +file. You should use a secure channel to send the line to the +server administrator. +.El +.Pp +Since +.Li $ Ns Ev HOME Ns Pa /.csup/auth +contains passwords, you should ensure that it is not readable by +anyone except yourself. +.Pp +Authentication works independently in both directions. The server +administrator controls whether you must prove your identity. +You control whether to check the server's identity, by means of the +.Fl a +command line option. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 12 08:46:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD1E21065695; Fri, 12 Feb 2010 08:46:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63F7E1065693 for ; Fri, 12 Feb 2010 08:46:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 51BB68FC1A for ; Fri, 12 Feb 2010 08:46:04 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1C8k4C0073740 for ; Fri, 12 Feb 2010 08:46:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1C8k4k0073738 for perforce@freebsd.org; Fri, 12 Feb 2010 08:46:04 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 12 Feb 2010 08:46:04 GMT Message-Id: <201002120846.o1C8k4k0073738@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174615 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2010 08:46:04 -0000 http://p4web.freebsd.org/chv.cgi?CH=174615 Change 174615 by hselasky@hselasky_laptop001 on 2010/02/12 08:45:12 USB serial: - add new device ID. PR: usb/143832 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#103 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#23 (text+ko) ==== @@ -224,6 +224,7 @@ UFTDI_DEV(FTDI, SERIAL_8U100AX, SIO), UFTDI_DEV(FTDI, SERIAL_2232C, 8U232AM), UFTDI_DEV(FTDI, SERIAL_2232D, 8U232AM), + UFTDI_DEV(FTDI, SERIAL_4232H, 8U232AM), UFTDI_DEV(FTDI, SERIAL_8U232AM, 8U232AM), UFTDI_DEV(FTDI, SERIAL_8U232AM4, 8U232AM), UFTDI_DEV(FTDI, SEMC_DSS20, 8U232AM), ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#103 (text+ko) ==== @@ -1472,6 +1472,7 @@ product FTDI SERIAL_8U232AM4 0x6004 8U232AM Serial product FTDI SERIAL_2232C 0x6010 FT2232C Dual port Serial product FTDI SERIAL_2232D 0x9e90 FT2232D Dual port Serial +product FTDI SERIAL_4232H 0x6011 FT4232H Quad port Serial /* Gude Analog- und Digitalsysteme products also uses FTDI's id: */ product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru From owner-p4-projects@FreeBSD.ORG Fri Feb 12 09:05:24 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B61C1065694; Fri, 12 Feb 2010 09:05:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3F34106568F for ; Fri, 12 Feb 2010 09:05:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B81DC8FC17 for ; Fri, 12 Feb 2010 09:05:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1C95Ndq087389 for ; Fri, 12 Feb 2010 09:05:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1C95NOW087387 for perforce@freebsd.org; Fri, 12 Feb 2010 09:05:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 12 Feb 2010 09:05:23 GMT Message-Id: <201002120905.o1C95NOW087387@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174616 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2010 09:05:24 -0000 http://p4web.freebsd.org/chv.cgi?CH=174616 Change 174616 by hselasky@hselasky_laptop001 on 2010/02/12 09:05:16 USB input: - add new quirk PR: usb/116947 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#44 edit .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#9 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#104 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#44 (text+ko) ==== @@ -867,6 +867,18 @@ */ KBD_PROBE_DONE(kbd); + /* + * Set boot protocol if we need the quirk. + */ + if (usb_test_quirk(uaa, UQ_KBD_BOOTPROTO)) { + err = usbd_req_set_protocol(sc->sc_udev, NULL, + sc->sc_iface_index, 0); + if (err != USB_ERR_NORMAL_COMPLETION) { + DPRINTF("set protocol error=%s\n", usbd_errstr(err)); + goto detach; + } + } + /* figure out if there is an ID byte in the data */ err = usbd_req_get_hid_desc(uaa->device, NULL, &hid_ptr, &hid_len, M_TEMP, uaa->info.bIfaceIndex); ==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#23 (text+ko) ==== @@ -459,6 +459,7 @@ [UQ_BUS_POWERED] = "UQ_BUS_POWERED", [UQ_HID_IGNORE] = "UQ_HID_IGNORE", [UQ_KBD_IGNORE] = "UQ_KBD_IGNORE", + [UQ_KBD_BOOTPROTO] = "UQ_KBD_BOOTPROTO", [UQ_MS_BAD_CLASS] = "UQ_MS_BAD_CLASS", [UQ_MS_LEADING_BYTE] = "UQ_MS_LEADING_BYTE", [UQ_MS_REVZ] = "UQ_MS_REVZ", ==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#9 (text+ko) ==== @@ -45,6 +45,7 @@ UQ_BUS_POWERED, /* device is bus powered, despite claim */ UQ_HID_IGNORE, /* device should be ignored by hid class */ UQ_KBD_IGNORE, /* device should be ignored by kbd class */ + UQ_KBD_BOOTPROTO, /* device should set the boot protocol */ UQ_MS_BAD_CLASS, /* doesn't identify properly */ UQ_MS_LEADING_BYTE, /* mouse sends an unknown leading byte */ UQ_MS_REVZ, /* mouse has Z-axis reversed */ ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#104 (text+ko) ==== @@ -2031,6 +2031,7 @@ product MICROSOFT WLNOTEBOOK3 0x00d2 Wireless Optical Mouse 3000 (Model 1049) product MICROSOFT WLUSBMOUSE 0x00b9 Wireless USB Mouse product MICROSOFT XBOX360 0x0292 XBOX 360 WLAN +product MICROSOFT NATURAL4000 0x00db Natural Ergonomic Keyboard 4000 /* Microtech products */ product MICROTECH SCSIDB25 0x0004 USB-SCSI-DB25 From owner-p4-projects@FreeBSD.ORG Sat Feb 13 15:30:55 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FF2D1065672; Sat, 13 Feb 2010 15:30:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13F00106566B for ; Sat, 13 Feb 2010 15:30:55 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 02EBD8FC08 for ; Sat, 13 Feb 2010 15:30:55 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1DFUso9041499 for ; Sat, 13 Feb 2010 15:30:54 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1DFUsIB041497 for perforce@freebsd.org; Sat, 13 Feb 2010 15:30:54 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 13 Feb 2010 15:30:54 GMT Message-Id: <201002131530.o1DFUsIB041497@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174653 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2010 15:30:55 -0000 http://p4web.freebsd.org/chv.cgi?CH=174653 Change 174653 by rene@rene_self on 2010/02/13 15:30:06 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#24 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#72 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/asiabsdcon/rao-kernellocking-2.sbv#1 branch .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#25 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#12 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#17 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#14 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.hardware.xml#5 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.misc.xml#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#67 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#24 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2462,6 +2462,15 @@ + RELENG_7_3 + + + The release branch for &os;-7.3, used only for + security advisories and other critical fixes. + + + + RELENG_7_2 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#72 (text+ko) ==== @@ -1,7 +1,7 @@ + 703000 + February 9, 2010 + 7.3-RELEASE + + + + 703100 + February 9, 2010 + 7.3-STABLE after 7.3-RELEASE. + + + 800000 October 11, 2007 8.0-CURRENT. Separating wide and single byte ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#25 (text+ko) ==== @@ -1,7 +1,7 @@ + - $FreeBSD: www/share/sgml/commercial.hardware.xml,v 1.17 2010/02/06 11:23:51 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.hardware.xml,v 1.18 2010/02/13 08:43:42 jkois Exp $ @@ -330,16 +330,6 @@ - - Introspective Technologies USA - http://www.itechusa.net/ - - Introspective Technologies USA delivers networking solutions with - high powered servers and workstations pre-installed with choice of - operating systems, including FreeBSD. - - - Iron Systems http://www.ironsystems.com/ ==== //depot/projects/docproj_nl/www/share/sgml/commercial.misc.xml#2 (text+ko) ==== @@ -1,34 +1,15 @@ - + - $FreeBSD: www/share/sgml/commercial.misc.xml,v 1.3 2007/05/18 13:43:00 keramida Exp $ + $FreeBSD: www/share/sgml/commercial.misc.xml,v 1.7 2010/02/13 08:38:02 jkois Exp $ - - Bookpool - http://www.bookpool.com/ - - The Bookpool offers 30% discounts on the new edition of The - Design and Implementation of the 4.4BSD Operating System and - other FreeBSD-related books. - - - - - BSDMall - http://www.bsdmall.com/ - - BSDMall supports all flavors of BSD, providing books, clothing, - hardware, software, and more! - - - FreeBSD Mall http://www.freebsdmall.com/ @@ -41,23 +22,6 @@ - - Marketbridge Technologies, Inc. - http://www.marketbridge.ca/cgi-bin/courses/bsd.pl - - At Marketbridge Technologies, Inc. we believe that courses with - unsurpassed quality can be offered at reasonable rates. Don't - break your training budget... come and see us first! We are - located in Ottawa, Canada and a stone throw away from downtown - (a map is available on our website). Call us at 1-877-595-5504 - or 1-613-728-5504. We provide FreeBSD training. Here's what - you get: Manual: BSD Hacks, by Dru Lavigne, O'Reilly, ISBN - 0596006799, Instructor-Led Course, One PC per student, Duration: - 40 hours (all students welcomed to come back for practice given - enough space in a class). - - - ScotGold Products http://www.scotgold.com/acatalog/ScotGold_Catalogue_BSD_Daemon_Stuff_3.html @@ -67,33 +31,6 @@ - - Fultus FODL - http://www.fultus.com/ - - Fultus presents FreeBSD Open Documentation Library. This is the - full up-to-date FreeBSD documentation collection available - online in the Technical Literature section of the Fultus eLibrary and Fultus Online - Book Superstore in the following formats: -
    -
  • Online Web Help (searchable through all documents) - (Mozilla, Netscape Navigator & IE compatible);
    • -
  • Searchable Adobe PDF format with Bookmark link page (for desktop - and PDA);
    • -
  • Compiled HTML format (chm) (for Windows).
    • -
- Interested? Read about FreeBSD eBooks and download examples on - the FreeBSD - Documentation page of the Fultus - web site. - - - ExaVault http://www.exavault.com ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#67 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.294 2010/02/06 18:09:19 bschmidt Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.295 2010/02/13 14:47:49 bcr Exp $ @@ -36,6 +36,16 @@ 2 + 12 + + +

Enhanced commit privileges: Benedict Reuschling + (full doc/www)

+ + + + 6 From owner-p4-projects@FreeBSD.ORG Sat Feb 13 15:45:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C629A1065679; Sat, 13 Feb 2010 15:45:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 892781065672 for ; Sat, 13 Feb 2010 15:45:09 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7A1288FC18 for ; Sat, 13 Feb 2010 15:45:09 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1DFj90P042563 for ; Sat, 13 Feb 2010 15:45:09 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1DFj9mF042561 for perforce@freebsd.org; Sat, 13 Feb 2010 15:45:09 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 13 Feb 2010 15:45:09 GMT Message-Id: <201002131545.o1DFj9mF042561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2010 15:45:10 -0000 http://p4web.freebsd.org/chv.cgi?CH=174655 Change 174655 by rene@rene_self on 2010/02/13 15:44:37 MFen handbook/mirrors 1.474 -> 1.477 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#42 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#42 (text+ko) ==== @@ -5,7 +5,7 @@ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.474 + %SRCID% 1.477 --> @@ -2578,6 +2578,16 @@ + RELENG_7_3 + + + De uitgavetak voor &os;-7.3, alleen gebruikt voor + beveiligingswaarschuwingen en andere kritische + aanpassingen. + + + + RELENG_7_2 From owner-p4-projects@FreeBSD.ORG Sat Feb 13 16:13:39 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D18710656A3; Sat, 13 Feb 2010 16:13:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31BE81065697 for ; Sat, 13 Feb 2010 16:13:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A2498FC17 for ; Sat, 13 Feb 2010 16:13:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1DGDcmY045798 for ; Sat, 13 Feb 2010 16:13:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1DGDcCx045796 for perforce@freebsd.org; Sat, 13 Feb 2010 16:13:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 13 Feb 2010 16:13:38 GMT Message-Id: <201002131613.o1DGDcCx045796@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2010 16:13:39 -0000 http://p4web.freebsd.org/chv.cgi?CH=174658 Change 174658 by hselasky@hselasky_laptop001 on 2010/02/13 16:13:29 USB serial: - patch from Milan Obuch to add support for new Huawei dongle. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.h#6 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#105 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#28 (text+ko) ==== @@ -92,6 +92,7 @@ #define U3GINIT_CMOTECH 6 /* Requires CMOTECH SCSI command */ #define U3GINIT_WAIT 7 /* Device reappears after a delay */ #define U3GINIT_SAEL_M460 8 /* Requires vendor init */ +#define U3GINIT_HUAWEI_E1752 9 /* Requires Huawei E1752 init command */ enum { U3G_BULK_WR, @@ -281,6 +282,7 @@ U3G_DEV(HUAWEI, E220, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E220BIS, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, MOBILE, U3GINIT_HUAWEI), + U3G_DEV(HUAWEI, E1752, U3GINIT_HUAWEI_E1752), U3G_DEV(KYOCERA2, CDMA_MSM_K, 0), U3G_DEV(KYOCERA2, KPC680, 0), U3G_DEV(MERLIN, V620, 0), @@ -667,6 +669,9 @@ /* Just pretend we ejected, the card will timeout */ error = 0; break; + case U3GINIT_HUAWEI_E1752: + error = usb_msc_eject(udev, 0, MSC_EJECT_E1752); + break; default: /* no 3G eject quirks */ error = EOPNOTSUPP; ==== //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#16 (text+ko) ==== @@ -94,6 +94,9 @@ 0x01, 0x01, 0x01, 0x01, 0x00, 0x00 }; static uint8_t scsi_cmotech_eject[] = { 0xff, 0x52, 0x44, 0x45, 0x56, 0x43, 0x48, 0x47 }; +static uint8_t scsi_huawei1752_eject[] = { 0x11, 0x06, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; #define BULK_SIZE 64 /* dummy */ #define ERR_CSW_FAILED -1 @@ -611,6 +614,11 @@ &scsi_cmotech_eject, sizeof(scsi_cmotech_eject), USB_MS_HZ); break; + case MSC_EJECT_E1752: + err = bbb_command_start(sc, DIR_IN, 0, NULL, 0, + &scsi_huawei1752_eject, sizeof(scsi_huawei1752_eject), + USB_MS_HZ); + break; default: printf("usb_msc_eject: unknown eject method (%d)\n", method); break; ==== //depot/projects/usb/src/sys/dev/usb/usb_msctest.h#6 (text+ko) ==== @@ -31,7 +31,8 @@ MSC_EJECT_STOPUNIT, MSC_EJECT_REZERO, MSC_EJECT_ZTESTOR, - MSC_EJECT_CMOTECH + MSC_EJECT_CMOTECH, + MSC_EJECT_E1752, }; int usb_iface_is_cdrom(struct usb_device *udev, ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#105 (text+ko) ==== @@ -1724,6 +1724,7 @@ product HUAWEI E143D 0x143d 3G modem product HUAWEI E143E 0x143e 3G modem product HUAWEI E143F 0x143f 3G modem +product HUAWEI E1752 0x1446 3G modem product HUAWEI E14AC 0x14ac 3G modem /* HUAWEI 3com products */