From rene at FreeBSD.org Thu Jan 1 12:04:04 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Thu Jan 1 12:04:10 2009 Subject: PERFORCE change 155544 for review Message-ID: <200901011204.n01C41bd009410@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155544 Change 155544 by rene@rene_self on 2009/01/01 12:03:37 explaining-bsd: * Fix typo in URL * Correct $FreeBSD$ (somehow p4 keeps screwing this up) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#9 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#9 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -109,7 +109,7 @@ twee aparte projecten, ofwel het &xfree86; project, of het X.Org project. Linux + url="http://www.X.org/">X.Org project. Linux gebruikt dezelfde code. BSD specificeert normaliter geen grafisch bureaublad zoals GNOME of KDE, deze zijn wel beschikbaar. From rene at FreeBSD.org Thu Jan 1 12:18:21 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Thu Jan 1 12:18:27 2009 Subject: PERFORCE change 155546 for review Message-ID: <200901011218.n01CIJE5011453@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155546 Change 155546 by rene@rene_self on 2009/01/01 12:17:29 contributing article: refer to English version for untranslated articles/books Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#11 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#11 (text+ko) ==== @@ -104,7 +104,7 @@ helpen door aanvullende documenten te vertalen of te controleren dat de vertalingen up-to-date zijn. Kijk eerst op Translations + url="&url.books.fdp-primer.en;/translations.html">Translations FAQ in de &os; Documentation Project Primer. U bindt zich niet aan het vertalen van elk &os;-document door dit te doen — als vrijwilliger kunt u zo veel of zo @@ -307,7 +307,7 @@ Veranderingen aan de documentatie worden overzien door de &a.doc;. Bekijk de &os; Documentation + url="&url.books.fdp-primer.en;/index.html">&os; Documentation Primer voor volledige instructies. Stuur bijdragen en veranderingen (zelfs kleine zijn welkom!) door &man.send-pr.1; te gebruiken zoals beschreven is in We kunnen altijd nieuwe spiegelsites voor FTP, WWW, of cvsup gebruiken. Als u zo'n spiegel wilt hosten, bekijk dan het artikel Mirroring &os; + url="&url.articles.hubs.en;/index.html">Mirroring &os; voor meer informtie. From rene at FreeBSD.org Thu Jan 1 12:21:23 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Thu Jan 1 12:21:30 2009 Subject: PERFORCE change 155547 for review Message-ID: <200901011221.n01CLM3A011995@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155547 Change 155547 by rene@rene_self on 2009/01/01 12:21:20 articles/contributing-ports: use English versions for non-translated texts Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#6 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#6 (text+ko) ==== @@ -105,7 +105,7 @@ Er is een apart document beschikbaar om u door het creëeren (en bijwerken) van een port te loodsen genaamd het - Porter's + Porter's Handbook. Het Porter's Handbook is het beste naslagwerk wat betreft het werken met het portssysteem. Het noemt details over hoe het portssysteem werkt en bespreekt aangeraden @@ -156,7 +156,7 @@ Zorg eerst dat u uw verantwoordelijkheden als onderhouder begrijpt. Lees - ook het Porter's + ook het Porter's Handbook. Neem alstublieft niet meer werk op u dan dat u op een comfortabele manier aankunt. @@ -303,7 +303,7 @@ Dit is een overzicht. Meer informatie over het bijwerken van een port is beschikbaar in het Porter's + url="&url.books.porters-handbook.en;">Porter's Handbook. @@ -403,7 +403,7 @@ -r. Op deze manier kunnen committers veel gemakkelijker zien welke veranderingen er precies gemaakt worden. De sectie in het Porter's Handbook over - + Upgrading bevat meer informatie hierover. @@ -800,7 +800,7 @@ Bronnen voor onderhouders en vrijwilligers voor ports Het Porter's Handbook is + url="&url.books.porters-handbook.en;">Porter's Handbook is uw overlevingsgids voor het portssysteem. Houd het in de buurt! @@ -852,7 +852,7 @@ applicatie, dus dient u het alleen als gids te gebruiken. Als portlint veranderingen voorstelt die onredelijk lijken, raadpleeg dan het - Porter's Handbook + Porter's Handbook of vraag om advies. From rene at FreeBSD.org Thu Jan 1 12:30:33 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Thu Jan 1 12:30:40 2009 Subject: PERFORCE change 155548 for review Message-ID: <200901011230.n01CUWAB013099@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155548 Change 155548 by rene@rene_self on 2009/01/01 12:29:52 articles/problem-reports: * Manually fill in $FreeBSD$ * Use English versions for non-translated texts * The article by Simon Tatham is also available in Dutch, use that version instead of the English one Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#12 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#12 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -139,7 +139,7 @@ In beide gevallen zal het volgen van het proces zoals beschreven in het + url="&url.books.porters-handbook.en;/port-upgrading.html"> Porters Handboek tot de beste resultaten leiden. (U bent misschien ook geïnteresseerd in @@ -208,7 +208,7 @@ Als het probleem in het basissysteem zit, dient u eerst het FAQ-gedeelte over + url="&url.books.faq.en;/introduction.html#LATEST-VERSION"> &os;-versies te lezen als u niet reeds bekend bent met het onderwerp. Het is niet mogelijk voor &os; om problemen in iets anders dan bepaalde recente takken van het basissysteem op te @@ -242,14 +242,14 @@ De &os;-lijst van - Veelgestelde + Veelgestelde Vragen (FAQ). De FAQ probeert antwoord te geven op een breed scala aan vragen, zoals die die betrekking hebben op - compatibiliteit van + compatibiliteit van hardware, - + gebruikersapplicaties, en - + kernelconfiguratie. @@ -1353,14 +1353,14 @@ - How to Report Bugs Effectively—een uitstekend + url="http://www.chiark.greenend.org.uk/~sgtatham/bugs-nl.html"> + Effectief softwarestoringen melden—een uitstekend essay door Simon G. Tatham over het samenstellen van nuttige (niet-&os;-specifieke) probleemrapporten. Problem + url="&url.articles.pr-guidelines.en;/article.html">Problem Report Handling Guidelines—waardevolle inzichten in hoe probleemrapporten worden afgehandeld door de &os;-ontwikkelaars. From ed at FreeBSD.org Thu Jan 1 13:51:00 2009 From: ed at FreeBSD.org (Ed Schouten) Date: Thu Jan 1 13:51:10 2009 Subject: PERFORCE change 155551 for review Message-ID: <200901011350.n01DowLP034038@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155551 Change 155551 by ed@ed_dull on 2009/01/01 13:50:50 IFC libteken. Affected files ... .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/mpsafetty/sys/conf/files#40 integrate .. //depot/projects/mpsafetty/sys/conf/files.amd64#9 integrate .. //depot/projects/mpsafetty/sys/conf/files.i386#14 integrate .. //depot/projects/mpsafetty/sys/conf/files.ia64#6 integrate .. //depot/projects/mpsafetty/sys/conf/files.powerpc#12 integrate .. //depot/projects/mpsafetty/sys/conf/files.sparc64#12 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/scterm.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#10 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/syscons.h#5 integrate .. //depot/projects/mpsafetty/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_hostap.c#10 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_node.c#8 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_wds.c#5 integrate .. //depot/projects/mpsafetty/sys/pc98/cbus/scterm-sck.c#5 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_pipe.c#6 integrate .. //depot/projects/mpsafetty/sys/sys/elf64.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/elf_common.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/elf_generic.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/file.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/link_elf.h#3 integrate .. //depot/projects/mpsafetty/sys/vm/vm_map.c#3 integrate .. //depot/projects/mpsafetty/sys/vm/vm_map.h#3 integrate .. //depot/projects/mpsafetty/usr.sbin/mergemaster/mergemaster.8#2 integrate .. //depot/projects/mpsafetty/usr.sbin/mergemaster/mergemaster.sh#3 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/menus.c#5 integrate Differences ... ==== //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_gzip.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_gzip.c,v 1.17 2008/12/06 06:45:15 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_gzip.c,v 1.18 2009/01/01 02:29:57 kientzle Exp $"); #ifdef HAVE_ERRNO_H @@ -428,8 +428,9 @@ "Failed to clean up gzip decompressor"); return (ARCHIVE_FATAL); } - /* Restart header parser with the next block. */ - state->header_state = state->header_done = 0; + /* zlib has been torn down */ + state->header_done = 0; + state->eof = 1; /* FALL THROUGH */ case Z_OK: /* Decompressor made some progress. */ /* If we filled our buffer, update stats and return. */ ==== //depot/projects/mpsafetty/sys/conf/files#40 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1360 2008/12/31 13:56:31 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1361 2009/01/01 13:26:53 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/mpsafetty/sys/conf/files.amd64#9 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.126 2008/12/01 16:53:01 sam Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.127 2009/01/01 13:26:53 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/mpsafetty/sys/conf/files.i386#14 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.611 2008/12/01 16:53:01 sam Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.612 2009/01/01 13:26:53 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/mpsafetty/sys/conf/files.ia64#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.95 2008/09/22 16:09:16 obrien Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.96 2009/01/01 13:26:53 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/mpsafetty/sys/conf/files.powerpc#12 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.87 2008/12/20 00:33:10 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.88 2009/01/01 13:26:53 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/mpsafetty/sys/conf/files.sparc64#12 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.103 2008/12/20 00:33:10 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.104 2009/01/01 13:26:53 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/mpsafetty/sys/dev/syscons/scterm.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm.c,v 1.6 2003/08/24 18:17:24 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm.c,v 1.7 2009/01/01 13:26:53 ed Exp $"); #include "opt_syscons.h" ==== //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.465 2008/11/17 20:33:13 emax Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.466 2009/01/01 13:26:53 ed Exp $"); #include "opt_compat.h" #include "opt_syscons.h" ==== //depot/projects/mpsafetty/sys/dev/syscons/syscons.h#5 (text+ko) ==== @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.91 2008/08/20 08:31:58 ed Exp $ + * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.92 2009/01/01 13:26:53 ed Exp $ */ #ifndef _DEV_SYSCONS_SYSCONS_H_ ==== //depot/projects/mpsafetty/sys/kern/kern_sysctl.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.184 2008/12/29 19:24:00 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.185 2009/01/01 00:19:51 ed Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1371,8 +1371,11 @@ uap->new, uap->newlen, &j, 0); if (error && error != ENOMEM) return (error); - if (uap->oldlenp) - error = copyout(&j, uap->oldlenp, sizeof(j)); + if (uap->oldlenp) { + int i = copyout(&j, uap->oldlenp, sizeof(j)); + if (i) + return (i); + } return (error); } ==== //depot/projects/mpsafetty/sys/net80211/ieee80211_hostap.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ #include #ifdef __FreeBSD__ -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_hostap.c,v 1.13 2008/12/18 23:00:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_hostap.c,v 1.14 2008/12/31 21:21:46 sam Exp $"); #endif /* @@ -355,7 +355,7 @@ if (mcopy != NULL) { int len, err; len = mcopy->m_pkthdr.len; - err = (ifp->if_transmit)(ifp, mcopy); + err = ifp->if_transmit(ifp, mcopy); if (err) { /* NB: IFQ_HANDOFF reclaims mcopy */ } else { ==== //depot/projects/mpsafetty/sys/net80211/ieee80211_node.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.114 2008/12/18 23:00:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.115 2008/12/31 21:29:09 sam Exp $"); #include "opt_wlan.h" @@ -1334,6 +1334,10 @@ if (ieee80211_ies_init(&ni->ni_ies, sp->ies, sp->ies_len)) { ieee80211_ies_expand(&ni->ni_ies); + if (ni->ni_ies.wme_ie != NULL) + ni->ni_flags |= IEEE80211_NODE_QOS; + else + ni->ni_flags &= ~IEEE80211_NODE_QOS; if (ni->ni_ies.ath_ie != NULL) ieee80211_parse_ath(ni, ni->ni_ies.ath_ie); } ==== //depot/projects/mpsafetty/sys/net80211/ieee80211_output.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.71 2008/12/15 00:47:24 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.72 2008/12/31 21:21:46 sam Exp $"); #include "opt_inet.h" #include "opt_wlan.h" @@ -266,7 +266,7 @@ m->m_pkthdr.rcvif = (void *)ni; /* XXX defer if_start calls? */ - error = (parent->if_transmit)(parent, m); + error = parent->if_transmit(parent, m); if (error != 0) { /* NB: IFQ_HANDOFF reclaims mbuf */ ieee80211_free_node(ni); ==== //depot/projects/mpsafetty/sys/net80211/ieee80211_wds.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ #include #ifdef __FreeBSD__ -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_wds.c,v 1.5 2008/11/22 07:35:45 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_wds.c,v 1.6 2008/12/31 21:21:46 sam Exp $"); #endif /* @@ -278,7 +278,7 @@ mcopy->m_flags |= M_MCAST | M_WDS; mcopy->m_pkthdr.rcvif = (void *) ni; - err = (parent->if_transmit)(parent, mcopy); + err = parent->if_transmit(parent, mcopy); if (err) { /* NB: IFQ_HANDOFF reclaims mbuf */ ifp->if_oerrors++; ==== //depot/projects/mpsafetty/sys/pc98/cbus/scterm-sck.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pc98/cbus/scterm-sck.c,v 1.18 2008/08/20 08:31:58 ed Exp $ + * $FreeBSD: src/sys/pc98/cbus/scterm-sck.c,v 1.19 2009/01/01 13:26:53 ed Exp $ */ #include "opt_syscons.h" ==== //depot/projects/mpsafetty/sys/security/audit/audit_pipe.c#6 (text) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.27 2008/11/02 00:25:48 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.28 2008/12/31 23:22:45 rwatson Exp $"); #include #include @@ -169,7 +169,8 @@ /* * Current pending record list. Protected by a combination of ap_mtx * and ap_sx. Note particularly that *both* locks are required to - * remove a record from the head of the queue, as an in-progress read * may sleep while copying and therefore cannot hold ap_mtx. + * remove a record from the head of the queue, as an in-progress read + * may sleep while copying and therefore cannot hold ap_mtx. */ TAILQ_HEAD(, audit_pipe_entry) ap_queue; ==== //depot/projects/mpsafetty/sys/sys/elf64.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/elf64.h,v 1.17 2006/10/17 05:43:30 jkoshy Exp $ + * $FreeBSD: src/sys/sys/elf64.h,v 1.18 2009/01/01 02:08:56 obrien Exp $ */ #ifndef _SYS_ELF64_H_ @@ -141,16 +141,16 @@ } Elf64_Rela; /* Macros for accessing the fields of r_info. */ -#define ELF64_R_SYM(info) ((info) >> 32) -#define ELF64_R_TYPE(info) ((info) & 0xffffffffL) +#define ELF64_R_SYM(info) ((info) >> 32) +#define ELF64_R_TYPE(info) ((info) & 0xffffffffL) /* Macro for constructing r_info from field values. */ -#define ELF64_R_INFO(sym, type) (((sym) << 32) + ((type) & 0xffffffffL)) +#define ELF64_R_INFO(sym, type) (((sym) << 32) + ((type) & 0xffffffffL)) #define ELF64_R_TYPE_DATA(info) (((Elf64_Xword)(info)<<32)>>40) #define ELF64_R_TYPE_ID(info) (((Elf64_Xword)(info)<<56)>>56) #define ELF64_R_TYPE_INFO(data, type) \ - (((Elf64_Xword)(data)<<8)+(Elf64_Xword)(type)) + (((Elf64_Xword)(data)<<8)+(Elf64_Xword)(type)) /* * Note entry header @@ -197,14 +197,14 @@ } Elf64_Sym; /* Macros for accessing the fields of st_info. */ -#define ELF64_ST_BIND(info) ((info) >> 4) -#define ELF64_ST_TYPE(info) ((info) & 0xf) +#define ELF64_ST_BIND(info) ((info) >> 4) +#define ELF64_ST_TYPE(info) ((info) & 0xf) /* Macro for constructing st_info from field values. */ -#define ELF64_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf)) +#define ELF64_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf)) /* Macro for accessing the fields of st_other. */ -#define ELF64_ST_VISIBILITY(oth) ((oth) & 0x3) +#define ELF64_ST_VISIBILITY(oth) ((oth) & 0x3) /* Structures used by Sun & GNU-style symbol versioning. */ typedef struct { ==== //depot/projects/mpsafetty/sys/sys/elf_common.h#4 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/elf_common.h,v 1.25 2008/12/19 09:32:31 kaiw Exp $ + * $FreeBSD: src/sys/sys/elf_common.h,v 1.26 2009/01/01 02:07:32 obrien Exp $ */ #ifndef _SYS_ELF_COMMON_H_ -#define _SYS_ELF_COMMON_H_ 1 +#define _SYS_ELF_COMMON_H_ 1 /* * ELF definitions that are independent of architecture or word size. @@ -50,267 +50,267 @@ /* Indexes into the e_ident array. Keep synced with http://www.sco.com/developers/gabi/latest/ch4.eheader.html */ -#define EI_MAG0 0 /* Magic number, byte 0. */ -#define EI_MAG1 1 /* Magic number, byte 1. */ -#define EI_MAG2 2 /* Magic number, byte 2. */ -#define EI_MAG3 3 /* Magic number, byte 3. */ -#define EI_CLASS 4 /* Class of machine. */ -#define EI_DATA 5 /* Data format. */ -#define EI_VERSION 6 /* ELF format version. */ -#define EI_OSABI 7 /* Operating system / ABI identification */ -#define EI_ABIVERSION 8 /* ABI version */ -#define OLD_EI_BRAND 8 /* Start of architecture identification. */ -#define EI_PAD 9 /* Start of padding (per SVR4 ABI). */ -#define EI_NIDENT 16 /* Size of e_ident array. */ +#define EI_MAG0 0 /* Magic number, byte 0. */ +#define EI_MAG1 1 /* Magic number, byte 1. */ +#define EI_MAG2 2 /* Magic number, byte 2. */ +#define EI_MAG3 3 /* Magic number, byte 3. */ +#define EI_CLASS 4 /* Class of machine. */ +#define EI_DATA 5 /* Data format. */ +#define EI_VERSION 6 /* ELF format version. */ +#define EI_OSABI 7 /* Operating system / ABI identification */ +#define EI_ABIVERSION 8 /* ABI version */ +#define OLD_EI_BRAND 8 /* Start of architecture identification. */ +#define EI_PAD 9 /* Start of padding (per SVR4 ABI). */ +#define EI_NIDENT 16 /* Size of e_ident array. */ /* Values for the magic number bytes. */ -#define ELFMAG0 0x7f -#define ELFMAG1 'E' -#define ELFMAG2 'L' -#define ELFMAG3 'F' -#define ELFMAG "\177ELF" /* magic string */ -#define SELFMAG 4 /* magic string size */ +#define ELFMAG0 0x7f +#define ELFMAG1 'E' +#define ELFMAG2 'L' +#define ELFMAG3 'F' +#define ELFMAG "\177ELF" /* magic string */ +#define SELFMAG 4 /* magic string size */ /* Values for e_ident[EI_VERSION] and e_version. */ -#define EV_NONE 0 -#define EV_CURRENT 1 +#define EV_NONE 0 +#define EV_CURRENT 1 /* Values for e_ident[EI_CLASS]. */ -#define ELFCLASSNONE 0 /* Unknown class. */ -#define ELFCLASS32 1 /* 32-bit architecture. */ -#define ELFCLASS64 2 /* 64-bit architecture. */ +#define ELFCLASSNONE 0 /* Unknown class. */ +#define ELFCLASS32 1 /* 32-bit architecture. */ +#define ELFCLASS64 2 /* 64-bit architecture. */ /* Values for e_ident[EI_DATA]. */ -#define ELFDATANONE 0 /* Unknown data format. */ -#define ELFDATA2LSB 1 /* 2's complement little-endian. */ -#define ELFDATA2MSB 2 /* 2's complement big-endian. */ +#define ELFDATANONE 0 /* Unknown data format. */ +#define ELFDATA2LSB 1 /* 2's complement little-endian. */ +#define ELFDATA2MSB 2 /* 2's complement big-endian. */ /* Values for e_ident[EI_OSABI]. */ -#define ELFOSABI_NONE 0 /* UNIX System V ABI */ -#define ELFOSABI_HPUX 1 /* HP-UX operating system */ -#define ELFOSABI_NETBSD 2 /* NetBSD */ -#define ELFOSABI_LINUX 3 /* GNU/Linux */ -#define ELFOSABI_HURD 4 /* GNU/Hurd */ -#define ELFOSABI_86OPEN 5 /* 86Open common IA32 ABI */ -#define ELFOSABI_SOLARIS 6 /* Solaris */ -#define ELFOSABI_AIX 7 /* AIX */ -#define ELFOSABI_IRIX 8 /* IRIX */ -#define ELFOSABI_FREEBSD 9 /* FreeBSD */ -#define ELFOSABI_TRU64 10 /* TRU64 UNIX */ -#define ELFOSABI_MODESTO 11 /* Novell Modesto */ -#define ELFOSABI_OPENBSD 12 /* OpenBSD */ -#define ELFOSABI_OPENVMS 13 /* Open VMS */ -#define ELFOSABI_NSK 14 /* HP Non-Stop Kernel */ -#define ELFOSABI_AROS 15 /* Amiga Research OS */ -#define ELFOSABI_ARM 97 /* ARM */ -#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */ +#define ELFOSABI_NONE 0 /* UNIX System V ABI */ +#define ELFOSABI_HPUX 1 /* HP-UX operating system */ +#define ELFOSABI_NETBSD 2 /* NetBSD */ +#define ELFOSABI_LINUX 3 /* GNU/Linux */ +#define ELFOSABI_HURD 4 /* GNU/Hurd */ +#define ELFOSABI_86OPEN 5 /* 86Open common IA32 ABI */ +#define ELFOSABI_SOLARIS 6 /* Solaris */ +#define ELFOSABI_AIX 7 /* AIX */ +#define ELFOSABI_IRIX 8 /* IRIX */ +#define ELFOSABI_FREEBSD 9 /* FreeBSD */ +#define ELFOSABI_TRU64 10 /* TRU64 UNIX */ +#define ELFOSABI_MODESTO 11 /* Novell Modesto */ +#define ELFOSABI_OPENBSD 12 /* OpenBSD */ +#define ELFOSABI_OPENVMS 13 /* Open VMS */ +#define ELFOSABI_NSK 14 /* HP Non-Stop Kernel */ +#define ELFOSABI_AROS 15 /* Amiga Research OS */ +#define ELFOSABI_ARM 97 /* ARM */ +#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */ -#define ELFOSABI_SYSV ELFOSABI_NONE /* symbol used in old spec */ -#define ELFOSABI_MONTEREY ELFOSABI_AIX /* Monterey */ +#define ELFOSABI_SYSV ELFOSABI_NONE /* symbol used in old spec */ +#define ELFOSABI_MONTEREY ELFOSABI_AIX /* Monterey */ /* e_ident */ -#define IS_ELF(ehdr) ((ehdr).e_ident[EI_MAG0] == ELFMAG0 && \ +#define IS_ELF(ehdr) ((ehdr).e_ident[EI_MAG0] == ELFMAG0 && \ (ehdr).e_ident[EI_MAG1] == ELFMAG1 && \ (ehdr).e_ident[EI_MAG2] == ELFMAG2 && \ (ehdr).e_ident[EI_MAG3] == ELFMAG3) /* Values for e_type. */ -#define ET_NONE 0 /* Unknown type. */ -#define ET_REL 1 /* Relocatable. */ -#define ET_EXEC 2 /* Executable. */ -#define ET_DYN 3 /* Shared object. */ -#define ET_CORE 4 /* Core file. */ -#define ET_LOOS 0xfe00 /* First operating system specific. */ -#define ET_HIOS 0xfeff /* Last operating system-specific. */ -#define ET_LOPROC 0xff00 /* First processor-specific. */ -#define ET_HIPROC 0xffff /* Last processor-specific. */ +#define ET_NONE 0 /* Unknown type. */ +#define ET_REL 1 /* Relocatable. */ +#define ET_EXEC 2 /* Executable. */ +#define ET_DYN 3 /* Shared object. */ +#define ET_CORE 4 /* Core file. */ +#define ET_LOOS 0xfe00 /* First operating system specific. */ +#define ET_HIOS 0xfeff /* Last operating system-specific. */ +#define ET_LOPROC 0xff00 /* First processor-specific. */ +#define ET_HIPROC 0xffff /* Last processor-specific. */ /* Values for e_machine. */ -#define EM_NONE 0 /* Unknown machine. */ -#define EM_M32 1 /* AT&T WE32100. */ -#define EM_SPARC 2 /* Sun SPARC. */ -#define EM_386 3 /* Intel i386. */ -#define EM_68K 4 /* Motorola 68000. */ -#define EM_88K 5 /* Motorola 88000. */ -#define EM_860 7 /* Intel i860. */ -#define EM_MIPS 8 /* MIPS R3000 Big-Endian only. */ -#define EM_S370 9 /* IBM System/370. */ -#define EM_MIPS_RS3_LE 10 /* MIPS R3000 Little-Endian. */ -#define EM_PARISC 15 /* HP PA-RISC. */ -#define EM_VPP500 17 /* Fujitsu VPP500. */ -#define EM_SPARC32PLUS 18 /* SPARC v8plus. */ -#define EM_960 19 /* Intel 80960. */ -#define EM_PPC 20 /* PowerPC 32-bit. */ -#define EM_PPC64 21 /* PowerPC 64-bit. */ -#define EM_S390 22 /* IBM System/390. */ -#define EM_V800 36 /* NEC V800. */ -#define EM_FR20 37 /* Fujitsu FR20. */ -#define EM_RH32 38 /* TRW RH-32. */ -#define EM_RCE 39 /* Motorola RCE. */ -#define EM_ARM 40 /* ARM. */ -#define EM_SH 42 /* Hitachi SH. */ -#define EM_SPARCV9 43 /* SPARC v9 64-bit. */ -#define EM_TRICORE 44 /* Siemens TriCore embedded processor. */ -#define EM_ARC 45 /* Argonaut RISC Core. */ -#define EM_H8_300 46 /* Hitachi H8/300. */ -#define EM_H8_300H 47 /* Hitachi H8/300H. */ -#define EM_H8S 48 /* Hitachi H8S. */ -#define EM_H8_500 49 /* Hitachi H8/500. */ -#define EM_IA_64 50 /* Intel IA-64 Processor. */ -#define EM_MIPS_X 51 /* Stanford MIPS-X. */ -#define EM_COLDFIRE 52 /* Motorola ColdFire. */ -#define EM_68HC12 53 /* Motorola M68HC12. */ -#define EM_MMA 54 /* Fujitsu MMA. */ -#define EM_PCP 55 /* Siemens PCP. */ -#define EM_NCPU 56 /* Sony nCPU. */ -#define EM_NDR1 57 /* Denso NDR1 microprocessor. */ -#define EM_STARCORE 58 /* Motorola Star*Core processor. */ -#define EM_ME16 59 /* Toyota ME16 processor. */ -#define EM_ST100 60 /* STMicroelectronics ST100 processor. */ -#define EM_TINYJ 61 /* Advanced Logic Corp. TinyJ processor. */ -#define EM_X86_64 62 /* Advanced Micro Devices x86-64 */ +#define EM_NONE 0 /* Unknown machine. */ +#define EM_M32 1 /* AT&T WE32100. */ +#define EM_SPARC 2 /* Sun SPARC. */ +#define EM_386 3 /* Intel i386. */ +#define EM_68K 4 /* Motorola 68000. */ +#define EM_88K 5 /* Motorola 88000. */ +#define EM_860 7 /* Intel i860. */ +#define EM_MIPS 8 /* MIPS R3000 Big-Endian only. */ +#define EM_S370 9 /* IBM System/370. */ +#define EM_MIPS_RS3_LE 10 /* MIPS R3000 Little-Endian. */ +#define EM_PARISC 15 /* HP PA-RISC. */ +#define EM_VPP500 17 /* Fujitsu VPP500. */ +#define EM_SPARC32PLUS 18 /* SPARC v8plus. */ +#define EM_960 19 /* Intel 80960. */ +#define EM_PPC 20 /* PowerPC 32-bit. */ +#define EM_PPC64 21 /* PowerPC 64-bit. */ +#define EM_S390 22 /* IBM System/390. */ +#define EM_V800 36 /* NEC V800. */ +#define EM_FR20 37 /* Fujitsu FR20. */ +#define EM_RH32 38 /* TRW RH-32. */ +#define EM_RCE 39 /* Motorola RCE. */ +#define EM_ARM 40 /* ARM. */ +#define EM_SH 42 /* Hitachi SH. */ +#define EM_SPARCV9 43 /* SPARC v9 64-bit. */ +#define EM_TRICORE 44 /* Siemens TriCore embedded processor. */ +#define EM_ARC 45 /* Argonaut RISC Core. */ +#define EM_H8_300 46 /* Hitachi H8/300. */ +#define EM_H8_300H 47 /* Hitachi H8/300H. */ +#define EM_H8S 48 /* Hitachi H8S. */ +#define EM_H8_500 49 /* Hitachi H8/500. */ +#define EM_IA_64 50 /* Intel IA-64 Processor. */ +#define EM_MIPS_X 51 /* Stanford MIPS-X. */ +#define EM_COLDFIRE 52 /* Motorola ColdFire. */ +#define EM_68HC12 53 /* Motorola M68HC12. */ +#define EM_MMA 54 /* Fujitsu MMA. */ +#define EM_PCP 55 /* Siemens PCP. */ +#define EM_NCPU 56 /* Sony nCPU. */ +#define EM_NDR1 57 /* Denso NDR1 microprocessor. */ +#define EM_STARCORE 58 /* Motorola Star*Core processor. */ +#define EM_ME16 59 /* Toyota ME16 processor. */ +#define EM_ST100 60 /* STMicroelectronics ST100 processor. */ +#define EM_TINYJ 61 /* Advanced Logic Corp. TinyJ processor. */ +#define EM_X86_64 62 /* Advanced Micro Devices x86-64 */ #define EM_AMD64 EM_X86_64 /* Advanced Micro Devices x86-64 (compat) */ -#define EM_PDSP 63 /* Sony DSP Processor. */ -#define EM_FX66 66 /* Siemens FX66 microcontroller. */ -#define EM_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 +#define EM_PDSP 63 /* Sony DSP Processor. */ +#define EM_FX66 66 /* Siemens FX66 microcontroller. */ +#define EM_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 microcontroller. */ -#define EM_ST7 68 /* STmicroelectronics ST7 8-bit +#define EM_ST7 68 /* STmicroelectronics ST7 8-bit microcontroller. */ -#define EM_68HC16 69 /* Motorola MC68HC16 microcontroller. */ -#define EM_68HC11 70 /* Motorola MC68HC11 microcontroller. */ -#define EM_68HC08 71 /* Motorola MC68HC08 microcontroller. */ -#define EM_68HC05 72 /* Motorola MC68HC05 microcontroller. */ -#define EM_SVX 73 /* Silicon Graphics SVx. */ -#define EM_ST19 74 /* STMicroelectronics ST19 8-bit mc. */ -#define EM_VAX 75 /* Digital VAX. */ -#define EM_CRIS 76 /* Axis Communications 32-bit embedded +#define EM_68HC16 69 /* Motorola MC68HC16 microcontroller. */ +#define EM_68HC11 70 /* Motorola MC68HC11 microcontroller. */ +#define EM_68HC08 71 /* Motorola MC68HC08 microcontroller. */ +#define EM_68HC05 72 /* Motorola MC68HC05 microcontroller. */ +#define EM_SVX 73 /* Silicon Graphics SVx. */ +#define EM_ST19 74 /* STMicroelectronics ST19 8-bit mc. */ +#define EM_VAX 75 /* Digital VAX. */ +#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor. */ -#define EM_JAVELIN 77 /* Infineon Technologies 32-bit embedded +#define EM_JAVELIN 77 /* Infineon Technologies 32-bit embedded processor. */ -#define EM_FIREPATH 78 /* Element 14 64-bit DSP Processor. */ -#define EM_ZSP 79 /* LSI Logic 16-bit DSP Processor. */ -#define EM_MMIX 80 /* Donald Knuth's educational 64-bit proc. */ -#define EM_HUANY 81 /* Harvard University machine-independent +#define EM_FIREPATH 78 /* Element 14 64-bit DSP Processor. */ +#define EM_ZSP 79 /* LSI Logic 16-bit DSP Processor. */ +#define EM_MMIX 80 /* Donald Knuth's educational 64-bit proc. */ +#define EM_HUANY 81 /* Harvard University machine-independent object files. */ -#define EM_PRISM 82 /* SiTera Prism. */ -#define EM_AVR 83 /* Atmel AVR 8-bit microcontroller. */ -#define EM_FR30 84 /* Fujitsu FR30. */ -#define EM_D10V 85 /* Mitsubishi D10V. */ -#define EM_D30V 86 /* Mitsubishi D30V. */ -#define EM_V850 87 /* NEC v850. */ -#define EM_M32R 88 /* Mitsubishi M32R. */ -#define EM_MN10300 89 /* Matsushita MN10300. */ -#define EM_MN10200 90 /* Matsushita MN10200. */ -#define EM_PJ 91 /* picoJava. */ -#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor. */ -#define EM_ARC_A5 93 /* ARC Cores Tangent-A5. */ -#define EM_XTENSA 94 /* Tensilica Xtensa Architecture. */ -#define EM_VIDEOCORE 95 /* Alphamosaic VideoCore processor. */ -#define EM_TMM_GPP 96 /* Thompson Multimedia General Purpose +#define EM_PRISM 82 /* SiTera Prism. */ +#define EM_AVR 83 /* Atmel AVR 8-bit microcontroller. */ +#define EM_FR30 84 /* Fujitsu FR30. */ +#define EM_D10V 85 /* Mitsubishi D10V. */ +#define EM_D30V 86 /* Mitsubishi D30V. */ +#define EM_V850 87 /* NEC v850. */ +#define EM_M32R 88 /* Mitsubishi M32R. */ +#define EM_MN10300 89 /* Matsushita MN10300. */ +#define EM_MN10200 90 /* Matsushita MN10200. */ +#define EM_PJ 91 /* picoJava. */ +#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor. */ +#define EM_ARC_A5 93 /* ARC Cores Tangent-A5. */ +#define EM_XTENSA 94 /* Tensilica Xtensa Architecture. */ +#define EM_VIDEOCORE 95 /* Alphamosaic VideoCore processor. */ +#define EM_TMM_GPP 96 /* Thompson Multimedia General Purpose Processor. */ -#define EM_NS32K 97 /* National Semiconductor 32000 series. */ -#define EM_TPC 98 /* Tenor Network TPC processor. */ -#define EM_SNP1K 99 /* Trebia SNP 1000 processor. */ -#define EM_ST200 100 /* STMicroelectronics ST200 microcontroller. */ -#define EM_IP2K 101 /* Ubicom IP2xxx microcontroller family. */ -#define EM_MAX 102 /* MAX Processor. */ -#define EM_CR 103 /* National Semiconductor CompactRISC +#define EM_NS32K 97 /* National Semiconductor 32000 series. */ +#define EM_TPC 98 /* Tenor Network TPC processor. */ +#define EM_SNP1K 99 /* Trebia SNP 1000 processor. */ +#define EM_ST200 100 /* STMicroelectronics ST200 microcontroller. */ +#define EM_IP2K 101 /* Ubicom IP2xxx microcontroller family. */ +#define EM_MAX 102 /* MAX Processor. */ +#define EM_CR 103 /* National Semiconductor CompactRISC microprocessor. */ -#define EM_F2MC16 104 /* Fujitsu F2MC16. */ -#define EM_MSP430 105 /* Texas Instruments embedded microcontroller +#define EM_F2MC16 104 /* Fujitsu F2MC16. */ +#define EM_MSP430 105 /* Texas Instruments embedded microcontroller msp430. */ -#define EM_BLACKFIN 106 /* Analog Devices Blackfin (DSP) processor. */ -#define EM_SE_C33 107 /* S1C33 Family of Seiko Epson processors. */ -#define EM_SEP 108 /* Sharp embedded microprocessor. */ -#define EM_ARCA 109 /* Arca RISC Microprocessor. */ -#define EM_UNICORE 110 /* Microprocessor series from PKU-Unity Ltd. +#define EM_BLACKFIN 106 /* Analog Devices Blackfin (DSP) processor. */ +#define EM_SE_C33 107 /* S1C33 Family of Seiko Epson processors. */ +#define EM_SEP 108 /* Sharp embedded microprocessor. */ +#define EM_ARCA 109 /* Arca RISC Microprocessor. */ +#define EM_UNICORE 110 /* Microprocessor series from PKU-Unity Ltd. and MPRC of Peking University */ /* Non-standard or deprecated. */ -#define EM_486 6 /* Intel i486. */ -#define EM_MIPS_RS4_BE 10 /* MIPS R4000 Big-Endian */ -#define EM_ALPHA_STD 41 /* Digital Alpha (standard value). */ -#define EM_ALPHA 0x9026 /* Alpha (written in the absence of an ABI) */ +#define EM_486 6 /* Intel i486. */ +#define EM_MIPS_RS4_BE 10 /* MIPS R4000 Big-Endian */ +#define EM_ALPHA_STD 41 /* Digital Alpha (standard value). */ +#define EM_ALPHA 0x9026 /* Alpha (written in the absence of an ABI) */ /* Special section indexes. */ -#define SHN_UNDEF 0 /* Undefined, missing, irrelevant. */ -#define SHN_LORESERVE 0xff00 /* First of reserved range. */ -#define SHN_LOPROC 0xff00 /* First processor-specific. */ -#define SHN_HIPROC 0xff1f /* Last processor-specific. */ -#define SHN_LOOS 0xff20 /* First operating system-specific. */ -#define SHN_HIOS 0xff3f /* Last operating system-specific. */ -#define SHN_ABS 0xfff1 /* Absolute values. */ -#define SHN_COMMON 0xfff2 /* Common data. */ -#define SHN_XINDEX 0xffff /* Escape -- index stored elsewhere. */ -#define SHN_HIRESERVE 0xffff /* Last of reserved range. */ +#define SHN_UNDEF 0 /* Undefined, missing, irrelevant. */ +#define SHN_LORESERVE 0xff00 /* First of reserved range. */ +#define SHN_LOPROC 0xff00 /* First processor-specific. */ +#define SHN_HIPROC 0xff1f /* Last processor-specific. */ +#define SHN_LOOS 0xff20 /* First operating system-specific. */ +#define SHN_HIOS 0xff3f /* Last operating system-specific. */ +#define SHN_ABS 0xfff1 /* Absolute values. */ +#define SHN_COMMON 0xfff2 /* Common data. */ +#define SHN_XINDEX 0xffff /* Escape -- index stored elsewhere. */ +#define SHN_HIRESERVE 0xffff /* Last of reserved range. */ /* sh_type */ -#define SHT_NULL 0 /* inactive */ -#define SHT_PROGBITS 1 /* program defined information */ -#define SHT_SYMTAB 2 /* symbol table section */ -#define SHT_STRTAB 3 /* string table section */ -#define SHT_RELA 4 /* relocation section with addends */ -#define SHT_HASH 5 /* symbol hash table section */ -#define SHT_DYNAMIC 6 /* dynamic section */ -#define SHT_NOTE 7 /* note section */ -#define SHT_NOBITS 8 /* no space section */ -#define SHT_REL 9 /* relocation section - no addends */ -#define SHT_SHLIB 10 /* reserved - purpose unknown */ -#define SHT_DYNSYM 11 /* dynamic symbol table section */ -#define SHT_INIT_ARRAY 14 /* Initialization function pointers. */ -#define SHT_FINI_ARRAY 15 /* Termination function pointers. */ -#define SHT_PREINIT_ARRAY 16 /* Pre-initialization function ptrs. */ -#define SHT_GROUP 17 /* Section group. */ -#define SHT_SYMTAB_SHNDX 18 /* Section indexes (see SHN_XINDEX). */ -#define SHT_LOOS 0x60000000 /* First of OS specific semantics */ -#define SHT_LOSUNW 0x6ffffff4 -#define SHT_SUNW_dof 0x6ffffff4 -#define SHT_SUNW_cap 0x6ffffff5 -#define SHT_SUNW_SIGNATURE 0x6ffffff6 -#define SHT_SUNW_ANNOTATE 0x6ffffff7 -#define SHT_SUNW_DEBUGSTR 0x6ffffff8 -#define SHT_SUNW_DEBUG 0x6ffffff9 -#define SHT_SUNW_move 0x6ffffffa -#define SHT_SUNW_COMDAT 0x6ffffffb -#define SHT_SUNW_syminfo 0x6ffffffc -#define SHT_SUNW_verdef 0x6ffffffd -#define SHT_GNU_verdef 0x6ffffffd /* Symbol versions provided */ -#define SHT_SUNW_verneed 0x6ffffffe -#define SHT_GNU_verneed 0x6ffffffe /* Symbol versions required */ -#define SHT_SUNW_versym 0x6fffffff -#define SHT_GNU_versym 0x6fffffff /* Symbol version table */ -#define SHT_HISUNW 0x6fffffff -#define SHT_HIOS 0x6fffffff /* Last of OS specific semantics */ -#define SHT_LOPROC 0x70000000 /* reserved range for processor */ -#define SHT_AMD64_UNWIND 0x70000001 /* unwind information */ -#define SHT_HIPROC 0x7fffffff /* specific section header types */ -#define SHT_LOUSER 0x80000000 /* reserved range for application */ -#define SHT_HIUSER 0xffffffff /* specific indexes */ +#define SHT_NULL 0 /* inactive */ +#define SHT_PROGBITS 1 /* program defined information */ +#define SHT_SYMTAB 2 /* symbol table section */ +#define SHT_STRTAB 3 /* string table section */ +#define SHT_RELA 4 /* relocation section with addends */ +#define SHT_HASH 5 /* symbol hash table section */ +#define SHT_DYNAMIC 6 /* dynamic section */ +#define SHT_NOTE 7 /* note section */ +#define SHT_NOBITS 8 /* no space section */ +#define SHT_REL 9 /* relocation section - no addends */ +#define SHT_SHLIB 10 /* reserved - purpose unknown */ +#define SHT_DYNSYM 11 /* dynamic symbol table section */ +#define SHT_INIT_ARRAY 14 /* Initialization function pointers. */ +#define SHT_FINI_ARRAY 15 /* Termination function pointers. */ +#define SHT_PREINIT_ARRAY 16 /* Pre-initialization function ptrs. */ +#define SHT_GROUP 17 /* Section group. */ +#define SHT_SYMTAB_SHNDX 18 /* Section indexes (see SHN_XINDEX). */ +#define SHT_LOOS 0x60000000 /* First of OS specific semantics */ +#define SHT_LOSUNW 0x6ffffff4 +#define SHT_SUNW_dof 0x6ffffff4 +#define SHT_SUNW_cap 0x6ffffff5 +#define SHT_SUNW_SIGNATURE 0x6ffffff6 +#define SHT_SUNW_ANNOTATE 0x6ffffff7 +#define SHT_SUNW_DEBUGSTR 0x6ffffff8 +#define SHT_SUNW_DEBUG 0x6ffffff9 +#define SHT_SUNW_move 0x6ffffffa +#define SHT_SUNW_COMDAT 0x6ffffffb +#define SHT_SUNW_syminfo 0x6ffffffc +#define SHT_SUNW_verdef 0x6ffffffd +#define SHT_GNU_verdef 0x6ffffffd /* Symbol versions provided */ +#define SHT_SUNW_verneed 0x6ffffffe +#define SHT_GNU_verneed 0x6ffffffe /* Symbol versions required */ +#define SHT_SUNW_versym 0x6fffffff +#define SHT_GNU_versym 0x6fffffff /* Symbol version table */ +#define SHT_HISUNW 0x6fffffff +#define SHT_HIOS 0x6fffffff /* Last of OS specific semantics */ +#define SHT_LOPROC 0x70000000 /* reserved range for processor */ +#define SHT_AMD64_UNWIND 0x70000001 /* unwind information */ +#define SHT_HIPROC 0x7fffffff /* specific section header types */ +#define SHT_LOUSER 0x80000000 /* reserved range for application */ +#define SHT_HIUSER 0xffffffff /* specific indexes */ /* Flags for sh_flags. */ -#define SHF_WRITE 0x1 /* Section contains writable data. */ -#define SHF_ALLOC 0x2 /* Section occupies memory. */ -#define SHF_EXECINSTR 0x4 /* Section contains instructions. */ -#define SHF_MERGE 0x10 /* Section may be merged. */ -#define SHF_STRINGS 0x20 /* Section contains strings. */ -#define SHF_INFO_LINK 0x40 /* sh_info holds section index. */ -#define SHF_LINK_ORDER 0x80 /* Special ordering requirements. */ -#define SHF_OS_NONCONFORMING 0x100 /* OS-specific processing required. */ -#define SHF_GROUP 0x200 /* Member of section group. */ -#define SHF_TLS 0x400 /* Section contains TLS data. */ -#define SHF_MASKOS 0x0ff00000 /* OS-specific semantics. */ -#define SHF_MASKPROC 0xf0000000 /* Processor-specific semantics. */ +#define SHF_WRITE 0x1 /* Section contains writable data. */ +#define SHF_ALLOC 0x2 /* Section occupies memory. */ +#define SHF_EXECINSTR 0x4 /* Section contains instructions. */ +#define SHF_MERGE 0x10 /* Section may be merged. */ +#define SHF_STRINGS 0x20 /* Section contains strings. */ +#define SHF_INFO_LINK 0x40 /* sh_info holds section index. */ +#define SHF_LINK_ORDER 0x80 /* Special ordering requirements. */ +#define SHF_OS_NONCONFORMING 0x100 /* OS-specific processing required. */ +#define SHF_GROUP 0x200 /* Member of section group. */ +#define SHF_TLS 0x400 /* Section contains TLS data. */ +#define SHF_MASKOS 0x0ff00000 /* OS-specific semantics. */ +#define SHF_MASKPROC 0xf0000000 /* Processor-specific semantics. */ /* Values for p_type. */ -#define PT_NULL 0 /* Unused entry. */ -#define PT_LOAD 1 /* Loadable segment. */ -#define PT_DYNAMIC 2 /* Dynamic linking information segment. */ -#define PT_INTERP 3 /* Pathname of interpreter. */ -#define PT_NOTE 4 /* Auxiliary information. */ -#define PT_SHLIB 5 /* Reserved (not used). */ -#define PT_PHDR 6 /* Location of program header itself. */ +#define PT_NULL 0 /* Unused entry. */ +#define PT_LOAD 1 /* Loadable segment. */ +#define PT_DYNAMIC 2 /* Dynamic linking information segment. */ +#define PT_INTERP 3 /* Pathname of interpreter. */ +#define PT_NOTE 4 /* Auxiliary information. */ +#define PT_SHLIB 5 /* Reserved (not used). */ +#define PT_PHDR 6 /* Location of program header itself. */ #define PT_TLS 7 /* Thread local storage segment */ -#define PT_LOOS 0x60000000 /* First OS-specific. */ +#define PT_LOOS 0x60000000 /* First OS-specific. */ #define PT_SUNW_UNWIND 0x6464e550 /* amd64 UNWIND program header */ #define PT_GNU_EH_FRAME 0x6474e550 #define PT_LOSUNW 0x6ffffffa @@ -319,48 +319,48 @@ #define PT_SUNWDTRACE 0x6ffffffc /* private */ #define PT_SUNWCAP 0x6ffffffd /* hard/soft capabilities segment */ #define PT_HISUNW 0x6fffffff -#define PT_HIOS 0x6fffffff /* Last OS-specific. */ -#define PT_LOPROC 0x70000000 /* First processor-specific type. */ -#define PT_HIPROC 0x7fffffff /* Last processor-specific type. */ +#define PT_HIOS 0x6fffffff /* Last OS-specific. */ +#define PT_LOPROC 0x70000000 /* First processor-specific type. */ +#define PT_HIPROC 0x7fffffff /* Last processor-specific type. */ /* Values for p_flags. */ -#define PF_X 0x1 /* Executable. */ -#define PF_W 0x2 /* Writable. */ -#define PF_R 0x4 /* Readable. */ -#define PF_MASKOS 0x0ff00000 /* Operating system-specific. */ -#define PF_MASKPROC 0xf0000000 /* Processor-specific. */ +#define PF_X 0x1 /* Executable. */ +#define PF_W 0x2 /* Writable. */ +#define PF_R 0x4 /* Readable. */ +#define PF_MASKOS 0x0ff00000 /* Operating system-specific. */ +#define PF_MASKPROC 0xf0000000 /* Processor-specific. */ /* Extended program header index. */ #define PN_XNUM 0xffff /* Values for d_tag. */ -#define DT_NULL 0 /* Terminating entry. */ -#define DT_NEEDED 1 /* String table offset of a needed shared +#define DT_NULL 0 /* Terminating entry. */ +#define DT_NEEDED 1 /* String table offset of a needed shared library. */ -#define DT_PLTRELSZ 2 /* Total size in bytes of PLT relocations. */ -#define DT_PLTGOT 3 /* Processor-dependent address. */ -#define DT_HASH 4 /* Address of symbol hash table. */ -#define DT_STRTAB 5 /* Address of string table. */ -#define DT_SYMTAB 6 /* Address of symbol table. */ -#define DT_RELA 7 /* Address of ElfNN_Rela relocations. */ -#define DT_RELASZ 8 /* Total size of ElfNN_Rela relocations. */ -#define DT_RELAENT 9 /* Size of each ElfNN_Rela relocation entry. */ -#define DT_STRSZ 10 /* Size of string table. */ -#define DT_SYMENT 11 /* Size of each symbol table entry. */ -#define DT_INIT 12 /* Address of initialization function. */ -#define DT_FINI 13 /* Address of finalization function. */ -#define DT_SONAME 14 /* String table offset of shared object +#define DT_PLTRELSZ 2 /* Total size in bytes of PLT relocations. */ +#define DT_PLTGOT 3 /* Processor-dependent address. */ +#define DT_HASH 4 /* Address of symbol hash table. */ +#define DT_STRTAB 5 /* Address of string table. */ +#define DT_SYMTAB 6 /* Address of symbol table. */ +#define DT_RELA 7 /* Address of ElfNN_Rela relocations. */ +#define DT_RELASZ 8 /* Total size of ElfNN_Rela relocations. */ +#define DT_RELAENT 9 /* Size of each ElfNN_Rela relocation entry. */ +#define DT_STRSZ 10 /* Size of string table. */ +#define DT_SYMENT 11 /* Size of each symbol table entry. */ +#define DT_INIT 12 /* Address of initialization function. */ +#define DT_FINI 13 /* Address of finalization function. */ +#define DT_SONAME 14 /* String table offset of shared object name. */ -#define DT_RPATH 15 /* String table offset of library path. [sup] */ -#define DT_SYMBOLIC 16 /* Indicates "symbolic" linking. [sup] */ -#define DT_REL 17 /* Address of ElfNN_Rel relocations. */ -#define DT_RELSZ 18 /* Total size of ElfNN_Rel relocations. */ -#define DT_RELENT 19 /* Size of each ElfNN_Rel relocation. */ -#define DT_PLTREL 20 /* Type of relocation used for PLT. */ -#define DT_DEBUG 21 /* Reserved (not used). */ -#define DT_TEXTREL 22 /* Indicates there may be relocations in +#define DT_RPATH 15 /* String table offset of library path. [sup] */ +#define DT_SYMBOLIC 16 /* Indicates "symbolic" linking. [sup] */ +#define DT_REL 17 /* Address of ElfNN_Rel relocations. */ +#define DT_RELSZ 18 /* Total size of ElfNN_Rel relocations. */ +#define DT_RELENT 19 /* Size of each ElfNN_Rel relocation. */ +#define DT_PLTREL 20 /* Type of relocation used for PLT. */ +#define DT_DEBUG 21 /* Reserved (not used). */ +#define DT_TEXTREL 22 /* Indicates there may be relocations in non-writable segments. [sup] */ -#define DT_JMPREL 23 /* Address of PLT relocations. */ +#define DT_JMPREL 23 /* Address of PLT relocations. */ #define DT_BIND_NOW 24 /* [sup] */ #define DT_INIT_ARRAY 25 /* Address of the array of pointers to initialization functions */ @@ -455,63 +455,63 @@ thread-local storage scheme. */ /* Values for n_type. Used in core files. */ -#define NT_PRSTATUS 1 /* Process status. */ -#define NT_FPREGSET 2 /* Floating point registers. */ -#define NT_PRPSINFO 3 /* Process state info. */ +#define NT_PRSTATUS 1 /* Process status. */ +#define NT_FPREGSET 2 /* Floating point registers. */ +#define NT_PRPSINFO 3 /* Process state info. */ /* Symbol Binding - ELFNN_ST_BIND - st_info */ -#define STB_LOCAL 0 /* Local symbol */ -#define STB_GLOBAL 1 /* Global symbol */ -#define STB_WEAK 2 /* like global - lower precedence */ -#define STB_LOOS 10 /* Reserved range for operating system */ -#define STB_HIOS 12 /* specific semantics. */ -#define STB_LOPROC 13 /* reserved range for processor */ -#define STB_HIPROC 15 /* specific semantics. */ +#define STB_LOCAL 0 /* Local symbol */ +#define STB_GLOBAL 1 /* Global symbol */ +#define STB_WEAK 2 /* like global - lower precedence */ +#define STB_LOOS 10 /* Reserved range for operating system */ +#define STB_HIOS 12 /* specific semantics. */ +#define STB_LOPROC 13 /* reserved range for processor */ +#define STB_HIPROC 15 /* specific semantics. */ /* Symbol type - ELFNN_ST_TYPE - st_info */ -#define STT_NOTYPE 0 /* Unspecified type. */ -#define STT_OBJECT 1 /* Data object. */ -#define STT_FUNC 2 /* Function. */ -#define STT_SECTION 3 /* Section. */ -#define STT_FILE 4 /* Source file. */ -#define STT_COMMON 5 /* Uninitialized common block. */ -#define STT_TLS 6 /* TLS object. */ -#define STT_NUM 7 -#define STT_LOOS 10 /* Reserved range for operating system */ -#define STT_HIOS 12 /* specific semantics. */ -#define STT_LOPROC 13 /* reserved range for processor */ -#define STT_HIPROC 15 /* specific semantics. */ +#define STT_NOTYPE 0 /* Unspecified type. */ +#define STT_OBJECT 1 /* Data object. */ +#define STT_FUNC 2 /* Function. */ +#define STT_SECTION 3 /* Section. */ +#define STT_FILE 4 /* Source file. */ +#define STT_COMMON 5 /* Uninitialized common block. */ +#define STT_TLS 6 /* TLS object. */ +#define STT_NUM 7 +#define STT_LOOS 10 /* Reserved range for operating system */ +#define STT_HIOS 12 /* specific semantics. */ +#define STT_LOPROC 13 /* reserved range for processor */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From ed at FreeBSD.org Thu Jan 1 13:53:02 2009 From: ed at FreeBSD.org (Ed Schouten) Date: Thu Jan 1 13:53:09 2009 Subject: PERFORCE change 155552 for review Message-ID: <200901011353.n01Dr0FW034184@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155552 Change 155552 by ed@ed_dull on 2009/01/01 13:52:40 Reduce unneeded diff against SVN. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#20 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/teken/Makefile#4 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/teken/gensequences#5 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/teken/sequences#8 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#12 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#12 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_demo.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_stress.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#24 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr_compat.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_wcwidth.h#5 integrate .. //depot/projects/mpsafetty/sys/pc98/cbus/sctermvar.h#2 integrate Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#20 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1999 Kazutaka YOKOTA * All rights reserved. * - * Copyright (c) 2008 Ed Schouten + * Copyright (c) 2008-2009 Ed Schouten * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm-teken.c,v 1.1 2009/01/01 13:26:53 ed Exp $"); #include "opt_syscons.h" ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/sys/dev/syscons/teken/Makefile,v 1.1 2009/01/01 13:26:53 ed Exp $ PROG= teken_demo SRCS= teken_demo.c teken.c teken_state.h ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/gensequences#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/usr/bin/awk -f #- -# Copyright (c) 2008 Ed Schouten +# Copyright (c) 2008-2009 Ed Schouten # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD$ +# $FreeBSD: src/sys/dev/syscons/teken/gensequences,v 1.1 2009/01/01 13:26:53 ed Exp $ function die(msg) { print msg; ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/sequences#8 (text+ko) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2008 Ed Schouten +# Copyright (c) 2008-2009 Ed Schouten # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD$ +# $FreeBSD: src/sys/dev/syscons/teken/sequences,v 1.1 2009/01/01 13:26:53 ed Exp $ # File format is as follows: # Abbr Abbreviation of sequence name ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Ed Schouten + * Copyright (c) 2008-2009 Ed Schouten * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/dev/syscons/teken/teken.c,v 1.1 2009/01/01 13:26:53 ed Exp $ */ #include ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#12 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Ed Schouten + * Copyright (c) 2008-2009 Ed Schouten * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/dev/syscons/teken/teken.h,v 1.1 2009/01/01 13:26:53 ed Exp $ */ #ifndef _TEKEN_H_ ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_demo.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Ed Schouten + * Copyright (c) 2008-2009 Ed Schouten * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/dev/syscons/teken/teken_demo.c,v 1.1 2009/01/01 13:26:53 ed Exp $ */ #include ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_stress.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Ed Schouten + * Copyright (c) 2008-2009 Ed Schouten * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/dev/syscons/teken/teken_stress.c,v 1.1 2009/01/01 13:26:53 ed Exp $ */ #include ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#24 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Ed Schouten + * Copyright (c) 2008-2009 Ed Schouten * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/dev/syscons/teken/teken_subr.h,v 1.1 2009/01/01 13:26:53 ed Exp $ */ static void teken_subr_cursor_up(teken_t *, unsigned int); ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr_compat.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Ed Schouten + * Copyright (c) 2008-2009 Ed Schouten * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/dev/syscons/teken/teken_subr_compat.h,v 1.1 2009/01/01 13:26:53 ed Exp $ */ static void ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_wcwidth.h#5 (text+ko) ==== @@ -7,7 +7,7 @@ * * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c * - * $FreeBSD$ + * $FreeBSD: src/sys/dev/syscons/teken/teken_wcwidth.h,v 1.1 2009/01/01 13:26:53 ed Exp $ */ struct interval { ==== //depot/projects/mpsafetty/sys/pc98/cbus/sctermvar.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/pc98/cbus/sctermvar.h,v 1.1 2009/01/01 13:26:53 ed Exp $ */ #ifndef _DEV_SYSCONS_SCTERMVAR_H_ From mayur at FreeBSD.org Thu Jan 1 14:08:18 2009 From: mayur at FreeBSD.org (Mayur Shardul) Date: Thu Jan 1 14:08:24 2009 Subject: PERFORCE change 155554 for review Message-ID: <200901011408.n01E8GYU036190@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155554 Change 155554 by mayur@mayur_freebsd_vm on 2009/01/01 14:07:27 some cleanup Affected files ... .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/conf/options#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/radix_tree.c#4 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/radix_tree.h#4 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_map.c#4 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_map.h#3 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_object.c#5 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_object.h#5 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_page.c#5 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_reserv.c#5 edit Differences ... ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/conf/options#2 (text+ko) ==== @@ -46,6 +46,7 @@ TWA_DEBUG opt_twa.h TWA_FLASH_FIRMWARE opt_twa.h + # Debugging options. DDB DDB_CAPTURE_DEFAULTBUFSIZE opt_ddb.h @@ -560,6 +561,7 @@ VM_KMEM_SIZE_MAX opt_vm.h VM_NRESERVLEVEL opt_vm.h VM_LEVEL_0_ORDER opt_vm.h +VM_RADIX opt_vm.h NO_SWAPPING opt_vm.h MALLOC_MAKE_FAILURES opt_vm.h MALLOC_PROFILE opt_vm.h ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/radix_tree.c#4 (text+ko) ==== @@ -1,4 +1,32 @@ /* + * Copyright (c) 2008 Mayur Shardul + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + + +/* * Radix tree implementation. * Number of bits per level are configurable. * ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/radix_tree.h#4 (text+ko) ==== @@ -1,6 +1,28 @@ - /* - * radix tree + * Copyright (c) 2008 Mayur Shardul + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * */ #include @@ -27,7 +49,7 @@ }; -struct radix_tree *create_radix_tree(int ); +struct radix_tree *create_radix_tree(int ); int radix_tree_insert(rtidx_t , struct radix_tree *, void *); void *radix_tree_remove(rtidx_t , struct radix_tree *); void *radix_tree_lookup(rtidx_t , struct radix_tree *); ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_map.c#4 (text+ko) ==== @@ -1501,19 +1501,18 @@ start = 0; p_start = NULL; - /* +#ifdef VM_RADIX + p = radix_tree_lookup_ge(pindex, &object->rtree); +#else if ((p = TAILQ_FIRST(&object->memq)) != NULL) { if (p->pindex < pindex) { p = vm_page_splay(pindex, object->root); if ((object->root = p)->pindex < pindex) p = TAILQ_NEXT(p, listq); - - r = radix_tree_lookup_ge(pindex, &object->rtree); - KASSERT(r == p, ("r != p, lookup_ge failed\n")); } - }*/ - p = radix_tree_lookup_ge(pindex, &object->rtree); + } +#endif /* * Assert: the variable p is either (1) the page with the * least pindex greater than or equal to the parameter pindex ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_map.h#3 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_object.c#5 (text+ko) ==== @@ -216,13 +216,15 @@ TAILQ_INIT(&object->memq); LIST_INIT(&object->shadow_head); - //object->root = NULL; +#ifdef VM_RADIX object->rtree.rt_bits_per_level = 4; object->rtree.rt_height = 0; object->rtree.rt_root = NULL; object->rtree.rt_max_height = (8*sizeof(rtidx_t))/4; object->rtree.rt_max_index = ~((rtidx_t)0); - +#else + object->root = NULL; +#endif object->type = type; object->size = size; object->generation = 1; @@ -1362,17 +1364,14 @@ retry: if ((m = TAILQ_FIRST(&orig_object->memq)) != NULL) { if (m->pindex < offidxstart) { - /* +#ifdef VM_RADIX + m = radix_tree_lookup_ge(offidxstart, + &orig_object->rtree); +#else m = vm_page_splay(offidxstart, orig_object->root); if ((orig_object->root = m)->pindex < offidxstart) m = TAILQ_NEXT(m, listq); - */ - m = radix_tree_lookup_ge(offidxstart, - &orig_object->rtree); - /* - KASSERT( r == m, ("VM_ALGO: vm_object_split " - "lookup_ge failed")); - */ +#endif } } vm_page_lock_queues(); @@ -1892,16 +1891,13 @@ vm_page_lock_queues(); if ((p = TAILQ_FIRST(&object->memq)) != NULL) { if (p->pindex < start) { - /* +#ifdef VM_RADIX + p = radix_tree_lookup_ge(start, &object->rtree); +#else p = vm_page_splay(start, object->root); if ((object->root = p)->pindex < start) p = TAILQ_NEXT(p, listq); - */ - p = radix_tree_lookup_ge(start, &object->rtree); - /* - KASSERT(r == p, ("VM_ALGO: vm_object_page_remove " - "lookup_ge failed\n")); - */ +#endif } } /* ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_object.h#5 (text+ko) ==== @@ -67,7 +67,11 @@ #ifndef _VM_OBJECT_ #define _VM_OBJECT_ +#include "opt_vm.h" + +#ifdef VM_RADIX #include "radix_tree.h" +#endif #include #include @@ -89,8 +93,11 @@ LIST_HEAD(, vm_object) shadow_head; /* objects that this is a shadow for */ LIST_ENTRY(vm_object) shadow_list; /* chain of shadow objects */ TAILQ_HEAD(, vm_page) memq; /* list of resident pages */ - //vm_page_t root; /* root of the resident page splay tree */ +#ifdef VM_RADIX struct radix_tree rtree; +#else + vm_page_t root; /* root of the resident page splay tree */ +#endif vm_pindex_t size; /* Object size */ int generation; /* generation ID */ int ref_count; /* How many refs?? */ ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_page.c#5 (text+ko) ==== @@ -137,8 +137,10 @@ struct mtx vm_page_queue_mtx; struct mtx vm_page_queue_free_mtx; +#ifdef VM_RADIX extern SLIST_HEAD(, radix_node) res_rnodes_head; extern int rnode_size; +#endif vm_page_t vm_page_array = 0; int vm_page_array_size = 0; @@ -271,7 +273,7 @@ vm_page_queues[PQ_INACTIVE].cnt = &cnt.v_inactive_count; vm_page_queues[PQ_ACTIVE].cnt = &cnt.v_active_count; vm_page_queues[PQ_HOLD].cnt = &cnt.v_active_count; - +#ifdef VM_RADIX /* reserve memory for radix nodes. */ rnode_size = sizeof(struct radix_node) + (sizeof(void *) * (0xf + 1)); @@ -289,6 +291,7 @@ next); mapped += rnode_size; } +#endif /* * Allocate memory for use when boot strapping the kernel memory * allocator. @@ -657,8 +660,11 @@ void vm_page_insert(vm_page_t m, vm_object_t object, vm_pindex_t pindex) { +#ifdef VM_RADIX vm_page_t neighbour; - +#else + vm_page_t root; +#endif VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); if (m->object != NULL) panic("vm_page_insert: page already inserted"); @@ -669,10 +675,27 @@ m->object = object; m->pindex = pindex; +#ifdef VM_RADIX + if(object->resident_page_count == 0){ + TAILQ_INSERT_TAIL(&object->memq, m, listq); + } + else{ + if((neighbour = radix_tree_lookup_ge(pindex, + &object->rtree)) != NULL){ + KASSERT( pindex != neighbour->pindex, ("vm_page_insert" + ": offset already allocated")); + TAILQ_INSERT_BEFORE(neighbour, m, listq); + }else{ + neighbour = radix_tree_lookup_le(pindex, + &object->rtree); + TAILQ_INSERT_AFTER(&object->memq, neighbour, m, listq); + } + } + radix_tree_insert(pindex, &object->rtree, m); +#else /* * Now link into the object's ordered list of backed pages. */ - /* root = object->root; if (root == NULL) { m->left = NULL; @@ -695,26 +718,9 @@ } } object->root = m; - */ - if(object->resident_page_count == 0){ - TAILQ_INSERT_TAIL(&object->memq, m, listq); - } - else{ - if((neighbour = radix_tree_lookup_ge(pindex, - &object->rtree)) != NULL){ - KASSERT( pindex != neighbour->pindex, ("vm_page_insert" - ": offset already allocated")); - TAILQ_INSERT_BEFORE(neighbour, m, listq); - }else{ - neighbour = radix_tree_lookup_le(pindex, - &object->rtree); - TAILQ_INSERT_AFTER(&object->memq, neighbour, m, listq); - } - } - +#endif object->generation++; - radix_tree_insert(pindex, &object->rtree, m); - + /* * show that the object has one more resident page. */ @@ -749,7 +755,9 @@ vm_page_remove(vm_page_t m) { vm_object_t object; - //vm_page_t root; +#ifndef VM_RADIX + vm_page_t root; +#endif if ((object = m->object) == NULL) return; @@ -760,10 +768,12 @@ } mtx_assert(&vm_page_queue_mtx, MA_OWNED); +#ifdef VM_RADIX + radix_tree_remove(m->pindex,&object->rtree); +#else /* * Now remove from the object's list of backed pages. */ - /* if (m != object->root) vm_page_splay(m->pindex, object->root); if (m->left == NULL) @@ -773,7 +783,8 @@ root->right = m->right; } object->root = root; - */ +#endif + TAILQ_REMOVE(&object->memq, m, listq); /* @@ -781,7 +792,6 @@ */ object->resident_page_count--; object->generation++; - radix_tree_remove(m->pindex,&object->rtree); /* * The vnode may now be recycled. */ @@ -807,15 +817,16 @@ vm_page_t m; VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); - /* + +#ifdef VM_RADIX + m = radix_tree_lookup(pindex, &object->rtree); +#else if ((m = object->root) != NULL && m->pindex != pindex) { m = vm_page_splay(pindex, m); if ((object->root = m)->pindex != pindex) m = NULL; } - */ - m = radix_tree_lookup(pindex, &object->rtree); - //KASSERT( r == m, ("VM_ALGO: r != m, lookup failed.")); +#endif return (m); } @@ -1681,11 +1692,13 @@ */ vm_pageq_remove(m); +#ifdef VM_RADIX + radix_tree_remove(m->pindex, &object->rtree); +#else /* * Remove the page from the object's collection of resident * pages. */ - /* if (m != object->root) vm_page_splay(m->pindex, object->root); if (m->left == NULL) @@ -1695,8 +1708,7 @@ root->right = m->right; } object->root = root; - */ - radix_tree_remove(m->pindex, &object->rtree); +#endif TAILQ_REMOVE(&object->memq, m, listq); object->resident_page_count--; object->generation++; ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_reserv.c#5 (text+ko) ==== @@ -311,16 +311,47 @@ /* * Look for an existing reservation. */ - //msucc = NULL; - //mpred = object->root; - /* +#ifdef VM_RADIX + mpred = radix_tree_lookup_le(pindex, &object->rtree); + if(mpred != NULL){ + KASSERT(mpred->pindex != pindex, + ("vm_reserv_alloc_page: pindex already allocated")); + rv = vm_reserv_from_page(mpred); + if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) { + m = &rv->pages[VM_RESERV_INDEX(object, pindex)]; + // Handle vm_page_rename(m, new_object, ...). + if ((m->flags & (PG_CACHED | PG_FREE)) == 0) + return (NULL); + vm_reserv_populate(rv); + return (m); + } + } + msucc = radix_tree_lookup_ge(pindex, &object->rtree); + if(msucc != NULL){ + KASSERT(msucc->pindex != pindex, + ("vm_reserv_alloc_page: pindex already allocated")); + rv = vm_reserv_from_page(msucc); + if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) { + m = &rv->pages[VM_RESERV_INDEX(object, pindex)]; + // Handle vm_page_rename(m, new_object, ...). + if ((m->flags & (PG_CACHED | PG_FREE)) == 0) + return (NULL); + vm_reserv_populate(rv); + return (m); + } + } + +#else + msucc = NULL; + mpred = object->root; + while (mpred != NULL) { KASSERT(mpred->pindex != pindex, ("vm_reserv_alloc_page: pindex already allocated")); rv = vm_reserv_from_page(mpred); if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) { m = &rv->pages[VM_RESERV_INDEX(object, pindex)]; - // Handle vm_page_rename(m, new_object, ...). + /* Handle vm_page_rename(m, new_object, ...). */ if ((m->flags & (PG_CACHED | PG_FREE)) == 0) return (NULL); vm_reserv_populate(rv); @@ -335,7 +366,7 @@ if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) { m = &rv->pages[VM_RESERV_INDEX(object, pindex)]; - // Handle vm_page_rename(m, new_object, ...). + /* Handle vm_page_rename(m, new_object, ...). */ if ((m->flags & (PG_CACHED | PG_FREE)) == 0) return (NULL); vm_reserv_populate(rv); @@ -350,38 +381,7 @@ msucc = NULL; mpred = object->root = vm_page_splay(pindex, object->root); } - */ - mpred = radix_tree_lookup_le(pindex, &object->rtree); - if(mpred != NULL){ - KASSERT(mpred->pindex != pindex, - ("vm_reserv_alloc_page: pindex already allocated")); - rv = vm_reserv_from_page(mpred); - if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) { - m = &rv->pages[VM_RESERV_INDEX(object, pindex)]; - // Handle vm_page_rename(m, new_object, ...). - if ((m->flags & (PG_CACHED | PG_FREE)) == 0) - return (NULL); - vm_reserv_populate(rv); - return (m); - } - } - msucc = radix_tree_lookup_ge(pindex, &object->rtree); - - if(msucc != NULL){ - KASSERT(msucc->pindex != pindex, - ("vm_reserv_alloc_page: pindex already allocated")); - rv = vm_reserv_from_page(msucc); - if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) { - m = &rv->pages[VM_RESERV_INDEX(object, pindex)]; - // Handle vm_page_rename(m, new_object, ...). - if ((m->flags & (PG_CACHED | PG_FREE)) == 0) - return (NULL); - vm_reserv_populate(rv); - return (m); - } - } - //KASSERT(rpred == mpred, ("rpred != mpred\n")); - //KASSERT(msucc == rsucc, ("msucc != rsucc\n")); +#endif /* * Determine the first index to the left that can be used. */ From ed at 80386.nl Thu Jan 1 14:18:35 2009 From: ed at 80386.nl (Ed Schouten) Date: Thu Jan 1 14:18:41 2009 Subject: PERFORCE change 155554 for review In-Reply-To: <200901011408.n01E8GYU036190@repoman.freebsd.org> References: <200901011408.n01E8GYU036190@repoman.freebsd.org> Message-ID: <20090101141833.GF1176@hoeg.nl> Hello Mayur, I don't know a lot about our VM subsystem, but I've got a question about your work. Some time ago I ran a `buildkernel' with lock profiling enabled and saw the following results (sorted by `wait_total'): http://80386.nl/files/lock-profiling-buildkernel.txt It seems to me that the "vm page queue mutex" is clearly one of the most contended locks inside the kernel. Is your work also targeted to reduce this contention? Happy 2009! -- Ed Schouten WWW: http://80386.nl/ -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 195 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/p4-projects/attachments/20090101/701a3443/attachment.pgp From rene at FreeBSD.org Thu Jan 1 16:33:46 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Thu Jan 1 16:33:53 2009 Subject: PERFORCE change 155556 for review Message-ID: <200901011633.n01GXjNb048909@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155556 Change 155556 by rene@rene_self on 2009/01/01 16:33:19 handbook/cutting-edge: - minor nits - save my translation credits Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#9 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#9 (text+ko) ==== @@ -18,31 +18,37 @@ + Jordan Hubbard Origineel door + Poul-Henning Kamp + John Polstra + Nik Clayton + Remko Lodder Vertaald door + Siebrand Mazeland @@ -143,6 +149,14 @@ Gebaseerd op notities aangeleverd door + + + + René + Ladan + Vertaald door + + FreeBSD Update @@ -191,10 +205,10 @@ Het configuratiebestand - Sommige gebruikers willen het configuratiebestand tweaken, - waardoor het proces beter gecontroleerd kan worden. De opties - zijn goed gedocumenteerd, maar voor de volgenden is wat extra - uitleg nodig: + Sommige gebruikers willen het configuratiebestand + optimaliseren, waardoor het proces beter gecontroleerd kan + worden. De opties zijn goed gedocumenteerd, maar voor de + volgenden is wat extra uitleg nodig: # Componenten van het basissysteem die bijgewerkt moeten blijven Components src world kernel @@ -545,6 +559,14 @@ Gebaseerd op notities geleverd door + + + + René + Ladan + Vertaald door + + Portsnap: een updategereedschap voor de Portscollectie From remko at FreeBSD.org Thu Jan 1 16:58:11 2009 From: remko at FreeBSD.org (Remko Lodder) Date: Thu Jan 1 16:58:19 2009 Subject: PERFORCE change 155557 for review Message-ID: <200901011658.n01Gw9kd060786@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155557 Change 155557 by remko@remko_nakur on 2009/01/01 16:57:10 Import translated filesystems chapter from Wouter Reckman. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#4 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Dutch Documentation Project $FreeBSD: $ - %SOURCE% en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml + %SOURCE% en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml %SRCID% 1.3 --> @@ -36,202 +36,219 @@ Bestandssystemen zijn een integraal onderdeel van ieder - besturingssysteem. Ze stellen gebruikers in de gelegenheid om bestanden - te uploaden en op te slaan, geven toegang tot gegevens en maken - natuurlijk harde schijven bruikbaar. - Verschillende besturingssystemen hebben gewoonlijk één + besturingssysteem. Ze stellen gebruikers in de gelegenheid om + bestanden te uploaden en op te slaan, geven toegang tot gegevens + en maken natuurlijk harde schijven bruikbaar. Verschillende + besturingssystemen hebben gewoonlijk één gezamenlijk aspect, namelijk het bestandssysteem. Op &os; staat dit bestandssysteem bekend onder de naam Fast File System ofwel FFS, dat is gebaseerd op het oorspronkelijke Unix™ File System, ook bekend als UFS. - Dit is het oorspronkelijke bestandssysteem van &os; dat op harde - schijven wordt geplaatst voor gegevenstoegang. + Dit is het oorspronkelijke bestandssysteem van &os; dat op + harde schijven wordt geplaatst voor gegevenstoegang. - &os; ondersteunt daarnaast ook een groot aantal - andere bestandssystemen om lokaal toegang tot gegevens van - andere besturingssystemen te bewerkstelligen; dat wil zeggen: - gegevens opgeslagen op lokaal aangesloten USB - opslagapparaten, flash drives, en harde schijven. Verder is er - ook ondersteuning voor vreemde bestandssystemen. - Dit zijn bestandssystemen ontwikkeld voor andere - besturingssystemen zoals het &linux; Extended File System - (EXT) en het &sun; Z File System - (ZFS). + &os; ondersteunt daarnaast ook een groot aantal andere + bestandssystemen om lokaal toegang tot gegevens van andere + besturingssystemen te bewerkstelligen; dat wil zeggen: gegevens + opgeslagen op lokaal aangesloten USB + opslagapparaten, flash drives, en harde schijven. Verder is er + ook ondersteuning voor vreemde bestandssystemen. Dit zijn + bestandssystemen ontwikkeld voor andere besturingssystemen + zoals het &linux; Extended File System (EXT) + en het &sun; Z File System (ZFS). - Er zijn verschillende gradaties van - ondersteuning voor de verschillende bestandssystemen op &os;. - Sommigen vereisen het laden van een kernelmodule, voor anderen - moet een toolset worden geïnstalleerd. Dit hoofdstuk is - geschreven om gebruikers van &os; te helpen om op hun systeem - toegang te verkrijgen tot andere bestandssystemen, te beginnen - met het &sun; Z File System. + Er zijn verschillende gradaties van ondersteuning voor de + verschillende bestandssystemen op &os;. Sommigen vereisen het + laden van een kernelmodule, voor anderen moet een toolset + worden geïnstalleerd. Dit hoofdstuk is geschreven om + gebruikers van &os; te helpen om op hun systeem toegang te + verkrijgen tot andere bestandssystemen, te beginnen met het + &sun; Z File System. Na het lezen van dit hoofstuk weet de lezer: - Het verschil tussen eigen en ondersteunde bestandssystemen. + Het verschil tussen eigen en ondersteunde + bestandssystemen. - Welke bestandssystemen zijn ondersteund in &os;. + Welke bestandssystemen zijn ondersteund in &os;. - Hoe niet-eigen bestandssystemen geactiveerd, geconfigureerd, - benaderd en gebruikt kunnen worden. + Hoe niet-eigen bestandssystemen geactiveerd, + geconfigureerd, benaderd en gebruikt kunnen worden. - Voorafgaand aan het lezen van dit hoofdstuk dient - de lezer: + Voorafgaand aan het lezen van dit hoofdstuk dient de + lezer: - Begrip te hebben van de beginselen van &unix; en &os; - (). + Begrip te hebben van de beginselen van &unix; en &os; + (). - Bekend te zijn met de beginselen van kernelconfiguratie en - -compilatie (). + Bekend te zijn met de beginselen van + kernelconfiguratie en -compilatie + (). - Vertrouwd te zijn met installatie van software van - derden in &os; (). + Vertrouwd te zijn met installatie van software van + derden in &os; (). - Enigszins bekend te zijn met schijven, opslag en - apparaatnamen in &os; (). + Enigszins bekend te zijn met schijven, opslag en + apparaatnamen in &os; (). Ondersteuning van ZFS wordt - beschouwd als experimenteel. Sommige opties kunnen beperkt zijn - in functionaliteit, andere onderdelen werken mogelijk in het - geheel niet. Op een zeker moment zal deze ondersteuning klaar - voor productie zijn en zal deze documentatie worden aangepast aan - de nieuwe situatie. + beschouwd als experimenteel. Sommige opties kunnen beperkt + zijn in functionaliteit, andere onderdelen werken mogelijk in + het geheel niet. Op een zeker moment zal deze ondersteuning + klaar voor productie zijn en zal deze documentatie worden + aangepast aan de nieuwe situatie. Het Z File System - The Z file system, developed by &sun;, is a new - technology designed to use a pooled storage method. This means - that space is only used as it is needed for data storage. It - has also been designed for maximum data integrity, supporting - data snapshots, multiple copies, and data checksums. A new - data replication model, known as RAID-Z has - been added. The RAID-Z model is similar - to RAID5 but is designed to prevent data - write corruption. + Het Z File System, ontwikkeld door &sun;, is een + nieuwe technologie ontwikkeld om gebruik te maken van een + pool-gebaseerde opslagmethode. Dit houdt in dat ruimte pas + wordt gebruikt wanneer het nodig is voor dataopslag. Verder is + het ontworpen voor maximale integriteit van gegevens, + ondersteuning van gegevens-snapshots, meerdere kopieën, en + gegevenschecksums. Ook is een nieuw gegevensreplicatiemodel, + bekend als RAID-Z, toegevoegd; + RAID-Z lijkt op RAID5, + maar is ontworpen om corruptie tijdens het schrijven van + gegevens te voorkomen. - ZFS Tuning + ZFS tuning - The ZFS subsystem utilizes much of - the system resources, so some tuning may be required to provide - maximum efficiency during every-day use. As an experimental - feature in &os; this may change in the near future; however, - at this time, the following steps are recommended. + Het ZFS subsysteem maakt gebruik van + veel systeembronnen waardoor het nodig kan zijn een en ander + af te stellen, zodat voor het dagelijks gebruik maximale + efficiëntie wordt behaald. Doordat het een + experimentele eigenschap van &os; is, kan dit in de nabije + toekomst veranderen; op dit moment echter, worden de volgende + stappen aangeraden. - Memory + Geheugen - The total system memory should be at least one gigabyte, - with two gigabytes or more recommended. In all of the - examples here, the system has one gigabyte of memory with - several other tuning mechanisms in place. + De totale hoeveelheid systeemgeheugen dient minstens + één gigabyte te zijn, maar twee gigabytes of meer + wordt aanbevolen. In alle voorbeelden hier heeft het systeem + één gigabyte geheugen, met verschillende andere + afstelmechanismen in werking. - Some people have had luck using fewer than one gigabyte - of memory, but with such a limited amount of physical memory, - when the system is under heavy load, it is very plausible - that &os; will panic due to memory exhaustion. + Sommigen hebben succes gehad met minder dan een + gigabyte geheugen, maar met een dergelijke, beperkte + hoeveelheid geheugen is de kans groot dat onder zware + belasting een kernelpanic in &os; op zal treden door uitputting + van het geheugen. - Kernel Configuration + Kernelconfiguratie - It is recommended that unused drivers and options - be removed from the kernel configuration file. Since most - devices are available as modules, they may simply be loaded - using the /boot/loader.conf file. + Het wordt aangeraden om ongebruikte + stuurprogramma's en opties te verwijderen uit het + kernelconfiguratiebestand. Omdat de meeste + stuurprogramma's beschikbaar zijn als modules kunnen ze + alsnog worden geladen door middel van het bestand + /boot/loader.conf. - Users of the i386 architecture should add the following - option to their kernel configuration file, rebuild their - kernel, and reboot: + Gebruikers van de i386-architectuur dienen de volgende + optie aan hun kernelconfiguratiebestand toe te voegen, de + kernel opnieuw te compileren, en opnieuw op te + starten: options KVA_PAGES=512 - This option will expand the kernel address space, thus - allowing the vm.kvm_size tunable to be - pushed beyond the currently imposed limit of 1 GB - (2 GB for PAE). To find the most - suitable value for this option, divide the desired address - space in megabytes by four (4). In this case, it is - 512 for 2 GB. + Deze optie vergroot de kerneladresruimte, waarmee het + mogelijk wordt gemaakt om de vm.kvm_size + afstelling hoger dan de huidige limiet van 1 GB + (2 GB voor PAE) in te stellen. + Deel, om de meest geschikte waarde voor deze optie te + vinden, de gewenste hoeveelheid adresruimte door vier (4). + In dit geval is dat 512 voor + 2 GB. - Loader Tunables + Loader tunables - The kmem address space should be - increased on all &os; architectures. On the test system with - one gigabyte of physical memory, success was achieved with the - following options which should be placed in - the /boot/loader.conf file and the system - restarted: + De kmem adresruimte dient te + worden vergroot op alle &os; architecturen. Op het + testsysteem met één gigabyte fysiek geheugen werd + succes behaald met de volgende opties, die in het bestand + /boot/loader.conf geplaatst dienen te + worden, waarna het systeem opnieuw moet worden + opgestart: vm.kmem_slze="330M" vm.kmem_size_max="330M" vfs.zfs.arc_max="40M" vfs.zfs.vdev.cache.size="5M" - For a more detailed list of recommendations for ZFS-related - tuning, see - . + Zie voor een meer gedetailleerde lijst van aanbevelingen + aangaande ZFS-afstelling: + + . - Using <acronym>ZFS</acronym> + Gebruik maken van <acronym>ZFS</acronym> - There is a start up mechanism that allows &os; to - mount ZFS pools during system - initialization. To set it, issue the following - commands: + Er is een opstartmechanisme dat &os; in staat stelt om + ZFS pools te mounten tijdens initialisatie van + het systeem. Voer de volgende commando's uit om dit in te + stellen: &prompt.root; echo 'zfs_enable="YES"' >> /etc/rc.conf &prompt.root; /etc/rc.d/zfs start - The remainder of this document assumes two - SCSI disks are available, and their device names - are da0 - and da1 - respectively. Users of IDE hardware may - use the ad - devices in place of SCSI hardware. + In het resterende deel van dit document wordt aangenomen + dat twee SCSI-schijven beschikbaar zijn, + en dat hun apparaatnamen respectievelijk + da0 en + da1 zijn. + Gebruikers van IDE-hardware kunnen de + ad + apparaten gebruiken in plaats van + SCSI-apparaten. - Single Disk Pool + Een pool op een enkele schijf - To create a ZFS over a single disk - device, use the zpool command: + Voer het zpool-commando uit om een + ZFS op een enkele schijf aan te + maken: &prompt.root; zpool create example /dev/da0 - To view the new pool, review the output of the - df: + Bestudeer de uitvoer van het commando + df om de nieuwe pool te zien: &prompt.root; df Filesystem 1K-blocks Used Avail Capacity Mounted on @@ -240,12 +257,12 @@ /dev/ad0s1d 54098308 1032846 48737598 2% /usr example 17547136 0 17547136 0% /example - This output clearly shows the example - pool has not only been created but - mounted as well. It is also accessible - just like a normal file system, files may be created on it - and users are able to browse it as in the - following example: + In deze uitvoer wordt duidelijk dat de + example-pool niet alleen is aangemaakt, + maar ook direct gemount is. Hij is ook + toegankelijk, net als een gewoon bestandssysteem; er kunnen + bestanden op worden aangemaakt en gebruikers kunnen er op + rondkijken zoals in het volgende voorbeeld: &prompt.root cd /example &prompt.root; ls @@ -256,25 +273,26 @@ drwxr-xr-x 21 root wheel 512 Aug 29 23:12 .. -rw-r--r-- 1 root wheel 0 Aug 29 23:15 testfile - Unfortunately this pool is not taking advantage of - any ZFS features. Create a file system - on this pool, and enable compression on it: + Helaas benut deze pool nog geen + ZFS-mogelijkheden. Maak een bestandssysteem + aan op deze pool en activeer er compressie op: &prompt.root; zfs create example/compressed &prompt.root; zfs set compression=gzip example/compressed - The example/compressed is now a - ZFS compressed file system. Try copying - some large files to it by copying them to - /example/compressed. + example/compressed is nu een + gecomprimeerd ZFS-bestandssysteem. Probeer + er een paar grote bestanden naartoe te kopiëren door ze + naar /example/compressed + te kopiëren. - The compression may now be disabled with: + De compressie kan nu worden uitgeschakeld met: &prompt.root; zfs set compression=off example/compressed - To unmount the file system, issue the following command - and then verify by using the df - utility: + Voer het volgende commando uit om het bestandssysteem te + unmounten, en controleer dat daarna met + df: &prompt.root; zfs umount example/compressed &prompt.root; df @@ -284,8 +302,9 @@ /dev/ad0s1d 54098308 1032864 48737580 2% /usr example 17547008 0 17547008 0% /example - Re-mount the file system to make it accessible - again, and verify with df: + Mount het bestandssysteem opnieuw om het weer + toegankelijk te maken en controleer met + df: &prompt.root; zfs mount example/compressed &prompt.root; df @@ -296,8 +315,8 @@ example 17547008 0 17547008 0% /example example/compressed 17547008 0 17547008 0% /example/compressed - The pool and file system may also be observed by viewing - the output from mount: + De pool en het bestandssysteem zijn ook zichtbaar in de + uitvoer van mount: &prompt.root; mount /dev/ad0s1a on / (ufs, local) @@ -307,18 +326,22 @@ example/data on /example/data (zfs, local) example/compressed on /example/compressed (zfs, local) - As observed, ZFS file systems, after - creation, may be used like ordinary file systems; however, - many other features are also available. In the following - example, a new file system, data is - created. Important files will be stored here, so the file - system is set to keep two copies of each data block: + Zoals is te zien kunnen + ZFS-bestandssystemen, nadat ze zijn + gecreëerd, net als gewone bestandssystemen worden + gebruikt; er zijn echter ook vele andere mogelijkheden + beschikbaar. In het volgende voorbeeld wordt er een nieuw + bestandssysteem data gecreëerd. + Er zullen belangrijke bestanden op worden bewaard, dus het + bestandssysteem wordt zodanig ingesteld dat het twee + kopieën van ieder gegevensblok opslaat: &prompt.root; zfs create example/data &prompt.root; zfs set copies=2 example/data - It is now possible to see the data and space utilization - by issuing the df again: + Het is nu mogelijk om het gegevens- en ruimtegebruik te + bekijken door df opnieuw te + draaien: &prompt.root; df Filesystem 1K-blocks Used Avail Capacity Mounted on @@ -329,113 +352,121 @@ example/compressed 17547008 0 17547008 0% /example/compressed example/data 17547008 0 17547008 0% /example/data - Notice that each file system on the pool has the same - amount of available space. This is the reason for using - the df through these examples, to show - that the file systems are using only the amount of space - they need and will all draw from the same pool. - The ZFS file system does away with concepts - such as volumes and partitions, and allows for several file - systems to occupy the same pool. Destroy the file systems, - and then destroy the pool as they are no longer - needed: + Merk op dat ieder bestandssysteem in de pool dezelfde + hoeveelheid vrije ruimte heeft. Dit is de reden dat + df steeds wordt gebruikt tussen de + voorbeelden door, om te laten zien dat de bestandssystemen + slechts zoveel ruimte gebruiken als ze nodig hebben en + allemaal putten uit dezelfde pool. + Het ZFS bestandssysteem elimineert + concepten als volumes en partities, en staat verschillende + bestandssystemen toe om in dezelfde pool te bestaan. + Verwijder nu de bestandssystemen en verwijder daarna de pool, + omdat deze niet meer nodig zijn: &prompt.root; zfs destroy example/compressed &prompt.root; zfs destroy example/data &prompt.root; zpool destroy example - Disks go bad and fail, an unavoidable trait. When - this disk goes bad, the data will be lost. One method of - avoiding data loss due to a failed hard disk is to implement - a RAID. ZFS supports - this feature in its pool design which is covered in - the next section. + Schijven gaan slechter werken en begeven het, een + onvermijdelijke eigenschap. Wanneer de schijf stukgaat + zullen de gegevens verloren gaan. Een methode om + gegevensverlies ten gevolge van een kapotte harde schijf te + vermijden is het implementeren van RAID. + ZFS ondersteunt deze mogelijkheid in zijn + pool-ontwerp en wordt beschreven in de volgende + sectie. <acronym>ZFS</acronym> RAID-Z - As previously noted, this section will assume that - two SCSI exists as devices - da0 and - da1. To create a - RAID-Z pool, issue the following - command: + Zoals eerder opgemerkt wordt in deze sectie aangenomen + dat er twee SCSI-schijven bestaan als de + apparaten da0 en + da1. Voer het volgende commando uit + om een RAID-Z-pool te + creëren: &prompt.root; zpool create storage raidz da0 da1 - The storage zpool should have been - created. This may be verified by using the &man.mount.8; and - &man.df.1; commands as before. More disk devices may have - been allocated by adding them to the end of the list above. - Make a new file system in the pool, called - home where user files will eventually be - placed: + De storage zpool zou gecreëerd + moeten zijn. Dit kan worden geverifieerd met de + &man.mount.8; en &man.df.1; commando's zoals eerder. Er + kunnen meer schijfapparaten worden toegewezen door ze aan het + einde van de bovenstaande lijst toe te voegen. + Maak een nieuw bestandssysteem in de pool, genaamd + home waar op den duur de + gebruikersbestanden geplaatst zullen worden: &prompt.root; zfs create storage/home - It is now possible to enable compression and keep extra - copies of the user's home directories and files. This may - be accomplished just as before using the following - commands: + Het is nu mogelijk om compressie in te schakelen en extra + kopieën te bewaren van de gebruikersmappen en + -bestanden. Dit kan net als eerder worden bewerkstelligd + door de volgende commando's uit te voeren: &prompt.root; zfs set copies=2 storage/home &prompt.root; zfs set compression=gzip storage/home - To make this the new home directory for users, copy the - user data to this directory, and create the appropriate - symbolic links: + Kopieer, om dit als de nieuwe home-map voor gebruikers in + te stellen, de gebruikersgegevens naar deze map en + creëer de benodigde links: &prompt.root; cp -rp /home/* /storage/home &prompt.root; rm -rf /home /usr/home &prompt.root; ln -s /storage/home /home &prompt.root; ln -s /storage/home /usr/home - Users should now have their data stored on the freshly - created /storage/home - file system. Test by adding a new user and logging in as - that user. + De gebruikersgegevens zouden nu op het nieuw aangemaakte + /storage/home + bestandssysteem moeten staan. Test dit door een nieuwe + gebruiker aan te maken en daarmee in te loggen. - Try creating a snapshot which may be rolled back - later: + Probeer een snapshot te maken dat later weer hersteld kan + worden: &prompt.root; zfs snapshot storage/home@08-30-08 - Note that the snapshot option will only capture a real - file system, not a home directory or a file. The - @ character is a delimiter used between - the file system name or the volume name. When a user's - home directory gets trashed, restore it with: + Merk op dat de snapshot-optie alleen een echt + bestandssysteem vastlegt, geen mappen of bestanden. Het + @-karakter wordt gebruikt als + scheidingsteken tussen de naam van het bestandssysteem of de + naam van het volume. Wanneer de home-map van een gebruiker + wordt weggegooid, kan deze worden hersteld met: &prompt.root; zfs rollback storage/home@08-30-08 - To get a list of all available snapshots, run the - ls in the file system's + Voer ls in de .zfs/snapshot - directory. For example, to see the previously taken - snapshot, perform the following command: + directory van het bestandssysteem uit om een lijst van alle + beschikbare snapshots te krijgen. Voer, om bijvoorbeeld + het zojuist gemaakte snapshot te zien, het volgende commando + uit: &prompt.root; ls /storage/home/.zfs/snapshot - It is possible to write a script to perform monthly - snapshots on user data; however, over time, snapshots - may consume a great deal of disk space. The previous - snapshot may be removed using the following command: + Het is mogelijk om een script te schrijven dat + maandelijks een snapshot van de gebruikersgegevens maakt; na + verloop van tijd kunnen snapshots echter een grote + hoeveelheid schrijfruimte in beslag nemen. Het vorige + snapshot kan worden verwijderd met het volgende + commando: &prompt.root; zfs destroy storage/home@08-30-08 - There is no reason, after all of this testing, we should - keep /storage/home - around in its present state. Make it the real - /home file - system: + Na al dit testen is er geen reden om + /storage/home in zijn + huidige staat nog te bewaren. Maak er het echte + /home + bestandssysteem van: &prompt.root; zfs set mountpoint=/home storage/home - Issuing the df and - mount commands will show that the system - now treats our file system as the real - /home: + Het uitvoeren van de commando's df en + mount laat zien dat het systeem ons + bestandssysteem nu als de echte /home behandelt: &prompt.root; mount /dev/ad0s1a on / (ufs, local) @@ -451,32 +482,33 @@ storage 17547008 0 17547008 0% /storage storage/home 17547008 0 17547008 0% /home - This completes the RAID-Z - configuration. To get status updates about the file systems - created during the nightly &man.periodic.8; runs, issue the - following command: + Hiermee is de RAID-Z configuratie + compleet. Voer het volgende commando uit om status-updates + van de gecreëerde bestandssystemen te krijgen tijdens + het draaien van de nachtelijke &man.periodic.8;: &prompt.root; echo 'daily_status_zfs_enable="YES"' >> /etc/periodic.conf - Recovering <acronym>RAID</acronym>-Z + Het herstellen van <acronym>RAID</acronym>-Z - Every software RAID has a method of - monitoring their state. - ZFS is no exception. The status of - RAID-Z devices may be viewed with the - following command: + Iedere software-RAID heeft een methode + om zijn status te inspecteren. + ZFS is geen uitzondering. De status van + RAID-Z-apparaten kan worden + geïnspecteerd met het volgende commando: &prompt.root; zpool status -x - If all pools are healthy and everything is normal, the - following message will be returned: + Als alle pools in orde zijn en alles is normaal, dan + wordt het volgende bericht weergegeven: all pools are healthy - If there is an issue, perhaps a disk has gone offline, - the pool state will be returned and look similar to: + Als er een probleem is, misschien een schijf die offine + is gegaan, dan wordt de status van de pool weergegeven en dat + zal er als volgt uitzien: pool: storage state: DEGRADED @@ -496,23 +528,24 @@ errors: No known data errors - This states that the device was taken offline by the - administrator. This is true for this particular example. - To take the disk offline, the following command was - used: + Hier staat dat het apparaat offline is gezet door de + beheerder. Dat is waar voor dit specifieke voorbeeld. Om de + schijf offline te zetten werd het volgende commando + gebruikt: &prompt.root; zpool offline storage da1 - It is now possible to replace the - da1 after the system has been - powered down. When the system is back online, the following - command may issued to replace the disk: + Het is nu mogelijk om de schijf + da1 te vervangen nadat het systeem + uitgeschakeld is. Zodra het systeem weer opgestart is, kan + het volgende commando worden uitgevoerd om de schijf te + vervangen: &prompt.root; zpool replace storage da1 - From here, the status may be checked again, this time - without the flag to get state - information: + Nu kan de status opnieuw geïnspecteerd worden, + dit keer zonder de vlag, om de + statusinformatie op te vragen: &prompt.root; zpool status storage pool: storage @@ -528,38 +561,42 @@ errors: No known data errors - As shown from this example, everything appears to be - normal. + Zoals te zien in dit voorbeeld lijkt alles normaal te + zijn. - Data Verification + Gegevensverificatie - As previously mentioned, ZFS uses - checksums to verify the integrity of - stored data. They are enabled automatically upon creation - of file systems and may be disabled using the following - command: + Zoals eerder opgemerkt gebruikt ZFS + checksums om de integriteit van opgeslagen + gegevens te verifiëren. Ze worden automatisch + ingeschakeld bij het creëren van bestandssystemen en + kunnen worden uitgeschakeld door middel van het volgende + commando: &prompt.root; zfs set checksum=off storage/home - This is not a wise idea; however, as checksums take - very little storage space and are more useful enabled. There - also appear to be no noticeable costs having them enabled. - While enabled, it is possible to have ZFS - check data integrity using checksum verification. This - process is known as scrubing. To verify the - data integrity of the storage pool, issue - the following command: + Dit is echter geen verstandig idee, omdat checksums zeer + weinig opslagruimte innemen en nuttiger zijn wanneer ze zijn + ingeschakeld. Het lijkt daarnaast ook geen merkbare invloed + op de prestaties te hebben wanneer ze zijn ingeschakeld. + Wanneer ze aanstaan is het mogelijk om ZFS + gegevensintegriteit te laten controleren door middel van + checksum-verificatie. Dit proces staat bekend als + scrubbing. Voer het volgende commando uit om + de gegevensintegriteit van de storage-pool + te controleren: &prompt.root; zpool scrub storage - This process may take considerable time depending on - the amount of data stored. It is also very - I/O intensive, so much that only one - of these operations may be run at any given time. After - the scrub has completed, the status is updated and may be - viewed by issuing a status request: + Dit proces kan, afhankelijk van de hoeveelheid opgeslagen + gegevens, een aanzienlijke hoeveelheid tijd in beslag nemen. + Het is daarnaast ook zeer I/O-intensief, + zozeer dat slechts één van deze operaties + tegelijkertijd uitgevoerd kan worden. Nadat de scrub is + voltooid wordt de status bijgewerkt en kan deze worden + bekeken door een statusaanvraag te doen: &prompt.root; zpool status storage pool: storage @@ -575,61 +612,41 @@ errors: No known data errors - The completion time is in plain view in this example. - This feature helps to ensure data integrity over a long - period of time. + De voltooiingstijd is in dit voorbeeld duidelijk + zichtbaar. Deze eigenschap helpt om gegevensintegriteit te + garanderen gedurende een langere tijdsperiode. - There are many more options for the Z file system, - see the &man.zfs.8; and &man.zpool.8; manual - pages. + Er zijn vele andere opties for het Z-bestandssysteem, zie + de &man.zfs.8; en &man.zpool.8; manualpagina's. - +--> From remko at FreeBSD.org Thu Jan 1 17:03:17 2009 From: remko at FreeBSD.org (Remko Lodder) Date: Thu Jan 1 17:03:23 2009 Subject: PERFORCE change 155558 for review Message-ID: <200901011703.n01H3FiB062005@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155558 Change 155558 by remko@remko_nakur on 2009/01/01 17:03:06 Basic review of style for the new translated chapter. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#5 (text+ko) ==== @@ -30,8 +30,10 @@ Overzicht Bestandssystemen + Ondersteuning bestandssystemen + Bestandssystemen @@ -155,16 +157,16 @@ Geheugen De totale hoeveelheid systeemgeheugen dient minstens - één gigabyte te zijn, maar twee gigabytes of meer - wordt aanbevolen. In alle voorbeelden hier heeft het systeem - één gigabyte geheugen, met verschillende andere - afstelmechanismen in werking. + één gigabyte te zijn, maar twee gigabytes of meer + wordt aanbevolen. In alle voorbeelden hier heeft het systeem + één gigabyte geheugen, met verschillende andere + afstelmechanismen in werking. Sommigen hebben succes gehad met minder dan een - gigabyte geheugen, maar met een dergelijke, beperkte - hoeveelheid geheugen is de kans groot dat onder zware - belasting een kernelpanic in &os; op zal treden door uitputting - van het geheugen. + gigabyte geheugen, maar met een dergelijke, beperkte + hoeveelheid geheugen is de kans groot dat onder zware + belasting een kernelpanic in &os; op zal treden door uitputting + van het geheugen. @@ -198,12 +200,12 @@ Loader tunables De kmem adresruimte dient te - worden vergroot op alle &os; architecturen. Op het - testsysteem met één gigabyte fysiek geheugen werd - succes behaald met de volgende opties, die in het bestand - /boot/loader.conf geplaatst dienen te - worden, waarna het systeem opnieuw moet worden - opgestart: + worden vergroot op alle &os; architecturen. Op het + testsysteem met één gigabyte fysiek geheugen werd + succes behaald met de volgende opties, die in het bestand + /boot/loader.conf geplaatst dienen te + worden, waarna het systeem opnieuw moet worden + opgestart: vm.kmem_slze="330M" vm.kmem_size_max="330M" @@ -221,9 +223,9 @@ Gebruik maken van <acronym>ZFS</acronym> Er is een opstartmechanisme dat &os; in staat stelt om - ZFS pools te mounten tijdens initialisatie van - het systeem. Voer de volgende commando's uit om dit in te - stellen: + ZFS pools te mounten tijdens initialisatie van + het systeem. Voer de volgende commando's uit om dit in te + stellen: &prompt.root; echo 'zfs_enable="YES"' >> /etc/rc.conf &prompt.root; /etc/rc.d/zfs start @@ -248,7 +250,7 @@ &prompt.root; zpool create example /dev/da0 Bestudeer de uitvoer van het commando - df om de nieuwe pool te zien: + df om de nieuwe pool te zien: &prompt.root; df Filesystem 1K-blocks Used Avail Capacity Mounted on @@ -274,25 +276,25 @@ -rw-r--r-- 1 root wheel 0 Aug 29 23:15 testfile Helaas benut deze pool nog geen - ZFS-mogelijkheden. Maak een bestandssysteem - aan op deze pool en activeer er compressie op: + ZFS-mogelijkheden. Maak een bestandssysteem + aan op deze pool en activeer er compressie op: &prompt.root; zfs create example/compressed &prompt.root; zfs set compression=gzip example/compressed example/compressed is nu een - gecomprimeerd ZFS-bestandssysteem. Probeer - er een paar grote bestanden naartoe te kopiëren door ze - naar /example/compressed - te kopiëren. + gecomprimeerd ZFS-bestandssysteem. Probeer + er een paar grote bestanden naartoe te kopiëren door ze + naar /example/compressed + te kopiëren. De compressie kan nu worden uitgeschakeld met: &prompt.root; zfs set compression=off example/compressed Voer het volgende commando uit om het bestandssysteem te - unmounten, en controleer dat daarna met - df: + unmounten, en controleer dat daarna met + df: &prompt.root; zfs umount example/compressed &prompt.root; df @@ -303,8 +305,8 @@ example 17547008 0 17547008 0% /example Mount het bestandssysteem opnieuw om het weer - toegankelijk te maken en controleer met - df: + toegankelijk te maken en controleer met + df: &prompt.root; zfs mount example/compressed &prompt.root; df @@ -316,7 +318,7 @@ example/compressed 17547008 0 17547008 0% /example/compressed De pool en het bestandssysteem zijn ook zichtbaar in de - uitvoer van mount: + uitvoer van mount: &prompt.root; mount /dev/ad0s1a on / (ufs, local) From remko at FreeBSD.org Thu Jan 1 17:41:56 2009 From: remko at FreeBSD.org (Remko Lodder) Date: Thu Jan 1 17:42:04 2009 Subject: PERFORCE change 155559 for review Message-ID: <200901011741.n01Hfscd064994@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155559 Change 155559 by remko@remko_nakur on 2009/01/01 17:41:01 Bump copyright year because we are going to touch the book with the import of the filesystems chapter by Wouter. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/book.sgml#9 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/book.sgml#9 (text+ko) ==== @@ -81,6 +81,7 @@ 2006 2007 2008 + 2009 The &os; Dutch Documentation Project From mayur.shardul at gmail.com Thu Jan 1 19:23:17 2009 From: mayur.shardul at gmail.com (Mayur) Date: Thu Jan 1 19:23:23 2009 Subject: PERFORCE change 155554 for review In-Reply-To: <20090101141833.GF1176@hoeg.nl> References: <200901011408.n01E8GYU036190@repoman.freebsd.org> <20090101141833.GF1176@hoeg.nl> Message-ID: <2ac427a0901011055x7e561f12w338efac38e6c5e71@mail.gmail.com> Hi Ed, This work is not targeted to reduce the contention but this seems an interesting problem. Will look in to it. -- Mayur On Thu, Jan 1, 2009 at 6:18 AM, Ed Schouten wrote: > Hello Mayur, > > I don't know a lot about our VM subsystem, but I've got a question about > your work. Some time ago I ran a `buildkernel' with lock profiling > enabled and saw the following results (sorted by `wait_total'): > > http://80386.nl/files/lock-profiling-buildkernel.txt > > It seems to me that the "vm page queue mutex" is clearly one of the most > contended locks inside the kernel. Is your work also targeted to reduce > this contention? > > Happy 2009! > > -- > Ed Schouten > WWW: http://80386.nl/ > From remko at FreeBSD.org Thu Jan 1 19:58:18 2009 From: remko at FreeBSD.org (Remko Lodder) Date: Thu Jan 1 19:58:24 2009 Subject: PERFORCE change 155561 for review Message-ID: <200901011958.n01JwGld077130@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155561 Change 155561 by remko@remko_nakur on 2009/01/01 19:58:11 Reviewed, ready for commit Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#6 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#7 integrate .. //depot/projects/docproj_nl/www/en/community/social.xsl#4 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#10 integrate Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#6 (text+ko) ==== @@ -132,8 +132,8 @@ Het Z File System, ontwikkeld door &sun;, is een nieuwe technologie ontwikkeld om gebruik te maken van een - pool-gebaseerde opslagmethode. Dit houdt in dat ruimte pas - wordt gebruikt wanneer het nodig is voor dataopslag. Verder is + pool-gebaseerde opslagmethode. Dit houdt in dat ruimte pas + wordt gebruikt wanneer het nodig is voor dataopslag. Verder is het ontworpen voor maximale integriteit van gegevens, ondersteuning van gegevens-snapshots, meerdere kopieën, en gegevenschecksums. Ook is een nieuw gegevensreplicatiemodel, @@ -231,7 +231,7 @@ &prompt.root; /etc/rc.d/zfs start In het resterende deel van dit document wordt aangenomen - dat twee SCSI-schijven beschikbaar zijn, + dat er twee SCSI-schijven beschikbaar zijn, en dat hun apparaatnamen respectievelijk da0 en da1 zijn. @@ -394,7 +394,7 @@ De storage zpool zou gecreëerd moeten zijn. Dit kan worden geverifieerd met de - &man.mount.8; en &man.df.1; commando's zoals eerder. Er + &man.mount.8; en &man.df.1; commando's zoals eerder. Er kunnen meer schijfapparaten worden toegewezen door ze aan het einde van de bovenstaande lijst toe te voegen. Maak een nieuw bestandssysteem in de pool, genaamd @@ -573,7 +573,7 @@ Zoals eerder opgemerkt gebruikt ZFS checksums om de integriteit van opgeslagen gegevens te verifiëren. Ze worden automatisch - ingeschakeld bij het creëren van bestandssystemen en + ingeschakeld bij het creëeren van bestandssystemen en kunnen worden uitgeschakeld door middel van het volgende commando: @@ -581,12 +581,12 @@ Dit is echter geen verstandig idee, omdat checksums zeer weinig opslagruimte innemen en nuttiger zijn wanneer ze zijn - ingeschakeld. Het lijkt daarnaast ook geen merkbare invloed + ingeschakeld. Het lijkt daarnaast ook geen merkbare invloed op de prestaties te hebben wanneer ze zijn ingeschakeld. Wanneer ze aanstaan is het mogelijk om ZFS gegevensintegriteit te laten controleren door middel van checksum-verificatie. Dit proces staat bekend als - scrubbing. Voer het volgende commando uit om + scrubbing. Voer het volgende commando uit om de gegevensintegriteit van de storage-pool te controleren: ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#15 (text+ko) ==== ==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#7 (text+ko) ==== @@ -1,7 +1,7 @@ + @@ -64,6 +64,15 @@ +

Blog Activity

+ +

Posts that contain FreeBSD per day for the last 90 days.
Technorati Chart +

+
==== //depot/projects/docproj_nl/www/en/releng/index.sgml#10 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -48,13 +48,13 @@ - December 2008 + January 2009 FreeBSD 7.1   - February 2009 + To be defined FreeBSD 7.2   From rene at FreeBSD.org Thu Jan 1 22:19:42 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Thu Jan 1 22:19:48 2009 Subject: PERFORCE change 155567 for review Message-ID: <200901012219.n01MJf34000998@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155567 Change 155567 by rene@rene_self on 2009/01/01 22:19:10 IFC Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/www/share/sgml/header.ent#2 integrate Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#7 (text+ko) ==== @@ -1,6 +1,6 @@ + @@ -11,7 +11,7 @@ Site Map | - Legal Notices | © 1995-2008 The FreeBSD Project. + Legal Notices | © 1995-2009 The FreeBSD Project. All rights reserved.'> home   |   contact   |   legal   |   ©right;'> From rene at FreeBSD.org Fri Jan 2 00:18:44 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Fri Jan 2 00:18:50 2009 Subject: PERFORCE change 155571 for review Message-ID: <200901020018.n020IgM6015400@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155571 Change 155571 by rene@rene_self on 2009/01/02 00:18:38 IFC Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#7 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#12 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#10 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#13 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/Makefile#14 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/book.sgml#10 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/chapters.ent#9 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#10 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#12 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#12 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#9 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/preface/preface.sgml#13 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.sgml#9 integrate Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#7 (text+ko) ==== @@ -1,5 +1,5 @@ ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#12 (text+ko) ==== @@ -1,4 +1,4 @@ - + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#10 (text+ko) ==== @@ -1,4 +1,4 @@ - + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#13 (text+ko) ==== @@ -1,5 +1,5 @@ ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/Makefile#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.14 2008/11/16 20:50:17 rene Exp $ +# $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.15 2009/01/01 22:50:49 rene Exp $ # $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.19 2006/01/03 21:17:07 siebrand Exp $ # # %SOURCE% en_US.ISO8859-1/books/handbook/Makefile ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/book.sgml#10 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -207,7 +207,7 @@ worden, waarna het systeem opnieuw moet worden opgestart: - vm.kmem_slze="330M" + vm.kmem_size="330M" vm.kmem_size_max="330M" vfs.zfs.arc_max="40M" vfs.zfs.vdev.cache.size="5M" @@ -618,8 +618,8 @@ zichtbaar. Deze eigenschap helpt om gegevensintegriteit te garanderen gedurende een langere tijdsperiode. - Er zijn vele andere opties for het Z-bestandssysteem, zie - de &man.zfs.8; en &man.zpool.8; manualpagina's. + Er zijn vele andere opties voor het Z-bestandssysteem, zie + de handleidingpagina's &man.zfs.8; en &man.zpool.8;. From rene at FreeBSD.org Fri Jan 2 16:06:53 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Fri Jan 2 16:07:00 2009 Subject: PERFORCE change 155580 for review Message-ID: <200901021606.n02G6oA0058211@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155580 Change 155580 by rene@rene_self on 2009/01/02 16:06:33 MFen handbook/cutting-edge 1.233 -> 1.234 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#11 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#11 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.47 2006/01/07 11:27:42 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml - %SRCID% 1.233 + %SRCID% 1.234 --> @@ -332,18 +332,55 @@ de kernel of enige kernelmodule is gewijzigd. Dit stelt &os; in staat om de nieuwe binairen in het geheugen te laden. + Het gereedschap freebsd-update kan alleen + de kernel GENERIC automatisch bijwerken. Als + een eigen kernel wordt gebruikt, moet het herbouwd en + geherinstalleerd worden nadat freebsd-update + klaar is met het installeren de rest van de updates. + freebsd-update zal echter de kernel + GENERIC in /boot/GENERIC detecteren en + bijwerken (als het bestaat), zelfs als het niet de huidige + (draaiende) kernel van het systeem is. + + + Het is een goed idee om altijd een kopie van de kernel + GENERIC in /boot/GENERIC te bewaren. Het + kan van pas komen bij het vaststellen van een keur aan + problemen, en bij het uitvoeren van versie-upgrades met + freebsd-update zoals beschreven in sectie + . + + + Tenzij de standaardconfiguratie in + /etc/freebsd-update.conf is gewijzigd, zal + freebsd-update de bijgewerkte kernelbronnen + samen met de rest van de updates installeren. Het herbouwen en + herinstalleren van uw nieuwe eigen kernel kan daarna op de + gebruikelijke manier gedaan worden. + - De freebsd-update werkt alleen met de - kernel GENERIC. Als er wijzigingen aan - de kernel GENERIC zijn gemaakt of er een - eigen kernel is geïnstalleerd, wordt - freebsd-update niet voltooid — - het zal falen in het eerste geval en een fout produceren in - het laatste. + De updates die via freebsd-update + verspreid worden hebben niet altijd betrekking op de kernel. + Het is niet nodig om uw eigen kernel te herbouwen als de + kernelbronnen niet zijn aangepast door het uitvoeren van + freebsd-update install. + freebsd-update install zal echter altijd + het bestand /usr/src/sys/conf/newvers.sh + bijwerken. Het huidige patchniveau (zoals aangegeven door het + -p-nummer gerapporteerd door uname + -r) wordt uit dit bestand gehaald. Het herbouwen + van uw eigen kernel, zelfs als er niets veranderd is, stelt + &man.uname.1; in staat om het huidige patchniveau van het + systeem accuraat te rapporteren. Dit is in het bijzonder + behulpzaam wanneer meerdere systemen onderhouden worden, + aangezien hierdoor snel de geïnstalleerde updates op elk + ervan kunnen worden nagegaan. - + Grote en kleine upgrades Dit proces ruimt oude objectbestanden en bibliotheken op @@ -364,12 +401,69 @@ proces, waardoor het niet nodig is om handmatig in het bouwproces in te grijpen. + Als een eigen kernel wordt gebruikt, is het upgradeproces + iets ingewikkelder. Een kopie van de kernel + GENERIC is nodig en dient in /boot/GENERIC geplaatst te + worden. Als de kernel GENERIC niet reeds op + het systeem aanwezig is, moet het met één van de + volgende methoden verkregen worden: + + + + Als er slechts eenmaal een eigen kernel is gebouwd, dan + is de kernel in /boot/kernel.old eigenlijk de + GENERIC. Hernoem deze map naar /boot/GENERIC. + + + + Aannemende dat fysieke toegang tot de machine mogelijk + is, kan een kopie van de kernel GENERIC + van het CD-ROM-medium worden geïnstalleerd. Laad de + installatieschijf en geef de volgende commando's: + + &prompt.root; mount /cdrom +&prompt.root; cd /cdrom/X.Y-RELEASE/kernels +&prompt.root; ./install.sh GENERIC + + Vervang X.Y-RELEASE + met de versie van de uitgave die u gebruikt. De kernel + GENERIC zal standaard in /boot/GENERIC worden + geïnstalleerd. + + + + Als al het bovenstaande niet lukt, kan de kernel + GENERIC herbouwd en geherinstalleerd + worden vanaf de broncode: + + &prompt.root; cd /usr/src +&prompt.root; env DESTDIR=/boot/GENERIC make kernel +&prompt.root; mv /boot/GENERIC/boot/kernel/* /boot/GENERIC +&prompt.root; rm -rf /boot/GENERIC/boot + + Om deze kernel door freebsd-update + als GENERIC te laten herkennen, mag het + configuratiebestand voor GENERIC niet op + enige wijze veranderd zijn. Het is ook aan te raden dat het + zonder andere speciale opties wordt gebouwd (bij voorkeur + met een leeg /etc/make.conf). + + + + Opnieuw opstarten naar de kernel GENERIC + is in dit stadium niet nodig. + Updates van grote en kleine versies kunnen worden uitgevoerd door een uitgaveversie als doel aan freebsd-update op te geven, het volgende - commando zal bijvoorbeeld updaten naar &os; 6.3: + commando zal bijvoorbeeld updaten naar &os; 6.4: - &prompt.root; freebsd-update -r 6.3-RELEASE upgrade + &prompt.root; freebsd-update -r 6.4-RELEASE upgrade Nadat het commando is ontvangen, zal freebsd-update het instellingenbestand en het @@ -379,7 +473,7 @@ en welke niet. Bijvoorbeeld: Looking up update.FreeBSD.org mirrors... 1 mirrors found. -Fetching metadata signature for 6.3-BETA1 from update1.FreeBSD.org... done. +Fetching metadata signature for 6.3-RELEASE from update1.FreeBSD.org... done. Fetching metadata index... done. Inspecting system... done. @@ -400,6 +494,19 @@ sommige gevallen kan de gebruiker worden gevraagd wat te installeren of hoe verder te gaan. + Wanneer een eigen kernel wordt gebruikt, zal de bovenstaande + stap een waarschuwing geven die lijkt op de volgende: + + WARNING: This system is running a "MIJNKERNEL" kernel, which is not a +kernel configuration distributed as part of FreeBSD 6.3-RELEASE. +This kernel will not be updated: you MUST update the kernel manually +before running "/usr/sbin/freebsd-update install" + + Deze waarschuwing kan op dit moment veilig worden + genegeerd. De bijgewerkte kernel GENERIC + zal als tussenliggende stap in het upgradeproces worden + gebruikt. + Nadat alle patches zijn gedownload naar het plaatselijke systeem zullen ze worden toegepast. Dit proces kan afhankelijk van de snelheid en werklast van de machine even duren. Hierna @@ -431,9 +538,34 @@ &prompt.root; freebsd-update install De kernel en kernelmodules zullen als eerste gepatcht - worden. Nu moet de machine opnieuw opgestart worden. Het - volgende commando kan gegeven worden om de machine te herstarten - en dus de nieuwe kernel in het geheugen te laden: + worden. Nu moet de machine opnieuw opgestart worden. Als het + systeem een eigen kernel draaide, gebruik dan het commando + &man.nextboot.8; om de kernel voor de volgende keer dat + opgestart wordt in te stellen op /boot/GENERIC (welke is + bijgewerkt): + + &prompt.root; nextboot -k GENERIC + + + Voordat er met de kernel GENERIC wordt + opgestart, dient te worden gecontroleerd dat het alle + stuurprogramma's bevat om uw systeem juist te laten opstarten + (en met het netwerk te verbinden, als de machine die + bijgewerkt wordt van afstand wordt benaderd). In het + bijzonder, als de vorige kernel die draaide ingebouwde + functionaliteit bevatte die normaalgesproken door + kernelmodules wordt geleverd, zorg er dan voor dat deze + modules tijdelijk in de kernel GENERIC + worden geladen door de faciliteit + /boot/loader.conf te gebruiken. U kunt + er ook voor kiezen om niet-essentiële diensten, schijf- + en netwerkkoppelingen, enzovoorts uit te zetten totdat het + upgradeproces voltooid is. + + + De machine dient nu te worden herstart met de bijgewerkte + kernel: &prompt.root; shutdown -r now @@ -475,6 +607,10 @@ &prompt.root; freebsd-update install + Als de kernel GENERIC tijdelijk werd + gebruikt, is dit het moment om een nieuwe eigen kernel op de + gebruikelijke manier te bouwen en installeren. + Start de machine opnieuw op in de nieuwe &os;-versie. Het proces is voltooid. From rene at FreeBSD.org Fri Jan 2 16:37:23 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Fri Jan 2 16:37:29 2009 Subject: PERFORCE change 155581 for review Message-ID: <200901021637.n02GbLpv060992@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155581 Change 155581 by rene@rene_self on 2009/01/02 16:36:30 MFen handbook/cutting-edge 1.234 -> 1.235 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#12 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#12 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.47 2006/01/07 11:27:42 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml - %SRCID% 1.234 + %SRCID% 1.235 --> @@ -349,7 +349,7 @@ class="directory">/boot/GENERIC te bewaren. Het kan van pas komen bij het vaststellen van een keur aan problemen, en bij het uitvoeren van versie-upgrades met - freebsd-update zoals beschreven in sectie + freebsd-update zoals beschreven in . From rene at FreeBSD.org Fri Jan 2 16:45:32 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Fri Jan 2 16:45:39 2009 Subject: PERFORCE change 155582 for review Message-ID: <200901021645.n02GjUjB061680@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155582 Change 155582 by rene@rene_self on 2009/01/02 16:45:12 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/book.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#9 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#10 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/book.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ 2006 2007 2008 + 2009 The FreeBSD Documentation Project ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -294,17 +294,51 @@ or any kernel modules were modified. This will allow &os; to load the new binaries into memory. + The freebsd-update utility can + automatically update the GENERIC kernel only. + If a custom kernel is in use, it will have to be rebuilt and + reinstalled after freebsd-update finishes + installing the rest of the updates. However, + freebsd-update will detect and update the + GENERIC kernel in /boot/GENERIC (if it exists), even if + it is not the current (running) kernel of the system. + + + It is a good idea to always keep a copy of the + GENERIC kernel in /boot/GENERIC. It will be helpful + in diagnosing a variety of problems, and in performing version + upgrades using freebsd-update as described in + section . + + + Unless the default configuration in + /etc/freebsd-update.conf has been changed, + freebsd-update will install the updated kernel + sources along with the rest of the updates. Rebuilding and + reinstalling your new custom kernel can then be performed in the usual + way. + - The freebsd-update only works with - the GENERIC kernel. If any changes have - been made to GENERIC or a custom kernel - has been installed, freebsd-update will - not complete — failing in the former case and - producing an error in the latter. + The updates distributed via freebsd-update, + do not always involve the kernel. It will not be necessary to + rebuild your custom kernel if the kernel sources have not been + modified by the execution of + freebsd-update install. However, + freebsd-update will always update the + /usr/src/sys/conf/newvers.sh file. The current + patch level (as indicated by the -p number + reported by uname -r) is + obtained from this file. Rebuilding your custom kernel, even if + nothing else changed, will allow &man.uname.1; to accurately report + the current patch level of the system. This is particularly + helpful when maintaining multiple systems, as it allows for a quick + assessment of the updates installed in each one. - + Major and Minor Upgrades This process will remove old object files and @@ -324,12 +358,66 @@ any prompts during this process, removing the need for manual intervention during the build process. + If a custom kernel is in use, the upgrade process is slightly + more involved. A copy of the GENERIC kernel is + needed, and it should be placed in /boot/GENERIC. If the + GENERIC kernel is not already present in the + system, it may be obtained using one of the following methods: + + + + If a custom kernel has only been built once, the kernel in + /boot/kernel.old is + actually the GENERIC one. Simply rename this + directory to + /boot/GENERIC. + + + + Assuming physical access to the machine is possible, a copy + of the GENERIC kernel can be installed from + the CD-ROM media. Insert your installation disc and use the + following commands: + + &prompt.root; mount /cdrom +&prompt.root; cd /cdrom/X.Y-RELEASE/kernels +&prompt.root; ./install.sh GENERIC + + Replace X.Y-RELEASE + with the actual version of the release you are using. The + GENERIC kernel will be installed in /boot/GENERIC by default. + + + + Failing all the above, the GENERIC kernel + may be rebuilt and installed from the sources: + + &prompt.root; cd /usr/src +&prompt.root; env DESTDIR=/boot/GENERIC make kernel +&prompt.root; mv /boot/GENERIC/boot/kernel/* /boot/GENERIC +&prompt.root; rm -rf /boot/GENERIC/boot + + For this kernel to be picked up as GENERIC + by freebsd-update, the + GENERIC configuration file must not have been + modified in any way. It is also suggested that it is built + without any other special options (preferably with an empty + /etc/make.conf). + + + + Rebooting to the GENERIC kernel is not + required at this stage. + Major and minor version updates may be performed by providing freebsd-update with a release version target, for example, the following command will - update to &os; 6.3: + update to &os; 6.4: - &prompt.root; freebsd-update -r 6.3-RELEASE upgrade + &prompt.root; freebsd-update -r 6.4-RELEASE upgrade After the command has been received, freebsd-update will evaluate the @@ -339,7 +427,7 @@ what components have not been detected. For example: Looking up update.FreeBSD.org mirrors... 1 mirrors found. -Fetching metadata signature for 6.3-BETA1 from update1.FreeBSD.org... done. +Fetching metadata signature for 6.3-RELEASE from update1.FreeBSD.org... done. Fetching metadata index... done. Inspecting system... done. @@ -360,6 +448,18 @@ some cases, the user may be prompted with questions regarding what to install or how to proceed. + When using a custom kernel, the above step will produce a warning + similar to the following: + + WARNING: This system is running a "MYKERNEL" kernel, which is not a +kernel configuration distributed as part of FreeBSD 6.3-RELEASE. +This kernel will not be updated: you MUST update the kernel manually +before running "/usr/sbin/freebsd-update install" + + This warning may be safely ignored at this point. The updated + GENERIC kernel will be used as an intermediate + step in the upgrade process. + After all patches have been downloaded to the local system, they will then be applied. This process may take a while depending on the speed and workload of the machine. @@ -388,9 +488,28 @@ &prompt.root; freebsd-update install The kernel and kernel modules will be patched first. At - this point the machine must be rebooted. The following - command may be issued to restart the machine so the new - kernel will be loaded into memory: + this point the machine must be rebooted. If the system was running + with a custom kernel, use the &man.nextboot.8; command to set the + kernel for the next boot to /boot/GENERIC (which was + updated): + + &prompt.root; nextboot -k GENERIC + + + Before rebooting with the GENERIC kernel, + make sure it contains all drivers required for your system to boot + properly (and connect to the network, if the machine that is being + updated is accessed remotely). In particular, if the previously + running custom kernel contained built-in functionality usually + provided by kernel modules, make sure to temporarily load these + modules into the GENERIC kernel using the + /boot/loader.conf facility. You may also wish + to disable non-essential services, disk and network mounts, etc. + until the upgrade process is complete. + + + The machine should now be restarted with the updated kernel: &prompt.root; shutdown -r now @@ -431,6 +550,10 @@ &prompt.root; freebsd-update install + If the GENERIC kernel was temporarily used, + this is the time to build and install a new custom kernel in the + usual way. + Reboot the machine into the new &os; version. The process is complete. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#9 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -310,7 +310,7 @@ class="directory">/boot/GENERIC. It will be helpful in diagnosing a variety of problems, and in performing version upgrades using freebsd-update as described in - section . + . Unless the default configuration in ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ ]> -
+
FreeBSD and Solid State Devices @@ -51,8 +54,6 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/solid-state/article.sgml,v 1.13 2004/11/29 21:43:34 ceri Exp $ - 2001 The FreeBSD Documentation Project @@ -83,6 +84,8 @@ and building filesystems from scratch. The article will conclude with some general strategies for small and read-only FreeBSD environments. + + Vertaald door René Ladan. From rene at FreeBSD.org Sat Jan 3 20:29:50 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Sat Jan 3 20:29:55 2009 Subject: PERFORCE change 155596 for review Message-ID: <200901032029.n03KTlp1040519@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155596 Change 155596 by rene@rene_self on 2009/01/03 20:29:43 Translate legalnotice.sgml *** Review of a legal person is highly recommended before this file is committed into the CVS repository. *** Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/legalnotice.sgml#2 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/legalnotice.sgml#2 (text+ko) ==== @@ -1,44 +1,49 @@ - - Redistribution and use in source (SGML DocBook) and 'compiled' - forms (SGML, HTML, PDF, PostScript, RTF and so forth) with or without - modification, are permitted provided that the following conditions are - met: + Herdistributie en gebruik in bronvorm (SGML DocBook) en + gecompileerde vormen (SGML, HTML, PDF, PostScript, + RTF enzovoorts) met of zonder wijzigingen, zijn toegestaan gegeven + dat aan de volgende voorwaarden is voldaan: - Redistributions of source code (SGML DocBook) must retain the - above copyright notice, this list of conditions and the following - disclaimer as the first lines of this file unmodified. + Herdistributies van broncode (SGML DockBook) moeten de + bovenstaande copyright-notitie, deze lijst van voorwaarden en + het volgende vrijtekeningsbeding ongewijzigd als de eerste + regels van dit bestand behouden. - Redistributions in compiled form (transformed to other DTDs, - converted to PDF, PostScript, RTF and other formats) must - reproduce the above copyright notice, this list of conditions and - the following disclaimer in the documentation and/or other - materials provided with the distribution. + Herdistributies in gecompileerde vorm (getransformeerd naar + andere DTD's, omgezet naar PDF, PostScript, RTF en andere + formaten) moeten de bovenstaande copyright-notitie, deze lijst + van voorwaarden en het volgende vrijtekeningsbeding in de + documentatie en/of andere materialen geleverd met de distributie + reproduceren. - THIS DOCUMENTATION IS PROVIDED BY THE FREEBSD DOCUMENTATION - PROJECT "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, - BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - THE FREEBSD DOCUMENTATION PROJECT BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - DAMAGE. + DEZE DOCUMENTATIE WORDT DOOR HET FREEBSD DOCUMENTATION PROJECT + "ALS ZODANIG" EN ENIGE GEUITE OF GEIMPLICEERDE GARANTIES, + INCLUSIEF, MAAR NIET BEPERKT TOT, DE GEIMPLICEERDE GARANTIES VAN + VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD DOEL ZIJN + VERWORPEN. IN GEEN GEVAL ZAL HET FREEBSD DOCUMENTATIE PROJECT + AANSPRAKELIJK ZIJN VOOR ENIGE DIRECTE, INDIRECTE, INCIDENTELE, + SPECIALE, EXEMPLARISCHE, OF CONSEQUENTIELE SCHADE (INCLUSIEF, MAAR + NIET BEPERKT TOT, VERSCHAFFING VAN VERVANGENDE GOEDEREN OF + DIENSTEN; VERLIES VAN GEBRUIK, GEGEVENS, OF WINST; OF + BEDRIJFSONDERBREKING) ECHTER VEROORZAAKT EN IN ENIGE THEORIE VAN + AANSPRAKELIJKHEID, HETZIJ IN CONTRACT, STRIKTE AANSPRAKELIJKHEID, + OF ONRECHTMATIGE DAAD (INCLUSIEF VERWAARLOZING OF ANDERSWIJS) DIE + OP ENIGE WIJZE UIT HET GEBRUIK VAN DEZE DOCUMENTATIE ONTSTAAN, + ZELFS INDIEN GEADVISEERD OVER DE MOGELIJKHEID VAN ZULKE SCHADE. - From rene at FreeBSD.org Sat Jan 3 21:44:04 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Sat Jan 3 21:44:10 2009 Subject: PERFORCE change 155597 for review Message-ID: <200901032144.n03Li3tk056864@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155597 Change 155597 by rene@rene_self on 2009/01/03 21:43:10 Fix some nits, lines wrapped. *** Still do not commit this file, it might contain legal errors *** Obtained from: ed@ Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/legalnotice.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/legalnotice.sgml#3 (text+ko) ==== @@ -9,22 +9,22 @@ Herdistributie en gebruik in bronvorm (SGML DocBook) en gecompileerde vormen (SGML, HTML, PDF, PostScript, - RTF enzovoorts) met of zonder wijzigingen, zijn toegestaan gegeven + RTF enzovoorts) met of zonder wijzigingen, zijn toegestaan, gegeven dat aan de volgende voorwaarden is voldaan: - Herdistributies van broncode (SGML DockBook) moeten de - bovenstaande copyright-notitie, deze lijst van voorwaarden en + Herdistributies van broncode (SGML DocBook) moeten de + bovenstaande copyright-vermelding, deze lijst van voorwaarden en het volgende vrijtekeningsbeding ongewijzigd als de eerste regels van dit bestand behouden. Herdistributies in gecompileerde vorm (getransformeerd naar - andere DTD's, omgezet naar PDF, PostScript, RTF en andere - formaten) moeten de bovenstaande copyright-notitie, deze lijst - van voorwaarden en het volgende vrijtekeningsbeding in de + andere DTD's, omgezet in PDF, PostScript, RTF en andere + formaten) moeten de bovenstaande copyright-vermelding, deze + lijst van voorwaarden en het volgende vrijtekeningsbeding in de documentatie en/of andere materialen geleverd met de distributie reproduceren. @@ -32,18 +32,19 @@ DEZE DOCUMENTATIE WORDT DOOR HET FREEBSD DOCUMENTATION PROJECT - "ALS ZODANIG" EN ENIGE GEUITE OF GEIMPLICEERDE GARANTIES, - INCLUSIEF, MAAR NIET BEPERKT TOT, DE GEIMPLICEERDE GARANTIES VAN - VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD DOEL ZIJN - VERWORPEN. IN GEEN GEVAL ZAL HET FREEBSD DOCUMENTATIE PROJECT - AANSPRAKELIJK ZIJN VOOR ENIGE DIRECTE, INDIRECTE, INCIDENTELE, - SPECIALE, EXEMPLARISCHE, OF CONSEQUENTIELE SCHADE (INCLUSIEF, MAAR - NIET BEPERKT TOT, VERSCHAFFING VAN VERVANGENDE GOEDEREN OF - DIENSTEN; VERLIES VAN GEBRUIK, GEGEVENS, OF WINST; OF - BEDRIJFSONDERBREKING) ECHTER VEROORZAAKT EN IN ENIGE THEORIE VAN - AANSPRAKELIJKHEID, HETZIJ IN CONTRACT, STRIKTE AANSPRAKELIJKHEID, - OF ONRECHTMATIGE DAAD (INCLUSIEF VERWAARLOZING OF ANDERSWIJS) DIE - OP ENIGE WIJZE UIT HET GEBRUIK VAN DEZE DOCUMENTATIE ONTSTAAN, - ZELFS INDIEN GEADVISEERD OVER DE MOGELIJKHEID VAN ZULKE SCHADE. + ALS ZODANIG EN ENIGE GEÜITE OF + GEÏMPLICEERDE GARANTIES, INCLUSIEF, MAAR NIET BEPERKT TOT, DE + GEÏMPLICEERDE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID + VOOR EEN BEPAALD DOEL ZIJN VERWORPEN. IN GEEN GEVAL ZAL HET + FREEBSD DOCUMENTATIE PROJECT AANSPRAKELIJK ZIJN VOOR ENIGE + DIRECTE, INDIRECTE, INCIDENTELE, SPECIALE, EXEMPLARISCHE, OF + CONSEQUENTIELE SCHADE (INCLUSIEF, MAAR NIET BEPERKT TOT, + VERSCHAFFING VAN VERVANGENDE GOEDEREN OF DIENSTEN; VERLIES VAN + GEBRUIK, GEGEVENS, OF WINST; OF BEDRIJFSONDERBREKING) ECHTER + VEROORZAAKT EN IN ENIGE THEORIE VAN AANSPRAKELIJKHEID, HETZIJ IN + CONTRACT, STRIKTE AANSPRAKELIJKHEID, OF ONRECHTMATIGE DAAD + (INCLUSIEF VERWAARLOZING OF ANDERSWIJS) DIE OP ENIGE WIJZE UIT HET + GEBRUIK VAN DEZE DOCUMENTATIE ONTSTAAN, ZELFS INDIEN GEADVISEERD + OVER DE MOGELIJKHEID VAN ZULKE SCHADE. From rene at FreeBSD.org Sat Jan 3 22:33:55 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Sat Jan 3 22:34:01 2009 Subject: PERFORCE change 155598 for review Message-ID: <200901032233.n03MXrDd061531@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155598 Change 155598 by rene@rene_self on 2009/01/03 22:33:31 Add missing word to legalnotice.sgml, replace 'copyright' with 'auteursrecht'. *** Do not commit *** Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/legalnotice.sgml#4 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/legalnotice.sgml#4 (text+ko) ==== @@ -15,15 +15,15 @@ Herdistributies van broncode (SGML DocBook) moeten de - bovenstaande copyright-vermelding, deze lijst van voorwaarden en - het volgende vrijtekeningsbeding ongewijzigd als de eerste + bovenstaande auteursrechtvermelding, deze lijst van voorwaarden + en het volgende vrijtekeningsbeding ongewijzigd als de eerste regels van dit bestand behouden. Herdistributies in gecompileerde vorm (getransformeerd naar andere DTD's, omgezet in PDF, PostScript, RTF en andere - formaten) moeten de bovenstaande copyright-vermelding, deze + formaten) moeten de bovenstaande auteursrechtvermelding, deze lijst van voorwaarden en het volgende vrijtekeningsbeding in de documentatie en/of andere materialen geleverd met de distributie reproduceren. @@ -32,7 +32,7 @@ DEZE DOCUMENTATIE WORDT DOOR HET FREEBSD DOCUMENTATION PROJECT - ALS ZODANIG EN ENIGE GEÜITE OF + ALS ZODANIG GELEVERD EN ENIGE GEÜITE OF GEÏMPLICEERDE GARANTIES, INCLUSIEF, MAAR NIET BEPERKT TOT, DE GEÏMPLICEERDE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD DOEL ZIJN VERWORPEN. IN GEEN GEVAL ZAL HET From trasz at FreeBSD.org Sun Jan 4 01:37:06 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Sun Jan 4 01:37:14 2009 Subject: PERFORCE change 155601 for review Message-ID: <200901040137.n041b1Lu091241@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155601 Change 155601 by trasz@trasz_victim7 on 2009/01/04 01:36:09 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/COPYRIGHT#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/CHANGES#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/FAQ#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/aclocal.m4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/nsupdate.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/nsupdate.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/config.h.in#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/configure.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/sort-options.pl#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4648.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4701.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc5155.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/platform.h.in#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/portset.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/resource.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/portset.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/app.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/resource.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/socket_p.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/version#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/Makefile.am#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/NEWS#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/README#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/TODO#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/VERSION#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/audit/Makefile.am#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/audit/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/audit/audit.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/Makefile.am#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/audit_warn.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd_darwin.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd_fbsd.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditfilterd/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditreduce/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/praudit/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/Makefile.am#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/audit_uevents.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/auditd_lib.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/config/config.h.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/configure#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libauditd/Makefile.am#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libauditd/Makefile.in#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libauditd/auditd_lib.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/Makefile.am#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/au_errno.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/au_token.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/audit_submit.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_class.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_control.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_errno.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_event.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_mask.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_user.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_wrappers.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/man/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/man/audit.log.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/modules/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/modules/auditfilter_noop/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit_errno.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit_record.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/bsm/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/E2BIG_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EACCES_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EBADF_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EBUSY_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ECHILD_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EDEADLK_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EEXIST_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EFAULT_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EFBIG_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EINTR_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EINVAL_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EIO_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EISDIR_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EMFILE_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EMLINK_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENFILE_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENODEV_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOENT_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOEXEC_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOMEM_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOSPC_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOTBLK_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOTDIR_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOTTY_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENXIO_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EPERM_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EPIPE_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EROFS_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ESPIPE_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ESRCH_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ETXTBSY_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EXDEV_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/header32_token#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process32ex_record-IPv4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process32ex_record-IPv6#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process64_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process64ex_record-IPv4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process64ex_record-IPv6#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/return32_token#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/socketex_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/socketex_token#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/zonename_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/tools/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/devd.conf#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/devd/asus.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/man/manpath/manpath.config#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/Makefile#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/bind/config.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/bind/port_after.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/config.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/dns/code.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/dns/dns/enumclass.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/dns/dns/enumtype.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/dns/dns/rdatastruct.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/isc/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libauditd/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libbsm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/arm/_fpmath.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/arm/arith.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/include/fpmath.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/kinfo_getfile.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/kinfo_getvmmap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/math_private.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/ftpd/extern.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/ftpd/ftpcmd.y#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/ftpd/ftpd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ddb/ddb.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fsck_ffs/main.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_msdosfs/mount_msdosfs.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/savecore/savecore.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/shutdown/shutdown.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/doc/bind9/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/cpuctl.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ndis.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ng_ether_echo.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ng_tty.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/textdump.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/uscanner.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/domain.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.libnames.mk#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/USB2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/AVILA#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/EP80219#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/HL200#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/NSLU#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/armreg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/ieee.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/if_npereg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp435_ehci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_errno.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_internal.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_kevents.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_record.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_sim.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/usbd_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.ia64#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.powerpc#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.sparc64#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_asus.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp_i810.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfe/cfe_console.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scterm-dumb.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scterm-sc.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scterm-teken.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scterm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/sctermvar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/gensequences#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/sequences#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_demo.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_stress.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_subr.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_subr_compat.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_wcwidth.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci_ixp4xx.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehcivar.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_zyd.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/umass.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uscanner.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci_atmelarm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/musb2_otg.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/musb2_otg_atmelarm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2_atmelarm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_bus.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_controller.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci_atmelarm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_transfer.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_aue2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axe2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cue2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_kue2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_rue2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_udav2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/input/ukbd2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/input/ums2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ulpt2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rum2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_ural2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/console/console.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/netfront/netfront.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/procfs/procfs_map.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_bsd.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/USB2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/XEN#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/genassym.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/evtchn.h#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/hypervisor.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/xen_intr.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/xenfunc.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/npx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/clock.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/mp_machdep.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/mptable.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_machdep.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_xxx.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_ule.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_param.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_cache.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_export.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/elf64_machdep.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ndis/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/netgraph/ether_echo/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tun.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_hostap.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_wds.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ether.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ether_echo.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ether_echo.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipprotosw.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_input.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6_nbr.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/vipsec.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/cbus/scterm-sck.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/cbus/sctermvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_errno.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_token.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_pipe.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_process.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/tlb.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/copyright.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/elf64.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/elf_common.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/elf_generic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/file.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/link_elf.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/tree.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_map.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_map.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/evtchn.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/evtchn/evtchn.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/features.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/gnttab.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/gnttab.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/hypervisor.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xen_intr.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_client.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_comms.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_comms.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_dev.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_probe.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_probe_backend.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_xs.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbusvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ether_reflect/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ether_reflect/ether_reflect.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ether_reflect/ether_reflect.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/mctest/mctest.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/csplit/csplit.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/elf2aout/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/elf2aout/elf2aout.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/fstat/zfs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/gprof/gprof.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/for.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/job.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/job.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/main.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/make.1#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/make.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/parse.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/suff.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ncal/ncal.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ncal/ncal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/main.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/unix.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/nsupdate/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_args.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_basic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_bin.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_cred.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_files.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_kstack.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_threads.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_vm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/top/machine.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/arp/arp.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/auditd/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/burncd/burncd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cpucontrol/cpucontrol.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/gssd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mergemaster/mergemaster.sh#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ndiscvt/inf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ndiscvt/windrv_stub.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ndp/ndp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/nscd.conf.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/add/main.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/lib.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/plist.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmcstat/pmcstat.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/powerd/powerd.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sade/disks.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/disks.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/menus.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/syslogd/syslog.conf.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ugidfw/ugidfw.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbdevs/usbdevs.c#2 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/COPYRIGHT#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/COPYRIGHT,v 1.10 2008/11/28 19:21:10 imp Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.11 2008/12/30 04:46:25 imp Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (C) 1992-2008 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2009 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/soc2008/trasz_nfs4acl/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.355 2008/12/01 00:45:51 alfred Exp $ +# $FreeBSD: src/Makefile,v 1.356 2008/12/27 15:07:51 bz Exp $ # # The user-driven targets are: # @@ -298,7 +298,7 @@ .endif .for target in ${TARGETS} KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ - find [A-Z]*[A-Z] -type f -maxdepth 0 \ + find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} universe: universe_${target} ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.164 2008/11/30 11:03:16 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.165 2008/12/23 16:52:03 bz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20081223: ipprotosw.h removed +OLD_FILES+=usr/include/netinet/ipprotosw.h # 20081123: vfs_mountedon.9 removed OLD_FILES+=usr/share/man/man9/vfs_mountedon.9.gz # 20081023: FREE.9 and MALLOC.9 removed ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#15 (text+ko) ==== @@ -22,6 +22,12 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081225: + ng_tty(4) module updated to match the new TTY subsystem. + Due to API change, user-level applications must be updated. + New API support added to mpd5 CVS and expected to be present + in next mpd5.3 release. + 20081219: With __FreeBSD_version 800060 the makefs tool is part of the base system (it was a port). @@ -1195,4 +1201,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.556 2008/12/19 23:12:14 sam Exp $ +$FreeBSD: src/UPDATING,v 1.557 2008/12/25 10:05:00 mav Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 (text+ko) ==== @@ -146,6 +146,7 @@ #include #include +#include #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/CHANGES#4 (text+ko) ==== @@ -1,14 +1,158 @@ - --- 9.4.2-P2 released --- + + --- 9.4.3 released --- + +2490. [port] aix: work around a kernel bug where IPV6_RECVPKTINFO + is cleared when IPV6_V6ONLY is set. [RT #18785] + +2489. [port] solaris: Workaround Solaris's kernel bug about + /dev/poll: + http://bugs.opensolaris.org/view_bug.do?bug_id=6724237 + Define ISC_SOCKET_USE_POLLWATCH at build time to enable + this workaround. [RT #18870] + + --- 9.4.3rc1 released --- + +2473. [port] linux: raise the limit on open files to the possible + maximum value before spawning threads; 'files' + specified in named.conf doesn't seem to work with + threads as expected. [RT #18784] + +2472. [port] linux: check the number of available cpu's before + calling chroot as it depends on "/proc". [RT #16923] + +2471. [bug] named-checkzone was not reporting missing manditory + glue when sibling checks were disabled. [RT #18768] + +2469. [port] solaris: Work around Solaris's select() limitations. + [RT #18769] + +2468. [bug] Resolver could try unreachable servers multiple times. + [RT #18739] + +2467. [bug] Failure of fcntl(F_DUPFD) wasn't logged. [RT #18740] + +2466. [doc] ARM: explain max-cache-ttl 0 SERVFAIL issue. + [RT #18302] + +2465. [bug] Adb's handling of lame addresses was different + for IPv4 and IPv6. [RT #18738] + +2463. [port] linux: POSIX doesn't include the IPv6 Advanced Socket + API and glibc hides parts of the IPv6 Advanced Socket + API as a result. This is stupid as it breaks how the + two halves (Basic and Advanced) of the IPv6 Socket API were designed to be used but we have to live with it. + Define _GNU_SOURCE to pull in the IPv6 Advanced Socket + API. [RT #18388] + +2462. [doc] Document -m (enable memory usage debugging) + option for dig. [RT #18757] + +2461. [port] sunos: Change #2363 was not complete. [RT #17513] + +2458. [doc] ARM: update and correction for max-cache-size. + [RT #18294] + +2455. [bug] Stop metadata being transfered via axfr/ixfr. + [RT #18639] + +2453. [bug] Remove NULL pointer dereference in dns_journal_print(). + [RT #18316] + +2449. [bug] libbind: Out of bounds reference in dns_ho.c:addrsort. + [RT #18044] + +2445. [doc] ARM out-of-date on empty reverse zones (list includes + RFC1918 address, but these are not yet compiled in). + [RT #18578] + +2444. [port] Linux, FreeBSD, AIX: Turn off path mtu discovery + (clear DF) for UDP responses and requests. + + --- 9.4.3b3 released --- + +2443. [bug] win32: UDP connect() would not generate an event, + and so connected UDP sockets would never clean up. + Fix this by doing an immediate WSAConnect() rather + than an io completion port type for UDP. + +2438. [bug] Timeouts could be logged incorrectly under win32. + [RT #18617] + +2437. [bug] Sockets could be closed too early, leading to + inconsistent states in the socket module. [RT #18298] + +2436. [security] win32: UDP client handler can be shutdown. [RT #18576] + +2433. [tuning] Set initial timeout to 800ms. + +2432. [bug] More Windows socket handling improvements. Stop + using I/O events and use IO Completion Ports + throughout. Rewrite the receive path logic to make + it easier to support multiple simultaneous + requestrs in the future. Add stricter consistency + checking as a compile-time option (define + ISC_SOCKET_CONSISTENCY_CHECKS; defaults to off). + +2430. [bug] win32: isc_interval_set() could round down to + zero if the input was less than NS_INTERVAL + nanoseconds. Round up instead. [RT #18549] + +2429. [doc] nsupdate should be in section 1 of the man pages. + [RT #18283] + +2426. [bug] libbind: inet_net_pton() can sometimes return the + wrong value if excessively large netmasks are + supplied. [RT #18512] + +2425. [bug] named didn't detect unavailable query source addresses + at load time. [RT #18536] + +2424. [port] configure now probes for a working epoll + implementation. Allow the use of kqueue, + epoll and /dev/poll to be selected at compile + time. [RT #18277] + +2422. [bug] Handle the special return value of a empty node as + if it was a NXRRSET in the validator. [RT #18447] + +2421. [func] Add new command line option '-S' for named to specify + the max number of sockets. [RT #18493] + Use caution: this option may not work for some + operating systems without rebuilding named. + +2420. [bug] Windows socket handling cleanup. Let the io + completion event send out cancelled read/write + done events, which keeps us from writing to memeory + we no longer have ownership of. Add debugging + socket_log() function. Rework TCP socket handling + to not leak sockets. + +2417. [bug] Connecting UDP sockets for outgoing queries could + unexpectedly fail with an 'address already in use' + error. [RT #18411] + +2416. [func] Log file descriptors that cause exceeding the + internal maximum. [RT #18460] + +2414. [bug] A masterdump context held the database lock too long, + causing various troubles such as dead lock and + recursive lock acquisition. [RT #18311, #18456] + +2413. [bug] Fixed an unreachable code path in socket.c. [RT #18442] + +2412. [bug] win32: address a resourse leak. [RT #18374] + +2411. [bug] Allow using a larger number of sockets than FD_SETSIZE + for select(). To enable this, set ISC_SOCKET_MAXSOCKETS + at compilation time. [RT #18433] + +2410. [bug] Correctly delete m_versionInfo. [RT #18432] + +2408. [bug] A duplicate TCP dispatch event could be sent, which + could then trigger an assertion failure in + resquery_response(). [RT #18275] -2406. [bug] Some operating systems have FD_SETSIZE set to a - low value by default, which can cause resource - exhaustion when many simultaneous connections are - open. Linux in particular makes it difficult to - increase this value. To use more sockets with - select(), set ISC_SOCKET_FDSETSIZE. Example: - STD_CDEFINES="-DISC_SOCKET_FDSETSIZE=4096" ./configure - (This should not be necessary in most cases, and - never for an authoritative-only server.) [RT #18328] +2407. [port] hpux: test for sys/dyntune.h. [RT #18421] 2404. [port] hpux: files unlimited support. @@ -39,15 +183,271 @@ 2392. [bug] remove 'grep -q' from acl test script, some platforms don't support it. [RT #18253] +2391 [port] hpux: cover additional recvmsg() error codes. + [RT #18301] + +2390 [bug] dispatch.c could make a false warning on 'odd socket'. + [RT #18301]. + +2389 [bug] Move the "working directory writable" check to after + the ns_os_changeuser() call. [RT #18326] + +2386. [func] Add warning about too small 'open files' limit. + [RT #18269] + + --- 9.4.3b2 released --- + +2385. [bug] A condition variable in socket.c could leak in + rare error handling [RT #17968]. + +2384. [security] Additional support for query port randomization (change + #2375) including performance improvement and port range + specification. [RT #17949, #18098] + +2383. [bug] named could double queries when they resulted in + SERVFAIL due to overkilling EDNS0 failure detection. + [RT #18182] + +2382. [doc] Add descriptions of IPSECKEY, SPF and SSHFP to ARM. + +2381. [port] dlz/mysql: support multiple install layouts for + mysql. /include/{,mysql/}mysql.h and + /lib/{,mysql/}. [RT #18152] + +2380. [bug] dns_view_find() was not returning NXDOMAIN/NXRRSET + proofs which, in turn, caused validation failures + for insecure zones immediately below a secure zone + the server was authoritative for. [RT #18112] + +2379. [contrib] queryperf/gen-data-queryperf.py: removed redundant + TLDs and supported RRs with TTLs [RT #17972] + +2377. [bug] Address race condition in dnssec-signzone. [RT #18142] + +2376. [bug] Change #2144 was not complete. + +2375. [security] Fully randomize UDP query ports to improve + forgery resilience. [RT #17949] + +2372. [bug] fixed incorrect TAG_HMACSHA256_BITS value [RT #18047] + +2369. [bug] libbind: Array bounds overrun on read in bitncmp(). + [RT #18054] + +2364. [bug] named could trigger a assertion when serving a + malformed signed zone. [RT #17828] + +2363. [port] sunos: pre-set "lt_cv_sys_max_cmd_len=4096;". + [RT #17513] + +2361. [bug] "recursion" statistics counter could be counted + multiple times for a single query. [RT #17990] + + --- 9.4.3b1 released --- + +2358. [doc] Update host's default query description. [RT #17934] + +2356. [bug] Built in mutex profiler was not scalable enough. + [RT #17436] + +2353. [func] libbind: nsid support. [RT #17091] + +2350. [port] win32: IPv6 support. [RT #17797] + +2347. [bug] Delete now traverses the RB tree in the canonical >>> TRUNCATED FOR MAIL (1000 lines) <<< From gonzo at FreeBSD.org Sun Jan 4 02:02:40 2009 From: gonzo at FreeBSD.org (Oleksandr Tymoshenko) Date: Sun Jan 4 02:02:50 2009 Subject: PERFORCE change 155603 for review Message-ID: <200901040202.n0422Wcv093099@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155603 Change 155603 by gonzo@gonzo_figaro on 2009/01/04 02:02:12 IFC @155601 Affected files ... .. //depot/projects/mips2/src/COPYRIGHT#4 integrate .. //depot/projects/mips2/src/Makefile#13 integrate .. //depot/projects/mips2/src/Makefile.inc1#26 integrate .. //depot/projects/mips2/src/ObsoleteFiles.inc#25 integrate .. //depot/projects/mips2/src/UPDATING#25 integrate .. //depot/projects/mips2/src/bin/df/df.1#3 integrate .. //depot/projects/mips2/src/bin/df/df.c#5 integrate .. //depot/projects/mips2/src/bin/ps/print.c#3 integrate .. //depot/projects/mips2/src/bin/sh/eval.c#4 integrate .. //depot/projects/mips2/src/bin/sh/exec.c#3 integrate .. //depot/projects/mips2/src/cddl/Makefile.inc#4 integrate .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/mnttab.h#3 integrate .. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/deviceid.c#2 integrate .. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/mnttab.c#2 integrate .. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/zmount.c#2 integrate .. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/zone.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zinject/translate.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zinject/zinject.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zinject/zinject.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/head/assert.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/head/libintl.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/head/synch.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/head/thread.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate .. //depot/projects/mips2/src/cddl/lib/libzfs/Makefile#4 integrate .. //depot/projects/mips2/src/cddl/lib/libzpool/Makefile#4 integrate .. //depot/projects/mips2/src/cddl/sbin/zpool/Makefile#4 integrate .. //depot/projects/mips2/src/cddl/usr.bin/Makefile#6 integrate .. //depot/projects/mips2/src/cddl/usr.bin/zinject/Makefile#1 branch .. //depot/projects/mips2/src/cddl/usr.bin/ztest/Makefile#4 integrate .. //depot/projects/mips2/src/cddl/usr.sbin/zdb/Makefile#4 integrate .. //depot/projects/mips2/src/contrib/bind9/CHANGES#8 integrate .. //depot/projects/mips2/src/contrib/bind9/COPYRIGHT#6 integrate .. //depot/projects/mips2/src/contrib/bind9/FAQ#5 integrate .. //depot/projects/mips2/src/contrib/bind9/FAQ.xml#5 integrate .. //depot/projects/mips2/src/contrib/bind9/README#6 integrate .. //depot/projects/mips2/src/contrib/bind9/aclocal.m4#1 branch .. //depot/projects/mips2/src/contrib/bind9/bin/check/check-tool.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkconf.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkzone.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.1#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.docbook#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dighost.c#6 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.1#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.docbook#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/client.c#8 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/config.c#6 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/controlconf.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/globals.h#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/interfacemgr.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwaddr.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwdgnba.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwdnoop.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.8#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.docbook#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/main.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.8#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.5#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.docbook#6 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.docbook#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/query.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/server.c#8 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/unix/include/named/os.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/unix/os.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/update.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.1#1 branch .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.8#5 delete .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc-confgen.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.8#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.docbook#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/config.h.in#1 branch .. //depot/projects/mips2/src/contrib/bind9/configure.in#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#8 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#7 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.pdf#7 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.dig.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.host.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.named-checkconf.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.named-checkzone.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.named.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.rndc-confgen.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.rndc.conf.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.rndc.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/Makefile.in#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/format-options.pl#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/migration#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/sort-options.pl#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/rfc/index#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc4648.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc4701.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc5155.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/bind/api#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/strerror.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/strtoul.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/configure.in#6 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/dst_api.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/hmac_link.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/support.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/arpa/nameser.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/assertions.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/eventlib.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/misc.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/platform.h.in#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/netdb.h#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/resolv.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_net_pton.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_network.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/dns_ho.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getnetgrent.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irp.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/assertions.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/bitncmp.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ctl_srvr.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/logging.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/port_after.h.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/port_before.h.in#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_debug.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_mkquery.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_query.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_send.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/api#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/check.c#7 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/adb.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/api#7 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/cache.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dispatch.c#8 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dst_parse.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dst_parse.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/dispatch.h#7 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/journal.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/master.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/masterdump.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/message.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rbtdb.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/txt_16.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/request.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/resolver.c#7 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rootns.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/sdb.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/tkey.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/tsig.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/validator.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/view.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/xfrin.c#6 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/zone.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/Makefile.in#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/api#6 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/assertions.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/assertions.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/lex.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/mem.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/msgs.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/platform.h.in#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/portset.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/resource.h#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/socket.h#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/timer.h#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/types.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/mem.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/portset.c#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/print.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/pthreads/mutex.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/timer.c#6 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/app.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/isc/net.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/net.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/resource.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/socket.c#6 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/socket_p.h#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/time.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/api#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/namedconf.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/api#5 integrate .. //depot/projects/mips2/src/contrib/bind9/make/rules.in#5 integrate .. //depot/projects/mips2/src/contrib/bind9/version#8 integrate .. //depot/projects/mips2/src/contrib/binutils/bfd/config.bfd#4 integrate .. //depot/projects/mips2/src/contrib/binutils/gas/config/tc-mips.c#4 integrate .. //depot/projects/mips2/src/contrib/bsnmp/snmp_mibII/mibII.c#4 integrate .. //depot/projects/mips2/src/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/mips2/src/contrib/gdb/gdb/arm-tdep.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ipsend/44arp.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ANNOUNCE#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/FREEBSD-upgrade#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/FREEBSD-vendor#3 delete .. //depot/projects/mips2/src/contrib/ncurses/INSTALL#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/MANIFEST#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/NEWS#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/TO-DO#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/aclocal.m4#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/announce.html.in#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/config.guess#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/config.sub#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/configure#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/configure.in#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/dist.mk#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/doc/html/announce.html#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/form.priv.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_def.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_driver.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_req_name.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/MKterm.h.awk.in#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/capdefaults.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/curses.h.in#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/curses.tail#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/nc_alloc.h#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/nc_panel.h#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/ncurses_defs#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/term_entry.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_getcchar.3x#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_memleaks.3x#1 branch .. //depot/projects/mips2/src/contrib/ncurses/man/curs_terminfo.3x#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_util.3x#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form.3x#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_driver.3x#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_field_buffer.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/man_db.renames#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/menu_attributes.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/menu_driver.3x#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/menu_pattern.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/ncurses.3x#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/menu/m_driver.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/menu/m_req_name.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/misc/ncu-indent#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/misc/ncurses.supp#1 branch .. //depot/projects/mips2/src/contrib/ncurses/misc/terminfo.src#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/Makefile.in#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/MKkeyname.awk#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/MKlib_gen.sh#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/MKunctrl.awk#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_addch.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_delwin.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_freeall.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_getch.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_getstr.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_initscr.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_mouse.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_newterm.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_newwin.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_overlay.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_restart.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_screen.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_set_term.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_slk.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_slkrefr.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_ungetch.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_window.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/resizeterm.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/tries.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/use_window.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/wresize.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/curses.priv.h#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/fifo_defs.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/llib-lncurses#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/llib-lncursest#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/llib-lncursesw#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/MKcodes.awk#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/MKnames.awk#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/alloc_entry.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/captoinfo.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/comp_expand.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/comp_hash.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/comp_parse.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/comp_scan.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/entries.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/home_terminfo.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/init_keytry.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_acs.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_data.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_options.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_raw.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_termcap.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_tparm.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_tputs.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/make_keys.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/name_match.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/parse_entry.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/read_entry.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/use_screen.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/write_entry.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_trace.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_traceatr.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_tracebits.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_tracechr.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_tracedmp.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_tracemse.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/trace_buf.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/trace_tries.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/varargs.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/visbuf.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/hardscroll.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/lib_mvcur.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/lib_twait.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/tty_update.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/charable.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_get_wch.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_key_name.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/panel/p_new.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/panel/panel.priv.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/MKtermsort.sh#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/Makefile.in#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/dump_entry.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/dump_entry.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/infocmp.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/progs.priv.h#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/tic.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/toe.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/tput.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/tset.c#4 integrate .. //depot/projects/mips2/src/contrib/netcat/FREEBSD-vendor#2 integrate .. //depot/projects/mips2/src/contrib/netcat/nc.1#6 integrate .. //depot/projects/mips2/src/contrib/netcat/netcat.c#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/CREDITS#1 branch .. //depot/projects/mips2/src/contrib/openbsm/HISTORY#6 delete .. //depot/projects/mips2/src/contrib/openbsm/INSTALL#1 branch .. //depot/projects/mips2/src/contrib/openbsm/LICENSE#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/NEWS#1 branch .. //depot/projects/mips2/src/contrib/openbsm/README#5 integrate .. //depot/projects/mips2/src/contrib/openbsm/TODO#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/VERSION#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/audit/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/audit/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/audit/audit.8#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/audit/audit.c#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/audit_triggers.defs#1 branch .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/audit_warn.c#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.8#5 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.c#5 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.h#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd_control.defs#1 branch .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd_darwin.c#1 branch .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd_fbsd.c#1 branch .. //depot/projects/mips2/src/contrib/openbsm/bin/auditfilterd/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditfilterd/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/auditreduce.1#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/auditreduce.c#5 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/auditreduce.h#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/praudit/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/praudit/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/praudit/praudit.1#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/praudit/praudit.c#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/bsm/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bsm/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bsm/audit_uevents.h#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bsm/auditd_lib.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/bsm/libbsm.h#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/compat/clock_gettime.h#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/compat/strlcat.h#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/compat/strlcpy.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/config/config.h#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/config/config.h.in#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/configure#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/configure.ac#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/etc/audit_event#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/libauditd/Makefile.am#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libauditd/Makefile.in#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libauditd/auditd_lib.c#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_class.3#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_errno.3#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_free_token.3#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_token.3#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/audit_submit.3#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_class.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_control.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_errno.c#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_event.c#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_flags.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_io.c#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_mask.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_notify.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_token.c#5 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_user.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_wrappers.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/libbsm.3#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit.2#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit.log.5#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_class.5#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_control.5#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_event.5#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_user.5#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_warn.5#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/auditctl.2#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/auditon.2#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/getaudit.2#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/getauid.2#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/setaudit.2#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/setauid.2#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/modules/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/modules/auditfilter_noop/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/sys/Makefile.am#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/Makefile.in#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/Makefile.am#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/Makefile.in#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_errno.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_internal.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_record.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/bsm/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/bsm/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/bsm/generate.c#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/E2BIG_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EACCES_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EBADF_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EBUSY_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ECHILD_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EDEADLK_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EEXIST_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EFAULT_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EFBIG_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EINTR_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EINVAL_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EIO_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EISDIR_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EMFILE_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EMLINK_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENFILE_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENODEV_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOENT_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOEXEC_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOMEM_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOSPC_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOTBLK_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOTDIR_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOTTY_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENXIO_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EPERM_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EPIPE_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EROFS_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ESPIPE_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ESRCH_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ETXTBSY_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EXDEV_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/arg32_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/data_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/file_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/header32_token#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/in_addr_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ip_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ipc_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/iport_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/opaque_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/path_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32ex_record-IPv4#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32ex_record-IPv6#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64ex_record-IPv4#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64ex_record-IPv6#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/return32_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/return32_token#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/seq_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/socketex_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/socketex_token#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/subject32_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/subject32ex_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/text_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/zonename_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/tools/Makefile.am#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/tools/Makefile.in#4 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/sendmail.h#5 integrate .. //depot/projects/mips2/src/contrib/smbfs/lib/smb/nb_name.c#2 integrate .. //depot/projects/mips2/src/contrib/telnet/telnetd/ext.h#2 integrate .. //depot/projects/mips2/src/contrib/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/mips2/src/etc/Makefile#13 integrate .. //depot/projects/mips2/src/etc/defaults/rc.conf#14 integrate .. //depot/projects/mips2/src/etc/devd.conf#8 integrate .. //depot/projects/mips2/src/etc/devd/Makefile#1 branch .. //depot/projects/mips2/src/etc/devd/asus.conf#1 branch .. //depot/projects/mips2/src/etc/gss/mech#4 integrate .. //depot/projects/mips2/src/etc/mtree/BSD.include.dist#7 integrate .. //depot/projects/mips2/src/etc/mtree/BSD.root.dist#4 integrate .. //depot/projects/mips2/src/etc/newsyslog.conf#3 integrate .. //depot/projects/mips2/src/etc/rc.d/Makefile#11 integrate .. //depot/projects/mips2/src/etc/rc.d/defaultroute#2 integrate .. //depot/projects/mips2/src/etc/rc.d/gssd#1 branch .. //depot/projects/mips2/src/etc/rc.d/nfsd#4 integrate .. //depot/projects/mips2/src/etc/regdomain.xml#2 integrate .. //depot/projects/mips2/src/etc/syslog.conf#2 integrate .. //depot/projects/mips2/src/gnu/lib/libstdc++/Makefile#6 integrate .. //depot/projects/mips2/src/gnu/usr.bin/binutils/as/Makefile#4 integrate .. //depot/projects/mips2/src/gnu/usr.bin/binutils/libbfd/bfd.h#4 integrate .. //depot/projects/mips2/src/gnu/usr.bin/cc/libiberty/config.h#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/Makefile#3 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/gdbserver/Makefile#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c#1 branch .. //depot/projects/mips2/src/gnu/usr.bin/gdb/gdbserver/reg-arm.c#1 branch .. //depot/projects/mips2/src/gnu/usr.bin/groff/tmac/mdoc.local#7 integrate .. //depot/projects/mips2/src/gnu/usr.bin/man/manpath/manpath.config#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/sort/config.h#4 integrate .. //depot/projects/mips2/src/include/Makefile#9 integrate .. //depot/projects/mips2/src/include/arpa/nameser.h#3 integrate .. //depot/projects/mips2/src/include/resolv.h#3 integrate .. //depot/projects/mips2/src/include/rpc/xdr.h#2 integrate .. //depot/projects/mips2/src/include/string.h#3 integrate .. //depot/projects/mips2/src/include/strings.h#2 integrate .. //depot/projects/mips2/src/include/utmp.h#2 integrate .. //depot/projects/mips2/src/kerberos5/include/config.h#3 integrate .. //depot/projects/mips2/src/lib/Makefile#17 integrate .. //depot/projects/mips2/src/lib/bind/bind/config.h#4 integrate .. //depot/projects/mips2/src/lib/bind/bind/port_after.h#3 integrate .. //depot/projects/mips2/src/lib/bind/bind/port_before.h#5 integrate .. //depot/projects/mips2/src/lib/bind/config.h#6 integrate .. //depot/projects/mips2/src/lib/bind/dns/code.h#4 integrate .. //depot/projects/mips2/src/lib/bind/dns/dns/enumclass.h#4 integrate .. //depot/projects/mips2/src/lib/bind/dns/dns/enumtype.h#4 integrate .. //depot/projects/mips2/src/lib/bind/dns/dns/rdatastruct.h#4 integrate .. //depot/projects/mips2/src/lib/bind/isc/Makefile#3 integrate .. //depot/projects/mips2/src/lib/bind/isc/isc/platform.h#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive.h#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_check_magic.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_endian.h#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry.c#11 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry.h#10 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_platform.h#8 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_private.h#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_private.h#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_all.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_bzip2.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_compress.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_gzip.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_none.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_program.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_ar.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_cpio.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_empty.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_iso9660.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_mtree.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_tar.c#12 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_zip.c#12 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_string.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_string.h#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write.3#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_disk.c#17 integrate .. //depot/projects/mips2/src/lib/libarchive/test/Makefile#12 integrate .. //depot/projects/mips2/src/lib/libarchive/test/main.c#9 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_acl_freebsd.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_bzip2.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_bzip2_1.tbz.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_bzip2_2.tbz.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_gtar.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_gzip.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_gzip_1.tgz.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_gzip_2.tgz.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_fuzz.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_fuzz_1.iso.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_sparse.c#8 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_pax_truncated.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_compress.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_perms.c#8 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_ar.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_cpio.c#5 integrate .. //depot/projects/mips2/src/lib/libauditd/Makefile#1 branch .. //depot/projects/mips2/src/lib/libbsm/Makefile#5 integrate .. //depot/projects/mips2/src/lib/libc/amd64/SYS.h#4 integrate .. //depot/projects/mips2/src/lib/libc/amd64/gen/_setjmp.S#4 integrate .. //depot/projects/mips2/src/lib/libc/amd64/gen/fabs.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/gen/modf.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/gen/rfork_thread.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/gen/setjmp.S#4 integrate .. //depot/projects/mips2/src/lib/libc/amd64/gen/sigsetjmp.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/stdlib/div.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/stdlib/ldiv.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/stdlib/lldiv.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/bcmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/bcopy.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/bzero.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/memcmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/memset.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/strcat.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/strcmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/strcpy.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/brk.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/exect.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/getcontext.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/pipe.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/ptrace.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/reboot.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/sbrk.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/setlogin.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/vfork.S#3 integrate .. //depot/projects/mips2/src/lib/libc/arm/_fpmath.h#2 integrate .. //depot/projects/mips2/src/lib/libc/arm/arith.h#3 integrate .. //depot/projects/mips2/src/lib/libc/arm/sys/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/Symbol.map#10 integrate .. //depot/projects/mips2/src/lib/libc/gen/dirname.3#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/dirname.c#2 integrate .. //depot/projects/mips2/src/lib/libc/gen/dlfcn.c#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/getvfsbyname.3#4 integrate .. //depot/projects/mips2/src/lib/libc/gen/times.3#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/SYS.h#4 integrate .. //depot/projects/mips2/src/lib/libc/i386/gen/_ctx_start.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/gen/_setjmp.S#4 integrate .. //depot/projects/mips2/src/lib/libc/i386/gen/fabs.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/gen/modf.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/gen/rfork_thread.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/gen/setjmp.S#4 integrate .. //depot/projects/mips2/src/lib/libc/i386/gen/sigsetjmp.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/stdlib/abs.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/stdlib/div.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/stdlib/labs.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/stdlib/ldiv.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/bcmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/bcopy.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/bzero.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/ffs.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/index.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/memchr.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/memcmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/memset.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/rindex.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/strcat.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/strchr.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/strcmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/strcpy.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/strlen.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/strncmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/strrchr.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/swab.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/wcschr.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/wcscmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/wcslen.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/wmemchr.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/Ovfork.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/brk.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/exect.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/getcontext.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/pipe.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/ptrace.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/reboot.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/sbrk.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/setlogin.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/syscall.S#3 integrate .. //depot/projects/mips2/src/lib/libc/ia64/sys/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libc/include/fpmath.h#2 integrate .. //depot/projects/mips2/src/lib/libc/include/isc/eventlib.h#3 integrate .. //depot/projects/mips2/src/lib/libc/include/isc/platform.h#1 branch .. //depot/projects/mips2/src/lib/libc/inet/inet_net_pton.c#3 integrate .. //depot/projects/mips2/src/lib/libc/mips/sys/Makefile.inc#5 integrate .. //depot/projects/mips2/src/lib/libc/net/rcmd.3#3 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_add_perm.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_calc_mask.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_calc_mask.c#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_clear_perms.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_copy.c#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_copy_entry.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_create_entry.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_delete_entry.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_delete_perm.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_get_entry.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_get_perm_np.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_get_permset.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_get_qualifier.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_get_tag_type.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_perm.c#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_set_permset.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_set_qualifier.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_set_tag_type.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_size.c#2 integrate .. //depot/projects/mips2/src/lib/libc/powerpc/sys/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libc/resolv/res_debug.c#5 integrate .. //depot/projects/mips2/src/lib/libc/resolv/res_mkquery.c#4 integrate .. //depot/projects/mips2/src/lib/libc/resolv/res_query.c#4 integrate .. //depot/projects/mips2/src/lib/libc/resolv/res_send.c#4 integrate .. //depot/projects/mips2/src/lib/libc/sparc64/sys/Makefile.inc#4 integrate .. //depot/projects/mips2/src/lib/libc/stdio/fread.c#3 integrate .. //depot/projects/mips2/src/lib/libc/stdio/vfprintf.c#6 integrate .. //depot/projects/mips2/src/lib/libc/stdio/vfwprintf.c#7 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/malloc.3#8 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/malloc.c#16 integrate .. //depot/projects/mips2/src/lib/libc/string/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libc/string/Symbol.map#4 integrate .. //depot/projects/mips2/src/lib/libc/string/ffs.3#3 integrate .. //depot/projects/mips2/src/lib/libc/string/ffsl.c#3 integrate .. //depot/projects/mips2/src/lib/libc/string/ffsll.c#1 branch .. //depot/projects/mips2/src/lib/libc/string/flsll.c#1 branch .. //depot/projects/mips2/src/lib/libc/string/strdup.3#3 integrate .. //depot/projects/mips2/src/lib/libc/string/strndup.c#1 branch .. //depot/projects/mips2/src/lib/libc/string/strsep.3#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/Symbol.map#14 integrate .. //depot/projects/mips2/src/lib/libc/sys/cpuset_getaffinity.2#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/jail.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/kldunload.2#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/pipe.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/recv.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/rename.2#4 integrate .. //depot/projects/mips2/src/lib/libc/xdr/Symbol.map#3 integrate .. //depot/projects/mips2/src/lib/libc/xdr/xdr.c#2 integrate .. //depot/projects/mips2/src/lib/libfetch/fetch.3#5 integrate .. //depot/projects/mips2/src/lib/libfetch/fetch.c#3 integrate .. //depot/projects/mips2/src/lib/libfetch/fetch.h#2 integrate .. //depot/projects/mips2/src/lib/libfetch/http.c#6 integrate .. //depot/projects/mips2/src/lib/libkvm/Makefile#4 integrate .. //depot/projects/mips2/src/lib/libkvm/kvm_arm.c#3 integrate .. //depot/projects/mips2/src/lib/libkvm/kvm_minidump_arm.c#1 branch .. //depot/projects/mips2/src/lib/libkvm/kvm_private.h#4 integrate .. //depot/projects/mips2/src/lib/libkvm/kvm_proc.c#7 integrate .. //depot/projects/mips2/src/lib/libmagic/config.h#4 integrate .. //depot/projects/mips2/src/lib/libmd/Makefile#2 integrate .. //depot/projects/mips2/src/lib/libpmc/libpmc.c#7 integrate .. //depot/projects/mips2/src/lib/libpmc/libpmcinternal.h#1 branch .. //depot/projects/mips2/src/lib/libpmc/pmc.3#11 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.atom.3#2 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.core.3#2 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.core2.3#2 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.iaf.3#2 integrate .. //depot/projects/mips2/src/lib/libpmc/pmclog.c#3 integrate .. //depot/projects/mips2/src/lib/libproc/libproc.h#2 integrate .. //depot/projects/mips2/src/lib/libproc/proc_create.c#2 integrate .. //depot/projects/mips2/src/lib/librpcsec_gss/svc_rpcsec_gss.c#3 integrate .. //depot/projects/mips2/src/lib/libstand/bootp.c#3 integrate .. //depot/projects/mips2/src/lib/libstand/if_ether.h#3 integrate .. //depot/projects/mips2/src/lib/libstand/nfs.c#3 integrate .. //depot/projects/mips2/src/lib/libstand/printf.c#3 integrate .. //depot/projects/mips2/src/lib/libstand/stand.h#4 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_fork.c#3 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_rtld.c#7 integrate .. //depot/projects/mips2/src/lib/libusb20/Makefile#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20.3#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20.c#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20.h#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_compat01.c#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_compat01.h#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_compat10.c#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_compat10.h#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_desc.c#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_desc.h#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_int.h#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_ugen20.c#1 branch .. //depot/projects/mips2/src/lib/libutil/Makefile#7 integrate .. //depot/projects/mips2/src/lib/libutil/gr_util.c#2 integrate .. //depot/projects/mips2/src/lib/libutil/kinfo_getfile.3#1 branch .. //depot/projects/mips2/src/lib/libutil/kinfo_getfile.c#1 branch .. //depot/projects/mips2/src/lib/libutil/kinfo_getvmmap.3#1 branch .. //depot/projects/mips2/src/lib/libutil/kinfo_getvmmap.c#1 branch .. //depot/projects/mips2/src/lib/libutil/libutil.h#7 integrate .. //depot/projects/mips2/src/lib/libutil/login_cap.c#3 integrate .. //depot/projects/mips2/src/lib/libutil/login_class.c#5 integrate .. //depot/projects/mips2/src/lib/libutil/pty.c#8 integrate .. //depot/projects/mips2/src/lib/libutil/realhostname.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/math_private.h#7 integrate .. //depot/projects/mips2/src/lib/ncurses/ncurses/Makefile#6 integrate .. //depot/projects/mips2/src/lib/ncurses/ncurses/ncurses_cfg.h#4 integrate .. //depot/projects/mips2/src/libexec/bootpd/rtmsg.c#2 integrate .. //depot/projects/mips2/src/libexec/ftpd/extern.h#2 integrate .. //depot/projects/mips2/src/libexec/ftpd/ftpcmd.y#3 integrate .. //depot/projects/mips2/src/libexec/ftpd/ftpd.c#4 integrate .. //depot/projects/mips2/src/libexec/rpc.rquotad/Makefile#2 integrate .. //depot/projects/mips2/src/libexec/rpc.rquotad/rquotad.c#2 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/Symbol.map#3 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/rtld.c#11 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/rtld_lock.c#5 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/rtld_lock.h#3 integrate .. //depot/projects/mips2/src/libexec/telnetd/Makefile#5 integrate .. //depot/projects/mips2/src/release/Makefile#14 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#13 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#23 integrate .. //depot/projects/mips2/src/release/picobsd/tinyware/ns/ns.c#2 integrate .. //depot/projects/mips2/src/sbin/atacontrol/atacontrol.8#5 integrate .. //depot/projects/mips2/src/sbin/bsdlabel/bsdlabel.8#4 integrate .. //depot/projects/mips2/src/sbin/ddb/ddb.8#6 integrate .. //depot/projects/mips2/src/sbin/devd/devd.cc#3 integrate .. //depot/projects/mips2/src/sbin/devd/devd.conf.5#3 integrate .. //depot/projects/mips2/src/sbin/fsck_ffs/main.c#10 integrate .. //depot/projects/mips2/src/sbin/geom/class/part/Makefile#2 integrate .. //depot/projects/mips2/src/sbin/geom/class/part/geom_part.c#6 integrate .. //depot/projects/mips2/src/sbin/geom/class/part/gpart.8#5 integrate .. //depot/projects/mips2/src/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifieee80211.c#11 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifvlan.c#6 integrate .. //depot/projects/mips2/src/sbin/ifconfig/regdomain.c#5 integrate .. //depot/projects/mips2/src/sbin/ifconfig/regdomain.h#2 integrate .. //depot/projects/mips2/src/sbin/ipfw/ipfw.8#14 integrate .. //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#16 integrate .. //depot/projects/mips2/src/sbin/iscontrol/auth_subr.c#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/config.c#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/fsm.c#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/iscontrol.8#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/iscontrol.c#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/iscontrol.h#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/iscsi.conf.5#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/login.c#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/misc.c#3 integrate .. //depot/projects/mips2/src/sbin/iscontrol/pdu.c#2 integrate .. //depot/projects/mips2/src/sbin/kldstat/kldstat.c#3 integrate .. //depot/projects/mips2/src/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/mips2/src/sbin/mount/mount.c#8 integrate .. //depot/projects/mips2/src/sbin/mount/mount_fs.c#3 integrate .. //depot/projects/mips2/src/sbin/mount_msdosfs/mount_msdosfs.8#2 integrate .. //depot/projects/mips2/src/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate .. //depot/projects/mips2/src/sbin/mount_nfs/mount_nfs.c#7 integrate .. //depot/projects/mips2/src/sbin/newfs/Makefile#2 integrate .. //depot/projects/mips2/src/sbin/newfs/mkfs.c#5 integrate .. //depot/projects/mips2/src/sbin/newfs/newfs.8#6 integrate .. //depot/projects/mips2/src/sbin/newfs/newfs.c#5 integrate .. //depot/projects/mips2/src/sbin/newfs/newfs.h#5 integrate .. //depot/projects/mips2/src/sbin/newfs_msdos/newfs_msdos.8#3 integrate .. //depot/projects/mips2/src/sbin/newfs_msdos/newfs_msdos.c#3 integrate .. //depot/projects/mips2/src/sbin/route/route.c#5 integrate .. //depot/projects/mips2/src/sbin/routed/table.c#2 integrate .. //depot/projects/mips2/src/sbin/savecore/savecore.8#3 integrate .. //depot/projects/mips2/src/sbin/shutdown/shutdown.8#2 integrate .. //depot/projects/mips2/src/secure/usr.sbin/sshd/Makefile#6 integrate .. //depot/projects/mips2/src/share/doc/bind9/Makefile#3 integrate .. //depot/projects/mips2/src/share/man/man4/Makefile#25 integrate .. //depot/projects/mips2/src/share/man/man4/acpi_aiboost.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/acpi_asus.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/ale.4#1 branch .. //depot/projects/mips2/src/share/man/man4/altq.4#7 integrate .. //depot/projects/mips2/src/share/man/man4/atapicam.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/ath_hal.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/bce.4#5 integrate .. //depot/projects/mips2/src/share/man/man4/cpuctl.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/cxgb.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/ddb.4#13 integrate .. //depot/projects/mips2/src/share/man/man4/fxp.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/man4.arm/Makefile#2 integrate .. //depot/projects/mips2/src/share/man/man4/man4.arm/mge.4#1 branch .. //depot/projects/mips2/src/share/man/man4/man4.powerpc/Makefile#3 integrate .. //depot/projects/mips2/src/share/man/man4/man4.powerpc/pmu.4#1 branch .. //depot/projects/mips2/src/share/man/man4/miibus.4#7 integrate .. //depot/projects/mips2/src/share/man/man4/ndis.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/ng_ether_echo.4#1 branch .. //depot/projects/mips2/src/share/man/man4/ng_tty.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/rl.4#4 integrate .. //depot/projects/mips2/src/share/man/man4/route.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/snd_hda.4#8 integrate .. //depot/projects/mips2/src/share/man/man4/snp.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/textdump.4#5 integrate .. //depot/projects/mips2/src/share/man/man4/upgt.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/usb2_bluetooth.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_controller.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_core.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_ethernet.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_image.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_input.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_misc.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_ndis.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_quirk.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_serial.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_sound.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_storage.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_template.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_wlan.4#1 branch .. //depot/projects/mips2/src/share/man/man4/uscanner.4#6 integrate .. //depot/projects/mips2/src/share/man/man4/vlan.4#8 integrate .. //depot/projects/mips2/src/share/man/man4/zyd.4#4 integrate .. //depot/projects/mips2/src/share/man/man5/fstab.5#4 integrate .. //depot/projects/mips2/src/share/man/man5/nsswitch.conf.5#4 integrate .. //depot/projects/mips2/src/share/man/man7/hier.7#6 integrate .. //depot/projects/mips2/src/share/man/man7/ports.7#9 integrate .. //depot/projects/mips2/src/share/man/man9/Makefile#19 integrate .. //depot/projects/mips2/src/share/man/man9/VFS_SET.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/VOP_ACCESS.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/VOP_STRATEGY.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/VOP_VPTOCNP.9#1 branch .. //depot/projects/mips2/src/share/man/man9/bus_dma.9#6 integrate .. //depot/projects/mips2/src/share/man/man9/devfs_set_cdevpriv.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/domain.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/ifnet.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/ktr.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/pseudofs.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/rtalloc.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/rtentry.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/style.9#6 integrate .. //depot/projects/mips2/src/share/man/man9/vfs_busy.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/vfs_mountedon.9#2 delete .. //depot/projects/mips2/src/share/man/man9/vn_fullpath.9#2 integrate .. //depot/projects/mips2/src/share/misc/bsd-family-tree#12 integrate .. //depot/projects/mips2/src/share/misc/committers-doc.dot#7 integrate .. //depot/projects/mips2/src/share/misc/committers-src.dot#13 integrate .. //depot/projects/mips2/src/share/mk/bsd.libnames.mk#8 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From rene at FreeBSD.org Sun Jan 4 11:33:20 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Sun Jan 4 11:33:26 2009 Subject: PERFORCE change 155606 for review Message-ID: <200901041133.n04BXIic077976@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155606 Change 155606 by rene@rene_self on 2009/01/04 11:33:05 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#4 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -901,12 +901,26 @@ Slaven Rezic eserte@cs.tu-berlin.de wrote a - tutorial how to use umlauts on a FreeBSD machine. The tutorial - is written in German and available at + tutorial on using umlauts on a FreeBSD machine. The tutorial + is written in German and is available at . + Greek Language Localization + + + localization + Greek + + Nikos Kokkalis nickkokkalis@gmail.com has written + a complete article on Greek support in &os;. It is available as + part of the official &os; Greek documentation, in http://www.freebsd.org/doc/el_GR.ISO8859-7/articles/greek-language-support/index.html. + Please note this is in Greek only. + + + Japanese and Korean Language Localization localization @@ -925,7 +939,7 @@ Non-English FreeBSD Documentation - Some FreeBSD contributors have translated parts of FreeBSD to + Some FreeBSD contributors have translated parts of FreeBSD documentation to other languages. They are available through links on the main site or in /usr/share/doc. From rene at FreeBSD.org Sun Jan 4 11:45:32 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Sun Jan 4 11:45:39 2009 Subject: PERFORCE change 155607 for review Message-ID: <200901041145.n04BjVTW078950@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155607 Change 155607 by rene@rene_self on 2009/01/04 11:45:02 MFen handbook/l10n 1.126 -> 1.127 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#6 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml,v 1.34 2006/08/12 22:53:14 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/l10n/chapter.sgml - %SRCID% 1.126 + %SRCID% 1.127 --> @@ -23,7 +23,7 @@ Wu Herschreven door - + @@ -1035,13 +1035,31 @@ Slaven Rezic eserte@cs.tu-berlin.de heeft - een tutorial geschreven over hoe umlauten in &os; gebruikt - kunnen worden. De tutorial is in het Duits geschreven en staat + een tutorial geschreven over het gebruik van umlauten op een + &os;-machine. De tutorial is in het Duits geschreven en staat op . + Grieks + + + lokalisatie + + Grieks + + + Nikos Kokkalis nickkokkalis@gmail.com heeft + een compleet artikel over Griekse ondersteuning in &os; + geschreven. Het is beschikbaar als deel van de officiële + Griekse &os;-documentatie, in http://www.freebsd.org/doc/el_GR.ISO8859-7/articles/greek-language-support/index.html. + Merk opdat dit alleen in het Grieks + beschikbaar is. + + + Japans en Koreaans @@ -1065,8 +1083,8 @@ Niet-Engelstalige &os; documentatie - Sommige delen van &os; zijn naar andere talen vertaald. - Hiernaar staan links op de Sommige delen van de &os;-documentatie zijn naar andere + talen vertaald. Hiernaar staan links op de hoofdsite of in /usr/share/doc. From rene at FreeBSD.org Sun Jan 4 19:41:47 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Sun Jan 4 19:41:53 2009 Subject: PERFORCE change 155615 for review Message-ID: <200901041941.n04Jfg0C048899@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155615 Change 155615 by rene@rene_self on 2009/01/04 19:41:28 committers-guide: process trhodes' and pgj's comments. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#11 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#11 (text+ko) ==== @@ -186,9 +186,9 @@ Commit bits allocated prior to the development of the notion of areas of authority may be appropriate for use in many parts of the tree. However, common sense dictates that a committer who has not - previously worked in an area of the tree seeks review prior to - committing, seeks approval from the appropriate responsible party, - and/or works with a mentor. Since the rules regarding code + previously worked in an area of the tree seek review prior to + committing, seek approval from the appropriate responsible party, + and/or work with a mentor. Since the rules regarding code maintenance differ by area of the tree, this is as much for the benefit of the committer working in an area of less familiarity as it is for others working on the tree. @@ -1214,7 +1214,7 @@ check in place but that may change. Some people blame these checks for bouncing valid email. If you want these checks turned off for your email you can place a file named - ~/.spam_lover + .spam_lover in your home directory on freefall.FreeBSD.org to disable the checks for your email. @@ -1410,7 +1410,7 @@ You can run a local copy of GNATS, and then integrate the FreeBSD - GNATS tree in to it using CVSup. Then you can run the GNATS commands + GNATS tree in to it using CVSup. Then you can run GNATS commands locally. This lets you query the PR database without needing to be connected to the Internet. @@ -1680,7 +1680,7 @@ - If you do not wish to type in your password every + If you do not wish to type your password in every time you use &man.ssh.1;, and you use RSA or DSA keys to authenticate, &man.ssh-agent.1; is there for your convenience. If you want to use &man.ssh-agent.1;, make @@ -1703,7 +1703,7 @@ ($HOME/.ssh/id_dsa.pub or $HOME/.ssh/id_rsa.pub) to the person setting you up as a committer so it can be put - into yourlogin in + into the yourlogin file in /etc/ssh-keys/ on freefall. @@ -1859,7 +1859,7 @@ Do not commit to anything under the src/contrib, - src/crypto, or + src/crypto, or src/sys/contrib trees without explicit approval from the respective maintainer(s). @@ -2112,7 +2112,7 @@ flame-o-gram at least had the grace to send it privately, then have the grace to keep it private yourself. If you feel you are being unfairly treated by another developer, - and it is causing you anguish, bring up the matter with + and it is causing you anguish, bring the matter up with core rather than taking it public. Core will do its best to play peace makers and get things back to sanity. In cases where the dispute involves a change to the codebase and @@ -2209,17 +2209,17 @@ Policy on Multiple Architectures - &os; has added several new architecture ports during recent + FreeBSD has added several new architecture ports during recent release cycles and is truly no longer an &i386; centric operating system. In an effort to make it easier to keep FreeBSD portable across the platforms we support, core has developed the following mandate:
- Our 32 bit reference platform is i386, and our 64 bit + Our 32-bit reference platform is i386, and our 64-bit reference platform is Sparc64. Major design work (including major API and ABI changes) must prove itself on at least one - 32 bit and at least one 64 bit platform, preferably the + 32-bit and at least one 64-bit platform, preferably the primary reference platforms, before it may be committed to the source tree.
@@ -2236,7 +2236,7 @@ developers. We will continue to re-evaluate this policy as cost and - availability of the 64 bit platforms change. + availability of the 64-bit platforms change. Developers should also be aware of our Tier Policy for the long term support of hardware architectures. The rules @@ -2334,7 +2334,7 @@ security officer, and release engineering teams. Diversity in hardware support broadens the options for FreeBSD consumers by offering new features and usage opportunities (such as support - for 64 bit CPUs, use in embedded environments, etc.), but these + for 64-bit CPUs, use in embedded environments, etc.), but these benefits must always be carefully considered in terms of the real-world maintenance cost associated with additional platform support. @@ -3310,6 +3310,18 @@ a busy machine. + + + Free 4-CD and DVD sets + + + &os; committers can get a free 4-CD or DVD set at + conferences from + &os; Mall, Inc.. The sets are no longer available + as a subscription due to the high shipment costs to + countries outside the USA. + + @@ -3393,7 +3405,7 @@ well. This information consists of one or more lines containing the - key word or phrase, a colon, tabs and/or spaces for formatting, and then the + key word or phrase, a colon, tabs for formatting, and then the additional information. The key words or phrases are: From brueffer at FreeBSD.org Sun Jan 4 19:58:01 2009 From: brueffer at FreeBSD.org (Christian Brueffer) Date: Sun Jan 4 19:58:08 2009 Subject: PERFORCE change 155616 for review Message-ID: <200901041957.n04JvxGJ050077@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155616 Change 155616 by brueffer@brueffer_haakonia on 2009/01/04 19:57:34 Fix the example, ad matches both successful and failed events. Discussed with: rwatson Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit_user.5#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit_user.5#14 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#13 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#14 $ .\" -.Dd February 5, 2006 +.Dd January 4, 2008 .Dt AUDIT_USER 5 .Os .Sh NAME @@ -67,7 +67,7 @@ .Ed .Pp These settings would cause login/logout and administrative events that -succeed on behalf of user +are performed on behalf of user .Dq Li root to be audited. No failure events are audited. From gonzo at FreeBSD.org Sun Jan 4 23:14:25 2009 From: gonzo at FreeBSD.org (Oleksandr Tymoshenko) Date: Sun Jan 4 23:14:31 2009 Subject: PERFORCE change 155618 for review Message-ID: <200901042314.n04NENxT080648@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155618 Change 155618 by gonzo@gonzo_figaro on 2009/01/04 23:13:41 - KERNVIRTADDR i snot required any more - LDSCRIPT_NAME is not required too. Now, when we have trampolined kernel - disable bfe/mii ATM. Need to figure SSB voodoo first Affected files ... .. //depot/projects/mips2/src/sys/mips/conf/SENTRY5#16 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/conf/SENTRY5#16 (text+ko) ==== @@ -41,13 +41,8 @@ options CFE_CONSOLE options ALT_BREAK_TO_DEBUGGER -# cfe loader expects kernel at 0x80001000 for mips32 w/o backwards -# offsets in the linked elf image (see ldscript hack) -# XXX can we conditionalize the linker stuff on options CFE? -options KERNVIRTADDR=0x80001000 +# makeoptions LDSCRIPT_NAME= ldscript.mips.cfe -makeoptions LDSCRIPT_NAME= ldscript.mips.cfe - #makeoptions ARCH_FLAGS=-march=mips32 makeoptions MIPS_LITTLE_ENDIAN=defined makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols @@ -73,8 +68,8 @@ device siba # Sonics SiliconBackplane device pci # siba_pcib -device bfe # XXX will build both pci and siba -device miibus # attachments +# device bfe # XXX will build both pci and siba +# device miibus # attachments # pci devices # notyet: From weongyo at FreeBSD.org Mon Jan 5 10:53:24 2009 From: weongyo at FreeBSD.org (Weongyo Jeong) Date: Mon Jan 5 10:53:32 2009 Subject: PERFORCE change 155642 for review Message-ID: <200901051053.n05ArJUm082565@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155642 Change 155642 by weongyo@weongyo_ws on 2009/01/05 10:52:36 IFC Affected files ... .. //depot/projects/ndisusb/COPYRIGHT#3 integrate .. //depot/projects/ndisusb/Makefile#5 integrate .. //depot/projects/ndisusb/ObsoleteFiles.inc#6 integrate .. //depot/projects/ndisusb/UPDATING#6 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/CHANGES#4 integrate .. //depot/projects/ndisusb/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/ndisusb/contrib/bind9/FAQ#2 integrate .. //depot/projects/ndisusb/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/ndisusb/contrib/bind9/README#2 integrate .. //depot/projects/ndisusb/contrib/bind9/aclocal.m4#1 branch .. //depot/projects/ndisusb/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/nsupdate/nsupdate.1#1 branch .. //depot/projects/ndisusb/contrib/bind9/bin/nsupdate/nsupdate.8#2 delete .. //depot/projects/ndisusb/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/config.h.in#1 branch .. //depot/projects/ndisusb/contrib/bind9/configure.in#3 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/misc/sort-options.pl#1 branch .. //depot/projects/ndisusb/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/rfc/rfc4648.txt#1 branch .. //depot/projects/ndisusb/contrib/bind9/doc/rfc/rfc4701.txt#1 branch .. //depot/projects/ndisusb/contrib/bind9/doc/rfc/rfc5155.txt#1 branch .. //depot/projects/ndisusb/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/isc/platform.h.in#1 branch .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/portset.h#1 branch .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/resource.h#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/portset.c#1 branch .. //depot/projects/ndisusb/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/app.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/resource.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/socket_p.h#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/ndisusb/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/version#4 integrate .. //depot/projects/ndisusb/contrib/file/AUTHORS#1 branch .. //depot/projects/ndisusb/contrib/file/COPYING#1 branch .. //depot/projects/ndisusb/contrib/file/ChangeLog#2 integrate .. //depot/projects/ndisusb/contrib/file/FREEBSD-upgrade#2 delete .. //depot/projects/ndisusb/contrib/file/INSTALL#1 branch .. //depot/projects/ndisusb/contrib/file/LEGAL.NOTICE#2 delete .. //depot/projects/ndisusb/contrib/file/MAINT#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/animation#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/apple#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/archive#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/audio#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/c64#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/cddb#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/clarion#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/commands#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/compress#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/console#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/cracklib#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/database#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/diff#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/dump#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/elf#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/erlang#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/flash#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/frame#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/freebsd#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/games#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/gimp#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/gnome-keyring#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/gnumeric#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/graphviz#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/hp#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/iff#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/images#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/inform#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/java#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/kde#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/lex#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/linux#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/llvm#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/lua#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/luks#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/mathcad#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/mercurial#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/mozilla#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/mup#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/netware#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/ole2compounddocs#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/os2#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/palm#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/perl#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/pgp#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/pkgadd#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/printer#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/psion#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/revision#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/riff#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/rpm#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/rtf#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/ruby#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/sc#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/scientific#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/securitycerts#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/sketch#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/softquad#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/spectrum#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/tex#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/troff#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/unicode#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/uuencode#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/warc#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/weak#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/windows#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/xilinx#1 branch .. //depot/projects/ndisusb/contrib/file/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/file/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/file/Makefile.std#2 delete .. //depot/projects/ndisusb/contrib/file/NEWS#1 branch .. //depot/projects/ndisusb/contrib/file/PORTING#2 delete .. //depot/projects/ndisusb/contrib/file/README#2 integrate .. //depot/projects/ndisusb/contrib/file/TODO#1 branch .. //depot/projects/ndisusb/contrib/file/acinclude.m4#2 integrate .. //depot/projects/ndisusb/contrib/file/aclocal.m4#2 integrate .. //depot/projects/ndisusb/contrib/file/apprentice.c#2 integrate .. //depot/projects/ndisusb/contrib/file/ascmagic.c#2 integrate .. //depot/projects/ndisusb/contrib/file/asprintf.c#1 branch .. //depot/projects/ndisusb/contrib/file/compile#1 branch .. //depot/projects/ndisusb/contrib/file/compress.c#2 integrate .. //depot/projects/ndisusb/contrib/file/config.guess#1 branch .. //depot/projects/ndisusb/contrib/file/config.h.in#2 integrate .. //depot/projects/ndisusb/contrib/file/config.sub#1 branch .. //depot/projects/ndisusb/contrib/file/configure#2 integrate .. //depot/projects/ndisusb/contrib/file/configure.ac#1 branch .. //depot/projects/ndisusb/contrib/file/configure.in#2 delete .. //depot/projects/ndisusb/contrib/file/elfclass.h#1 branch .. //depot/projects/ndisusb/contrib/file/file.c#2 integrate .. //depot/projects/ndisusb/contrib/file/file.h#2 integrate .. //depot/projects/ndisusb/contrib/file/file.man#2 integrate .. //depot/projects/ndisusb/contrib/file/fsmagic.c#2 integrate .. //depot/projects/ndisusb/contrib/file/funcs.c#2 integrate .. //depot/projects/ndisusb/contrib/file/getopt_long.c#1 branch .. //depot/projects/ndisusb/contrib/file/is_tar.c#2 integrate .. //depot/projects/ndisusb/contrib/file/libmagic.man#2 integrate .. //depot/projects/ndisusb/contrib/file/magic.c#2 integrate .. //depot/projects/ndisusb/contrib/file/magic.h#2 integrate .. //depot/projects/ndisusb/contrib/file/magic.man#2 integrate .. //depot/projects/ndisusb/contrib/file/magic.mime#2 delete .. //depot/projects/ndisusb/contrib/file/magic2mime#2 delete .. //depot/projects/ndisusb/contrib/file/mkinstalldirs#2 delete .. //depot/projects/ndisusb/contrib/file/mygetopt.h#1 branch .. //depot/projects/ndisusb/contrib/file/names.h#2 integrate .. //depot/projects/ndisusb/contrib/file/patchlevel.h#2 integrate .. //depot/projects/ndisusb/contrib/file/print.c#2 integrate .. //depot/projects/ndisusb/contrib/file/readelf.c#2 integrate .. //depot/projects/ndisusb/contrib/file/readelf.h#2 integrate .. //depot/projects/ndisusb/contrib/file/softmagic.c#2 integrate .. //depot/projects/ndisusb/contrib/file/tar.h#2 integrate .. //depot/projects/ndisusb/contrib/file/test.c#2 delete .. //depot/projects/ndisusb/contrib/file/tests/Makefile.am#1 branch .. //depot/projects/ndisusb/contrib/file/tests/Makefile.in#1 branch .. //depot/projects/ndisusb/contrib/file/tests/README#1 branch .. //depot/projects/ndisusb/contrib/file/tests/gedcom.magic#1 branch .. //depot/projects/ndisusb/contrib/file/tests/gedcom.result#1 branch .. //depot/projects/ndisusb/contrib/file/tests/gedcom.testfile#1 branch .. //depot/projects/ndisusb/contrib/file/tests/test.c#1 branch .. //depot/projects/ndisusb/contrib/file/vasprintf.c#1 branch .. //depot/projects/ndisusb/contrib/openbsm/Makefile.am#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/NEWS#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/README#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/TODO#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/VERSION#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/audit/Makefile.am#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/audit/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/audit/audit.8#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/Makefile.am#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/audit_warn.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/auditd.h#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/auditd_darwin.c#1 branch .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/auditd_fbsd.c#1 branch .. //depot/projects/ndisusb/contrib/openbsm/bin/auditfilterd/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditreduce/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/praudit/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bsm/Makefile.am#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bsm/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bsm/audit_uevents.h#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bsm/auditd_lib.h#1 branch .. //depot/projects/ndisusb/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/config/config.h.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/configure#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libauditd/Makefile.am#1 branch .. //depot/projects/ndisusb/contrib/openbsm/libauditd/Makefile.in#1 branch .. //depot/projects/ndisusb/contrib/openbsm/libauditd/auditd_lib.c#1 branch .. //depot/projects/ndisusb/contrib/openbsm/libbsm/Makefile.am#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/au_errno.3#1 branch .. //depot/projects/ndisusb/contrib/openbsm/libbsm/au_token.3#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/audit_submit.3#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_class.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_control.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_errno.c#1 branch .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_event.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_mask.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_user.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_wrappers.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/audit.log.5#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/modules/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/modules/auditfilter_noop/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/audit.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/audit_errno.h#1 branch .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/audit_record.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/bsm/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/E2BIG_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EACCES_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EBADF_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EBUSY_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ECHILD_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EDEADLK_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EEXIST_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EFAULT_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EFBIG_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EINTR_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EINVAL_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EIO_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EISDIR_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EMFILE_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EMLINK_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENFILE_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENODEV_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENOENT_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENOEXEC_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENOMEM_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENOSPC_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENOTBLK_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENOTDIR_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENOTTY_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENXIO_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EPERM_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EPIPE_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EROFS_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ESPIPE_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ESRCH_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ETXTBSY_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EXDEV_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/header32_token#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/process32ex_record-IPv4#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/process32ex_record-IPv6#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/process64_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/process64ex_record-IPv4#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/process64ex_record-IPv6#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/return32_token#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/socketex_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/socketex_token#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/zonename_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/tools/Makefile.in#3 integrate .. //depot/projects/ndisusb/etc/devd.conf#5 integrate .. //depot/projects/ndisusb/etc/devd/asus.conf#2 integrate .. //depot/projects/ndisusb/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/ndisusb/gnu/usr.bin/man/manpath/manpath.config#2 integrate .. //depot/projects/ndisusb/lib/Makefile#3 integrate .. //depot/projects/ndisusb/lib/bind/bind/config.h#2 integrate .. //depot/projects/ndisusb/lib/bind/bind/port_after.h#3 integrate .. //depot/projects/ndisusb/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/ndisusb/lib/bind/config.h#3 integrate .. //depot/projects/ndisusb/lib/bind/dns/code.h#2 integrate .. //depot/projects/ndisusb/lib/bind/dns/dns/enumclass.h#2 integrate .. //depot/projects/ndisusb/lib/bind/dns/dns/enumtype.h#2 integrate .. //depot/projects/ndisusb/lib/bind/dns/dns/rdatastruct.h#2 integrate .. //depot/projects/ndisusb/lib/bind/isc/Makefile#2 integrate .. //depot/projects/ndisusb/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/ndisusb/lib/libauditd/Makefile#1 branch .. //depot/projects/ndisusb/lib/libbsm/Makefile#2 integrate .. //depot/projects/ndisusb/lib/libc/arm/_fpmath.h#2 integrate .. //depot/projects/ndisusb/lib/libc/arm/arith.h#2 integrate .. //depot/projects/ndisusb/lib/libc/include/fpmath.h#2 integrate .. //depot/projects/ndisusb/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/ndisusb/lib/libelf/README#1 branch .. //depot/projects/ndisusb/lib/libmagic/Makefile#2 integrate .. //depot/projects/ndisusb/lib/libusb20/libusb20_desc.c#2 integrate .. //depot/projects/ndisusb/lib/libutil/kinfo_getfile.c#2 integrate .. //depot/projects/ndisusb/lib/libutil/kinfo_getvmmap.c#2 integrate .. //depot/projects/ndisusb/lib/msun/src/math_private.h#2 integrate .. //depot/projects/ndisusb/sbin/ddb/ddb.8#3 integrate .. //depot/projects/ndisusb/sbin/fsck_ffs/main.c#4 integrate .. //depot/projects/ndisusb/sbin/geom/class/virstor/gvirstor.8#2 integrate .. //depot/projects/ndisusb/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/ndisusb/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/ndisusb/sbin/mount/mount.c#4 integrate .. //depot/projects/ndisusb/sbin/mount_msdosfs/mount_msdosfs.8#2 integrate .. //depot/projects/ndisusb/sbin/savecore/savecore.8#2 integrate .. //depot/projects/ndisusb/sbin/shutdown/shutdown.8#2 integrate .. //depot/projects/ndisusb/share/doc/bind9/Makefile#2 integrate .. //depot/projects/ndisusb/share/man/man4/Makefile#5 integrate .. //depot/projects/ndisusb/share/man/man4/ae.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/cpuctl.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/ndis.4#3 integrate .. //depot/projects/ndisusb/share/man/man4/ng_ether_echo.4#1 branch .. //depot/projects/ndisusb/share/man/man4/ng_tty.4#3 integrate .. //depot/projects/ndisusb/share/man/man4/textdump.4#3 integrate .. //depot/projects/ndisusb/share/man/man4/uscanner.4#2 integrate .. //depot/projects/ndisusb/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/ndisusb/share/man/man9/dev_clone.9#2 integrate .. //depot/projects/ndisusb/share/man/man9/domain.9#2 integrate .. //depot/projects/ndisusb/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/ndisusb/sys/amd64/conf/USB2#1 branch .. //depot/projects/ndisusb/sys/arm/conf/AVILA#4 integrate .. //depot/projects/ndisusb/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/ndisusb/sys/arm/conf/EP80219#4 integrate .. //depot/projects/ndisusb/sys/arm/conf/HL200#3 integrate .. //depot/projects/ndisusb/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/ndisusb/sys/arm/conf/NSLU#3 integrate .. //depot/projects/ndisusb/sys/arm/include/armreg.h#4 integrate .. //depot/projects/ndisusb/sys/arm/include/ieee.h#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/if_npereg.h#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp435_ehci.c#2 delete .. //depot/projects/ndisusb/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/ndisusb/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/ndisusb/sys/bsm/audit.h#4 integrate .. //depot/projects/ndisusb/sys/bsm/audit_errno.h#1 branch .. //depot/projects/ndisusb/sys/bsm/audit_internal.h#4 integrate .. //depot/projects/ndisusb/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/ndisusb/sys/bsm/audit_record.h#4 integrate .. //depot/projects/ndisusb/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/ndisusb/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/ndisusb/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/ndisusb/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/ndisusb/sys/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/ndisusb/sys/compat/ndis/kern_windrv.c#4 integrate .. //depot/projects/ndisusb/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/ndisusb/sys/compat/ndis/ntoskrnl_var.h#10 integrate .. //depot/projects/ndisusb/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/ndisusb/sys/compat/ndis/subr_ntoskrnl.c#9 integrate .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#36 integrate .. //depot/projects/ndisusb/sys/compat/ndis/usbd_var.h#9 integrate .. //depot/projects/ndisusb/sys/conf/files#6 integrate .. //depot/projects/ndisusb/sys/conf/files.amd64#4 integrate .. //depot/projects/ndisusb/sys/conf/files.i386#5 integrate .. //depot/projects/ndisusb/sys/conf/files.ia64#3 integrate .. //depot/projects/ndisusb/sys/conf/files.powerpc#5 integrate .. //depot/projects/ndisusb/sys/conf/files.sparc64#4 integrate .. //depot/projects/ndisusb/sys/conf/options#5 integrate .. //depot/projects/ndisusb/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/ndisusb/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/ndisusb/sys/dev/agp/agp.c#3 integrate .. //depot/projects/ndisusb/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/ndisusb/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/ndisusb/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/ndisusb/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#17 integrate .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis_usb.c#6 integrate .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#10 integrate .. //depot/projects/ndisusb/sys/dev/ofw/ofw_bus_subr.c#3 integrate .. //depot/projects/ndisusb/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/ndisusb/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/ndisusb/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/ndisusb/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/ndisusb/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/ndisusb/sys/dev/syscons/scterm-dumb.c#2 delete .. //depot/projects/ndisusb/sys/dev/syscons/scterm-sc.c#3 delete .. //depot/projects/ndisusb/sys/dev/syscons/scterm-teken.c#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/scterm.c#2 integrate .. //depot/projects/ndisusb/sys/dev/syscons/sctermvar.h#2 delete .. //depot/projects/ndisusb/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/ndisusb/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/ndisusb/sys/dev/syscons/teken/Makefile#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/gensequences#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/sequences#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/teken.c#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/teken.h#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/teken_demo.c#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/teken_stress.c#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/teken_subr.h#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/teken_subr_compat.h#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/teken_wcwidth.h#1 branch .. //depot/projects/ndisusb/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb/ehci_ixp4xx.c#1 branch .. //depot/projects/ndisusb/sys/dev/usb/if_zyd.c#4 integrate .. //depot/projects/ndisusb/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/ndisusb/sys/dev/usb/umass.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/ndisusb/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/at91dci.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/at91dci_atmelarm.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ehci2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ehci2.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ehci2_pci.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/musb2_otg.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/musb2_otg_atmelarm.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ohci2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ohci2_atmelarm.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ohci2_pci.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/uhci2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/uhci2.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/uhci2_pci.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/usb2_bus.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/usb2_controller.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/usb2_controller.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/uss820dci.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_busdma.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_core.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_device.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_device.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_dynamic.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_dynamic.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_generic.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_handle_request.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_hub.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_hub.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_msctest.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_msctest.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_request.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_request.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_transfer.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_transfer.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_aue2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_axe2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_axe2_reg.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_cue2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_kue2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_rue2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_udav2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/image/uscanner2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/include/usb2_devid.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/include/usb2_devtable.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/include/usb2_ioctl.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/include/usb2_standard.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/input/ukbd2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/input/ums2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/u3g2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uchcom2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uftdi2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/ulpt2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uplcom2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uvscom2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/sound/uaudio2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/storage/umass2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/storage/ustorage2_fs.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/wlan/if_rum2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/wlan/if_ural2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/wlan/if_zyd2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/wlan/if_zyd2_reg.h#2 integrate .. //depot/projects/ndisusb/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/ndisusb/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/ndisusb/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/ndisusb/sys/dev/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/ndisusb/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/ndisusb/sys/fs/procfs/procfs_map.c#4 integrate .. //depot/projects/ndisusb/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/ndisusb/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/ndisusb/sys/geom/part/g_part_bsd.c#4 integrate .. //depot/projects/ndisusb/sys/geom/part/g_part_pc98.c#5 integrate .. //depot/projects/ndisusb/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/ndisusb/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/ndisusb/sys/i386/conf/USB2#1 branch .. //depot/projects/ndisusb/sys/i386/conf/XEN#3 integrate .. //depot/projects/ndisusb/sys/i386/i386/genassym.c#4 integrate .. //depot/projects/ndisusb/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/ndisusb/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/ndisusb/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/ndisusb/sys/i386/include/xen/evtchn.h#2 delete .. //depot/projects/ndisusb/sys/i386/include/xen/hypervisor.h#2 delete .. //depot/projects/ndisusb/sys/i386/include/xen/xen_intr.h#2 delete .. //depot/projects/ndisusb/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/ndisusb/sys/i386/isa/npx.c#3 integrate .. //depot/projects/ndisusb/sys/i386/xen/clock.c#2 integrate .. //depot/projects/ndisusb/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/ndisusb/sys/i386/xen/mptable.c#2 integrate .. //depot/projects/ndisusb/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/ndisusb/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/ndisusb/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/ndisusb/sys/kern/kern_jail.c#5 integrate .. //depot/projects/ndisusb/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/ndisusb/sys/kern/kern_proc.c#4 integrate .. //depot/projects/ndisusb/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/ndisusb/sys/kern/kern_xxx.c#4 integrate .. //depot/projects/ndisusb/sys/kern/sched_ule.c#4 integrate .. //depot/projects/ndisusb/sys/kern/subr_param.c#5 integrate .. //depot/projects/ndisusb/sys/kern/tty.c#4 integrate .. //depot/projects/ndisusb/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/ndisusb/sys/kern/uipc_debug.c#3 integrate .. //depot/projects/ndisusb/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/ndisusb/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/ndisusb/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/ndisusb/sys/kern/vfs_export.c#5 integrate .. //depot/projects/ndisusb/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/ndisusb/sys/mips/mips/elf64_machdep.c#1 branch .. //depot/projects/ndisusb/sys/modules/ndis/Makefile#3 integrate .. //depot/projects/ndisusb/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/ndisusb/sys/modules/netgraph/ether_echo/Makefile#1 branch .. //depot/projects/ndisusb/sys/modules/usb2/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/usb2/serial_3g/Makefile#1 branch .. //depot/projects/ndisusb/sys/net/if_tun.c#5 integrate .. //depot/projects/ndisusb/sys/net/route.c#4 integrate .. //depot/projects/ndisusb/sys/net/route.h#4 integrate .. //depot/projects/ndisusb/sys/net/rtsock.c#5 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_wds.c#3 integrate .. //depot/projects/ndisusb/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate .. //depot/projects/ndisusb/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/ndisusb/sys/netgraph/ng_ether_echo.c#1 branch .. //depot/projects/ndisusb/sys/netgraph/ng_ether_echo.h#1 branch .. //depot/projects/ndisusb/sys/netinet/if_ether.c#5 integrate .. //depot/projects/ndisusb/sys/netinet/in.c#5 integrate .. //depot/projects/ndisusb/sys/netinet/ip_output.c#4 integrate .. //depot/projects/ndisusb/sys/netinet/ipprotosw.h#2 delete .. //depot/projects/ndisusb/sys/netinet6/in6.c#5 integrate .. //depot/projects/ndisusb/sys/netinet6/in6_gif.c#4 integrate .. //depot/projects/ndisusb/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/ndisusb/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/ndisusb/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/ndisusb/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/ndisusb/sys/netipsec/vipsec.h#3 integrate .. //depot/projects/ndisusb/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/ndisusb/sys/pc98/cbus/scterm-sck.c#3 integrate .. //depot/projects/ndisusb/sys/pc98/cbus/sctermvar.h#1 branch .. //depot/projects/ndisusb/sys/powerpc/powermac/grackle.c#5 integrate .. //depot/projects/ndisusb/sys/powerpc/powermac/gracklevar.h#3 integrate .. //depot/projects/ndisusb/sys/powerpc/powermac/macio.c#5 integrate .. //depot/projects/ndisusb/sys/powerpc/powermac/uninorth.c#5 integrate .. //depot/projects/ndisusb/sys/powerpc/powermac/uninorthvar.h#4 integrate .. //depot/projects/ndisusb/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/ndisusb/sys/security/audit/audit_bsm_errno.c#1 branch .. //depot/projects/ndisusb/sys/security/audit/audit_bsm_token.c#5 integrate .. //depot/projects/ndisusb/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/ndisusb/sys/sparc64/include/tlb.h#3 integrate .. //depot/projects/ndisusb/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/ndisusb/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/ndisusb/sys/sys/copyright.h#3 integrate .. //depot/projects/ndisusb/sys/sys/elf64.h#2 integrate .. //depot/projects/ndisusb/sys/sys/elf_common.h#4 integrate .. //depot/projects/ndisusb/sys/sys/elf_generic.h#2 integrate .. //depot/projects/ndisusb/sys/sys/file.h#4 integrate .. //depot/projects/ndisusb/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/ndisusb/sys/sys/link_elf.h#3 integrate .. //depot/projects/ndisusb/sys/sys/protosw.h#3 integrate .. //depot/projects/ndisusb/sys/sys/tree.h#2 integrate .. //depot/projects/ndisusb/sys/vm/vm_map.c#3 integrate .. //depot/projects/ndisusb/sys/vm/vm_map.h#2 integrate .. //depot/projects/ndisusb/sys/vm/vm_page.c#4 integrate .. //depot/projects/ndisusb/sys/vm/vm_page.h#3 integrate .. //depot/projects/ndisusb/sys/xen/evtchn.h#1 branch .. //depot/projects/ndisusb/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/ndisusb/sys/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/ndisusb/sys/xen/features.c#2 integrate .. //depot/projects/ndisusb/sys/xen/gnttab.c#3 integrate .. //depot/projects/ndisusb/sys/xen/gnttab.h#3 integrate .. //depot/projects/ndisusb/sys/xen/hypervisor.h#1 branch .. //depot/projects/ndisusb/sys/xen/xen_intr.h#1 branch .. //depot/projects/ndisusb/sys/xen/xenbus/xenbus_client.c#3 integrate .. //depot/projects/ndisusb/sys/xen/xenbus/xenbus_comms.c#3 integrate .. //depot/projects/ndisusb/sys/xen/xenbus/xenbus_comms.h#3 integrate .. //depot/projects/ndisusb/sys/xen/xenbus/xenbus_dev.c#3 integrate .. //depot/projects/ndisusb/sys/xen/xenbus/xenbus_probe.c#3 integrate .. //depot/projects/ndisusb/sys/xen/xenbus/xenbus_probe_backend.c#3 integrate .. //depot/projects/ndisusb/sys/xen/xenbus/xenbus_xs.c#3 integrate .. //depot/projects/ndisusb/sys/xen/xenbus/xenbusvar.h#2 integrate .. //depot/projects/ndisusb/tools/tools/README#2 integrate .. //depot/projects/ndisusb/tools/tools/ether_reflect/Makefile#1 branch .. //depot/projects/ndisusb/tools/tools/ether_reflect/ether_reflect.1#1 branch .. //depot/projects/ndisusb/tools/tools/ether_reflect/ether_reflect.c#1 branch .. //depot/projects/ndisusb/tools/tools/mctest/mctest.1#3 integrate .. //depot/projects/ndisusb/usr.bin/csplit/csplit.1#2 integrate .. //depot/projects/ndisusb/usr.bin/fstat/zfs.c#2 integrate .. //depot/projects/ndisusb/usr.bin/gprof/gprof.1#2 integrate .. //depot/projects/ndisusb/usr.bin/make/for.c#2 integrate .. //depot/projects/ndisusb/usr.bin/make/globals.h#3 integrate .. //depot/projects/ndisusb/usr.bin/make/job.c#4 integrate .. //depot/projects/ndisusb/usr.bin/make/job.h#3 integrate .. //depot/projects/ndisusb/usr.bin/make/main.c#4 integrate .. //depot/projects/ndisusb/usr.bin/make/make.1#4 integrate .. //depot/projects/ndisusb/usr.bin/make/make.h#2 integrate .. //depot/projects/ndisusb/usr.bin/make/parse.c#2 integrate .. //depot/projects/ndisusb/usr.bin/make/suff.c#2 integrate .. //depot/projects/ndisusb/usr.bin/make/var.c#2 integrate .. //depot/projects/ndisusb/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/ndisusb/usr.bin/netstat/main.c#3 integrate .. //depot/projects/ndisusb/usr.bin/netstat/unix.c#2 integrate .. //depot/projects/ndisusb/usr.bin/nsupdate/Makefile#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat.c#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_args.c#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_basic.c#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_bin.c#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_cred.c#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_files.c#5 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_kstack.c#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_threads.c#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_vm.c#3 integrate .. //depot/projects/ndisusb/usr.bin/top/machine.c#3 integrate .. //depot/projects/ndisusb/usr.sbin/arp/arp.8#2 integrate .. //depot/projects/ndisusb/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/ndisusb/usr.sbin/auditd/Makefile#3 integrate .. //depot/projects/ndisusb/usr.sbin/burncd/burncd.c#3 integrate .. //depot/projects/ndisusb/usr.sbin/cpucontrol/cpucontrol.8#2 integrate .. //depot/projects/ndisusb/usr.sbin/fwcontrol/fwcontrol.c#4 integrate .. //depot/projects/ndisusb/usr.sbin/gssd/Makefile#2 integrate .. //depot/projects/ndisusb/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/ndisusb/usr.sbin/mergemaster/mergemaster.sh#3 integrate .. //depot/projects/ndisusb/usr.sbin/ndiscvt/inf.c#5 integrate .. //depot/projects/ndisusb/usr.sbin/ndiscvt/windrv_stub.c#3 integrate .. //depot/projects/ndisusb/usr.sbin/ndp/ndp.c#3 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/add/main.c#5 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/lib/lib.h#4 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/lib/plist.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/pmcstat/pmcstat.c#4 integrate .. //depot/projects/ndisusb/usr.sbin/powerd/powerd.8#4 integrate .. //depot/projects/ndisusb/usr.sbin/sade/disks.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/sysinstall/disks.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/sysinstall/menus.c#4 integrate .. //depot/projects/ndisusb/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/ndisusb/usr.sbin/syslogd/syslog.conf.5#3 integrate .. //depot/projects/ndisusb/usr.sbin/ugidfw/ugidfw.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/usbdevs/usbdevs.c#2 integrate Differences ... ==== //depot/projects/ndisusb/COPYRIGHT#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/COPYRIGHT,v 1.10 2008/11/28 19:21:10 imp Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.11 2008/12/30 04:46:25 imp Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (C) 1992-2008 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2009 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/ndisusb/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.355 2008/12/01 00:45:51 alfred Exp $ +# $FreeBSD: src/Makefile,v 1.356 2008/12/27 15:07:51 bz Exp $ # # The user-driven targets are: # @@ -298,7 +298,7 @@ .endif .for target in ${TARGETS} KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ - find [A-Z]*[A-Z] -type f -maxdepth 0 \ + find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} universe: universe_${target} ==== //depot/projects/ndisusb/ObsoleteFiles.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.164 2008/11/30 11:03:16 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.166 2009/01/03 11:25:50 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1 +OLD_FILES+=usr/share/man/man8/nsupdate.8.gz +# 20081223: ipprotosw.h removed +OLD_FILES+=usr/include/netinet/ipprotosw.h # 20081123: vfs_mountedon.9 removed OLD_FILES+=usr/share/man/man9/vfs_mountedon.9.gz # 20081023: FREE.9 and MALLOC.9 removed ==== //depot/projects/ndisusb/UPDATING#6 (text+ko) ==== @@ -22,6 +22,12 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081225: + ng_tty(4) module updated to match the new TTY subsystem. + Due to API change, user-level applications must be updated. + New API support added to mpd5 CVS and expected to be present + in next mpd5.3 release. + 20081219: With __FreeBSD_version 800060 the makefs tool is part of the base system (it was a port). @@ -1195,4 +1201,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.556 2008/12/19 23:12:14 sam Exp $ +$FreeBSD: src/UPDATING,v 1.557 2008/12/25 10:05:00 mav Exp $ ==== //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 (text+ko) ==== @@ -146,6 +146,7 @@ #include #include +#include #include #include ==== //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/ndisusb/contrib/bind9/CHANGES#4 (text+ko) ==== @@ -1,14 +1,158 @@ - --- 9.4.2-P2 released --- + + --- 9.4.3 released --- + +2490. [port] aix: work around a kernel bug where IPV6_RECVPKTINFO + is cleared when IPV6_V6ONLY is set. [RT #18785] + +2489. [port] solaris: Workaround Solaris's kernel bug about + /dev/poll: + http://bugs.opensolaris.org/view_bug.do?bug_id=6724237 + Define ISC_SOCKET_USE_POLLWATCH at build time to enable + this workaround. [RT #18870] + + --- 9.4.3rc1 released --- + +2473. [port] linux: raise the limit on open files to the possible + maximum value before spawning threads; 'files' + specified in named.conf doesn't seem to work with + threads as expected. [RT #18784] + +2472. [port] linux: check the number of available cpu's before + calling chroot as it depends on "/proc". [RT #16923] + +2471. [bug] named-checkzone was not reporting missing manditory + glue when sibling checks were disabled. [RT #18768] + +2469. [port] solaris: Work around Solaris's select() limitations. + [RT #18769] + +2468. [bug] Resolver could try unreachable servers multiple times. + [RT #18739] + +2467. [bug] Failure of fcntl(F_DUPFD) wasn't logged. [RT #18740] + +2466. [doc] ARM: explain max-cache-ttl 0 SERVFAIL issue. + [RT #18302] + +2465. [bug] Adb's handling of lame addresses was different + for IPv4 and IPv6. [RT #18738] + +2463. [port] linux: POSIX doesn't include the IPv6 Advanced Socket + API and glibc hides parts of the IPv6 Advanced Socket >>> TRUNCATED FOR MAIL (1000 lines) <<< From rene at FreeBSD.org Mon Jan 5 11:37:08 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Mon Jan 5 11:37:15 2009 Subject: PERFORCE change 155643 for review Message-ID: <200901051137.n05Bb65H086882@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155643 Change 155643 by rene@rene_self on 2009/01/05 11:36:10 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/hubs/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#8 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#13 integrate .. //depot/projects/docproj_nl/www/en/index.xsl#4 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/Makefile#3 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/announce.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/errata.html#2 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/hardware.html#2 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/readme.html#2 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/relnotes.html#2 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#11 integrate .. //depot/projects/docproj_nl/www/en/releases/index.sgml#5 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#11 integrate .. //depot/projects/docproj_nl/www/share/sgml/libcommon.xsl#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#24 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#9 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/hubs/article.sgml#2 (text+ko) ==== @@ -7,7 +7,7 @@
Mirroring FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/hubs/article.sgml,v 1.66 2008/02/24 19:27:21 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/hubs/article.sgml,v 1.67 2009/01/05 05:35:03 kuriyama Exp $ Jun @@ -79,8 +79,8 @@ Here are some approximate figures: - Full FTP Distribution: 412 GB - CVS repository: 3.3 GB + Full FTP Distribution: 739 GB + CVS repository: 3.8 GB CTM deltas: 3.2 GB Web pages: 463 MB ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -638,12 +638,13 @@ The tree was branched again in July 2005, this time for RELENG_6. 6.0-RELEASE, the first release of the 6.X branch, was released in November 2005. The most recent &rel2.current;-RELEASE came out in - &rel2.current.date;. There will be additional releases from the + &rel2.current.date;. This will probably be the final release from the RELENG_6 branch. - The RELENG_7 branch was created in October 2007. The most - recent release of this branch was &rel.current;-RELEASE, which came - out in &rel.current.date;. There will be additional releases from the + The RELENG_7 branch was created in October 2007. The first + release of this branch was 7.0-RELEASE, which came + out in February 2008. The most recent &rel.current;-RELEASE came out + in &rel.current.date;. There will be additional releases from the RELENG_7 branch. For now, long-term development projects continue to take place ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ - - + + ==== //depot/projects/docproj_nl/share/sgml/man-refs.ent#13 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.477 2008/12/31 05:47:03 hrs Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.479 2009/01/05 08:20:23 hrs Exp $ --> @@ -564,6 +564,7 @@ + @@ -3387,6 +3388,7 @@ + ==== //depot/projects/docproj_nl/www/en/index.xsl#4 (text+ko) ==== @@ -4,7 +4,7 @@ ]> - + @@ -303,7 +303,7 @@
  • - More + More
  • Security Advisories RSS Feed ==== //depot/projects/docproj_nl/www/en/releases/7.1R/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releases/7.1R/Makefile,v 1.2 2008/12/31 06:17:26 hrs Exp $ +# $FreeBSD: www/en/releases/7.1R/Makefile,v 1.3 2009/01/05 04:08:29 hrs Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -7,8 +7,7 @@ .include "../Makefile.inc" .endif -#DOCS= announce.sgml schedule.sgml -DOCS= schedule.sgml +DOCS= announce.sgml schedule.sgml DATA= docbook.css DATA+= errata.html ==== //depot/projects/docproj_nl/www/en/releases/7.1R/announce.sgml#2 (text+ko) ==== @@ -1,13 +1,424 @@ - + ]> &header; -

    Not announced yet

    - &footer; +

    The FreeBSD Release Engineering Team is pleased to announce the + availability of FreeBSD 7.1-RELEASE. This is the second release + from the 7-STABLE branch which improves on the functionality of + FreeBSD 7.0 and introduces some new features. Some of the + highlights:

    + +
      +

    • The ULE scheduler is now the default in GENERIC kernels for + amd64 and i386 architectures. The ULE scheduler significantly + improves performance on multicore systems for many workloads.

      • + +

    • Support for using DTrace inside the kernel has been imported + from OpenSolaris. DTrace is a comprehensive dynamic tracing + framework.

      • + +

    • A new and much-improved NFS Lock Manager (NLM) client.

      • + +

    • Boot loader changes allow, among other things, booting from + USB devices and booting from GPT-labeled devices.

      • + +

    • The cpuset(2) system call and cpuset(1) command have been added, + providing an API for thread to CPU binding and CPU resource + grouping and assignment.

      • + +

    • KDE updated to 3.5.10, GNOME updated to 2.22.3.

      • + +

    • DVD-sized media for the amd64 and i386 architectures

      • +
    + +

    For a complete list of new features and known problems, please + see the online release notes and errata list, available at:

    + + + +

    For more information about FreeBSD release engineering activities, + please see:

    + +

    http://www.FreeBSD.org/releng/

    + +

    Availability

    + +

    FreeBSD 7.1-RELEASE is now available for the amd64, i386, ia64, + pc98, powerpc, and sparc64 architectures.

    + +

    FreeBSD 7.1 can be installed from bootable ISO images or over the + network; the required files can be downloaded via FTP or + BitTorrent as described in the sections below. While some of the + smaller FTP mirrors may not carry all architectures, they will all + generally contain the more common ones, such as i386 and + amd64.

    + +

    MD5 and SHA256 hashes for the release ISO images are included at + the bottom of this message.

    + +

    The purpose of the ISO images provided as part of the release are + as follows:

    + +
    +
    dvd1:
    +

    Contains everything necessary to install the base FreeBSD + operating system, a collection of pre-built packages, the + documentation, and supports booting into a "livefs" based + rescue mode. This should be all you need if you can burn + and use DVD-sized media.

    + +
    disc1, disc2, disc3, livefs, docs:
    +

    disc1 contains the base FreeBSD + system and a few pre-built packages. disc2 and disc3 contain + more pre-built packages. Those three can be burned to CDROM + sized media and should be all you need to do a normal installation. + livefs contains support for entering into a "livefs" based + rescue mode but you need disc1 to do the initial boot first. + docs contains the documentation.

    + +
    bootonly:
    +

    This supports booting a machine using the CDROM drive but + does not contain the support for installing FreeBSD from the + CD itself, you would need to perform a network based install + (e.g. from an FTP server) after booting from the CD.

    +
    + +

    FreeBSD 7.1-RELEASE can also be purchased on CD-ROM or DVD from + several vendors. One of the vendors that will be offering FreeBSD + 7.1-based products is:

    + + + +

    BitTorrent

    + +

    7.1-RELEASE ISOs are available via BitTorrent. A collection of + torrent files to download the images is available at:

    + +

    http://torrents.freebsd.org:8080

    + +

    FTP

    + +

    At the time of this announcement the following FTP sites have + FreeBSD 7.1-RELEASE available.

    + + + +

    However before trying these sites you may want to check your regional + mirror(s) first by going to:

    + +

    ftp://ftp.<yourdomain>.FreeBSD.org/pub/FreeBSD

    + +

    Any additional mirror sites will be labeled ftp2, + ftp3 and so on.

    + +

    More information about FreeBSD mirror sites can be found at:

    + +

    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html

    + +

    For instructions on installing FreeBSD, please see Chapter 2 of The + FreeBSD Handbook. It provides a complete installation walk-through + for users new to FreeBSD, and can be found online at:

    + +

    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/install.html

    + +

    Updating Existing Systems

    + +

    NOTE: If updating from a 7.0 or earlier system due to a + change in the Vendor's drivers certain Intel NICs will now come up + as igb(4) instead of em(4). We normally try to avoid changes like + that in stable branches but the vendor felt it necessary in order + to support the new adapters. See the UPDATING entry dated + 20080811 for details. There are only 3 PCI ID's that should have + their name changed from em(4) to igb(4): 0x10A78086, 0x10A98086, + and 0x10D68086. You should be able to determine if your card will + change names by running the command "pciconf -l", and for the line + representing your NIC (should be named em on older systems, + e.g. em0 or em1, etc) check the fourth column. If that says + "chip=0x10a78086" (or one of the other two IDs given above) you + will have the adapter's name change.

    + +

    Updates from Source

    + +

    The procedure for doing a source code based update is described + in the FreeBSD Handbook:

    + + + +

    The branch tag to use for updating the source is RELENG_7_1.

    + +

    FreeBSD Update

    + +

    The freebsd-update(8) utility supports binary upgrades of i386 + and amd64 systems running earlier FreeBSD releases. Systems + running 7.0-RELEASE, 7.1-BETA, 7.1-BETA2, 7.1-RC1, or 7.1-RC2 can + upgrade as follows:

    + +

    # freebsd-update upgrade -r 7.1-RELEASE

    + +

    During this process, FreeBSD Update may ask the user to help by merging + some configuration files or by confirming that the automatically performed + merging was done correctly.

    + +

    # freebsd-update install

    + +

    The system must be rebooted with the newly installed kernel before continuing.

    + +

    # shutdown -r now

    + +

    After rebooting, freebsd-update needs to be run again to install the new + userland components, and the system needs to be rebooted again:

    + +

    # freebsd-update install

    +

    # shutdown -r now

    + +

    Users of Intel network interfaces which are changing their name from "em" to + "igb" should make necessary changes to configuration files BEFORE running + freebsd-update, since otherwise the network interface will not be configured + appropriately after rebooting for the first time.

    + +

    Users of earlier FreeBSD releases (FreeBSD 6.x) can also use + freebsd-update to upgrade to FreeBSD 7.1, but will be prompted to + rebuild all third-party applications (e.g., anything installed from + the ports tree) after the second invocation of "freebsd-update + install", in order to handle differences in the system libraries + between FreeBSD 6.x and FreeBSD 7.x.

    + +

    For more information, see:

    + +

    http://www.daemonology.net/blog/2007-11-11-freebsd-major-version-upgrade.html

    + +

    Support

    + +

    The FreeBSD Security Team currently plans to support FreeBSD 7.1 + until January 31st 2011. For more information on the Security + Team and their support of the various FreeBSD branches see:

    + +

    http://www.freebsd.org/security/

    + +

    Acknowledgments

    + +

    Many companiews donated equipment, network access, or man-hours + to support the release engineering activities for FreeBSD 7.1 + including The FreeBSD Foundation, FreeBSD Systems, + Hewlett-Packard, Yahoo!, Network Appliances, and Sentex + Communications.

    + +

    The release engineering team for 7.1-RELEASE includes:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Ken Smith <kensmith@FreeBSD.org>Release Engineering, + amd64, i386, sparc64 Release Building, + Mirror Site Coordination
    Robert Watson <rwatson@FreeBSD.org>Release Engineering, Security
    Konstantin Belousov <kib@FreeBSD.org>Release Engineering
    Marc Fonvieille <blackend@FreeBSD.org>Release Engineering, Documentation
    Maxime Henrion <mux@FreeBSD.org>Release Engineering
    Bruce A. Mah <bmah@FreeBSD.org>Release Engineering, Documentation
    George Neville-Neil <gnn@FreeBSD.org>Release Engineering
    Hiroki Sato <hrs@FreeBSD.org>Release Engineering, Documentation
    Murray Stokely <murray@FreeBSD.org>Release Engineering
    Marcel Moolenaar <marcel@FreeBSD.org>ia64, powerpc Release Building
    Takahashi Yoshihiro <nyan@FreeBSD.org>PC98 Release Building
    Kris Kennaway <kris@FreeBSD.org>Package Building
    Joe Marcus Clarke <marcus@FreeBSD.org>Package Building
    Erwin Lansing <erwin@FreeBSD.org>Package Building
    Mark Linimon <linimon@FreeBSD.org>Package Building
    Pav Lucistnik <pav@FreeBSD.org>Package Building
    Colin Percival <cperciva@FreeBSD.org>Security Officer
    Peter Wemm <peter@FreeBSD.org>Bittorrent Coordination
    + +

    Trademark

    + +

    FreeBSD is a registered trademark of The FreeBSD Foundation.

    + +

    ISO Image Checksums

    + + 
    MD5 (7.1-RELEASE-amd64-bootonly.iso) = f127de85eb1f3a945b56ef750fa610ae
+MD5 (7.1-RELEASE-amd64-disc1.iso) = ac88bfa3359aea242450d74c20347bde
+MD5 (7.1-RELEASE-amd64-disc2.iso) = 918d89e3ee330f5bd13535bc82def802
+MD5 (7.1-RELEASE-amd64-disc3.iso) = d01747e4de48acb052f827d723ef9672
+MD5 (7.1-RELEASE-amd64-docs.iso) = 4558db657d0b021849c2b1a802e1bea4
+MD5 (7.1-RELEASE-amd64-dvd1.iso) = df1a3604d4f99b7cf3511d42d33c550a
+MD5 (7.1-RELEASE-amd64-livefs.iso) = 83dd8e10ff27f8799c66bd4bd26ac5b3
+
+MD5 (7.1-RELEASE-i386-bootonly.iso) = 6988cd1662a03e5465cb38b1100a28eb
+MD5 (7.1-RELEASE-i386-disc1.iso) = ebdea2ebae35597bed323047cd70bcf2
+MD5 (7.1-RELEASE-i386-disc2.iso) = e20444a71dd709d92f3340323e58535c
+MD5 (7.1-RELEASE-i386-disc3.iso) = e64fab3db2917e1ba15bc72ab2af35f6
+MD5 (7.1-RELEASE-i386-docs.iso) = e04e8dc0261fc947efb699faf8852eb8
+MD5 (7.1-RELEASE-i386-dvd1.iso) = bbb47ab60bda55270ddd9ff4f73b9dc8
+MD5 (7.1-RELEASE-i386-livefs.iso) = 148b2aae58b4a9e27970ff77b5dd6f08
+
+MD5 (7.1-RELEASE-ia64-bootonly.iso) = 43c55b764bcc0b6c7ec07037cdca12a7
+MD5 (7.1-RELEASE-ia64-disc1.iso) = 47ffbdbdf8b258c6b1018e3a75b3cab3
+MD5 (7.1-RELEASE-ia64-disc2.iso) = e603d24d1c8e21dbc8e85e4bf30f0482
+MD5 (7.1-RELEASE-ia64-disc3.iso) = ef356f4e4efc7258899a9ead3fa834ea
+MD5 (7.1-RELEASE-ia64-docs.iso) = 7dba36505623251068e7fc1f06099634
+MD5 (7.1-RELEASE-ia64-livefs.iso) = d3f6f2d47b1bd2b46cb7db7180215385
+
+MD5 (7.1-RELEASE-pc98-bootonly.iso) = c46d9eed8fb421f294ffd6a6770dbd46
+MD5 (7.1-RELEASE-pc98-disc1.iso) = 90d8d8c24d8a14c166428df037addc68
+MD5 (7.1-RELEASE-pc98-livefs.iso) = 4c578bfe71d3dd7c2de4ba490fae04ee
+
+MD5 (7.1-RELEASE-powerpc-bootonly.iso) = c7f8b40c7b7194f4b40776b86864e257
+MD5 (7.1-RELEASE-powerpc-disc1.iso) = 228c53863c604298f66a86f0a1fd4f88
+MD5 (7.1-RELEASE-powerpc-disc2.iso) = a1d8c054fdfa420ac1965ca0795f6693
+MD5 (7.1-RELEASE-powerpc-disc3.iso) = 24aa15c263cebf28e1d2f66f7c6b9215
+MD5 (7.1-RELEASE-powerpc-docs.iso) = 3073516ccd548a979794ea0aaba7b732
+
+MD5 (7.1-RELEASE-sparc64-bootonly.iso) = 0fd076346a8d6d49601f4aaa2148edb1
+MD5 (7.1-RELEASE-sparc64-disc1.iso) = 715680a781ed8649271430c10f7907db
+MD5 (7.1-RELEASE-sparc64-disc2.iso) = 7179853c118549dbe780f94e74e90ddf
+MD5 (7.1-RELEASE-sparc64-disc3.iso) = f640b3a800c18020279158f444cf1643
+MD5 (7.1-RELEASE-sparc64-docs.iso) = 94d5661906826735b0a4264197a5f4b4
+
+SHA256 (7.1-RELEASE-amd64-bootonly.iso) = a633924d756812eb6916d0e9cc2821c20935daaf76eb741319bcabd246a2d4ab
+SHA256 (7.1-RELEASE-amd64-disc1.iso) = 4f7deebbd5e3211d144c6e630b808e918fcbb901ff4689b64087ed4c2d6e781d
+SHA256 (7.1-RELEASE-amd64-disc2.iso) = 2236148b61b896d62086889bc6fedaf36a24dbf327c1d1f30f79a6c1ff677b8d
+SHA256 (7.1-RELEASE-amd64-disc3.iso) = 19035ad37eae028bf27b060ea10ecff7a9cc9feae10f951d63907b6be852c458
+SHA256 (7.1-RELEASE-amd64-docs.iso) = ac17871f20b9438ce27ec6598c2441c8ad58f19b5696cacddc332976c2e24a4c
+SHA256 (7.1-RELEASE-amd64-dvd1.iso) = 1c148191e8c01191011d5fde4688aaa567a166838ed9722d1ae73451c4ef2b7d
+SHA256 (7.1-RELEASE-amd64-livefs.iso) = 1a30fca92c806b2f58c569c894bec221e7e2aad9c2937e6c09cd8e340bfb0903
+
+SHA256 (7.1-RELEASE-i386-bootonly.iso) = ad848e85c0a8e83fc5c26fad4f370eb6c34d2e3154966cd460788f56f734085c
+SHA256 (7.1-RELEASE-i386-disc1.iso) = 58e588c26d06b84d8c3c01d8507b2ffe2e237b167f72604c82d34011dc850a46
+SHA256 (7.1-RELEASE-i386-disc2.iso) = 6d0476f77e3a17863eddf59eadb41ecb52c4399614442a0df39f97c8e4c74b2e
+SHA256 (7.1-RELEASE-i386-disc3.iso) = b58d19c5bcb88e5651dce06ccf55bd9a309efaec2b2fe47a9277343a8f6646fe
+SHA256 (7.1-RELEASE-i386-docs.iso) = 521e45641f4e50168a74ea315720d13844e8a1220f28656302aca8281261ac5b
+SHA256 (7.1-RELEASE-i386-dvd1.iso) = 303be4ce844f0cb18aa38a41988dc5fba960427dbcc69263410308176cb5875f
+SHA256 (7.1-RELEASE-i386-livefs.iso) = db1609e72ad3f979b3f6d954ac2811588cc99c460c57e3035835cb604447dc0d
+
+SHA256 (7.1-RELEASE-ia64-bootonly.iso) = 059c82e3e4b535730795a52b939d3085c7cd891a37570a3567e47dee6a345787
+SHA256 (7.1-RELEASE-ia64-disc1.iso) = e97ad79b9f21e3554e47bd125a25dea5adac112608bbcba8c60d45aebc0b1837
+SHA256 (7.1-RELEASE-ia64-disc2.iso) = f1c91524eebe8d1933057669ad7ce1343f18aecbad092d1402652e6c0d69f7a9
+SHA256 (7.1-RELEASE-ia64-disc3.iso) = ed838b4c4801d6244f33cdd02abcca4c208b0dd2d89c6f0446a1913d95662096
+SHA256 (7.1-RELEASE-ia64-docs.iso) = dd7c1dc8fe4968bd32b2fef42b21460211bef5284ecf9be53490de595f4b6a8b
+SHA256 (7.1-RELEASE-ia64-livefs.iso) = 81a8cad96e8540e32a9197d4dcba587b1266a8d56ff75db3755381471793e90f
+
+SHA256 (7.1-RELEASE-pc98-bootonly.iso) = 8b4038d22b59464e7df7cc1273a1929bdf89be77bc8fecfa88faf4d81db049c9
+SHA256 (7.1-RELEASE-pc98-disc1.iso) = 43eae1bc95cc307f0b228cd8388c94cfad0db1402650e5b31262c8a2040ead7a
+SHA256 (7.1-RELEASE-pc98-livefs.iso) = ba4e744629fb5a7f40e288b15a39dc971c3a5108a38e9952ec00fd951292f677
+
+SHA256 (7.1-RELEASE-powerpc-bootonly.iso) = e1c0e47b3aa66604853e9a27ccad381d1abb3b6dbe49fc7a773ba91720dd5862
+SHA256 (7.1-RELEASE-powerpc-disc1.iso) = e672b975d10502677076014804d486c406e79cd7724353f76abc68b55dd5972e
+SHA256 (7.1-RELEASE-powerpc-disc2.iso) = 9f6aff26f127a229cdae1e73c4eb25d6d51b595380110bb99f9882b88c0a2a20
+SHA256 (7.1-RELEASE-powerpc-disc3.iso) = 0c0c3a012fad489b425d35e4df539f23be4c26cc46a950f5699b84da4a37bdb2
+SHA256 (7.1-RELEASE-powerpc-docs.iso) = 4fc75610e7bed8c05e474053266b4a8cce40c039707e39970ca2cf78ff99dee9
+
+SHA256 (7.1-RELEASE-sparc64-bootonly.iso) = d8259fa546988201cb629ce606a10f8928e7b93a6e317e4078abbe6804bd5068
+SHA256 (7.1-RELEASE-sparc64-disc1.iso) = 020030fff08be2a2e99dfa057096a27305c762ad5aebc4b880de84587dd3ef1a
+SHA256 (7.1-RELEASE-sparc64-disc2.iso) = 0d287b855a94317332d0dada8ac6ba2e216200f76551e463e94af30dc14cebdc
+SHA256 (7.1-RELEASE-sparc64-disc3.iso) = 246c73be0f35fcdc7437b346a796c6224a9de887325cdc99f3008fd961c47edb
+SHA256 (7.1-RELEASE-sparc64-docs.iso) = 30e298e8d36cdabcf6b48eea5d5fb784351c44f8cb97df29695037d9513843cc
    + + &footer; ==== //depot/projects/docproj_nl/www/en/releases/7.1R/errata.html#2 (text+ko) ==== @@ -16,10 +16,10 @@

    The FreeBSD Project

    -

    Copyright © 2008 The FreeBSD Documentation Project

    +

    Copyright © 2008, 2009 The FreeBSD Documentation Project

    -

    $FreeBSD: releng/7.1/release/doc/en_US.ISO8859-1/errata/article.sgml -186637 2008-12-31 05:56:22Z hrs $
    +

    $FreeBSD: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml +186764 2009-01-05 08:56:45Z hrs $

    @@ -43,7 +43,7 @@
    -
    +

    This document lists errata items for FreeBSD 7.1-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as @@ -73,8 +73,8 @@ target="_top">http://www.FreeBSD.org/releases/, plus any sites which keep up-to-date mirrors of this location.

    -

    Source and binary snapshots of FreeBSD 7.1-STABLE also contain up-to-date copies of -this document (as of the time of the snapshot).

    +

    Source and binary snapshots of FreeBSD 7-STABLE also contain up-to-date copies of this +document (as of the time of the snapshot).

    For a list of all FreeBSD CERT security advisories, see

    3 Open Issues

    -

    No open issues.

    +

    [20090105] As in the Announcement of 7.1-RELEASE, certain Intel NICs will come up as +igb(4) instead of em(4) in this +release. There are only 3 PCI ID's that should have their name changed from em(4) to igb(4):

    + +
      +
    • +

      0x10A78086

      +
      • + +
    • +

      0x10A98086

      +
      • + +
    • +

      0x10D68086

      +
      • +
    + +

    You should be able to determine if your card will change names by running the +following command:

    + +
    +% pciconf -l
+. . .
+em0@pci0:0:25:0: class=0x020000 card=0x02381028 chip=0x10c08086 rev=0x02 hdr=0x00
+
    + +

    and for the line representing your NIC (should be named em on older systems, e.g. em0 or em1, etc) check the fourth column. If that says chip=0x10a78086 (or one of the other two IDs given above) you will +have the adapter's name change.

    @@ -102,18 +142,173 @@

    4 Late-Breaking News and Corrections

    -

    No news.

    +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the ae(4) driver has been +added to provide support for the Attansic/Atheros L2 FastEthernet controllers. This +driver is not enabled in GENERIC kernels for this release.

    + +

    [20090105] The Release Notes for 7.1-RELEASE included the following +misdescriptions:

    + +
      +
    • +

      In the entry of +linux(4) ABI +support, get_setaffinity() should have been sched_setaffinity().

      +
      • +
    + +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the jme(4) driver has +been added to provide support for PCIe adapters based on JMicron JMC250 gigabit Ethernet +and JMC260 fast Ethernet controllers.

    + +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the age(4) driver has +been added to provide support for Attansic/Atheros L1 gigabit Ethernet controller.

    + +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the +malo(4) driver +has been added to provide support for Marvell Libertas 88W8335 based PCI network +adapters.

    + +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the +bm(4) driver has been added to provide support for Apple Big Mac (BMAC) Ethernet +controller, found on various Apple G3 models.

    + +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the +et(4) driver has been added to provide support for Agere ET1310 10/100/Gigabit Ethernet +controller.

    + +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the +glxsb(4) driver +has been added to provide support for the Security Block in AMD Geode LX processors.

    + +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned that FreeBSD now +supports multiple routing tables. To enable this, the following steps are needed:

    + +
      +
    • +

      Add the following kernel configuration option and rebuild the kernel. The 2 is the number of FIB (Forward Information Base, synonym for a +routing table here). The maximum value is 16.

      + +
      +options    ROUTETABLES=2
+
      + +

      The procedure for rebuilding the FreeBSD kernel is described in the FreeBSD Handbook.

      + +

      This number can be modified on boot time. To do so, add the following to /boot/loader.conf and reboot the system:

      + +
      +net.fibs=6
+
      +
      • + +
    • +

      Set a loader tunable net.my_fibnum if needed. This means +the default number of routing tables. If not specified, 0 will +be used.

      +
      • + +
    • +

      Set a loader tunable net.add_addr_allfibs if needed. This +enables to add routes to all FIBs for new interfaces by default. When this is set to 0, it will only allocate routes on interface changes for the FIB of +the caller when adding a new set of addresses to an interface. Note that this tunable is +set to 1 by default.

      +
      • +
    + +

    To select one of the FIBs, the new +setfib(1) +utility can be used. This set an associated FIB with the process. For example:

    + +
    +# setfib -3 ping target.example.com
+
    + +

    The FIB #3 will be used for the +ping(8) +command.

    + +

    The FIB which the packet will be associated with will be determined in the following +rules:

    + +
      +
    • +

      All packets which have a FIB associated with them will use the FIB. If not, FIB #0 +will be used.

      +
      • + +
    • +

      A packet received on an interface for forwarding uses FIB #0.

      +
      • + +
    • +

      A TCP listen socket associated with an FIB will generate accept sockets which are +associated with the same FIB.

      +
      • + +
    • +

      A packet generated in response to other packet uses the FIB associated with the packet +being responded to.

      +
      • + +
    • +

      A packet generated on tunnel interfaces such as gif(4) and tun(4) will be +encapsulated using the FIB of the process which set up the tunnel.

      +
      • + +
    • +

      Routing messages will be associated with the process's FIB.

      +
      • +
    + +

    Also, the +ipfw(8) now +supports an action rule setfib. The following action:

    + +
    +setfib fibnum
+
    + +

    will make the matched packet use the FIB specified in fibnum. The rule processing continues at the next +rule.

    This file, and other release-related documents, can be -downloaded from ftp://ftp.FreeBSD.org/.

    +downloaded from http://www.FreeBSD.org/snapshots/.

    For questions about FreeBSD, read the documentation before contacting <questions@FreeBSD.org>.

    +

    All users of FreeBSD 7-STABLE should subscribe to the <stable@FreeBSD.org> mailing list.

    +

    For questions about this documentation, e-mail <doc@FreeBSD.org>.

    ==== //depot/projects/docproj_nl/www/en/releases/7.1R/hardware.html#2 (text+ko) ==== @@ -19,8 +19,9 @@

    Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The FreeBSD Documentation Project

    -

    $FreeBSD: releng/7.1/release/doc/en_US.ISO8859-1/hardware/article.sgml -186206 2008-12-17 03:57:28Z murray $
    +

    $FreeBSD: +release/7.1.0/release/doc/en_US.ISO8859-1/hardware/article.sgml 186206 2008-12-17 +03:57:28Z murray $

    @@ -3347,15 +3348,11 @@
    • -

      Broadcom NetXtreme II BCM5706 1000Base-SX

      -
      • - -

    • Broadcom NetXtreme II BCM5706 1000Base-T

    • -

      Broadcom NetXtreme II BCM5708 1000Base-SX

      +

      Broadcom NetXtreme II BCM5706 1000Base-SX

    • @@ -3363,15 +3360,7 @@
    • -

      Broadcom NetXtreme II BCM5709 1000Base-SX

      -
      • - -
    • -

      Broadcom NetXtreme II BCM5709 1000Base-T

      -
      • - -
    • -

      Broadcom NetXtreme II BCM5716 1000Base-T

      +

      Broadcom NetXtreme II BCM5708 1000Base-SX

    • ==== //depot/projects/docproj_nl/www/en/releases/7.1R/readme.html#2 (text+ko) ==== @@ -19,8 +19,9 @@

      Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 The FreeBSD Documentation Project

      -

      $FreeBSD: releng/7.1/release/doc/en_US.ISO8859-1/readme/article.sgml -171891 2007-08-18 17:11:14Z bmah $
      +

      $FreeBSD: +release/7.1.0/release/doc/en_US.ISO8859-1/readme/article.sgml 171891 2007-08-18 17:11:14Z +bmah $

      ==== //depot/projects/docproj_nl/www/en/releases/7.1R/relnotes.html#2 (text+ko) ==== @@ -19,8 +19,9 @@

      Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The FreeBSD Documentation Project

      -

      $FreeBSD: releng/7.1/release/doc/en_US.ISO8859-1/relnotes/article.sgml -186639 2008-12-31 06:27:09Z hrs $
      +

      $FreeBSD: +release/7.1.0/release/doc/en_US.ISO8859-1/relnotes/article.sgml 186643 2008-12-31 +08:07:10Z hrs $

      @@ -146,7 +147,7 @@

      2.1 Security Advisories

      -

      Problems described in the following security advisories has been fixed. For more +

      Problems described in the following security advisories have been fixed. For more information, consult the individual advisories available from http://security.FreeBSD.org/.

      ==== //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -177,7 +177,7 @@ Announcement 13 October 2008 - -- + 5 January 2009 Announcement sent out after a majority of the mirrors have received the bits. ==== //depot/projects/docproj_nl/www/en/releases/index.sgml#5 (text+ko) ==== @@ -1,10 +1,10 @@ - + ]> - + &header; >>> TRUNCATED FOR MAIL (1000 lines) <<< From rene at FreeBSD.org Mon Jan 5 11:45:17 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Mon Jan 5 11:45:23 2009 Subject: PERFORCE change 155644 for review Message-ID: <200901051145.n05BjFbO087544@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155644 Change 155644 by rene@rene_self on 2009/01/05 11:44:14 MFen handbook/introduction 1.131 -> 1.132 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#13 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#13 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.35 2005/09/23 17:03:10 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml - %SRCID% 1.131 + %SRCID% 1.132 --> @@ -776,12 +776,14 @@ De RELENG_6 tak is gemaakt in juli 2005, de eerste uitgave van de 6.X tak werd vrijgegeven in november 2005. De meest recente &rel2.current;-RELEASE kwam uit op &rel2.current.date;. - Er staan nog andere versies gepland in de RELENG_6 tak. + Dit zal waarschijnlijk de laatste uitgave zijn van de 6.X + tak. - De RELENG_7 tak is gemaakt in oktober 2007. De recentste - uitgave van deze tak is &rel.current;-RELEASE, welke is - uitgekomen in &rel.current.date;. Er zullen nog andere uitgaven - van de RELENG_7 tak uitkomen. + De RELENG_7 tak is gemaakt in oktober 2007. De eerste + uitgave van deze tak is 7.0-RELEASE, welke is uitgekomen in + februari 2008. De meest recente &rel.current;-RELEASE kwam uit + in &rel.current.date;. Er zullen nog andere uitgaven van de + RELENG_7 tak uitkomen. Op dit moment vinden lange-termijn ontwikkelprojecten plaats in de 8.X-CURRENT tak, en snapshot uitgaven van 8.X op From nwhitehorn at FreeBSD.org Mon Jan 5 15:34:12 2009 From: nwhitehorn at FreeBSD.org (Nathan Whitehorn) Date: Mon Jan 5 15:34:20 2009 Subject: PERFORCE change 155654 for review Message-ID: <200901051534.n05FY9ig018662@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155654 Change 155654 by nwhitehorn@nwhitehorn_trantor on 2009/01/05 15:33:51 IFC Affected files ... .. //depot/projects/ppc-g5/ObsoleteFiles.inc#7 integrate .. //depot/projects/ppc-g5/contrib/file/AUTHORS#1 branch .. //depot/projects/ppc-g5/contrib/file/COPYING#1 branch .. //depot/projects/ppc-g5/contrib/file/ChangeLog#2 integrate .. //depot/projects/ppc-g5/contrib/file/FREEBSD-upgrade#2 delete .. //depot/projects/ppc-g5/contrib/file/INSTALL#1 branch .. //depot/projects/ppc-g5/contrib/file/LEGAL.NOTICE#2 delete .. //depot/projects/ppc-g5/contrib/file/MAINT#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/animation#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/apple#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/archive#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/audio#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/c64#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/cddb#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/clarion#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/commands#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/compress#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/console#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/cracklib#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/database#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/diff#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/dump#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/elf#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/erlang#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/flash#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/frame#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/freebsd#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/games#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/gimp#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/gnome-keyring#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/gnumeric#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/graphviz#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/hp#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/iff#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/images#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/inform#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/java#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/kde#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/lex#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/linux#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/llvm#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/lua#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/luks#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mathcad#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mercurial#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mozilla#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mup#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/netware#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/ole2compounddocs#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/os2#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/palm#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/perl#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/pgp#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/pkgadd#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/printer#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/psion#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/revision#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/riff#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/rpm#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/rtf#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/ruby#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/sc#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/scientific#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/securitycerts#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/sketch#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/softquad#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/spectrum#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/tex#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/troff#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/unicode#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/uuencode#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/warc#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/weak#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/windows#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/xilinx#1 branch .. //depot/projects/ppc-g5/contrib/file/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/file/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/file/Makefile.std#2 delete .. //depot/projects/ppc-g5/contrib/file/NEWS#1 branch .. //depot/projects/ppc-g5/contrib/file/PORTING#2 delete .. //depot/projects/ppc-g5/contrib/file/README#2 integrate .. //depot/projects/ppc-g5/contrib/file/TODO#1 branch .. //depot/projects/ppc-g5/contrib/file/acinclude.m4#2 integrate .. //depot/projects/ppc-g5/contrib/file/aclocal.m4#2 integrate .. //depot/projects/ppc-g5/contrib/file/apprentice.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/ascmagic.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/asprintf.c#1 branch .. //depot/projects/ppc-g5/contrib/file/compile#1 branch .. //depot/projects/ppc-g5/contrib/file/compress.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/config.guess#1 branch .. //depot/projects/ppc-g5/contrib/file/config.h.in#2 integrate .. //depot/projects/ppc-g5/contrib/file/config.sub#1 branch .. //depot/projects/ppc-g5/contrib/file/configure#2 integrate .. //depot/projects/ppc-g5/contrib/file/configure.ac#1 branch .. //depot/projects/ppc-g5/contrib/file/configure.in#2 delete .. //depot/projects/ppc-g5/contrib/file/elfclass.h#1 branch .. //depot/projects/ppc-g5/contrib/file/file.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/file.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/file.man#2 integrate .. //depot/projects/ppc-g5/contrib/file/fsmagic.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/funcs.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/getopt_long.c#1 branch .. //depot/projects/ppc-g5/contrib/file/is_tar.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/libmagic.man#2 integrate .. //depot/projects/ppc-g5/contrib/file/magic.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/magic.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/magic.man#2 integrate .. //depot/projects/ppc-g5/contrib/file/magic.mime#2 delete .. //depot/projects/ppc-g5/contrib/file/magic2mime#2 delete .. //depot/projects/ppc-g5/contrib/file/mkinstalldirs#2 delete .. //depot/projects/ppc-g5/contrib/file/mygetopt.h#1 branch .. //depot/projects/ppc-g5/contrib/file/names.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/patchlevel.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/print.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/readelf.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/readelf.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/softmagic.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/tar.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/test.c#2 delete .. //depot/projects/ppc-g5/contrib/file/tests/Makefile.am#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/Makefile.in#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/README#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/gedcom.magic#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/gedcom.result#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/gedcom.testfile#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/test.c#1 branch .. //depot/projects/ppc-g5/contrib/file/vasprintf.c#1 branch .. //depot/projects/ppc-g5/lib/libc/sys/socket.2#2 integrate .. //depot/projects/ppc-g5/lib/libelf/README#1 branch .. //depot/projects/ppc-g5/lib/libmagic/Makefile#2 integrate .. //depot/projects/ppc-g5/lib/libusb20/libusb20_desc.c#3 integrate .. //depot/projects/ppc-g5/sbin/geom/class/virstor/gvirstor.8#2 integrate .. //depot/projects/ppc-g5/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate .. //depot/projects/ppc-g5/share/man/man4/ae.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/cpuctl.4#3 integrate .. //depot/projects/ppc-g5/share/man/man9/dev_clone.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/domain.9#3 integrate .. //depot/projects/ppc-g5/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_bus_subr.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_if.m#4 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_standard.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofwvar.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/openfirm.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/openfirm.h#8 integrate .. //depot/projects/ppc-g5/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken_demo.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken_subr.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/at91dci.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ehci2.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ehci2.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/musb2_otg.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ohci2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ohci2_pci.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uhci2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uhci2.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/usb2_bus.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/usb2_controller.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/usb2_controller.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uss820dci.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_busdma.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_core.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_device.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_device.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_dynamic.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_dynamic.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_generic.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_handle_request.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_hub.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_hub.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_msctest.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_msctest.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_request.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_request.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_transfer.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_transfer.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_axe2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_axe2_reg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/image/uscanner2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_devid.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_devtable.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_ioctl.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_standard.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/u3g2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uchcom2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uftdi2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uplcom2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uvscom2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/sound/uaudio2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/umass2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/ustorage2_fs.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_ural2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_zyd2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_zyd2_reg.h#2 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_pc98.c#5 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/ppc-g5/sys/kern/kern_jail.c#8 integrate .. //depot/projects/ppc-g5/sys/kern/tty.c#8 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/ppc-g5/sys/modules/usb2/Makefile#4 integrate .. //depot/projects/ppc-g5/sys/modules/usb2/serial_3g/Makefile#1 branch .. //depot/projects/ppc-g5/sys/net/route.c#9 integrate .. //depot/projects/ppc-g5/sys/netinet/in.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_output.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_gif.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#9 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#11 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/gracklevar.h#5 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/macio.c#9 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#10 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorthvar.h#8 integrate .. //depot/projects/ppc-g5/sys/sys/elf_common.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/protosw.h#3 integrate .. //depot/projects/ppc-g5/sys/vm/vm_page.c#4 integrate .. //depot/projects/ppc-g5/sys/vm/vm_page.h#3 integrate .. //depot/projects/ppc-g5/usr.bin/make/globals.h#3 integrate .. //depot/projects/ppc-g5/usr.bin/make/job.c#4 integrate .. //depot/projects/ppc-g5/usr.bin/make/main.c#3 integrate .. //depot/projects/ppc-g5/usr.bin/make/make.1#3 integrate .. //depot/projects/ppc-g5/usr.bin/make/var.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/cpucontrol/cpucontrol.8#3 integrate .. //depot/projects/ppc-g5/usr.sbin/fwcontrol/fwcontrol.c#4 integrate .. //depot/projects/ppc-g5/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/ppc-g5/usr.sbin/mergemaster/mergemaster.sh#4 integrate .. //depot/projects/ppc-g5/usr.sbin/pkg_install/add/pkg_add.1#2 integrate Differences ... ==== //depot/projects/ppc-g5/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.165 2008/12/23 16:52:03 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.166 2009/01/03 11:25:50 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1 +OLD_FILES+=usr/share/man/man8/nsupdate.8.gz # 20081223: ipprotosw.h removed OLD_FILES+=usr/include/netinet/ipprotosw.h # 20081123: vfs_mountedon.9 removed ==== //depot/projects/ppc-g5/contrib/file/ChangeLog#2 (text+ko) ==== @@ -1,4 +1,135 @@ -2007-12-28 15:06 Christos Zoulas +2008-08-30 12:54 Christos Zoulas + + * Don't eat trailing \n in magic enties. + + * Cast defines to allow compilation using a c++ compiler. + +2008-07-26 00:59 Reuben Thomas + + * Add MIME types for special files. + + * Use access to give more accurate information for files that + can't be opened. + + * Add a TODO list. + +2008-07-02 11:15 Christos Zoulas + + * add !:strength op to adjust magic strength (experimental) + +2008-06-16 21:41 Reuben Thomas + + * Fix automake error in configure.ac. + + * Add MIME type for Psion Sketch files. + +2008-06-05 08:59 Christos Zoulas + + * Don't print warnings about bad namesize in stripped + binaries with PT_NOTE is still there, and the actual + note is gone (Jakub Jelinek) + +2008-05-28 15:12 Robert Byrnes + + * magic/Magdir/elf: + Note invalid byte order for little-endian SPARC32PLUS. + Add SPARC V9 vendor extensions and memory model. + + * src/elfclass.h: + Pass target machine to doshn (for Solaris hardware capabilities). + + * src/readelf.c (doshn): + Add support for Solaris hardware/software capabilities. + + * src/readelf.h: + Ditto. + + * src/vasprintf.c (dispatch): + Add support for ll modifier. + +2008-05-16 10:25 Christos Zoulas + + * Fix compiler warnings. + + * remove stray printf, and fix a vprintf bug. (Martin Dorey) + +2008-05-06 00:13 Robert Byrnes + + * src/Makefile.am: + Ensure that getopt_long and [v]asprintf are included in libmagic, + as needed. + + Remove unnecessary EXTRA_DIST. + + * src/Makefile.in: + Rerun automake. + + * src/vasprintf.c (dispatch): + Fix variable precision bug: be sure to step past '*'. + + * src/vasprintf.c (core): + Remove unreachable code. + + * src/apprentice.c (set_test_type): + Add cast to avoid compiler warning. + +2008-04-22 23:45 Christos Zoulas + + * Add magic submission guidelines (Abel Cheung) + + * split msdos and windows magic (Abel Cheung) + +2008-04-04 11:00 Christos Zoulas + + * >= <= is not supported, so fix the magic and warn about it. + reported by: Thien-Thi Nguyen + +2008-03-27 16:16 Robert Byrnes + + * src/readelf.c (donote): + ELF core file command name/line bug fixes and enhancements: + + Try larger offsets first to avoid false matches + from earlier data that happen to look like strings; + this primarily affected SunOS 5.x 32-bit Intel core files. + + Add support for command line (instead of just short name) + for SunOS 5.x. + + Add information about NT_PSINFO for SunOS 5.x. + + Only trim whitespace from end of command line. + +2007-02-11 01:36 Reuben Thomas + + * Change strength of ! from MULT to 0, as it matches almost + anything (Reuben Thomas) + + * Debian fixes (Reuben Thomas) + +2007-02-11 00:17 Reuben Thomas + + * Clarify UTF-8 BOM message (Reuben Thomas) + + * Add HTML comment to token list in names.h + +2007-02-04 15:50 Christos Zoulas + + * Debian fixes (Reuben Thomas) + +2007-02-04 11:31 Christos Zoulas + + * !:mime annotations in magic files (Reuben Thomas) + +2007-01-29 15:35 Christos Zoulas + + * zero out utime/utimes structs (Gavin Atkinson) + +2007-01-26 13:45 Christos Zoulas + + * reduce writable data from Diego "Flameeyes" Petten + +2007-12-28 15:06 Christos Zoulas * strtof detection @@ -6,7 +137,7 @@ * better mismatch version message -2007-12-27 11:35 Christos Zoulas +2007-12-27 11:35 Christos Zoulas * bring back some fixes from OpenBSD @@ -14,46 +145,46 @@ * fix gcc warnings -2007-12-01 19:55 Christos Zoulas +2007-12-01 19:55 Christos Zoulas * make sure we have zlib.h and libz to compile the builtin decompress code -2007-10-28 20:48 Christos Zoulas +2007-10-28 20:48 Christos Zoulas * float and double magic support (Behan Webster) -2007-10-28 20:48 Christos Zoulas +2007-10-28 20:48 Christos Zoulas * Convert fortran to a soft test (Reuben Thomas) -2007-10-23 5:25 Christos Zoulas +2007-10-23 5:25 Christos Zoulas * Add --with-filename, and --no-filename (Reuben Thomas) -2007-10-23 3:59 Christos Zoulas +2007-10-23 3:59 Christos Zoulas * Rest of the mime split (Reuben Thomas) * Make usage message generated from the flags so that they stay consistent (Reuben Thomas) -2007-10-20 3:06 Christos Zoulas +2007-10-20 3:06 Christos Zoulas * typo in comment, missing ifdef QUICK, remove unneeded code (Charles Longeau) -2007-10-17 3:33 Christos Zoulas +2007-10-17 3:33 Christos Zoulas * Fix problem printing -\012 in some entries * Separate magic type and encoding flags (Reuben Thomas) -2007-10-09 3:55 Christos Zoulas +2007-10-09 3:55 Christos Zoulas * configure fix for int64 and strndup (Reuben Thomas) -2007-09-26 4:45 Christos Zoulas +2007-09-26 4:45 Christos Zoulas * Add magic_descriptor() function. @@ -62,7 +193,7 @@ * Don't convert NUL's to spaces in {l,b}estring16 (Daniel Dawson) -2007-08-19 6:30 Christos Zoulas +2007-08-19 6:30 Christos Zoulas * Make mime format consistent so that it can be easily parsed: @@ -79,38 +210,38 @@ This work was done by Reuben Thomas -2007-05-24 10:00 Christos Zoulas +2007-05-24 10:00 Christos Zoulas * Fix another integer overflow (Colin Percival) -2007-03-26 13:58 Christos Zoulas +2007-03-26 13:58 Christos Zoulas * make sure that all of struct magic_set is initialized appropriately (Brett) -2007-03-25 17:44 Christos Zoulas +2007-03-25 17:44 Christos Zoulas * reset left bytes in the buffer (Dmitry V. Levin) * compilation failed with COMPILE_ONLY and ENABLE_CONDITIONALS (Peter Avalos) -2007-03-15 10:51 Christos Zoulas +2007-03-15 10:51 Christos Zoulas * fix fortran and nroff reversed tests (Dmitry V. Levin) * fix exclude option (Dmitry V. Levin) -2007-02-08 17:30 Christos Zoulas +2007-02-08 17:30 Christos Zoulas * fix integer underflow in file_printf which can lead to to exploitable heap overflow (Jean-Sebastien Guay-Lero) -2007-02-05 11:35 Christos Zoulas +2007-02-05 11:35 Christos Zoulas * make socket/pipe reading more robust -2007-01-25 16:01 Christos Zoulas +2007-01-25 16:01 Christos Zoulas * Centralize all the tests in file_buffer. @@ -184,7 +315,7 @@ * make file.c compile with gcc warnings and pass lint -2006-12-11 16:49 Christos Zoulas +2006-12-11 16:49 Christos Zoulas * fix byteswapping issue @@ -193,7 +324,7 @@ * add a few missed cases in the strength routine -2006-12-08 16:32 Christos Zoulas +2006-12-08 16:32 Christos Zoulas * store and print the line number of the magic entry for debugging. @@ -210,7 +341,7 @@ * propagate the error return from match to file_softmagic. -2006-11-25 13:35 Christos Zoulas +2006-11-25 13:35 Christos Zoulas * Don't store the current offset in the magic struct, because it needs to be restored and @@ -221,12 +352,12 @@ print it as an additional separator; print it as the only separator. -2006-11-17 10:51 Christos Zoulas +2006-11-17 10:51 Christos Zoulas * Added a -0 option to print a '\0' separator Etienne Buira -2006-10-31 15:14 Christos Zoulas +2006-10-31 15:14 Christos Zoulas * Check offset before copying (Mike Frysinger) @@ -242,7 +373,7 @@ * use calloc to initialize the ascii buffers (Jos van den Oever) -2006-06-08 11:11 Christos Zoulas +2006-06-08 11:11 Christos Zoulas * QNX fixes (Mike Gorchak) @@ -256,7 +387,7 @@ * Magic format function improvent (Karl Chen) -2006-05-03 11:11 Christos Zoulas +2006-05-03 11:11 Christos Zoulas * Pick up some elf changes and some constant fixes from SUSE @@ -264,13 +395,13 @@ * When keep going, don't print spurious newlines (Radek Vokál) -2006-04-01 12:02 Christos Zoulas +2006-04-01 12:02 Christos Zoulas * Use calloc instead of malloc (Mike Frysinger) * Fix configure script to detect wctypes.h (Mike Frysinger) -2006-03-02 16:06 Christos Zoulas +2006-03-02 16:06 Christos Zoulas * Print empty if the file is (Mike Frysinger) @@ -278,21 +409,21 @@ * Sort magic entries by strength [experimental] -2005-11-29 13:26 Christos Zoulas +2005-11-29 13:26 Christos Zoulas * Use iswprint() to convert the output string. (Bastien Nocera) -2005-10-31 8:54 Christos Zoulas +2005-10-31 8:54 Christos Zoulas * Fix regression where the core info was not completely processed (Radek Vokál) -2005-10-20 11:15 Christos Zoulas +2005-10-20 11:15 Christos Zoulas * Middle Endian magic (Diomidis Spinellis) -2005-10-17 11:15 Christos Zoulas +2005-10-17 11:15 Christos Zoulas * Open with O_BINARY for CYGWIN (Corinna Vinschen) @@ -300,39 +431,39 @@ * Look for note sections in non executables. -2005-09-20 13:33 Christos Zoulas +2005-09-20 13:33 Christos Zoulas * Don't print SVR4 Style in core files multiple times (Radek Vokál) -2005-08-27 04:09 Christos Zoulas +2005-08-27 04:09 Christos Zoulas * Cygwin changes Corinna Vinschen -2005-08-18 09:53 Christos Zoulas +2005-08-18 09:53 Christos Zoulas * Remove erroreous mention of /etc/magic in the file man page This is gentoo bug 101639. (Mike Frysinger) * Cross-compile support and detection (Mike Frysinger) -2005-08-12 10:17 Christos Zoulas +2005-08-12 10:17 Christos Zoulas * Add -h flag and dereference symlinks if POSIXLY_CORRECT is set. -2005-07-29 13:57 Christos Zoulas +2005-07-29 13:57 Christos Zoulas * Avoid search and regex buffer overflows (Kelledin) -2005-07-12 11:48 Christos Zoulas +2005-07-12 11:48 Christos Zoulas * Provide stub implementations for {v,}nsprintf() for older OS's that don't have them. * Change mbstate_t autoconf detection macro from AC_MBSTATE_T to AC_TYPE_MBSTATE_T. -2005-06-25 11:48 Christos Zoulas +2005-06-25 11:48 Christos Zoulas * Dynamically allocate the string buffers and make the default read size 256K. @@ -361,43 +492,43 @@ With CRLF, the line length was not computed correctly, and even lines of length MAXLINELEN - 1 were treated as ``very long''. -2004-12-07 14:15 Christos Zoulas +2004-12-07 14:15 Christos Zoulas * bzip2 needs a lot of input buffer space on some files before it can begin uncompressing. This makes file -z fail on some bz2 files. Fix it by giving it a copy of the file descriptor to read as much as it wants if we - have access to it. + have access to it. -2004-11-24 12:39 Christos Zoulas +2004-11-24 12:39 Christos Zoulas * Stack smash fix, and ELF more conservative reading. Jakub Bogusz -2004-11-20 18:50 Christos Zoulas +2004-11-20 18:50 Christos Zoulas * New FreeBSD version parsing code: Jon Noack - * Hackish support for ucs16 strings + * Hackish support for ucs16 strings -2004-11-13 03:07 Christos Zoulas +2004-11-13 03:07 Christos Zoulas * print the file name and line number in syntax errors. -2004 10-12 10:50 Christos Zoulas +2004 10-12 10:50 Christos Zoulas * Fix stack overwriting on 0 length strings: Tim Waugh Ned Ludd -2004-09-27 11:30 Christos Zoulas +2004-09-27 11:30 Christos Zoulas * Remove 3rd and 4th copyright clause; approved by Ian Darwin. * Fix small memory leaks; caught by: Tamas Sarlos -2004-07-24 16:33 Christos Zoulas +2004-07-24 16:33 Christos Zoulas * magic.mime update Danny Milosavljevic @@ -407,19 +538,19 @@ * errors reading elf magic Jakub Bogusz -2004-04-12 10:55 Christos Zoulas +2004-04-12 10:55 Christos Zoulas * make sure that magic formats match magic types during compilation * fix broken sgi magic file -2004-04-06 20:36 Christos Zoulas +2004-04-06 20:36 Christos Zoulas * detect present of mbstate_t Petter Reinholdtsen * magic fixes -2004-03-22 15:25 Christos Zoulas +2004-03-22 15:25 Christos Zoulas * Lots of mime fixes (Joerg Ostertag) @@ -428,7 +559,7 @@ (Edwin Groothuis) * correct cleanup in all cases; don't just close the file. - (Christos Zoulas) + (Christos Zoulas) * add gettext message catalogue support (Michael Piefel) @@ -446,37 +577,37 @@ or name and description note sizes. Reported by (Mikael Magnusson) -2004-03-09 13:55 Christos Zoulas +2004-03-09 13:55 Christos Zoulas * Fix possible memory leak on error and add missing regfree (Dmitry V. Levin) -2003-12-23 12:12 Christos Zoulas +2003-12-23 12:12 Christos Zoulas * fix -k flag (Maciej W. Rozycki) -2003-11-18 14:10 Christos Zoulas +2003-11-18 14:10 Christos Zoulas * Try to give us much info as possible on corrupt elf files. (Willy Tarreau) * Updated python bindings (Brett Funderburg) -2003-11-11 15:03 Christos Zoulas +2003-11-11 15:03 Christos Zoulas * Include file.h first, because it includes config.h breaks largefile test macros otherwise. (Paul Eggert via Lars Hecking ) -2003-10-14 21:39 Christos Zoulas +2003-10-14 21:39 Christos Zoulas * Python bindings (Brett Funderburg) * Don't lookup past the end of the buffer (Chad Hanson) * Add MAGIC_ERROR and api on magic_errno() -2003-10-08 12:40 Christos Zoulas +2003-10-08 12:40 Christos Zoulas * handle error conditions from compile as fatal (Antti Kantee) @@ -486,32 +617,32 @@ * describe magic file handling (Bryan Henderson) -2003-09-12 15:09 Christos Zoulas +2003-09-12 15:09 Christos Zoulas * update magic files. * remove largefile support from file.h; it breaks things on most OS's -2003-08-10 10:25 Christos Zoulas +2003-08-10 10:25 Christos Zoulas * fix unmapping'ing of mmaped files. -2003-07-10 12:03 Christos Zoulas +2003-07-10 12:03 Christos Zoulas * don't exit with -1 on error; always exit 1 (Marty Leisner) * restore utimes code. -2003-06-10 17:03 Christos Zoulas +2003-06-10 17:03 Christos Zoulas * make sure we don't access uninitialized memory. * pass lint * #ifdef __cplusplus in magic.h -2003-05-25 19:23 Christos Zoulas +2003-05-25 19:23 Christos Zoulas * rename cvs magic file to revision to deal with case insensitive filesystems. -2003-05-23 17:03 Christos Zoulas +2003-05-23 17:03 Christos Zoulas * documentation fixes from Michael Piefel * magic fixes (various) @@ -521,30 +652,30 @@ close files Maciej W. Rozycki +2003-04-21 20:12 Christos Zoulas * fix zsh magic -2003-04-04 16:59 Christos Zoulas +2003-04-04 16:59 Christos Zoulas * fix operand sort order in string. -2003-04-02 17:30 Christos Zoulas +2003-04-02 17:30 Christos Zoulas * cleanup namespace in magic.h -2003-04-02 13:50 Christos Zoulas +2003-04-02 13:50 Christos Zoulas * Magic additions (Alex Ott) * Fix bug that broke VPATH compilation (Peter Breitenlohner) -2003-03-28 16:03 Christos Zoulas +2003-03-28 16:03 Christos Zoulas * remove packed attribute from magic struct. * make the magic struct properly aligned. * bump version number of compiled files to 2. -2003-03-27 13:10 Christos Zoulas +2003-03-27 13:10 Christos Zoulas * separate tar detection and run it before softmagic. * fix reversed symlink test. @@ -552,7 +683,7 @@ * make separator a string instead of a char. * update manual page and sort options. -2003-03-26 11:00 Christos Zoulas +2003-03-26 11:00 Christos Zoulas * Pass lint * make NULL in magic_file mean stdin ==== //depot/projects/ppc-g5/contrib/file/MAINT#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$File: MAINT,v 1.9 2007/01/19 21:15:27 christos Exp $ +$File: MAINT,v 1.10 2008/02/05 19:08:11 christos Exp $ Maintenance notes: @@ -41,5 +41,4 @@ readelf.c file_tryelf() "unknown" -Christos Zoulas -christos@astron.com +Christos Zoulas (see README for email address) ==== //depot/projects/ppc-g5/contrib/file/Magdir/adventure#2 (text+ko) ==== @@ -73,3 +73,13 @@ >10 belong 0x0A0D1A00 >>14 string >\0 %s saved game data +# Danny Milosavljevic +# this are adrift (adventure game standard) game files, extension .taf +# depending on version magic continues with 0x93453E6139FA (V 4.0) +# 0x9445376139FA (V 3.90) +# 0x9445366139FA (V 3.80) +# this is from source (http://www.adrift.org.uk/) and I have some taf +# files, and checked them. +#0 belong 0x3C423FC9 +#>4 belong 0x6A87C2CF Adrift game file +#!:mime application/x-adrift ==== //depot/projects/ppc-g5/contrib/file/Magdir/animation#2 (text+ko) ==== @@ -8,57 +8,78 @@ # SGI and Apple formats 0 string MOVI Silicon Graphics movie file +!:mime video/x-sgi-movie 4 string moov Apple QuickTime +!:mime video/quicktime >12 string mvhd \b movie (fast start) >12 string mdra \b URL >12 string cmov \b movie (fast start, compressed header) >12 string rmra \b multiple URLs 4 string mdat Apple QuickTime movie (unoptimized) -4 string wide Apple QuickTime movie (unoptimized) -4 string skip Apple QuickTime movie (modified) -4 string free Apple QuickTime movie (modified) +!:mime video/quicktime +#4 string wide Apple QuickTime movie (unoptimized) +#!:mime video/quicktime +#4 string skip Apple QuickTime movie (modified) +#!:mime video/quicktime +#4 string free Apple QuickTime movie (modified) +#!:mime video/quicktime 4 string idsc Apple QuickTime image (fast start) -4 string idat Apple QuickTime image (unoptimized) +!:mime image/x-quicktime +#4 string idat Apple QuickTime image (unoptimized) +#!:mime image/x-quicktime 4 string pckg Apple QuickTime compressed archive +!:mime application/x-quicktime-player 4 string/B jP JPEG 2000 image +!:mime image/jp2 4 string ftyp ISO Media >8 string isom \b, MPEG v4 system, version 1 +!:mime video/mp4 >8 string iso2 \b, MPEG v4 system, part 12 revision >8 string mp41 \b, MPEG v4 system, version 1 +!:mime video/mp4 >8 string mp42 \b, MPEG v4 system, version 2 +!:mime video/mp4 >8 string mp7t \b, MPEG v4 system, MPEG v7 XML >8 string mp7b \b, MPEG v4 system, MPEG v7 binary XML >8 string/B jp2 \b, JPEG 2000 +!:mime image/jp2 >8 string 3gp \b, MPEG v4 system, 3GPP +!:mime video/3gpp >>11 byte 4 \b v4 (H.263/AMR GSM 6.10) >>11 byte 5 \b v5 (H.263/AMR GSM 6.10) >>11 byte 6 \b v6 (ITU H.264/AMR GSM 6.10) >8 string mmp4 \b, MPEG v4 system, 3GPP Mobile +!:mime video/mp4 >8 string avc1 \b, MPEG v4 system, 3GPP JVT AVC +!:mime video/3gpp >8 string/B M4A \b, MPEG v4 system, iTunes AAC-LC +!:mime audio/mp4 +>8 string/B M4V \b, MPEG v4 system, iTunes AVC-LC +!:mime video/mp4 >8 string/B M4P \b, MPEG v4 system, iTunes AES encrypted >8 string/B M4B \b, MPEG v4 system, iTunes bookmarked >8 string/B qt \b, Apple QuickTime movie >>> TRUNCATED FOR MAIL (1000 lines) <<< From nwhitehorn at FreeBSD.org Mon Jan 5 15:46:23 2009 From: nwhitehorn at FreeBSD.org (Nathan Whitehorn) Date: Mon Jan 5 15:46:36 2009 Subject: PERFORCE change 155656 for review Message-ID: <200901051546.n05FkMbl019778@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155656 Change 155656 by nwhitehorn@nwhitehorn_trantor on 2009/01/05 15:46:15 Adapt the CPC 9xx PCI driver to the new icell-independent interrupt map interface. As a status update on this project, we now boot SMP inside the Mambo simulator, and I don't know of any bugs at this time. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#11 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpchtvar.h#4 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#11 (text+ko) ==== @@ -11,7 +11,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY Benno Rice ``AS IS'' AND ANY EXPRESS OR + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, @@ -317,7 +317,7 @@ cpcpci_attach(device_t dev) { struct cpcpci_softc *sc; - phandle_t node, iparent; + phandle_t node; u_int32_t reg[2], busrange[2], config_base; struct cpcpci_range *rp, *io, *mem[2]; struct cpcpci_range fakeio; @@ -414,12 +414,6 @@ ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(cell_t)); - /* We need the number of interrupt cells to read the imap */ - sc->sc_icells = 2; - if (OF_getprop(node, "interrupt-parent", &iparent,sizeof(iparent)) > 0) - OF_getprop(iparent,"#interrupt-cells",&sc->sc_icells, - sizeof(sc->sc_icells)); - device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); @@ -611,15 +605,14 @@ { struct cpcpci_softc *sc; struct ofw_pci_register reg; - uint32_t pintr, mintr[2]; + uint32_t pintr, mintr; uint8_t maskbuf[sizeof(reg) + sizeof(pintr)]; sc = device_get_softc(bus); pintr = pin; if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), &sc->sc_pci_iinfo, ®, - sizeof(reg), &pintr, sizeof(pintr), &mintr, - sizeof(mintr[0])*sc->sc_icells, maskbuf)) - return (mintr[0]); + sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), maskbuf)) + return (mintr); /* Maybe it's a real interrupt, not an intpin */ if (pin > 4) ==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpchtvar.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (C) 2002 Benno Rice. + * Copyright (C) 2008 Nathan Whitehorn * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,7 +11,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY Benno Rice ``AS IS'' AND ANY EXPRESS OR + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, @@ -53,7 +53,6 @@ bus_space_tag_t sc_memt; bus_dma_tag_t sc_dmat; struct ofw_bus_iinfo sc_pci_iinfo; - int sc_icells; }; #endif /* _POWERPC_POWERMAC_CPCHTVAR_H_ */ From hselasky at FreeBSD.org Mon Jan 5 17:51:31 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Mon Jan 5 17:51:38 2009 Subject: PERFORCE change 155662 for review Message-ID: <200901051751.n05HpTcS049973@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155662 Change 155662 by hselasky@hselasky_laptop001 on 2009/01/05 17:51:08 Integrate latest USB changes in -current. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/TODO.TXT#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_pci.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/README.TXT#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#30 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#45 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.h#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_error.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#38 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_if.m#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#35 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2_reg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2_reg.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2_reg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_fw.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_reg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2_reg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2_reg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/image/usb2_image.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/image/usb2_image.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/Makefile#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/ufm2_ioctl.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_cdc.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_endian.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_error.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_hid.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#26 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_mfunc.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_revision.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/usb2_rdesc.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/misc/ufm2.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/misc/usb2_misc.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/misc/usb2_misc.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/ndis/if_ndis_usb2.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2_reg.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2_pcm.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2_reg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/usb2_sound.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/usb2_sound.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/usb2_storage.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/usb2_storage.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_msc.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_mtp.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_fw.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_reg.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_var.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_reg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_var.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_fw.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_reg.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/usb2_wlan.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/usb2_wlan.h#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/bluetooth/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/bluetooth_fw/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/bluetooth_ng/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#10 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_at91dci/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_ehci/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_musb/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_ohci/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_uhci/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_uss820dci/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/core/Makefile#10 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_aue/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_axe/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_cdce/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_cue/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_dav/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_kue/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_rue/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/image/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/input/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_hid/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_kbd/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_ms/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc_dbp/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc_fm/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/quirk/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/scanner/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_3g/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ark/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_bsa/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_bser/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_chcom/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_cycom/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_foma/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ftdi/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_gensa/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ipaq/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_lpt/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_mct/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_modem/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_moscom/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_plcom/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_visor/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_vscom/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/sound/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_ata/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_fs/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_mass/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_rio/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/template/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_ral/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_rum/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_zyd/Makefile#4 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/TODO.TXT#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#10 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#19 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci.c,v 1.6 2009/01/04 00:12:01 alfred Exp $"); /*- * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#25 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2.c,v 1.6 2009/01/04 00:12:01 alfred Exp $"); #include #include ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/ehci2.h,v 1.2 2008/11/19 08:56:35 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/ehci2.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#17 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/musb2_otg.c,v 1.6 2008/12/23 19:59:21 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/musb2_otg.c,v 1.7 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#11 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#21 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2.c,v 1.4 2008/12/23 19:59:21 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $"); /* * USB Open Host Controller driver. ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#13 (text) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#14 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2_pci.c,v 1.3 2008/12/23 17:36:25 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2_pci.c,v 1.4 2009/01/03 14:33:48 marius Exp $"); /* * USB Open Host Controller driver. @@ -211,6 +211,13 @@ pci_enable_busmaster(self); + /* + * Some Sun PCIO-2 USB controllers have their intpin register + * bogusly set to 0, although it should be 4. Correct that. + */ + if (pci_get_devid(self) == 0x1103108e && pci_get_intpin(self) == 0) + pci_set_intpin(self, 4); + rid = PCI_CBMEM; sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE); ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#19 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uhci2.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uhci2.c,v 1.6 2009/01/04 00:12:01 alfred Exp $"); /* * USB Universal Host Controller driver. ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/uhci2.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/uhci2.h,v 1.2 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#15 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/usb2_bus.h,v 1.3 2008/12/23 17:36:25 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/usb2_bus.h,v 1.4 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/usb2_controller.c,v 1.5 2008/12/23 17:36:25 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/usb2_controller.c,v 1.6 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/usb2_controller.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/usb2_controller.h,v 1.2 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_pci.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#17 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/uss820dci.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/uss820dci.c,v 1.6 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/README.TXT#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_busdma.c,v 1.5 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_busdma.c,v 1.6 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.h#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#8 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.c#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#30 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_core.h,v 1.4 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_core.h,v 1.5 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.h#8 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#45 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#18 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#44 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_device.c,v 1.6 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_device.c,v 1.7 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.h#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_device.h,v 1.2 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_device.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_dynamic.c,v 1.2 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_dynamic.c,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_dynamic.h,v 1.2 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_dynamic.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_error.c#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#38 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_generic.c,v 1.5 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_generic.c,v 1.6 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.h#11 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_handle_request.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_handle_request.c,v 1.5 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.c#8 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.h#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#26 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_hub.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_hub.c,v 1.5 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_hub.h,v 1.2 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_hub.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_if.m#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.c#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.h#11 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_msctest.c,v 1.3 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_msctest.c,v 1.4 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_msctest.h,v 1.3 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_msctest.h,v 1.4 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.c#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#28 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_request.c,v 1.5 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_request.c,v 1.6 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_request.h,v 1.2 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_request.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#35 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_transfer.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_transfer.c,v 1.6 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_transfer.h,v 1.3 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_transfer.h,v 1.4 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#10 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#15 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2_reg.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/ethernet/if_axe2.c,v 1.4 2008/12/23 19:59:21 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/ethernet/if_axe2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $"); /* * ASIX Electronics AX88172/AX88178/AX88778 USB 2.0 ethernet driver. Used in the ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2_reg.h#7 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb2/ethernet/if_axe2_reg.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ + * $FreeBSD: src/sys/dev/usb2/ethernet/if_axe2_reg.h,v 1.2 2009/01/04 00:12:01 alfred Exp $ */ /* ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2_reg.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_fw.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_reg.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2_reg.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2_reg.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/image/usb2_image.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/image/usb2_image.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#13 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/image/uscanner2.c,v 1.3 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/image/uscanner2.c,v 1.4 2009/01/04 00:12:01 alfred Exp $"); /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. ==== //depot/projects/usb/src/sys/dev/usb2/include/Makefile#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/ufm2_ioctl.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_cdc.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#20 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#20 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_endian.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_error.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_hid.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#26 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/include/usb2_ioctl.h,v 1.2 2008/11/19 08:56:35 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/include/usb2_ioctl.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_mfunc.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_revision.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/include/usb2_standard.h,v 1.2 2008/11/25 08:04:40 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/include/usb2_standard.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#12 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.c#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/input/usb2_rdesc.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#11 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/misc/ufm2.c#8 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/misc/usb2_misc.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/misc/usb2_misc.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ndis/if_ndis_usb2.c#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#11 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#4 (text+ko) ==== @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/usb/u3g.c,v 1.20 2008/11/13 21:49:07 n_hibma Exp $ + * $FreeBSD: src/sys/dev/usb2/serial/u3g2.c,v 1.2 2009/01/04 00:12:01 alfred Exp $ */ /* ==== //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#12 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#17 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#12 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#15 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uchcom2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uchcom2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $"); /* * driver for WinChipHead CH341/340, the worst USB-serial chip in the world. ==== //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#15 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#14 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uftdi2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uftdi2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $"); /* * NOTE: all function names beginning like "uftdi_cfg_" can only ==== //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2_reg.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#18 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#12 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#12 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#15 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#15 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: uplcom.c,v 1.21 2001/11/13 06:24:56 lukem Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uplcom2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uplcom2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $"); /*- * Copyright (c) 2001-2003, 2005 Shunsuke Akiyama . ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#19 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#14 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: usb/uvscom.c,v 1.1 2002/03/19 15:08:42 augustss Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uvscom2.c,v 1.5 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uvscom2.c,v 1.6 2009/01/04 00:12:01 alfred Exp $"); /*- * Copyright (c) 2001-2003, 2005 Shunsuke Akiyama . ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#23 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/usb2/sound/uaudio2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/sound/uaudio2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2_pcm.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2_reg.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/sound/usb2_sound.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/sound/usb2_sound.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#12 (text) ==== ==== //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#19 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/storage/umass2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/storage/umass2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $"); /*- * Copyright (c) 1999 MAEKAWA Masahide , @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb2/storage/umass2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $ + * $FreeBSD: src/sys/dev/usb2/storage/umass2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ ==== //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#13 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From remko at FreeBSD.org Mon Jan 5 21:27:21 2009 From: remko at FreeBSD.org (Remko Lodder) Date: Mon Jan 5 21:27:30 2009 Subject: PERFORCE change 155680 for review Message-ID: <200901052127.n05LRIPU093550@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155680 Change 155680 by remko@remko_nakur on 2009/01/05 21:27:08 Import WIP version that I did at the Snow HQ today. Facilitated by: Snow B.V. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#14 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#14 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/faq/book.sgml - %SRCID% 1.1078 + %SRCID% 1.1104 --> 2006 2007 2008 + 2009 The &os; Dutch Documentation Project @@ -372,12 +373,12 @@ &os.current; + url="&url.books.handbook;/cutting-stable.html#CURRENT">&os.current; is de ontwikkel versie van het besturingssysteem, welke over enige tijd de nieuwe &os.stable; tak wordt. Hierdoor is het eigenlijk alleen interessant voor ontwikkelaars die aan het systeem werken, en voor die-hard hobbyisten. Ze de relevante sectie + url="&url.books.handbook;/cutting-stable.html#CURRENT">relevante sectie in het handboek voor details over het draaien van @@ -663,15 +664,9 @@ Het project produceert een grote verscheidenheid aan documentatie welke online beschikbaar is via de volgende link . Deze - documenten zijn beschikbaar als pakket, zodat het makkelijk - geïnstalleerd kan worden op het &os; systeem. Meer - details over documentatie pakketten kan gevonden worden - in de volgende paragraven. - - Daarnaast refereren de bibliografie aan het - eind van deze FAQ en . Daarnaast + is er de bibliografie + aan het eind van deze FAQ en de versie in het handbook naar andere aangeraden boeken. @@ -911,17 +906,7 @@ rtf - Microsoft's Rich Text Format - Pagina nummers worden niet automatisch - geupdate wanneer ze worden ingeladen in - Word. Druk op CTRLA, - CTRLEND, - F9 nadat het document geladen - is om de pagina nummering te updaten. - - + Microsoft's Rich Text Format @@ -932,6 +917,16 @@ + + + Page numbers are not automatically updated when + loading Rich Text Format into Word. Press CtrlA, + CtrlEnd, + F9 after loading the document, to + update the page numbers. + @@ -982,8 +977,8 @@ bz2 - Het BZip2 formaat. Minder verspreid - dan Zip, maar levert gemiddeld kleinere + Het bzip2 formaat. Minder verspreid + dan zip, maar levert gemiddeld kleinere betanden. Installeer de archivers/bzip2 port om deze bestanden te @@ -1174,6 +1169,12 @@ kan meer informatie krijgen op de web site. + BSD Certification Group, Inc. provides system + administration certifications for DragonFly BSD, &os;, NetBSD, + OpenBSD. If you are interested in them, visit their site. + + Elke andere organisatie die training en ondersteuning aanbied, zou het project moeten informeren om hier ook vermeld te worden. @@ -1524,362 +1525,384 @@ laptop &os; niet kan opstarten en waar het mogelijk is om de BIOS te upgraden of downgraden. - If you have an earlier BIOS, and upgrading is not an - option, a workaround is to install &os;, change the partition - ID &os; uses, and install new boot blocks that can handle - the different partition ID. + Als je een eerdere BIOS hebt, en upgraden is geen + optie is er nog een workaround om &os; te installeren, + verander het partitie ID dat &os; gebruikt en installeer + de nieuwe opstart blokken zodat deze overweg kan met + een ander partitie ID. - First, you will need to restore the machine to a state - where it can get through its self-test screen. Doing this - requires powering up the machine without letting it find a - &os; partition on its primary disk. One way is to remove - the hard disk and temporarily move it to an older ThinkPad - (such as a ThinkPad 600) or a desktop PC with an appropriate - conversion cable. Once it is there, you can delete the &os; - partition and move the hard disk back. The ThinkPad should - now be in a bootable state again. + Als eerste moet de machine in een staat worden + teruggebracht waardoor het door zijn zelf-test scherm + heen komt. Om dit te doen moet de machine aangezet worden + zonder dat het een &os; parititie kan vinden op de primaire + schijf. Één mogelijkheid is om de harde + schijf te verwijderen en deze tijdelijk in een oudere + ThinkPad (zoals de ThinkPad 600) stoppen of in een + desktop PC met een juiste conversie kabel. Zodra deze + er is kun je de &os; partitie verwijderen en de harde + schijf terugzetten. De ThinkPAd zou nu weer opstartbaar + moeten zijn. - With the machine functional again, you can use the - workaround procedure described here to get a working &os; - installation. + Als de machine wederom functioneel is, kan de + workaround procedure die hier beschreven is gebruikt + worden om een werkende &os; installatie te krijgen: - Download boot1 and - boot2 from Download boot1 en + boot2 van . - Put these files somewhere you will be able to retrieve - them later. + Plaats deze bestanden ergens zodat ze later nog opgehaald + kunnen worden. - Install &os; as normal on to the ThinkPad. - Do not use Dangerously - Dedicated mode. Do not - reboot when the install has finished. + Installeer &os; zoals normaal op de ThinkPad. + Maak geen gebruik van de + Dangerously Dedicated mode. + Herstart niet nadat de installatie + voltooid is. - Either switch to the Emergency Holographic - Shell (AltF4) - or start a fixit shell. + Wissel of naar de Emergency Holographic + Shell ( + AltF4) + of start een fixit shell. - Use &man.fdisk.8; to change the &os; partition ID - from 165 to 166 - (this is the type used by OpenBSD). + Gebruik &man.fdisk.8; om de &os; parititie ID + van 165 naar 166 + te wijzigen (dit is het type dat gebruikt wordt door + OpenBSD). - Bring the boot1 and - boot2 files to the local file - system. + Haal de boot1 en + boot2 bestanden naar het lokale + bestandssysteem. - Use &man.disklabel.8; to write - boot1 and boot2 - to your &os; slice. + Gebruik &man.disklabel.8; om + boot1 en boot2 + naar de &os; partitie te schrijven. &prompt.root; disklabel -B -b boot1 -s boot2 ad0sn - n is the number of the - slice where you installed &os;. + n is het nummer van de + partitie waarop &os; geïnstalleerd is. - Reboot. At the boot prompt you will be given the - option of booting OpenBSD. This will - actually boot &os;. + Reboot. Op de boot prompt wordt de optie getoond + om OpenBSD op te starten. + Uiteindelijk zal dit &os; opstarten. - Getting this to work in the case where you want to dual - boot OpenBSD and &os; on the same laptop is left as an - exercise for the reader. + Om zowel OpenBSD als &os; op te kunnen starten, zult u + zelf één en ander moeten uitzoeken en + proberen. - Can I install on a disk with bad blocks? + Kan ik een installatie doen op een schijf met + bad blocks? - You can, but it is a bad idea. + Ja dit kan, maar het is een slecht idee. - If you are seeing bad block errors with a modern IDE - drive, chances are the drive is going to die very soon (the - drive's internal remapping functions are no longer - sufficient to fix the bad blocks, which means the disk is - heavily corrupted); we suggest you buy a new hard - drive. + Als je bad block errors ziet op een + moderne IDE schijf, is de kans groot dat deze spoedig + stuk gaat (de interne herstel functies van de schijf zijn + niet langer in staat om de bad blocks te repareren wat + betekend dat de disk ernstig corrupt is); we raden aan + dat u een nieuwe harde schijf koopt. - If you have a SCSI drive with bad blocks, see this answer. + Als u een SCSI schijf heeft met bad blocks zie dan + dit antwoord. - Strange things happen when I boot the install floppy! - What is happening? + Er gebeuren rare dingen wanneer ik opstart met de + installatie floppy. Wat is er aan de hand? - If you are seeing things like the machine grinding to a - halt or spontaneously rebooting when you try to boot the - install floppy, here are three questions to ask - yourself: + Als u dingen ziet zoals dat de machine krakend en + piepend tot stilstand komt, of spontaan herstart wanneer + u start met de installatie floppy, zijn er drie vragen die + u zichzelf moet stellen: - Did you use a new, freshly-formatted, error-free - floppy (preferably a brand-new one straight out of the - box, as opposed to the magazine cover disk that has been - lying under the bed for the last three years)? + Heeft u een nieuwe, vers geformatteerde, error-vrije + floppy gebruikt (bij voorkeur een hele nieuwe direct uit + het doosje, in tegenstelling tot de boekenlegger die al + jaren onder bed ligt)? - Did you download the floppy image in binary (or - image) mode? (do not be embarrassed, even the best of us - have accidentally downloaded a binary file in ASCII mode - at least once!) + Heeft u de floppy bestanden gedownload in binary + (of image) mode? (Geneer u niet, zelfs de besten van ons + hebben per ongeluk een binair bestand gedownload in + ASCII mode!) - If you are using &windows; 95 or - &windows; 98 did you run fdimage - or rawrite in pure DOS mode? These - operating systems can interfere with programs that write - directly to hardware, which the disk creation program - does; even running it inside a DOS shell in the GUI can - cause this problem. + Als u gebruik maakt van &windows; 95 of + &windows; 98 heeft u dan gebruik gemaakt van + fdimage of rawrite + in pure DOS mode? Deze besturingssystemen kunnen + invloed hebben op programma's die direct schrijven + naar de hardware, welke het disk creatie programma + gebruikt; zelfs het draaien in een DOS shell vanuit + de GUI kan problemen veroorzaken. - There have also been reports of &netscape; causing - problems when downloading the boot floppy, so it is probably - best to use a different FTP client if you can. + Er zijn ook rapporten van &netscape; welke problemen + geeft wanneer de opstart floppy's gedownload worden, dus + het is waarschijnlijk slim om een andere FTP cliënt + te gebruiken waar mogelijk. - I booted from my ATAPI CD-ROM, but the install program - says no CD-ROM is found. Where did it go? + Ik ben opgestart vanaf mijn ATAPI CD-ROM, maar het + installatie programma zegt dat er geen CD-ROM is + gevonden. Waar is deze heen? - The usual cause of this problem is a mis-configured - CD-ROM drive. Many PCs now ship with the CD-ROM as the slave - device on the secondary IDE controller, with no master - device on that controller. This is illegal according to the - ATAPI specification, but &windows; plays fast and loose with - the specification, and the BIOS ignores it when booting. - This is why the BIOS was able to see the CD-ROM to boot from - it, but why &os; cannot see it to complete the - install. + De meest voorkomende oorzaak van dit probleem is een + foutief geconfigureerde CD-ROM drive. De meeste PC's + worden nu verscheept met de CD-ROM speler als het slaaf + apparaat op de tweede IDE controller zonder master + apparaat op de controller. Dit mag eigenlijk niet vanuit de + ATAPI specificatie, maar &windows; speelt met deze + specificatie, en de BIOS negeert dit wanneer er wordt + opgestart. Dit is de reden waarom het BIOS in staat was om + de CD-ROM te zien waarvanaf opgestart moest worden, maar + ook waarom &os; deze niet kan zien om de installatie af te + maken. - Reconfigure your system so that the CD-ROM is either the - master device on the IDE controller it is attached to, or - make sure that it is the slave on an IDE controller that - also has a master device. + Herconfigureer uw systeem dusdanig dat de CD-ROM ofwel + het master apparaat is op de IDE controller waaraan hij + vast zit, of zorg ervoor dat het d slaaf is op een IDE + controller waar ook een master apparaat aan vast zit. - Can I install on my laptop over PLIP (Parallel Line - IP)? + Kan ik een installatie op mijn laptop doen over PLIP + (Parallel Line IP)? - Yes. Use a standard Laplink cable. If necessary, you - can check out the PLIP section of the Handbook - for details on parallel port networking. + Ja. Gebruik een standaard Laplink kabel. Indien nodig + kunt u de PLIP sectie van het handbook + raadplegen voor meer informatie over paralelle poort netwerken. - Which geometry should I use for a disk drive? + Welke geometrie moet gebruikt worden door een disk drive? - By the geometry of a disk, we mean - the number of cylinders, heads and sectors/track on a - disk. We will refer to this as C/H/S for convenience. - This is how the PC's BIOS works out which area on a disk - to read/write from. + Met de geometrie van een schijf, + bedoelen we het aantal cylinders, heads en sectoren/tracks + op een disk. We verwijzen hiernaar als C/H/S voor de + makkelijkheid. Dit wordt gebruikt door de PC's BIOS + om uit te vinden op welk deel van de schijf gelezen of + geschreven moet worden. - This causes a lot of confusion among new system - administrators. First of all, the - physical geometry of a SCSI drive is - totally irrelevant, as &os; works in term of disk blocks. - In fact, there is no such thing as the - physical geometry, as the sector density varies across the - disk. What manufacturers claim is the physical - geometry is usually the geometry that they have - determined wastes the least space. For IDE disks, &os; does - work in terms of C/H/S, but all modern drives internally - convert this into block references. + Dit zorgt voor een berg verwarring voor nieuwe systeem + beheerders. Als eerste is de fysieke + geometrie van een SCSI schijf totaal irrelevant, omdat &os; + werkt in termen van disk blokken. In feite s er niet zoiets + als de fysieke geometrie, omdat de sector + dichtheid varieert op de schijf. Wat de leverancier claimt + is dat de fysieke geometrie meestal geometrie + is waarvan ze denken dat het de minste schijfruimte kost. + Voor IDE schijven doet &os; dit in termen van C/H/S, maar + alle moderne schijven veranderen dit intern in blok + referenties. - All that matters is the logical - geometry. This is the answer that the BIOS gets when it - asks the drive what is your geometry? It then - uses this geometry to access the disk. As &os; uses the - BIOS when booting, it is very important to get this right. - In particular, if you have more than one operating system on - a disk, they must all agree on the geometry. Otherwise you - will have serious problems booting! + Alles wat van belang is, is de + logische geometrie. Dit is het + antwoord dat de BIOS krijgt wanneer het deze de disk + vraagt wat is jouw geometrie? Daarna + wordt deze geometrie gebruikt om de disk te benaderen. + Omdat &os; de BIOS gebruikt tijdens het opstarten, is + het belangrijk om dit juist te hebben. In het bijzonder + als je meer dan één besturingssysteem op + een schijf hebt, moeten ze het allemaal eens zijn over + de geometrie. Anders zult u serieuze problemen zijn + tijdens het opstarten! - For SCSI disks, the geometry to use depends on whether - extended translation support is turned on in your controller - (this is often referred to as support for DOS disks - >1GB or something similar). If it is turned off, - then use N cylinders, 64 heads - and 32 sectors/track, where N is - the capacity of the disk in MB. For example, a 2GB disk - should pretend to have 2048 cylinders, 64 heads and 32 - sectors/track. + Voor SCSI schijven is de geometrie die gebruikt + wordt afhankelijk van of extended translation + support is ingeschakeld in de controller (meestal + wordt hiernaar toe verwezen als support voor DOS + schijven >1GB of iets soortgelijks). Als deze + uitstaat, gebruik dan N cylinders, + 64 heads en 32 sectoren/tracks, waar + N de capaciteit in MB's is. + Bijvoorbeeld een 2GB disk zou moeten doen alsof het 2048 + cylinders heeft, 64 heads en 32 sectoren/tracks. - If it is turned on (it is often - supplied this way to get around certain limitations in - &ms-dos;) and the disk capacity is more than 1 GB, use - M cylinders, 63 sectors per track - (not 64), and 255 heads, where - M is the disk capacity in MB - divided by 7.844238 (!). So our example 2 GB drive - would have 261 cylinders, 63 sectors per track and 255 - heads. + Als het is ingeschakeld (het wordt + meestal gebruikt als manier om bepaalde beperkingen van + &ms-dos; te omzeilen), en de capaciteit van de schijf is + meer dan 1 GB, gebruik M + cylinders, 63 sectoren per track (niet + 64) en 255 heads, waar M de disk + capaciteit in MB's is gedeeld door 7.844238(!). Dus onze + voorbeeld 2 GB schijven zou 261 cylinders, 63 sectoren + per track moeten hebben en 255 heads. - If you are not sure about this, or &os; fails to detect - the geometry correctly during installation, the simplest way - around this is usually to create a small DOS partition on - the disk. The BIOS should then detect the correct geometry, - and you can always remove the DOS partition in the partition - editor if you do not want to keep it. You might want to - leave it around for programming network cards and the like, - however. + Als u niet zeker hierover bent, of als &os; faalt om de + geometrie goed te detecteren tijdens de installatie, is de + simpelste manier om dit omzeilen door een kleine DOS + partitie aan te maken op de schijf. De BIOS zou dan de + juiste geometrie moeten detecteren, de DOS parititie kan + altijd verwijderd worden in de partitie editor als u deze + niet wilt bewaren. U kunt echter overwegen hem te bewaren + voor als u uw netwerk kaarten en dergelijke moet + inprogrammeren. - Alternatively, there is a freely available utility - distributed with &os; called - pfdisk.exe. You can find it in the - tools subdirectory on - the &os; CD-ROM or on the various &os; FTP sites. This - program can be used to work out what geometry the other - operating systems on the disk are using. You can then enter - this geometry in the partition editor. + Als alternatief is er een vrijelijk beschikbare tool + welke geleverd wordt bij &os; genaamd + pfdisk.exe. U kunt deze vinden in de + tools subdirectory op + de &os; CD-ROM of op de verschillende FTP servers. Dit + programma kan gebruikt worden om te bepalen welke geometrie + de andere besturingssystemen gebruiken op de schijven die u + gebruikt. Daarna kunt u deze geometrie invoeren in de + partitie bewerker. - Are there any restrictions on how I divide the disk - up? + Zijn er enige restricties over hoe ik de disk moet + indelen? - Yes. You must make sure that your root partition is - below 1024 cylinders so the BIOS can boot the kernel from it. - (Note that this is a limitation in the PC's BIOS, not - &os;). + Ja. U moet ervoor zorgen dat uw root partitie zich + onder de 1024 cylinders bevind zodat de BIOS in staat is + om de kernel ervanaf te starten (Let op, dit is een + limitatie van de BIOS van de PC en niet van &os;). - For a SCSI drive, this will normally imply that the root - partition will be in the first 1024 MB (or in the first - 4096 MB if extended translation is turned on - see - previous question). For IDE, the corresponding figure is - 504 MB. + Voor een SCSI schijf betekend dit normaal gesproken dat + de root partitie in de eerste 1024 MB zit (of in de + eerste 4096 MB als extended translation is + ingeschakeld - zie de vorige vraag). Voor IDE is het + corresponderende plaatje 504 MB. - Is &os; compatible with any disk managers? + Is &os; compatible met enige schijf managers? - &os; recognizes the Ontrack Disk - Manager and makes allowances for it. Other disk - managers are not supported. + &os; herkent d Ontrack Disk + Manager en accepteert deze. Andere schijf + managers worden niet ondersteund. - If you just want to use the disk with &os; you do not - need a disk manager. Just configure the disk for as much - space as the BIOS can deal with (usually - 504 megabytes), and &os; should figure out how much - space you really have. If you are using an old disk with an - MFM controller, you may need to explicitly tell &os; how - many cylinders to use. + Als u de schijf alleen wilt gebruiken met &os; heeft + u geen schijf manager nodig. Configureer de schijf voor + zoveel mogelijk ruimte als de BIOS mee overweg kan (meestal + 504 megabytes) waarna &os; in staat is om uit te zoeken + hoeveel ruimte u daadwerkelijk heeft. Als u een oude schijf + gebruikt met een MFM controller, is het mogelijk dat u &os; + moet vertellen hoeveel cylinders u precies heeft. - If you want to use the disk with &os; and another - operating system, you may be able to do without a disk - manager: just make sure the &os; boot partition and the - slice for the other operating system are in the first 1024 - cylinders. If you are reasonably careful, a - 20 megabyte boot partition should be plenty. + Als u de disk wilt gebruiken met &os; en een ander + besturingssysteem, kan dit wellicht gedaan worden zonder + schijf manager: zorg er alleen voor dat de &os; opstart + partitie en de slice voor het andere besturingssysteem zich + in de eerste 1024 cylinders bevind. Als u redelijk + voorzichtib bent is een 20 megabyte opstart partitie + voldoende. - When I boot &os; for the first time after install I get - Missing Operating System. What is - happening? + Wanneer ik &os; opstart voor de eerste keer na de + installatie krijg ik de melding Missing + Operating System. Wat is er aan de hand? - This is classically a case of &os; and DOS or some other - OS conflicting over their ideas of disk geometry. You will have to - reinstall &os;, but obeying the instructions given above - will almost always get you going. + Dit is een klassiek geval van &os; en DOS of en ander + OS die conflicteert met hun ideëen over de schijf geometrie. U moet &os; opnieuw + installeren, maar door het luisteren naar de instructies + die hierboven gegeven zijn, krijgt u bijna altijd wat u + wilt. - Why can I not get past the boot manager's + Waarom kom ik niet langs de boot manager's F? prompt? - This is another symptom of the problem described in the - preceding question. Your BIOS geometry and &os; geometry - settings do not agree! If your controller or BIOS supports - cylinder translation (often marked as >1GB drive - support), try toggling its setting and reinstalling - &os;. + Dit is een ander symptoom van het proleem beschreven in + voorgaande vraag. Uw BIOS geometrie en &os; geometrie + instellingen komen niet overeen! Als uw controller of BIOS + cylinder translation ondersteund (veelal gemarkeerd als + >1GB drive support), probeert u dan de + instelling in te schakelen en vervolgens &os; te + herinstalleren. - Do I need to install the complete sources? + Moet ik de complete bronnen installeren? - In general, no. However, we would strongly recommend - that you install, at a minimum, the base - source kit, which includes several of the files mentioned - here, and the sys (kernel) source kit, - which includes sources for the kernel. There is nothing in - the system which requires the presence of the sources to - operate, however, except for the kernel-configuration - program &man.config.8;. With the exception of the kernel - sources, our build structure is set up so that you can - read-only mount the sources from elsewhere via NFS and still - be able to make new binaries (due to the kernel-source - restriction, we recommend that you not mount this on - /usr/src directly, but - rather in some other location with appropriate symbolic - links to duplicate the top-level structure of the source - tree). + In het algemeen, nee. Echter, we raden u sterk aan dat + u minstens de base source kit te + installeren, welke een aantal van de bestanden die hier + genoemd zijn hebben, en de sys (kernel) + source kit welke de bronnen bevat voor de kernel. Er is + niets in het systeem dat vereist dat de broncode aanwezig + is om te kunnen draaien, apart van het kernel configuratie + programma &man.config.8;. Met de uitzondering van de + kernel broncode, is onze bouw structuur dermate opgezet + dat u deze alleen-lezen kunt lezen door de broncode via + NFS te benaderen, waarbij het nog steeds mogelijk is om + nieuwe binaries te maken (door de kernel-broncode + restricties, raden we u aan om deze niet te koppelen aan + de /usr/src directory, + , maar in een andere directory met een symbolische link + om de top-level structuur te dupliceren van de broncode + boom). Having the sources on-line and knowing how to build a system with them will make it much easier for you to upgrade @@ -2593,9 +2616,9 @@ &man.kbdmux.4; driver type the following commands: &prompt.root; kbdcontrol -K < /dev/console > /dev/null -kbdcontrol -a atkbd0 < /dev/kbdmux0 > /dev/null -kbdcontrol -a ukbd1 < /dev/kbdmux0 > /dev/null -kbdcontrol -k /dev/kbdmux0 < /dev/console > /dev/null +&prompt.root; kbdcontrol -a atkbd0 < /dev/kbdmux0 > /dev/null +&prompt.root; kbdcontrol -a ukbd1 < /dev/kbdmux0 > /dev/null +&prompt.root; kbdcontrol -k /dev/kbdmux0 < /dev/console > /dev/null See the &man.ukbd.4;, &man.kbdcontrol.1; and &man.kbdmux.4; manual pages for more information. @@ -5255,13 +5278,13 @@ tolerate this much risk, do not use Soft Updates on the root file system! - / is traditionally one of the + / is traditionally one of the smallest partitions. If you put the - /tmp directory on - / and you have a busy - /tmp, you might see intermittent space - problems. Symlinking /tmp to - /var/tmp will solve this + /tmp directory on + / and you have a busy + /tmp, you might see intermittent space + problems. Symlinking /tmp to + /var/tmp will solve this problem. @@ -6392,6 +6415,12 @@ &prompt.root; sysctl hw.syscons.kbd_reboot=0 + + The above two methods are exclusive: The &man.sysctl.8; + does not exist if you compile your kernel with the + SC_DISABLE_REBOOT option. + + If you use the &man.pcvt.4; console driver, use the following kernel configuration line instead and rebuild the kernel: @@ -6502,45 +6531,22 @@ - If you have lot of telnet, - ssh, X, or screen users, - you will probably run out of pseudoterminals. Here is how - to add more: + If you have a lot of telnet, + ssh, X, or screen + users, you might run out of pseudoterminals. By default, + &os; 6.2 and earlier support 256 pseudoterminals, while + &os; 6.3 and later support 512 pseudoterminals. - - - Build and install a new kernel with the line in - the configuration file: - - device pty N - - where N is the number - of requested pseudoterminals. - - - - Edit /etc/ttys and add lines - for each of the N terminals. - They should match the form of the existing entries, i.e. - they look like this: - - ttyqc none network - - The order of the letter designations is - tty[pqrsPQRSlmnoLMNO][0123456789abcdefghijklmnopqrstuv], - using a regular expression. - - - - Reboot the system with the new kernel and you are - ready to go. - - - - - Using more than 256 (up to 512) &man.pty.4; devices - requires &os; 6.3 or later. - + + If needed, more pseudoterminals can be added. + However, this requires patching the standard C library, + the kernel, and /etc/ttys. For + example, + expands the number of pseudoterminals to 1152. Note that + the patch will only apply cleanly to &os; 6.3 or + later. + @@ -7502,49 +7508,10 @@ - &os; have a feature to allow the display of - splash screens during the boot messages. The - splash screens currently must be a 256 color bitmap - (*.BMP) or ZSoft PCX - (*.PCX) file. In addition, they must - have a resolution of 320x200 or less to work on standard VGA - adapters. If you compile VESA support into your kernel, - then you can use larger bitmaps up to 1024x768. The actual - VESA support can either be compiled directly into the kernel - with the VESA kernel config option or by - loading the VESA kld module during bootup. - - To use a splash screen, you need to modify the startup - files that control the boot process for &os;. - - You need to create a - /boot/loader.rc file that contains the - following lines: - - include /boot/loader.4th -start - - and a /boot/loader.conf that - contains the following: - - splash_bmp_load="YES" -bitmap_load="YES" - - This assumes you are using - /boot/splash.bmp for your splash - screen. If you would rather use a PCX file, copy it to - /boot/splash.pcx, create a - /boot/loader.rc as instructed above, - and create a /boot/loader.conf that - contains: - - splash_pcx_load="YES" -bitmap_load="YES" -bitmap_name="/boot/splash.pcx" - - Now all you need is a splash screen. For that you can - surf on over to the gallery at . + The detailed answer for this question can be found in + the Boot Time Splash Screens + section of the &os; Handbook. From rene at FreeBSD.org Mon Jan 5 22:49:44 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Mon Jan 5 22:49:51 2009 Subject: PERFORCE change 155687 for review Message-ID: <200901052249.n05MngdU011664@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155687 Change 155687 by rene@rene_self on 2009/01/05 22:49:30 Translate first 18% of solid-state article. Use English copyright notice for now. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#3 (text+ko) ==== @@ -36,12 +36,12 @@ %articles.ent; - + ]>
      - FreeBSD and Solid State Devices + &os; en Solid State Devices @@ -53,10 +53,10 @@ - + 2001 - The FreeBSD Documentation Project + The &os; Documentation Project @@ -66,50 +66,58 @@ &legalnotice; - + - This article covers the use of solid state disk devices in FreeBSD - to create embedded systems. - - Embedded systems have the advantage of increased stability due to - the lack of integral moving parts (hard drives). Account must be - taken, however, for the generally low disk space available in the - system and the durability of the storage medium. + Dit artikel behandelt het gebruik van solid state + disk-apparaten in &os; voor het maken van embeddded + systemen. + + Embedded systemen hebben het voordeel van verhoogde + stabiliteit wegens het ontbreken van bewegende delen (harde + schijven). Er moet echter rekening worden gehouden met de over + het algemeen weinig beschikbare schijfruimte in het systeem en + de duurzaamheid van het opslagmedium. - Specific topics to be covered include the types and attributes of - solid state media suitable for disk use in FreeBSD, kernel options - that are of interest in such an environment, the - rc.diskless mechanisms that automate the - initialization of such systems and the need for read-only filesystems, - and building filesystems from scratch. The article will conclude - with some general strategies for small and read-only FreeBSD - environments. + Specifieke onderwerpen die aan bod komen omvatten de typen + en attributen van solid state-media die geschikt zijn om in &os; + als schijf te gebruiken, kernelopties die interessant zijn in + zo'n omgeving, de mechanismen van + rc.diskless die de initialisatie van zulke + systemen automatiseren en de noodzaak voor alleen-lezen + bestandssystemen, en het van voor af aan bouwen van + bestandssystemen. Het artikel zal afsluiten met wat algemene + strategiën voor kleine en alleen-lezen + &os;-omgevingen. Vertaald door René Ladan. - Solid State Disk Devices + Solid State Disk-apparaten - The scope of this article will be limited to solid state disk - devices made from flash memory. Flash memory is a solid state memory - (no moving parts) that is non-volatile (the memory maintains data even - after all power sources have been disconnected). Flash memory can - withstand tremendous physical shock and is reasonably fast (the flash - memory solutions covered in this article are slightly slower than a EIDE - hard disk for write operations, and much faster for read operations). - One very important aspect of flash memory, the ramifications of which - will be discussed later in this article, is that each sector has a - limited rewrite capacity. You can only write, erase, and write again to - a sector of flash memory a certain number of times before the sector - becomes permanently unusable. Although many flash memory products - automatically map bad blocks, and although some even distribute write - operations evenly throughout the unit, the fact remains that there - exists a limit to the amount of writing that can be done to the device. - Competitive units have between 1,000,000 and 10,000,000 writes per - sector in their specification. This figure varies due to the - temperature of the environment. + Het bereik van dit artikel zal beperkt zijn tot solid state + disk-apparaten die gemaakt zijn met flash-geheugen. + Flash-geheugen is een solid state-geheugen (geen bewegende + onderdelen) dat niet-vluchtig is (het geheugen blijft gegevens + behouden zelf nadat alle stroombronnen zijn ontkoppeld). + Flash-geheugen kan enorme fysieke schokken weerstaan en is + redelijk snel (de oplossingen met flash-geheugens die in dit + artikel worden behandeld zijn iets langzamer dan een EIDE-harde + schijf voor schrijfbewerkingen, en veel sneller voor + leesbewerkingen). Een heel belangrijk aspect van flash-geheugen, + waarvan de ramnificaties later in dit artikel besproken zullen + worden, is dat elke sector een beperkte herschijfcapaciteit heeft. + Een sector flash-geheugen kan maar een bepald aantal keren + beschreven, gewist, en herschreven worden voordat de sector + permanent onbruikbaar wordt. Hoewel veel flash-geheugenproducten + automatisch slechte blokken in kaart brengen, en hoewel sommigen + zelfs schrijfoperaties gelijkmatig over de eenheid distribueren, + blijft het een feit dat er een limiet bestaat aan de hoeveelheid + waarmee het apparaat kan worden beschreven. Concurrerende + apparaten hebben tussen de 1.000.000 en 10.000.000 + schrijfbewerkingen per sector in hun specificaties staan. Dit + getal varieert vanwege de omgevingstemperatuur. Specifically, we will be discussing ATA compatible compact-flash units and the M-Systems &diskonchip; flash memory unit. ATA compatible @@ -325,7 +333,7 @@ &prompt.root; mknod /dev/ad0a c 116 0 -&prompt.root; mknod /dev/ad0c c 116 2 +&prompt.root; mknod /dev/ad0c c 116 2 &prompt.root; disklabel -e /dev/ad0c &prompt.root; mknod /dev/fla0a c 102 0 @@ -399,7 +407,7 @@ - + Bring this machine up on the network so we may transfer our tar file and explode it onto our flash media filesystem. One example of how to do this is: @@ -474,7 +482,7 @@ &prompt.root; mount /dev/vn0c /mnt - + Place your kernel file into /mnt, replacing the existing one @@ -580,7 +588,7 @@ /var/db/pkg. An example: &prompt.root; ln -s /etc/pkg /var/db/pkg - + Add another line in /etc/rc.diskless2 that creates and populates /var/db/port.mkversion @@ -618,7 +626,7 @@ First, add the directory log/apache to the list of directories to be created in /etc/rc.diskless2. - + Second, add these commands to /etc/rc.diskless2 after the directory creation section: @@ -635,4 +643,3 @@
      - From rene at FreeBSD.org Mon Jan 5 23:47:46 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Mon Jan 5 23:47:58 2009 Subject: PERFORCE change 155689 for review Message-ID: <200901052347.n05NliTs019768@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155689 Change 155689 by rene@rene_self on 2009/01/05 23:47:43 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#13 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#13 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/share/sgml/trademarks.ent#2 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#7 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/errata.html#3 integrate .. //depot/projects/docproj_nl/www/en/security/security.sgml#4 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#13 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1104 2008/12/24 10:32:40 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1106 2009/01/05 15:44:57 remko Exp $ 1995 @@ -29,6 +29,7 @@ 2006 2007 2008 + 2009 The &os; Documentation Project ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -21,7 +21,7 @@ - How to set up IEEE 802.11 and &bluetooth; devices. + How to set up &ieee; 802.11 and &bluetooth; devices. @@ -700,7 +700,7 @@ Wireless Networking Basics - Most wireless networks are based on the IEEE 802.11 + Most wireless networks are based on the &ieee; 802.11 standards. A basic wireless network consists of multiple stations communicating with radios that broadcast in either the 2.4GHz or 5GHz band (though this varies according to the @@ -720,7 +720,7 @@ network. 802.11 networks were first deployed in the 2.4GHz band - using protocols defined by the IEEE 802.11 and 802.11b + using protocols defined by the &ieee; 802.11 and 802.11b standard. These specifications include the operating frequencies, MAC layer characteristics including framing and transmission rates (communication can be done at various @@ -740,7 +740,7 @@ to communicate. This scheme was shown to be easily broken and is now rarely used except to discourage transient users from joining networks. Current security practice is given by the - IEEE 802.11i specification that defines new cryptographic + &ieee; 802.11i specification that defines new cryptographic ciphers and an additional protocol to authenticate stations to an access point and exchange keys for doing data communication. Further, cryptographic keys are periodically @@ -1378,7 +1378,7 @@ - Here, we use RSN (IEEE 802.11i) protocol, i.e., + Here, we use RSN (&ieee; 802.11i) protocol, i.e., WPA2. @@ -3216,7 +3216,7 @@ - failover + Failover Sends and receives traffic only through the master port. If the @@ -3226,15 +3226,15 @@ - fec + &cisco; Fast ðerchannel; - Supports Cisco EtherChannel. This is a static setup and does not + &cisco; Fast ðerchannel; (FEC), is a static setup and does not negotiate aggregation with the peer or exchange frames to monitor the - link, if the switch supports LACP then that should be used + link. If the switch supports LACP then that should be used instead. - Balances outgoing traffic across the active ports based on hashed + FEC balances outgoing traffic across the active ports based on hashed protocol header information and accepts incoming traffic from any active port. The hash includes the Ethernet source and destination address, and, if available, the VLAN tag, and the IPv4/IPv6 source @@ -3242,20 +3242,20 @@ - lacp + LACP - Supports the IEEE 802.3ad Link Aggregation Control Protocol + The &ieee; 802.3ad Link Aggregation Control Protocol (LACP) and the Marker Protocol. LACP will negotiate a set of aggregable links with the peer in to one or more Link Aggregated - Groups. Each LAG is composed of ports of the same speed, set to + Groups (LAG). Each LAG is composed of ports of the same speed, set to full-duplex operation. The traffic will be balanced across the ports in the LAG with the greatest total speed, in most cases there will - only be one LAG which contains all ports. In the event of changes in + only be one LAG which contains all ports. In the event of changes in physical connectivity, Link Aggregation will quickly converge to a new configuration. - Balances outgoing traffic across the active ports based on hashed + LACP balances outgoing traffic across the active ports based on hashed protocol header information and accepts incoming traffic from any active port. The hash includes the Ethernet source and destination address, and, if available, the VLAN tag, and the IPv4/IPv6 source @@ -3263,19 +3263,19 @@ - loadbalance + Loadbalance - This is an alias of fec mode. + This is an alias of FEC mode. - roundrobin + Round-robin Distributes outgoing traffic using a round-robin scheduler through all active ports and accepts incoming traffic from any active - port. This mode will violate Ethernet frame ordering and should be + port. This mode violates Ethernet Frame ordering and should be used with caution. @@ -3286,7 +3286,7 @@ Examples - LACP aggregation with a Cisco switch + LACP aggregation with a &cisco; Switch This example connects two interfaces on a &os; machine to the switch as a single load balanced and fault tolerant link. More interfaces @@ -3297,23 +3297,31 @@ much information as it can to distinguish different traffic flows and balance across the available interfaces. - On the Cisco switch add the interfaces to the channel group. + On the &cisco; switch add the + FastEthernet0/1 and + FastEthernet0/2 interfaces to the + channel-group 1: - interface FastEthernet0/1 - channel-group 1 mode active - channel-protocol lacp + interface FastEthernet0/1 + channel-group 1 mode active + channel-protocol lacp ! -interface FastEthernet0/2 - channel-group 1 mode active - channel-protocol lacp -! +interface FastEthernet0/2 + channel-group 1 mode active + channel-protocol lacp - On the &os; machine create the lagg interface. + On the &os; machine create the &man.lagg.4; interface using + fxp0 and + fxp1: - &prompt.root; ifconfig lagg0 create -&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 + &prompt.root; ifconfig lagg0 create +&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 - View the interface status from ifconfig; ports marked as + View the interface status by running: + + &prompt.root; ifconfig lagg0 + + Ports marked as ACTIVE are part of the active aggregation group that has been negotiated with the remote switch and traffic will be transmitted and received. Use the verbose output of &man.ifconfig.8; @@ -3328,8 +3336,8 @@ laggport: fxp1 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING> laggport: fxp0 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING> - The switch will show which ports are active. For more detail use - show lacp neighbor detail. + To see the port status on the switch, use show + lacp neighbor: switch# show lacp neighbor Flags: S - Device is requesting Slow LACPDUs @@ -3345,17 +3353,27 @@ Fa0/1 SA 32768 0005.5d71.8db8 29s 0x146 0x3 0x3D Fa0/2 SA 32768 0005.5d71.8db8 29s 0x146 0x4 0x3D + For more detail use the show lacp neighbor + detail command. Failover mode - Failover mode can be used to switch over to another interface if - the link is lost on the master. + Failover mode can be used to switch over to a secondary interface if + the link is lost on the master interface. Create and configure the + lagg0 interface, with + fxp0 as the master interface and + fxp1 as the secondary interface: + + &prompt.root; ifconfig lagg0 create +&prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1 - &prompt.root; ifconfig lagg0 create -&prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1 + The interface will look something like this, the major + differences will be the MAC address and the + device names: - lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + &prompt.root; ifconfig lagg0 +lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 options=8<VLAN_MTU> ether 00:05:5d:71:8d:b8 media: Ethernet autoselect @@ -3365,8 +3383,8 @@ laggport: fxp0 flags=5<MASTER,ACTIVE> Traffic will be transmitted and received on - fxp0. If the link is lost on - fxp0 then fxp1 will + fxp0. If the link is lost on + fxp0 then fxp1 will become the active link. If the link is restored on the master interface then it will once again become the active link. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ 3Com and HomeConnect are registered @@ -86,7 +86,9 @@ Cisco, Catalyst, and IOS are registered trademarks of Cisco Systems, Inc. and/or its affiliates in the United States and certain other countries."> +Cisco"> Catalyst"> +EtherChannel"> IOS"> Corel and WordPerfect are trademarks @@ -151,6 +153,7 @@ IEEE, POSIX, and 802 are registered trademarks of Institute of Electrical and Electronics Engineers, Inc. in the United States."> +IEEE"> POSIX"> ==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#7 (text+ko) ==== @@ -34,7 +34,7 @@ # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.226 2008/12/21 23:04:17 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.227 2009/01/05 20:46:44 hrs Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -159,19 +159,22 @@ ); $manLocalDir = '/usr/local/www/bsddoc/man'; -$manPathDefault = 'FreeBSD 7.0-RELEASE'; +$manPathDefault = 'FreeBSD 7.1-RELEASE'; %manPath = ( - 'FreeBSD 7.0-RELEASE and Ports', + 'FreeBSD 7.1-RELEASE and Ports', "$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", 'FreeBSD 6.4-RELEASE and Ports', "$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", 'FreeBSD 8-current', "$manLocalDir/FreeBSD-8-current/man:$manLocalDir/FreeBSD-8-current/openssl/man", - 'FreeBSD 7.0-stable', "$manLocalDir/FreeBSD-7.0-stable", - 'FreeBSD 7.0-RELEASE', -"$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man", + + 'FreeBSD 7.1-stable', "$manLocalDir/FreeBSD-7.1-stable", + 'FreeBSD 7.1-RELEASE', "$manLocalDir/FreeBSD-7.1-RELEASE/man:$manLocalDir/FreeBSD-7.1-RELEASE/openssl/man", + 'FreeBSD Ports 7.1-RELEASE', "$manLocalDir/FreeBSD-ports-7.1-RELEASE", + + 'FreeBSD 7.0-RELEASE', "$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man", 'FreeBSD Ports 7.0-RELEASE', "$manLocalDir/FreeBSD-ports-7.0-RELEASE", 'FreeBSD 6.4-stable', "$manLocalDir/FreeBSD-6.4-stable", @@ -461,15 +464,15 @@ # keywords must be in lower cases. %manPathAliases = ( - 'freebsd', 'FreeBSD 7.0-RELEASE', - 'freebsd-release', 'FreeBSD 7.0-RELEASE', + 'freebsd', 'FreeBSD 7.1-RELEASE', + 'freebsd-release', 'FreeBSD 7.1-RELEASE', - 'freebsd-stable', 'FreeBSD 7.0-stable', - 'freebsd-stable7', 'FreeBSD 7.0-stable', + 'freebsd-stable', 'FreeBSD 7.1-stable', + 'freebsd-stable7', 'FreeBSD 7.1-stable', 'freebsd-stable6', 'FreeBSD 6.4-stable', 'freebsd-current', 'FreeBSD 8-current', - 'freebsd-release-ports', 'FreeBSD 7.0-RELEASE and Ports', + 'freebsd-release-ports', 'FreeBSD 7.1-RELEASE and Ports', 'slackware', 'Linux Slackware 3.1', 'redhat', 'Red Hat Linux/i386 9', @@ -1375,7 +1378,7 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.226 2008/12/21 23:04:17 wosch Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.227 2009/01/05 20:46:44 hrs Exp $'; return qq{\ 
       Copyright (c) 1996-2008 Wolfram Schneider

==== //depot/projects/docproj_nl/www/en/releases/7.1R/errata.html#3 (text+ko) ====

@@ -19,7 +19,7 @@
 
      Copyright © 2008, 2009 The FreeBSD Documentation Project
      
 
 
      $FreeBSD: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml
-186764 2009-01-05 08:56:45Z hrs $
      
+186782 2009-01-05 15:38:45Z hrs $
      
 
      
 
 
      
@@ -142,6 +142,15 @@
 
      4 Late-Breaking News and
 Corrections
      
 
+
      [20090105] The Release Notes for 7.1-RELEASE should have mentioned that the 
+procstat(1)
+utility has been added. This is a process inspection utility which provides both some of
+the missing functionality from 
+procfs(5) and
+new functionality for monitoring and debugging specific processes.
      
+
 
      [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the ae(4) driver has been

==== //depot/projects/docproj_nl/www/en/security/security.sgml#4 (text+ko) ====

@@ -1,12 +1,12 @@
 
-
+
 
 
  %developers;
 
 ]>
-
+
 
 
   &header;
@@ -208,10 +208,18 @@
     
      Normal
      
     
      Releases which are published from a -STABLE branch will be
       supported by the Security Officer for a minimum of 12 months after the
-      release.
      
+      release, and for sufficient additional time (if needed) to ensure
+      that there is a newer release for at least 3 months before the
+      older Normal relase expires.
+    
     
      Extended
      
-    
      Selected releases will be supported by the Security Officer for a
-      minimum of 24 months after the release.
      
+    
      Selected releases (normally every second release plus the last
+      release from each -STABLE branch) will be supported by the
+      Security Officer for a minimum of 24 months after the release,
+      and for sufficient additional time (if needed) to ensure that
+      there is a newer Extended release for at least 3 months before the
+      older Extended release expires.
+    
      
   
 
   
@@ -269,7 +277,14 @@
       7.0-RELEASE
       Normal
       February 27, 2008
-      February 28, 2009
+      April 30, 2009
+    
+    
+      RELENG_7_1
+      7.1-RELEASE
+      Extended
+      January 4, 2009
+      January 31, 2011
     
   
 
From weongyo at FreeBSD.org  Tue Jan  6 08:20:29 2009
From: weongyo at FreeBSD.org (Weongyo Jeong)
Date: Tue Jan  6 08:20:34 2009
Subject: PERFORCE change 155702 for review
Message-ID: <200901060820.n068KQx6006060@repoman.freebsd.org>

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

Change 155702 by weongyo@weongyo_ws on 2009/01/06 08:19:26

	a trivial ordering of functions.

Affected files ...

.. //depot/projects/vap/sys/dev/usb/if_urtw.c#7 edit

Differences ...

==== //depot/projects/vap/sys/dev/usb/if_urtw.c#7 (text+ko) ====

@@ -582,33 +582,6 @@
 }
 
 static usbd_status
-urtw_close_pipes(struct urtw_softc *sc)
-{
-	usbd_status error = 0;
-
-	if (sc->sc_rxpipe != NULL) {
-		error = usbd_close_pipe(sc->sc_rxpipe);
-		if (error != 0)
-			goto fail;
-		sc->sc_rxpipe = NULL;
-	}
-	if (sc->sc_txpipe_low != NULL) {
-		error = usbd_close_pipe(sc->sc_txpipe_low);
-		if (error != 0)
-			goto fail;
-		sc->sc_txpipe_low = NULL;
-	}
-	if (sc->sc_txpipe_normal != NULL) {
-		error = usbd_close_pipe(sc->sc_txpipe_normal);
-		if (error != 0)
-			goto fail;
-		sc->sc_txpipe_normal = NULL;
-	}
-fail:
-	return (error);
-}
-
-static usbd_status
 urtw_open_pipes(struct urtw_softc *sc)
 {
 	usbd_status error;
@@ -649,6 +622,33 @@
 	return (error);
 }
 
+static usbd_status
+urtw_close_pipes(struct urtw_softc *sc)
+{
+	usbd_status error = 0;
+
+	if (sc->sc_rxpipe != NULL) {
+		error = usbd_close_pipe(sc->sc_rxpipe);
+		if (error != 0)
+			goto fail;
+		sc->sc_rxpipe = NULL;
+	}
+	if (sc->sc_txpipe_low != NULL) {
+		error = usbd_close_pipe(sc->sc_txpipe_low);
+		if (error != 0)
+			goto fail;
+		sc->sc_txpipe_low = NULL;
+	}
+	if (sc->sc_txpipe_normal != NULL) {
+		error = usbd_close_pipe(sc->sc_txpipe_normal);
+		if (error != 0)
+			goto fail;
+		sc->sc_txpipe_normal = NULL;
+	}
+fail:
+	return (error);
+}
+
 static int
 urtw_alloc_data_list(struct urtw_softc *sc, struct urtw_data data[],
 	int ndata, int maxsz, int fillmbuf)
From weongyo at FreeBSD.org  Tue Jan  6 11:01:11 2009
From: weongyo at FreeBSD.org (Weongyo Jeong)
Date: Tue Jan  6 11:01:18 2009
Subject: PERFORCE change 155706 for review
Message-ID: <200901061101.n06B1AOH035261@repoman.freebsd.org>

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

Change 155706 by weongyo@weongyo_ws on 2009/01/06 11:00:49

	define magic macros due to the lack of documents; no functional changes

Affected files ...

.. //depot/projects/vap/sys/dev/usb/if_urtw.c#8 edit
.. //depot/projects/vap/sys/dev/usb/if_urtwreg.h#3 edit

Differences ...

==== //depot/projects/vap/sys/dev/usb/if_urtw.c#8 (text+ko) ====

@@ -849,9 +849,9 @@
 	urtw_read16_m(sc, URTW_RF_PINS_OUTPUT, &o1);
 	urtw_read16_m(sc, URTW_RF_PINS_ENABLE, &o2);
 	urtw_read16_m(sc, URTW_RF_PINS_SELECT, &o3);
-	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, o2 | 0xf);
-	urtw_write16_m(sc, URTW_RF_PINS_SELECT, o3 | 0xf);
-	o1 &= ~0xf;
+	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, o2 | URTW_RF_PINS_MAGIC4);
+	urtw_write16_m(sc, URTW_RF_PINS_SELECT, o3 | URTW_RF_PINS_MAGIC4);
+	o1 &= ~URTW_RF_PINS_MAGIC4;
 	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, o1 | URTW_BB_HOST_BANG_EN);
 	DELAY(5);
 	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, o1);
@@ -917,7 +917,7 @@
 
 	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, o2);
 	urtw_write16_m(sc, URTW_RF_PINS_SELECT, o3);
-	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, 0x3a0);
+	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, URTW_RF_PINS_OUTPUT_MAGIC1);
 
 	if (data != NULL)
 		*data = value;
@@ -932,12 +932,12 @@
 	usbd_status error;
 
 	urtw_read16_m(sc, URTW_RF_PINS_OUTPUT, &d80);
-	d80 &= 0xfff3;
+	d80 &= URTW_RF_PINS_MAGIC1;
 	urtw_read16_m(sc, URTW_RF_PINS_ENABLE, &d82);
 	urtw_read16_m(sc, URTW_RF_PINS_SELECT, &d84);
-	d84 &= 0xfff0;
-	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, d82 | 0x0007);
-	urtw_write16_m(sc, URTW_RF_PINS_SELECT, d84 | 0x0007);
+	d84 &= URTW_RF_PINS_MAGIC2;
+	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, d82 | URTW_RF_PINS_MAGIC3);
+	urtw_write16_m(sc, URTW_RF_PINS_SELECT, d84 | URTW_RF_PINS_MAGIC3);
 	DELAY(10);
 
 	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, d80 | URTW_BB_HOST_BANG_EN);
@@ -966,27 +966,29 @@
 
 	*ret = 1;
 
-	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, 0x0080);
-	urtw_write16_m(sc, URTW_RF_PINS_SELECT, 0x0080);
-	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, 0x0080);
+	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, URTW_RF_PINS_MAGIC5);
+	urtw_write16_m(sc, URTW_RF_PINS_SELECT, URTW_RF_PINS_MAGIC5);
+	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, URTW_RF_PINS_MAGIC5);
 	usbd_delay_ms(sc->sc_udev, 1100);
 
-	urtw_8225_write(sc, 0x0, 0x1b7);
+	urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC,
+	    URTW_8225_ADDR_0_DATA_MAGIC1);
 
-	error = urtw_8225_read(sc, 0x8, &data);
+	error = urtw_8225_read(sc, URTW_8225_ADDR_8_MAGIC, &data);
 	if (error != 0)
 		goto fail;
-	if (data != 0x588)
+	if (data != URTW_8225_ADDR_8_DATA_MAGIC1)
 		*ret = 0;
 	else {
-		error = urtw_8225_read(sc, 0x9, &data);
+		error = urtw_8225_read(sc, URTW_8225_ADDR_9_MAGIC, &data);
 		if (error != 0)
 			goto fail;
-		if (data != 0x700)
+		if (data != URTW_8225_ADDR_9_DATA_MAGIC1)
 			*ret = 0;
 	}
 
-	urtw_8225_write(sc, 0x0, 0xb7);
+	urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC,
+	    URTW_8225_ADDR_0_DATA_MAGIC2);
 fail:
 	return (error);
 }
@@ -1546,7 +1548,7 @@
 	usbd_delay_ms(sc->sc_udev, 200);
 
 	urtw_read8_m(sc, URTW_CMD, &data);
-	data = (data & 2) | URTW_CMD_RST;
+	data = (data & 0x2) | URTW_CMD_RST;
 	urtw_write8_m(sc, URTW_CMD, data);
 	usbd_delay_ms(sc->sc_udev, 200);
 
@@ -1605,8 +1607,9 @@
 	if (type == URTW_LED_GPIO) {
 		switch (sc->sc_gpio_ledpin) {
 		case URTW_LED_PIN_GPIO0:
-			urtw_write8_m(sc, URTW_GPIO, 0x01);
-			urtw_write8_m(sc, URTW_GP_ENABLE, 0x01);
+			urtw_write8_m(sc, URTW_GPIO, URTW_GPIO_DATA_MAGIC1);
+			urtw_write8_m(sc,
+			    URTW_GP_ENABLE, URTW_GP_ENABLE_DATA_MAGIC1);
 			break;
 		default:
 			panic("unsupported LED PIN type 0x%x",
@@ -1901,11 +1904,11 @@
 	if (error)
 		goto fail;
 
-	urtw_write8_m(sc, 0x85, 0);
+	urtw_write8_m(sc, URTW_ADDR_MAGIC1, 0);
 	urtw_write8_m(sc, URTW_GPIO, 0);
 
 	/* for led  */
-	urtw_write8_m(sc, 0x85, 4);
+	urtw_write8_m(sc, URTW_ADDR_MAGIC1, 4);
 	error = urtw_led_ctl(sc, URTW_LED_CTL_POWER_ON);
 	if (error != 0)
 		goto fail;
@@ -1937,12 +1940,14 @@
 	if (sc->sc_rf_set_sens != NULL)
 		sc->sc_rf_set_sens(sc, sc->sc_sens);
 
-	urtw_write16_m(sc, 0x5e, 1);
-	urtw_write16_m(sc, 0xfe, 0x10);
+	/* XXX correct? to call write16  */
+	urtw_write16_m(sc, URTW_PSR, 1);
+	urtw_write16_m(sc, URTW_ADDR_MAGIC2, 0x10);
 	urtw_write8_m(sc, URTW_TALLY_SEL, 0x80);
-	urtw_write8_m(sc, 0xff, 0x60);
-	urtw_write16_m(sc, 0x5e, 0);
-	urtw_write8_m(sc, 0x85, 4);
+	urtw_write8_m(sc, URTW_ADDR_MAGIC3, 0x60);
+	/* XXX correct? to call write16  */
+	urtw_write16_m(sc, URTW_PSR, 0);
+	urtw_write8_m(sc, URTW_ADDR_MAGIC1, 4);
 
 	error = urtw_intr_enable(sc);
 	if (error != 0)
@@ -2555,10 +2560,10 @@
 	usbd_status error;
 
 	phyw = ((data << 8) | (addr | 0x80));
-	urtw_write8_m(sc, 0x7f, ((phyw & 0xff000000) >> 24));
-	urtw_write8_m(sc, 0x7e, ((phyw & 0x00ff0000) >> 16));
-	urtw_write8_m(sc, 0x7d, ((phyw & 0x0000ff00) >> 8));
-	urtw_write8_m(sc, 0x7c, ((phyw & 0x000000ff)));
+	urtw_write8_m(sc, URTW_PHY_MAGIC4, ((phyw & 0xff000000) >> 24));
+	urtw_write8_m(sc, URTW_PHY_MAGIC3, ((phyw & 0x00ff0000) >> 16));
+	urtw_write8_m(sc, URTW_PHY_MAGIC2, ((phyw & 0x0000ff00) >> 8));
+	urtw_write8_m(sc, URTW_PHY_MAGIC1, ((phyw & 0x000000ff)));
 	usbd_delay_ms(sc->sc_udev, 1);
 fail:
 	return (error);
@@ -2697,19 +2702,24 @@
 		usbd_delay_ms(sc->sc_udev, 1);
 	}
 	usbd_delay_ms(sc->sc_udev, 100);
-	urtw_8225_write(sc, 0x2, 0xc4d);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1);
 	usbd_delay_ms(sc->sc_udev, 200);
-	urtw_8225_write(sc, 0x2, 0x44d);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2);
 	usbd_delay_ms(sc->sc_udev, 200);
-	urtw_8225_write(sc, 0x0, 0x127);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC3);
 	
 	for (i = 0; i < 95; i++) {
-		urtw_8225_write(sc, 0x1, (uint8_t)(i + 1));
-		urtw_8225_write(sc, 0x2, urtw_8225_rxgain[i]);
+		urtw_8225_write(sc, URTW_8225_ADDR_1_MAGIC, (uint8_t)(i + 1));
+		urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC, urtw_8225_rxgain[i]);
 	}
 
-	urtw_8225_write(sc, 0x0, 0x27);
-	urtw_8225_write(sc, 0x0, 0x22f);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC4);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC5);
 	
 	for (i = 0; i < 128; i++) {
 		urtw_8187_write_phy_ofdm(sc, 0xb, urtw_8225_agc[i]);
@@ -2734,7 +2744,7 @@
 		usbd_delay_ms(sc->sc_udev, 1);
 	}
 
-	urtw_write8_m(sc, 0x5b, 0x0d);
+	urtw_write8_m(sc, URTW_ADDR_MAGIC4, 0x0d);
 
 	error = urtw_8225_set_txpwrlvl(sc, 1);
 	if (error)
@@ -2749,7 +2759,7 @@
 	error = urtw_8185_tx_antenna(sc, 0x3);
 	if (error)
 		goto fail;
-	urtw_write32_m(sc, 0x94, 0x3dc00002);
+	urtw_write32_m(sc, URTW_ADDR_MAGIC5, 0x3dc00002);
 
 	error = urtw_8225_rf_set_chan(sc, 1);
 fail:
@@ -2768,7 +2778,7 @@
 	error = urtw_8225_set_txpwrlvl(sc, chan);
 	if (error)
 		goto fail;
-	urtw_8225_write(sc, 0x7, urtw_8225_channel[chan]);
+	urtw_8225_write(sc, URTW_8225_ADDR_7_MAGIC, urtw_8225_channel[chan]);
 	usbd_delay_ms(sc->sc_udev, 10);
 
 	urtw_write8_m(sc, URTW_SIFS, 0x22);
@@ -2804,9 +2814,11 @@
 		return -1;
 
 	if (sens > 4)
-		urtw_8225_write(sc, 0x0c, 0x850);
+		urtw_8225_write(sc,
+		    URTW_8225_ADDR_C_MAGIC, URTW_8225_ADDR_C_DATA_MAGIC1);
 	else	
-		urtw_8225_write(sc, 0x0c, 0x50);
+		urtw_8225_write(sc,
+		    URTW_8225_ADDR_C_MAGIC, URTW_8225_ADDR_C_DATA_MAGIC2);
 
 	sens = 6 - sens;
 	error = urtw_8225_setgain(sc, sens);
@@ -3006,9 +3018,9 @@
 	cck_pwrtable = (chan == 14) ? urtw_8225v2_txpwr_cck_ch14 :
 	    urtw_8225v2_txpwr_cck;
 
-	for (i = 0; i < 8; i++) {
+	for (i = 0; i < 8; i++)
 		urtw_8187_write_phy_cck(sc, 0x44 + i, cck_pwrtable[i]);
-	}
+
 	urtw_write8_m(sc, URTW_TX_GAIN_CCK,
 	    urtw_8225v2_tx_gain_cck_ofdm[cck_pwrlvl]);
 	usbd_delay_ms(sc->sc_udev, 1);
@@ -3079,45 +3091,55 @@
 	}
 	usbd_delay_ms(sc->sc_udev, 100);
 
-	urtw_8225_write(sc, 0x0, 0x1b7);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC1);
 
 	for (i = 0; i < 95; i++) {
-		urtw_8225_write(sc, 0x1, (uint8_t)(i + 1));
+		urtw_8225_write(sc, URTW_8225_ADDR_1_MAGIC, (uint8_t)(i + 1));
 		usbd_delay_ms(sc->sc_udev, 1);
-		urtw_8225_write(sc, 0x2, urtw_8225v2_rxgain[i]);
+		urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC,
+		    urtw_8225v2_rxgain[i]);
 		usbd_delay_ms(sc->sc_udev, 1);
 	}
 
-	urtw_8225_write(sc, 0x3, 0x2);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_3_MAGIC, URTW_8225_ADDR_3_DATA_MAGIC1);
 	usbd_delay_ms(sc->sc_udev, 1);
-	urtw_8225_write(sc, 0x5, 0x4);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_5_MAGIC, URTW_8225_ADDR_5_DATA_MAGIC1);
 	usbd_delay_ms(sc->sc_udev, 1);
-	urtw_8225_write(sc, 0x0, 0xb7);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC2);
 	usbd_delay_ms(sc->sc_udev, 1);
-	urtw_8225_write(sc, 0x2, 0xc4d);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1);
 	usbd_delay_ms(sc->sc_udev, 200);
-	urtw_8225_write(sc, 0x2, 0x44d);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2);
 	usbd_delay_ms(sc->sc_udev, 200);
 
-	error = urtw_8225_read(sc, 0x6, &data32);
+	error = urtw_8225_read(sc, URTW_8225_ADDR_6_MAGIC, &data32);
 	if (error != 0)
 		goto fail;
-	if (data32 != 0xe6)
+	if (data32 != URTW_8225_ADDR_6_DATA_MAGIC1)
 		device_printf(sc->sc_dev, "expect 0xe6!! (0x%x)\n", data32);
-	if (!(data32 & 0x80)) {
-		urtw_8225_write(sc, 0x02, 0x0c4d);
+	if (!(data32 & URTW_8225_ADDR_6_DATA_MAGIC2)) {
+		urtw_8225_write(sc,
+		    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1);
 		usbd_delay_ms(sc->sc_udev, 200);
-		urtw_8225_write(sc, 0x02, 0x044d);
+		urtw_8225_write(sc,
+		    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2);
 		usbd_delay_ms(sc->sc_udev, 100);
-		error = urtw_8225_read(sc, 0x6, &data32);
+		error = urtw_8225_read(sc, URTW_8225_ADDR_6_MAGIC, &data32);
 		if (error != 0)
 			goto fail;
-		if (!(data32 & 0x80))
+		if (!(data32 & URTW_8225_ADDR_6_DATA_MAGIC2))
 			device_printf(sc->sc_dev, "RF calibration failed\n");
 	}
 	usbd_delay_ms(sc->sc_udev, 200);
 
-	urtw_8225_write(sc, 0x0, 0x2bf);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC6);
 	for (i = 0; i < 128; i++) {
 		urtw_8187_write_phy_ofdm(sc, 0xb, urtw_8225_agc[i]);
 		usbd_delay_ms(sc->sc_udev, 1);
@@ -3142,7 +3164,7 @@
 		usbd_delay_ms(sc->sc_udev, 1);
 	}
 
-	urtw_write8_m(sc, 0x5b, 0x0d);
+	urtw_write8_m(sc, URTW_ADDR_MAGIC4, 0x0d);
 
 	error = urtw_8225v2_set_txpwrlvl(sc, 1);
 	if (error)
@@ -3157,7 +3179,7 @@
 	error = urtw_8185_tx_antenna(sc, 0x3);
 	if (error)
 		goto fail;
-	urtw_write32_m(sc, 0x94, 0x3dc00002);
+	urtw_write32_m(sc, URTW_ADDR_MAGIC5, 0x3dc00002);
 
 	error = urtw_8225_rf_set_chan(sc, 1);
 fail:
@@ -3177,7 +3199,7 @@
 	if (error)
 		goto fail;
 
-	urtw_8225_write(sc, 0x7, urtw_8225_channel[chan]);
+	urtw_8225_write(sc, URTW_8225_ADDR_7_MAGIC, urtw_8225_channel[chan]);
 	usbd_delay_ms(sc->sc_udev, 10);
 
 	urtw_write8_m(sc, URTW_SIFS, 0x22);

==== //depot/projects/vap/sys/dev/usb/if_urtwreg.h#3 (text+ko) ====

@@ -120,6 +120,7 @@
 #define URTW_CONFIG3			0x0059		/* 1 byte  */
 #define URTW_CONFIG3_ANAPARAM_WRITE	(0x40)
 #define URTW_CONFIG3_ANAPARAM_W_SHIFT	(6)
+#define	URTW_ADDR_MAGIC4		0x005b		/* 1 byte  */
 #define URTW_PSR			0x005e		/* 1 byte  */
 #define URTW_ANAPARAM2			0x0060		/* 4 byte  */
 #define URTW_8225_ANAPARAM2_ON		(0x860c7312)
@@ -127,17 +128,31 @@
 #define	URTW_ATIM_WND			0x0072		/* 2 byte  */
 #define	URTW_BEACON_INTERVAL_TIME	0x0074		/* 2 byte  */
 #define	URTW_ATIM_TR_ITV		0x0076		/* 2 byte  */
+#define	URTW_PHY_MAGIC1			0x007c		/* 1 byte  */
+#define	URTW_PHY_MAGIC2			0x007d		/* 1 byte  */
+#define	URTW_PHY_MAGIC3			0x007e		/* 1 byte  */
+#define	URTW_PHY_MAGIC4			0x007f		/* 1 byte  */
 #define URTW_RF_PINS_OUTPUT		0x0080		/* 2 byte  */
+#define	URTW_RF_PINS_OUTPUT_MAGIC1	(0x3a0)
 #define URTW_BB_HOST_BANG_CLK		(1 << 1)
 #define URTW_BB_HOST_BANG_EN		(1 << 2)
 #define URTW_BB_HOST_BANG_RW		(1 << 3)
 #define URTW_RF_PINS_ENABLE		0x0082		/* 2 byte  */
 #define URTW_RF_PINS_SELECT		0x0084		/* 2 byte  */
+#define	URTW_ADDR_MAGIC1		0x0085		/* broken?  */
 #define URTW_RF_PINS_INPUT		0x0086		/* 2 byte  */
+#define	URTW_RF_PINS_MAGIC1		(0xfff3)
+#define	URTW_RF_PINS_MAGIC2		(0xfff0)
+#define	URTW_RF_PINS_MAGIC3		(0x0007)
+#define	URTW_RF_PINS_MAGIC4		(0xf)
+#define	URTW_RF_PINS_MAGIC5		(0x0080)
 #define URTW_RF_PARA			0x0088		/* 4 byte  */
 #define URTW_RF_TIMING			0x008c		/* 4 byte  */
 #define URTW_GP_ENABLE			0x0090		/* 1 byte  */
+#define	URTW_GP_ENABLE_DATA_MAGIC1	(0x1)
 #define URTW_GPIO			0x0091		/* 1 byte  */
+#define	URTW_GPIO_DATA_MAGIC1		(0x1)
+#define	URTW_ADDR_MAGIC5		0x0094		/* 4 byte  */
 #define URTW_TX_AGC_CTL			0x009c		/* 1 byte  */
 #define URTW_TX_AGC_CTL_PERPACKET_GAIN	(0x1)
 #define URTW_TX_AGC_CTL_PERPACKET_ANTSEL	(0x2)
@@ -155,6 +170,36 @@
 #define URTW_CW_VAL			0x00bd		/* 1 byte  */
 #define URTW_RATE_FALLBACK		0x00be		/* 1 byte  */
 #define URTW_TALLY_SEL			0x00fc		/* 1 byte  */
+#define	URTW_ADDR_MAGIC2		0x00fe		/* 2 byte  */
+#define	URTW_ADDR_MAGIC3		0x00ff		/* 1 byte  */
+
+/* for 8225  */
+#define	URTW_8225_ADDR_0_MAGIC		0x0
+#define	URTW_8225_ADDR_0_DATA_MAGIC1	(0x1b7)
+#define	URTW_8225_ADDR_0_DATA_MAGIC2	(0x0b7)
+#define	URTW_8225_ADDR_0_DATA_MAGIC3	(0x127)
+#define	URTW_8225_ADDR_0_DATA_MAGIC4	(0x027)
+#define	URTW_8225_ADDR_0_DATA_MAGIC5	(0x22f)
+#define	URTW_8225_ADDR_0_DATA_MAGIC6	(0x2bf)
+#define	URTW_8225_ADDR_1_MAGIC		0x1
+#define	URTW_8225_ADDR_2_MAGIC		0x2
+#define	URTW_8225_ADDR_2_DATA_MAGIC1	(0xc4d)
+#define	URTW_8225_ADDR_2_DATA_MAGIC2	(0x44d)
+#define	URTW_8225_ADDR_3_MAGIC		0x3
+#define	URTW_8225_ADDR_3_DATA_MAGIC1	(0x2)
+#define	URTW_8225_ADDR_5_MAGIC		0x5
+#define	URTW_8225_ADDR_5_DATA_MAGIC1	(0x4)
+#define	URTW_8225_ADDR_6_MAGIC		0x6
+#define	URTW_8225_ADDR_6_DATA_MAGIC1	(0xe6)
+#define	URTW_8225_ADDR_6_DATA_MAGIC2	(0x80)
+#define	URTW_8225_ADDR_7_MAGIC		0x7
+#define	URTW_8225_ADDR_8_MAGIC		0x8
+#define	URTW_8225_ADDR_8_DATA_MAGIC1	(0x588)
+#define	URTW_8225_ADDR_9_MAGIC		0x9
+#define	URTW_8225_ADDR_9_DATA_MAGIC1	(0x700)
+#define	URTW_8225_ADDR_C_MAGIC		0xc
+#define	URTW_8225_ADDR_C_DATA_MAGIC1	(0x850)
+#define	URTW_8225_ADDR_C_DATA_MAGIC2	(0x050)
 
 /* for EEPROM  */
 #define URTW_EPROM_TXPW_BASE		0x05
From weongyo at FreeBSD.org  Tue Jan  6 11:17:28 2009
From: weongyo at FreeBSD.org (Weongyo Jeong)
Date: Tue Jan  6 11:17:34 2009
Subject: PERFORCE change 155708 for review
Message-ID: <200901061117.n06BHQe5037702@repoman.freebsd.org>

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

Change 155708 by weongyo@weongyo_ws on 2009/01/06 11:16:34

	reduce delays to initialize the device more fast.  This is tested with
	my device.

Affected files ...

.. //depot/projects/vap/sys/dev/usb/if_urtw.c#9 edit

Differences ...

==== //depot/projects/vap/sys/dev/usb/if_urtw.c#9 (text+ko) ====

@@ -969,7 +969,7 @@
 	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, URTW_RF_PINS_MAGIC5);
 	urtw_write16_m(sc, URTW_RF_PINS_SELECT, URTW_RF_PINS_MAGIC5);
 	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, URTW_RF_PINS_MAGIC5);
-	usbd_delay_ms(sc->sc_udev, 1100);
+	usbd_delay_ms(sc->sc_udev, 500);
 
 	urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC,
 	    URTW_8225_ADDR_0_DATA_MAGIC1);
@@ -1534,7 +1534,7 @@
 	error = urtw_intr_disable(sc);
 	if (error)
 		goto fail;
-	usbd_delay_ms(sc->sc_udev, 200);
+	usbd_delay_ms(sc->sc_udev, 100);
 
 	error = urtw_write8e(sc, 0x18, 0x10);
 	if (error != 0)
@@ -1545,12 +1545,12 @@
 	error = urtw_write8e(sc, 0x18, 0x00);
 	if (error != 0)
 		goto fail;
-	usbd_delay_ms(sc->sc_udev, 200);
+	usbd_delay_ms(sc->sc_udev, 100);
 
 	urtw_read8_m(sc, URTW_CMD, &data);
 	data = (data & 0x2) | URTW_CMD_RST;
 	urtw_write8_m(sc, URTW_CMD, data);
-	usbd_delay_ms(sc->sc_udev, 200);
+	usbd_delay_ms(sc->sc_udev, 100);
 
 	urtw_read8_m(sc, URTW_CMD, &data);
 	if (data & URTW_CMD_RST) {
@@ -1561,7 +1561,7 @@
 	error = urtw_set_mode(sc, URTW_EPROM_CMD_LOAD);
 	if (error)
 		goto fail;
-	usbd_delay_ms(sc->sc_udev, 200);
+	usbd_delay_ms(sc->sc_udev, 100);
 
 	error = urtw_8180_set_anaparam(sc, URTW_8225_ANAPARAM_ON);
 	if (error)
@@ -2537,8 +2537,7 @@
 	urtw_write16_m(sc, URTW_RF_PINS_SELECT, 0x80);
 	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, 0x80);
 
-	usbd_delay_ms(sc->sc_udev, 100);
-	usbd_delay_ms(sc->sc_udev, 1000);
+	usbd_delay_ms(sc->sc_udev, 500);
 fail:
 	return (error);
 }
@@ -3082,41 +3081,35 @@
 	if (error)
 		goto fail;
 
-	usbd_delay_ms(sc->sc_udev, 1000);
+	usbd_delay_ms(sc->sc_udev, 500);
 
 	for (i = 0; i < N(urtw_8225v2_rf_part1); i++) {
 		urtw_8225_write(sc, urtw_8225v2_rf_part1[i].reg,
 		    urtw_8225v2_rf_part1[i].val);
-		usbd_delay_ms(sc->sc_udev, 1);
 	}
-	usbd_delay_ms(sc->sc_udev, 100);
+	usbd_delay_ms(sc->sc_udev, 50);
 
 	urtw_8225_write(sc,
 	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC1);
 
 	for (i = 0; i < 95; i++) {
 		urtw_8225_write(sc, URTW_8225_ADDR_1_MAGIC, (uint8_t)(i + 1));
-		usbd_delay_ms(sc->sc_udev, 1);
 		urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC,
 		    urtw_8225v2_rxgain[i]);
-		usbd_delay_ms(sc->sc_udev, 1);
 	}
 
 	urtw_8225_write(sc,
 	    URTW_8225_ADDR_3_MAGIC, URTW_8225_ADDR_3_DATA_MAGIC1);
-	usbd_delay_ms(sc->sc_udev, 1);
 	urtw_8225_write(sc,
 	    URTW_8225_ADDR_5_MAGIC, URTW_8225_ADDR_5_DATA_MAGIC1);
-	usbd_delay_ms(sc->sc_udev, 1);
 	urtw_8225_write(sc,
 	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC2);
-	usbd_delay_ms(sc->sc_udev, 1);
 	urtw_8225_write(sc,
 	    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1);
-	usbd_delay_ms(sc->sc_udev, 200);
+	usbd_delay_ms(sc->sc_udev, 100);
 	urtw_8225_write(sc,
 	    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2);
-	usbd_delay_ms(sc->sc_udev, 200);
+	usbd_delay_ms(sc->sc_udev, 100);
 
 	error = urtw_8225_read(sc, URTW_8225_ADDR_6_MAGIC, &data32);
 	if (error != 0)
@@ -3126,32 +3119,28 @@
 	if (!(data32 & URTW_8225_ADDR_6_DATA_MAGIC2)) {
 		urtw_8225_write(sc,
 		    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1);
-		usbd_delay_ms(sc->sc_udev, 200);
+		usbd_delay_ms(sc->sc_udev, 100);
 		urtw_8225_write(sc,
 		    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2);
-		usbd_delay_ms(sc->sc_udev, 100);
+		usbd_delay_ms(sc->sc_udev, 50);
 		error = urtw_8225_read(sc, URTW_8225_ADDR_6_MAGIC, &data32);
 		if (error != 0)
 			goto fail;
 		if (!(data32 & URTW_8225_ADDR_6_DATA_MAGIC2))
 			device_printf(sc->sc_dev, "RF calibration failed\n");
 	}
-	usbd_delay_ms(sc->sc_udev, 200);
+	usbd_delay_ms(sc->sc_udev, 100);
 
 	urtw_8225_write(sc,
 	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC6);
 	for (i = 0; i < 128; i++) {
 		urtw_8187_write_phy_ofdm(sc, 0xb, urtw_8225_agc[i]);
-		usbd_delay_ms(sc->sc_udev, 1);
 		urtw_8187_write_phy_ofdm(sc, 0xa, (uint8_t)i + 0x80);
-		usbd_delay_ms(sc->sc_udev, 1);
 	}
-	usbd_delay_ms(sc->sc_udev, 1);
 
 	for (i = 0; i < N(urtw_8225v2_rf_part2); i++) {
 		urtw_8187_write_phy_ofdm(sc, urtw_8225v2_rf_part2[i].reg,
 		    urtw_8225v2_rf_part2[i].val);
-		usbd_delay_ms(sc->sc_udev, 1);
 	}
 	
 	error = urtw_8225v2_setgain(sc, 4);
@@ -3161,7 +3150,6 @@
 	for (i = 0; i < N(urtw_8225v2_rf_part3); i++) {
 		urtw_8187_write_phy_cck(sc, urtw_8225v2_rf_part3[i].reg,
 		    urtw_8225v2_rf_part3[i].val);
-		usbd_delay_ms(sc->sc_udev, 1);
 	}
 
 	urtw_write8_m(sc, URTW_ADDR_MAGIC4, 0x0d);
@@ -3171,9 +3159,7 @@
 		goto fail;
 	
 	urtw_8187_write_phy_cck(sc, 0x10, 0x9b);
-	usbd_delay_ms(sc->sc_udev, 1);
 	urtw_8187_write_phy_ofdm(sc, 0x26, 0x90);
-	usbd_delay_ms(sc->sc_udev, 1);
 
 	/* TX ant A, 0x0 for B */
 	error = urtw_8185_tx_antenna(sc, 0x3);
From hselasky at FreeBSD.org  Tue Jan  6 18:27:47 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Tue Jan  6 18:27:52 2009
Subject: PERFORCE change 155730 for review
Message-ID: <200901061827.n06IRj9x007650@repoman.freebsd.org>

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

Change 155730 by hselasky@hselasky_laptop001 on 2009/01/06 18:27:26

	
	Config index should be zero. Reported by:
	Stanislav Sedov 

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#18 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#18 (text+ko) ====

@@ -92,7 +92,7 @@
 #define	UBSA_N_TRANSFER           6	/* units */
 #define	UBSA_BSIZE             1024	/* bytes */
 
-#define	UBSA_CONFIG_INDEX	1
+#define	UBSA_CONFIG_INDEX	0
 #define	UBSA_IFACE_INDEX	0
 
 #define	UBSA_REG_BAUDRATE	0x00
From hselasky at FreeBSD.org  Tue Jan  6 18:29:48 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Tue Jan  6 18:29:54 2009
Subject: PERFORCE change 155731 for review
Message-ID: <200901061829.n06ITlmu007775@repoman.freebsd.org>

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

Change 155731 by hselasky@hselasky_laptop001 on 2009/01/06 18:29:31

	
	Make printout more informative. Reported by:
	Volker

Affected files ...

.. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#10 edit

Differences ...

==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#10 (text+ko) ====

@@ -562,7 +562,7 @@
 	}
 
 	if (matches == 0) {
-		printf("No device match\n");
+		printf("No device match or lack of permissions.\n");
 	}
 done:
 	reset_options(opt);
From rene at FreeBSD.org  Tue Jan  6 22:04:37 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Tue Jan  6 22:04:44 2009
Subject: PERFORCE change 155737 for review
Message-ID: <200901062204.n06M4PfS043833@repoman.freebsd.org>

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

Change 155737 by rene@rene_self on 2009/01/06 22:03:56

	MFen handbook/advanced-networking 1.419 -> 1.420

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#25 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#25 (text+ko) ====

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.9 2008/12/23 23:07:32 rene Exp $
 
      %SOURCE%  en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
-     %SRCID%   1.419
+     %SRCID%   1.420
 -->
 
 
@@ -34,7 +34,8 @@
       
 
       
-	Hoe IEEE 802.11- en &bluetooth;-apparaten te installeren.
+	Hoe &ieee; 802.11- en &bluetooth;-apparaten te
+	  installeren.
 	
       
 
@@ -786,7 +787,7 @@
     
       De beginselen van draadloos netwerken
 
-      De meeste draadloze netwerken zijn op de IEEE 802.11
+      De meeste draadloze netwerken zijn op de &ieee; 802.11
 	standaarden gebaseerd.  Een eenvoudig draadloos netwerk bestaat
 	uit meerdere stations die met radio's communiceren die in de
 	2,4GHz of de 5GHz band uitzenden (alhoewel dit regionaal
@@ -806,16 +807,16 @@
 	netwerk.
 
       802.11 netwerken begonnen in de 2,4GHz band waarbij gebruik
-	werd gemaakt van protocollen die door de IEEE 802.11 en 802.11b
-	standaarden worden gedefinieerd.  Deze specificaties omvatten de
-	werkfrequenties, karakteristieken van de MAC-lagen waaronder
-	frame- en zendsnelheden (communicatie kan met verschillende
-	snelheden plaatsvinden).  Later definieerde de 802.11a-standaard
-	het werken in de 5GHz band, inclusief andere mechanismen voor
-	signalering en hogere zendsnelheden.  Nog later werd de
-	802.11g-standaard gedefinieerd om gebruik te kunnen maken van de
-	signalerings- en zendmechanismen van 802.11a in de 2,4GHz band
-	zodanig dat het met terugwerkende kracht werkt op
+	werd gemaakt van protocollen die door de &ieee; 802.11 en
+	802.11b standaarden worden gedefinieerd.  Deze specificaties
+	omvatten de werkfrequenties, karakteristieken van de MAC-lagen
+	waaronder frame- en zendsnelheden (communicatie kan met
+	verschillende snelheden plaatsvinden).  Later definieerde de
+	802.11a-standaard het werken in de 5GHz band, inclusief andere
+	mechanismen voor signalering en hogere zendsnelheden.  Nog later
+	werd de 802.11g-standaard gedefinieerd om gebruik te kunnen
+	maken van de signalerings- en zendmechanismen van 802.11a in de
+	2,4GHz band zodanig dat het met terugwerkende kracht werkt op
 	802.11b-netwerken.
 
       Afgezien van de onderliggende zendtechnieken beschikken
@@ -829,7 +830,7 @@
 	Het is bewezen dat dit mechanisme eenvoudig te kraken is en
 	wordt nu, afgezien om voorbijgaande gebruikers te ontmoedigen
 	het netwerk te gebruiken, nog zelden gebruikt.  De huidige
-	beveiligingsmethoden worden gegeven door de IEEE 802.11i
+	beveiligingsmethoden worden gegeven door de &ieee; 802.11i
 	specificatie dat nieuwe cryptografische algoritmen en een
 	aanvullend protocol om stations aan een toegangspunt te
 	authenticeren en om sleutels voor gegevenscommunicatie uit te
@@ -1500,7 +1501,7 @@
 	      
 
 	      
-		Hier wordt het RSN (IEEE 802.11i) protocol
+		Hier wordt het RSN (&ieee; 802.11i) protocol
 		  gebruikt, ofwel WPA2.
 	      
 
@@ -3481,7 +3482,7 @@
 
       
 	
-	  failover
+	  Failover
 
 	  
 	    Zendt en ontvangt verkeer alleen door de meesterpoort.
@@ -3494,61 +3495,61 @@
 	
 
 	
-	  fec
+	  &cisco; Fast ðerchannel;
 
 	  
-	    Ondersteunt Cisco EtherChannel.  Dit is een statische
+	    &cisco; Fast ðerchannel; (FEC), is een statische
 	      installatie en onderhandelt niet over aggregatie met de
 	      peer noch wisselt het frames uit om de verbinding te
-	      monitoren, indien de switch LACP ondersteunt dient dat
+	      monitoren.  Indien de switch LACP ondersteunt dient dat
 	      gebruikt te worden.
 
-	    Balanceert uitgaand verkeer over de actieve poorten
-	      gebaseerd op gehashde informatie over protocolheaders en
-	      accepteert inkomend verkeer van elke actieve poort.  De
-	      hash bevat het Ethernet bron- en doeladres, en indien
-	      beschikbaar, de VLAN-tag, en de IPv4/IPv6 bron- en
-	      doeladressen.
+	    FEC balanceert uitgaand verkeer
+	      over de actieve poorten gebaseerd op gehashde informatie
+	      over protocolheaders en accepteert inkomend verkeer van
+	      elke actieve poort.  De hash bevat het Ethernet bron- en
+	      doeladres, en indien beschikbaar, de VLAN-tag, en de
+	      IPv4/IPv6 bron- en doeladressen.
 	  
 	
 
 	
-	  lacp
+	  LACP
 
 	  
-	    Ondersteunt het IEEE 802.3ad Link Aggregation Control
-	      Protocol (LACP) en het Marker Protocol.  LACP onderhandelt
-	      met de peer over een verzameling aggregeerbare
-	      verbindingen in een of meerdere Link Aggregated Groups.
-	      Elke LAG is opgebouwd uit poorten die dezelfde snelheid
-	      hebben, ingesteld op full-duplex werking.  Het verkeer zal
-	      over de poorten in de LAG gebalanceerd worden met de
-	      hoogste totaalsnelheid, in de meeste gevallen zal er
-	      slechts één LAG zijn die alle poorten bevat.
-	      Wanneer er fysieke verbindingen veranderen, zal Link
-	      Aggregation snel naar een nieuwe opstelling
+	    Het &ieee; 802.3ad Link Aggregation Control Protocol
+	      (LACP) en het Marker Protocol.  LACP onderhandelt met de
+	      peer over een verzameling aggregeerbare verbindingen in
+	      één of meerdere Link Aggregated Groups
+	      (LAG).  Elke LAG is opgebouwd uit poorten die dezelfde
+	      snelheid hebben, ingesteld op full-duplex werking.  Het
+	      verkeer zal over de poorten in de LAG gebalanceerd worden
+	      met de hoogste totaalsnelheid, in de meeste gevallen zal
+	      er slechts één LAG zijn die alle poorten
+	      bevat.  Wanneer er fysieke verbindingen veranderen, zal
+	      Link Aggregation snel naar een nieuwe opstelling
 	      convergeren.
 
-	    Balanceert uitgaand verkeer over de actieve poorten
-	      gebaseerd op gehashde informatie over protocolheaders en
-	      accepteert inkomend verkeer van elke actieve poort.  De
-	      hash bevat het Ethernet bron- en doeladres, en indien
-	      beschikbaar, de VLAN-tag, en de IPv4/IPv6 bron- en
-	      doeladressen.
+	    LACP balanceert uitgaand verkeer
+	      over de actieve poorten gebaseerd op gehashde informatie
+	      over protocolheaders en accepteert inkomend verkeer van
+	      elke actieve poort.  De hash bevat het Ethernet bron- en
+	      doeladres, en indien beschikbaar, de VLAN-tag, en de
+	      IPv4/IPv6 bron- en doeladressen.
 	  
 	
 
 	
-	  loadbalance
+	  Loadbalance
 
 	  
-	    Dit is een alias van de fec
+	    Dit is een alias van de FEC
 	      modus.
 	  
 	
 
 	
-	  roundrobin
+	  Round-Robin
 
 	  
 	    Distribueert uitgaand verkeer door middel van een
@@ -3565,7 +3566,7 @@
       Voorbeelden
 
       
-	LACP aggregatie met een Cisco switch
+	LACP-aggregatie met een &cisco; switch
 
 	Dit voorbeeld verbindt twee interfaces op een &os;-machine
 	  met de switch als een enkele loadgebalanceerde en
@@ -3580,29 +3581,35 @@
 	  verkeersstromen en deze over de beschikbare interfaces te
 	  balanceren.
 
-	Voeg op de Cisco switch de interfaces aan de kanaalgroep
-	  toe.
+	Voeg op de &cisco; switch de interfaces
+	  FastEthernet0/1 en
+	  FastEthernet0/2 aan de kanaalgroep
+	  1 toe:
 
-	interface FastEthernet0/1
- channel-group 1 mode active
- channel-protocol lacp
+	interface FastEthernet0/1
+ channel-group 1 mode active
+ channel-protocol lacp
 !
-interface FastEthernet0/2
- channel-group 1 mode active
- channel-protocol lacp
-!
+interface FastEthernet0/2
+ channel-group 1 mode active
+ channel-protocol lacp
+
+	Maak op de &os;-machine de &man.lagg.4;-interface aan door
+	  fxp0 en
+	  fxp1 te gebruiken:
+
+	&prompt.root; ifconfig lagg0 create
+&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1
 
-	Maak op de &os;-machine de lagg-interface aan.
+	Bekijk de interfacestatus van ifconfig:
 
-	&prompt.root; ifconfig lagg0 create
-&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1
+	&prompt.root; ifconfig lagg0
 
-	Bekijk de interfacestatus van ifconfig; poorten die als
-	  ACTIVE zijn gemarkeerd zijn lid van de
-	  actieve aggregatiegroep waarover onderhandeld is met de verre
-	  switch en waarover verkeer zal worden verzonden en ontvangen.
-	  Gebruik de uitgebreide uitvoer van &man.ifconfig.8; om de
-	  LAG-identifiers te bekijken.
+	Poorten die als ACTIVE zijn
+	  gemarkeerd zijn lid van de actieve aggregatiegroep waarover
+	  onderhandeld is met de verre switch en waarover verkeer zal
+	  worden verzonden en ontvangen.  Gebruik de uitgebreide uitvoer
+	  van &man.ifconfig.8; om de LAG-identifiers te bekijken.
 
 	lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
         options=8<VLAN_MTU>
@@ -3613,9 +3620,8 @@
         laggport: fxp1 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING>
         laggport: fxp0 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING>
 
-	De switch zal laten zien welke poorten actief zijn.
-	  Gebruik voor meer detail
-	  show lacp neighbor detail.
+	Gebruik, om de toestand van de poorten op de switch te
+	  bekijken, show lacp neighbor.
 
 	switch# show lacp neighbor
 Flags:  S - Device is requesting Slow LACPDUs
@@ -3631,19 +3637,30 @@
 Fa0/1     SA      32768     0005.5d71.8db8  29s    0x146   0x3      0x3D
 Fa0/2     SA      32768     0005.5d71.8db8  29s    0x146   0x4      0x3D
 
+	Gebruik voor meer detail het commando show lacp
+	    neighbor detail.
       
 
       
 	Failover-modus
 
-	Failover-modus kan worden gebruikt om op een ander
+	Failover-modus kan worden gebruikt om op een secondaire
 	  interface over te schakelen wanneer de verbinding op de
-	  meester verloren is.
+	  meesterinterface verloren is.  Creëer en configureer de
+	  interface lagg0, met
+	  fxp0 als de meesterinterface en
+	  fxp1 als de secondaire
+	  interface:
+
+	&prompt.root; ifconfig lagg0 create
+&prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1
 
-        &prompt.root; ifconfig lagg0 create
-&prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1
+	De interface zal er ongeveer als volgt uitzien, de grote
+	  verschillen zullen het MAC-adres en de
+	  apparaatnamen zijn:
 
-	lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
+	&prompt.root; ifconfig lagg0
+lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
         options=8<VLAN_MTU>
         ether 00:05:5d:71:8d:b8
         media: Ethernet autoselect
@@ -3653,9 +3670,9 @@
         laggport: fxp0 flags=5<MASTER,ACTIVE>
 
 	Het verkeer zal worden verzonden en ontvangen op
-	  fxp0.  Indien de verbinding op
-	  fxp0 verloren is, zal
-	  fxp1 de actieve verbinding worden.
+	  fxp0.  Indien de verbinding op
+	  fxp0 verloren is, zal
+	  fxp1 de actieve verbinding worden.
 	  Indien de verbinding op de meesterinterface hersteld is, zal
 	  het weer de actieve verbinding worden.
       
From hselasky at FreeBSD.org  Wed Jan  7 10:09:47 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Wed Jan  7 10:09:54 2009
Subject: PERFORCE change 155748 for review
Message-ID: <200901071009.n07A9jrs056953@repoman.freebsd.org>

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

Change 155748 by hselasky@hselasky_laptop001 on 2009/01/07 10:09:35

	
	Umass module quirk from Alexander Best
	to support Meizu Electronics MiniPlayer.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usbdevs#35 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 edit
.. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usbdevs#35 (text+ko) ====

@@ -151,6 +151,7 @@
 vendor KYOCERA		0x0482	Kyocera Wireless Corp.
 vendor STMICRO		0x0483	STMicroelectronics
 vendor FOXCONN		0x0489	Foxconn
+vendor MEIZU		0x0492	Meizu Electronics
 vendor YAMAHA		0x0499	YAMAHA
 vendor COMPAQ		0x049f	Compaq
 vendor HITACHI		0x04a4	Hitachi
@@ -1657,6 +1658,9 @@
 product MCT USB232		0x0210	USB-232 Interface
 product MCT SITECOM_USB232	0x0230	Sitecom USB-232 Products
 
+/* Meizu Electronics */
+product MEIZU M6_SL		0x0140	MiniPlayer M6 (SL)
+
 /* Melco, Inc products */
 product MELCO LUATX1		0x0001	LUA-TX Ethernet
 product MELCO LUATX5		0x0005	LUA-TX Ethernet

==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 (text+ko) ====

@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.390 2008/12/23 13:09:17 remko Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.391 2008/12/31 14:25:14 luigi Exp 
  */
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
@@ -158,6 +158,7 @@
 #define	USB_VENDOR_KYOCERA	0x0482		/* Kyocera Wireless Corp. */
 #define	USB_VENDOR_STMICRO	0x0483		/* STMicroelectronics */
 #define	USB_VENDOR_FOXCONN	0x0489		/* Foxconn */
+#define	USB_VENDOR_MEIZU	0x0492		/* Meizu Electronics */
 #define	USB_VENDOR_YAMAHA	0x0499		/* YAMAHA */
 #define	USB_VENDOR_COMPAQ	0x049f		/* Compaq */
 #define	USB_VENDOR_HITACHI	0x04a4		/* Hitachi */
@@ -1247,12 +1248,18 @@
 #define	USB_PRODUCT_EPSON_CX5400	0x0808		/* CX5400 scanner */
 #define	USB_PRODUCT_EPSON_3500	0x080e		/* CX-3500/3600/3650 MFP */
 #define	USB_PRODUCT_EPSON_RX425	0x080f		/* Stylus Photo RX425 scanner */
-#define	USB_PRODUCT_EPSON_4800	0x0819		/* CX4800 MP scanner */
-#define	USB_PRODUCT_EPSON_4200	0x0820		/* CX4200 MP scanner */
-#define	USB_PRODUCT_EPSON_5000	0x082b		/* DX-50x0 MFP scanner */
-#define	USB_PRODUCT_EPSON_6000	0x082e		/* DX-60x0 MFP scanner */
-#define	USB_PRODUCT_EPSON_DX7400	0x0838		/* DX7400/CX7300 scanner */
-#define	USB_PRODUCT_EPSON_DX8400	0x0839		/* DX8400 scanner */
+#define	USB_PRODUCT_EPSON_DX3800	0x0818		/* CX3700/CX3800/DX38x0 MFP scanner */
+#define	USB_PRODUCT_EPSON_4800	0x0819		/* CX4700/CX4800/DX48x0 MFP scanner */
+#define	USB_PRODUCT_EPSON_4200	0x0820		/* CX4100/CX4200/DX4200 MFP scanner */
+#define	USB_PRODUCT_EPSON_5000	0x082b		/* CX4900/CX5000/DX50x0 MFP scanner */
+#define	USB_PRODUCT_EPSON_6000	0x082e		/* CX5900/CX6000/DX60x0 MFP scanner */
+#define	USB_PRODUCT_EPSON_DX4000	0x082f		/* DX4000 MFP scanner */
+#define	USB_PRODUCT_EPSON_DX7400	0x0838		/* CX7300/CX7400/DX7400 MFP scanner */
+#define	USB_PRODUCT_EPSON_DX8400	0x0839		/* CX8300/CX8400/DX8400 MFP scanner */
+#define	USB_PRODUCT_EPSON_SX100	0x0841		/* SX100/NX100 MFP scanner */
+#define	USB_PRODUCT_EPSON_NX300	0x0848		/* NX300 MFP scanner */
+#define	USB_PRODUCT_EPSON_SX200	0x0849		/* SX200/SX205 MFP scanner */
+#define	USB_PRODUCT_EPSON_SX400	0x084a		/* SX400/NX400/TX400 MFP scanner */
 
 /* e-TEK Labs products */
 #define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial */
@@ -1658,6 +1665,9 @@
 #define	USB_PRODUCT_MCT_USB232	0x0210		/* USB-232 Interface */
 #define	USB_PRODUCT_MCT_SITECOM_USB232	0x0230		/* Sitecom USB-232 Products */
 
+/* Meizu Electronics */
+#define	USB_PRODUCT_MEIZU_M6_SL	0x0140		/* MiniPlayer M6 (SL) */
+
 /* Melco, Inc products */
 #define	USB_PRODUCT_MELCO_LUATX1	0x0001		/* LUA-TX Ethernet */
 #define	USB_PRODUCT_MELCO_LUATX5	0x0005		/* LUA-TX Ethernet */

==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 (text+ko) ====

@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.390 2008/12/23 13:09:17 remko Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.391 2008/12/31 14:25:14 luigi Exp 
  */
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
@@ -2357,40 +2357,76 @@
 	    "Stylus Photo RX425 scanner",
 	},
 	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX3800,
+	    0,
+	    "Seiko Epson",
+	    "CX3700/CX3800/DX38x0 MFP scanner",
+	},
+	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4800,
 	    0,
 	    "Seiko Epson",
-	    "CX4800 MP scanner",
+	    "CX4700/CX4800/DX48x0 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4200,
 	    0,
 	    "Seiko Epson",
-	    "CX4200 MP scanner",
+	    "CX4100/CX4200/DX4200 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_5000,
 	    0,
 	    "Seiko Epson",
-	    "DX-50x0 MFP scanner",
+	    "CX4900/CX5000/DX50x0 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_6000,
 	    0,
 	    "Seiko Epson",
-	    "DX-60x0 MFP scanner",
+	    "CX5900/CX6000/DX60x0 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX4000,
+	    0,
+	    "Seiko Epson",
+	    "DX4000 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX7400,
 	    0,
 	    "Seiko Epson",
-	    "DX7400/CX7300 scanner",
+	    "CX7300/CX7400/DX7400 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX8400,
 	    0,
 	    "Seiko Epson",
-	    "DX8400 scanner",
+	    "CX8300/CX8400/DX8400 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_SX100,
+	    0,
+	    "Seiko Epson",
+	    "SX100/NX100 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_NX300,
+	    0,
+	    "Seiko Epson",
+	    "NX300 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_SX200,
+	    0,
+	    "Seiko Epson",
+	    "SX200/SX205 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_SX400,
+	    0,
+	    "Seiko Epson",
+	    "SX400/NX400/TX400 MFP scanner",
 	},
 	{
 	    USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
@@ -3995,6 +4031,12 @@
 	    "Sitecom USB-232 Products",
 	},
 	{
+	    USB_VENDOR_MEIZU, USB_PRODUCT_MEIZU_M6_SL,
+	    0,
+	    "Meizu Electronics",
+	    "MiniPlayer M6 (SL)",
+	},
+	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1,
 	    0,
 	    "Melco",
@@ -7835,6 +7877,12 @@
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MEIZU, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Meizu Electronics",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_YAMAHA, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "YAMAHA",

==== //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 (text+ko) ====

@@ -916,6 +916,10 @@
 		UMASS_PROTO_ATAPI | UMASS_PROTO_CBI,
 		NO_QUIRKS
 	},
+	{USB_VENDOR_MEIZU, USB_PRODUCT_MEIZU_M6_SL, RID_WILDCARD,
+		UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+		NO_INQUIRY | NO_SYNCHRONIZE_CACHE
+	},
 	{VID_EOT, PID_EOT, RID_EOT, 0, 0}
 };
 
From hselasky at FreeBSD.org  Wed Jan  7 10:41:29 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Wed Jan  7 10:41:35 2009
Subject: PERFORCE change 155750 for review
Message-ID: <200901071041.n07AfHG9061148@repoman.freebsd.org>

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

Change 155750 by hselasky@hselasky_laptop001 on 2009/01/07 10:40:28

	
	Patch to resolve problems with power mode off.
	Reported by Alexander Best.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#39 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#27 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#39 (text+ko) ====

@@ -1699,11 +1699,12 @@
 	}
 	switch (mode) {
 	case USB_POWER_MODE_OFF:
-		/* clear suspend */
-		err = usb2_req_clear_port_feature(udev->parent_hub,
-		    NULL, udev->port_no, UHF_PORT_SUSPEND);
-		if (err)
-			break;
+		/* get the device unconfigured */
+		err = ugen_set_config(f, USB_UNCONFIG_INDEX);
+		if (err) {
+			DPRINTFN(0, "Could not unconfigure "
+			    "device (ignored)\n");
+		}
 
 		/* clear port enable */
 		err = usb2_req_clear_port_feature(udev->parent_hub,

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#27 (text+ko) ====

@@ -1823,7 +1823,8 @@
 usb2_set_power_mode(struct usb2_device *udev, uint8_t power_mode)
 {
 	/* filter input argument */
-	if (power_mode != USB_POWER_MODE_ON) {
+	if ((power_mode != USB_POWER_MODE_ON) &&
+	    (power_mode != USB_POWER_MODE_OFF)) {
 		power_mode = USB_POWER_MODE_SAVE;
 	}
 	udev->power_mode = power_mode;	/* update copy of power mode */
From hselasky at FreeBSD.org  Wed Jan  7 13:23:13 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Wed Jan  7 13:23:19 2009
Subject: PERFORCE change 155754 for review
Message-ID: <200901071323.n07DNBA1091553@repoman.freebsd.org>

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

Change 155754 by hselasky@hselasky_laptop001 on 2009/01/07 13:22:11

	
	Make sure that the cancelled error code
	is always checked and result in a return
	from the USB callback.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#24 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#24 (text+ko) ====

@@ -2921,6 +2921,8 @@
 	uint8_t chan;
 	uint8_t buf[2];
 
+	DPRINTF("\n");
+
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 tr_transferred:
@@ -2980,11 +2982,14 @@
 		if (repeat) {
 			goto tr_setup;
 		}
-		return;
+		break;
 
 	default:			/* Error */
 		DPRINTF("error=%s\n", usb2_errstr(xfer->error));
-
+		if (xfer->error == USB_ERR_CANCELLED) {
+			/* do nothing - we are detaching */
+			break;
+		}
 		goto tr_transferred;
 	}
 }
From hselasky at FreeBSD.org  Wed Jan  7 13:27:17 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Wed Jan  7 13:27:22 2009
Subject: PERFORCE change 155755 for review
Message-ID: <200901071327.n07DRFt5091936@repoman.freebsd.org>

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

Change 155755 by hselasky@hselasky_laptop001 on 2009/01/07 13:26:37

	
	Fix a race causing the explore thread to
	hang when tearing down USB transfers at
	detach.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#36 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#36 (text+ko) ====

@@ -1915,8 +1915,7 @@
 
 	/*
 	 * Check if we got started after that we got cancelled, but
-	 * before we managed to do the callback. Check if we are
-	 * draining.
+	 * before we managed to do the callback.
 	 */
 	if ((!xfer->flags_int.open) &&
 	    (xfer->flags_int.started) &&
@@ -1924,13 +1923,19 @@
 		/* try to loop, but not recursivly */
 		usb2_command_wrapper(&info->done_q, xfer);
 		return;
-	} else if (xfer->flags_int.draining &&
+	}
+
+done:
+	/*
+	 * Check if we are draining.
+	 */
+	if (xfer->flags_int.draining &&
 	    (!xfer->flags_int.transferring)) {
 		/* "usb2_transfer_drain()" is waiting for end of transfer */
 		xfer->flags_int.draining = 0;
 		usb2_cv_broadcast(&xfer->usb2_root->cv_drain);
 	}
-done:
+
 	/* do the next callback, if any */
 	usb2_command_wrapper(&info->done_q,
 	    info->done_q.curr);
From hselasky at FreeBSD.org  Wed Jan  7 15:13:05 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Wed Jan  7 15:13:11 2009
Subject: PERFORCE change 155759 for review
Message-ID: <200901071513.n07FD3Do019127@repoman.freebsd.org>

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

Change 155759 by hselasky@hselasky_laptop001 on 2009/01/07 15:12:24

	
	Optimise: Remove extra flush calls.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#22 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#22 (text+ko) ====

@@ -1558,13 +1558,12 @@
 	}
 	ed->ed_flags = htole32(ed_flags);
 
-	usb2_pc_cpu_flush(ed->page_cache);
-
 	td = xfer->td_transfer_first;
 
 	ed->ed_headp = td->td_self;
 
 	if (xfer->udev->pwr_save.suspended == 0) {
+		/* the append function will flush the endpoint descriptor */
 		OHCI_APPEND_QH(ed, *ed_last);
 
 		if (methods == &ohci_device_bulk_methods) {
@@ -2009,13 +2008,12 @@
 	}
 	ed->ed_flags = htole32(ed_flags);
 
-	usb2_pc_cpu_flush(ed->page_cache);
-
 	td = xfer->td_transfer_first;
 
 	ed->ed_headp = td->itd_self;
 
 	/* isochronous transfers are not affected by suspend / resume */
+	/* the append function will flush the endpoint descriptor */
 
 	OHCI_APPEND_QH(ed, sc->sc_isoc_p_last);
 }
From rene at FreeBSD.org  Wed Jan  7 19:10:07 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Wed Jan  7 19:10:18 2009
Subject: PERFORCE change 155769 for review
Message-ID: <200901071910.n07JA5bk057731@repoman.freebsd.org>

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

Change 155769 by rene@rene_self on 2009/01/07 19:09:32

	IFC	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#9 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#14 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#7 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#26 integrate
.. //depot/projects/docproj_nl/www/en/developers/cvs.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/releases/7.1R/announce.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#12 integrate
.. //depot/projects/docproj_nl/www/en/security/security.sgml#5 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#12 integrate
.. //depot/projects/docproj_nl/www/share/sgml/navibar.ent#3 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#9 (text+ko) ====

@@ -11,7 +11,7 @@
       The &os; Ports Management Team
     
 
-    $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.35 2008/09/20 18:47:41 linimon Exp $
+    $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.36 2009/01/07 09:34:58 pav Exp $
 
     
       2003
@@ -491,7 +491,8 @@
 
 	
 	  build portsupdate arch
-	    branch - Replaces the ports
+	    branch
+	    buildid - Replaces the ports
 	    tree with a new ZFS snapshot.  Don't forget to use
 	    -noports flag to dopackages
 	    later!

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#14 (text+ko) ====

@@ -12,7 +12,7 @@
 
     The &os; Documentation Project
 
-    $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1106 2009/01/05 15:44:57 remko Exp $
+    $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1107 2009/01/07 09:49:12 pgj Exp $
 
     
       1995
@@ -4590,6 +4590,46 @@
       
 
       
+	
+	  Do I need to recompile every port each time I perform a
+	    major version update?
+	
+
+	
+	  By all means!  While a recent system will run with
+	    software compiled under an older release, you will end up with
+	    things randomly crashing and failing to work once you start
+	    installing other ports or updating a portion of what you
+	    already have.
+
+	  When the system is upgraded, various shared libraries,
+	    loadable modules, and other parts of the system will be
+	    replaced with newer versions.  Applications linked against
+	    the older versions may fail to start or, in other cases,
+	    fail to function properly.
+
+	  For more information, see the section on upgrades
+	    in the &os; Handbook.
+	
+      
+
+      
+	
+	  Do I need to recompile every port each time I perform a
+	    minor version update?
+	
+
+	
+	  In general, no.  &os; developers do their utmost to
+	    guarantee binary compatibility across all releases with the
+	    same major version number.  Any exceptions will be
+	    documented in the Release Notes, and advice given there
+	    should be followed.
+	
+      
+
+      
 	
 	  Why is /bin/sh so minimal?  Why does
 	    &os; not use bash or another

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#9 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -79,6 +79,12 @@
       
 
       
+	How to keep your documentation up to date with
+	  CVSup.
+      
+
+      
 	The difference between the two development
 	  branches: &os.stable; and &os.current;.
       
@@ -698,6 +704,327 @@
     &prompt.root; portsnap fetch update
   
 
+  
+    Updating the Documentation Set
+
+    Updating and Upgrading
+
+    
+      Documentation
+      Updating and Upgrading
+    
+
+    Besides the base system and the Ports Collection,
+      documentation is an integral part of the &os; operating system.
+      While an up-to-date version of the &os; Documentation Set is
+      always available on the &os; web site, some
+      users might have slow or no permanent network connectivity at all.
+      Fortunately, there are several ways to update the documentation
+      shipped with each release by maintaining a local copy of the
+      latest &os; Documentation Set.
+
+    
+      Using CVSup to Update the Documentation
+
+      The sources and the installed copy of the &os; documentation
+        can be updated with CVSup, using a
+        mechanism similar to the one employed for the base system
+        sources (c.f. ).  This section
+        describes:
+
+      
+	
+	  How to install the documentation toolchain, the tools
+	    that are required to rebuild the &os; documentation from its
+	    source.
+	
+
+	
+	  How to download a copy of the documentation source
+	    at /usr/doc,
+	    using CVSup.
+	
+
+	
+	  How to rebuild the &os; documentation from its source,
+	    and install it
+	    under /usr/share/doc.
+	
+
+	
+	  Some of the build options that are supported by the
+	    build system of the documentation, i.e. the options that
+	    build only some of the different language translations of
+	    the documentation or the options that select a specific
+	    output format.
+	
+      
+    
+
+    
+      Installing CVSup and the Documentation Toolchain
+
+      Rebuilding the &os; documentation from source requires a
+	fairly large collection of tools.  These tools are not part of
+	the &os; base system, because they need a large amount of disk
+	space and they are not useful to all &os; users; they are only
+	useful to those users that are actively writing new
+	documentation for &os; or are frequently updating their
+	documentation from source.
+
+      All the required tools are available as part of the Ports
+	Collection.  The textproc/docproj port is a master
+	port that has been developed by the &os; Documentation Project,
+	to ease the initial installation and future updates of these
+	tools.
+
+      
+	When no &postscript; or PDF documentation required, one
+	  might consider installing the textproc/docproj-nojadetex port
+	  instead.  This version of the documentation toolchain includes
+	  everything except the teTeX
+	  typesetting engine.  teTeX is a
+	  very large collection of tools, so it may be quite sensible to
+	  omit its installation if PDF output is not really
+	  necessary.
+      
+
+      For more information on installing and using
+	CVSup, see Using CVSup.
+    
+
+    
+      Updating the Documentation Sources
+
+      The CVSup utility can fetch a
+	clean copy of the documentation sources, using
+	the /usr/share/examples/cvsup/doc-supfile
+	file as a configuration template.  The default update host is
+	set to a placeholder value in doc-supfile,
+	but &man.cvsup.1; accepts a host name through the command line,
+	so the documentation sources can be fetched from one of the
+	CVSup servers by typing:
+
+      &prompt.root; cvsup -h cvsup.FreeBSD.org -g -L 2 /usr/share/examples/cvsup/doc-supfile
+
+      Change cvsup.FreeBSD.org to the
+	nearest CVSup server.  See  for a complete listing of mirror
+	sites.
+
+      The initial download of the documentation sources may take a
+	while.  Let it run until it completes.
+
+      Future updates of the documentation sources may be fetched
+	by running the same command.
+	The CVSup utility downloads and
+	copies only the updates since the last time it ran, so every run
+	of CVSup after the first complete run
+	should be pretty fast.
+
+      After checking out the sources, an alternative way of
+	updating the documentation is supported by the
+	Makefile of the /usr/doc directory.  By setting
+	SUP_UPDATE, SUPHOST and
+	DOCSUPFILE in the
+	/etc/make.conf file, it is possible to
+	run:
+
+      &prompt.root; cd /usr/doc
+&prompt.root; make update
+
+      A typical set of these &man.make.1; options
+	for /etc/make.conf is:
+
+      SUP_UPDATE= yes
+SUPHOST?= cvsup.freebsd.org
+DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile
+
+      
+	Setting the SUPHOST
+	  and DOCSUPFILE value
+	  with ?= permits overriding them in the
+	  command-line of make.  This is the recommended way of adding
+	  options to make.conf, to avoid having to
+	  edit the file every time a different option value has to be
+	  tested.
+      
+    
+
+    
+      Tunable Options of the Documentation Sources
+
+      The updating and build system of the &os; documentation
+	supports a few options that ease the process of updating only
+	parts of the documentation, or the build of specific
+	translations.  These options can be set either as system-wide
+	options in the /etc/make.conf file, or as
+	command-line options passed to the &man.make.1; utility.
+
+      The following options are some of these:
+
+      
+	
+	  DOC_LANG
+
+	  
+	    The list of languages and encodings to build and
+	      install, e.g. en_US.ISO8859-1 for the
+	      English documentation only.
+	  
+	
+
+	
+	  FORMATS
+
+	  
+	    A single format or a list of output formats to be
+	      built.  Currently, html,
+	      html-split, txt,
+	      ps, pdf,
+	      and rtf are supported.
+	  
+	
+
+	
+	  SUPHOST
+
+	  
+	    The hostname of the CVSup
+	      server to use when updating.
+	  
+	
+      
+
+      For more make variables supported as system-wide options in
+	&os;, see &man.make.conf.5;.
+
+      For more make variables supported by the build system of the
+	&os; documentation, please refer to
+	the &os;
+	  Documentation Project Primer for New Contributors.
+    
+
+    
+      Installing the &os; Documentation from Source
+
+      When an up-to-date snapshot of the documentation sources has
+	been fetched in /usr/doc,
+	everything is ready for an update of the installed
+	documentation.
+
+      A full update of all the languages defined in
+	the DOC_LANG makefile option may be done by
+	typing:
+
+      &prompt.root; cd /usr/doc
+&prompt.root; make install clean
+
+      If make.conf has been set up with the
+	correct DOCSUPFILE, SUPHOST
+	and SUP_UPDATE options, the install step may
+	be combined with an update of the documentation sources by
+	typing:
+
+      &prompt.root; cd /usr/doc
+&prompt.root; make update install clean
+
+      If an update of only a specific language is desired,
+	&man.make.1; can be invoked in a language specific subdirectory
+	of /usr/doc, i.e.:
+
+      &prompt.root; cd /usr/doc/en_US.ISO8859-1
+&prompt.root; make update install clean
+
+      The output formats that will be installed may be specified
+	by setting the FORMATS make variable,
+	i.e.:
+
+      &prompt.root; cd /usr/doc
+&prompt.root; make FORMATS='html html-split' install clean
+    
+
+
+
+      
+	
+	  
+	    Pav
+	    Lucistnik
+	    Based on information provided by 
+	  
+	
+      
+
+      Using Docsnap
+
+      Updating and Upgrading
+
+      
+	Docsnap
+	Updating and Upgrading
+      
+
+      Docsnap is an &man.rsync.1;
+	repository for updating installed &os; Documentation in a
+	relatively easy and fast way.  A
+	Docsnap server tracks
+	the documentation sources, and builds them in HTML format every
+	hour.  The textproc/docproj
+	is unneeded with Docsnap as only
+	patches to the built documentation exist.
+
+      The only requirement for using this technique is
+	the net/rsync port or
+	package.  To add it, use the following command:
+
+      &prompt.root; pkg_add -r rsync
+
+      
+	Docsnap has been originally
+	  developed for updating documentation installed
+	  to /usr/share/doc, but
+	  the following examples could be adapted for other directories
+	  as well.  For user directories, it does not require
+	  root privileges.
+      
+
+      To update the documentation set, issue the following
+	command:
+
+      &prompt.root; rsync -rltvz docsnap.sk.FreeBSD.org::docsnap /usr/share/doc
+
+      
+	There is only one Docsnap
+	  server at the moment;
+	  the docsnap.sk.FreeBSD.org shown
+	  above.
+      
+
+      Do not use the  flag here as there
+	are some items installed
+	into /usr/share/doc
+	during make installworld, which would
+	accidentally be removed.  To clean up, use this command
+	instead:
+
+      &prompt.root; rsync -rltvz --delete docsnap.sk.FreeBSD.org::docsnap/??_??\.\* /usr/share/doc
+
+      If a subset of documentation needs to be updated, for
+	example, the English documentation only, the following command
+	should be used:
+
+      &prompt.root; rsync -rltvz docsnap.sk.FreeBSD.org::docsnap/en_US.ISO8859-1 /usr/share/doc
+    
+]]>
+  
+
   
     Tracking a Development Branch
     -CURRENT

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#7 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -714,32 +714,12 @@
 	Portsnap Method
 
 	Portsnap is an alternative system for
-	  distributing the Ports Collection.  It was first included in
-	  &os; 6.0.  On older systems, you can install it from ports-mgmt/portsnap package:
-
-	&prompt.root; pkg_add -r portsnap
-
-	Please refer to Using Portsnap
+	  distributing the Ports Collection.
+	  Please refer to Using Portsnap
 	  for a detailed description of all Portsnap
 	  features.
 
 	
-	  Since &os; 6.1-RELEASE and with recent versions
-	    of the Portsnap port or package, you
-	    can safely skip this step.  The /usr/ports will be created
-	    automatically at first use of the &man.portsnap.8; command.
-	    With previous versions of
-	    Portsnap, you will have to
-	    create an empty directory /usr/ports if it does not
-	    exists:
-
-	  &prompt.root; mkdir /usr/ports
-	
-
-	
 	  Download a compressed snapshot of the Ports Collection into
 	    /var/db/portsnap.  You can
 	    disconnect from the Internet after this step, if you wish.

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#26 (text+ko) ====

@@ -1,7 +1,7 @@
 
+
 
 
   &header;
@@ -210,7 +210,7 @@
       supported by the Security Officer for a minimum of 12 months after the
       release, and for sufficient additional time (if needed) to ensure
       that there is a newer release for at least 3 months before the
-      older Normal relase expires.
+      older Normal release expires.
     
     
      Extended
      
     
      Selected releases (normally every second release plus the last

==== //depot/projects/docproj_nl/www/share/sgml/events.xml#12 (text+ko) ====

@@ -10,10 +10,36 @@
 
   
     
-      $FreeBSD: www/share/sgml/events.xml,v 1.64 2008/12/29 11:11:56 murray Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.66 2009/01/06 13:45:10 danger Exp $
     
   
 
+  
+    FOSDEM '09
+    http://fosdem.org/2009/
+    
+      2009
+      2
+      7
+    
+    
+      2009
+      2
+      8
+    
+    
+      Belgium
+      Brussels
+      ULB Campus Solbosh
+    
+
+    FOSDEM '09 is a free and non-commercial event organized
+      by the community, for the community.  Its goal is to provide Free
+      and Open Source developers a place to meet.  Several &os;
+      developers will be present, including Kris Kennaway who will be
+      giving a talk about system performance.
+  
+
   
     EuroBSDCon 2009
     http://2009.eurobsdcon.org/
@@ -63,6 +89,40 @@
       from commercial vendors.
   
 
+  
+    FreeBSD Kernel Internals: Intensive Evening Course
+    http://www.mckusick.com/courses/adveveclass.html
+    
+      2009
+      3
+      18
+    
+    
+      2009
+      7
+      2
+    
+    
+      USA
+      California
+      Berkeley
+    
+
+    The 
+      FreeBSD Kernel Internals: An Intensive Code Walkthrough
+      course provides an in depth study of the source code of the
+      FreeBSD 8-current kernel as of early March.  This course is
+      aimed at users with a good understanding of the algorithms used
+      in the FreeBSD kernel that want to learn the details of their
+      implementation.  The class will be held at the historic  Hillside Club at 2286
+      Cedar Street, Berkeley, CA 94709 just three blocks north of the
+      Berkeley campus once per week from 6:30PM to 10:00PM starting
+      Wednesday March 18th and finishing Thursday July 2nd.
+  
+
+
   
     AsiaBSDCon 2009
     http://2009.asiabsdcon.org/

==== //depot/projects/docproj_nl/www/share/sgml/navibar.ent#3 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 Developers
    • Developer's Handbook
    • Porter's Handbook
      • -
    • CVS Repository
      • +
    • Source code repositories
    • Release Engineering
    • Platforms
    • Project Ideas
      • From rene at FreeBSD.org Wed Jan 7 19:19:15 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Wed Jan 7 19:20:56 2009 Subject: PERFORCE change 155770 for review Message-ID: <200901071919.n07JJEEL058500@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155770 Change 155770 by rene@rene_self on 2009/01/07 19:18:59 MFen handbook/ports 1.286 -> 1.287 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#12 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#12 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.29 2006/08/12 22:53:16 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/ports/chapter.sgml - %SRCID% 1.286 + %SRCID% 1.287 --> @@ -781,32 +781,12 @@ Met Portsnap Portsnap is een alternatief systeem voor het - distribueren van de Portscollectie dat voor het eerst - beschikbaar was in &os; 6.0. Op oudere systemen is het - te installeren uit het pakket sysutils/portsnap: - - &prompt.root; pkg_add -r portsnap - - In Portsnap - gebruiken staat een gedetailleerde beschrijving van + distribueren van de Portscollectie. In Portsnap + gebruiken staat een gedetailleerde beschrijving van alle mogelijkheden van Portsnap. - Sinds &os;- 6.1-RELEASE en met recente versies van - de Portsnap port of pakket kan - de volgende stap veilig worden overgeslagen. De /usr/ports wordt automatisch - gemaakt bij het eerste gebruik van het &man.portsnap.8; - commando. Met eerdere versies van - Portsnap moet de /usr/ports directory eerst - gemaakt worden als deze nog niet bestaat: - - &prompt.root; mkdir /usr/ports - - - Download een gecomprimeerd snapshot van de Portscollectie naar /var/db/portsnap. Na deze From rene at FreeBSD.org Wed Jan 7 20:03:01 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Wed Jan 7 20:03:08 2009 Subject: PERFORCE change 155772 for review Message-ID: <200901072002.n07K2wYv062263@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155772 Change 155772 by rene@rene_self on 2009/01/07 20:02:33 Synchronize committers-guide with commit candidate 1. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#12 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#12 (text+ko) ==== @@ -2404,7 +2404,7 @@ maintainer is expected to work with the platform maintainers to refine these changes. Major new toolchain components are allowed to break support for Tier 2 architectures if the - &os;-local changes have not been incorporated upstream. The + FreeBSD-local changes have not been incorporated upstream. The toolchain maintainers are expected to provide prompt review of any proposed changes and cannot block, through their inaction, changes going into the tree. New features added to FreeBSD @@ -3312,7 +3312,7 @@ - Free 4-CD and DVD sets + Free 4-CD and DVD Sets &os; committers can get a free 4-CD or DVD set at From rene at FreeBSD.org Wed Jan 7 20:06:04 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Wed Jan 7 20:06:10 2009 Subject: PERFORCE change 155774 for review Message-ID: <200901072006.n07K62tg063393@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155774 Change 155774 by rene@rene_self on 2009/01/07 20:05:47 Undo ordering change of i386 and Sparc64 in commiters-guide Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#13 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#13 (text+ko) ==== @@ -2224,7 +2224,7 @@ to the source tree.
    - The Sparc64 and i386 platforms were chosen due to being more + The i386 and Sparc64 platforms were chosen due to being more readily available to developers and as representatives of more diverse processor and system designs - big vs little endian, register file vs register stack, different DMA and cache From peter at FreeBSD.org Wed Jan 7 23:32:51 2009 From: peter at FreeBSD.org (Peter Wemm) Date: Wed Jan 7 23:33:00 2009 Subject: PERFORCE change 155790 for review Message-ID: <200901072332.n07NWkhX092742@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155790 Change 155790 by peter@peter_daintree on 2009/01/07 23:32:45 IFC @155788 Affected files ... .. //depot/projects/hammer/COPYRIGHT#8 integrate .. //depot/projects/hammer/Makefile#54 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#63 integrate .. //depot/projects/hammer/UPDATING#128 integrate .. //depot/projects/hammer/bin/test/test.1#7 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate .. //depot/projects/hammer/contrib/bind9/CHANGES#12 integrate .. //depot/projects/hammer/contrib/bind9/COPYRIGHT#7 integrate .. //depot/projects/hammer/contrib/bind9/FAQ#8 integrate .. //depot/projects/hammer/contrib/bind9/FAQ.xml#6 integrate .. //depot/projects/hammer/contrib/bind9/README#9 integrate .. //depot/projects/hammer/contrib/bind9/aclocal.m4#1 branch .. //depot/projects/hammer/contrib/bind9/bin/check/check-tool.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.1#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dighost.c#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.1#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.8#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.8#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/client.c#10 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/config.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/controlconf.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/globals.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/interfacemgr.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwaddr.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdgnba.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdnoop.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.8#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/main.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.8#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.5#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.docbook#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.html#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.docbook#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/query.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/server.c#10 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/unix/include/named/os.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/unix/os.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/update.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.1#1 branch .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.8#6 delete .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.8#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.c#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.html#6 integrate .. //depot/projects/hammer/contrib/bind9/config.h.in#1 branch .. //depot/projects/hammer/contrib/bind9/configure.in#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM-book.xml#10 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch01.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch02.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch03.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch04.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch05.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch06.html#9 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch07.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch08.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch09.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch10.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.pdf#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dig.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-keygen.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-signzone.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.host.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkconf.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkzone.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc-confgen.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.conf.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/format-options.pl#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/migration#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/options#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/sort-options.pl#1 branch .. //depot/projects/hammer/contrib/bind9/doc/rfc/index#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4648.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4701.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc5155.txt#1 branch .. //depot/projects/hammer/contrib/bind9/lib/bind/aclocal.m4#4 branch .. //depot/projects/hammer/contrib/bind9/lib/bind/api#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strerror.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strtoul.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/config.h.in#7 branch .. //depot/projects/hammer/contrib/bind9/lib/bind/configure.in#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/dst_api.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/hmac_link.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/support.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/arpa/nameser.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/assertions.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/eventlib.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/misc.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/platform.h.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/bind/include/netdb.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/resolv.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_net_pton.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_network.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_ho.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnetgrent.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnetgrent_r.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/assertions.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/bitncmp.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ctl_clnt.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ctl_srvr.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/logging.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/port_after.h.in#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/port_before.h.in#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_debug.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_mkquery.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_query.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_send.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/api#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/check.c#9 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/adb.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/api#10 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/cache.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dispatch.c#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_parse.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_parse.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dispatch.h#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/journal.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/master.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/masterdump.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/message.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbt.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/txt_16.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/request.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/resolver.c#11 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rootns.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/sdb.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/tkey.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/tsig.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/validator.c#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/view.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/xfrin.c#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/zone.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/api#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/assertions.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/assertions.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lex.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/mem.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/msgs.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/platform.h.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/portset.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/resource.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/socket.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/timer.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/types.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/mem.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/portset.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/print.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/mutex.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/timer.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/app.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/net.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/net.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/resource.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket.c#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket_p.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/time.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/api#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/namedconf.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/api#7 integrate .. //depot/projects/hammer/contrib/bind9/make/rules.in#6 integrate .. //depot/projects/hammer/contrib/bind9/version#12 integrate .. //depot/projects/hammer/contrib/csup/GNUmakefile#3 integrate .. //depot/projects/hammer/contrib/csup/Makefile#3 integrate .. //depot/projects/hammer/contrib/csup/TODO#3 integrate .. //depot/projects/hammer/contrib/csup/config.c#3 integrate .. //depot/projects/hammer/contrib/csup/csup.1#3 integrate .. //depot/projects/hammer/contrib/csup/detailer.c#2 integrate .. //depot/projects/hammer/contrib/csup/diff.c#2 integrate .. //depot/projects/hammer/contrib/csup/diff.h#2 integrate .. //depot/projects/hammer/contrib/csup/fattr.c#3 integrate .. //depot/projects/hammer/contrib/csup/fattr.h#2 integrate .. //depot/projects/hammer/contrib/csup/keyword.c#2 integrate .. //depot/projects/hammer/contrib/csup/keyword.h#2 integrate .. //depot/projects/hammer/contrib/csup/lex.rcs.c#1 branch .. //depot/projects/hammer/contrib/csup/lister.c#3 integrate .. //depot/projects/hammer/contrib/csup/misc.c#3 integrate .. //depot/projects/hammer/contrib/csup/misc.h#3 integrate .. //depot/projects/hammer/contrib/csup/mux.c#3 integrate .. //depot/projects/hammer/contrib/csup/proto.c#3 integrate .. //depot/projects/hammer/contrib/csup/proto.h#2 integrate .. //depot/projects/hammer/contrib/csup/rcsfile.c#1 branch .. //depot/projects/hammer/contrib/csup/rcsfile.h#1 branch .. //depot/projects/hammer/contrib/csup/rcsparse.c#1 branch .. //depot/projects/hammer/contrib/csup/rcsparse.h#1 branch .. //depot/projects/hammer/contrib/csup/rcstokenizer.h#1 branch .. //depot/projects/hammer/contrib/csup/rcstokenizer.l#1 branch .. //depot/projects/hammer/contrib/csup/rsyncfile.c#1 branch .. //depot/projects/hammer/contrib/csup/rsyncfile.h#1 branch .. //depot/projects/hammer/contrib/csup/status.c#2 integrate .. //depot/projects/hammer/contrib/csup/stream.c#2 integrate .. //depot/projects/hammer/contrib/csup/stream.h#2 integrate .. //depot/projects/hammer/contrib/csup/updater.c#3 integrate .. //depot/projects/hammer/contrib/file/AUTHORS#1 branch .. //depot/projects/hammer/contrib/file/COPYING#1 branch .. //depot/projects/hammer/contrib/file/ChangeLog#6 integrate .. //depot/projects/hammer/contrib/file/FREEBSD-upgrade#6 delete .. //depot/projects/hammer/contrib/file/INSTALL#1 branch .. //depot/projects/hammer/contrib/file/LEGAL.NOTICE#5 delete .. //depot/projects/hammer/contrib/file/MAINT#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/adventure#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/animation#8 integrate .. //depot/projects/hammer/contrib/file/Magdir/apple#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/archive#9 integrate .. //depot/projects/hammer/contrib/file/Magdir/audio#9 integrate .. //depot/projects/hammer/contrib/file/Magdir/c-lang#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/c64#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/cddb#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/clarion#1 branch .. //depot/projects/hammer/contrib/file/Magdir/commands#7 integrate .. //depot/projects/hammer/contrib/file/Magdir/compress#6 integrate .. //depot/projects/hammer/contrib/file/Magdir/console#7 integrate .. //depot/projects/hammer/contrib/file/Magdir/cracklib#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/ctags#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/database#7 integrate .. //depot/projects/hammer/contrib/file/Magdir/diff#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/dump#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/elf#9 integrate .. //depot/projects/hammer/contrib/file/Magdir/erlang#1 branch .. //depot/projects/hammer/contrib/file/Magdir/filesystems#9 integrate .. //depot/projects/hammer/contrib/file/Magdir/flash#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/fonts#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/frame#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/freebsd#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/fsav#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/games#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/gimp#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/gnome-keyring#1 branch .. //depot/projects/hammer/contrib/file/Magdir/gnu#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/gnumeric#1 branch .. //depot/projects/hammer/contrib/file/Magdir/graphviz#1 branch .. //depot/projects/hammer/contrib/file/Magdir/hp#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/iff#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/images#7 integrate .. //depot/projects/hammer/contrib/file/Magdir/inform#1 branch .. //depot/projects/hammer/contrib/file/Magdir/java#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/jpeg#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/kde#1 branch .. //depot/projects/hammer/contrib/file/Magdir/lex#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/linux#7 integrate .. //depot/projects/hammer/contrib/file/Magdir/lisp#6 integrate .. //depot/projects/hammer/contrib/file/Magdir/llvm#1 branch .. //depot/projects/hammer/contrib/file/Magdir/lua#1 branch .. //depot/projects/hammer/contrib/file/Magdir/luks#1 branch .. //depot/projects/hammer/contrib/file/Magdir/macintosh#6 integrate .. //depot/projects/hammer/contrib/file/Magdir/mail.news#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/mathcad#1 branch .. //depot/projects/hammer/contrib/file/Magdir/mathematica#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/mercurial#1 branch .. //depot/projects/hammer/contrib/file/Magdir/misctools#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/mozilla#1 branch .. //depot/projects/hammer/contrib/file/Magdir/msdos#8 integrate .. //depot/projects/hammer/contrib/file/Magdir/mup#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/netware#1 branch .. //depot/projects/hammer/contrib/file/Magdir/ole2compounddocs#1 branch .. //depot/projects/hammer/contrib/file/Magdir/os2#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/palm#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/pdf#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/perl#6 integrate .. //depot/projects/hammer/contrib/file/Magdir/pgp#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/pkgadd#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/printer#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/psion#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/revision#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/riff#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/rpm#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/rtf#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/ruby#1 branch .. //depot/projects/hammer/contrib/file/Magdir/sc#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/scientific#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/securitycerts#1 branch .. //depot/projects/hammer/contrib/file/Magdir/sgi#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/sgml#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/sharc#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/sketch#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/softquad#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/spectrum#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/tex#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/troff#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/unicode#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/uuencode#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/varied.script#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/vorbis#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/warc#1 branch .. //depot/projects/hammer/contrib/file/Magdir/weak#1 branch .. //depot/projects/hammer/contrib/file/Magdir/windows#1 branch .. //depot/projects/hammer/contrib/file/Magdir/wordprocessors#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/xilinx#1 branch .. //depot/projects/hammer/contrib/file/Makefile.am#9 integrate .. //depot/projects/hammer/contrib/file/Makefile.in#9 integrate .. //depot/projects/hammer/contrib/file/Makefile.std#4 delete .. //depot/projects/hammer/contrib/file/NEWS#1 branch .. //depot/projects/hammer/contrib/file/PORTING#2 delete .. //depot/projects/hammer/contrib/file/README#6 integrate .. //depot/projects/hammer/contrib/file/TODO#1 branch .. //depot/projects/hammer/contrib/file/acinclude.m4#5 integrate .. //depot/projects/hammer/contrib/file/aclocal.m4#8 integrate .. //depot/projects/hammer/contrib/file/apprentice.c#9 integrate .. //depot/projects/hammer/contrib/file/ascmagic.c#9 integrate .. //depot/projects/hammer/contrib/file/asprintf.c#1 branch .. //depot/projects/hammer/contrib/file/compile#1 branch .. //depot/projects/hammer/contrib/file/compress.c#8 integrate .. //depot/projects/hammer/contrib/file/config.guess#1 branch .. //depot/projects/hammer/contrib/file/config.h.in#9 integrate .. //depot/projects/hammer/contrib/file/config.sub#1 branch .. //depot/projects/hammer/contrib/file/configure#9 integrate .. //depot/projects/hammer/contrib/file/configure.ac#1 branch .. //depot/projects/hammer/contrib/file/configure.in#9 delete .. //depot/projects/hammer/contrib/file/elfclass.h#1 branch .. //depot/projects/hammer/contrib/file/file.c#9 integrate .. //depot/projects/hammer/contrib/file/file.h#9 integrate .. //depot/projects/hammer/contrib/file/file.man#7 integrate .. //depot/projects/hammer/contrib/file/fsmagic.c#8 integrate .. //depot/projects/hammer/contrib/file/funcs.c#6 integrate .. //depot/projects/hammer/contrib/file/getopt_long.c#1 branch .. //depot/projects/hammer/contrib/file/is_tar.c#7 integrate .. //depot/projects/hammer/contrib/file/libmagic.man#4 integrate .. //depot/projects/hammer/contrib/file/magic.c#7 integrate .. //depot/projects/hammer/contrib/file/magic.h#5 integrate .. //depot/projects/hammer/contrib/file/magic.man#7 integrate .. //depot/projects/hammer/contrib/file/magic.mime#9 delete .. //depot/projects/hammer/contrib/file/magic2mime#5 delete .. //depot/projects/hammer/contrib/file/mkinstalldirs#5 delete .. //depot/projects/hammer/contrib/file/mygetopt.h#1 branch .. //depot/projects/hammer/contrib/file/names.h#7 integrate .. //depot/projects/hammer/contrib/file/patchlevel.h#9 integrate .. //depot/projects/hammer/contrib/file/print.c#9 integrate .. //depot/projects/hammer/contrib/file/readelf.c#10 integrate .. //depot/projects/hammer/contrib/file/readelf.h#7 integrate .. //depot/projects/hammer/contrib/file/softmagic.c#9 integrate .. //depot/projects/hammer/contrib/file/tar.h#5 integrate .. //depot/projects/hammer/contrib/file/test.c#4 delete .. //depot/projects/hammer/contrib/file/tests/Makefile.am#1 branch .. //depot/projects/hammer/contrib/file/tests/Makefile.in#1 branch .. //depot/projects/hammer/contrib/file/tests/README#1 branch .. //depot/projects/hammer/contrib/file/tests/gedcom.magic#1 branch .. //depot/projects/hammer/contrib/file/tests/gedcom.result#1 branch .. //depot/projects/hammer/contrib/file/tests/gedcom.testfile#1 branch .. //depot/projects/hammer/contrib/file/tests/test.c#1 branch .. //depot/projects/hammer/contrib/file/vasprintf.c#1 branch .. //depot/projects/hammer/contrib/lukemftpd/src/extern.h#5 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/ftpcmd.y#5 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/ftpd.c#5 integrate .. //depot/projects/hammer/contrib/netcat/FREEBSD-vendor#2 integrate .. //depot/projects/hammer/contrib/netcat/nc.1#9 integrate .. //depot/projects/hammer/contrib/netcat/netcat.c#7 integrate .. //depot/projects/hammer/contrib/openbsm/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/openbsm/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/openbsm/NEWS#2 integrate .. //depot/projects/hammer/contrib/openbsm/README#7 integrate .. //depot/projects/hammer/contrib/openbsm/TODO#6 integrate .. //depot/projects/hammer/contrib/openbsm/VERSION#8 integrate .. //depot/projects/hammer/contrib/openbsm/bin/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/audit.8#5 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/audit.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/audit_warn.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.8#6 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.c#7 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.h#5 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd_darwin.c#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd_fbsd.c#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditfilterd/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/auditreduce.c#7 integrate .. //depot/projects/hammer/contrib/openbsm/bin/praudit/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/audit_uevents.h#3 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/auditd_lib.h#1 branch .. //depot/projects/hammer/contrib/openbsm/bsm/libbsm.h#6 integrate .. //depot/projects/hammer/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/config/config.h#8 integrate .. //depot/projects/hammer/contrib/openbsm/config/config.h.in#6 integrate .. //depot/projects/hammer/contrib/openbsm/configure#8 integrate .. //depot/projects/hammer/contrib/openbsm/configure.ac#8 integrate .. //depot/projects/hammer/contrib/openbsm/etc/audit_event#9 integrate .. //depot/projects/hammer/contrib/openbsm/libauditd/Makefile.am#1 branch .. //depot/projects/hammer/contrib/openbsm/libauditd/Makefile.in#1 branch .. //depot/projects/hammer/contrib/openbsm/libauditd/auditd_lib.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/au_errno.3#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/au_token.3#6 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/audit_submit.3#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_audit.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_class.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_control.c#4 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_errno.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_event.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_io.c#8 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_mask.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_token.c#7 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_user.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_wrappers.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/libbsm.3#5 integrate .. //depot/projects/hammer/contrib/openbsm/man/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/man/audit.log.5#6 integrate .. //depot/projects/hammer/contrib/openbsm/modules/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/modules/auditfilter_noop/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/sys/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_errno.h#1 branch .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_record.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/bsm/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/bsm/generate.c#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/E2BIG_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EACCES_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EBADF_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EBUSY_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ECHILD_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EDEADLK_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EEXIST_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EFAULT_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EFBIG_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EINTR_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EINVAL_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EIO_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EISDIR_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EMFILE_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EMLINK_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENFILE_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENODEV_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOENT_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOEXEC_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOMEM_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOSPC_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOTBLK_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOTDIR_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOTTY_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENXIO_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EPERM_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EPIPE_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EROFS_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ESPIPE_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ESRCH_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ETXTBSY_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EXDEV_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/arg32_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/data_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/file_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/header32_token#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/in_addr_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ip_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ipc_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/iport_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/opaque_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/path_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process32_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process32ex_record-IPv4#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process32ex_record-IPv6#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process64_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process64ex_record-IPv4#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process64ex_record-IPv6#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/return32_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/return32_token#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/seq_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/socketex_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/socketex_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/subject32_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/subject32ex_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/text_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/zonename_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/tools/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/openssl/apps/speed.c#6 integrate .. //depot/projects/hammer/crypto/openssl/apps/spkac.c#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/verify.c#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/x509.c#7 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s2_clnt.c#6 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s2_srvr.c#6 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_clnt.c#8 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_srvr.c#9 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssltest.c#7 integrate .. //depot/projects/hammer/etc/Makefile#67 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#92 integrate .. //depot/projects/hammer/etc/devd.conf#36 integrate .. //depot/projects/hammer/etc/devd/Makefile#1 branch .. //depot/projects/hammer/etc/devd/asus.conf#1 branch .. //depot/projects/hammer/etc/mtree/BSD.root.dist#20 integrate .. //depot/projects/hammer/etc/rc.d/defaultroute#2 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#31 integrate .. //depot/projects/hammer/gnu/usr.bin/man/manpath/manpath.config#7 integrate .. //depot/projects/hammer/lib/Makefile#75 integrate .. //depot/projects/hammer/lib/bind/bind/config.h#7 integrate .. //depot/projects/hammer/lib/bind/bind/port_after.h#5 integrate .. //depot/projects/hammer/lib/bind/bind/port_before.h#6 integrate .. //depot/projects/hammer/lib/bind/config.h#10 integrate .. //depot/projects/hammer/lib/bind/dns/code.h#6 integrate .. //depot/projects/hammer/lib/bind/dns/dns/enumclass.h#6 integrate .. //depot/projects/hammer/lib/bind/dns/dns/enumtype.h#6 integrate .. //depot/projects/hammer/lib/bind/dns/dns/rdatastruct.h#6 integrate .. //depot/projects/hammer/lib/bind/isc/Makefile#8 integrate .. //depot/projects/hammer/lib/bind/isc/isc/platform.h#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#37 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#16 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_ar.c#9 integrate .. //depot/projects/hammer/lib/libarchive/test/main.c#15 integrate .. //depot/projects/hammer/lib/libarchive/test/test_compat_gtar.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_compress.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_ar.c#9 integrate .. //depot/projects/hammer/lib/libauditd/Makefile#1 branch .. //depot/projects/hammer/lib/libbsm/Makefile#7 integrate .. //depot/projects/hammer/lib/libc/arm/_fpmath.h#5 integrate .. //depot/projects/hammer/lib/libc/arm/arith.h#3 integrate .. //depot/projects/hammer/lib/libc/include/fpmath.h#4 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.3#15 integrate .. //depot/projects/hammer/lib/libc/sys/jail.2#10 integrate .. //depot/projects/hammer/lib/libc/sys/kldunload.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/socket.2#9 integrate .. //depot/projects/hammer/lib/libelf/README#1 branch .. //depot/projects/hammer/lib/libfetch/fetch.c#6 integrate .. //depot/projects/hammer/lib/libmagic/Makefile#11 integrate .. //depot/projects/hammer/lib/libstand/bootp.c#4 integrate .. //depot/projects/hammer/lib/libusb20/libusb20_desc.c#3 integrate .. //depot/projects/hammer/lib/libutil/kinfo_getfile.c#2 integrate .. //depot/projects/hammer/lib/libutil/kinfo_getvmmap.c#2 integrate .. //depot/projects/hammer/lib/msun/src/math_private.h#11 integrate .. //depot/projects/hammer/libexec/ftpd/extern.h#2 integrate .. //depot/projects/hammer/libexec/ftpd/ftpcmd.y#12 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#32 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#16 integrate .. //depot/projects/hammer/sbin/ddb/ddb.8#6 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#18 integrate .. //depot/projects/hammer/sbin/geom/class/virstor/gvirstor.8#2 integrate .. //depot/projects/hammer/sbin/geom/misc/subr.c#10 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#69 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#68 integrate .. //depot/projects/hammer/sbin/kldstat/kldstat.c#10 integrate .. //depot/projects/hammer/sbin/md5/md5.1#9 integrate .. //depot/projects/hammer/sbin/mount/getmntopts.c#8 integrate .. //depot/projects/hammer/sbin/mount/mount.c#33 integrate .. //depot/projects/hammer/sbin/mount/mount_fs.c#3 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.8#9 integrate .. //depot/projects/hammer/sbin/ping/ping.8#11 integrate .. //depot/projects/hammer/sbin/savecore/savecore.8#10 integrate .. //depot/projects/hammer/sbin/shutdown/shutdown.8#7 integrate .. //depot/projects/hammer/share/doc/bind9/Makefile#6 integrate .. //depot/projects/hammer/share/man/man4/Makefile#115 integrate .. //depot/projects/hammer/share/man/man4/acpi_asus.4#2 integrate .. //depot/projects/hammer/share/man/man4/ae.4#2 integrate .. //depot/projects/hammer/share/man/man4/cpuctl.4#2 integrate .. //depot/projects/hammer/share/man/man4/ndis.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_ether_echo.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_tty.4#6 integrate .. //depot/projects/hammer/share/man/man4/snd_hda.4#14 integrate .. //depot/projects/hammer/share/man/man4/snd_ich.4#9 integrate .. //depot/projects/hammer/share/man/man4/textdump.4#5 integrate .. //depot/projects/hammer/share/man/man4/uscanner.4#21 integrate .. //depot/projects/hammer/share/man/man5/nsswitch.conf.5#11 integrate .. //depot/projects/hammer/share/man/man7/build.7#19 integrate .. //depot/projects/hammer/share/man/man9/dev_clone.9#2 integrate .. //depot/projects/hammer/share/man/man9/domain.9#4 integrate .. //depot/projects/hammer/share/man/man9/style.9#31 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#47 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#42 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#66 integrate .. //depot/projects/hammer/sys/amd64/conf/DEFAULTS#11 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#118 integrate .. //depot/projects/hammer/sys/amd64/conf/USB2#1 branch .. //depot/projects/hammer/sys/amd64/include/cputypes.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/elf.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#34 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#26 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#19 integrate .. //depot/projects/hammer/sys/arm/arm/identcpu.c#13 integrate .. //depot/projects/hammer/sys/arm/conf/AVILA#15 integrate .. //depot/projects/hammer/sys/arm/conf/AVILA.hints#3 integrate .. //depot/projects/hammer/sys/arm/conf/CAMBRIA#1 branch .. //depot/projects/hammer/sys/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/hammer/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/hammer/sys/arm/conf/EP80219#8 integrate .. //depot/projects/hammer/sys/arm/conf/HL200#7 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#18 integrate .. //depot/projects/hammer/sys/arm/conf/NSLU#5 integrate .. //depot/projects/hammer/sys/arm/include/armreg.h#8 integrate .. //depot/projects/hammer/sys/arm/include/elf.h#6 integrate .. //depot/projects/hammer/sys/arm/include/ieee.h#3 integrate .. //depot/projects/hammer/sys/arm/include/intr.h#12 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_ata.c#5 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_led.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_machdep.c#10 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/ixp425/files.avila#3 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/files.ixp425#5 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/if_npe.c#9 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/if_npereg.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425.c#8 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_iic.c#4 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_intr.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_mem.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_npe.c#6 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_npevar.h#5 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_pci.c#5 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_qmgr.c#5 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_timer.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_wdog.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425var.h#4 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/std.avila#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/hammer/sys/boot/arm/ixp425/boot2/arm_init.S#2 integrate .. //depot/projects/hammer/sys/boot/arm/ixp425/boot2/boot2.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/ixp425/boot2/ixp425_board.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/ixp425/boot2/lib.h#2 integrate .. //depot/projects/hammer/sys/boot/forth/loader.4th#3 integrate .. //depot/projects/hammer/sys/boot/forth/pnp.4th#2 integrate .. //depot/projects/hammer/sys/boot/forth/support.4th#5 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/Makefile#11 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/boot0.S#13 integrate .. //depot/projects/hammer/sys/boot/i386/gptzfsboot/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/i386/zfsboot/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/hammer/sys/boot/uboot/common/main.c#4 integrate .. //depot/projects/hammer/sys/boot/uboot/lib/devicename.c#4 integrate .. //depot/projects/hammer/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/hammer/sys/bsm/audit.h#12 integrate .. //depot/projects/hammer/sys/bsm/audit_errno.h#1 branch .. //depot/projects/hammer/sys/bsm/audit_internal.h#9 integrate .. //depot/projects/hammer/sys/bsm/audit_kevents.h#13 integrate .. //depot/projects/hammer/sys/bsm/audit_record.h#10 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#25 integrate .. //depot/projects/hammer/sys/cam/cam_periph.h#7 integrate .. //depot/projects/hammer/sys/cam/cam_sim.c#8 integrate .. //depot/projects/hammer/sys/cam/cam_sim.h#5 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#41 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#27 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#49 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_pass.c#13 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sg.c#5 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#63 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#47 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#57 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#44 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_windrv.c#12 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#28 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#28 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#48 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#49 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_usbd.c#4 integrate .. //depot/projects/hammer/sys/compat/ndis/usbd_var.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#23 integrate .. //depot/projects/hammer/sys/conf/NOTES#156 integrate .. //depot/projects/hammer/sys/conf/files#194 integrate .. //depot/projects/hammer/sys/conf/files.amd64#110 integrate .. //depot/projects/hammer/sys/conf/files.i386#101 integrate .. //depot/projects/hammer/sys/conf/files.ia64#43 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#36 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#50 integrate .. //depot/projects/hammer/sys/conf/files.sun4v#10 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#45 integrate .. //depot/projects/hammer/sys/conf/options#138 integrate .. //depot/projects/hammer/sys/conf/options.arm#17 integrate .. //depot/projects/hammer/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#2 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#13 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#16 integrate .. //depot/projects/hammer/sys/dev/agp/agp.c#4 integrate .. //depot/projects/hammer/sys/dev/agp/agp_i810.c#7 integrate .. //depot/projects/hammer/sys/dev/agp/agppriv.h#2 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-sis.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#16 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#18 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#16 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#21 integrate .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#16 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#29 integrate .. //depot/projects/hammer/sys/dev/cfe/cfe_console.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ael1002.c#11 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#31 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#15 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_crom.c#10 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#18 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#19 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.c#9 integrate .. //depot/projects/hammer/sys/dev/drm/drm_scatter.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_irq.c#9 integrate .. //depot/projects/hammer/sys/dev/exca/exca.c#17 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#69 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#68 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#13 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#15 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_usb.c#5 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#27 integrate .. //depot/projects/hammer/sys/dev/iicbus/ad7418.c#4 integrate .. //depot/projects/hammer/sys/dev/iicbus/ds1672.c#3 integrate .. //depot/projects/hammer/sys/dev/iicbus/icee.c#4 integrate .. //depot/projects/hammer/sys/dev/iicbus/if_ic.c#15 integrate .. //depot/projects/hammer/sys/dev/iicbus/iic.c#13 integrate .. //depot/projects/hammer/sys/dev/iicbus/iicbus.c#10 integrate .. //depot/projects/hammer/sys/dev/iicbus/iicsmb.c#7 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.c#24 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.h#20 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#21 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#13 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_user.c#3 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfe.c#13 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_bus_subr.c#3 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_if.m#1 branch .. //depot/projects/hammer/sys/dev/ofw/ofw_standard.c#1 branch .. //depot/projects/hammer/sys/dev/ofw/ofwvar.h#1 branch .. //depot/projects/hammer/sys/dev/ofw/openfirm.c#12 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirm.h#9 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirmio.c#13 integrate .. //depot/projects/hammer/sys/dev/ofw/openpromio.c#9 integrate .. //depot/projects/hammer/sys/dev/pccard/pccardvar.h#20 integrate .. //depot/projects/hammer/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#35 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#66 integrate .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#13 delete .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.h#3 delete .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#26 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#27 integrate .. //depot/projects/hammer/sys/dev/syscons/scterm-dumb.c#5 delete .. //depot/projects/hammer/sys/dev/syscons/scterm-sc.c#8 delete .. //depot/projects/hammer/sys/dev/syscons/scterm-teken.c#1 branch .. //depot/projects/hammer/sys/dev/syscons/scterm.c#3 integrate .. //depot/projects/hammer/sys/dev/syscons/sctermvar.h#3 delete .. //depot/projects/hammer/sys/dev/syscons/syscons.c#50 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.h#17 integrate .. //depot/projects/hammer/sys/dev/syscons/teken/Makefile#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/gensequences#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/sequences#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/teken.c#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/teken.h#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/teken_demo.c#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/teken_stress.c#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/teken_subr.h#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/teken_subr_compat.h#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/teken_wcwidth.h#1 branch .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#38 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_ddb.c#1 branch .. //depot/projects/hammer/sys/dev/usb/ehci_ixp4xx.c#1 branch .. //depot/projects/hammer/sys/dev/usb/ehci_mbus.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#31 integrate .. //depot/projects/hammer/sys/dev/usb/ehcireg.h#11 integrate .. //depot/projects/hammer/sys/dev/usb/ehcivar.h#16 integrate .. //depot/projects/hammer/sys/dev/usb/if_zyd.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#31 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#53 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#115 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.h#17 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#33 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/at91dci.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/at91dci_atmelarm.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ehci2.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ehci2.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ehci2_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/musb2_otg.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/musb2_otg_atmelarm.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ohci2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ohci2_atmelarm.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ohci2_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/uhci2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/uhci2.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/uhci2_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/usb2_bus.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/usb2_controller.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/usb2_controller.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/uss820dci.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_busdma.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_core.h#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_device.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_device.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_dynamic.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_dynamic.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_generic.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_handle_request.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_hub.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_hub.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_msctest.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_msctest.h#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_request.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_request.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_transfer.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_transfer.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_aue2.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_axe2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_axe2_reg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_cue2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_kue2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_rue2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_udav2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/image/uscanner2.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/include/usb2_devid.h#4 integrate .. //depot/projects/hammer/sys/dev/usb2/include/usb2_devtable.h#4 integrate .. //depot/projects/hammer/sys/dev/usb2/include/usb2_ioctl.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/include/usb2_standard.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/input/ukbd2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/input/ums2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/u3g2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uchcom2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uftdi2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/ulpt2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uplcom2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uvscom2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/sound/uaudio2.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/storage/umass2.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/storage/ustorage2_fs.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/wlan/if_rum2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/wlan/if_ural2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/wlan/if_zyd2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/wlan/if_zyd2_reg.h#2 integrate .. //depot/projects/hammer/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/hammer/sys/dev/xen/console/console.c#4 integrate .. //depot/projects/hammer/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/hammer/sys/dev/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/hammer/sys/dev/xen/netfront/netfront.c#5 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_map.c#16 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#21 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#31 integrate .. //depot/projects/hammer/sys/geom/part/g_part.c#18 integrate .. //depot/projects/hammer/sys/geom/part/g_part_bsd.c#10 integrate .. //depot/projects/hammer/sys/geom/part/g_part_pc98.c#8 integrate .. //depot/projects/hammer/sys/geom/part/g_part_vtoc8.c#6 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#17 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_bitops.h#3 integrate .. //depot/projects/hammer/sys/i386/conf/DEFAULTS#12 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#77 integrate .. //depot/projects/hammer/sys/i386/conf/USB2#1 branch .. //depot/projects/hammer/sys/i386/conf/XEN#6 integrate .. //depot/projects/hammer/sys/i386/cpufreq/est.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/genassym.c#26 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#90 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#65 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysi86.c#7 integrate .. //depot/projects/hammer/sys/i386/include/elf.h#8 integrate .. //depot/projects/hammer/sys/i386/include/xen/evtchn.h#4 delete .. //depot/projects/hammer/sys/i386/include/xen/hypervisor.h#2 delete .. //depot/projects/hammer/sys/i386/include/xen/xen_intr.h#3 delete .. //depot/projects/hammer/sys/i386/include/xen/xenfunc.h#3 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#33 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#37 integrate .. //depot/projects/hammer/sys/i386/xen/clock.c#3 integrate .. //depot/projects/hammer/sys/i386/xen/mp_machdep.c#4 integrate .. //depot/projects/hammer/sys/i386/xen/mptable.c#2 integrate .. //depot/projects/hammer/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/hammer/sys/i386/xen/xen_machdep.c#7 integrate .. //depot/projects/hammer/sys/ia64/include/elf.h#7 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#50 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#88 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#38 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#80 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_xxx.c#20 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#101 integrate .. //depot/projects/hammer/sys/kern/subr_kobj.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#21 integrate .. //depot/projects/hammer/sys/kern/subr_prf.c#31 integrate .. //depot/projects/hammer/sys/kern/tty.c#67 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#14 integrate .. //depot/projects/hammer/sys/kern/uipc_cow.c#19 integrate .. //depot/projects/hammer/sys/kern/uipc_debug.c#5 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#22 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#60 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_export.c#24 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#41 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#102 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#139 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#87 integrate .. //depot/projects/hammer/sys/mips/conf/DEFAULTS#2 integrate .. //depot/projects/hammer/sys/mips/include/elf.h#3 integrate .. //depot/projects/hammer/sys/mips/mips/elf64_machdep.c#1 branch .. //depot/projects/hammer/sys/modules/ndis/Makefile#10 integrate .. //depot/projects/hammer/sys/modules/netgraph/Makefile#24 integrate .. //depot/projects/hammer/sys/modules/netgraph/ether_echo/Makefile#1 branch .. //depot/projects/hammer/sys/modules/sound/driver/au88x0/Makefile#2 delete .. //depot/projects/hammer/sys/modules/usb2/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/usb2/serial_3g/Makefile#1 branch .. //depot/projects/hammer/sys/net/ieee8023ad_lacp.c#9 integrate .. //depot/projects/hammer/sys/net/if.c#85 integrate .. //depot/projects/hammer/sys/net/if_arcsubr.c#24 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#78 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#28 integrate .. //depot/projects/hammer/sys/net/if_fwsubr.c#25 integrate .. //depot/projects/hammer/sys/net/if_iso88025subr.c#27 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#20 integrate .. //depot/projects/hammer/sys/net/if_media.h#24 integrate .. //depot/projects/hammer/sys/net/if_tun.c#39 integrate .. //depot/projects/hammer/sys/net/if_var.h#53 integrate .. //depot/projects/hammer/sys/net/route.c#42 integrate .. //depot/projects/hammer/sys/net/route.h#25 integrate .. //depot/projects/hammer/sys/net/rtsock.c#44 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_acl.c#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_ccmp.c#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_tkip.c#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_wep.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#20 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_hostap.c#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#46 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#43 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#52 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#42 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_power.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#37 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan.c#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_sta.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_wds.c#6 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_main.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#33 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether_echo.c#1 branch .. //depot/projects/hammer/sys/netgraph/ng_ether_echo.h#1 branch .. //depot/projects/hammer/sys/netinet/if_ether.c#53 integrate .. //depot/projects/hammer/sys/netinet/in.c#35 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#66 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#47 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#75 integrate .. //depot/projects/hammer/sys/netinet/ipprotosw.h#4 delete .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#19 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#93 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#90 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#68 integrate .. //depot/projects/hammer/sys/netinet/tcp_timewait.c#9 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#63 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#64 integrate .. //depot/projects/hammer/sys/netinet/udp_var.h#9 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#41 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#37 integrate .. //depot/projects/hammer/sys/netinet6/in6_gif.c#19 integrate .. //depot/projects/hammer/sys/netinet6/in6_rmx.c#20 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#41 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#55 integrate .. //depot/projects/hammer/sys/netinet6/ip6protosw.h#7 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#41 integrate .. //depot/projects/hammer/sys/netinet6/nd6.h#13 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#31 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#24 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#44 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#46 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.c#28 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.h#19 integrate .. //depot/projects/hammer/sys/netipsec/vipsec.h#4 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipip.c#19 integrate .. //depot/projects/hammer/sys/pc98/cbus/scterm-sck.c#4 integrate .. //depot/projects/hammer/sys/pc98/cbus/sctermvar.h#1 branch .. //depot/projects/hammer/sys/pc98/conf/DEFAULTS#8 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From weongyo at FreeBSD.org Thu Jan 8 02:40:07 2009 From: weongyo at FreeBSD.org (Weongyo Jeong) Date: Thu Jan 8 02:40:13 2009 Subject: PERFORCE change 155793 for review Message-ID: <200901080240.n082e4hZ020843@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155793 Change 155793 by weongyo@weongyo_ws on 2009/01/08 02:39:44 looks the initilizetion of led is done so get rid of a XXX comment. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#10 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#10 (text+ko) ==== @@ -501,7 +501,7 @@ error = urtw_get_txpwr(sc); if (error != 0) goto fail; - error = urtw_led_init(sc); /* XXX incompleted */ + error = urtw_led_init(sc); if (error != 0) goto fail; From weongyo at FreeBSD.org Thu Jan 8 02:51:17 2009 From: weongyo at FreeBSD.org (Weongyo Jeong) Date: Thu Jan 8 02:51:25 2009 Subject: PERFORCE change 155794 for review Message-ID: <200901080251.n082pG6n021672@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155794 Change 155794 by weongyo@weongyo_ws on 2009/01/08 02:51:09 some comments and remove magic values to handle preamble modes. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#11 edit .. //depot/projects/vap/sys/dev/usb/if_urtwvar.h#3 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#11 (text+ko) ==== @@ -508,8 +508,11 @@ sc->sc_rts_retry = URTW_DEFAULT_RTS_RETRY; sc->sc_tx_retry = URTW_DEFAULT_TX_RETRY; sc->sc_currate = 3; - /* XXX for what? */ - sc->sc_preamble_mode = 2; + /* + * XXX there's no points to set this variable to + * URTW_PREAMBLE_MODE_SHORT so we need to set it properly. + */ + sc->sc_preamble_mode = URTW_PREAMBLE_MODE_LONG; ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { @@ -2381,10 +2384,11 @@ data->buf[1] = (m0->m_pkthdr.len & 0x0f00) >> 8; data->buf[1] |= (1 << 7); - /* XXX sc_preamble_mode is always 2. */ + /* XXX sc_preamble_mode is always URTW_PREAMBLE_MODE_LONG. */ if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) && - (sc->sc_preamble_mode == 1) && (sc->sc_currate != 0)) + (sc->sc_preamble_mode == URTW_PREAMBLE_MODE_SHORT) && + (sc->sc_currate != 0)) data->buf[2] |= 1; if ((m0->m_pkthdr.len > vap->iv_rtsthreshold) && prior == URTW_PRIORITY_LOW) ==== //depot/projects/vap/sys/dev/usb/if_urtwvar.h#3 (text+ko) ==== @@ -129,6 +129,8 @@ uint8_t sc_rts_retry; uint8_t sc_tx_retry; uint8_t sc_preamble_mode; +#define URTW_PREAMBLE_MODE_SHORT 1 +#define URTW_PREAMBLE_MODE_LONG 2 struct callout sc_watchdog_ch; int sc_txtimer; int sc_currate; From weongyo at FreeBSD.org Thu Jan 8 03:30:00 2009 From: weongyo at FreeBSD.org (Weongyo Jeong) Date: Thu Jan 8 03:30:06 2009 Subject: PERFORCE change 155796 for review Message-ID: <200901080329.n083TuFo025480@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155796 Change 155796 by weongyo@weongyo_ws on 2009/01/08 03:29:22 update a comment. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#12 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#12 (text+ko) ==== @@ -510,7 +510,8 @@ sc->sc_currate = 3; /* * XXX there's no points to set this variable to - * URTW_PREAMBLE_MODE_SHORT so we need to set it properly. + * URTW_PREAMBLE_MODE_SHORT so we need to set it properly to increase + * the throughput perfomance at high data rates. */ sc->sc_preamble_mode = URTW_PREAMBLE_MODE_LONG; From weongyo at FreeBSD.org Thu Jan 8 03:42:12 2009 From: weongyo at FreeBSD.org (Weongyo Jeong) Date: Thu Jan 8 03:42:18 2009 Subject: PERFORCE change 155797 for review Message-ID: <200901080342.n083gARw026433@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155797 Change 155797 by weongyo@weongyo_ws on 2009/01/08 03:41:18 add a knob to control the preamble mode. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#13 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#13 (text+ko) ==== @@ -63,8 +63,8 @@ #include #include +SYSCTL_NODE(_hw_usb, OID_AUTO, urtw, CTLFLAG_RW, 0, "USB Realtek 8187L"); #ifdef URTW_DEBUG -SYSCTL_NODE(_hw_usb, OID_AUTO, urtw, CTLFLAG_RW, 0, "USB Realtek 8187L"); int urtw_debug = 0; SYSCTL_INT(_hw_usb_urtw, OID_AUTO, debug, CTLFLAG_RW, &urtw_debug, 0, "control debugging printfs"); @@ -88,6 +88,10 @@ (void) sc; \ } while (0) #endif +int urtw_preamble_mode = URTW_PREAMBLE_MODE_LONG; +SYSCTL_INT(_hw_usb_urtw, OID_AUTO, preamble_mode, CTLFLAG_RW, + &urtw_preamble_mode, 0, "set the preable mode (long or short)"); +TUNABLE_INT("hw.usb.urtw.preamble_mode", &urtw_preamble_mode); /* recognized device vendors/products */ static const struct usb_devno urtw_devs[] = { @@ -508,12 +512,7 @@ sc->sc_rts_retry = URTW_DEFAULT_RTS_RETRY; sc->sc_tx_retry = URTW_DEFAULT_TX_RETRY; sc->sc_currate = 3; - /* - * XXX there's no points to set this variable to - * URTW_PREAMBLE_MODE_SHORT so we need to set it properly to increase - * the throughput perfomance at high data rates. - */ - sc->sc_preamble_mode = URTW_PREAMBLE_MODE_LONG; + sc->sc_preamble_mode = urtw_preamble_mode; ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { @@ -2385,7 +2384,6 @@ data->buf[1] = (m0->m_pkthdr.len & 0x0f00) >> 8; data->buf[1] |= (1 << 7); - /* XXX sc_preamble_mode is always URTW_PREAMBLE_MODE_LONG. */ if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) && (sc->sc_preamble_mode == URTW_PREAMBLE_MODE_SHORT) && From weongyo at FreeBSD.org Thu Jan 8 03:56:27 2009 From: weongyo at FreeBSD.org (Weongyo Jeong) Date: Thu Jan 8 03:56:33 2009 Subject: PERFORCE change 155798 for review Message-ID: <200901080356.n083uPY0027520@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155798 Change 155798 by weongyo@weongyo_ws on 2009/01/08 03:55:24 As a looking of the Realtek's linux driver they use RX_MAXSIZE buffers with 0x9c4(2500) but currently urtw(4) would use MCLBYTES. Without datasheets it looks hard to define the value exactly. Just with some testing it looks it's ok to use MCLBYTES but not sure there're some side-effects. So temporary remove a warning message to make users into confusions. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#14 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#14 (text+ko) ==== @@ -669,7 +669,6 @@ goto fail; } if (fillmbuf) { - /* XXX check maxsz */ dp->m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); if (dp->m == NULL) { device_printf(sc->sc_dev, @@ -734,9 +733,6 @@ urtw_alloc_rx_data_list(struct urtw_softc *sc) { - /* XXX todo */ - device_printf(sc->sc_dev, "WARNING: rx buffer is smaller than %d\n", - URTW_RX_MAXSIZE); return urtw_alloc_data_list(sc, sc->sc_rxdata, URTW_RX_DATA_LIST_COUNT, MCLBYTES, 1 /* mbufs */); } From weongyo at FreeBSD.org Thu Jan 8 04:58:30 2009 From: weongyo at FreeBSD.org (Weongyo Jeong) Date: Thu Jan 8 04:58:36 2009 Subject: PERFORCE change 155801 for review Message-ID: <200901080458.n084wS3T042753@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155801 Change 155801 by weongyo@weongyo_ws on 2009/01/08 04:58:16 check the value directly. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#15 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#15 (text+ko) ==== @@ -2770,7 +2770,6 @@ { struct ieee80211com *ic = sc->sc_ifp->if_l2com; struct ieee80211_channel *c = ic->ic_curchan; - short gset = (IEEE80211_IS_CHAN_G(c)) ? 1 : 0; usbd_status error; error = urtw_8225_set_txpwrlvl(sc, chan); @@ -2787,7 +2786,7 @@ else urtw_write8_m(sc, URTW_SLOT, 0x14); - if (gset) { + if (IEEE80211_IS_CHAN_G(c)) { /* for G */ urtw_write8_m(sc, URTW_DIFS, 0x14); urtw_write8_m(sc, URTW_EIFS, 0x5b - 0x14); @@ -3177,7 +3176,6 @@ { struct ieee80211com *ic = sc->sc_ifp->if_l2com; struct ieee80211_channel *c = ic->ic_curchan; - short gset = (IEEE80211_IS_CHAN_G(c)) ? 1 : 0; usbd_status error; error = urtw_8225v2_set_txpwrlvl(sc, chan); @@ -3195,7 +3193,7 @@ else urtw_write8_m(sc, URTW_SLOT, 0x14); - if (gset) { + if (IEEE80211_IS_CHAN_G(c)) { /* for G */ urtw_write8_m(sc, URTW_DIFS, 0x14); urtw_write8_m(sc, URTW_EIFS, 0x5b - 0x14); From gonzo at FreeBSD.org Thu Jan 8 05:40:12 2009 From: gonzo at FreeBSD.org (Oleksandr Tymoshenko) Date: Thu Jan 8 05:40:18 2009 Subject: PERFORCE change 155804 for review Message-ID: <200901080540.n085eB8d046998@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155804 Change 155804 by gonzo@gonzo_figaro on 2009/01/08 05:39:36 o Clean code while I'm here looking for pcib(4) examples Affected files ... .. //depot/projects/mips2/src/sys/mips/idt/idtpci.c#4 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/idt/idtpci.c#4 (text+ko) ==== @@ -125,8 +125,6 @@ struct rman sc_mem_rman[2]; struct rman sc_io_rman[2]; struct rman sc_irq_rman; - uint32_t sc_mem; - uint32_t sc_io; }; static uint32_t @@ -155,9 +153,6 @@ sc->sc_dev = dev; sc->sc_busno = busno; - sc->sc_io = 0; - sc->sc_mem = 0; - /* TODO: Check for host mode */ /* Enabled PCI, IG mode, EAP mode */ @@ -240,7 +235,6 @@ } /* Use KSEG1 to access IO ports for it is uncached */ - sc->sc_io = 0; sc->sc_io_rman[0].rm_type = RMAN_ARRAY; sc->sc_io_rman[0].rm_descr = "IDTPCI I/O Ports window 1"; if (rman_init(&sc->sc_io_rman[0]) != 0 || @@ -258,7 +252,6 @@ } /* Use KSEG1 to access PCI memory for it is uncached */ - sc->sc_mem = 0; sc->sc_mem_rman[0].rm_type = RMAN_ARRAY; sc->sc_mem_rman[0].rm_descr = "IDTPCI PCI Memory window 1"; if (rman_init(&sc->sc_mem_rman[0]) != 0 || From hselasky at FreeBSD.org Thu Jan 8 10:13:54 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Thu Jan 8 10:14:01 2009 Subject: PERFORCE change 155807 for review Message-ID: <200901081013.n08ADqxX086593@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155807 Change 155807 by hselasky@hselasky_laptop001 on 2009/01/08 10:13:07 Fix a typo. Reported by Alexander Best. Affected files ... .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#11 edit Differences ... ==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#11 (text+ko) ==== @@ -327,7 +327,7 @@ opt->got_power_save + opt->got_power_on + opt->got_power_off) > 1) { - err(1, "cannot only specify one of 'set_config', " + err(1, "can only specify one of 'set_config', " "'set_alt', 'reset', 'suspend', 'resume', " "'power_save', 'power_on' and 'power_off' " "at the same time!"); From hselasky at FreeBSD.org Thu Jan 8 10:28:08 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Thu Jan 8 10:28:14 2009 Subject: PERFORCE change 155810 for review Message-ID: <200901081028.n08AS6eS088407@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155810 Change 155810 by hselasky@hselasky_laptop001 on 2009/01/08 10:27:16 Usability improvement. Make sure that setting power mode ON resurrects the device if powered OFF. Reported by: Alexander Best. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#40 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#40 (text+ko) ==== @@ -1688,15 +1688,23 @@ { struct usb2_device *udev = f->udev; int err; + uint8_t old_mode; if ((udev == NULL) || (udev->parent_hub == NULL)) { return (EINVAL); } err = priv_check(curthread, PRIV_ROOT); - if (err) { + if (err) return (err); - } + + /* get old power mode */ + old_mode = udev->power_mode; + + /* if no change, then just return */ + if (old_mode == mode) + return (0); + switch (mode) { case USB_POWER_MODE_OFF: /* get the device unconfigured */ @@ -1734,6 +1742,13 @@ if (err) return (ENXIO); /* I/O failure */ + /* if we are powered off we need to re-enumerate first */ + if (old_mode == USB_POWER_MODE_OFF) { + err = ugen_re_enumerate(f); + if (err) + return (err); + } + /* set new power mode */ usb2_set_power_mode(udev, mode); From remko at FreeBSD.org Thu Jan 8 12:23:13 2009 From: remko at FreeBSD.org (Remko Lodder) Date: Thu Jan 8 12:23:20 2009 Subject: PERFORCE change 155813 for review Message-ID: <200901081223.n08CNAqk000149@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155813 Change 155813 by remko@remko_nakur on 2009/01/08 12:22:56 More WIP. Facilitated by: Snow B.V. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#15 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#15 (text+ko) ==== @@ -1904,134 +1904,144 @@ om de top-level structuur te dupliceren van de broncode boom). - Having the sources on-line and knowing how to build a - system with them will make it much easier for you to upgrade - to future releases of &os;. + Door de broncode direct te kunnen benaderen, en weten + hoe een systeem opgebouwd kan worden ermee, maakt het een + stuk makkelijker om te upgraden naar toekomstige versies + van &os;. - To actually select a subset of the sources, use the - Custom menu item when you are in - the Distributions menu of the - system installation tool. + Om een subset van de broncode te kunnen zien, maak + gebruik van het Custom menu + item wanneer u in het + Distributions menu zit van de + systeem installatie applicatie. - Do I need to build a kernel? + Moet ik een kernel bouwen? - Building a new kernel was originally pretty much a - required step in a &os; installation, but more recent releases - have benefited from the introduction of much friendlier - kernel configuration methods. It is very easy to configure - the kernel's configuration by much more flexible - hints which can be set at the loader - prompt. + Het bouwen van een nieuwe kernel was voorheen een + benodigde stap bij een &os; installatie, maar meer recente + versies hebben voordeel gehad van de introductie van veel + vriendelijkere kernel configuratie methodes. Het is heel + makkelijk om de kernel configuratie aan te passen door een + veel flexibelere hints welke ingesteld kunnen + worden op de loader prompt. - It may still be worthwhile building a new kernel - containing just the drivers that you need, just to save a - bit of RAM, but it is no longer necessary for most - systems. + Het kan nog steeds de moeite waard zijn om een nieuwe + kernel te maken, welke alleen de drivers bevat die je + nodig hebt, enkel om een beetje RAM te sparen, maar dat is + veelal niet meer nodig voor de meeste systemen. - Should I use DES, Blowfish, or MD5 passwords and how do - I specify which form my users receive? + Moet ik gebruik maken van DES, Blowfish of MD5 + wachtwoorden en hoe specificeer ik welke vorm gebruikt + wordt voor mijn gebruikers? - The default password format on &os; is to use - MD5-based passwords. These are - believed to be more secure than the traditional &unix; - password format, which used a scheme based on the - DES algorithm. DES passwords are still - available if you need to share your password file with - legacy operating systems which still use the less secure - password format. &os; also allows you to use the Blowfish - password format, which is more secure. Which password - format to use for new passwords is controlled by the - passwd_format login capability in - /etc/login.conf, which takes values of - des, blf (if these are - available) or md5. See the - &man.login.conf.5; manual page for more information about - login capabilities. + Het standaard wachtwoord formaat op &os; is door + gebruik te maken van MD5 + gebaseerde wachtwoorden. Deze worden geacht veiliger te + zijn dan het traditionele &unix; wachtwoord formaat welke + gebruik maakt van een schema gebaseerd op het + DES algorithme. DES wachtwoorden zijn + nog steeds beschikbaar als u uw wachtwoord bestand moet + delen met oudere besturingssystemen, welke nog gebruik maken + van het minder veilige wachtwoord formaat. &os; stelt u ook + in staat om gebruik te maken van het Blowfish wachtwoord + formaat, welke veiliger is. Welk wachtwoord formaat er + gebruikt wordt voor nieuwe wachtwoorden, wordt ingesteld + door de passwd_format login mogelijkheden + in /etc/login.conf, welke de waardes + des, blf (als deze + beschikbaar is) of md5 accepteert. Zie + de &man.login.conf.5; handleiding voor meer informatie over + login mogelijkheden. - Why does the boot floppy start, but hang at the - Probing Devices... screen? + Waarom start de floppy op, maar hangt deze op het + Probing Devices... scherm? - If you have a IDE &iomegazip; or &jaz; drive installed, - remove it and try again. The boot floppy can get confused by - the drives. After the system is installed you can reconnect - the drive. Hopefully this will be fixed in a later - release. + Als u een IDE &iomegezip; of &jaz; heeft + geïnstalleerd, verwijder deze en probeer het opnieuw. + De opstart floppy kan in de war raken door de schijven. + Nadat het systeem geïnstalleerd is kunnen ze opnieuw + verbonden worden met het systeem. Hopelijk wordt dit in + een latere versie opgelost. - Why do I get a panic: can't mount - root error when rebooting the system after - installation? + Waarom krijg ik een panic: can't mount + root error als ik het systeem herstart + na de installatie? - This error comes from confusion between the boot block's - and the kernel's understanding of the disk devices. The - error usually manifests on two-disk IDE systems, with the - hard disks arranged as the master or single device on - separate IDE controllers, with &os; installed on the - secondary IDE controller. The boot blocks think the system - is installed on ad0 (the second - BIOS disk) while the kernel assigns the first disk on the - secondary controller device, ad2. - After the device probing, the kernel tries to mount what the - boot blocks think is the boot disk, - ad0, while it is really - ad2, and fails. + Deze error komt uit de verwarring tussen de boot blokken + en het begrip van de kernel over de schijf apparaten. De + error komt meestal voor op twee-schijf IDE systemen, met de + schijven ingedeeld als de master of als enkel apparaat op + verschillende IDE controllers, waarbij &os; geïnstalleerd + is op de tweede IDE controller. De bootblokken denken dat het + systeem geïnstalleerd is op ad0 + (de eerste BIOS schijf), terwijl de kernel de eerste schijf op + de tweede controller toewijst, ad2. + Na het proben van de apparaten, probeert de kernel de opstart + schijf te koppelen, naar wat de bootblokken denken dat de + opstart schijf is, ad0, terwijl dit + eigenlijk ad2 is waarna de opstart + poging mislukt. - To fix the problem, do one of the following: + Om dit probleem op te lossen, voer één + van de volgende dingen uit: - Reboot the system and hit Enter at - the Booting kernel in 10 seconds; hit [Enter] - to interrupt prompt. This will drop you into - the boot loader. + Herstart het systeem en druk op de + Enter tijdens de + Booting kernel in 10 seconds; hit [Enter] + to interrupt prompt. Dit verwijst u naar de + boot loader. - Then type + Type hierna set root_disk_unit="disk_number". - disk_number will be - 0 if &os; is installed on the master - drive on the first IDE controller, 1 - if it is installed on the slave on the first IDE - controller, 2 if it is installed on - the master of the second IDE controller, and - 3 if it is installed on the slave of - the second IDE controller. + disk_number wordt + 0 als &os; is geïnstalleerd op + de master schijf van de eerste IDE controller, + 1 als deze geïnstallerd op de + slaaf van de eerste IDE controller, + 2 als deze geïnstalleerd is op + de master van de tweede IDE controller, en + 3 als deze geïnstalleerd is op + de slaaf van de tweede IDE controller. - Then type boot, and your - system should boot correctly. + Type hierna boot en uw + systeem zou correct moeten opstarten. - To make this change permanent (i.e, so you do not - have to do this every time you reboot or turn on your - &os; machine), put the line - root_disk_unit="disk_number" - in /boot/loader.conf.local. + Om deze wijziging permanent te maken (dusdanig zodat + u dit niet elke keer hoeft te doen als u uw machine + herstart, of hem opnieuw aanzet), zet de volgende regel + in /boot/loader.conf.local: + root_disk_unit="disk_number". - Move the &os; disk onto the primary IDE - controller, so the hard disks are consecutive. + Verplaats de &os; schijf naar de primaire IDE + controller, zodat de disken goed herkend worden. From hselasky at FreeBSD.org Thu Jan 8 15:32:27 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Thu Jan 8 15:32:34 2009 Subject: PERFORCE change 155820 for review Message-ID: <200901081532.n08FWPDx031982@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155820 Change 155820 by hselasky@hselasky_laptop001 on 2009/01/08 15:32:01 USB memory usage reduction patch. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#15 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#11 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#18 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#7 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#14 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#15 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#9 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#21 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#45 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#28 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#6 (text+ko) ==== @@ -34,6 +34,8 @@ #ifndef _AT9100_DCI_H_ #define _AT9100_DCI_H_ +#define AT91_MAX_DEVICES (USB_MIN_DEVICES + 1) + #define AT91_UDP_FRM 0x00 /* Frame number register */ #define AT91_UDP_FRM_MASK (0x7FF << 0) /* Frame Number as Defined in * the Packet Field Formats */ @@ -206,6 +208,7 @@ struct usb2_sw_transfer sc_root_intr; struct usb2_config_td sc_config_td; + struct usb2_device *sc_devices[AT91_MAX_DEVICES]; struct resource *sc_io_res; struct resource *sc_irq_res; void *sc_intr_hdl; ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#15 (text+ko) ==== @@ -145,9 +145,12 @@ sc->sc_dci.sc_pull_down = &at91_udp_pull_down; sc->sc_dci.sc_pull_arg = sc; + /* initialise some bus fields */ + sc->sc_dci.sc_bus.parent = dev; + sc->sc_dci.sc_bus.devices = sc->sc_dci.sc_devices; + sc->sc_dci.sc_bus.devices_max = AT91_MAX_DEVICES; + /* get all DMA memory */ - - sc->sc_dci.sc_bus.parent = dev; if (usb2_bus_mem_alloc_all(&sc->sc_dci.sc_bus, USB_GET_DMA_TAG(dev), NULL)) { return (ENOMEM); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#11 (text+ko) ==== @@ -38,6 +38,8 @@ #ifndef _EHCI_H_ #define _EHCI_H_ +#define EHCI_MAX_DEVICES USB_MAX_DEVICES + /* PCI config registers */ #define PCI_CBMEM 0x10 /* configuration base MEM */ #define PCI_INTERFACE_EHCI 0x20 @@ -459,6 +461,7 @@ struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; + struct usb2_device *sc_devices[EHCI_MAX_DEVICES]; struct resource *sc_io_res; struct resource *sc_irq_res; struct ehci_qh *sc_async_p_last; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#18 (text+ko) ==== @@ -232,12 +232,15 @@ device_printf(self, "Could not allocate sc\n"); return (ENXIO); } + /* initialise some bus fields */ + sc->sc_bus.parent = self; + sc->sc_bus.devices = sc->sc_devices; + sc->sc_bus.devices_max = EHCI_MAX_DEVICES; + /* get all DMA memory */ - - sc->sc_bus.parent = self; if (usb2_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(self), &ehci_iterate_hw_softc)) { - return ENOMEM; + return (ENOMEM); } sc->sc_dev = self; ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#10 (text+ko) ==== @@ -32,6 +32,8 @@ #ifndef _MUSB2_OTG_H_ #define _MUSB2_OTG_H_ +#define MUSB2_MAX_DEVICES (USB_MIN_DEVICES + 1) + /* Common registers */ #define MUSB2_REG_FADDR 0x0000 /* function address register */ @@ -365,6 +367,8 @@ struct usb2_sw_transfer sc_root_intr; struct usb2_config_td sc_config_td; struct usb2_hw_ep_profile sc_hw_ep_profile[16]; + + struct usb2_device *sc_devices[MUSB2_MAX_DEVICES]; struct resource *sc_io_res; struct resource *sc_irq_res; void *sc_intr_hdl; ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#12 (text+ko) ==== @@ -102,9 +102,12 @@ sc->sc_otg.sc_clocks_off = &musbotg_clocks_off; sc->sc_otg.sc_clocks_arg = sc; + /* initialise some bus fields */ + sc->sc_otg.sc_bus.parent = dev; + sc->sc_otg.sc_bus.devices = sc->sc_otg.sc_devices; + sc->sc_otg.sc_bus.devices_max = MUSB2_MAX_DEVICES; + /* get all DMA memory */ - - sc->sc_otg.sc_bus.parent = dev; if (usb2_bus_mem_alloc_all(&sc->sc_otg.sc_bus, USB_GET_DMA_TAG(dev), NULL)) { return (ENOMEM); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#7 (text+ko) ==== @@ -39,6 +39,8 @@ #ifndef _OHCI_H_ #define _OHCI_H_ +#define OHCI_MAX_DEVICES USB_MAX_DEVICES + /* PCI config registers */ #define PCI_CBMEM 0x10 /* configuration base memory */ #define PCI_INTERFACE_OHCI 0x10 @@ -324,6 +326,7 @@ struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; + struct usb2_device *sc_devices[OHCI_MAX_DEVICES]; struct resource *sc_io_res; struct resource *sc_irq_res; struct ohci_hcca *sc_hcca_p; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#14 (text) ==== @@ -73,12 +73,15 @@ if (sc == NULL) { return (ENXIO); } + /* initialise some bus fields */ + sc->sc_ohci.sc_bus.parent = dev; + sc->sc_ohci.sc_bus.devices = sc->sc_ohci.sc_devices; + sc->sc_ohci.sc_bus.devices_max = OHCI_MAX_DEVICES; + /* get all DMA memory */ - - sc->sc_ohci.sc_bus.parent = dev; if (usb2_bus_mem_alloc_all(&sc->sc_ohci.sc_bus, USB_GET_DMA_TAG(dev), &ohci_iterate_hw_softc)) { - return ENOMEM; + return (ENOMEM); } sc->iclk = at91_pmc_clock_ref("ohci_clk"); sc->fclk = at91_pmc_clock_ref("uhpck"); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#15 (text+ko) ==== @@ -200,12 +200,15 @@ device_printf(self, "Could not allocate sc\n"); return (ENXIO); } + /* initialise some bus fields */ + sc->sc_bus.parent = self; + sc->sc_bus.devices = sc->sc_devices; + sc->sc_bus.devices_max = OHCI_MAX_DEVICES; + /* get all DMA memory */ - - sc->sc_bus.parent = self; if (usb2_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(self), &ohci_iterate_hw_softc)) { - return ENOMEM; + return (ENOMEM); } sc->sc_dev = self; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#9 (text+ko) ==== @@ -39,6 +39,8 @@ #ifndef _UHCI_H_ #define _UHCI_H_ +#define UHCI_MAX_DEVICES USB_MAX_DEVICES + /* PCI config registers */ #define PCI_USBREV 0x60 /* USB protocol revision */ #define PCI_USB_REV_MASK 0xff @@ -273,6 +275,7 @@ struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; + struct usb2_device *sc_devices[UHCI_MAX_DEVICES]; struct uhci_td *sc_isoc_p_last[UHCI_VFRAMELIST_COUNT]; /* pointer to last TD * for isochronous */ struct uhci_qh *sc_intr_p_last[UHCI_IFRAMELIST_COUNT]; /* pointer to last QH ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#16 (text+ko) ==== @@ -251,9 +251,12 @@ device_printf(self, "Could not allocate sc\n"); return (ENXIO); } + /* initialise some bus fields */ + sc->sc_bus.parent = self; + sc->sc_bus.devices = sc->sc_devices; + sc->sc_bus.devices_max = UHCI_MAX_DEVICES; + /* get all DMA memory */ - - sc->sc_bus.parent = self; if (usb2_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(self), &uhci_iterate_hw_softc)) { return ENOMEM; ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#10 (text+ko) ==== @@ -70,7 +70,7 @@ struct usb2_dma_tag dma_tags[USB_BUS_DMA_TAG_MAX]; struct usb2_bus_methods *methods; /* filled by HC driver */ - struct usb2_device *devices[USB_MAX_DEVICES]; + struct usb2_device **devices; uint32_t hw_power_state; /* see USB_HW_POWER_XXX */ uint32_t uframe_usage[USB_HS_MICRO_FRAMES_MAX]; ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#21 (text+ko) ==== @@ -493,8 +493,6 @@ { bus->alloc_failed = 0; - bus->devices_max = USB_MAX_DEVICES; - mtx_init(&bus->bus_mtx, device_get_nameunit(bus->parent), NULL, MTX_DEF | MTX_RECURSE); @@ -506,6 +504,13 @@ usb2_dma_tag_setup(bus->dma_parent_tag, bus->dma_tags, dmat, &bus->bus_mtx, NULL, NULL, 32, USB_BUS_DMA_TAG_MAX); + if ((bus->devices_max > USB_MAX_DEVICES) || + (bus->devices_max < USB_MIN_DEVICES) || + (bus->devices == NULL)) { + DPRINTFN(0, "Devices field has not been " + "initialised properly!\n"); + bus->alloc_failed = 1; /* failure */ + } if (cb) { cb(bus, &usb2_bus_mem_alloc_all_cb); } ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#6 (text+ko) ==== @@ -28,6 +28,8 @@ #ifndef _USS820_DCI_H_ #define _USS820_DCI_H_ +#define USS820_MAX_DEVICES (USB_MIN_DEVICES + 1) + #define USS820_EP_MAX 8 /* maximum number of endpoints */ #define USS820_TXDAT 0x00 /* Transmit FIFO data */ @@ -347,6 +349,7 @@ struct usb2_sw_transfer sc_root_intr; struct usb2_config_td sc_config_td; + struct usb2_device *sc_devices[USS820_MAX_DEVICES]; struct resource *sc_io_res; struct resource *sc_irq_res; void *sc_intr_hdl; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#7 (text+ko) ==== @@ -138,9 +138,13 @@ if (sc == NULL) { return (ENXIO); } - /* get all DMA memory */ + /* initialise some bus fields */ sc->sc_bus.parent = dev; + sc->sc_bus.devices = sc->sc_devices; + sc->sc_bus.devices_max = USS820_MAX_DEVICES; + + /* get all DMA memory */ if (usb2_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(dev), NULL)) { return (ENOMEM); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#45 (text+ko) ==== @@ -1290,19 +1290,23 @@ * Find an unused device index. In USB Host mode this is the * same as the device address. * - * NOTE: Index 1 is reserved for the Root HUB. + * Device index zero is not used and device index 1 should + * always be the root hub. */ - for (device_index = USB_ROOT_HUB_ADDR; device_index != - USB_MAX_DEVICES; device_index++) { + for (device_index = USB_ROOT_HUB_ADDR;; device_index++) { +#if (USB_ROOT_HUB_ADDR > USB_MIN_DEVICES) +#error "Incorrect device limit." +#endif + if (device_index == bus->devices_max) { + device_printf(bus->bdev, + "No free USB device " + "index for new device!\n"); + return (NULL); + } if (bus->devices[device_index] == NULL) break; } - if (device_index == USB_MAX_DEVICES) { - device_printf(bus->bdev, - "No free USB device index for new device!\n"); - return (NULL); - } if (depth > 0x10) { device_printf(bus->bdev, "Invalid device depth!\n"); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#28 (text+ko) ==== @@ -1520,8 +1520,12 @@ * The root HUB device is never suspended * and we simply skip it. */ - for (x = USB_ROOT_HUB_ADDR + 1; - x != USB_MAX_DEVICES; x++) { + for (x = USB_ROOT_HUB_ADDR + 1;; x++) { +#if ((USB_ROOT_HUB_ADDR + 1) > USB_MIN_DEVICES) +#error "Incorrect device limit." +#endif + if (x == bus->devices_max) + break; udev = bus->devices[x]; if (udev == NULL) @@ -1564,8 +1568,12 @@ /* Re-loop all the devices to get the actual state */ - for (x = USB_ROOT_HUB_ADDR + 1; - x != USB_MAX_DEVICES; x++) { + for (x = USB_ROOT_HUB_ADDR + 1;; x++) { +#if ((USB_ROOT_HUB_ADDR + 1) > USB_MIN_DEVICES) +#error "Incorrect device limit." +#endif + if (x == bus->devices_max) + break; udev = bus->devices[x]; if (udev == NULL) ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#7 (text+ko) ==== @@ -35,6 +35,8 @@ #define USB_EP_MAX (2*16) /* hardcoded */ #define USB_FIFO_MAX (4 * USB_EP_MAX) +#define USB_MIN_DEVICES 2 /* unused + root HUB */ + #define USB_MAX_DEVICES USB_DEV_MAX /* including virtual root HUB and * address zero */ #define USB_MAX_ENDPOINTS USB_EP_MAX /* 2 directions on 16 endpoints */ @@ -64,5 +66,7 @@ #if (USB_EP_MAX < (2*16)) #error "Misconfigured limits #3" #endif - +#if (USB_MAX_DEVICES < USB_MIN_DEVICES) +#error "Misconfigured limits #4" +#endif #endif /* _USB2_DEFS_H_ */ From remko at FreeBSD.org Thu Jan 8 16:29:32 2009 From: remko at FreeBSD.org (Remko Lodder) Date: Thu Jan 8 16:29:38 2009 Subject: PERFORCE change 155822 for review Message-ID: <200901081629.n08GTSHU038351@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155822 Change 155822 by remko@remko_nakur on 2009/01/08 16:29:26 Correct typo. Submitted by: rene Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#16 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#16 (text+ko) ==== @@ -1974,7 +1974,7 @@ - Als u een IDE &iomegezip; of &jaz; heeft + Als u een IDE &iomegazip; of &jaz; heeft geïnstalleerd, verwijder deze en probeer het opnieuw. De opstart floppy kan in de war raken door de schijven. Nadat het systeem geïnstalleerd is kunnen ze opnieuw From nwhitehorn at FreeBSD.org Thu Jan 8 16:30:31 2009 From: nwhitehorn at FreeBSD.org (Nathan Whitehorn) Date: Thu Jan 8 16:30:38 2009 Subject: PERFORCE change 155823 for review Message-ID: <200901081630.n08GUTeT038483@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155823 Change 155823 by nwhitehorn@nwhitehorn_trantor on 2009/01/08 16:30:00 970 CPUs don't implement the L2 and L3 cache configuration registers, so we should not try to program them. We should have a better scheme (a CPU features mask) for controlling this -- right now we just check if the stored values for the L2CR and L3CR are zero. This commit makes SMP work in the simulator, modulo platform-specific issues starting the CPU. It may work on real (Apple) hardware. The CPU start/stop bits of this file should be abstracted into a platform module. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/mp_cpudep.c#3 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/mp_cpudep.c#3 (text+ko) ==== @@ -250,8 +250,10 @@ mtmsr(msr); isync(); - reg = l3_enable(); - reg = l2_enable(); + if (l3cr_config != 0) + reg = l3_enable(); + if (l2cr_config != 0) + reg = l2_enable(); reg = l1d_enable(); reg = l1i_enable(); From imp at bsdimp.com Thu Jan 8 17:24:25 2009 From: imp at bsdimp.com (M. Warner Losh) Date: Thu Jan 8 17:24:32 2009 Subject: PERFORCE change 155748 for review In-Reply-To: <200901071009.n07A9jrs056953@repoman.freebsd.org> References: <200901071009.n07A9jrs056953@repoman.freebsd.org> Message-ID: <20090108.102311.1541746851.imp@bsdimp.com> In message: <200901071009.n07A9jrs056953@repoman.freebsd.org> Hans Petter Selasky writes: : http://perforce.freebsd.org/chv.cgi?CH=155748 : : Change 155748 by hselasky@hselasky_laptop001 on 2009/01/07 10:09:35 : : : Umass module quirk from Alexander Best : to support Meizu Electronics MiniPlayer. : : Affected files ... : : .. //depot/projects/usb/src/sys/dev/usb/usbdevs#35 edit : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 edit : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 edit : .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 edit : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 (text+ko) ==== : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 (text+ko) ==== Why are these generated files committed to the tree? We did a lot of work to make usbdevs generated files not need to be committed to the tree and this breaks that... Warner From imp at bsdimp.com Thu Jan 8 17:27:23 2009 From: imp at bsdimp.com (M. Warner Losh) Date: Thu Jan 8 17:27:35 2009 Subject: PERFORCE change 155755 for review In-Reply-To: <200901071327.n07DRFt5091936@repoman.freebsd.org> References: <200901071327.n07DRFt5091936@repoman.freebsd.org> Message-ID: <20090108.102453.-1749728154.imp@bsdimp.com> In message: <200901071327.n07DRFt5091936@repoman.freebsd.org> Hans Petter Selasky writes: : Fix a race causing the explore thread to : hang when tearing down USB transfers at : detach. Would this explain a hang with a wait channel of DMSG on kldunload of the drivers? Warner From imp at bsdimp.com Thu Jan 8 17:27:26 2009 From: imp at bsdimp.com (M. Warner Losh) Date: Thu Jan 8 17:27:36 2009 Subject: PERFORCE change 155750 for review In-Reply-To: <200901071041.n07AfHG9061148@repoman.freebsd.org> References: <200901071041.n07AfHG9061148@repoman.freebsd.org> Message-ID: <20090108.102400.-1877578186.imp@bsdimp.com> In message: <200901071041.n07AfHG9061148@repoman.freebsd.org> Hans Petter Selasky writes: : http://perforce.freebsd.org/chv.cgi?CH=155750 : : Change 155750 by hselasky@hselasky_laptop001 on 2009/01/07 10:40:28 : : : Patch to resolve problems with power mode off. Can you please use more descriptive commits? This doesn't tell us much about what the problems were, or how this fixes them. Warner : Reported by Alexander Best. : : Affected files ... : : .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#39 edit : .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#27 edit : : Differences ... : : ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#39 (text+ko) ==== : : @@ -1699,11 +1699,12 @@ : } : switch (mode) { : case USB_POWER_MODE_OFF: : - /* clear suspend */ : - err = usb2_req_clear_port_feature(udev->parent_hub, : - NULL, udev->port_no, UHF_PORT_SUSPEND); : - if (err) : - break; : + /* get the device unconfigured */ : + err = ugen_set_config(f, USB_UNCONFIG_INDEX); : + if (err) { : + DPRINTFN(0, "Could not unconfigure " : + "device (ignored)\n"); : + } : : /* clear port enable */ : err = usb2_req_clear_port_feature(udev->parent_hub, : : ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#27 (text+ko) ==== : : @@ -1823,7 +1823,8 @@ : usb2_set_power_mode(struct usb2_device *udev, uint8_t power_mode) : { : /* filter input argument */ : - if (power_mode != USB_POWER_MODE_ON) { : + if ((power_mode != USB_POWER_MODE_ON) && : + (power_mode != USB_POWER_MODE_OFF)) { : power_mode = USB_POWER_MODE_SAVE; : } : udev->power_mode = power_mode; /* update copy of power mode */ : From imp at bsdimp.com Thu Jan 8 17:35:49 2009 From: imp at bsdimp.com (M. Warner Losh) Date: Thu Jan 8 17:35:56 2009 Subject: PERFORCE change 155820 for review In-Reply-To: <200901081532.n08FWPDx031982@repoman.freebsd.org> References: <200901081532.n08FWPDx031982@repoman.freebsd.org> Message-ID: <20090108.103306.1683974155.imp@bsdimp.com> In message: <200901081532.n08FWPDx031982@repoman.freebsd.org> Hans Petter Selasky writes: : USB memory usage reduction patch. This likely needs to be more descriptive. : ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#45 (text+ko) ==== : : @@ -1290,19 +1290,23 @@ : * Find an unused device index. In USB Host mode this is the : * same as the device address. : * : - * NOTE: Index 1 is reserved for the Root HUB. : + * Device index zero is not used and device index 1 should : + * always be the root hub. : */ : - for (device_index = USB_ROOT_HUB_ADDR; device_index != : - USB_MAX_DEVICES; device_index++) { : + for (device_index = USB_ROOT_HUB_ADDR;; device_index++) { This looks wrong. ';;' seems wrong to me. While it is acceptable 'C' code, the fact that you have an if statement at the end means that you should write this like: for (device_index = USB_ROOT_HUB_ADDR; bus->devices[device_index] != NULL; device_index++) { : +#if (USB_ROOT_HUB_ADDR > USB_MIN_DEVICES) : +#error "Incorrect device limit." : +#endif This likely is the wrong place for this #ifdef. : + if (device_index == bus->devices_max) { : + device_printf(bus->bdev, : + "No free USB device " : + "index for new device!\n"); : + return (NULL); : + } : if (bus->devices[device_index] == NULL) : break; See above: likely want to merge this statement into the for loop. : ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#28 (text+ko) ==== : : @@ -1520,8 +1520,12 @@ : * The root HUB device is never suspended : * and we simply skip it. : */ : - for (x = USB_ROOT_HUB_ADDR + 1; : - x != USB_MAX_DEVICES; x++) { : + for (x = USB_ROOT_HUB_ADDR + 1;; x++) { : +#if ((USB_ROOT_HUB_ADDR + 1) > USB_MIN_DEVICES) : +#error "Incorrect device limit." : +#endif : + if (x == bus->devices_max) : + break; Same comments as above. This #if is in the wrong place for a compile time assert. The for loop is weirdly constructed. : : udev = bus->devices[x]; : if (udev == NULL) : @@ -1564,8 +1568,12 @@ : : /* Re-loop all the devices to get the actual state */ : : - for (x = USB_ROOT_HUB_ADDR + 1; : - x != USB_MAX_DEVICES; x++) { : + for (x = USB_ROOT_HUB_ADDR + 1;; x++) { : +#if ((USB_ROOT_HUB_ADDR + 1) > USB_MIN_DEVICES) : +#error "Incorrect device limit." : +#endif : + if (x == bus->devices_max) : + break; Same comments as above. This #if is in the wrong place for a compile time assert. The for loop is weirdly constructed. : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#7 (text+ko) ==== : : @@ -35,6 +35,8 @@ : #define USB_EP_MAX (2*16) /* hardcoded */ : #define USB_FIFO_MAX (4 * USB_EP_MAX) : : +#define USB_MIN_DEVICES 2 /* unused + root HUB */ : + : #define USB_MAX_DEVICES USB_DEV_MAX /* including virtual root HUB and : * address zero */ : #define USB_MAX_ENDPOINTS USB_EP_MAX /* 2 directions on 16 endpoints */ : @@ -64,5 +66,7 @@ : #if (USB_EP_MAX < (2*16)) : #error "Misconfigured limits #3" : #endif : - : +#if (USB_MAX_DEVICES < USB_MIN_DEVICES) : +#error "Misconfigured limits #4" : +#endif : #endif /* _USB2_DEFS_H_ */ These #error messages are lame. Please make them less lame and more descriptive. Warner From hselasky at FreeBSD.org Thu Jan 8 18:01:05 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Thu Jan 8 18:01:11 2009 Subject: PERFORCE change 155829 for review Message-ID: <200901081801.n08I1222058936@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155829 Change 155829 by hselasky@hselasky_laptop001 on 2009/01/08 18:00:49 Cody style changes requested by: M. Warner Losh Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#31 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#46 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#29 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#31 (text+ko) ==== @@ -101,8 +101,6 @@ #define USB_HOST_ALIGN 8 /* bytes, must be power of two */ -#define USB_ROOT_HUB_ADDR 1 /* value */ - #define USB_ISOC_TIME_MAX 128 /* ms */ #define USB_FS_ISOC_UFRAME_MAX 4 /* exclusive unit */ ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#46 (text+ko) ==== @@ -1293,18 +1293,15 @@ * Device index zero is not used and device index 1 should * always be the root hub. */ - for (device_index = USB_ROOT_HUB_ADDR;; device_index++) { -#if (USB_ROOT_HUB_ADDR > USB_MIN_DEVICES) -#error "Incorrect device limit." -#endif - if (device_index == bus->devices_max) { - device_printf(bus->bdev, - "No free USB device " - "index for new device!\n"); - return (NULL); - } - if (bus->devices[device_index] == NULL) - break; + for (device_index = USB_ROOT_HUB_ADDR; + (device_index != bus->devices_max) && + (bus->devices[device_index] != NULL); + device_index++) /* nop */; + + if (device_index == bus->devices_max) { + device_printf(bus->bdev, + "No free USB device index for new device!\n"); + return (NULL); } if (depth > 0x10) { ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#29 (text+ko) ==== @@ -1520,12 +1520,8 @@ * The root HUB device is never suspended * and we simply skip it. */ - for (x = USB_ROOT_HUB_ADDR + 1;; x++) { -#if ((USB_ROOT_HUB_ADDR + 1) > USB_MIN_DEVICES) -#error "Incorrect device limit." -#endif - if (x == bus->devices_max) - break; + for (x = USB_ROOT_HUB_ADDR + 1; + x != bus->devices_max; x++) { udev = bus->devices[x]; if (udev == NULL) @@ -1568,12 +1564,8 @@ /* Re-loop all the devices to get the actual state */ - for (x = USB_ROOT_HUB_ADDR + 1;; x++) { -#if ((USB_ROOT_HUB_ADDR + 1) > USB_MIN_DEVICES) -#error "Incorrect device limit." -#endif - if (x == bus->devices_max) - break; + for (x = USB_ROOT_HUB_ADDR + 1; + x != bus->devices_max; x++) { udev = bus->devices[x]; if (udev == NULL) ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#8 (text+ko) ==== @@ -35,6 +35,8 @@ #define USB_EP_MAX (2*16) /* hardcoded */ #define USB_FIFO_MAX (4 * USB_EP_MAX) +#define USB_ROOT_HUB_ADDR 1 /* index */ + #define USB_MIN_DEVICES 2 /* unused + root HUB */ #define USB_MAX_DEVICES USB_DEV_MAX /* including virtual root HUB and @@ -58,15 +60,18 @@ /* sanity checks */ #if (USB_FIFO_MAX < USB_EP_MAX) -#error "Misconfigured limits #1" +#error "There cannot be less FIFOs than USB endpoints." #endif #if (USB_FIFO_MAX & 1) -#error "Misconfigured limits #2" +#error "Number of FIFOs must be odd." #endif #if (USB_EP_MAX < (2*16)) -#error "Misconfigured limits #3" +#error "Number of hardware USB endpoints cannot be less than 32." #endif #if (USB_MAX_DEVICES < USB_MIN_DEVICES) -#error "Misconfigured limits #4" +#error "Minimum number of devices is greater than maximum number of devices." +#endif +#if (USB_ROOT_HUB_ADDR >= USB_MIN_DEVICES) +#error "The root hub address must be less than USB_MIN_DEVICES." #endif #endif /* _USB2_DEFS_H_ */ From hselasky at c2i.net Thu Jan 8 18:08:13 2009 From: hselasky at c2i.net (Hans Petter Selasky) Date: Thu Jan 8 18:08:27 2009 Subject: PERFORCE change 155829 for review In-Reply-To: <200901081801.n08I1222058936@repoman.freebsd.org> References: <200901081801.n08I1222058936@repoman.freebsd.org> Message-ID: <200901081910.33615.hselasky@c2i.net> On Thursday 08 January 2009, Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=155829 > > Change 155829 by hselasky@hselasky_laptop001 on 2009/01/08 18:00:49 > > > Cody style changes requested by: > M. Warner Losh > > Affected files ... > I think I need to buy a new USB keyboard soon :-) s/Cody/Code Are these changes Ok Warner? --HPS From hselasky at freebsd.org Thu Jan 8 18:36:44 2009 From: hselasky at freebsd.org (Hans Petter Selasky) Date: Thu Jan 8 18:37:14 2009 Subject: PERFORCE change 155755 for review In-Reply-To: <20090108.102453.-1749728154.imp@bsdimp.com> References: <200901071327.n07DRFt5091936@repoman.freebsd.org> <20090108.102453.-1749728154.imp@bsdimp.com> Message-ID: <200901081838.55030.hselasky@freebsd.org> On Thursday 08 January 2009, M. Warner Losh wrote: > In message: <200901071327.n07DRFt5091936@repoman.freebsd.org> > > Hans Petter Selasky writes: > : Fix a race causing the explore thread to > : hang when tearing down USB transfers at > : detach. > > Would this explain a hang with a wait channel of DMSG on kldunload of > the drivers? > > Warner Yes, If "ps auxw| grep DRAIN" shows you something. Try out -current next week if you don't have access to P4. --HPS From hselasky at freebsd.org Thu Jan 8 18:37:07 2009 From: hselasky at freebsd.org (Hans Petter Selasky) Date: Thu Jan 8 18:37:26 2009 Subject: PERFORCE change 155748 for review In-Reply-To: <20090108.102311.1541746851.imp@bsdimp.com> References: <200901071009.n07A9jrs056953@repoman.freebsd.org> <20090108.102311.1541746851.imp@bsdimp.com> Message-ID: <200901081839.27124.hselasky@freebsd.org> On Thursday 08 January 2009, M. Warner Losh wrote: > In message: <200901071009.n07A9jrs056953@repoman.freebsd.org> > > Hans Petter Selasky writes: > : http://perforce.freebsd.org/chv.cgi?CH=155748 > : > : Change 155748 by hselasky@hselasky_laptop001 on 2009/01/07 10:09:35 > : > : > : Umass module quirk from Alexander Best > : to support Meizu Electronics MiniPlayer. > : > : Affected files ... > : > : .. //depot/projects/usb/src/sys/dev/usb/usbdevs#35 edit > : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 edit > : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 edit > : .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 edit > : > : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 > : (text+ko) ==== ==== > : //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 > : (text+ko) ==== > > Why are these generated files committed to the tree? We did a lot of > work to make usbdevs generated files not need to be committed to the > tree and this breaks that... > > Warner Because they are not automatically generated any more. --HPS From hselasky at freebsd.org Thu Jan 8 18:38:05 2009 From: hselasky at freebsd.org (Hans Petter Selasky) Date: Thu Jan 8 18:38:11 2009 Subject: PERFORCE change 155750 for review In-Reply-To: <20090108.102400.-1877578186.imp@bsdimp.com> References: <200901071041.n07AfHG9061148@repoman.freebsd.org> <20090108.102400.-1877578186.imp@bsdimp.com> Message-ID: <200901081840.24219.hselasky@freebsd.org> On Thursday 08 January 2009, M. Warner Losh wrote: > In message: <200901071041.n07AfHG9061148@repoman.freebsd.org> > > Hans Petter Selasky writes: > : http://perforce.freebsd.org/chv.cgi?CH=155750 > : > : Change 155750 by hselasky@hselasky_laptop001 on 2009/01/07 10:40:28 > : > : > : Patch to resolve problems with power mode off. > > Can you please use more descriptive commits? This doesn't tell us > much about what the problems were, or how this fixes them. > I will try to think about people looking for patches reading the commit logs. --HPS From remko at elvandar.org Thu Jan 8 19:00:04 2009 From: remko at elvandar.org (Remko Lodder) Date: Thu Jan 8 19:00:10 2009 Subject: PERFORCE change 155748 for review In-Reply-To: <200901081839.27124.hselasky@freebsd.org> References: <200901071009.n07A9jrs056953@repoman.freebsd.org> <20090108.102311.1541746851.imp@bsdimp.com> <200901081839.27124.hselasky@freebsd.org> Message-ID: <61E32407-BF64-47D0-89E9-EB0B9EB22B91@elvandar.org> On Jan 8, 2009, at 6:39 PM, Hans Petter Selasky wrote: > On Thursday 08 January 2009, M. Warner Losh wrote: >> In message: <200901071009.n07A9jrs056953@repoman.freebsd.org> >> >> Hans Petter Selasky writes: >> : http://perforce.freebsd.org/chv.cgi?CH=155748 >> : >> : Change 155748 by hselasky@hselasky_laptop001 on 2009/01/07 10:09:35 >> : >> : >> : Umass module quirk from Alexander Best >> : to support Meizu Electronics MiniPlayer. >> : >> : Affected files ... >> : >> : .. //depot/projects/usb/src/sys/dev/usb/usbdevs#35 edit >> : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 >> edit >> : .. //depot/projects/usb/src/sys/dev/usb2/include/ >> usb2_devtable.h#21 edit >> : .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 edit >> : >> : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 >> : (text+ko) ==== ==== >> : //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 >> : (text+ko) ==== >> >> Why are these generated files committed to the tree? We did a lot of >> work to make usbdevs generated files not need to be committed to the >> tree and this breaks that... >> >> Warner > > Because they are not automatically generated any more. > > --HPS Hmm, I liked the idea of only needing to do something marginally to add something. If files are no longer generated automatically and I need to do more, I'll look for other low hanging fruit. In short: can you restore automatic regenerating behaviour? -- /"\ Best regards, | remko@FreeBSD.org \ / Remko Lodder | remko@EFnet X http://www.evilcoder.org/ | / \ ASCII Ribbon Campaign | Against HTML Mail and News From hselasky at freebsd.org Thu Jan 8 19:06:41 2009 From: hselasky at freebsd.org (Hans Petter Selasky) Date: Thu Jan 8 19:06:46 2009 Subject: PERFORCE change 155820 for review In-Reply-To: <20090108.103306.1683974155.imp@bsdimp.com> References: <200901081532.n08FWPDx031982@repoman.freebsd.org> <20090108.103306.1683974155.imp@bsdimp.com> Message-ID: <200901081908.57867.hselasky@freebsd.org> On Thursday 08 January 2009, M. Warner Losh wrote: > In message: <200901081532.n08FWPDx031982@repoman.freebsd.org> > > Hans Petter Selasky writes: > : USB memory usage reduction patch. > > This likely needs to be more descriptive. Hi, The change is about making the bus->devices array size dynamic. For embedded purpuse you can reduce the array size to save memory. Also in some cases like USB Device Mode you don't use more than 3 entries. Even though the wasted size is not much, 4*124 bytes, it needs to go away. --HPS From hselasky at freebsd.org Thu Jan 8 19:08:14 2009 From: hselasky at freebsd.org (Hans Petter Selasky) Date: Thu Jan 8 19:08:21 2009 Subject: PERFORCE change 155748 for review In-Reply-To: <61E32407-BF64-47D0-89E9-EB0B9EB22B91@elvandar.org> References: <200901071009.n07A9jrs056953@repoman.freebsd.org> <200901081839.27124.hselasky@freebsd.org> <61E32407-BF64-47D0-89E9-EB0B9EB22B91@elvandar.org> Message-ID: <200901082010.33577.hselasky@freebsd.org> On Thursday 08 January 2009, Remko Lodder wrote: > On Jan 8, 2009, at 6:39 PM, Hans Petter Selasky wrote: > > On Thursday 08 January 2009, M. Warner Losh wrote: > >> In message: <200901071009.n07A9jrs056953@repoman.freebsd.org> > >> > >> Hans Petter Selasky writes: > >> : http://perforce.freebsd.org/chv.cgi?CH=155748 > >> : > >> : Change 155748 by hselasky@hselasky_laptop001 on 2009/01/07 10:09:35 > >> : > >> : > >> : Umass module quirk from Alexander Best > >> : to support Meizu Electronics MiniPlayer. > >> : > >> : Affected files ... > >> : > >> : .. //depot/projects/usb/src/sys/dev/usb/usbdevs#35 edit > >> : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 > >> > >> edit > >> > >> : .. //depot/projects/usb/src/sys/dev/usb2/include/ > >> > >> usb2_devtable.h#21 edit > >> > >> : .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 edit > >> : > >> : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 > >> : (text+ko) ==== ==== > >> : //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 > >> : (text+ko) ==== > >> > >> Why are these generated files committed to the tree? We did a lot of > >> work to make usbdevs generated files not need to be committed to the > >> tree and this breaks that... > >> > >> Warner > > > > Because they are not automatically generated any more. > > > > --HPS > > Hmm, I liked the idea of only needing to do something marginally to > add something. If files are no longer generated automatically and I > need to do more, I'll look for other low hanging fruit. > > In short: can you restore automatic regenerating behaviour? Hi Remko, Everything is possible. How would you explain the benefit of the +19Mbyte of data resulting from this autogeneration when building the modules ? 126035 Jan 7 11:12 usb2_devid.h 197224 Jan 7 11:12 usb2_devtable.h 197+126 ans = 323 ans * 60 ans = 19380 --HPS From nwhitehorn at freebsd.org Thu Jan 8 19:10:03 2009 From: nwhitehorn at freebsd.org (Nathan Whitehorn) Date: Thu Jan 8 19:10:34 2009 Subject: PERFORCE change 155829 for review In-Reply-To: <200901081910.33615.hselasky@c2i.net> References: <200901081801.n08I1222058936@repoman.freebsd.org> <200901081910.33615.hselasky@c2i.net> Message-ID: <49664206.9090908@freebsd.org> Hans Petter Selasky wrote: > On Thursday 08 January 2009, Hans Petter Selasky wrote: >> http://perforce.freebsd.org/chv.cgi?CH=155829 >> >> Change 155829 by hselasky@hselasky_laptop001 on 2009/01/08 18:00:49 >> >> >> Cody style changes requested by: >> M. Warner Losh >> >> Affected files ... >> > > I think I need to buy a new USB keyboard soon :-) > > s/Cody/Code > > Are these changes Ok Warner? May I suggest a Sun Type 7? It would be nice if they worked reliably with the new stack :) -Nathan From ed at 80386.nl Thu Jan 8 19:13:39 2009 From: ed at 80386.nl (Ed Schouten) Date: Thu Jan 8 19:13:52 2009 Subject: PERFORCE change 155748 for review In-Reply-To: <200901082010.33577.hselasky@freebsd.org> References: <200901071009.n07A9jrs056953@repoman.freebsd.org> <200901081839.27124.hselasky@freebsd.org> <61E32407-BF64-47D0-89E9-EB0B9EB22B91@elvandar.org> <200901082010.33577.hselasky@freebsd.org> Message-ID: <20090108191335.GT45775@hoeg.nl> * Hans Petter Selasky wrote: > Everything is possible. > > How would you explain the benefit of the +19Mbyte of data resulting from this > autogeneration when building the modules ? I think we always had a preference to generate stuff on demand. It's a lot easier to maintain. -- Ed Schouten WWW: http://80386.nl/ -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 195 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/p4-projects/attachments/20090108/90327a33/attachment.pgp From hselasky at freebsd.org Thu Jan 8 19:23:00 2009 From: hselasky at freebsd.org (Hans Petter Selasky) Date: Thu Jan 8 19:23:07 2009 Subject: PERFORCE change 155748 for review In-Reply-To: <20090108191335.GT45775@hoeg.nl> References: <200901071009.n07A9jrs056953@repoman.freebsd.org> <200901082010.33577.hselasky@freebsd.org> <20090108191335.GT45775@hoeg.nl> Message-ID: <200901082025.20711.hselasky@freebsd.org> On Thursday 08 January 2009, Ed Schouten wrote: > * Hans Petter Selasky wrote: > > Everything is possible. > > > > How would you explain the benefit of the +19Mbyte of data resulting from > > this autogeneration when building the modules ? > > I think we always had a preference to generate stuff on demand. It's a > lot easier to maintain. Hi, I can understand that, but how about only generating the file once when you know it will be needed 60 times in a row? This also applies to other autogenerated files. It would speed up the module build alot I think. cd src/sys/modules/usb2/serial_3g make all clean time make all 0:01.58 rm u3g2.o time make all 0:00.96 You see it is around 50% slower to build a module which needs to generate N header files first, than if those header files were cached somewhere! Multiply the time you save by 60, and we are talking about a significant amount of time! --HPS From ed at 80386.nl Thu Jan 8 19:27:54 2009 From: ed at 80386.nl (Ed Schouten) Date: Thu Jan 8 19:27:59 2009 Subject: PERFORCE change 155748 for review In-Reply-To: <200901082025.20711.hselasky@freebsd.org> References: <200901071009.n07A9jrs056953@repoman.freebsd.org> <200901082010.33577.hselasky@freebsd.org> <20090108191335.GT45775@hoeg.nl> <200901082025.20711.hselasky@freebsd.org> Message-ID: <20090108192751.GU45775@hoeg.nl> * Hans Petter Selasky wrote: > I can understand that, but how about only generating the file once when you > know it will be needed 60 times in a row? This also applies to other > autogenerated files. It would speed up the module build alot I think. We're doing this with vnode_if.src as well and nobody has ever complained about this. I think moving to a faster C compiler (LLVM, anyone?) would cut down compile times even more than eliminating some calls to awk. -- Ed Schouten WWW: http://80386.nl/ -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 195 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/p4-projects/attachments/20090108/6251dfa5/attachment.pgp From hselasky at FreeBSD.org Thu Jan 8 21:06:11 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Thu Jan 8 21:06:19 2009 Subject: PERFORCE change 155834 for review Message-ID: <200901082106.n08L6ANa093922@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155834 Change 155834 by hselasky@hselasky_laptop001 on 2009/01/08 21:05:55 Factor out roothub process into the USB bus structure for all USB controller drivers. Essentially I am trying to save some processes on the root HUB and get away from the config thread pradigm. There will be a follow up commit where the root HUB control and interrupt callback will be moved over to run from the roothub process. Total win: 3 processes become 1 for every USB controller. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#20 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#7 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#26 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#12 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#19 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#21 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#11 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#23 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#8 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#15 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#20 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#17 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#11 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#22 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#8 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_pci.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#18 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#7 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#20 (text+ko) ==== @@ -50,14 +50,11 @@ #include #define USB_DEBUG_VAR at91dcidebug -#define usb2_config_td_cc at91dci_config_copy -#define usb2_config_td_softc at91dci_softc #include #include #include #include -#include #include #include #include @@ -106,7 +103,6 @@ static usb2_sw_transfer_func_t at91dci_root_intr_done; static usb2_sw_transfer_func_t at91dci_root_ctrl_done; -static usb2_config_td_command_t at91dci_root_ctrl_task; /* * NOTE: Some of the bits in the CSR register have inverse meaning so @@ -1817,15 +1813,13 @@ sc->sc_root_ctrl.xfer = xfer; - usb2_config_td_queue_command( - &sc->sc_config_td, NULL, &at91dci_root_ctrl_task, 0, 0); + usb2_bus_roothub_exec(xfer->udev->bus); } static void -at91dci_root_ctrl_task(struct at91dci_softc *sc, - struct at91dci_config_copy *cc, uint16_t refcount) +at91dci_root_ctrl_task(struct usb2_bus *bus) { - at91dci_root_ctrl_poll(sc); + at91dci_root_ctrl_poll(AT9100_DCI_BUS2SC(bus)); } static void @@ -2478,4 +2472,5 @@ .set_stall = &at91dci_set_stall, .clear_stall = &at91dci_clear_stall, .vbus_interrupt = &at91dci_vbus_interrupt, + .roothub_exec = &at91dci_root_ctrl_task, }; ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#7 (text+ko) ==== @@ -206,7 +206,6 @@ LIST_HEAD(, usb2_xfer) sc_interrupt_list_head; struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; - struct usb2_config_td sc_config_td; struct usb2_device *sc_devices[AT91_MAX_DEVICES]; struct resource *sc_io_res; ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#16 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -208,12 +207,6 @@ } device_set_ivars(sc->sc_dci.sc_bus.bdev, &sc->sc_dci.sc_bus); - err = usb2_config_td_setup(&sc->sc_dci.sc_config_td, sc, - &sc->sc_dci.sc_bus.bus_mtx, NULL, 0, 4); - if (err) { - device_printf(dev, "could not setup config thread!\n"); - goto error; - } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl); @@ -308,8 +301,6 @@ sc->sc_dci.sc_io_res); sc->sc_dci.sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_dci.sc_config_td); - usb2_bus_mem_free_all(&sc->sc_dci.sc_bus, NULL); /* disable clocks */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#26 (text+ko) ==== @@ -52,14 +52,11 @@ #include #define USB_DEBUG_VAR ehcidebug -#define usb2_config_td_cc ehci_config_copy -#define usb2_config_td_softc ehci_softc #include #include #include #include -#include #include #include #include @@ -99,7 +96,6 @@ extern struct usb2_pipe_methods ehci_root_ctrl_methods; extern struct usb2_pipe_methods ehci_root_intr_methods; -static usb2_config_td_command_t ehci_root_ctrl_task; static void ehci_do_poll(struct usb2_bus *bus); static void ehci_root_ctrl_poll(ehci_softc_t *sc); static void ehci_device_done(struct usb2_xfer *xfer, usb2_error_t error); @@ -3031,15 +3027,13 @@ sc->sc_root_ctrl.xfer = xfer; - usb2_config_td_queue_command - (&sc->sc_config_td, NULL, &ehci_root_ctrl_task, 0, 0); + usb2_bus_roothub_exec(xfer->udev->bus); } static void -ehci_root_ctrl_task(ehci_softc_t *sc, - struct usb2_config_td_cc *cc, uint16_t refcount) +ehci_root_ctrl_task(struct usb2_bus *bus) { - ehci_root_ctrl_poll(sc); + ehci_root_ctrl_poll(EHCI_BUS2SC(bus)); } static void @@ -3969,4 +3963,5 @@ .device_resume = ehci_device_resume, .device_suspend = ehci_device_suspend, .set_hw_power = ehci_set_hw_power, + .roothub_exec = ehci_root_ctrl_task, }; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#12 (text+ko) ==== @@ -455,7 +455,6 @@ typedef struct ehci_softc { struct ehci_hw_softc sc_hw; struct usb2_bus sc_bus; /* base device */ - struct usb2_config_td sc_config_td; struct usb2_callout sc_tmo_pcd; union ehci_hub_desc sc_hub_desc; struct usb2_sw_transfer sc_root_ctrl; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#19 (text+ko) ==== @@ -59,7 +59,6 @@ #include #include #include -#include #include #include @@ -341,12 +340,6 @@ sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self)); } - err = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_bus.bus_mtx, - NULL, 0, 4); - if (err) { - device_printf(self, "could not setup config thread!\n"); - goto error; - } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)(void *)ehci_interrupt, sc, &sc->sc_intr_hdl); @@ -381,8 +374,6 @@ ehci_softc_t *sc = device_get_softc(self); device_t bdev; - usb2_config_td_drain(&sc->sc_config_td); - if (sc->sc_bus.bdev) { bdev = sc->sc_bus.bdev; device_detach(bdev); @@ -422,8 +413,6 @@ sc->sc_io_res); sc->sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_config_td); - usb2_bus_mem_free_all(&sc->sc_bus, &ehci_iterate_hw_softc); return (0); ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#21 (text+ko) ==== @@ -42,14 +42,11 @@ #include #define USB_DEBUG_VAR musbotgdebug -#define usb2_config_td_cc musbotg_config_copy -#define usb2_config_td_softc musbotg_softc #include #include #include #include -#include #include #include #include @@ -101,7 +98,6 @@ static usb2_sw_transfer_func_t musbotg_root_intr_done; static usb2_sw_transfer_func_t musbotg_root_ctrl_done; -static usb2_config_td_command_t musbotg_root_ctrl_task; /* * Here is a configuration that the chip supports. @@ -2222,15 +2218,13 @@ sc->sc_root_ctrl.xfer = xfer; - usb2_config_td_queue_command( - &sc->sc_config_td, NULL, &musbotg_root_ctrl_task, 0, 0); + usb2_bus_roothub_exec(xfer->udev->bus); } static void -musbotg_root_ctrl_task(struct musbotg_softc *sc, - struct musbotg_config_copy *cc, uint16_t refcount) +musbotg_root_ctrl_task(struct usb2_bus *bus) { - musbotg_root_ctrl_poll(sc); + musbotg_root_ctrl_poll(MUSBOTG_BUS2SC(bus)); } static void @@ -2885,4 +2879,5 @@ .set_stall = &musbotg_set_stall, .clear_stall = &musbotg_clear_stall, .vbus_interrupt = &musbotg_vbus_interrupt, + .roothub_exec = &musbotg_root_ctrl_task, }; ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#11 (text+ko) ==== @@ -365,7 +365,6 @@ union musbotg_hub_temp sc_hub_temp; struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; - struct usb2_config_td sc_config_td; struct usb2_hw_ep_profile sc_hw_ep_profile[16]; struct usb2_device *sc_devices[MUSB2_MAX_DEVICES]; ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#13 (text+ko) ==== @@ -31,7 +31,6 @@ #include #include #include -#include #include #include @@ -136,12 +135,6 @@ } device_set_ivars(sc->sc_otg.sc_bus.bdev, &sc->sc_otg.sc_bus); - err = usb2_config_td_setup(&sc->sc_otg.sc_config_td, sc, - &sc->sc_otg.sc_bus.bus_mtx, NULL, 0, 4); - if (err) { - device_printf(dev, "could not setup config thread!\n"); - goto error; - } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_otg.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)musbotg_interrupt, sc, &sc->sc_otg.sc_intr_hdl); @@ -207,8 +200,6 @@ sc->sc_otg.sc_io_res); sc->sc_otg.sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_otg.sc_config_td); - usb2_bus_mem_free_all(&sc->sc_otg.sc_bus, NULL); return (0); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#23 (text+ko) ==== @@ -41,14 +41,11 @@ #include #define USB_DEBUG_VAR ohcidebug -#define usb2_config_td_cc ohci_config_copy -#define usb2_config_td_softc ohci_softc #include #include #include #include -#include #include #include #include @@ -99,7 +96,6 @@ extern struct usb2_pipe_methods ohci_root_ctrl_methods; extern struct usb2_pipe_methods ohci_root_intr_methods; -static usb2_config_td_command_t ohci_root_ctrl_task; static void ohci_root_ctrl_poll(struct ohci_softc *sc); static void ohci_do_poll(struct usb2_bus *bus); static void ohci_device_done(struct usb2_xfer *xfer, usb2_error_t error); @@ -2135,15 +2131,13 @@ sc->sc_root_ctrl.xfer = xfer; - usb2_config_td_queue_command - (&sc->sc_config_td, NULL, &ohci_root_ctrl_task, 0, 0); + usb2_bus_roothub_exec(xfer->udev->bus); } static void -ohci_root_ctrl_task(struct ohci_softc *sc, - struct ohci_config_copy *cc, uint16_t refcount) +ohci_root_ctrl_task(struct usb2_bus *bus) { - ohci_root_ctrl_poll(sc); + ohci_root_ctrl_poll(OHCI_BUS2SC(bus)); } static void @@ -2864,4 +2858,5 @@ .device_resume = ohci_device_resume, .device_suspend = ohci_device_suspend, .set_hw_power = ohci_set_hw_power, + .roothub_exec = ohci_root_ctrl_task, }; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#8 (text+ko) ==== @@ -320,7 +320,6 @@ typedef struct ohci_softc { struct ohci_hw_softc sc_hw; struct usb2_bus sc_bus; /* base device */ - struct usb2_config_td sc_config_td; struct usb2_callout sc_tmo_rhsc; union ohci_hub_desc sc_hub_desc; struct usb2_sw_transfer sc_root_ctrl; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#15 (text) ==== @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -114,12 +113,6 @@ strlcpy(sc->sc_ohci.sc_vendor, "Atmel", sizeof(sc->sc_ohci.sc_vendor)); - err = usb2_config_td_setup(&sc->sc_ohci.sc_config_td, sc, - &sc->sc_ohci.sc_bus.bus_mtx, NULL, 0, 4); - if (err) { - device_printf(dev, "could not setup config thread!\n"); - goto error; - } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_ohci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl); @@ -203,8 +196,6 @@ sc->sc_ohci.sc_io_res); sc->sc_ohci.sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_ohci.sc_config_td); - usb2_bus_mem_free_all(&sc->sc_ohci.sc_bus, &ohci_iterate_hw_softc); return (0); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#16 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include -#include #include #include @@ -291,12 +290,6 @@ sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self)); } - err = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_bus.bus_mtx, - NULL, 0, 4); - if (err) { - device_printf(self, "could not setup config thread!\n"); - goto error; - } /* sc->sc_bus.usbrev; set by ohci_init() */ #if (__FreeBSD_version >= 700031) @@ -332,8 +325,6 @@ ohci_softc_t *sc = device_get_softc(self); device_t bdev; - usb2_config_td_drain(&sc->sc_config_td); - if (sc->sc_bus.bdev) { bdev = sc->sc_bus.bdev; device_detach(bdev); @@ -368,8 +359,6 @@ sc->sc_io_res); sc->sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_config_td); - usb2_bus_mem_free_all(&sc->sc_bus, &ohci_iterate_hw_softc); return (0); ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#20 (text+ko) ==== @@ -44,14 +44,11 @@ #include #define USB_DEBUG_VAR uhcidebug -#define usb2_config_td_cc uhci_config_copy -#define usb2_config_td_softc uhci_softc #include #include #include #include -#include #include #include #include @@ -138,7 +135,6 @@ extern struct usb2_pipe_methods uhci_root_ctrl_methods; extern struct usb2_pipe_methods uhci_root_intr_methods; -static usb2_config_td_command_t uhci_root_ctrl_task; static void uhci_root_ctrl_poll(struct uhci_softc *); static void uhci_do_poll(struct usb2_bus *); static void uhci_device_done(struct usb2_xfer *, usb2_error_t); @@ -2502,15 +2498,13 @@ sc->sc_root_ctrl.xfer = xfer; - usb2_config_td_queue_command - (&sc->sc_config_td, NULL, &uhci_root_ctrl_task, 0, 0); + usb2_bus_roothub_exec(xfer->udev->bus); } static void -uhci_root_ctrl_task(struct uhci_softc *sc, - struct uhci_config_copy *cc, uint16_t refcount) +uhci_root_ctrl_task(struct usb2_bus *bus) { - uhci_root_ctrl_poll(sc); + uhci_root_ctrl_poll(UHCI_BUS2SC(bus)); } static void @@ -3361,4 +3355,5 @@ .device_resume = uhci_device_resume, .device_suspend = uhci_device_suspend, .set_hw_power = uhci_set_hw_power, + .roothub_exec = uhci_root_ctrl_task, }; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#10 (text+ko) ==== @@ -270,7 +270,6 @@ typedef struct uhci_softc { struct uhci_hw_softc sc_hw; struct usb2_bus sc_bus; /* base device */ - struct usb2_config_td sc_config_td; union uhci_hub_desc sc_hub_desc; struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#17 (text+ko) ==== @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include @@ -325,12 +324,6 @@ break; } - err = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_bus.bus_mtx, - NULL, 0, 4); - if (err) { - device_printf(self, "could not setup config thread!\n"); - goto error; - } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)(void *)uhci_interrupt, sc, &sc->sc_intr_hdl); @@ -379,8 +372,6 @@ uhci_softc_t *sc = device_get_softc(self); device_t bdev; - usb2_config_td_drain(&sc->sc_config_td); - if (sc->sc_bus.bdev) { bdev = sc->sc_bus.bdev; device_detach(bdev); @@ -422,8 +413,6 @@ sc->sc_io_res); sc->sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_config_td); - usb2_bus_mem_free_all(&sc->sc_bus, &uhci_iterate_hw_softc); return (0); ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#11 (text+ko) ==== @@ -52,9 +52,11 @@ struct usb2_bus_stat stats_err; struct usb2_bus_stat stats_ok; struct usb2_process explore_proc; + struct usb2_process roothub_proc; struct usb2_bus_msg explore_msg[2]; struct usb2_bus_msg detach_msg[2]; struct usb2_bus_msg attach_msg[2]; + struct usb2_bus_msg roothub_msg[2]; /* * This mutex protects the USB hardware: */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#22 (text+ko) ==== @@ -59,6 +59,7 @@ static void usb2_bus_mem_free_all_cb(struct usb2_bus *, struct usb2_page_cache *, struct usb2_page *, uint32_t, uint32_t); +static void usb2_bus_roothub(struct usb2_proc_msg *pm); /* static variables */ @@ -165,6 +166,10 @@ USB_BUS_UNLOCK(bus); + /* Get rid of USB roothub process */ + + usb2_proc_unsetup(&bus->roothub_proc); + /* Get rid of USB explore process */ usb2_proc_unsetup(&bus->explore_proc); @@ -381,10 +386,20 @@ bus->attach_msg[1].hdr.pm_callback = &usb2_bus_attach; bus->attach_msg[1].bus = bus; - /* Create a new USB process */ - if (usb2_proc_setup(&bus->explore_proc, + bus->roothub_msg[0].hdr.pm_callback = &usb2_bus_roothub; + bus->roothub_msg[0].bus = bus; + bus->roothub_msg[1].hdr.pm_callback = &usb2_bus_roothub; + bus->roothub_msg[1].bus = bus; + + /* Create USB explore and roothub processes */ + if (usb2_proc_setup(&bus->roothub_proc, + &bus->bus_mtx, USB_PRI_HIGH)) { + printf("WARNING: Creation of USB roothub " + "process failed.\n"); + } else if (usb2_proc_setup(&bus->explore_proc, &bus->bus_mtx, USB_PRI_MED)) { - printf("WARNING: Creation of USB explore process failed.\n"); + printf("WARNING: Creation of USB explore " + "process failed.\n"); } else { /* Get final attach going */ USB_BUS_LOCK(bus); @@ -543,3 +558,38 @@ mtx_destroy(&bus->bus_mtx); } + +/*------------------------------------------------------------------------* + * usb2_bus_roothub + * + * This function is used to execute roothub control requests on the + * roothub and is called from the roothub process. + *------------------------------------------------------------------------*/ +static void +usb2_bus_roothub(struct usb2_proc_msg *pm) +{ + struct usb2_bus *bus; + + bus = ((struct usb2_bus_msg *)pm)->bus; + + USB_BUS_LOCK_ASSERT(bus, MA_OWNED); + + (bus->methods->roothub_exec) (bus); +} + +/*------------------------------------------------------------------------* + * usb2_bus_roothub_exec + * + * This function is used to schedule the "roothub_done" bus callback + * method. The bus lock must be locked when calling this function. + *------------------------------------------------------------------------*/ +void +usb2_bus_roothub_exec(struct usb2_bus *bus) +{ + USB_BUS_LOCK_ASSERT(bus, MA_OWNED); + + if (usb2_proc_msignal(&bus->roothub_proc, + &bus->roothub_msg[0], &bus->roothub_msg[1])) { + /* ignore */ + } +} ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#8 (text+ko) ==== @@ -94,6 +94,10 @@ /* USB Device mode only - Optional */ void (*vbus_interrupt) (struct usb2_bus *, uint8_t is_on); + + /* USB Device and Host mode - Optional */ + + void (*roothub_exec) (struct usb2_bus *); }; /* @@ -186,6 +190,7 @@ void usb2_bus_mem_flush_all(struct usb2_bus *bus, usb2_bus_mem_cb_t *cb); uint8_t usb2_bus_mem_alloc_all(struct usb2_bus *bus, bus_dma_tag_t dmat, usb2_bus_mem_cb_t *cb); void usb2_bus_mem_free_all(struct usb2_bus *bus, usb2_bus_mem_cb_t *cb); +void usb2_bus_roothub_exec(struct usb2_bus *bus); uint16_t usb2_isoc_time_expand(struct usb2_bus *bus, uint16_t isoc_time_curr); uint16_t usb2_fs_isoc_schedule_isoc_time_expand(struct usb2_device *udev, struct usb2_fs_isoc_schedule **pp_start, struct usb2_fs_isoc_schedule **pp_end, uint16_t isoc_time); uint8_t usb2_fs_isoc_schedule_alloc(struct usb2_fs_isoc_schedule *fss, uint8_t *pstart, uint16_t len); ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_pci.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#18 (text+ko) ==== @@ -39,14 +39,11 @@ #include #define USB_DEBUG_VAR uss820dcidebug -#define usb2_config_td_cc uss820dci_config_copy -#define usb2_config_td_softc uss820dci_softc #include #include #include #include -#include #include #include #include @@ -98,7 +95,6 @@ static usb2_sw_transfer_func_t uss820dci_root_intr_done; static usb2_sw_transfer_func_t uss820dci_root_ctrl_done; -static usb2_config_td_command_t uss820dci_root_ctrl_task; /* * Here is a list of what the USS820D chip can support. The main @@ -1832,15 +1828,13 @@ sc->sc_root_ctrl.xfer = xfer; - usb2_config_td_queue_command( - &sc->sc_config_td, NULL, &uss820dci_root_ctrl_task, 0, 0); + usb2_bus_roothub_exec(xfer->udev->bus); } static void -uss820dci_root_ctrl_task(struct uss820dci_softc *sc, - struct uss820dci_config_copy *cc, uint16_t refcount) +uss820dci_root_ctrl_task(struct usb2_bus *bus) { - uss820dci_root_ctrl_poll(sc); + uss820dci_root_ctrl_poll(USS820_DCI_BUS2SC(bus)); } static void @@ -2496,4 +2490,5 @@ .get_hw_ep_profile = &uss820dci_get_hw_ep_profile, .set_stall = &uss820dci_set_stall, .clear_stall = &uss820dci_clear_stall, + .roothub_exec = &uss820dci_root_ctrl_task, }; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#7 (text+ko) ==== @@ -347,7 +347,6 @@ LIST_HEAD(, usb2_xfer) sc_interrupt_list_head; struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; - struct usb2_config_td sc_config_td; struct usb2_device *sc_devices[USS820_MAX_DEVICES]; struct resource *sc_io_res; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#8 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -175,12 +174,6 @@ } device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus); - err = usb2_config_td_setup(&sc->sc_config_td, sc, - &sc->sc_bus.bus_mtx, NULL, 0, 4); - if (err) { - device_printf(dev, "could not setup config thread!\n"); - goto error; - } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)uss820dci_interrupt, sc, &sc->sc_intr_hdl); @@ -244,8 +237,6 @@ sc->sc_io_res); sc->sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_config_td); - usb2_bus_mem_free_all(&sc->sc_bus, NULL); return (0); From trasz at FreeBSD.org Thu Jan 8 21:55:01 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Thu Jan 8 21:55:10 2009 Subject: PERFORCE change 155836 for review Message-ID: <200901082154.n08Lsxb9097788@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=155836 Change 155836 by trasz@trasz_victim7 on 2009/01/08 21:54:31 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/test/test.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/TODO#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/config.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/csup.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/detailer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/diff.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/diff.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/fattr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/fattr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/keyword.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/keyword.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/lex.rcs.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/lister.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/misc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/misc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/mux.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/proto.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/proto.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsfile.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsfile.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsparse.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsparse.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcstokenizer.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcstokenizer.l#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rsyncfile.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rsyncfile.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/status.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/stream.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/stream.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/updater.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/AUTHORS#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/COPYING#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/ChangeLog#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/FREEBSD-upgrade#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/INSTALL#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/LEGAL.NOTICE#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/MAINT#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/animation#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/apple#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/archive#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/audio#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/c64#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/cddb#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/clarion#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/commands#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/compress#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/console#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/cracklib#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/database#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/diff#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/dump#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/elf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/erlang#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/flash#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/frame#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/freebsd#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/games#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/gimp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/gnome-keyring#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/gnumeric#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/graphviz#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/hp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/iff#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/images#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/inform#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/java#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/kde#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/lex#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/linux#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/llvm#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/lua#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/luks#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mathcad#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mercurial#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mozilla#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mup#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/netware#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/ole2compounddocs#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/os2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/palm#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/perl#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/pgp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/pkgadd#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/printer#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/psion#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/revision#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/riff#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/rpm#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/rtf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/ruby#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/scientific#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/securitycerts#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sketch#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/softquad#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/spectrum#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/tex#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/troff#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/unicode#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/uuencode#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/warc#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/weak#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/windows#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/xilinx#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Makefile.std#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/NEWS#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/PORTING#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/TODO#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/acinclude.m4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/aclocal.m4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/apprentice.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/ascmagic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/asprintf.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/compile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/compress.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/config.guess#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/config.h.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/config.sub#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/configure#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/configure.ac#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/configure.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/elfclass.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/file.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/file.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/file.man#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/fsmagic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/funcs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/getopt_long.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/is_tar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/libmagic.man#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.man#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.mime#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic2mime#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/mkinstalldirs#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/mygetopt.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/names.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/patchlevel.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/print.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/readelf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/readelf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/softmagic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/Makefile.am#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/Makefile.in#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/README#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/gedcom.magic#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/gedcom.result#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/gedcom.testfile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/test.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/vasprintf.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/lukemftpd/src/extern.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/lukemftpd/src/ftpcmd.y#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/lukemftpd/src/ftpd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/s2_clnt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/s2_srvr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/s3_clnt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/ssltest.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/getaddrinfo.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/wsetup.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/jail.2#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/socket.2#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libelf/README#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libmagic/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/bootp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_desc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/math.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/virstor/gvirstor.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifieee80211.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/md5/md5.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ping/ping.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ae.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/cd.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/cpuctl.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_hda.4#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_ich.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man7/build.7#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/dev_clone.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/domain.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/insmntque.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/bsd-family-tree#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.own.mk#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/identcpu.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/common.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/discovery/db78xxx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/discovery/discovery.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/kirkwood.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mv_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvreg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/obio.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/db88f5xxx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/orion.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/pnp.4th#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/support.4th#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#27 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kern.post.mk#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_kbd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athvar.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/exca/exca.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/ad7418.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/ds1672.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/icee.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iicsmb.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mge/if_mgevar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_user.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/ofw_bus_subr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/openfirm.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccardvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/au88x0.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/au88x0.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_demo.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_subr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_cpu_mv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci_mbus.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/musb2_otg.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_bus.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_controller.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_controller.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_busdma.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_core.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_device.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_device.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_dynamic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_dynamic.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_generic.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_handle_request.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_hub.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_hub.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_msctest.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_msctest.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_request.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_request.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_transfer.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_transfer.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axe2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axe2_reg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/image/uscanner2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devid.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devtable.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_ioctl.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_standard.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/u3g2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uchcom2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ufoma2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uftdi2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uplcom2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/usb2_serial.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uvscom2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/sound/uaudio2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/umass2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/ustorage2_fs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_ural2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2_reg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_vnops.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_pc98.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_vtoc8.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/cpufreq/est.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_debug.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/sound/driver/au88x0/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_3g/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_adhoc.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ddb.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_input.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_input.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan_sta.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_tdma.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_tdma.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_vjc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_output.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_gif.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ipip.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/grackle.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/gracklevar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/macio.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/uninorth.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/uninorthvar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_pipe.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/elf_common.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mbuf.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/protosw.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/soundcard.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_extattr.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_page.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_page.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athdebug/athdebug.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/athstats.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/csup/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/globals.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/job.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/main.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/make.1#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/var.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/burncd/burncd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cpucontrol/cpucontrol.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/fwcontrol/fwcontrol.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kldxref/ef_i386.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kldxref/ef_obj.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kldxref/fileformat#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kldxref/kldxref.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mergemaster/mergemaster.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mergemaster/mergemaster.sh#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mld6query/mld6query.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/lib.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/plist.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rrenumd/rrenumd.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtadvd/rtadvd.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtsold/rtsold.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/traceroute6/traceroute6.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wlandebug/wlandebug.c#4 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.165 2008/12/23 16:52:03 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.166 2009/01/03 11:25:50 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1 +OLD_FILES+=usr/share/man/man8/nsupdate.8.gz # 20081223: ipprotosw.h removed OLD_FILES+=usr/include/netinet/ipprotosw.h # 20081123: vfs_mountedon.9 removed ==== //depot/projects/soc2008/trasz_nfs4acl/bin/test/test.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.26 2006/12/14 10:42:46 ru Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.27 2009/01/07 01:03:23 danger Exp $ .\" .Dd July 31, 2006 .Dt TEST 1 @@ -310,7 +310,7 @@ standards document. All other cases are subject to the ambiguity in the command semantics. -.Sh RETURN VALUES +.Sh EXIT STATUS The .Nm utility exits with one of the following values: ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/GNUmakefile#2 (text) ==== @@ -2,7 +2,7 @@ # be used elsewhere because it assumes that the target system doesn't # support BSD extended file flags. # -# $FreeBSD: src/contrib/csup/GNUmakefile,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ +# $FreeBSD: src/contrib/csup/GNUmakefile,v 1.2 2009/01/05 15:18:16 lulf Exp $ # PREFIX?=/usr/local @@ -12,8 +12,9 @@ UNAME= $(shell uname -s) SRCS= attrstack.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 pathcomp.c \ - parse.c proto.c status.c stream.c threads.c token.c updater.c + globtree.c idcache.c keyword.c lex.rcs.c lister.c main.c misc.c mux.c \ + pathcomp.c parse.c proto.c rcsfile.c rcsparse.c rsyncfile.c status.c \ + stream.c threads.c token.c updater.c OBJS= $(SRCS:.c=.o) WARNS= -Wall -W -Wno-unused-parameter -Wmissing-prototypes -Wpointer-arith \ ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/Makefile#2 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/contrib/csup/Makefile,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ +# $FreeBSD: src/contrib/csup/Makefile,v 1.2 2009/01/05 15:18:16 lulf Exp $ PREFIX?= /usr/local BINDIR?= ${PREFIX}/bin @@ -9,10 +9,11 @@ PROG= csup SRCS= attrstack.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 + pathcomp.c proto.c status.c stream.c threads.c token.l updater.c \ + rcsfile.c rcsparse.c lex.rcs.c rsyncfile.c CFLAGS+= -I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG -WARNS?= 6 +WARNS?= 1 # A bit of tweaking is needed to get this Makefile working # with the bsd.prog.mk of all the *BSD OSes... ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/TODO#2 (text) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/csup/TODO,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ +$FreeBSD: src/contrib/csup/TODO,v 1.2 2009/01/05 15:18:16 lulf Exp $ BUGS: @@ -28,4 +28,3 @@ checkout files (files in CVS/ subdirectores), a command line override to only update a specific collection and a third verbosity level to display commit log messages. -- Add support for CVS mode (maybe?). ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/config.c#2 (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.c,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ + * $FreeBSD: src/contrib/csup/config.c,v 1.2 2009/01/05 15:18:16 lulf Exp $ */ #include @@ -133,7 +133,6 @@ coll->co_options &= ~CO_CHECKRCS; /* In recent versions, we always try to set the file modes. */ coll->co_options |= CO_SETMODE; - /* XXX We don't support the rsync updating algorithm yet. */ coll->co_options |= CO_NORSYNC; error = config_parse_refusefiles(coll); if (error) @@ -444,10 +443,6 @@ "\"%s\"\n", cur_coll->co_name); exit(1); } - if (!(cur_coll->co_options & CO_CHECKOUTMODE)) { - lprintf(-1, "Client only supports checkout mode\n"); - exit(1); - } if (!STAILQ_EMPTY(&colls)) { coll = STAILQ_LAST(&colls, coll, co_next); if (strcmp(coll->co_host, cur_coll->co_host) != 0) { ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/csup.1#2 (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.1.1.2 2006/03/14 03:51:12 mux Exp $ +.\" $FreeBSD: src/contrib/csup/csup.1,v 1.2 2009/01/07 18:37:07 lulf Exp $ .\" .Dd February 1, 2006 .Os FreeBSD @@ -442,8 +442,6 @@ mode and .Em checkout mode. -.Nm -only supports the checkout mode for now. .Pp In CVS mode, the client receives copies of the actual RCS files making up the master CVS repository. CVS mode is the default mode of operation. ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/detailer.c#2 (text) ==== @@ -23,20 +23,28 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/detailer.c,v 1.1.1.1 2006/03/03 04:11:26 mux Exp $ + * $FreeBSD: src/contrib/csup/detailer.c,v 1.2 2009/01/05 15:18:16 lulf Exp $ */ #include #include #include #include +#include +#include +#include +#include + #include "config.h" #include "detailer.h" #include "fixups.h" +#include "globtree.h" #include "misc.h" #include "mux.h" #include "proto.h" +#include "rcsfile.h" +#include "rsyncfile.h" #include "status.h" #include "stream.h" @@ -56,8 +64,16 @@ static int detailer_batch(struct detailer *); static int detailer_coll(struct detailer *, struct coll *, struct status *); -static int detailer_dofile(struct detailer *, struct coll *, +static int detailer_dofile_co(struct detailer *, struct coll *, struct status *, char *); +static int detailer_dofile_rcs(struct detailer *, struct coll *, + char *, char *); +static int detailer_dofile_regular(struct detailer *, char *, char *); +static int detailer_dofile_rsync(struct detailer *, char *, char *); +static int detailer_checkrcsattr(struct detailer *, struct coll *, char *, + struct fattr *, int); +int detailer_send_details(struct detailer *, struct coll *, char *, + char *, struct fattr *); void * detailer(void *arg) @@ -186,8 +202,13 @@ } if (fixup->f_coll != coll) break; - error = proto_printf(wr, "Y %s %s %s\n", fixup->f_name, - coll->co_tag, coll->co_date); + if (coll->co_options & CO_CHECKOUTMODE) + error = proto_printf(wr, "Y %s %s %s\n", + fixup->f_name, coll->co_tag, coll->co_date); + else { + error = proto_printf(wr, "A %s\n", + fixup->f_name); + } if (error) return (DETAILER_ERR_WRITE); fixup = NULL; @@ -208,12 +229,14 @@ static int detailer_coll(struct detailer *d, struct coll *coll, struct status *st) { + struct fattr *rcsattr; struct stream *rd, *wr; - char *cmd, *file, *line, *msg; - int error; + char *attr, *cmd, *file, *line, *msg, *path, *target; + int error, attic; rd = d->rd; wr = d->wr; + attic = 0; line = stream_getln(rd, NULL); if (line == NULL) return (DETAILER_ERR_READ); @@ -226,17 +249,84 @@ /* Delete file. */ file = proto_get_ascii(&line); if (file == NULL || line != NULL) + return (DETAILER_ERR_PROTO); + error = proto_printf(wr, "D %s\n", file); + if (error) + return (DETAILER_ERR_WRITE); + break; + case 'I': + case 'i': + case 'j': + /* Directory operations. */ + file = proto_get_ascii(&line); + if (file == NULL || line != NULL) return (DETAILER_ERR_PROTO); - error = proto_printf(wr, "D %s\n", file); + error = proto_printf(wr, "%s %s\n", cmd, file); + if (error) + return (DETAILER_ERR_WRITE); + break; + case 'J': + /* Set directory attributes. */ + file = proto_get_ascii(&line); + attr = proto_get_ascii(&line); + if (file == NULL || line != NULL || attr == NULL) + return (DETAILER_ERR_PROTO); + error = proto_printf(wr, "%s %s %s\n", cmd, file, attr); if (error) return (DETAILER_ERR_WRITE); break; + case 'H': + case 'h': + /* Create a hard link. */ + file = proto_get_ascii(&line); + target = proto_get_ascii(&line); + if (file == NULL || target == NULL) + return (DETAILER_ERR_PROTO); + error = proto_printf(wr, "%s %s %s\n", cmd, file, + target); + break; + case 't': + file = proto_get_ascii(&line); + attr = proto_get_ascii(&line); + if (file == NULL || attr == NULL || line != NULL) { + return (DETAILER_ERR_PROTO); + } + rcsattr = fattr_decode(attr); + if (rcsattr == NULL) { + return (DETAILER_ERR_PROTO); + } + error = detailer_checkrcsattr(d, coll, file, rcsattr, + 1); + break; + + case 'T': + file = proto_get_ascii(&line); + attr = proto_get_ascii(&line); + if (file == NULL || attr == NULL || line != NULL) + return (DETAILER_ERR_PROTO); + rcsattr = fattr_decode(attr); + if (rcsattr == NULL) + return (DETAILER_ERR_PROTO); + error = detailer_checkrcsattr(d, coll, file, rcsattr, + 0); + break; + case 'U': /* Add or update file. */ file = proto_get_ascii(&line); if (file == NULL || line != NULL) return (DETAILER_ERR_PROTO); - error = detailer_dofile(d, coll, st, file); + if (coll->co_options & CO_CHECKOUTMODE) { + error = detailer_dofile_co(d, coll, st, file); + } else { + path = cvspath(coll->co_prefix, file, 0); + rcsattr = fattr_frompath(path, FATTR_NOFOLLOW); + error = detailer_send_details(d, coll, file, + path, rcsattr); + if (rcsattr != NULL) + fattr_free(rcsattr); + free(path); + } if (error) return (error); break; @@ -261,14 +351,110 @@ return (0); } +/* + * Tell the server to update a regular file. + */ +static int +detailer_dofile_regular(struct detailer *d, char *name, char *path) +{ + struct stream *wr; + struct stat st; + char md5[MD5_DIGEST_SIZE]; + int error; + + wr = d->wr; + error = stat(path, &st); + /* If we don't have it or it's unaccessible, we want it again. */ + if (error) { + proto_printf(wr, "A %s\n", name); + return (0); + } + + /* If not, we want the file to be updated. */ + error = MD5_File(path, md5); + if (error) { + lprintf(-1, "Error reading \"%s\"\n", name); + return (error); + } + error = proto_printf(wr, "R %s %O %s\n", name, st.st_size, md5); + if (error) + return (DETAILER_ERR_WRITE); + return (0); +} + +/* + * Tell the server to update a file with the rsync algorithm. + */ +static int +detailer_dofile_rsync(struct detailer *d, char *name, char *path) +{ + struct stream *wr; + struct rsyncfile *rf; + + wr = d->wr; + rf = rsync_open(path, 0, 1); + if (rf == NULL) { + /* Fallback if we fail in opening it. */ + proto_printf(wr, "A %s\n", name); + return (0); + } + proto_printf(wr, "r %s %z %z\n", name, rsync_filesize(rf), + rsync_blocksize(rf)); + /* Detail the blocks. */ + while (rsync_nextblock(rf) != 0) + proto_printf(wr, "%s %s\n", rsync_rsum(rf), rsync_blockmd5(rf)); + proto_printf(wr, ".\n"); + rsync_close(rf); + return (0); +} + +/* + * Tell the server to update an RCS file that we have, or send it if we don't. + */ static int -detailer_dofile(struct detailer *d, struct coll *coll, struct status *st, +detailer_dofile_rcs(struct detailer *d, struct coll *coll, char *name, + char *path) +{ + struct stream *wr; + struct fattr *fa; + struct rcsfile *rf; + int error; + + wr = d->wr; + path = atticpath(coll->co_prefix, name); + fa = fattr_frompath(path, FATTR_NOFOLLOW); + if (fa == NULL) { + /* We don't have it, so send request to get it. */ + error = proto_printf(wr, "A %s\n", name); + if (error) + return (DETAILER_ERR_WRITE); + free(path); + return (0); + } + + rf = rcsfile_frompath(path, name, coll->co_cvsroot, coll->co_tag, 1); + free(path); + if (rf == NULL) { + error = proto_printf(wr, "A %s\n", name); + if (error) + return (DETAILER_ERR_WRITE); + return (0); + } + /* Tell to update the RCS file. The client version details follow. */ + rcsfile_send_details(rf, wr); + rcsfile_free(rf); + fattr_free(fa); + return (0); +} + +static int +detailer_dofile_co(struct detailer *d, struct coll *coll, struct status *st, char *file) { - char md5[MD5_DIGEST_SIZE]; struct stream *wr; struct fattr *fa; struct statusrec *sr; + char md5[MD5_DIGEST_SIZE]; char *path; int error, ret; @@ -337,3 +523,81 @@ return (DETAILER_ERR_WRITE); return (0); } + +int +detailer_checkrcsattr(struct detailer *d, struct coll *coll, char *name, + struct fattr *server_attr, int attic) +{ + struct fattr *client_attr; + char *attr, *path; + int error; + + /* + * I don't think we can use the status file, since it only records file + * attributes in cvsmode. + */ + client_attr = NULL; + path = cvspath(coll->co_prefix, name, attic); + if (path == NULL) { + return (DETAILER_ERR_PROTO); + } + + if (access(path, F_OK) == 0 && + ((client_attr = fattr_frompath(path, FATTR_NOFOLLOW)) != NULL) && + fattr_equal(client_attr, server_attr)) { + attr = fattr_encode(client_attr, NULL, 0); + if (attic) { + error = proto_printf(d->wr, "l %s %s\n", name, attr); + } else { + error = proto_printf(d->wr, "L %s %s\n", name, attr); + } + free(attr); + free(path); + fattr_free(client_attr); + if (error) + return (DETAILER_ERR_WRITE); + return (0); + } + /* We don't have it, so tell the server to send it. */ + error = detailer_send_details(d, coll, name, path, client_attr); + fattr_free(client_attr); + free(path); + return (error); +} + +int +detailer_send_details(struct detailer *d, struct coll *coll, char *name, + char *path, struct fattr *fa) +{ + int error; + size_t len; + + /* + * Try to check if the file exists either live or dead to see if we can + * edit it and put it live or dead, rather than receiving the entire + * file. + */ + if (fa == NULL) { + path = atticpath(coll->co_prefix, name); + fa = fattr_frompath(path, FATTR_NOFOLLOW); + } + if (fa == NULL) { + error = proto_printf(d->wr, "A %s\n", name); + if (error) + return (DETAILER_ERR_WRITE); + } else if (fattr_type(fa) == FT_FILE) { + if (isrcs(name, &len) && !(coll->co_options & CO_NORCS)) { + detailer_dofile_rcs(d, coll, name, path); + } else if (!(coll->co_options & CO_NORSYNC) && + !globtree_test(coll->co_norsync, name)) { + detailer_dofile_rsync(d, name, path); + } else { + detailer_dofile_regular(d, name, path); + } + } else { + error = proto_printf(d->wr, "N %s\n", name); + if (error) + return (DETAILER_ERR_WRITE); + } + return (0); +} ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/diff.c#2 (text) ==== @@ -23,12 +23,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/diff.c,v 1.1.1.1 2006/03/03 04:11:26 mux Exp $ + * $FreeBSD: src/contrib/csup/diff.c,v 1.2 2009/01/05 15:18:16 lulf Exp $ */ +#include + #include #include #include +#include #include #include @@ -36,15 +39,20 @@ #include "keyword.h" #include "misc.h" #include "stream.h" +#include "queue.h" typedef long lineno_t; #define EC_ADD 0 #define EC_DEL 1 +#define MAXKEY LONG_MAX /* Editing command and state. */ struct editcmd { int cmd; + long key; + i