From owner-p4-projects@FreeBSD.ORG Sun Dec 7 00:26:34 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0DD251065675; Sun, 7 Dec 2008 00:26:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id C5D891065672
for ; Sun, 7 Dec 2008 00:26:33 +0000 (UTC)
(envelope-from zec@icir.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id B4BB58FC13
for ; Sun, 7 Dec 2008 00:26:33 +0000 (UTC)
(envelope-from zec@icir.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB70QXju036324
for ; Sun, 7 Dec 2008 00:26:33 GMT
(envelope-from zec@icir.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB70QXpt036322
for perforce@freebsd.org; Sun, 7 Dec 2008 00:26:33 GMT
(envelope-from zec@icir.org)
Date: Sun, 7 Dec 2008 00:26:33 GMT
Message-Id: <200812070026.mB70QXpt036322@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@icir.org using -f
From: Marko Zec
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154226 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 00:26:34 -0000
http://perforce.freebsd.org/chv.cgi?CH=154226
Change 154226 by zec@zec_tpx32 on 2008/12/07 00:26:21
Improve style and remove an XXX comment which no longer holds.
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/kern/kern_linker.c#6 edit
.. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#36 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/kern/kern_linker.c#6 (text+ko) ====
@@ -1311,10 +1311,9 @@
CURVNET_SET(TD_TO_VNET(td));
error = vi_symlookup(&lookup, symstr);
CURVNET_RESTORE();
- if (error == 0) {
+ if (error == 0)
error = copyout(&lookup, uap->data,
sizeof(lookup));
- }
}
#else
if (lf == NULL)
==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#4 (text+ko) ====
@@ -82,12 +82,12 @@
if (strcmp(symstr, mapentry->name) == 0) {
lookup->symvalue = (u_long) mapentry->base;
lookup->symsize = mapentry->size;
- return 0;
+ return (0);
}
}
}
- return ENOENT;
+ return (ENOENT);
}
static void
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#36 (text+ko) ====
@@ -1483,7 +1483,6 @@
#define ISN_RANDOM_INCREMENT (4096 - 1)
#ifdef VIMAGE_GLOBALS
-/* XXX WARNING WARNING clash with contrib/pf/net/pf_subr.c - REVISIT !!! */
static u_char isn_secret[32];
static int isn_last_reseed;
static u_int32_t isn_offset, isn_offset_old;
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 01:40:53 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 682431065675; Sun, 7 Dec 2008 01:40:53 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 2C1181065672
for ; Sun, 7 Dec 2008 01:40:53 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 19E7A8FC0C
for ; Sun, 7 Dec 2008 01:40:53 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB71ep27054920
for ; Sun, 7 Dec 2008 01:40:51 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB71engJ054917
for perforce@freebsd.org; Sun, 7 Dec 2008 01:40:49 GMT
(envelope-from pgj@FreeBSD.org)
Date: Sun, 7 Dec 2008 01:40:49 GMT
Message-Id: <200812070140.mB71engJ054917@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154228 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 01:40:54 -0000
http://perforce.freebsd.org/chv.cgi?CH=154228
Change 154228 by pgj@kolbasz on 2008/12/07 01:39:51
Add Hungarian translation of chapter "Structuring Documents Under
doc/" from FDP Primer
Affected files ...
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml#2 edit
Differences ...
==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml#2 (text+ko) ====
@@ -31,255 +31,368 @@
-->
- Structuring documents under doc/
+ A dokumentumok szervezése a doc/
+ könyvtáron belül
- The doc/ tree is organized in a particular
- fashion, and the documents that are part of the FDP are in turn organized
- in a particular fashion. The aim is to make it simple to add new
- documentation into the tree and:
+ A doc/ könyvtár tartalma egy
+ adott módon szervezõdik, és ennek megfelelõen
+ a &os; Dokumentációs Projektben
+ készített dokumentumok is adott módon
+ kerülnek elrendezésre. Célunk ezzel
+ megkönnyíteni az újabb
+ dokumentációk felvételét,
+ illetve:
- make it easy to automate converting the document to other formats;
+ leegyszerûsíteni az új dokumentum
+ automatikus átalakítását
+ különbözõ formátumokba;
- promote consistency between the different documentation
- organizations, to make it easier to switch between working on
- different documents;
+ megteremteni a különbözõ dokumentumok
+ közti következetes elrendezést, így
+ könnyebben lehet köztük váltani munka
+ közben;
- make it easy to decide where in the tree new documentation should
- be placed.
+ segíteni az új dokumentumok helyének
+ egyszerû eldöntésében.
- In addition, the documentation tree has to accommodate documentation
- that could be in many different languages and in many different
- encodings. It is important that the structure of the documentation tree
- does not enforce any particular defaults or cultural preferences.
+ Mindezek mellett a dokumentációt
+ tároló könyvtárnak olyan
+ felépítésûnek kell lennie, amely
+ lehetõvé teszi több különbözõ
+ nyelven és több különbözõ
+ kódolásban írt dokumentumok kényelmes
+ elhelyezését. Fontos hozzátennünk, hogy a
+ könyvtár szerkezete nem követel meg semmilyen
+ különleges elõfeltételezést vagy
+ kulturális berendezkedést.
- The top level, doc/
+ A legfelsõ szint: a doc/
+ könyvtár
- There are two types of directory under doc/,
- each with very specific directory names and meanings.
+ A doc/ további két,
+ különleges névvel és jelentéssel
+ rendelkezõ könyvtárat rejt.
- Directory
+ Könyvtár
- Meaning
+ Leírásshare/
-
- Contains files that are not specific to the various translations
- and encodings of the documentation. Contains subdirectories to
- further categorize the information. For example, the files that
- comprise the &man.make.1; infrastructure are in
- share/mk, while the additional SGML support
- files (such as the FreeBSD extended DocBook DTD) are in
- share/sgml.
+
+ Ebben a könyvtárban találjuk azokat az
+ állományokat, amelyek függetlenek az egyes
+ fordításoktól és
+ kódolásoktól. A benne
+ található alkönyvtárakon
+ keresztül tovább csoportosítódik a
+ tartalmuk. Például a dokumentáció
+ elõállításához
+ kapcsolódó &man.make.1; infrastruktúra
+ állományai a share/mk,
+ miközben a SGML használatához
+ szükséges további állományok
+ (mint például a &os; kiterjesztéseit
+ tartalmazó DocBook DTD) a
+ share/sgml alkönyvtárban
+ helyezkednek el.
- lang.encoding/
-
- One directory exists for each available translation and encoding
- of the documentation, for example
- en_US.ISO8859-1/ and
- zh_TW.Big5/. The names are long, but by fully
- specifying the language and encoding we prevent any future headaches
- should a translation team want to provide the documentation in the
- same language but in more than one encoding. This also completely
- isolates us from any problems that might be caused by a switch to
- Unicode.
+ nyelv.kódolás/
+
+ Minden fordításhoz és annak
+ kódolásához tartozik egy
+ könyvtár, például
+ en_US.ISO8859-1 vagy
+ hu_HU.ISO8859-2. A nevek alapvetõen
+ hosszúak, de pontosan meghatározzák az
+ adott nyelvet és a dokumentáció
+ írásához alkalmazott
+ kódolást. Ezzel igyekszük
+ felkészülni olyan esetekre, amikor a
+ fordítócsapatok egy nyelven többféle
+ kódolás szerint is szeretnének
+ dokumentációt készíteni. Ez a
+ megoldás egyben kiutat szolgáltat egy esetleges
+ késõbbi, Unicode kódolásra
+ váltás során felmerülõ
+ problémák elõl.
- The
- lang.encoding/ directories
+ A
+ nyelv.kódolás/
+ könyvtárak
- These directories contain the documents themselves. The
- documentation is split into up to three more categories at this
- level, indicated by the different directory names.
+ Ezek a könyvtárak tartalmazzák magukat a
+ dokumentumokat. A dokumentumokat ezen a szinten a
+ különbözõ könyvtárak neveinek
+ megfelelõen három vagy több
+ kategóriára osztjuk.
- Directory
+ Könyvtár
- Contents
+ Tartalomarticles
-
- Documentation marked up as a DocBook article
- (or equivalent). Reasonably short, and broken up into sections.
- Normally only available as one HTML file.
+
+ Az itt található dokumentumokat a DocBook
+ article eleme szerint (vagy egy azzal
+ egyenlõ megoldással) jelöltük.
+ Viszonylag rövid, szakaszokra osztott dokumentumokat
+ találhatunk itt. Általában egyetlen HTML
+ állományként érhetõek
+ el.
-
+
books
-
- Documentation marked up as a DocBook book (or
- equivalent). Book length, and broken up into chapters. Normally
- available as both one large HTML file (for people with fast
- connections, or who want to print it easily from a browser) and
- as a collection of linked, smaller files.
+
+ Ebben a könyvtárban a DocBook
+ book eleme szerint (vagy egy azzal
+ egyenlõ megoldással) jelöltük.
+ Hosszabb, fejezetekre osztott dokumentum.
+ Általában egyetlen nagyobb HTML
+ állományként (a gyors
+ internetkapcsolattal rendelkezõ, vagy a dokumentumot a
+ böngészõbõl nyomtatni
+ kívánó egyének
+ számára), illetve több kisebb
+ állományként együtteseként is
+ elérhetõ.man
-
- For translations of the system manual pages. This directory will
- contain one or more
- mann directories,
- corresponding to the sections that have been translated.
+
+ A rendszerhez tartozó man oldalak
+ fordításai. A lefordított szakaszoknak
+ megfelelõen ebben a könyvtárban egy vagy
+ több mann
+ nevû alkönyvtárat találhatunk.
- Not every
- lang.encoding directory will contain all of these directories. It depends
- on how much translation has been accomplished by that translation
- team.
+ Nem mindegyik
+ nyelv.kódolás
+ könyvtár tartalmazza ezeket az
+ alkönyvtárakat. Az egyes fordítások
+ tartalma mindig attól függ, hogy az adott
+ fordítócsapatnak mennyit sikerült eddig
+ lefordítania.
-
+
- Document specific information
+ Az egyes dokumentumokkal kapcsolatos
+ tudnivalók
- This section contains specific notes about particular documents
- managed by the FDP.
+ Ebben a szakaszban a &os; Dokumentációs Projekt
+ keretein belül gondozott különbözõ
+ dokumentumokat ismerhetjük meg részletesebben.
- The Handbook
+ A kézikönyvbooks/handbook/
- The Handbook is written to comply with the FreeBSD DocBook
- extended DTD.
-
- The Handbook is organized as a DocBook book.
- It is then divided into parts, each of which may
- contain several chapters.
- chapters are further subdivided into sections
- (sect1) and subsections (sect2,
- sect3) and so on.
-
+ A kézikönyv a &os; kiterjesztéseit
+ tartalmazó DocBook DTD szerint készült.
+
+ A kézikönyv a DocBook book
+ elemének megfelelõen szervezõdik. Több
+ part elemmel jelölt részbõl
+ áll, amelyek mindegyike több
+ chapter elemmel jelölt fejezetet foglal
+ magában. Ezek a fejezetek további szakaszokra
+ (sect1) bomlanak, amelyek helyenként
+ alszakaszokra (sect2,
+ sect3) oszlanak, és így
+ tovább.
+
- Physical organization
-
- There are a number of files and directories within the
- handbook directory.
+ Fizikai szervezés
+
+ A kézikönyv forrásai több
+ különbözõ állományban
+ és könyvtárban a
+ handbook könyvtáron
+ belül találhatóak.
- The Handbook's organization may change over time, and this
- document may lag in detailing the organizational changes. If you
- have any questions about how the Handbook is organized, please
- contact the &a.doc;.
+ A kézikönyv szervezése
+ idõrõl-idõre változik, ezért
+ könnyen elõfordulhat, hogy ez a dokumentum csak
+ kissé késve követi ezeket a
+ változtatásokat. Ha további
+ kérdéseink lennének a
+ kézikönyv szervezésérõl,
+ bátran írjunk a &a.doc;
+ címére!
-
+
Makefile
-
- The Makefile defines some variables that
- affect how the SGML source is converted to other formats, and
- lists the various source files that make up the Handbook. It then
- includes the standard doc.project.mk file, to
- bring in the rest of the code that handles converting documents
- from one format to another.
+
+ A Makefile
+ állományban definiálódnak olyan
+ változók, amelyek a SGML források
+ különbözõ formátumúra
+ alakításának menetét
+ befolyásolják, illetve hivatkozik a
+ kézikönyv forrásaira. Ezután
+ beemeli a doc.project.mk
+ állományt, és így
+ lényegében betölti a dokumentumok
+ átalakításáért
+ felelõs további
+ utasításokat.book.sgml
-
- This is the top level document in the Handbook. It contains
- the Handbook's DOCTYPE
- declaration, as well as the elements that describe the
- Handbook's structure.
+
+ Ez a kézikönyv legfelsõ szintû
+ dokumentuma. Ebben van a kézikönyv dokumentípus-deklarációja,
+ illetve a szerkezetét leíró
+ további elemek.
- book.sgml uses parameter
- entities to load in the files with the
- .ent extension. These files (described later)
- then define general
- entities that are used throughout the rest of the
- Handbook.
+ A book.sgml az
+ .ent kiterjesztésû
+ állományokat paraméteregyedek
+ segítségével tölti be. Ezek az
+ állományok (amelyekrõl késõbb
+ még szó lesz) aztán a
+ kézikönyv további részeiben
+ használt általános
+ egyedeket definiálnak.
- directory/chapter.sgml
+ könyvtár/chapter.sgml
+
+ A kézikönyv egyes fejezetei
+ egymástól különálló
+ könyvtárakban, chapter.sgml
+ nevû állományokban
+ tárolódnak. Ezeket a könyvtárakat
+ az adott fejezetet jelölõ
+ chapterid
+ tulajdonsága szerint szokták elnevezni.
- Each chapter in the Handbook is stored in a file called
- chapter.sgml in a separate directory from the
- other chapters. Each directory is named after the value of the
- id attribute on the chapter
- element.
+ Például ha az egyik fejezet
+ forrásában a következõ sor
+ olvasható:
- For example, if one of the chapter files contains:
-
+
...
]]>
- then it will be called chapter.sgml in
- the kernelconfiguration directory. In
- general, the entire contents of the chapter will be held in this
- file.
-
- When the HTML version of the Handbook is produced, this will
- yield kernelconfiguration.html. This is
- because of the id value, and is not related to
- the name of the directory.
+ Ekkor a chapter.sgml nevû
+ állományt tartalmazó könyvtár
+ neve kernelconfig lesz. Egy ilyen
+ állomány általában a teljes
+ fejezetet tartalmazza.
+
+ A kézikönyv HTML változatának
+ készítése során ebbõl a
+ kernelconfig.html
+ állomány fog keletkezni. Ezt azonban az
+ id értéke határozza
+ meg, semmi köze nincs a könyvtár
+ elnevezéséhez.
- In earlier versions of the Handbook the files were stored in
- the same directory as book.sgml, and named
- after the value of the id attribute on the
- file's chapter element. Moving them into
- separate directories prepares for future plans for the Handbook.
- Specifically, it will soon be possible to include images in each
- chapter. It makes more sense for each image to be stored in a
- directory with the text for the chapter than to try to keep the
- text for all the chapters, and all the images, in one large
- directory. Namespace collisions would be inevitable, and it is
- easier to work with several directories with a few files in them
- than it is to work with one directory that has many files in
- it.
+ A kézikönyv korábbi
+ változataiban az összes forrás a
+ book.sgml állománnyal
+ volt egy szinten, és az adott
+ chapter elemek id
+ tulajdonságának megfelelõen került
+ elnevezésre. A könyvtárak
+ létrehozásával a kézikönyv
+ szervezésének további
+ átalakításait kívántuk
+ elõkészíteni. Itt
+ különösen gondolunk arra, hogy ezzel
+ szeretnénk lehetõvé tenni képek
+ hozzáadását az egyes fejezetekhez.
+ Véleményünk szerint sokkal több
+ értelme van ugyanis a képeket a fejezetek
+ forrásával együtt egy külön
+ könyvtárban tárolni, mintsem az
+ összes képet és szöveget egyetlen
+ nagy könyvtárban összeömleszteni. A
+ névütközés egy idõ után
+ úgyis elkerülhetetlenné válik,
+ és sok, kevés állományt
+ tartalmazó könyvtárral
+ egyébként is könnyebb dolgozni, mint egy
+ sok állományt tartalmazó
+ könyvtárral.
- A brief look will show that there are many directories with
- individual chapter.sgml files, including
+ A kézikönyv forrásaiban könnyen
+ láthatjuk, hogy sok ilyen könyvtár van,
+ bennük egy-egy chapter.sgml
+ állománnyal. Például
basics/chapter.sgml,
- introduction/chapter.sgml, and
+ introduction/chapter.sgml és
printing/chapter.sgml.
-
+
- Chapters and/or directories should not be named in a fashion
- that reflects their ordering within the Handbook. This ordering
- might change as the content within the Handbook is reorganized;
- this sort of reorganization should not (generally) include the
- need to rename files (unless entire chapters are being promoted
- or demoted within the hierarchy).
+ A fejezeteket és könyvtárakat nem
+ szabad semmilyen sorrendiségre utaló
+ módon elnevezni. A fejezetek elrendezése
+ ugyanis változhat a kézikönyv egy
+ esetleges átszervezése során. Az
+ ilyen átszervezések során pedig
+ (általában) nem lenne szabad
+ állományokat átnevezni (hacsak
+ komplett fejezeteket nem mozgatunk fentebb vagy lentebb a
+ szerkezetben).
-
- Each chapter.sgml file will not be a
- complete SGML document. In particular, they will not have their
- own DOCTYPE lines at the start of the files.
-
- This is unfortunate as
- it makes it impossible to treat these as generic SGML
- files and simply convert them to HTML, RTF, PS, and other
- formats in the same way the main Handbook is generated. This
- would force you to rebuild the Handbook
- every time you want to see the effect a change has had on just
- one chapter.
+
+ Az egyes chapter.sgml
+ állományok önmagukban teljes SGML
+ dokumentumok. Különösen azért, mert
+ semmilyen DOCTYPE sor nem
+ található az elejükön.
+
+ Ez abból a szempontból
+ hátrányos, hogy ezeket az
+ állományokat ezért nem tudjuk
+ normál SGML állományokként
+ kezelni. Emiatt ezeket nem lehet egyszerûen, a
+ kézikönyvhöz hasonlóan módon
+ HTML, RTF, PS vagy más egyéb formátumba
+ átalakítani. Ezért tehát
+ könnyen elõfordulhat, hogy a fejezetek
+ megváltoztatásakor a
+ teljes kézikönyvet elõ
+ kell állítanunk.
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 01:49:02 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5599D10656D5; Sun, 7 Dec 2008 01:49:02 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 0048D10656D2
for ; Sun, 7 Dec 2008 01:49:01 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id E17DC8FC1A
for ; Sun, 7 Dec 2008 01:49:01 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB71n1oU055492
for ; Sun, 7 Dec 2008 01:49:01 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB71n1qm055490
for perforce@freebsd.org; Sun, 7 Dec 2008 01:49:01 GMT
(envelope-from pgj@FreeBSD.org)
Date: Sun, 7 Dec 2008 01:49:01 GMT
Message-Id: <200812070149.mB71n1qm055490@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154229 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 01:49:02 -0000
http://perforce.freebsd.org/chv.cgi?CH=154229
Change 154229 by pgj@kolbasz on 2008/12/07 01:48:29
IFC
Affected files ...
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#20 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml#7 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#9 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#11 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#8 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml#9 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#9 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#11 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#17 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/preface/preface.sgml#7 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/updating/chapter.sgml#6 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#4 edit
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#12 edit
.. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#11 integrate
.. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 integrate
.. //depot/projects/docproj_hu/www/en/community/social.xsl#2 integrate
.. //depot/projects/docproj_hu/www/en/multimedia/multimedia-input.xml#5 integrate
.. //depot/projects/docproj_hu/www/en/multimedia/multimedia.pl#4 integrate
.. //depot/projects/docproj_hu/www/en/releases/7.1R/schedule.sgml#7 integrate
.. //depot/projects/docproj_hu/www/en/releng/index.sgml#10 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#15 integrate
.. //depot/projects/docproj_hu/www/share/sgml/events.xml#10 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#30 integrate
Differences ...
==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#20 (text+ko) ====
@@ -1,7 +1,7 @@
@@ -3447,6 +3447,7 @@
+
@@ -3759,6 +3760,7 @@
+
==== //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 (text+ko) ====
@@ -17,7 +17,7 @@
The &os; Documentation Project
- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.342 2008/11/24 01:26:22 delphij Exp $
+ $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.343 2008/12/01 21:15:04 brueffer Exp $2000
@@ -712,6 +712,8 @@
&hwlist.ixgb;
+ &hwlist.ixgbe;
+
&hwlist.jme;
&hwlist.kue;
@@ -838,6 +840,8 @@
&hwlist.rum;
+ &hwlist.upgt;
+
&hwlist.ural;
[&arch.amd64;, &arch.i386;, &arch.pc98;] Lucent
==== //depot/projects/docproj_hu/www/en/community/social.xsl#2 (text+ko) ====
@@ -6,7 +6,7 @@
]>
-
+
@@ -55,7 +55,7 @@
There are hundreds of videos from conferences,
screencasts, and demonstrations relating to FreeBSD
- on YouTube.
+ on YouTube. In particular, there is a new BSD Conferences channel with full length 1 hour taped presentations from FreeBSD technical conferences.
==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#14 (text+ko) ====
@@ -7,7 +7,7 @@
@@ -5921,7 +5921,7 @@
/etc/inetd.conf állományban
is engedélyeznünk kell. Itt mindössze annyira
lesz szükségünk, hogy
- eltávolítjuk a megjegyzést jelzõ
+ eltávolítsuk a megjegyzést jelzõ
# karaktert a már meglevõ
ftpd sor elõl:
@@ -5932,7 +5932,29 @@
inetd
beállításait újra be kell
olvastatunk a konfigurációs állomány
- megváltoztatása után.
+ megváltoztatása után. A írja le az
+ inetd
+ engedélyezésének részleteit.
+
+ Az ftpd önálló
+ szerverként is elindítható. Ehhez
+ mindössze elegendõ csak a megfelelõ
+ változót beállítani az
+ /etc/rc.conf
+ állományban:
+
+ ftpd_enable="YES"
+
+ Miután megadtuk az iménti
+ változót, a szerver el fog indulni a rendszer
+ következõ indítása során.
+ Szükség esetén természetesen
+ root felhasználóként a
+ következõ paranccsal is közvetlenül
+ elindítható:
+
+ &prompt.root; /etc/rc.d/ftpd startMost már be is tudunk jelentkezni az FTP
szerverre:
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 12:06:07 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0250F1065676; Sun, 7 Dec 2008 12:06:07 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B9A3A1065673
for ; Sun, 7 Dec 2008 12:06:06 +0000 (UTC)
(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id A66588FC0C
for ; Sun, 7 Dec 2008 12:06:06 +0000 (UTC)
(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7C66UE060773
for ; Sun, 7 Dec 2008 12:06:06 GMT
(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7C65DK060769
for perforce@freebsd.org; Sun, 7 Dec 2008 12:06:05 GMT
(envelope-from ed@FreeBSD.org)
Date: Sun, 7 Dec 2008 12:06:05 GMT
Message-Id: <200812071206.mB7C65DK060769@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
ed@FreeBSD.org using -f
From: Ed Schouten
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154248 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 12:06:07 -0000
http://perforce.freebsd.org/chv.cgi?CH=154248
Change 154248 by ed@ed_flippo on 2008/12/07 12:06:05
IFC.
Affected files ...
.. //depot/projects/mpsafetty/lib/libarchive/archive.h#4 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_check_magic.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_endian.h#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_entry.h#5 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_platform.h#3 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_private.h#3 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_private.h#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_all.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_compress.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_none.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_program.c#3 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_ar.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_cpio.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_empty.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_mtree.c#3 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_tar.c#4 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_zip.c#3 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_string.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_string.h#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.c#11 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/Makefile#6 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_bzip2.c#1 branch
.. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_bzip2_1.tbz.uu#1 branch
.. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_bzip2_2.tbz.uu#1 branch
.. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_gzip.c#1 branch
.. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_gzip_1.tgz.uu#1 branch
.. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_gzip_2.tgz.uu#1 branch
.. //depot/projects/mpsafetty/lib/libarchive/test/test_fuzz.c#1 branch
.. //depot/projects/mpsafetty/lib/libarchive/test/test_fuzz_1.iso.uu#1 branch
.. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#3 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_gtar_sparse.c#4 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_read_pax_truncated.c#3 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk_perms.c#3 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_cpio.c#3 integrate
.. //depot/projects/mpsafetty/lib/libc/string/Makefile.inc#3 integrate
.. //depot/projects/mpsafetty/lib/libc/string/Symbol.map#3 integrate
.. //depot/projects/mpsafetty/lib/libc/string/strdup.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/string/strndup.c#1 branch
.. //depot/projects/mpsafetty/lib/libthr/thread/thr_rtld.c#3 integrate
.. //depot/projects/mpsafetty/lib/libutil/Makefile#5 integrate
.. //depot/projects/mpsafetty/lib/libutil/kinfo_getfile.3#1 branch
.. //depot/projects/mpsafetty/lib/libutil/kinfo_getvmmap.3#1 branch
.. //depot/projects/mpsafetty/share/man/man4/man4.powerpc/Makefile#2 integrate
.. //depot/projects/mpsafetty/share/man/man4/man4.powerpc/pmu.4#1 branch
.. //depot/projects/mpsafetty/share/man/man7/ports.7#2 integrate
.. //depot/projects/mpsafetty/sys/amd64/amd64/pmap.c#12 integrate
.. //depot/projects/mpsafetty/sys/boot/common/loader.8#2 integrate
.. //depot/projects/mpsafetty/sys/boot/zfs/Makefile#2 integrate
.. //depot/projects/mpsafetty/sys/dev/adb/adb.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/adb/adb_bus.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/adb/adb_kbd.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/adb/adb_mouse.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/adb/adbvar.h#3 integrate
.. //depot/projects/mpsafetty/sys/dev/ae/if_ae.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_t3_hw.c#8 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_main.c#14 integrate
.. //depot/projects/mpsafetty/sys/dev/mmc/mmc.c#7 integrate
.. //depot/projects/mpsafetty/sys/dev/mmc/mmcsd.c#9 integrate
.. //depot/projects/mpsafetty/sys/dev/sdhci/sdhci.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/if_ural.c#3 integrate
.. //depot/projects/mpsafetty/sys/geom/journal/g_journal.c#4 integrate
.. //depot/projects/mpsafetty/sys/geom/journal/g_journal.h#2 integrate
.. //depot/projects/mpsafetty/sys/i386/include/atomic.h#3 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_exec.c#10 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_exit.c#8 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_fork.c#5 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_proc.c#13 integrate
.. //depot/projects/mpsafetty/sys/libkern/iconv.c#2 integrate
.. //depot/projects/mpsafetty/sys/netgraph/ng_mppc.c#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/if_ether.c#11 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp.h#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_asconf.c#4 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_asconf.h#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_auth.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_auth.h#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_constants.h#5 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_header.h#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_indata.c#5 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_indata.h#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_input.c#5 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_os_bsd.h#7 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_output.c#8 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_output.h#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_pcb.c#8 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_pcb.h#5 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_sysctl.c#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_sysctl.h#4 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_timer.c#6 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_uio.h#4 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_usrreq.c#6 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_var.h#5 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctputil.c#8 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctputil.h#3 integrate
.. //depot/projects/mpsafetty/sys/netinet6/sctp6_usrreq.c#3 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/cuda.c#3 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/cudavar.h#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/pmu.c#3 integrate
.. //depot/projects/mpsafetty/sys/sys/proc.h#12 integrate
.. //depot/projects/mpsafetty/tools/test/pthread_vfork/pthread_vfork_test.c#1 branch
.. //depot/projects/mpsafetty/usr.bin/cpio/Makefile#2 integrate
.. //depot/projects/mpsafetty/usr.bin/cpio/cmdline.c#3 integrate
.. //depot/projects/mpsafetty/usr.bin/cpio/config_freebsd.h#2 integrate
.. //depot/projects/mpsafetty/usr.bin/cpio/cpio.c#8 integrate
.. //depot/projects/mpsafetty/usr.bin/cpio/cpio.h#5 integrate
.. //depot/projects/mpsafetty/usr.bin/cpio/cpio_platform.h#2 integrate
.. //depot/projects/mpsafetty/usr.bin/tar/Makefile#4 integrate
.. //depot/projects/mpsafetty/usr.bin/tar/bsdtar.1#4 integrate
.. //depot/projects/mpsafetty/usr.bin/tar/bsdtar.h#4 integrate
.. //depot/projects/mpsafetty/usr.bin/tar/bsdtar_platform.h#2 integrate
.. //depot/projects/mpsafetty/usr.bin/wc/wc.1#2 integrate
.. //depot/projects/mpsafetty/usr.bin/wc/wc.c#2 integrate
Differences ...
==== //depot/projects/mpsafetty/lib/libarchive/archive.h#4 (text+ko) ====
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libarchive/archive.h,v 1.21 2008/09/18 04:19:06 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive.h,v 1.22 2008/12/06 06:17:18 kientzle Exp $
*/
#ifndef ARCHIVE_H_INCLUDED
@@ -82,7 +82,6 @@
# define __LA_DECL
#endif
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -114,13 +113,13 @@
* (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000)
* #endif
*/
-#define ARCHIVE_VERSION_NUMBER 2005005
+#define ARCHIVE_VERSION_NUMBER 2005903
__LA_DECL int archive_version_number(void);
/*
* Textual name/version of the library, useful for version displays.
*/
-#define ARCHIVE_VERSION_STRING "libarchive 2.5.5"
+#define ARCHIVE_VERSION_STRING "libarchive 2.5.903a"
__LA_DECL const char * archive_version_string(void);
#if ARCHIVE_VERSION_NUMBER < 3000000
@@ -185,20 +184,37 @@
*/
/* Returns pointer and size of next block of data from archive. */
-typedef __LA_SSIZE_T archive_read_callback(struct archive *, void *_client_data,
- const void **_buffer);
+typedef __LA_SSIZE_T archive_read_callback(struct archive *,
+ void *_client_data, const void **_buffer);
+
/* Skips at most request bytes from archive and returns the skipped amount */
#if ARCHIVE_VERSION_NUMBER < 2000000
-typedef __LA_SSIZE_T archive_skip_callback(struct archive *, void *_client_data,
- size_t request);
+/* Libarchive 1.0 used ssize_t for the return, which is only 32 bits
+ * on most 32-bit platforms; not large enough. */
+typedef __LA_SSIZE_T archive_skip_callback(struct archive *,
+ void *_client_data, size_t request);
+#elif ARCHIVE_VERSION_NUMBER < 3000000
+/* Libarchive 2.0 used off_t here, but that is a bad idea on Linux and a
+ * few other platforms where off_t varies with build settings. */
+typedef off_t archive_skip_callback(struct archive *,
+ void *_client_data, off_t request);
#else
-typedef off_t archive_skip_callback(struct archive *, void *_client_data,
- off_t request);
+/* Libarchive 3.0 uses int64_t here, which is actually guaranteed to be
+ * 64 bits on every platform. */
+typedef __LA_INT64_T archive_skip_callback(struct archive *,
+ void *_client_data, __LA_INT64_T request);
#endif
+
/* Returns size actually written, zero on EOF, -1 on error. */
-typedef __LA_SSIZE_T archive_write_callback(struct archive *, void *_client_data,
- const void *_buffer, size_t _length);
+typedef __LA_SSIZE_T archive_write_callback(struct archive *,
+ void *_client_data,
+ const void *_buffer, size_t _length);
+
+#if ARCHIVE_VERSION_NUMBER < 3000000
+/* Open callback is actually never needed; remove it in libarchive 3.0. */
typedef int archive_open_callback(struct archive *, void *_client_data);
+#endif
+
typedef int archive_close_callback(struct archive *, void *_client_data);
/*
@@ -209,6 +225,7 @@
#define ARCHIVE_COMPRESSION_BZIP2 2
#define ARCHIVE_COMPRESSION_COMPRESS 3
#define ARCHIVE_COMPRESSION_PROGRAM 4
+#define ARCHIVE_COMPRESSION_LZMA 5
/*
* Codes returned by archive_format.
@@ -333,15 +350,23 @@
__LA_DECL __LA_INT64_T archive_read_header_position(struct archive *);
/* Read data from the body of an entry. Similar to read(2). */
-__LA_DECL __LA_SSIZE_T archive_read_data(struct archive *, void *, size_t);
+__LA_DECL __LA_SSIZE_T archive_read_data(struct archive *,
+ void *, size_t);
+
/*
* A zero-copy version of archive_read_data that also exposes the file offset
* of each returned block. Note that the client has no way to specify
* the desired size of the block. The API does guarantee that offsets will
* be strictly increasing and that returned blocks will not overlap.
*/
+#if ARCHIVE_VERSION_NUMBER < 3000000
+__LA_DECL int archive_read_data_block(struct archive *a,
+ const void **buff, size_t *size, off_t *offset);
+#else
__LA_DECL int archive_read_data_block(struct archive *a,
- const void **buff, size_t *size, off_t *offset);
+ const void **buff, size_t *size,
+ __LA_INT64_T *offset);
+#endif
/*-
* Some convenience functions that are built on archive_read_data:
@@ -350,8 +375,8 @@
* 'into_fd': writes data to specified filedes
*/
__LA_DECL int archive_read_data_skip(struct archive *);
-__LA_DECL int archive_read_data_into_buffer(struct archive *, void *buffer,
- __LA_SSIZE_T len);
+__LA_DECL int archive_read_data_into_buffer(struct archive *,
+ void *buffer, __LA_SSIZE_T len);
__LA_DECL int archive_read_data_into_fd(struct archive *, int fd);
/*-
@@ -414,12 +439,11 @@
__LA_DECL int archive_read_close(struct archive *);
/* Release all resources and destroy the object. */
/* Note that archive_read_finish will call archive_read_close for you. */
-#if ARCHIVE_VERSION_NUMBER >= 2000000
-__LA_DECL int archive_read_finish(struct archive *);
-#else
-/* Temporarily allow library to compile with either 1.x or 2.0 API. */
+#if ARCHIVE_VERSION_NUMBER < 2000000
/* Erroneously declared to return void in libarchive 1.x */
__LA_DECL void archive_read_finish(struct archive *);
+#else
+__LA_DECL int archive_read_finish(struct archive *);
#endif
/*-
@@ -491,22 +515,36 @@
*/
__LA_DECL int archive_write_header(struct archive *,
struct archive_entry *);
-#if ARCHIVE_VERSION_NUMBER >= 2000000
-__LA_DECL __LA_SSIZE_T archive_write_data(struct archive *, const void *, size_t);
+#if ARCHIVE_VERSION_NUMBER < 2000000
+/* This was erroneously declared to return "int" in libarchive 1.x. */
+__LA_DECL int archive_write_data(struct archive *,
+ const void *, size_t);
+#else
+/* Libarchive 2.0 and later return ssize_t here. */
+__LA_DECL __LA_SSIZE_T archive_write_data(struct archive *,
+ const void *, size_t);
+#endif
+
+#if ARCHIVE_VERSION_NUMBER < 3000000
+/* Libarchive 1.x and 2.x use off_t for the argument, but that's not
+ * stable on Linux. */
+__LA_DECL __LA_SSIZE_T archive_write_data_block(struct archive *,
+ const void *, size_t, off_t);
#else
-/* Temporarily allow library to compile with either 1.x or 2.0 API. */
-/* This was erroneously declared to return "int" in libarchive 1.x. */
-__LA_DECL int archive_write_data(struct archive *, const void *, size_t);
+/* Libarchive 3.0 uses explicit int64_t to ensure consistent 64-bit support. */
+__LA_DECL __LA_SSIZE_T archive_write_data_block(struct archive *,
+ const void *, size_t, __LA_INT64_T);
#endif
-__LA_DECL __LA_SSIZE_T archive_write_data_block(struct archive *, const void *, size_t, off_t);
__LA_DECL int archive_write_finish_entry(struct archive *);
__LA_DECL int archive_write_close(struct archive *);
-#if ARCHIVE_VERSION_NUMBER >= 2000000
-__LA_DECL int archive_write_finish(struct archive *);
-#else
-/* Temporarily allow library to compile with either 1.x or 2.0 API. */
+#if ARCHIVE_VERSION_NUMBER < 2000000
/* Return value was incorrect in libarchive 1.x. */
__LA_DECL void archive_write_finish(struct archive *);
+#else
+/* Libarchive 2.x and later returns an error if this fails. */
+/* It can fail if the archive wasn't already closed, in which case
+ * archive_write_finish() will implicitly call archive_write_close(). */
+__LA_DECL int archive_write_finish(struct archive *);
#endif
/*-
@@ -589,5 +627,9 @@
/* This is meaningless outside of this header. */
#undef __LA_DECL
+#undef __LA_GID_T
+#undef __LA_INT64_T
+#undef __LA_SSIZE_T
+#undef __LA_UID_T
#endif /* !ARCHIVE_H_INCLUDED */
==== //depot/projects/mpsafetty/lib/libarchive/archive_check_magic.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.8 2007/04/02 00:15:45 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.9 2008/12/06 05:52:01 kientzle Exp $");
#ifdef HAVE_SYS_TYPES_H
#include
@@ -46,7 +46,7 @@
static void
errmsg(const char *m)
{
- write(STDERR_FILENO, m, strlen(m));
+ write(2, m, strlen(m));
}
static void
==== //depot/projects/mpsafetty/lib/libarchive/archive_endian.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/lib/libarchive/archive_endian.h,v 1.3 2008/05/26 17:00:22 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.4 2008/12/06 06:12:24 kientzle Exp $
*
* Borrowed from FreeBSD's
*/
@@ -35,14 +35,14 @@
#define ARCHIVE_ENDIAN_H_INCLUDED
-/* Watcom C++ doesn't support 'inline' in C code. (For any version?) */
-#if defined( __WATCOMC__ )
- #define inline
-#endif
-
-/* Visual C++ 6.0 doesn't support 'inline' in C code. (Does VC7? VC8?) */
-#if defined(_MSC_VER)
- #define inline
+/*
+ * Disabling inline keyword for compilers known to choke on it:
+ * - Watcom C++ in C code. (For any version?)
+ * - SGI MIPSpro
+ * - Microsoft Visual C++ 6.0 (supposedly newer versions too)
+ */
+#if defined(__WATCOMC__) || defined(__sgi) || defined(_MSC_VER)
+#define inline
#endif
/* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
==== //depot/projects/mpsafetty/lib/libarchive/archive_entry.h#5 (text+ko) ====
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.30 2008/09/30 03:53:03 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.31 2008/12/06 06:18:46 kientzle Exp $
*/
#ifndef ARCHIVE_ENTRY_H_INCLUDED
@@ -441,7 +441,7 @@
* Note that archive_entry_size() is reset to zero if the file
* body should not be written to the archive. Pay attention!
*/
-__LA_DECL struct archive_entry_linkresolver;
+struct archive_entry_linkresolver;
/*
* There are three different strategies for marking hardlinks.
==== //depot/projects/mpsafetty/lib/libarchive/archive_platform.h#3 (text+ko) ====
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.31 2008/09/12 04:03:34 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.32 2008/12/06 05:53:05 kientzle Exp $
*/
/*
@@ -39,10 +39,7 @@
/* archive.h and archive_entry.h require this. */
#define __LIBARCHIVE_BUILD 1
-#ifdef _WIN32
-#include "config_windows.h"
-#include "archive_windows.h"
-#elif defined(PLATFORM_CONFIG_H)
+#if defined(PLATFORM_CONFIG_H)
/* Use hand-built config.h in environments that need it. */
#include PLATFORM_CONFIG_H
#elif defined(HAVE_CONFIG_H)
==== //depot/projects/mpsafetty/lib/libarchive/archive_private.h#3 (text+ko) ====
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.30 2008/08/04 01:25:48 cperciva Exp $
+ * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.32 2008/12/06 06:23:37 kientzle Exp $
*/
#ifndef ARCHIVE_PRIVATE_H_INCLUDED
@@ -31,15 +31,22 @@
#include "archive.h"
#include "archive_string.h"
+#if defined(__GNUC__) && (__GNUC__ > 2 || \
+ (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
+#define __LA_DEAD __attribute__((__noreturn__))
+#else
+#define __LA_DEAD
+#endif
+
#define ARCHIVE_WRITE_MAGIC (0xb0c5c0deU)
#define ARCHIVE_READ_MAGIC (0xdeb0c5U)
-#define ARCHIVE_WRITE_DISK_MAGIC (0xc001b0c5U)
+#define ARCHIVE_WRITE_DISK_MAGIC (0xc001b0c5U)
#define ARCHIVE_STATE_ANY 0xFFFFU
#define ARCHIVE_STATE_NEW 1U
#define ARCHIVE_STATE_HEADER 2U
#define ARCHIVE_STATE_DATA 4U
-#define ARCHIVE_STATE_DATA_END 8U
+#define ARCHIVE_STATE_DATA_END 8U
#define ARCHIVE_STATE_EOF 0x10U
#define ARCHIVE_STATE_CLOSED 0x20U
#define ARCHIVE_STATE_FATAL 0x8000U
@@ -92,7 +99,7 @@
void __archive_check_magic(struct archive *, unsigned int magic,
unsigned int state, const char *func);
-void __archive_errx(int retvalue, const char *msg) __dead2;
+void __archive_errx(int retvalue, const char *msg) __LA_DEAD;
#define err_combine(a,b) ((a) < (b) ? (a) : (b))
==== //depot/projects/mpsafetty/lib/libarchive/archive_read.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.38 2008/03/12 04:58:32 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.39 2008/12/06 06:45:15 kientzle Exp $");
#ifdef HAVE_ERRNO_H
#include
@@ -53,9 +53,10 @@
#include "archive_private.h"
#include "archive_read_private.h"
-static void choose_decompressor(struct archive_read *, const void*, size_t);
+#define minimum(a, b) (a < b ? a : b)
+
+static int build_stream(struct archive_read *);
static int choose_format(struct archive_read *);
-static off_t dummy_skip(struct archive_read *, off_t);
/*
* Allocate, initialize and return a struct archive object.
@@ -74,8 +75,15 @@
a->archive.state = ARCHIVE_STATE_NEW;
a->entry = archive_entry_new();
- /* We always support uncompressed archives. */
- archive_read_support_compression_none(&a->archive);
+ /* Initialize reblocking logic. */
+ a->buffer_size = 64 * 1024; /* 64k */
+ a->buffer = (char *)malloc(a->buffer_size);
+ a->next = a->buffer;
+ if (a->buffer == NULL) {
+ archive_entry_free(a->entry);
+ free(a);
+ return (NULL);
+ }
return (&a->archive);
}
@@ -108,6 +116,33 @@
client_reader, NULL, client_closer);
}
+static ssize_t
+client_read_proxy(struct archive_read_source *self, const void **buff)
+{
+ return (self->archive->client.reader)((struct archive *)self->archive,
+ self->data, buff);
+}
+
+static int64_t
+client_skip_proxy(struct archive_read_source *self, int64_t request)
+{
+ return (self->archive->client.skipper)((struct archive *)self->archive,
+ self->data, request);
+}
+
+static int
+client_close_proxy(struct archive_read_source *self)
+{
+ int r = ARCHIVE_OK;
+
+ if (self->archive->client.closer != NULL)
+ r = (self->archive->client.closer)((struct archive *)self->archive,
+ self->data);
+ free(self);
+ return (r);
+}
+
+
int
archive_read_open2(struct archive *_a, void *client_data,
archive_open_callback *client_opener,
@@ -116,28 +151,15 @@
archive_close_callback *client_closer)
{
struct archive_read *a = (struct archive_read *)_a;
- const void *buffer;
- ssize_t bytes_read;
int e;
- __archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW, "archive_read_open");
+ __archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
+ "archive_read_open");
if (client_reader == NULL)
__archive_errx(1,
"No reader function provided to archive_read_open");
- /*
- * Set these NULL initially. If the open or initial read fails,
- * we'll leave them NULL to indicate that the file is invalid.
- * (In particular, this helps ensure that the closer doesn't
- * get called more than once.)
- */
- a->client_opener = NULL;
- a->client_reader = NULL;
- a->client_skipper = NULL;
- a->client_closer = NULL;
- a->client_data = NULL;
-
/* Open data source. */
if (client_opener != NULL) {
e =(client_opener)(&a->archive, client_data);
@@ -149,129 +171,103 @@
}
}
- /* Read first block now for compress format detection. */
- bytes_read = (client_reader)(&a->archive, client_data, &buffer);
+ /* Save the client functions and mock up the initial source. */
+ a->client.opener = client_opener; /* Do we need to remember this? */
+ a->client.reader = client_reader;
+ a->client.skipper = client_skipper;
+ a->client.closer = client_closer;
+ a->client.data = client_data;
+
+ {
+ struct archive_read_source *source;
- if (bytes_read < 0) {
- /* If the first read fails, close before returning error. */
- if (client_closer)
- (client_closer)(&a->archive, client_data);
- /* client_reader should have already set error information. */
- return (ARCHIVE_FATAL);
+ source = calloc(1, sizeof(*source));
+ if (source == NULL)
+ return (ARCHIVE_FATAL);
+ source->reader = NULL;
+ source->upstream = NULL;
+ source->archive = a;
+ source->data = client_data;
+ source->read = client_read_proxy;
+ source->skip = client_skip_proxy;
+ source->close = client_close_proxy;
+ a->source = source;
}
- /* Now that the client callbacks have worked, remember them. */
- a->client_opener = client_opener; /* Do we need to remember this? */
- a->client_reader = client_reader;
- a->client_skipper = client_skipper;
- a->client_closer = client_closer;
- a->client_data = client_data;
+ /* In case there's no filter. */
+ a->archive.compression_code = ARCHIVE_COMPRESSION_NONE;
+ a->archive.compression_name = "none";
- /* Select a decompression routine. */
- choose_decompressor(a, buffer, (size_t)bytes_read);
- if (a->decompressor == NULL)
- return (ARCHIVE_FATAL);
-
- /* Initialize decompression routine with the first block of data. */
- e = (a->decompressor->init)(a, buffer, (size_t)bytes_read);
-
+ /* Build out the input pipeline. */
+ e = build_stream(a);
if (e == ARCHIVE_OK)
a->archive.state = ARCHIVE_STATE_HEADER;
- /*
- * If the decompressor didn't register a skip function, provide a
- * dummy compression-layer skip function.
- */
- if (a->decompressor->skip == NULL)
- a->decompressor->skip = dummy_skip;
-
return (e);
}
/*
- * Allow each registered decompression routine to bid on whether it
- * wants to handle this stream. Return index of winning bidder.
+ * Allow each registered stream transform to bid on whether
+ * it wants to handle this stream. Repeat until we've finished
+ * building the pipeline.
*/
-static void
-choose_decompressor(struct archive_read *a,
- const void *buffer, size_t bytes_read)
+static int
+build_stream(struct archive_read *a)
{
- int decompression_slots, i, bid, best_bid;
- struct decompressor_t *decompressor, *best_decompressor;
+ int number_readers, i, bid, best_bid;
+ struct archive_reader *reader, *best_reader;
+ struct archive_read_source *source;
+ const void *block;
+ ssize_t bytes_read;
+
+ /* Read first block now for compress format detection. */
+ bytes_read = (a->source->read)(a->source, &block);
+ if (bytes_read < 0) {
+ /* If the first read fails, close before returning error. */
+ if (a->source->close != NULL) {
+ (a->source->close)(a->source);
+ a->source = NULL;
+ }
+ /* source->read should have already set error information. */
+ return (ARCHIVE_FATAL);
+ }
- decompression_slots = sizeof(a->decompressors) /
- sizeof(a->decompressors[0]);
+ number_readers = sizeof(a->readers) / sizeof(a->readers[0]);
best_bid = 0;
- a->decompressor = NULL;
- best_decompressor = NULL;
+ best_reader = NULL;
- decompressor = a->decompressors;
- for (i = 0; i < decompression_slots; i++) {
- if (decompressor->bid) {
- bid = (decompressor->bid)(buffer, bytes_read);
- if (bid > best_bid || best_decompressor == NULL) {
+ reader = a->readers;
+ for (i = 0, reader = a->readers; i < number_readers; i++, reader++) {
+ if (reader->bid != NULL) {
+ bid = (reader->bid)(reader, block, bytes_read);
+ if (bid > best_bid) {
best_bid = bid;
- best_decompressor = decompressor;
+ best_reader = reader;
}
}
- decompressor ++;
}
/*
- * There were no bidders; this is a serious programmer error
- * and demands a quick and definitive abort.
+ * If we have a winner, it becomes the next stage in the pipeline.
*/
- if (best_decompressor == NULL)
- __archive_errx(1, "No decompressors were registered; you "
- "must call at least one "
- "archive_read_support_compression_XXX function in order "
- "to successfully read an archive.");
-
- /*
- * There were bidders, but no non-zero bids; this means we can't
- * support this stream.
- */
- if (best_bid < 1) {
- archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
- "Unrecognized archive format");
- return;
- }
-
- /* Record the best decompressor for this stream. */
- a->decompressor = best_decompressor;
-}
-
-/*
- * Dummy skip function, for use if the compression layer doesn't provide
- * one: This code just reads data and discards it.
- */
-static off_t
-dummy_skip(struct archive_read * a, off_t request)
-{
- const void * dummy_buffer;
- ssize_t bytes_read;
- off_t bytes_skipped;
-
- for (bytes_skipped = 0; request > 0;) {
- bytes_read = (a->decompressor->read_ahead)(a, &dummy_buffer, 1);
- if (bytes_read < 0)
- return (bytes_read);
- if (bytes_read == 0) {
- /* Premature EOF. */
- archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "Truncated input file (need to skip %jd bytes)",
- (intmax_t)request);
+ if (best_reader != NULL) {
+ source = (best_reader->init)(a, best_reader, a->source,
+ block, bytes_read);
+ if (source == NULL)
return (ARCHIVE_FATAL);
- }
- if (bytes_read > request)
- bytes_read = (ssize_t)request;
- (a->decompressor->consume)(a, (size_t)bytes_read);
- request -= bytes_read;
- bytes_skipped += bytes_read;
+ /* Record the best decompressor for this stream. */
+ a->source = source;
+ /* Recurse to get next pipeline stage. */
+ return (build_stream(a));
}
- return (bytes_skipped);
+ /* Save first block of data. */
+ a->client_buff = block;
+ a->client_total = bytes_read;
+ a->client_next = a->client_buff;
+ a->client_avail = a->client_total;
+ return (ARCHIVE_OK);
}
/*
@@ -598,23 +594,24 @@
/* TODO: Clean up the formatters. */
- /* Clean up the decompressors. */
- n = sizeof(a->decompressors)/sizeof(a->decompressors[0]);
+ /* Clean up the stream pipeline. */
+ if (a->source != NULL) {
+ r1 = (a->source->close)(a->source);
+ if (r1 < r)
+ r = r1;
+ a->source = NULL;
+ }
+
+ /* Release the reader objects. */
+ n = sizeof(a->readers)/sizeof(a->readers[0]);
for (i = 0; i < n; i++) {
- if (a->decompressors[i].finish != NULL) {
- r1 = (a->decompressors[i].finish)(a);
+ if (a->readers[i].free != NULL) {
+ r1 = (a->readers[i].free)(&a->readers[i]);
if (r1 < r)
r = r1;
}
}
- /* Close the client stream. */
- if (a->client_closer != NULL) {
- r1 = ((a->client_closer)(&a->archive, a->client_data));
- if (r1 < r)
- r = r1;
- }
-
return (r);
}
@@ -651,6 +648,7 @@
if (a->entry)
archive_entry_free(a->entry);
a->archive.magic = 0;
+ free(a->buffer);
free(a);
#if ARCHIVE_API_VERSION > 1
return (r);
@@ -700,40 +698,350 @@
* Used internally by decompression routines to register their bid and
* initialization functions.
*/
-struct decompressor_t *
-__archive_read_register_compression(struct archive_read *a,
- int (*bid)(const void *, size_t),
- int (*init)(struct archive_read *, const void *, size_t))
+struct archive_reader *
+__archive_read_get_reader(struct archive_read *a)
{
int i, number_slots;
__archive_check_magic(&a->archive,
ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
- "__archive_read_register_compression");
+ "__archive_read_get_reader");
- number_slots = sizeof(a->decompressors) / sizeof(a->decompressors[0]);
+ number_slots = sizeof(a->readers) / sizeof(a->readers[0]);
for (i = 0; i < number_slots; i++) {
- if (a->decompressors[i].bid == bid)
- return (a->decompressors + i);
- if (a->decompressors[i].bid == NULL) {
- a->decompressors[i].bid = bid;
- a->decompressors[i].init = init;
- return (a->decompressors + i);
- }
+ if (a->readers[i].bid == NULL)
+ return (a->readers + i);
}
__archive_errx(1, "Not enough slots for compression registration");
return (NULL); /* Never actually executed. */
}
-/* used internally to simplify read-ahead */
+/*
+ * The next three functions comprise the peek/consume internal I/O
+ * system used by archive format readers. This system allows fairly
+ * flexible read-ahead and allows the I/O code to operate in a
+ * zero-copy manner most of the time.
+ *
+ * In the ideal case, block providers give the I/O code blocks of data
+ * and __archive_read_ahead() just returns pointers directly into
+ * those blocks. Then __archive_read_consume() just bumps those
+ * pointers. Only if your request would span blocks does the I/O
+ * layer use a copy buffer to provide you with a contiguous block of
+ * data. The __archive_read_skip() is an optimization; it scans ahead
+ * very quickly (it usually translates into a seek() operation if
+ * you're reading uncompressed disk files).
+ *
+ * A couple of useful idioms:
+ * * "I just want some data." Ask for 1 byte and pay attention to
+ * the "number of bytes available" from __archive_read_ahead().
+ * You can consume more than you asked for; you just can't consume
+ * more than is available right now. If you consume everything that's
+ * immediately available, the next read_ahead() call will pull
+ * the next block.
+ * * "I want to output a large block of data." As above, ask for 1 byte,
+ * emit all that's available (up to whatever limit you have), then
+ * repeat until you're done.
+ * * "I want to peek ahead by a large amount." Ask for 4k or so, then
+ * double and repeat until you get an error or have enough. Note
+ * that the I/O layer will likely end up expanding its copy buffer
+ * to fit your request, so use this technique cautiously. This
+ * technique is used, for example, by some of the format tasting
+ * code that has uncertain look-ahead needs.
+ *
+ * TODO: Someday, provide a more generic __archive_read_seek() for
+ * those cases where it's useful. This is tricky because there are lots
+ * of cases where seek() is not available (reading gzip data from a
+ * network socket, for instance), so there needs to be a good way to
+ * communicate whether seek() is available and users of that interface
+ * need to use non-seeking strategies whenever seek() is not available.
+ */
+
+/*
+ * Looks ahead in the input stream:
+ * * If 'avail' pointer is provided, that returns number of bytes available
+ * in the current buffer, which may be much larger than requested.
+ * * If end-of-file, *avail gets set to zero.
+ * * If error, *avail gets error code.
+ * * If request can be met, returns pointer to data, returns NULL
+ * if request is not met.
+ *
+ * Note: If you just want "some data", ask for 1 byte and pay attention
+ * to *avail, which will have the actual amount available. If you
+ * know exactly how many bytes you need, just ask for that and treat
+ * a NULL return as an error.
+ *
+ * Important: This does NOT move the file pointer. See
+ * __archive_read_consume() below.
+ */
+
+/*
+ * This is tricky. We need to provide our clients with pointers to
+ * contiguous blocks of memory but we want to avoid copying whenever
+ * possible.
+ *
+ * Mostly, this code returns pointers directly into the block of data
+ * provided by the client_read routine. It can do this unless the
+ * request would split across blocks. In that case, we have to copy
+ * into an internal buffer to combine reads.
+ */
const void *
-__archive_read_ahead(struct archive_read *a, size_t len)
+__archive_read_ahead(struct archive_read *a, size_t min, ssize_t *avail)
{
- const void *h;
+ ssize_t bytes_read;
+ size_t tocopy;
- if ((a->decompressor->read_ahead)(a, &h, len) < (ssize_t)len)
+ if (a->fatal) {
+ if (avail)
+ *avail = ARCHIVE_FATAL;
return (NULL);
- return (h);
+ }
+
+ /*
+ * Keep pulling more data until we can satisfy the request.
+ */
+ for (;;) {
+
+ /*
+ * If we can satisfy from the copy buffer, we're done.
+ */
+ if (a->avail >= min) {
+ if (avail != NULL)
+ *avail = a->avail;
+ return (a->next);
+ }
+
+ /*
+ * We can satisfy directly from client buffer if everything
+ * currently in the copy buffer is still in the client buffer.
+ */
+ if (a->client_total >= a->client_avail + a->avail
+ && a->client_avail + a->avail >= min) {
+ /* "Roll back" to client buffer. */
+ a->client_avail += a->avail;
+ a->client_next -= a->avail;
+ /* Copy buffer is now empty. */
+ a->avail = 0;
+ a->next = a->buffer;
+ /* Return data from client buffer. */
+ if (avail != NULL)
+ *avail = a->client_avail;
+ return (a->client_next);
+ }
+
+ /* Move data forward in copy buffer if necessary. */
+ if (a->next > a->buffer &&
+ a->next + min > a->buffer + a->buffer_size) {
+ if (a->avail > 0)
+ memmove(a->buffer, a->next, a->avail);
+ a->next = a->buffer;
+ }
+
+ /* If we've used up the client data, get more. */
+ if (a->client_avail <= 0) {
+ if (a->end_of_file) {
+ if (avail != NULL)
+ *avail = 0;
+ return (NULL);
+ }
+ bytes_read = (a->source->read)(a->source,
+ &a->client_buff);
+ if (bytes_read < 0) { /* Read error. */
+ a->client_total = a->client_avail = 0;
+ a->client_next = a->client_buff = NULL;
+ a->fatal = 1;
+ if (avail != NULL)
+ *avail = ARCHIVE_FATAL;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 12:28:29 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id A7A971065673; Sun, 7 Dec 2008 12:28:29 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 52F9D106564A
for ; Sun, 7 Dec 2008 12:28:29 +0000 (UTC)
(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 412EB8FC0C
for ; Sun, 7 Dec 2008 12:28:29 +0000 (UTC)
(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7CSTBq062467
for ; Sun, 7 Dec 2008 12:28:29 GMT
(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7CSTfx062465
for perforce@freebsd.org; Sun, 7 Dec 2008 12:28:29 GMT
(envelope-from ed@FreeBSD.org)
Date: Sun, 7 Dec 2008 12:28:29 GMT
Message-Id: <200812071228.mB7CSTfx062465@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
ed@FreeBSD.org using -f
From: Ed Schouten
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154249 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 12:28:29 -0000
http://perforce.freebsd.org/chv.cgi?CH=154249
Change 154249 by ed@ed_flippo on 2008/12/07 12:27:41
- Import updated libteken with support for 132 column mode (not
implemented by us).
- Replace UTF-8 characters by bright yellow/red cells with a
question mark for now. We still need UTF-8 font maps.
Affected files ...
.. //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#14 edit
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#7 edit
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#5 edit
Differences ...
==== //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#14 (text+ko) ====
@@ -265,11 +265,19 @@
{
scr_stat *scp = arg;
u_char *map;
- u_char ch = c;
+ u_char ch;
vm_offset_t p;
int cursor, attr;
- attr = scteken_attr(a);
+ if (c >= 0x80) {
+ /* XXX: Don't display UTF-8 yet. */
+ attr = (FG_YELLOW|BG_RED) << 8;
+ ch = '?';
+ } else {
+ attr = scteken_attr(a);
+ ch = c;
+ }
+
map = scp->sc->scr_map;
cursor = tp->tp_row * scp->xsize + tp->tp_col;
@@ -287,11 +295,19 @@
{
scr_stat *scp = arg;
u_char *map;
- u_char ch = c;
+ u_char ch;
unsigned int width;
int attr, row;
- attr = scteken_attr(a);
+ if (c >= 0x80) {
+ /* XXX: Don't display UTF-8 yet. */
+ attr = (FG_YELLOW|BG_RED) << 8;
+ ch = '?';
+ } else {
+ attr = scteken_attr(a);
+ ch = c;
+ }
+
map = scp->sc->scr_map;
if (r->tr_begin.tp_col == 0 && r->tr_end.tp_col == scp->xsize) {
==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#7 (text+ko) ====
@@ -95,6 +95,7 @@
#define TP_KEYPADAPP 2
#define TP_AUTOREPEAT 3
#define TP_SWITCHVT 4
+#define TP_132COLS 5
typedef void tf_respond_t(void *, const void *, size_t);
typedef struct {
==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#5 (text+ko) ====
@@ -24,9 +24,10 @@
* SUCH DAMAGE.
*/
+static void teken_subr_cursor_up(teken_t *, unsigned int);
static void teken_subr_erase_line(teken_t *, unsigned int);
static void teken_subr_regular_character(teken_t *, teken_char_t);
-static void teken_subr_cursor_up(teken_t *, unsigned int);
+static void teken_subr_reset_to_initial_state(teken_t *);
static inline int
teken_tab_isset(teken_t *t, unsigned int col)
@@ -684,25 +685,33 @@
static void
teken_subr_regular_character(teken_t *t, teken_char_t c)
{
+ unsigned int width;
/* Unprintable characters. */
if (c <= 0x1B)
return;
+
+ /* XXX: calculate character width! */
+#ifdef TEKEN_UTF8
+ width = 1;
+#else /* !TEKEN_UTF8 */
+ width = 1;
+#endif /* TEKEN_UTF8 */
if (t->t_stateflags & TS_INSERT) {
/*
* Insert mode. Keep cursor at the same place, but move
* all existing characters to the right.
*/
- if (t->t_cursor.tp_col < t->t_winsize.tp_col - 1) {
+ if (t->t_cursor.tp_col < t->t_winsize.tp_col - width) {
teken_rect_t tr;
teken_pos_t tp;
tr.tr_begin = t->t_cursor;
tr.tr_end.tp_row = t->t_cursor.tp_row + 1;
- tr.tr_end.tp_col = t->t_winsize.tp_col - 1;
+ tr.tr_end.tp_col = t->t_winsize.tp_col - width;
tp.tp_row = t->t_cursor.tp_row;
- tp.tp_col = t->t_cursor.tp_col + 1;
+ tp.tp_col = t->t_cursor.tp_col + width;
teken_funcs_copy(t, &tr, &tp);
}
@@ -733,7 +742,7 @@
teken_funcs_putchar(t, &tp, c, &t->t_curattr);
t->t_cursor.tp_row = tp.tp_row;
- t->t_cursor.tp_col = 1;
+ t->t_cursor.tp_col = width;
t->t_stateflags &= ~TS_WRAPPED;
} else {
/* No scrolling needed. */
@@ -741,7 +750,7 @@
if (t->t_cursor.tp_col == t->t_winsize.tp_col - 1) {
t->t_stateflags |= TS_WRAPPED;
} else {
- t->t_cursor.tp_col++;
+ t->t_cursor.tp_col += width;
t->t_stateflags &= ~TS_WRAPPED;
}
}
@@ -758,19 +767,13 @@
teken_funcs_param(t, TP_CURSORKEYS, 0);
break;
case 3: /* 132 column mode. */
- teken_printf("DECRST 132 columns\n");
- /* XXX: temporary hacks to allow autowrap testing. */
- teken_subr_erase_display(t, 2);
- t->t_cursor.tp_row = 0;
- t->t_cursor.tp_col = 0;
- t->t_stateflags &= ~TS_WRAPPED;
- teken_funcs_cursor(t);
+ teken_funcs_param(t, TP_132COLS, 0);
+ teken_subr_reset_to_initial_state(t);
break;
case 5: /* Inverse video. */
teken_printf("DECRST inverse video\n");
break;
case 6: /* Origin mode. */
- teken_printf("DECRST origin mode\n");
t->t_stateflags &= ~TS_ORIGIN;
t->t_originreg.ts_begin = 0;
t->t_originreg.ts_end = t->t_winsize.tp_row;
@@ -779,7 +782,6 @@
teken_funcs_cursor(t);
break;
case 7: /* Autowrap mode. */
- teken_printf("DECRST autowrap mode\n");
t->t_stateflags &= ~TS_AUTOWRAP;
break;
case 8: /* Autorepeat mode. */
@@ -892,19 +894,13 @@
teken_funcs_param(t, TP_CURSORKEYS, 1);
break;
case 3: /* 132 column mode. */
- teken_printf("DECSET 132 columns\n");
- /* XXX: temporary hacks to allow autowrap testing. */
- teken_subr_erase_display(t, 2);
- t->t_cursor.tp_row = 0;
- t->t_cursor.tp_col = 0;
- t->t_stateflags &= ~TS_WRAPPED;
- teken_funcs_cursor(t);
+ teken_funcs_param(t, TP_132COLS, 1);
+ teken_subr_reset_to_initial_state(t);
break;
case 5: /* Inverse video. */
teken_printf("DECSET inverse video\n");
break;
case 6: /* Origin mode. */
- teken_printf("DECSET origin mode\n");
t->t_stateflags |= TS_ORIGIN;
t->t_originreg = t->t_scrollreg;
t->t_cursor.tp_row = t->t_scrollreg.ts_begin;
@@ -913,7 +909,6 @@
teken_funcs_cursor(t);
break;
case 7: /* Autowrap mode. */
- teken_printf("DECSET autowrap mode\n");
t->t_stateflags |= TS_AUTOWRAP;
break;
case 8: /* Autorepeat mode. */
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 13:11:14 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5E814106567C; Sun, 7 Dec 2008 13:11:14 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 21F6A106564A
for ; Sun, 7 Dec 2008 13:11:14 +0000 (UTC)
(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 10F1D8FC0C
for ; Sun, 7 Dec 2008 13:11:14 +0000 (UTC)
(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7DBDiI083274
for ; Sun, 7 Dec 2008 13:11:13 GMT
(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7DBDLS083272
for perforce@freebsd.org; Sun, 7 Dec 2008 13:11:13 GMT
(envelope-from ed@FreeBSD.org)
Date: Sun, 7 Dec 2008 13:11:13 GMT
Message-Id: <200812071311.mB7DBDLS083272@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
ed@FreeBSD.org using -f
From: Ed Schouten
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154254 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 13:11:14 -0000
http://perforce.freebsd.org/chv.cgi?CH=154254
Change 154254 by ed@ed_flippo on 2008/12/07 13:10:56
Add an implementation of wcwidth() to libteken.
I just took Markus Kuhn's implementation (see URL in
teken_wcwidth.h). Maybe we should add it to libkern. It's good
enough for now.
Affected files ...
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#4 edit
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#6 edit
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_wcwidth.h#1 add
Differences ...
==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#4 (text+ko) ====
@@ -46,6 +46,16 @@
#endif /* __FreeBSD__ && _KERNEL */
#include "teken.h"
+#ifdef TEKEN_UTF8
+#include "teken_wcwidth.h"
+#else /* !TEKEN_UTF8 */
+static inline int
+teken_wcwidth(teken_char_t c)
+{
+
+ return (c <= 0x1B) ? -1 : 1;
+}
+#endif /* TEKEN_UTF8 */
#define teken_clamp(x,low,high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#6 (text+ko) ====
@@ -685,18 +685,11 @@
static void
teken_subr_regular_character(teken_t *t, teken_char_t c)
{
- unsigned int width;
+ int width;
- /* Unprintable characters. */
- if (c <= 0x1B)
+ width = teken_wcwidth(c);
+ if (width < 0)
return;
-
- /* XXX: calculate character width! */
-#ifdef TEKEN_UTF8
- width = 1;
-#else /* !TEKEN_UTF8 */
- width = 1;
-#endif /* TEKEN_UTF8 */
if (t->t_stateflags & TS_INSERT) {
/*
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 14:01:05 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 943841065677; Sun, 7 Dec 2008 14:01:05 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 56FA61065672
for ; Sun, 7 Dec 2008 14:01:05 +0000 (UTC)
(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 2CF8D8FC13
for ; Sun, 7 Dec 2008 14:01:05 +0000 (UTC)
(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7E14XU087348
for ; Sun, 7 Dec 2008 14:01:04 GMT
(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7E14Hc087346
for perforce@freebsd.org; Sun, 7 Dec 2008 14:01:04 GMT
(envelope-from ed@FreeBSD.org)
Date: Sun, 7 Dec 2008 14:01:04 GMT
Message-Id: <200812071401.mB7E14Hc087346@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
ed@FreeBSD.org using -f
From: Ed Schouten
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154257 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 14:01:05 -0000
http://perforce.freebsd.org/chv.cgi?CH=154257
Change 154257 by ed@ed_flippo on 2008/12/07 14:00:44
Don't hardcode to 1-column characters here.
Affected files ...
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#7 edit
Differences ...
==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#7 (text+ko) ====
@@ -740,7 +740,7 @@
} else {
/* No scrolling needed. */
teken_funcs_putchar(t, &t->t_cursor, c, &t->t_curattr);
- if (t->t_cursor.tp_col == t->t_winsize.tp_col - 1) {
+ if (t->t_cursor.tp_col >= t->t_winsize.tp_col - width) {
t->t_stateflags |= TS_WRAPPED;
} else {
t->t_cursor.tp_col += width;
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 15:34:40 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 815D41065675; Sun, 7 Dec 2008 15:34:40 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 3B42D1065672
for ; Sun, 7 Dec 2008 15:34:40 +0000 (UTC)
(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 20CF48FC14
for ; Sun, 7 Dec 2008 15:34:40 +0000 (UTC)
(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7FYduE097808
for ; Sun, 7 Dec 2008 15:34:39 GMT
(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7FYd8c097806
for perforce@freebsd.org; Sun, 7 Dec 2008 15:34:39 GMT
(envelope-from ed@FreeBSD.org)
Date: Sun, 7 Dec 2008 15:34:39 GMT
Message-Id: <200812071534.mB7FYd8c097806@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
ed@FreeBSD.org using -f
From: Ed Schouten
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154259 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 15:34:40 -0000
http://perforce.freebsd.org/chv.cgi?CH=154259
Change 154259 by ed@ed_mekker on 2008/12/07 15:34:28
Argh! How hard is it to do it right? It seems we should not do
wrapping on tabs after all.
Affected files ...
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#8 edit
Differences ...
==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#8 (text+ko) ====
@@ -275,15 +275,13 @@
do {
/* Stop when we've reached the end of the line. */
- if ((t->t_stateflags & TS_AUTOWRAP) == 0 &&
- t->t_cursor.tp_col == t->t_winsize.tp_col - 1)
+ if (t->t_cursor.tp_col == t->t_winsize.tp_col - 1)
break;
teken_subr_regular_character(t, ' ');
/* Tab marker set. */
- if (t->t_stateflags & TS_WRAPPED ||
- teken_tab_isset(t, t->t_cursor.tp_col))
+ if (teken_tab_isset(t, t->t_cursor.tp_col))
ntabs--;
} while (ntabs > 0);
}
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 19:07:28 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 31CF71065678; Sun, 7 Dec 2008 19:07:28 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id D1BBC1065675
for ; Sun, 7 Dec 2008 19:07:27 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id BD8C78FC27
for ; Sun, 7 Dec 2008 19:07:27 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7J7Rdl090456
for ; Sun, 7 Dec 2008 19:07:27 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7J7RQ5090454
for perforce@freebsd.org; Sun, 7 Dec 2008 19:07:27 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 7 Dec 2008 19:07:27 GMT
Message-Id: <200812071907.mB7J7RQ5090454@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154280 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 19:07:28 -0000
http://perforce.freebsd.org/chv.cgi?CH=154280
Change 154280 by rwatson@rwatson_cinnamon_macosx on 2008/12/07 19:07:10
Regenerate test tokens.
Affected files ...
.. //depot/projects/trustedbsd/openbsm/test/reference/arg32_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/arg32_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/data_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/data_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/file_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/file_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/header32_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/in_addr_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/in_addr_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/ip_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/ip_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/ipc_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/ipc_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/iport_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/iport_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/opaque_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/opaque_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/path_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/path_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/process32_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/process32_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv4#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv6#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv4#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv6#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/process64_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/process64_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv4#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv6#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv4#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv6#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/return32_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/return32_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/seq_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/seq_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/socketex_record#2 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/socketex_token#2 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/subject32_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/subject32_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv4#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv6#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/text_record#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/text_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/trailer_token#3 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/zonename_record#2 edit
.. //depot/projects/trustedbsd/openbsm/test/reference/zonename_token#2 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/test/reference/arg32_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/arg32_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/data_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/data_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/file_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/file_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/header32_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/in_addr_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/in_addr_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/ip_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/ip_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/ipc_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/ipc_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/iport_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/iport_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/opaque_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/opaque_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/path_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/path_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/process32_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/process32_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv4#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv6#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv4#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv6#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/process64_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/process64_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv4#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv6#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv4#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv6#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/return32_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/return32_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/seq_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/seq_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/socketex_record#2 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/socketex_token#2 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/subject32_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/subject32_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv4#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv6#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/text_record#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/text_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/trailer_token#3 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/zonename_record#2 (binary) ====
==== //depot/projects/trustedbsd/openbsm/test/reference/zonename_token#2 (binary) ====
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 19:51:21 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 95A4C1065676; Sun, 7 Dec 2008 19:51:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 414891065672
for ; Sun, 7 Dec 2008 19:51:21 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 2D4B98FC13
for ; Sun, 7 Dec 2008 19:51:21 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7JpLaF017881
for ; Sun, 7 Dec 2008 19:51:21 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7JpLl4017879
for perforce@freebsd.org; Sun, 7 Dec 2008 19:51:21 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 7 Dec 2008 19:51:21 GMT
Message-Id: <200812071951.mB7JpLl4017879@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154288 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 19:51:21 -0000
http://perforce.freebsd.org/chv.cgi?CH=154288
Change 154288 by rwatson@rwatson_cinnamon on 2008/12/07 19:51:17
Bump OpenBSM BSM header version.
Complete deprecation of TRAILER_PAD_MAGIC by replacing it with
AUT_TRAILER_MAGIC and removing all references to the old Darwin
constant.
Affected files ...
.. //depot/projects/trustedbsd/openbsm/NEWS#16 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#84 edit
.. //depot/projects/trustedbsd/openbsm/man/audit.log.5#23 edit
.. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#6 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/NEWS#16 (text+ko) ====
@@ -12,6 +12,8 @@
after the exec args/env tokens.
- Support for AUT_SOCKET_EX extended socket tokens, which describe a socket
using a pair of IPv4/IPv6 and port tuples.
+- OpenBSM BSM file header version bumped for 1.1 release.
+- Deprecated Darwin constants, such as TRAILER_PAD_MAGIC, removed.
OpenBSM 1.1 alpha 2
@@ -361,4 +363,4 @@
to support reloading of kernel event table.
- Allow comments in /etc/security configuration files.
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#15 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#16 $
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#84 (text+ko) ====
@@ -30,7 +30,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#83 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#84 $
*/
#include
@@ -1556,7 +1556,7 @@
{
token_t *t;
u_char *dptr = NULL;
- u_int16_t magic = TRAILER_PAD_MAGIC;
+ u_int16_t magic = AUT_TRAILER_MAGIC;
GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int16_t) +
sizeof(u_int32_t));
==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#23 (text+ko) ====
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#22 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#23 $
.\"
.Dd November 5, 2006
.Dt AUDIT.LOG 5
@@ -140,7 +140,7 @@
The
.Dq trailer
terminates a BSM audit record, and contains a magic number,
-.Dv TRAILER_PAD_MAGIC
+.Dv AUT_TRAILER_MAGIC
and length that can be used to validate that the record was read properly.
A
.Dq trailer
==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#6 (text+ko) ====
@@ -26,7 +26,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.
*
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#5 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#6 $
*/
#ifndef _BSM_AUDIT_RECORD_H_
@@ -164,14 +164,11 @@
#define AUDIT_HEADER_VERSION_SOLARIS 2
#define AUDIT_HEADER_VERSION_TSOL25 3
#define AUDIT_HEADER_VERSION_TSOL 4
-#define AUDIT_HEADER_VERSION_OPENBSM 10
+#define AUDIT_HEADER_VERSION_OPENBSM10 10
+#define AUDIT_HEADER_VERSION_OPENBSM11 11
+#define AUDIT_HEADER_VERSION_OPENBSM AUDIT_HEADER_VERSION_OPENBSM11
-/*
- * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we
- * split the difference, will remove the Apple define for the next release.
- */
#define AUT_TRAILER_MAGIC 0xb105
-#define TRAILER_PAD_MAGIC AUT_TRAILER_MAGIC
/* BSM library calls */
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 20:15:46 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5E96D1065673; Sun, 7 Dec 2008 20:15:46 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 219E11065679
for ; Sun, 7 Dec 2008 20:15:46 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 0DDF38FC13
for ; Sun, 7 Dec 2008 20:15:46 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7KFkfQ035803
for ; Sun, 7 Dec 2008 20:15:46 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7KFjOj035798
for perforce@freebsd.org; Sun, 7 Dec 2008 20:15:45 GMT
(envelope-from rene@FreeBSD.org)
Date: Sun, 7 Dec 2008 20:15:45 GMT
Message-Id: <200812072015.mB7KFjOj035798@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154289 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 20:15:46 -0000
http://perforce.freebsd.org/chv.cgi?CH=154289
Change 154289 by rene@rene_self on 2008/12/07 20:14:54
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#8 integrate
.. //depot/projects/docproj_nl/www/en/multimedia/multimedia-input.xml#3 integrate
.. //depot/projects/docproj_nl/www/en/multimedia/multimedia.pl#2 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#10 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#3 (text+ko) ====
@@ -20,7 +20,7 @@
Jens Schweikhardt
- $FreeBSD: doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml,v 1.12 2008/12/03 21:59:51 schweikh Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml,v 1.14 2008/12/04 18:13:49 schweikh Exp $
&tm-attrib.freebsd;
@@ -119,7 +119,7 @@
done from within the old system, up to the point where you can
chroot to the new system. In other words, we go through three
stages, where each stage consists of either running a shell
- script or invoke make:
+ script or invoking make:
@@ -176,8 +176,9 @@
not be used for its usual duties. If you run a production server
you have to consider the downtime caused by stage two. The ports
compiled by stage_2.conf.default below require
- about 4 hours to build on an AMD1800+ SCSI system with 10krpm disks
- and 1GB of RAM. If you prefer to install packages instead of ports,
+ about 8 hours (of which 4 hours are due to
+ OpenOffice.org) to build on a contemporary
+ system. If you prefer to install packages instead of ports,
you can significantly reduce the downtime to about 10 minutes.
@@ -524,9 +525,9 @@
appropriate answers to the installation command (e.g. yes |
make install. For other ports you need to investigate
where exactly the interactive command is located and deal with it
- appropriately. The examples above for
+ appropriately. See the examples above for
print/acroread8 and
- java/jdk16 are examples.
+ java/jdk16.
You should also be aware of upgrade issues for config files.
In general you do not know when and if the format or contents of a
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.74 2006/04/28 12:39:55 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.76 2008/12/06 22:09:01 pgj Exp $
-->
@@ -50,7 +50,7 @@
content, please post it to the &a.doc;.
- Inline vs. block
+ Inline vs. BlockIn the remainder of this document, when describing elements,
inline means that the element can occur within a
@@ -64,7 +64,7 @@
HTML, the HyperText Markup Language, is the markup language of
choice on the World Wide Web. More information can be found at
- <URL:>.
+ .HTML is used to markup pages on the FreeBSD web site. It should not
(generally) be used to mark up other documentation,
@@ -77,7 +77,7 @@
latest, 4.0 (available in both strict and
loose variants).
- The HTML DTDs are available from the ports collection in the
+ The HTML DTDs are available from the Ports Collection in the
textproc/html port. They are automatically
installed as part of the textproc/docproj
port.
@@ -96,7 +96,7 @@
- Sectional elements
+ Sectional ElementsAn HTML document is normally split into two sections. The first
section, called the head, contains
@@ -110,11 +110,11 @@
contained within the top-level html element.
- Normal HTML document structure
+ Normal HTML Document Structure<html>
<head>
- <title>The document's title</title>
+ <title>The Document's Title</title>
</head>
<body>
@@ -127,7 +127,7 @@
- Block elements
+ Block ElementsHeadings
@@ -204,7 +204,7 @@
- Block quotations
+ Block QuotationsA block quotation is an extended quotation from another document
that should not appear within the current paragraph.
@@ -285,7 +285,7 @@
- Definition lists with dl
+ Definition Lists with dlUse:
@@ -308,7 +308,7 @@
- Pre-formatted text
+ Pre-formatted TextYou can indicate that text should be shown to the user exactly
as it is in the file. Typically, this means that the text is shown
@@ -370,7 +370,7 @@
p element.
- Simple use of table
+ Simple Use of tableUse:
@@ -392,7 +392,7 @@
A cell can span multiple rows and columns. To indicate this,
add the rowspan and/or colspan
- attributes, with values indicating the number of rows of columns
+ attributes, with values indicating the number of rows or columns
that should be spanned.
@@ -473,10 +473,10 @@
- In-line elements
+ In-line Elements
- Emphasizing information
+ Emphasizing InformationYou have two levels of emphasis available in HTML,
em and strong.
@@ -498,7 +498,7 @@
- Bold and italics
+ Bold and ItalicsBecause HTML includes presentational markup, you can also
indicate that particular content should be rendered in bold or
@@ -514,7 +514,7 @@
- Indicating fixed pitch text
+ Indicating Fixed-Pitch TextIf you have content that should be rendered in a fixed pitch
(typewriter) typeface, use tt (for
@@ -532,7 +532,7 @@
- Content size
+ Content SizeYou can indicate that content should be shown in a larger or
smaller font. There are three ways of doing this.
@@ -555,7 +555,7 @@
Use font with the size
- attribute set to a number between 1 and 7. The default font size
+ attribute set to a number between 1 and 7. The default font size
is 3. This approach is deprecated.
@@ -570,7 +570,7 @@
this text is slightly bigger.
This text is slightly smaller. But
- this text is slightly bigger
+ this text is slightly bigger.
This text is slightly smaller. But
this text is slightly bigger.
]]>
@@ -586,7 +586,7 @@
- Linking to other documents on the WWW
+ Linking to Other Documents on the WWWIn order to include a link to another document on the WWW you
must know the URL of the document you want to link to.
@@ -612,7 +612,7 @@
- Linking to other parts of documents
+ Linking to Other Parts of DocumentsLinking to a point within another document (or within the same
document) requires that the document author include anchors that you
@@ -636,7 +636,7 @@
# symbol.
- Linking to a named part of another document
+ Linking to A Named Part of Another DocumentAssume that the para1 example resides in a
document called foo.html.
@@ -651,7 +651,7 @@
the anchor (with the preceding #).
- Linking to a named part of the same document
+ Linking to A Named Part of the Same DocumentAssume that the para1 example resides in
this document:
@@ -680,7 +680,7 @@
how it should be presented.
- formal vs. informal
+ Formal vs. InformalSome elements may exist in two forms, formal
and informal. Typically, the formal version of
@@ -689,13 +689,13 @@
title.
- The DocBook DTD is available from the ports collection in the
+ The DocBook DTD is available from the Ports Collection in the
textproc/docbook port. It is automatically
installed as part of the textproc/docproj
port.
- FreeBSD extensions
+ &os; ExtensionsThe FreeBSD Documentation Project has extended the DocBook DTD by
adding some new elements. These elements serve to make some of the
@@ -717,8 +717,8 @@
touch with &a.doceng;.
- The FreeBSD extensions are not (currently) in the ports
- collection. They are stored in the FreeBSD CVS tree, as The &os; extensions are not (currently) in the Ports Collection.
+ They are stored in the &os; CVS tree, as doc/share/sgml/freebsd.dtd.
@@ -733,7 +733,7 @@
- Document structure
+ Document StructureDocBook allows you to structure your documentation in several
ways. In the FreeBSD Documentation Project we are using two primary
@@ -742,7 +742,7 @@
A book is organized into chapters. This is a
mandatory requirement. There may be parts between
the book and the chapter to provide another layer of organization.
- The Handbook is arranged in this way.
+ For example, the Handbook is arranged in this way.A chapter may (or may not) contain one or more sections. These
are indicated with the sect1 element. If a section
@@ -770,10 +770,10 @@
document, the FreeBSD
FAQ, and the FreeBSD Handbook are
- all marked up as books.
+ all marked up as books, for example.
- Starting a book
+ Starting a BookThe content of the book is contained within the
book element. As well as containing structural
@@ -793,7 +793,7 @@
replaceable elements -->
<book>
<bookinfo>
- <title>Your title here</title>
+ <title>Your Title Here</title>
<author>
<firstname>Your first name</firstname>
@@ -822,7 +822,7 @@
- Starting an article
+ Starting an ArticleThe content of the article is contained within the
article element. As well as containing
@@ -870,17 +870,17 @@
- Indicating chapters
+ Indicating ChaptersUse chapter to mark up your chapters. Each
chapter has a mandatory title. Articles do not
contain chapters, they are reserved for books.
- A simple chapter
+ A Simple Chapter
- The chapter's title
+ The Chapter's Title
...
]]>
@@ -891,10 +891,10 @@
chapter then just use an empty paragraph.
- Empty chapters
+ Empty Ehapters
- This is an empty chapter
+ This is An Empty Chapter
]]>
@@ -902,7 +902,7 @@
- Sections below chapters
+ Sections Below ChaptersIn books, chapters may (but do not need to) be broken up into
sections, subsections, and so on. In articles, sections are the
@@ -918,34 +918,34 @@
elements, and so on, down to sect5.
- Sections in chapters
+ Sections in Chapters
- A sample chapter
+ A Sample ChapterSome text in the chapter.
- First section (1.1)
+ First Section (1.1)
…
- Second section (1.2)
+ Second Section (1.2)
- First sub-section (1.2.1)
+ First Sub-Section (1.2.1)
- First sub-sub-section (1.2.1.1)
+ First Sub-Sub-Section (1.2.1.1)
…
- Second sub-section (1.2.2)
+ Second Sub-Section (1.2.2)
…
@@ -962,7 +962,7 @@
- Subdividing using parts
+ Subdividing Using part ElementsYou can introduce another layer of organization between
book and chapter with one or
@@ -994,7 +994,7 @@
- Block elements
+ Block ElementsParagraphs
@@ -1025,7 +1025,7 @@
- Block quotations
+ Block QuotationsA block quotation is an extended quotation from another document
that should not appear within the current paragraph. You will
@@ -1055,6 +1055,8 @@
Appearance:
+ A small excerpt from the US Constitution:
+
Preamble to the Constitution of the United States
@@ -1071,8 +1073,8 @@
- Tips, notes, warnings, cautions, important information and
- sidebars.
+ Tips, Notes, Warnings, Cautions, Important Information and
+ SidebarsYou may need to include extra information separate from the
main body of the text. Typically this is meta
@@ -1120,6 +1122,7 @@
]]>
+ Appearance:Installing FreeBSD may make you want to delete Windows from
@@ -1128,7 +1131,7 @@
- Lists and procedures
+ Lists and ProceduresYou will often need to list pieces of information to the user,
or present them with a number of steps that must be carried out in
@@ -1238,7 +1241,7 @@
- Showing file samples
+ Showing File SamplesIf you want to show a fragment of a file (or perhaps a complete
file) to the user, wrap it in the programlisting
@@ -1390,12 +1393,12 @@
Use:
-
+
- This is column head 1
- This is column head 2
+ This is Column Head 1
+ This is Column Head 2
@@ -1415,12 +1418,12 @@
Appearance:
-
+
- This is column head 1
- This is column head 2
+ This is Column Head 1
+ This is Column Head 2
@@ -1452,7 +1455,7 @@
frame="none">).
- Tables where frame="none"
+ Tables Where frame="none"Appearance:
@@ -1460,8 +1463,8 @@
- This is column head 1
- This is column head 2
+ This is Column Head 1
+ This is Column Head 2
@@ -1482,7 +1485,7 @@
- Examples for the user to follow
+ Examples for the User to FollowA lot of the time you need to show examples for the user to
follow. Typically, these will consist of dialogs with the computer;
@@ -1586,10 +1589,10 @@
- In-line elements
+ In-line Elements
- Emphasizing information
+ Emphasizing InformationWhen you want to emphasize a particular word or phrase, use
emphasis. This may be presented as italic, or
@@ -1644,7 +1647,7 @@
- Keys, mouse buttons, and combinations
+ Keys, Mouse Buttons, and CombinationsTo refer to a specific key on the keyboard, use
keycap. To refer to a mouse button, use
@@ -1665,7 +1668,7 @@
keycombo.
- Keys, mouse buttons, and combinations
+ Keys, Mouse Buttons, and CombinationsUse:
@@ -1700,10 +1703,10 @@
- Applications, commands, options, and cites
+ Applications, Commands, Options, and CitesYou will frequently want to refer to both applications and
- commands when writing for the Handbook. The distinction between
+ commands when writing documentation. The distinction between
them is simple: an application is the name for a suite (or possibly
just 1) of programs that fulfil a particular task. A command is the
name of a program that the user can run.
@@ -1769,7 +1772,7 @@
clear. Hopefully this example makes it clearer.
- Applications, commands, and options.
+ Applications, Commands, and OptionsUse:
@@ -1780,7 +1783,7 @@
sendmail8
- , &man.mailq.8;, and &man.newaliases.8;
+ , &man.mailq.1;, and &man.newaliases.1;
programs.
One of the command line parameters to
@@ -1799,13 +1802,7 @@
sendmail8
- ,
- mailq
- 8
- , and
- newaliases
- 8
- programs.
+ , &man.mailq.1;, and &man.newaliases.1; programs.
One of the command line parameters to sendmail
@@ -1822,7 +1819,7 @@
- Files, directories, extensions
+ Files, Directories, ExtensionsWhenever you wish to refer to the name of a file, a directory,
or a file extension, use filename.
@@ -1833,8 +1830,8 @@
Use:The SGML source for the Handbook in English can be
- found in /usr/doc/en/handbook/. The first
- file is called handbook.sgml in that
+ found in /usr/doc/en_US.ISO8859-1/books/handbook/. The first
+ file is called book.sgml in that
directory. You should also see a Makefile
and a number of files with a .ent
extension.]]>
@@ -1850,10 +1847,10 @@
- The name of ports
+ The Name of Ports
- FreeBSD extension
+ &os; ExtensionThese elements are part of the FreeBSD extension to DocBook,
and do not exist in the original DocBook DTD.
@@ -1887,7 +1884,7 @@
Devices
- FreeBSD extension
+ &os; ExtensionThese elements are part of the FreeBSD extension to DocBook,
and do not exist in the original DocBook DTD.
@@ -1938,10 +1935,10 @@
- Hosts, domains, IP addresses, and so forth
+ Hosts, Domains, IP Addresses, and So Forth
- FreeBSD extension
+ &os; ExtensionThese elements are part of the FreeBSD extension to DocBook,
and do not exist in the original DocBook DTD.
@@ -1955,11 +1952,11 @@
- No role attribute, or
+ No role attribute, or
role="hostname"
- With no role attribute (i.e.,
+ With no role attribute (i.e.,
hostid.../hostid) the
marked up information is the simple hostname, such as
freefall or wcarchive.
@@ -2037,13 +2034,13 @@
The FreeBSD.org domain
contains a number of different hosts, including
freefall.FreeBSD.org and
- bento.FreeBSD.org.
+ pointyhat.FreeBSD.org.When adding an IP alias to an interface (using
ifconfig) always use a
netmask of 255.255.255.255
(which can also be expressed as 0xffffffff.
+ role="netmask">0xffffffff).The MAC address uniquely identifies every network card
in existence. A typical MAC address looks like ifconfig) always use a
netmask of 255.255.255.255 (which
can also be expressed as 0xffffffff.
+ role="netmask">0xffffffff).
The MAC address uniquely identifies every network card in
existence. A typical MAC address looks like Usernames
- FreeBSD extension
+ &os; ExtensionThese elements are part of the FreeBSD extension to DocBook,
and do not exist in the original DocBook DTD.
@@ -2105,7 +2102,7 @@
Describing Makefiles
- FreeBSD extension
+ &os; ExtensionThese elements are part of the FreeBSD extension to DocBook,
and do not exist in the original DocBook DTD.
@@ -2158,11 +2155,11 @@
- Literal text
+ Literal TextYou will often need to include literal text in the
- Handbook. This is text that is excerpted from another file, or
- which should be copied from the Handbook into another file
+ documentation. This is text that is excerpted from another file, or
+ which should be copied from the documentation into another file
verbatim.Some of the time, programlisting will be
@@ -2210,9 +2207,7 @@
Use:
-
- &prompt.user; man command
-]]>
+ &prompt.user; man command]]>Appearance:
@@ -2249,7 +2244,7 @@
- Quoting system errors
+ Quoting System ErrorsYou might want to show errors generated by FreeBSD.
Mark these with errorname. This
@@ -2279,7 +2274,7 @@
Image support in the documentation is currently extremely
- experimental. I think the mechanisms described here are unlikely to
+ experimental. The mechanisms described here are unlikely to
change, but that is not guaranteed.You will also need to install the
@@ -2301,7 +2296,7 @@
- Image formats
+ Image FormatsWe currently support two formats for images. The format you
should use will depend on the nature of your image.
@@ -2423,7 +2418,7 @@
- Makefile entries
+ Makefile EntriesYour images must be listed in the
Makefile in the IMAGES
@@ -2453,7 +2448,7 @@
- Images and chapters in subdirectories
+ Images and Chapters in SubdirectoriesYou must be careful when you separate your documentation into
smaller files (see ) in
@@ -2464,7 +2459,7 @@
chapter1/chapter.sgml,
chapter2/chapter.sgml, and
chapter3/chapter.sgml. If each chapter has
- images associated with it, I suggest you place those images in each
+ images associated with it, it is suggested to place those images in each
chapter's subdirectory (chapter1/,
chapter2/, and
chapter3/).
@@ -2513,7 +2508,7 @@
- Linking to other parts of the same document
+ Linking to Other Parts of the Same DocumentLinking within the same document requires you to specify
where you are linking from (i.e., the text the user will click, or
@@ -2532,7 +2527,7 @@
elements.
- id on chapters and sections
+ Attribute id on Chapters and SectionsIntroduction
@@ -2603,7 +2598,7 @@
One.More specific information can be found in the
- section called Sub-sect 1.
+ section called Sub-Sect 1.
@@ -2665,7 +2660,7 @@
- Linking to documents on the WWW
+ Linking to Documents on the WWWLinking to external documents is much simpler, as long as you
know the URL of the document you want to link to. Use
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 (text+ko) ====
@@ -27,11 +27,11 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml,v 1.17 2005/09/12 16:47:35 yar Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml,v 1.18 2008/12/07 02:05:09 pgj Exp $
-->
- Structuring documents under doc/
+ Structuring Documents Under doc/The doc/ tree is organized in a particular
fashion, and the documents that are part of the FDP are in turn organized
@@ -40,17 +40,17 @@
- make it easy to automate converting the document to other formats;
+ Make it easy to automate converting the document to other formats.
- promote consistency between the different documentation
+ Promote consistency between the different documentation
organizations, to make it easier to switch between working on
- different documents;
+ different documents.
- make it easy to decide where in the tree new documentation should
+ Make it easy to decide where in the tree new documentation should
be placed.
@@ -61,7 +61,7 @@
does not enforce any particular defaults or cultural preferences.
- The top level, doc/
+ The Top Level, doc/There are two types of directory under doc/,
each with very specific directory names and meanings.
@@ -101,7 +101,7 @@
The
- lang.encoding/ directories
+ lang.encoding/ Directories
These directories contain the documents themselves. The
documentation is split into up to three more categories at this
@@ -147,7 +147,7 @@
- Document specific information
+ Document Specific InformationThis section contains specific notes about particular documents
managed by the FDP.
@@ -168,7 +168,7 @@
sect3) and so on.
- Physical organization
+ Physical OrganizationThere are a number of files and directories within the
handbook directory.
@@ -221,17 +221,17 @@
For example, if one of the chapter files contains:
+
...
]]>
- then it will be called chapter.sgml in
- the kernelconfiguration directory. In
+ Then it will be called chapter.sgml in
+ the kernelconfig directory. In
general, the entire contents of the chapter will be held in this
file.When the HTML version of the Handbook is produced, this will
- yield kernelconfiguration.html. This is
+ yield kernelconfig.html. This is
because of the id value, and is not related to
the name of the directory.
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 (text+ko) ====
@@ -1,7 +1,7 @@
@@ -507,6 +507,187 @@
+
+
+
+
+
+ Joseph J.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 20:49:21 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 008D01065677; Sun, 7 Dec 2008 20:49:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id A089B1065670
for ; Sun, 7 Dec 2008 20:49:20 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 8C6958FC08
for ; Sun, 7 Dec 2008 20:49:20 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7KnKGL076233
for ; Sun, 7 Dec 2008 20:49:20 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7KnKwo076228
for perforce@freebsd.org; Sun, 7 Dec 2008 20:49:20 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 7 Dec 2008 20:49:20 GMT
Message-Id: <200812072049.mB7KnKwo076228@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154291 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 20:49:21 -0000
http://perforce.freebsd.org/chv.cgi?CH=154291
Change 154291 by rwatson@rwatson_fledge on 2008/12/07 20:48:33
Add OpenBSM 1.1 alpha3 and hook it up to the OpenBSM page.
Affected files ...
.. //depot/projects/trustedbsd/www/downloads/openbsm-1.1-alpha3.tgz#1 add
.. //depot/projects/trustedbsd/www/openbsm.page#33 edit
Differences ...
==== //depot/projects/trustedbsd/www/openbsm.page#33 (text+ko) ====
@@ -30,7 +30,7 @@
- $P4: //depot/projects/trustedbsd/www/openbsm.page#32 $
+ $P4: //depot/projects/trustedbsd/www/openbsm.page#33 $
@@ -178,20 +178,17 @@
In this revision, BSM include files required by OS vendors for
- use in kernels are broken out into a separate include
- directory, a configure option is added to force use of native
- rather than OpenBSM sys includes if desired, strlcpy() and
- strlcat() are used in preference to less robust APIs,
- compatibility defines for old Darwin event identifiers are
- removed, support for exended header tokens (containing host
- information) is added to the BSM library and auditd(8), and can
- be set in audit_control(5).
+
In this revision, OpenBSM maps between local and wire values
+ for the errno error space, bugs are fixed in the encoding of
+ execve arguments and environmental variables, support for the
+ portable AUT_SOCKET_EX token type is added, and the BSM header
+ version is bumped to give OpenBSM 1.1 its own file format
+ version due to non-trivial changes in tokens.
In this revision, BSM include files required by OS vendors for
+ use in kernels are broken out into a separate include
+ directory, a configure option is added to force use of native
+ rather than OpenBSM sys includes if desired, strlcpy() and
+ strlcat() are used in preference to less robust APIs,
+ compatibility defines for old Darwin event identifiers are
+ removed, support for exended header tokens (containing host
+ information) is added to the BSM library and auditd(8), and can
+ be set in audit_control(5).
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 20:51:23 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 51C831065679; Sun, 7 Dec 2008 20:51:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 161F71065675
for ; Sun, 7 Dec 2008 20:51:23 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 029448FC1E
for ; Sun, 7 Dec 2008 20:51:22 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7KpMRN078259
for ; Sun, 7 Dec 2008 20:51:22 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7KpM6E078257
for perforce@freebsd.org; Sun, 7 Dec 2008 20:51:22 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 7 Dec 2008 20:51:22 GMT
Message-Id: <200812072051.mB7KpM6E078257@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154292 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 20:51:23 -0000
http://perforce.freebsd.org/chv.cgi?CH=154292
Change 154292 by rwatson@rwatson_fledge on 2008/12/07 20:51:21
Add a news blurb about OpenBSM 1.1 alpha3.
Affected files ...
.. //depot/projects/trustedbsd/www/news.page#16 edit
Differences ...
==== //depot/projects/trustedbsd/www/news.page#16 (text+ko) ====
@@ -37,7 +37,7 @@
- $P4: //depot/projects/trustedbsd/www/news.page#15 $
+ $P4: //depot/projects/trustedbsd/www/news.page#16 $
@@ -50,6 +50,15 @@
+
December 7, 2008 OpenBSM 1.1 alpha 3 released
+
+
OpenBSM 1.1 alpha 3 has been released; this is a test release
+ of OpenBSM, adding extended socket token support, mapping between
+ local and BSM error numbers, and bumping the BSM file format
+ version number in preparation for the release of OpenBSM 1.1. See
+ the OpenBSM web page for more
+ information.
+
November 11, 2008 OpenBSM 1.1 alpha 2 released
OpenBSM 1.1 alpha 2 has been released; this is a test release
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 20:55:27 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 67C301065673; Sun, 7 Dec 2008 20:55:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 2C2581065672
for ; Sun, 7 Dec 2008 20:55:27 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 171258FC14
for ; Sun, 7 Dec 2008 20:55:27 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7KtQZi080839
for ; Sun, 7 Dec 2008 20:55:26 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7KtQ46080834
for perforce@freebsd.org; Sun, 7 Dec 2008 20:55:26 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 7 Dec 2008 20:55:26 GMT
Message-Id: <200812072055.mB7KtQ46080834@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154293 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 20:55:27 -0000
http://perforce.freebsd.org/chv.cgi?CH=154293
Change 154293 by rwatson@rwatson_cinnamon on 2008/12/07 20:54:58
Begin work on OpenBSM 1.1 alpha 4.
Affected files ...
.. //depot/projects/trustedbsd/openbsm/NEWS#17 edit
.. //depot/projects/trustedbsd/openbsm/VERSION#21 edit
.. //depot/projects/trustedbsd/openbsm/configure#42 edit
.. //depot/projects/trustedbsd/openbsm/configure.ac#44 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/NEWS#17 (text+ko) ====
@@ -1,5 +1,7 @@
OpenBSM Version History
+OpenBSM 1.1 alpha 4
+
OpenBSM 1.1 alpha 3
- Add two new functions, au_bsm_to_errno() and au_errno_to_bsm(), to map
@@ -363,4 +365,4 @@
to support reloading of kernel event table.
- Allow comments in /etc/security configuration files.
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#16 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#17 $
==== //depot/projects/trustedbsd/openbsm/VERSION#21 (text+ko) ====
@@ -1,1 +1,1 @@
-OPENBSM_1_1_ALPHA_3
+OPENBSM_1_1_ALPHA_4
==== //depot/projects/trustedbsd/openbsm/configure#42 (xtext) ====
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#42 .
+# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#43 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha3.
+# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha4.
#
# Report bugs to .
#
@@ -729,8 +729,8 @@
# Identity of this package.
PACKAGE_NAME='OpenBSM'
PACKAGE_TARNAME='openbsm'
-PACKAGE_VERSION='1.1alpha3'
-PACKAGE_STRING='OpenBSM 1.1alpha3'
+PACKAGE_VERSION='1.1alpha4'
+PACKAGE_STRING='OpenBSM 1.1alpha4'
PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org'
ac_unique_file="bin/auditreduce/auditreduce.c"
@@ -1404,7 +1404,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures OpenBSM 1.1alpha3 to adapt to many kinds of systems.
+\`configure' configures OpenBSM 1.1alpha4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1474,7 +1474,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenBSM 1.1alpha3:";;
+ short | recursive ) echo "Configuration of OpenBSM 1.1alpha4:";;
esac
cat <<\_ACEOF
@@ -1580,7 +1580,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenBSM configure 1.1alpha3
+OpenBSM configure 1.1alpha4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1594,7 +1594,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by OpenBSM $as_me 1.1alpha3, which was
+It was created by OpenBSM $as_me 1.1alpha4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -19076,7 +19076,7 @@
# Define the identity of the package.
PACKAGE=OpenBSM
- VERSION=1.1alpha3
+ VERSION=1.1alpha4
cat >>confdefs.h <<_ACEOF
@@ -23522,7 +23522,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by OpenBSM $as_me 1.1alpha3, which was
+This file was extended by OpenBSM $as_me 1.1alpha4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23575,7 +23575,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-OpenBSM config.status 1.1alpha3
+OpenBSM config.status 1.1alpha4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
==== //depot/projects/trustedbsd/openbsm/configure.ac#44 (text+ko) ====
@@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([OpenBSM], [1.1alpha3], [trustedbsd-audit@TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#43 $])
+AC_INIT([OpenBSM], [1.1alpha4], [trustedbsd-audit@TrustesdBSD.org],[openbsm])
+AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#44 $])
AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_HEADER([config/config.h])
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 21:19:52 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5DA2B1065673; Sun, 7 Dec 2008 21:19:52 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 217511065670
for ; Sun, 7 Dec 2008 21:19:52 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 0EF6C8FC12
for ; Sun, 7 Dec 2008 21:19:52 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7LJp8R098091
for ; Sun, 7 Dec 2008 21:19:51 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7LJpkB098089
for perforce@freebsd.org; Sun, 7 Dec 2008 21:19:51 GMT
(envelope-from rene@FreeBSD.org)
Date: Sun, 7 Dec 2008 21:19:51 GMT
Message-Id: <200812072119.mB7LJpkB098089@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154295 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 21:19:52 -0000
http://perforce.freebsd.org/chv.cgi?CH=154295
Change 154295 by rene@rene_self on 2008/12/07 21:19:34
MFen handbook/desktop 1.79 -> 1.83
Checked build, spelling (diff only), whitespace.
Affected files ...
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#10 edit
Differences ...
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#10 (text+ko) ====
@@ -5,7 +5,7 @@
$FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.37 2006/08/25 16:14:06 remko Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
- %SRCID% 1.79
+ %SRCID% 1.83
-->
@@ -62,9 +62,8 @@
- Browsers (zoals Mozilla,
+ Browsers (zoals Firefox,
Opera,
- Firefox,
Konqueror)
@@ -149,15 +148,15 @@
Ports
- Afhankelijkheden
+ Grote afhankelijkheden
- Mozilla
+ Firefox
- veel
+ gemiddeldzwaar
@@ -178,16 +177,6 @@
- Firefox
-
- gemiddeld
-
- zwaar
-
- Gtk+
-
-
- Konquerorgemiddeld
@@ -201,95 +190,46 @@
- Mozilla
-
- Mozilla
-
- Mozilla is een moderne en
- stabiele browser die volledig geschikt gemaakt is voor &os;; de
- HTML-weergave engine voldoet in grote mate aan de standaarden;
- er worden een mail- en nieuwslezer bijgeleverd en het pakket
- bevat zelfs een HTML-bewerker voor het maken van webpagina's.
- Gebruikers van &netscape; zullen de
- gelijkheden met Communicator suite
- herkennen, aangezien beide browsers wat ontwikkelgeschiedenis
- delen.
-
- Op langzame machines, met een CPU-snelheid van 233MHz of
- minder dan 64MB aan RAM, kan Mozilla
- te veeleisend zijn om volledig bruikbaar te zijn. In dat geval
- is Opera browser een mogelijke
- vervanger, dat iets later in dit hoofdstuk beschreven wordt.
-
-
- Als het niet wenselijk of mogelijk is om
- Mozilla te compileren, dan is dit al
- door het &os; GNOME team gedaan. Het pakket kan vanaf het
- netwerk geïnstalleerd worden met:
-
- &prompt.root; pkg_add -r mozilla
-
- Als het pakket niet beschikbaar is en er genoeg tijd en
- schijfruimte beschikbaar zijn, kan de broncode van
- Mozilla gedownload, gecompileerd en
- geïnstalleerd worden. Dit gaat met:
-
- &prompt.root; cd /usr/ports/www/mozilla
-&prompt.root; make install clean
-
- De Mozilla port zorgt voor een
- correcte installatie door de
- chrome registry setup met
- root rechten te draaien. Als echter ook
- toevoegingen zoals muisgebaren geïnstalleerd moeten worden,
- dan moet Mozilla als
- root gedraaid worden om dat op de juiste
- wijze geïnstalleerd te krijgen.
-
- Als de installatie van Mozilla
- eenmaal voltooid is, is root zijn niet
- langer nodig. Mozilla kan als
- browser gestart worden met:
-
- &prompt.user; mozilla
-
- Het kan direct als mailprogramma of nieuwslezer gestart
- worden met:
-
- &prompt.user; mozilla -mail
-
-
- FirefoxFirefox
- Firefox is de volgende generatie
- browser die gebaseerd is op Mozilla.
- Mozilla is een compleet pakket aan
- applicaties, waaronder een browser, een email client, een chat
- client en nog veel meer. Firefox is
- alleen een browser waardoor deze simpeler en sneller is.
+ Firefox is een moderne, gratis,
+ stabiele open-source browser die volledig geporteerd is naar
+ &os;: het heeft een motor voor HTML-weergave die zich zeer
+ strikt aan de standaarden houdt, browsen met tabbladen,
+ blokkeren van pop-ups, uitbreidingen, verbeterde veiligheid, en
+ meer. Firefox is gebaseerd op de
+ codebase van Mozilla.Installeer het pakket door het volgende te typen:&prompt.root; pkg_add -r firefox
+ Dit zal Firefox 2.X installeren,
+ als u in plaats hiervan Firefox 3.X
+ wilt draaien, gebruik dan:
+
+ &prompt.root; pkg_add -r firefox3
+
De Portscollectie kan ook gebruikt worden als u liever
vanuit de broncode installeert.&prompt.root; cd /usr/ports/www/firefox
&prompt.root; make install clean
+
+ Voor Firefox 3.X dient
+ firefox in het vorige commando vervangen te
+ worden door firefox3.
- Firefox, Mozilla en &java; plugin
+ Firefox en &java; pluginIn deze en de volgende sectie wordt er vanuit gegaan dat
- Firefox of
- Mozilla reeds geïnstalleerd
+ Firefox reeds geïnstalleerd
is.
@@ -302,9 +242,8 @@
&os; Foundation website.
Om &java; ondersteuning toe te voegen aan
- Firefox of
- Mozilla moet als allereerste
- de java/javavmwrapper port
+ Firefox moet als allereerste de port
+ java/javavmwrapper
geïnstalleerd worden. Download daarna het
Diablo &jre; pakket van ,
@@ -324,7 +263,9 @@
- Firefox, Mozilla en ¯omedia; &flash; plugin
+ Firefox en ¯omedia; &flash; plugin
+
+ Flash¯omedia; &flash; plugin is niet beschikbaar voor &os;.
Er is echter wel een softwarelaag (wrapper) om de
@@ -352,6 +293,30 @@
plugins wordt nu getoond.
+
+ Firefox en Swfdec &flash; plugin
+
+ Swfdec is de bibliotheek om &flash;-animaties te decoderen
+ en af te beelden. Swfdec-Mozilla is een plugin voor
+ Firefox-browsers dat de
+ Swfdec-bibliotheek gebruikt om SWF-bestanden af te spelen. Er
+ wordt nog steeds veel aan ontwikkeld.
+
+ Als u het niet kunt of wilt compileren, kan het pakket vanaf
+ het netwerk worden geïnstalleerd:
+
+ &prompt.root; pkg_add -r swfdec-plugin
+
+ Als het pakket niet beschikbaar is, kunt u het vanuit de
+ Portscollectie compileren en installeren:
+
+ &prompt.root; cd /usr/ports/www/swfdec-plugin
+&prompt.root; make install clean
+
+ Herstart hierna uw browser om deze plugin effectief te
+ maken.
+
+
Opera
@@ -1113,14 +1078,6 @@
- Mozilla
-
- mozilla
-
- www/mozilla
-
-
- Operalinux-opera
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 22:28:02 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 45DAA1065675; Sun, 7 Dec 2008 22:28:02 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 09C3A1065672
for ; Sun, 7 Dec 2008 22:28:02 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id ECC238FC0C
for ; Sun, 7 Dec 2008 22:28:01 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7MS1fB045138
for ; Sun, 7 Dec 2008 22:28:01 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7MS1UV045136
for perforce@freebsd.org; Sun, 7 Dec 2008 22:28:01 GMT
(envelope-from pgj@FreeBSD.org)
Date: Sun, 7 Dec 2008 22:28:01 GMT
Message-Id: <200812072228.mB7MS1UV045136@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154300 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 22:28:02 -0000
http://perforce.freebsd.org/chv.cgi?CH=154300
Change 154300 by pgj@kolbasz on 2008/12/07 22:27:09
MFen (doc):
1.66 -> 1.67 hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml
Affected files ...
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#5 edit
Differences ...
==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#5 (text+ko) ====
@@ -7,7 +7,7 @@
The FreeBSD Hungarian Documentation Project
Translated by: PALI, Gabor
%SOURCE% en_US.ISO8859-1/books/handbook/boot/chapter.sgml
- %SRCID% 1.66
+ %SRCID% 1.67
-->
@@ -905,8 +905,10 @@
A betöltõképet tartalmazó
(.bmp vagy .pcx
kiterjesztésû) állományt a
- /boot
- könyvtárba kell tennünk.
+ rendszerindító partícióra,
+ például a /boot könyvtárba
+ kell tennünk.
A normál (256 szín, legfeljebb 320x200-as
felbontású) képek esetén a
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 23:42:23 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 7EA381065679; Sun, 7 Dec 2008 23:42:23 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 406C7106564A
for ; Sun, 7 Dec 2008 23:42:23 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 2E3C98FC08
for ; Sun, 7 Dec 2008 23:42:23 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7NgMd6092891
for ; Sun, 7 Dec 2008 23:42:22 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7NgMe0092889
for perforce@freebsd.org; Sun, 7 Dec 2008 23:42:22 GMT
(envelope-from pgj@FreeBSD.org)
Date: Sun, 7 Dec 2008 23:42:22 GMT
Message-Id: <200812072342.mB7NgMe0092889@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154304 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 23:42:23 -0000
http://perforce.freebsd.org/chv.cgi?CH=154304
Change 154304 by pgj@kolbasz on 2008/12/07 23:42:14
MFen (doc):
1.79 -> 1.84 hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml
1.1102 -> 1.1103 hu_HU.ISO8859-2/books/faq/book.sgml
Affected files ...
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#28 edit
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#10 edit
Differences ...
==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#28 (text+ko) ====
@@ -9,7 +9,7 @@
@@ -10102,69 +10102,11 @@
- A &os; képes
- betöltõképeket (splash screen)
- megjeleníteni a rendszer indításakor.
- Ezek a betöltõképek pillanatnyilag csak 256
- színû BMP (*.BMP) vagy PCX
- (*.PCX) állományok
- lehetnek. Emellett legfeljebb 320x200 pixel
- méretûnek kell lenniük, ha
- szabványos VGA kártyán akarjuk
- használni ezeket. Amennyiben a rendszermagunkban
- VESA támogatás is van, akkor akár
- 1024x768-as felbontásig is elmehetünk. A
- jelenlegi VESA támogatás
- beépíthetõ a rendszermagba a
- VESA opció
- megadásával, vagy betölthetõ a
- rendszerindítás során a VESA modul
- használatával.
-
- A betöltõképernyõ
- használatához a &os;
- indításáért felelõs
- állományokat kell
- módosítanunk.
-
- Elõször is létre kell hoznunk egy
- /boot/loader.rc
- állományt, amely a következõ sorokat
- tartalmazza:
-
- include /boot/loader.4th
-start
-
- Továbbá a
- /boot/loader.conf
- állománynak a következõket kell
- tartalmaznia:
-
- splash_bmp_load="YES"
-bitmap_load="YES"
-
- A fenti sorokban azt adtuk meg, hogy az
- /boot/splash.bmp állomány
- lesz a betöltõképernyõnk. Ha helyette
- egy PCX állományt használnánk
- inkább, akkor másoljuk le
- /boot/splash.pcx néven, majd az
- iméntiekben megadottak szerint hozzunk létre
- egy /boot/loader.rc, illetve egy ilyen
- /boot/loader.conf
- állományt:
-
- splash_pcx_load="YES"
-bitmap_load="YES"
-bitmap_name="/boot/splash.pcx"
-
- Most már csak egy jó
- betöltõképernyõre van
- szükségünk. Ha ilyet keresünk, akkor
- például érdemes
- szétnéznünk a
- oldalon.
+ Erre a kérdésre részletes
+ választ a &os; kézikönyv Rendszerbetöltõ
+ képernyõk
+ címû szakaszában kapunk.
==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#10 (text+ko) ====
@@ -6,7 +6,7 @@
The FreeBSD Hungarian Documentation Project
Translated by: PALI, Gabor
%SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
- %SRCID% 1.79
+ %SRCID% 1.84
-->
@@ -80,9 +80,8 @@
Böngészõk (mint a
- Mozilla,
+ Firefox,
Opera,
- Firefox,
Konqueror)
@@ -186,8 +185,8 @@
- Mozilla
- sok
+ Firefox
+ közepesnehézGtk+
@@ -204,13 +203,6 @@
- Firefox
- közepes
- nehéz
- Gtk+
-
-
- Konquerorközepesnehéz
@@ -222,105 +214,40 @@
- Mozilla
-
- Mozilla
-
- A Mozilla egy modern,
- megbízható böngészõ, amelyet
- sikeresen portoltak &os;-re. Ez egy nagyon jó, a
- szabványoknak megfelelõ HTML-megjelenítõ
- motorral rendelkezik, valamint hírolvasót
- és levelezõ klienst is tartalmaz. Ezenfelül
- találhatunk benne egy HTML-szerkesztõt is, ami
- jól használható honlapok
- készítéséhez. A
- &netscape;-hez szokott
- felhasználók felfedezhetnek némi
- hasonlóságot a
- Communicator programcsomaggal, mivel
- ez a két böngészõ valaha egy és
- ugyanaz volt.
-
- 233 MHz-nél lassabb processzorral vagy 64
- MB-nál kevesebb memóriával rendelkezõ
- gépeken a kielégítõ
- mûködéshez a Mozilla
- erõforrásigényesnek tûnhet. Ebben az
- esetben inkább érdemes a fejezet egy
- késõbbi részében bemutatandó
- Opera böngészõt
- használni.
-
- Ha bármilyen okból nem akarjuk vagy nem tudjuk
- lefordítani a Mozillat,
- nyugodtan támaszkodhatunk a &os; GNOME csapatának
- munkájára. Hálózaton keresztül
- csomagból a következõ paranccsal tudjuk
- telepíteni:
-
- &prompt.root; pkg_add -r mozilla
-
- Ha ez a csomag nem érhetõ el, de van
- elegendõ idõnk és tárhelyünk,
- letölthetjük a Mozilla
- forrását is, amit aztán lefordítunk
- és telepítünk. Ennek módja:
-
- &prompt.root; cd /usr/ports/www/mozilla
-&prompt.root; make install clean
-
- A Mozilla portja a
- root felhasználó jogaival
- végzett regisztrációs
- beállítások
- érvényesítésével gondoskodik
- a megfelelõ inicializálásról. Azonban
- ha további kiegészítéseket is
- szeretnénk még telepíteni,
- például az egérmozdulatok
- támogatását, magunknak kell
- root felhasználóként
- futtatni a Mozillat, hogy ezek
- szabályosan telepítõdhessenek.
-
- Amint sikeresen befejezõdõtt a
- Mozilla telepítése,
- nincs szükség rá, hogy továbbra is
- root felhasználók
- legyünk. A Mozilla
- böngészõt így tudjuk elindítani a
- parancssorból:
-
- &prompt.user; mozilla
-
- Hírolvasóként és levelezõ
- kliensként pedig az alábbi módon lehet
- elindítani:
-
- &prompt.user; mozilla -mail
-
-
-
- FirefoxFirefox
- A Firefox a
- Mozilla alapjaira
- építkezõ, következõ
- generációs böngészõ. A
- Mozilla egy teljes programcsomag,
- tehát böngészõ, levelezõ kliens,
- csevegõkliens stb. A Firefox
- azonban csak egy egyszerû böngészõ, aminek
- köszönhetõen kisebb és gyorsabb is.
+ A Firefox egy modern, szabad
+ és nyílt forráskódú
+ böngészõ, amely tökéletesen
+ használható &os; alatt.
+ Megtalálható benne egy, a jelenlegi HTML
+ szabványoknak nagyon jól megfelelõ
+ megjelenítõ motor, a lapokra bontható
+ böngészés támogatása, a
+ kéretlenül felbukkanó ablakok
+ blokkolása, különbözõ
+ kiterjesztések, javított biztonsági
+ lehetõségek és még sok minden
+ más. A Firefox forrása
+ a Mozilla kódján
+ alapszik.Csomagból így telepíthetõ:&prompt.root; pkg_add -r firefox
+ Ekkor a Firefox
+ 2.X változata fog
+ települni. Ha helyette a
+ Firefox
+ 3.X változatát
+ szeretnénk használni, akkor ezt a parancsot adjuk
+ ki:
+
+ &prompt.root; pkg_add -r firefox3
+
Ha forrásból szeretnénk felrakni,
használhatjuk a Portgyûjteményben
található portját is:
@@ -328,18 +255,22 @@
&prompt.root; cd /usr/ports/www/firefox
&prompt.root; make install clean
+ A Firefox
+ 3.X
+ telepítéséhez az iménti parancsban
+ cseréljük ki a firefox
+ részt a firefox3
+ könyvtárra.
- Firefox, Mozilla és a &java; plugin
+ A Firefox és a &java; pluginEnnél és a következõ
résznél feltételezzük, hogy
már korábban telepítettük a
- Firefox vagy a
- Mozilla alkalmazások
- valamelyikét.
+ Firefox alkalmazást.
A &os; Alapítvány megegyezett a Sun
@@ -354,10 +285,10 @@
Ha tehát &java;-támogatást
szeretnénk hozzáadni a
- Firefox vagy a
- Mozilla valamelyikéhez,
- elsõként fel kell telepítenünk a
- java/javavmwrapper portot.
+ Firefox
+ böngészõhöz, elsõként fel kell
+ telepítenünk a java/javavmwrapper portot.
Ezután le kell töltenünk a Diablo
&jre; csomagot a
@@ -384,9 +315,11 @@
+ A Firefox és a ¯omedia; &flash; plugin
- Firefox, Mozilla és a ¯omedia; &flash;
- plugin
+
+ Flash
+ A ¯omedia; &flash; plugin nem érhetõ el
közvetlenül &os;-re. Azonban létezik egy, a
@@ -413,10 +346,45 @@
&prompt.user; nspluginwrapper -v -a -i
- Ezután indítsuk el a böngészõt, majd gépeljük be a
- about:plugins szöveget a címsorba és nyomjuk
- le az Enter billentyût. Ekkor a jelenleg
- elérhetõ pluginok listájának kell megjelennie.
+ Ezután indítsuk el a
+ böngészõt, majd gépeljük be a
+ about:plugins szöveget a címsorba
+ és nyomjuk le az Enter billentyût.
+ Ekkor a jelenleg elérhetõ pluginok
+ listájának kell megjelennie.
+
+
+
+ A Firefox és az Swfdec &flash; plugin
+
+ Az Swfdec egy &flash; animációk
+ dekódolásáért és
+ megjelenítéséért felelõs
+ programkönyvtár. Az Swfdec-Mozilla pedig egy
+ Firefox
+ böngészõkhöz készített
+ plugin, amely az Swfdec könyvtáron keresztül
+ játszik le SWF állományokat. Jelenleg
+ még aktív fejlesztés alatt
+ áll.
+
+ Ha nem akarjuk vagy netalán nem tudjuk
+ forrásból lefordítani, akkor egyszerûen
+ csak telepítsük csomagként a
+ hálózaton keresztül:
+
+ &prompt.root; pkg_add -r swfdec-plugin
+
+ Ha valamiért mégsem érhetõ el
+ hozzá csomag, akkor a Portgyûjteménybõl is
+ telepíthetjük:
+
+ &prompt.root; cd /usr/ports/www/swfdec-plugin
+&prompt.root; make install clean
+
+ Miután telepítettük a plugint, a
+ használatához indítsuk újra a
+ böngészõt.
@@ -1294,12 +1262,6 @@
- Mozilla
- mozilla
- www/mozilla
-
-
- Operaoperawww/opera
From owner-p4-projects@FreeBSD.ORG Sun Dec 7 23:43:24 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 8750D1065673; Sun, 7 Dec 2008 23:43:24 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 4BB55106564A
for ; Sun, 7 Dec 2008 23:43:24 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 218B98FC18
for ; Sun, 7 Dec 2008 23:43:24 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7NhO03092961
for ; Sun, 7 Dec 2008 23:43:24 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7NhOxE092959
for perforce@freebsd.org; Sun, 7 Dec 2008 23:43:24 GMT
(envelope-from pgj@FreeBSD.org)
Date: Sun, 7 Dec 2008 23:43:24 GMT
Message-Id: <200812072343.mB7NhOxE092959@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154305 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 07 Dec 2008 23:43:24 -0000
http://perforce.freebsd.org/chv.cgi?CH=154305
Change 154305 by pgj@kolbasz on 2008/12/07 23:43:09
Add a missing section id
Affected files ...
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#6 edit
Differences ...
==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#6 (text+ko) ====
@@ -746,7 +746,7 @@
-
+
From owner-p4-projects@FreeBSD.ORG Mon Dec 8 02:23:06 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CAF7C1065678; Mon, 8 Dec 2008 02:23:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 8FBAA1065675
for ; Mon, 8 Dec 2008 02:23:06 +0000 (UTC)
(envelope-from zec@icir.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 7E93F8FC1F
for ; Mon, 8 Dec 2008 02:23:06 +0000 (UTC)
(envelope-from zec@icir.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB82N6mo019070
for ; Mon, 8 Dec 2008 02:23:06 GMT
(envelope-from zec@icir.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB82N6iZ019068
for perforce@freebsd.org; Mon, 8 Dec 2008 02:23:06 GMT
(envelope-from zec@icir.org)
Date: Mon, 8 Dec 2008 02:23:06 GMT
Message-Id: <200812080223.mB82N6iZ019068@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@icir.org using -f
From: Marko Zec
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154309 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 08 Dec 2008 02:23:07 -0000
http://perforce.freebsd.org/chv.cgi?CH=154309
Change 154309 by zec@zec_tpx32 on 2008/12/08 02:22:49
Nuke ng_wormhole to reduce the confusion among more essential
changes requiring attention and thought in the vimage branch.
ng_wormhole allowed for netgraph topologies to span multiple
vnets / vimages, which is a neat functionality, though not
so badly needed by probably 99% of people waiting for vimage
to arrive in -CURRENT. Moreover, ng_wormhole was effectively
defunct ever since the introduction of hierarchichal vimage
naming scheme. We'll most probably bring it back to life
once the management interface for vimage infrastructure gets
settled. Until that time, ng_wormhole will continue to live
under the radar in zec_vimage_7 branch in p4...
Affected files ...
.. //depot/projects/vimage/src/sys/conf/files#47 edit
.. //depot/projects/vimage/src/sys/conf/options#38 edit
.. //depot/projects/vimage/src/sys/modules/netgraph/Makefile#8 edit
.. //depot/projects/vimage/src/sys/modules/netgraph/wormhole/Makefile#2 delete
.. //depot/projects/vimage/src/sys/netgraph/ng_wormhole.c#7 delete
.. //depot/projects/vimage/src/sys/sys/vimage.h#71 edit
Differences ...
==== //depot/projects/vimage/src/sys/conf/files#47 (text+ko) ====
@@ -2314,7 +2314,6 @@
netgraph/ng_tee.c optional netgraph_tee
netgraph/ng_tty.c optional netgraph_tty
netgraph/ng_vjc.c optional netgraph_vjc
-netgraph/ng_wormhole.c optional netgraph_wormhole vimage
netinet/accf_data.c optional accept_filter_data
netinet/accf_dns.c optional accept_filter_dns
netinet/accf_http.c optional accept_filter_http
==== //depot/projects/vimage/src/sys/conf/options#38 (text+ko) ====
@@ -491,7 +491,6 @@
NETGRAPH_TTY opt_netgraph.h
NETGRAPH_UI opt_netgraph.h
NETGRAPH_VJC opt_netgraph.h
-NETGRAPH_WORMHOLE opt_netgraph.h
# NgATM options
NGATM_ATM opt_netgraph.h
==== //depot/projects/vimage/src/sys/modules/netgraph/Makefile#8 (text+ko) ====
@@ -51,8 +51,7 @@
tee \
UI \
vjc \
- vlan \
- ${_wormhole}
+ vlan
.if ${MACHINE_ARCH} == "i386"
_sync_ar= sync_ar
@@ -67,9 +66,4 @@
_mppc= mppc
.endif
-VIMAGE!= grep VIMAGE ${KERNBUILDDIR}/opt_vimage.h | cut -d" " -f3 || true
-.if ${VIMAGE} == 1
-_wormhole= wormhole
-.endif
-
.include
==== //depot/projects/vimage/src/sys/sys/vimage.h#71 (text+ko) ====
@@ -82,7 +82,6 @@
#define VNET_MOD_ATALK 10
#define VNET_MOD_ACCF_HTTP 11
/* stateless modules */
-#define VNET_MOD_NG_WORMHOLE 19
#define VNET_MOD_NG_ETHER 20
#define VNET_MOD_NG_IFACE 21
#define VNET_MOD_NG_EIFACE 22
From owner-p4-projects@FreeBSD.ORG Mon Dec 8 08:16:05 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id A3D7C1065675; Mon, 8 Dec 2008 08:16:05 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 683891065672
for ; Mon, 8 Dec 2008 08:16:05 +0000 (UTC)
(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 577258FC22
for ; Mon, 8 Dec 2008 08:16:05 +0000 (UTC)
(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB88G5XF091582
for ; Mon, 8 Dec 2008 08:16:05 GMT
(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB88G5vk091576
for perforce@freebsd.org; Mon, 8 Dec 2008 08:16:05 GMT
(envelope-from ed@FreeBSD.org)
Date: Mon, 8 Dec 2008 08:16:05 GMT
Message-Id: <200812080816.mB88G5vk091576@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
ed@FreeBSD.org using -f
From: Ed Schouten
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154320 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 08 Dec 2008 08:16:05 -0000
http://perforce.freebsd.org/chv.cgi?CH=154320
Change 154320 by ed@ed_dull on 2008/12/08 08:15:18
Unbreak Cons25-support:
When I implemented RIS (Reset to Initial State), I accidentally
replaced teken_subr_vertical_position_absolute() with code that
should have been placed inside the RIS routine. I didn't really
notice this, until I ran some Cons25-apps, which heavily use
VPA. This means we are once again compatible with syscons.
Affected files ...
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#9 edit
Differences ...
==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#9 (text+ko) ====
@@ -1074,8 +1074,8 @@
teken_subr_vertical_position_absolute(teken_t *t, unsigned int row)
{
- t->t_curattr = t->t_saved_curattr = teken_defattr;
- t->t_cursor.tp_row = t->t_cursor.tp_col = 0;
- t->t_saved_cursor = t->t_cursor;
- t->t_stateflags = TS_AUTOWRAP;
+ t->t_cursor.tp_row = teken_clamp(row + t->t_originreg.ts_begin,
+ 1, t->t_originreg.ts_end) - 1;
+ t->t_stateflags &= ~TS_WRAPPED;
+ teken_funcs_cursor(t);
}
From owner-p4-projects@FreeBSD.ORG Mon Dec 8 08:40:42 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 642B71065672; Mon, 8 Dec 2008 08:40:42 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 0EBE01065675
for ; Mon, 8 Dec 2008 08:40:42 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id F01368FC14
for ; Mon, 8 Dec 2008 08:40:41 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB88eXEf004975
for ; Mon, 8 Dec 2008 08:40:33 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB88eUnw004966
for perforce@freebsd.org; Mon, 8 Dec 2008 08:40:30 GMT
(envelope-from rene@FreeBSD.org)
Date: Mon, 8 Dec 2008 08:40:30 GMT
Message-Id: <200812080840.mB88eUnw004966@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154321 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 08 Dec 2008 08:40:42 -0000
http://perforce.freebsd.org/chv.cgi?CH=154321
Change 154321 by rene@rene_self on 2008/12/08 08:39:55
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#11 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/book.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#11 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#11 (text+ko) ====
@@ -12,7 +12,7 @@
The &os; Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1102 2008/10/18 08:54:27 manolis Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1103 2008/12/07 20:44:01 pgj Exp $1995
@@ -7426,49 +7426,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.
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/book.sgml#3 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.31 2008/10/02 12:14:31 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.32 2008/12/07 22:03:48 pgj Exp $
-->
DocEng
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.31 2008/10/02 12:14:31 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.32 2008/12/07 22:03:48 pgj Exp $
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.31 2008/10/02 12:14:31 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.32 2008/12/07 22:03:48 pgj Exp $
&bookinfo.legalnotice;
@@ -192,7 +192,7 @@
- Notes, tips, important information, warnings, and examples
+ Notes, Tips, Important Information, Warnings, and ExamplesWithin the text appear notes, warnings, and examples.
@@ -220,7 +220,7 @@
- A sample example
+ A Sample ExampleExamples are represented like this, and typically contain
examples you should walk through, or show you what the results of a
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml,v 1.23 2005/02/20 16:46:26 simon Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml,v 1.24 2008/12/07 22:03:48 pgj Exp $
-->
@@ -146,7 +146,7 @@
- Before you start
+ Before You StartThis document assumes that you already know:
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.76 2008/12/06 22:09:01 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.77 2008/12/07 22:03:48 pgj Exp $
-->
@@ -172,8 +172,8 @@
Leaving gaps in the numbering is to be avoided.
- Bad ordering of
- hn elements
+ Bad Ordering of
+ hn ElementsUse:
@@ -2023,7 +2023,7 @@
- hostid and roles
+ hostid and RolesUse:
@@ -2190,8 +2190,8 @@
- Showing items that the user must fill
- in
+ Showing Items That the User Must Fill
+ InThere will often be times when you want to show the user what to
do, or refer to a file, or command line, or similar, where the user
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.48 2008/10/31 12:23:35 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.49 2008/12/07 22:03:48 pgj Exp $
-->
@@ -157,7 +157,7 @@
- Elements, tags, and attributes
+ Elements, Tags, and AttributesAll the DTDs written in SGML share certain characteristics. This is
hardly surprising, as the philosophy behind SGML will inevitably show
@@ -209,7 +209,7 @@
/element-name.
- Using an element (start and end tags)
+ Using an Element (Start and End Tags)HTML has an element for indicating that the content enclosed by
the element is a paragraph, called p. This
@@ -228,7 +228,7 @@
the start tag is required for this element.
- Using an element (start tag only)
+ Using an Element (Start Tag Only)HTML has an element for indicating a horizontal rule, called
hr. This element does not wrap content, so only
@@ -248,7 +248,7 @@
on.
- Elements within elements; em
+ Elements within Elements; emThis is a simple paragraph where some
of the words have been emphasized.]]>
@@ -298,7 +298,7 @@
left.
- Using an element with an attribute
+ Using An Element with An AttributeThe inclusion of the align attribute
on this paragraph was superfluous, since the default is left.
@@ -313,7 +313,7 @@
the attribute value.
- Single quotes around attributes
+ Single Quotes Around AttributesI am on the right!]]>
@@ -332,7 +332,7 @@
catalog files.
- For you to do…
+ For You to Do…In order to run the examples in this document you will need to
install some software on your system and ensure that an environment
@@ -356,7 +356,7 @@
.profile, for &man.sh.1; and
- &man.bash.1; users
+ &man.bash.1; Users
SGML_ROOT=/usr/local/share/sgml
SGML_CATALOG_FILES=${SGML_ROOT}/jade/catalog
@@ -370,7 +370,7 @@
.cshrc, for &man.csh.1; and
- &man.tcsh.1; users
+ &man.tcsh.1; Users
setenv SGML_ROOT /usr/local/share/sgml
setenv SGML_CATALOG_FILES ${SGML_ROOT}/jade/catalog
@@ -395,7 +395,7 @@
- An example HTML file
+ An Example HTML File
@@ -526,7 +526,7 @@
- The DOCTYPE declaration
+ The DOCTYPE DeclarationThe beginning of each document that you write must specify the name
of the DTD that the document conforms to. This is so that SGML parsers
@@ -692,7 +692,7 @@
- catalog files
+ catalog FilesIf you use the syntax above and process this document
using an SGML processor, the processor will need to have some way of
@@ -779,7 +779,7 @@
- Escaping back to SGML
+ Escaping Back to SGMLAs mentioned earlier, SGML is only used when writing a
DTD. This is not strictly true. There is certain SGML syntax that you
@@ -814,7 +814,7 @@
opens a comment, and the second closes it.
- SGML generic comment
+ SGML Generic Comment<!-- test comment -->
@@ -832,7 +832,7 @@
- Use 2 dashes
+ Use 2 DashesThere is a problem with producing the Postscript and PDF versions
of this document. The above example probably shows just one hyphen
@@ -861,7 +861,7 @@
will reject documents that make that error.
- Erroneous SGML comments
+ Erroneous SGML Comments
- For you to do…
+ For You to Do…
@@ -964,7 +964,7 @@
declaration.
- Defining general entities
+ Defining General Entities
@@ -982,7 +982,7 @@
- Parameter entities
+ Parameter EntitiesLike general
entities, parameter entities are used to assign names to
@@ -1003,7 +1003,7 @@
entity.
- Defining parameter entities
+ Defining Parameter Entities
@@ -1018,7 +1018,7 @@
- For you to do…
+ For You to Do…
@@ -1031,7 +1031,7 @@
- An example HTML file
+ An Example HTML File
@@ -1098,7 +1098,7 @@
- Using entities to include files
+ Using Entities to Include FilesEntities (both general and
- Using general entities to include files
+ Using General Entities to Include FilesSuppose you have some content for an SGML book organized into
files, one file per chapter, called
@@ -1121,7 +1121,7 @@
the value of the entity.
- Using general entities to include files
+ Using General Entities to Include Files
@@ -1150,7 +1150,7 @@
- Using parameter entities to include files
+ Using Parameter Entities to Include FilesRecall that parameter entities can only be used inside an SGML
context. Why then would you want to include a file within an SGML
@@ -1171,7 +1171,7 @@
document.
- Using parameter entities to include files
+ Using Parameter Entities to Include FilesFirst, place your entity definitions in a separate file, called
chapters.ent. This file contains the
@@ -1203,10 +1203,10 @@
- For you to do…
+ For You to Do…
- Use general entities to include files
+ Use General Entities to Include Files
@@ -1232,7 +1232,7 @@
- An example HTML file
+ An Example HTML File
@@ -1262,7 +1262,7 @@
- Use parameter entities to include files
+ Use Parameter Entities to Include FilesYou must have taken the previous steps first.
@@ -1279,7 +1279,7 @@
- An example HTML file
+ An Example HTML File
@@ -1321,14 +1321,14 @@
- Marked sections
+ Marked SectionsSGML provides a mechanism to indicate that particular pieces of the
document should be processed in a special way. These are termed
marked sections.
- Structure of a marked section
+ Structure of A Marked Section<![ KEYWORD [
Contents of marked section
@@ -1352,7 +1352,7 @@
>.
- Marked section keywords
+ Marked Section KeywordsCDATA, RCDATA
@@ -1409,7 +1409,7 @@
- Using a CDATA marked section
+ Using a CDATA Marked Section<para>Here is an example of how you would include some text
that contained many <literal><</literal>
@@ -1451,7 +1451,7 @@
Using INCLUDE and
- IGNORE in marked sections
+ IGNORE in Marked Sections
<![ INCLUDE [
This text will be processed and included.
@@ -1488,8 +1488,8 @@
reprocess the document.
- Using a parameter entity to control a marked
- section
+ Using A Parameter Entity to Control a Marked
+ Section<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY % electronic.copy "INCLUDE">
@@ -1515,7 +1515,7 @@
- For you to do…
+ For You to Do…
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml,v 1.13 2007/01/15 23:29:57 keramida Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml,v 1.14 2008/12/07 22:03:48 pgj Exp $
-->
@@ -70,7 +70,7 @@
HTML document without abusing HTML to do so.
- The DocBook documents
+ The DocBook DocumentsThe FreeBSD DSSSL stylesheets include a reference to a stylesheet,
docbook.css, which is expected to appear in the
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.33 2008/10/13 06:57:53 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.34 2008/12/07 22:03:48 pgj Exp $
-->
@@ -47,7 +47,7 @@
tools is covered in later chapters.
- Use textproc/docproj if possible
+ Use textproc/docproj If PossibleYou can save yourself a lot of time if you install the
textproc/docproj port. This is a
@@ -83,7 +83,7 @@
- Mandatory tools
+ Mandatory ToolsSoftware
@@ -199,7 +199,7 @@
- Optional tools
+ Optional ToolsYou do not need to have any of the following installed. However,
you may find it easier to work with the documentation if you do, and
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#3 (text+ko) ====
@@ -1,7 +1,7 @@
@@ -614,8 +614,8 @@
Enabling the Splash Screen FunctionThe splash screen (.bmp) or
- (.pcx) file has to be placed in the
- .pcx) file has to be placed on the
+ root partition, for example in the /boot directory.For default boot display resolution (256-color, 320 by
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#6 (text+ko) ====
@@ -1,6 +1,6 @@
@@ -199,7 +199,7 @@
- Firefox and &java; plugin
+ Firefox and &java; PluginIn this section and in the next one, we assume you have
@@ -232,12 +232,12 @@
&prompt.root; ln -s /usr/local/diablo-jre1.6.0/plugin/i386/ns7/libjavaplugin_oji.so \
/usr/local/lib/browser_plugins/
- then relaunch your browser.
+ Then relaunch your browser.
- Firefox and ¯omedia; &flash; plugin
+ Firefox and ¯omedia; &flash; PluginFlash
@@ -247,18 +247,41 @@
exists. This wrapper also supports &adobe; &acrobat; plugin,
&realplayer; plugin and more.
+
+ The following text covers the installation of &flash;
+ 9.X on recent -STABLE branch, &os; 7.1-RELEASE and above.
+ If you run an older version of &os; or encounter issues, you
+ should install www/linux-flashplugin7 and skip
+ the &man.linprocfs.5; part.
+
+
Install the www/nspluginwrapper
port. This port requires
emulators/linux_base which is a
large port.The next step is to install the www/linux-flashplugin7 port. Once
+ role="package">www/linux-flashplugin9 port. Once
this port is installed, the plugin must be installed by each
user with nspluginwrapper:&prompt.user; nspluginwrapper -v -a -i
+ The &linux; process file system, &man.linprocfs.5; has to
+ be mounted on /usr/compat/linux/proc, if one
+ wants to play &flash; animations. This can be done via the
+ following command:
+
+ &prompt.user; mount -t linprocfs linproc /usr/compat/linux/proc
+
+ This point can be automated at boot time with the addition
+ of the matching line in
+ /etc/fstab:
+
+ linproc /usr/compat/linux/proc linprocfs rw 0 0
+
Then, start your browser, enter
about:plugins in the location bar and press
Enter.
@@ -267,7 +290,7 @@
- Firefox and Swfdec &flash; plugin
+ Firefox and Swfdec &flash; PluginSwfdec is the library for decoding and rendering &flash; animations.
And Swfdec-Mozilla is a plugin for Firefox
@@ -279,7 +302,7 @@
&prompt.root; pkg_add -r swfdec-plugin
- if the package is not available, you can compile and install it
+ If the package is not available, you can compile and install it
from the Ports Collection:&prompt.root; cd /usr/ports/www/swfdec-plugin
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#11 (text+ko) ====
@@ -1,7 +1,7 @@
@@ -575,7 +575,7 @@
and building a custom kernel (see ). The VESA
support gives users the ability to display a splash screen
- image that fills the whole display screen.
+ image that fills the whole display screen.While the splash screen is being displayed during the
booting process, it can be turned off any time by hitting
==== //depot/projects/docproj_nl/www/en/news/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/news/Makefile,v 1.50 2008/01/16 08:21:47 murray Exp $
+# $FreeBSD: www/en/news/Makefile,v 1.51 2008/12/08 09:10:44 murray Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@@ -46,6 +46,7 @@
SUBDIR+= 2004
SUBDIR+= 2005
SUBDIR+= 2006
+SUBDIR+= 2007
SUBDIR+= status
.include "${WEB_PREFIX}/share/mk/web.site.mk"
==== //depot/projects/docproj_nl/www/en/news/news.sgml#2 (text+ko) ====
@@ -1,6 +1,6 @@
-
+
]>
@@ -19,8 +19,7 @@
-
Press Releases: Press
- releases from the project and other related organizations.
The second release candidate of FreeBSD 6.3 has been announced.
- ISO images and distributions for Tier-1 architectures are
- now available on most of the
- FreeBSD mirror sites.
-
-
-
-
- 30
-
- FreeBSD 7.0-RC1 Available
-
-
The first release candidate of FreeBSD 7.0 is now available.
- ISO images for Tier-1 architectures are now available on most of the
-
- FreeBSD mirror sites.
-
-
-
-
- 25
-
- Juniper Networks, Inc has donated a reference FreeBSD
- port to the MIPS architecture
-
-
Juniper Networks, Inc. (http://www.juniper.net) has donated a
- reference FreeBSD port to the MIPS architecture to The FreeBSD
- Project.
- This code will be used as one reference for creating an official
- project-supported FreeBSD/MIPS offering.
-
Information about the code drop can be found here.
The FreeBSD
- Foundation has announced an End-of-Year Fund Raising
- Drive. The goal this year is to raise over $250,000.
- This money is used for sponsoring FreeBSD related conferences,
- providing travel grants to developers to attend these conferences,
- providing grants for projects that improve FreeBSD, and
- providing legal support on issues like understanding
- the GPLv3 impact on FreeBSD, trademarks, and other legal
- issues that come up.
The &os; 7.0 release process proceeds and as a consequence
- the 7.0-BETA4 ISO images for Tier-1 architectures are now
- available for download on most
- &os; mirror sites. We ask our users to report any
- outstanding bugs, as this will presumably be the last BETA
- release before the first RC release.
The first release candidate of FreeBSD 6.3 has been announced.
- ISO images and distributions for Tier-1 architectures are now available on most of the
-
- FreeBSD mirror sites.
-
-
-
-
- 19
-
- &os; 7.0-BETA3 Available
-
-
The &os; 7.0 release process proceeds and as a consequence
- the 7.0-BETA3 ISO images for Tier-1 architectures are now
- available for download on most
- &os; mirror sites. We ask our users to report any
- outstanding bugs.
-
-
-
-
- 4
-
- &os; 7.0-BETA2 Available
-
-
The &os; 7.0 release process proceeds and as a consequence
- the 7.0-BETA2 ISO images for Tier-1 architectures are now
- available for download on most
- &os; mirror sites. We ask our users to report any
- outstanding bugs, as this will presumably be the last BETA
- release before the first RC release.
-
-
-
-
-
- 10
-
-
- 27
-
- The FreeBSD Foundation auctions the first copy of the book
- "Absolute &os;, 2nd Edition"
-
-
The &os; Foundation has started its Fall Fund-Raising
- Campaign with an auction of the first copy of the book
- "Absolute &os;, 2nd Edition" which was graciously
- donated by the author Michael Lucas. The winner of this
- auction will get a laser-printed Certificate of Authenticity
- together with a signed bookplate. All proceeds will go to
- The &os; Foundation! The bidding ends on November 2nd.
- More information is available on eBay.
-
-
-
-
- 26
-
-
Enhanced commit privileges: Martin Wilke
- (ports, doc)
Ulf Lilleengen is now a src/
- committer. He participated in the Summer of Code program, where he
- worked on gvinum. In FreeBSD, Ulf will continue to work on gvinum,
- as well as csup and filesystem-related parts.
-
-
-
- 22
-
- &os; 7.0-BETA1 Available
-
-
The final stage of the &os;-7.0 Release cycle has begun
- with the first beta release. The &os; 7.0-BETA1 ISO images
- for Tier-1 architectures are now available
- for download on most of the
- &os; mirror sites. The more people that test and
- report bugs, the better &os; 7.0-RELEASE will be. For more
- information about the &os; 7.0 release process, please check
- the official schedule
- and the todo
- list.
The July-October, 2007 Status Reports is now
- available with 21 entries.
-
-
-
- 3
-
- PC-BSD 1.4 Released
-
-
PC-BSD 1.4 has just been released. PC-BSD is a
- successful desktop operating system based on FreeBSD that
- focuses on providing an easy to use desktop system for
- casual computer users. The release may be downloaded or purchased on CD.
-
-
-
-
-
- 9
-
-
- 28
-
- New committer: Kai Wang
- (src). SoC2007 alumnus.
-
-
Kai Wang, a
- student in the Summer of Code program, is now a
- src/ committer.
-
-
-
- 25
-
- New committer: Rui Paulo
- (src). SoC2007 alumnus.
-
-
Rui Paulo, a
- student in the Summer of Code program, is now a full
- src/ committer.
We are happy to report that 22 students successfully
- completed their FreeBSD Summer of
- Code projects. Congratulations to both mentors and
- students, and thanks to Google for running
- this program and providing funding.
-
-
-
-
- 2
-
- IPv6 live at the FreeBSD.org cluster
-
-
Most of the machines and services in the FreeBSD.org cluster
- are now available through IPv6. This includes www, mail and
- developer ssh access. Connectivity is provided from ISC using
- a tunnel.
-
-
-
-
- 7
-
- FreeBSD Project Integrates Support for the Camellia Block Cipher
-
-
Support for the Camellia block cipher has been integrated
- into FreeBSD 7-CURRENT and will be part of the upcoming
- FreeBSD 7-RELEASE. For more information, please refer to the
- press release.
-
-
-
-
- 4
-
-
-
Enhanced commit privileges: Johann Kois
- (full doc/www)
Attilio Rao, a
- student in the Summer of Code program, is now a full
- src/ committer.
-
-
-
-
- 19
-
- Xorg 7.2 imported into the ports collection.
-
Thanks to the hard work of
- Florent Thoumie (and
- others), the FreeBSD ports collection now uses the modular
- Xorg 7.2 as its default X server. i386 and AMD64 6.2-STABLE
- packages are available and other architectures/releases
- will be available later, or you can compile it from
- source. In both cases, see
- the 20070519 entry in /usr/ports/UPDATING on how to upgrade. Please track -ports
- for last minute information.
-
-
-
-
-
- 13
-
-
- Funded Summer of Code Projects Announced
-
-
The FreeBSD Project received over 120 applications for Google's
- Summer of Code program, amongst which 25 were selected
- for funding. Unfortunately, there were far more first rate
- applications than available spots for students. However,
- we encourage students to work together with us all year
- round. The FreeBSD Project is always willing to help
- mentor students learn more about operating system
- development through our normal community mailing lists and
- development forums. Contributing to an open source
- software project is a valuable component of a computer
- science education and great preparation for a career in
- software development.
-
-
A complete list of the winning students and projects is
- available here.
-A Summer
-of Code wiki is also available with additional information.
Under the supervision of Ganbold Tsagaankhuu the
- Mongolian translation goes live. The official translation of the
- FreeBSD Handbook, completed by the Mongolian FreeBSD Documentation
- Project, adds support for documentation in another language. For
- more information about the ongoing work of the MFDP, please refer
- to the Translations page
- of the FreeBSD Documentation Project.
The January-March, 2007 Status Report is now
- available with 19 entries.
-
-
-
-
- 6
-
- ZFS Now Part of FreeBSD
-
-
Support for Sun's
- ZFS has been committed
- to the FreeBSD 7-CURRENT development branch and will be available
- as an experimental feature in FreeBSD 7.0-RELEASE. For more
- information please refer to the
- announcement.
-
-
-
-
- 14
-
- Accepting Applications for Summer of Code
-
-
The FreeBSD Project is now accepting applications for
- the Google Summer
- of Code 2007 program. This program will provide
- funding for students to spend the summer contributing to
- open source software projects. A list of FreeBSD specific
- projects and potential mentors is available here.
-
-
Once a suitable project and mentor have been identified,
- interested students should complete a proposal and submit
- it to Google. Proposals are now being accepted and the
- final deadline is March 24, 2007. Please see the Google
- FAQ for more information.
-
-
-
-
- 12
-
- March 2007 Snapshot Releases Available
-
-
FreeBSD 7-CURRENT and 6-STABLE snapshot releases for
- March 2007 now available. The FreeBSD Release Engineering
- Team issues snapshot releases to encourage users to test
- new features and improve the reliability. For more
- details, please visit
- the snapshots
- page.
-
-
-
-
- 11
-
- New committer: Michael Bushkov
- (src). An SoC2006 alumnus.
-
-
Michael Bushkov, a
- successful student from last year's Summer of Code
- program, has continued working with the FreeBSD Project
- and is now a full src/ committer.
-
-
-
-
- 10
-
- Progress on scaling of FreeBSD on 8 CPU systems
-
-
Recently there has been significant progress on optimizing
- FreeBSD 7.0 for MySQL running an 8-core amd64 system. Under the
- test workload FreeBSD has peak performance consistent with Linux,
- and outperforms it by a factor of 4 under higher loads. Continue
- reading for a more detailed
- report here.
-
-
-
-
- 7
-
- FreeBSD Announces Intel Approval for Redistribution of Wireless Firmware
-
-
The FreeBSD project has reached an agreement with Intel about the redistribution
- of firmware images for Intel wireless cards. Please refer to the press release
- for more information.
-
-
-
-
-
- 2
-
-
- 27
-
-
Information
- about how the change in Daylight Savings Time for some
- time zones affects FreeBSD releases.
AsiaBSDCon, the BSD conference for Asia, has posted its schedule of
- tutorials, papers and presentations for the conference, taking place
- in Tokyo from March 8th through 11th 2007. The complete schedule can
- be found here.
-
-
Registration will begin on or about the 12th of February.
-
-
-
-
- 2
-
-
Enhanced commit privileges: Gábor Kövesdán
- (doc, ports)
-
-
-
-
-
- 1
-
-
- 31
-
-
Enhanced commit privileges: Rong-En Fan
- (src, ports)
The October-December, 2006 Status Report is now
- available with 41 entries.
-
-
-
-
- 15
-
-
- FreeBSD 6.2-RELEASE is Now Available
-
-
FreeBSD
- 6.2-RELEASE has been released. Please check the release errata
- before installation for any late-breaking news and/or
- issues with 6.2. The Release Information
- page has more information about FreeBSD releases.
Under the supervision of FreeBSD developer Gábor Kövesdán, the
- Hungarian translation goes live. This official translation,
- completed by the Hungarian FreeBSD Documentation Project, adds
- support for documentation in another language. For more
- information about the ongoing work of the HFDP team, please refer
- to the
- Translations page of the FreeBSD Documentation Project.
-
-
-
-
-
==== //depot/projects/docproj_nl/www/share/sgml/press.xml#6 (text+ko) ====
@@ -9,7 +9,7 @@
- $FreeBSD: www/share/sgml/press.xml,v 1.70 2008/10/06 08:54:23 jkoshy Exp $
+ $FreeBSD: www/share/sgml/press.xml,v 1.71 2008/12/08 09:10:44 murray Exp $
@@ -156,458 +156,4 @@
-
- 2007
-
-
- 11
-
-
- DataPipe and Rackspace are the Most Reliable Hosting Companies in October 2007
- http://news.netcraft.com/archives/2007/11/19/datapipe_and_rackspace_are_the_most_reliable_hosting_companies_in_october_2007.html
- Netcraft
- http://www.netcraft.com/
- 19 November 2007
- Paul Mutton
-
FreeBSD using web hosting provider DataPipe was ranked the
- most reliable provider in October 2007 by Netcraft.
-
-
-
-
- 10
-
-
- Desktop FreeBSD Part 9: FreeBSD and Broadband
- http://www.ofb.biz/safari/article/441.html
- Open For Business
- http://www.ofb.biz/
- 30 October 2007
- Ed Hurst
-
An article that briefly covers broadband setup on FreeBSD.
-
-
-
- Squeeze Your Gigabit NIC for Top Performance
- http://www.enterprisenetworkingplanet.com/nethub/article.php/3485486
- Enterprise Networking Planet
- http://www.enterprisenetworkingplanet.com/
- 24 October 2007
- Charlie Schluting
-
Describes the TCP stack tuning process used to get FreeBSD
- 5.3 to run at gigabit speeds.
FreeBSD-based FreeNAS is touched upon in an article on
- open-source storage tools.
-
-
-
- Creating And Managing A Jailed Virtual Host
- in FreeBSD
- http://www.openaddict.com/node/36
- OpenAddict
- http://www.openaddict.com/
- 18 October 2007
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon Dec 8 20:34:06 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6994E1065677; Mon, 8 Dec 2008 20:34:06 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 2E10A1065670
for ; Mon, 8 Dec 2008 20:34:06 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 1C4E78FC16
for ; Mon, 8 Dec 2008 20:34:06 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB8KY5th017952
for ; Mon, 8 Dec 2008 20:34:05 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB8KY5KO017950
for perforce@freebsd.org; Mon, 8 Dec 2008 20:34:05 GMT
(envelope-from rene@FreeBSD.org)
Date: Mon, 8 Dec 2008 20:34:05 GMT
Message-Id: <200812082034.mB8KY5KO017950@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154368 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 08 Dec 2008 20:34:06 -0000
http://perforce.freebsd.org/chv.cgi?CH=154368
Change 154368 by rene@rene_self on 2008/12/08 20:33:25
MFen handbook/desktop 1.83 -> 1.85
Affected files ...
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#12 edit
Differences ...
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#12 (text+ko) ====
@@ -5,7 +5,7 @@
$FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.37 2006/08/25 16:14:06 remko Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
- %SRCID% 1.83
+ %SRCID% 1.85
-->
@@ -268,10 +268,19 @@
Flash¯omedia; &flash; plugin is niet beschikbaar voor &os;.
- Er is echter wel een softwarelaag (wrapper) om de
- &linux;-versie van de plugin te draaien. Deze wrapper
- ondersteunt ook &adobe; &acrobat; plugin, &realplayer; plugin en
- meer.
+ Er is echter wel een softwarelaag (wrapper) om de &linux;-versie
+ van de plugin te draaien. Deze wrapper ondersteunt ook &adobe;
+ &acrobat; plugin, &realplayer; plugin en meer.
+
+
+ De volgende tekst behandelt de installatie van &flash; 9.X
+ op een recente -STABLE-tak, &os; 7.1-RELEASE en verder. Als u
+ een oudere versie van &os; draait of problemen tegenkomt,
+ dient u www/linux-flashplugin7 te
+ installeren en het gedeelte over &man.linprocfs.5; over te
+ slaan.
+ Installeer de port www/nspluginwrapper. Deze is
@@ -279,14 +288,28 @@
role="package">emulators/linux_base wat een grote
port is.
- De volgende stap is het installeren van de www/linux-flashplugin7 port. Zodra
- de plugin geïnstalleerd is, moet de plugin door elke
- gebruiker geïnstalleerd worden met
+ De volgende stap is het installeren van de port www/linux-flashplugin9. Zodra de
+ plugin geïnstalleerd is, moet de plugin door elke gebruiker
+ geïnstalleerd worden met
nspluginwrapper:&prompt.user; nspluginwrapper -v -a -i
+ Het &linux; procesbestandssysteem, &man.linprocfs.5;, moet
+ zijn aangekoppeld op /usr/compat/linux/proc, indien
+ het gewenst is om &flash;-animaties af te spelen. Dit kan met
+ het volgende commando gedaan worden:
+
+ &prompt.user; mount -t linprocfs linproc /usr/compat/linux/proc
+
+ Dit punt kan geautomatiseerd worden tijdens het opstarten
+ door het toevoegen van deze regel aan
+ /etc/fstab:
+
+ linproc /usr/compat/linux/proc linprocfs rw 0 0
+
Start dan de browser en voer op de adresbalk
about:plugins in en druk op
Enter. Een pagina met alle geïnstalleerde
From owner-p4-projects@FreeBSD.ORG Tue Dec 9 04:28:13 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0DD151065677; Tue, 9 Dec 2008 04:28:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id C4F6C106564A
for ; Tue, 9 Dec 2008 04:28:12 +0000 (UTC)
(envelope-from zec@icir.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id B210F8FC08
for ; Tue, 9 Dec 2008 04:28:12 +0000 (UTC)
(envelope-from zec@icir.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB94SCie092773
for ; Tue, 9 Dec 2008 04:28:12 GMT
(envelope-from zec@icir.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB94SCOX092771
for perforce@freebsd.org; Tue, 9 Dec 2008 04:28:12 GMT
(envelope-from zec@icir.org)
Date: Tue, 9 Dec 2008 04:28:12 GMT
Message-Id: <200812090428.mB94SCOX092771@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@icir.org using -f
From: Marko Zec
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154381 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 09 Dec 2008 04:28:13 -0000
http://perforce.freebsd.org/chv.cgi?CH=154381
Change 154381 by zec@zec_tca51 on 2008/12/09 04:28:02
IFC @ 154379
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/common/loader.8#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/forth/support.4th#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/i386/boot0/boot0.S#5 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/zfs/Makefile#3 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_table.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/adb/adb.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/adb/adb_bus.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/adb/adb_kbd.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/adb/adb_mouse.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/adb/adbvar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ae/if_ae.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/if_athvar.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_t3_hw.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/dc/if_dc.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/dc/if_dcreg.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxp.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmc.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcsd.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb_pci.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sdhci/sdhci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/if_ural.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_map.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom_subr.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/journal/g_journal.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/journal/g_journal.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/include/atomic.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_proc.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_rwlock.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_param.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_witness.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_export.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/net/radix.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net/radix.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net/route.c#25 integrate
.. //depot/projects/vimage-commit2/src/sys/net/route.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_mppc.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#23 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#30 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#10 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_asconf.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_asconf.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_auth.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_auth.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_constants.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_header.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_input.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#19 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_timer.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_uio.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_var.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#29 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/sctp6_usrreq.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/pci/if_rlreg.h#9 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/conf/NOTES#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/cuda.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/cudavar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/macgpio.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/macgpiovar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/pmu.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/pmuvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/rwlock.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_quota.c#3 integrate
Differences ...
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#9 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.645 2008/08/09 05:46:13 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.646 2008/12/06 19:37:52 alc Exp $");
/*
* Manages physical address maps.
@@ -180,7 +180,7 @@
SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
-static int pg_ps_enabled;
+static int pg_ps_enabled = 1;
SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RD, &pg_ps_enabled, 0,
"Are large page mappings enabled?");
==== //depot/projects/vimage-commit2/src/sys/boot/common/loader.8#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.94 2007/11/08 11:59:38 ru Exp $
+.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.95 2008/12/06 11:21:10 danger Exp $
.\"
.Dd November 8, 2007
.Dt LOADER 8
@@ -454,7 +454,7 @@
or if a SIGTERM is delivered to the
.Xr init 8
process (PID 1).
-.It Va init_script
+.It Va init_shell
Defines the shell binary to be used for executing the various shell scripts.
The default is
.Dq Li /bin/sh .
==== //depot/projects/vimage-commit2/src/sys/boot/forth/support.4th#2 (text+ko) ====
@@ -22,7 +22,7 @@
\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
\ SUCH DAMAGE.
\
-\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.17 2007/12/19 17:06:32 ambrisko Exp $
+\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.18 2008/12/07 19:42:20 luigi Exp $
\ Loader.rc support functions:
\
@@ -288,6 +288,17 @@
: free-memory free if free_error throw then ;
+: strget { var -- addr len } var .addr @ var .len @ ;
+
+\ assign addr len to variable.
+: strset { addr len var -- } addr var .addr ! len var .len ! ;
+
+\ free memory and reset fields
+: strfree { var -- } var .addr @ ?dup if free-memory 0 0 var strset then ;
+
+\ free old content, make a copy of the string and assign to variable
+: string= { addr len var -- } var strfree addr len strdup var strset ;
+
\ Assignment data temporary storage
string name_buffer
@@ -712,19 +723,6 @@
module_loaderror_suffix suffix_type?
;
-: set_conf_files
- conf_files .addr @ ?dup if
- free-memory
- then
- value_buffer .addr @ c@ [char] " = if
- value_buffer .addr @ char+ value_buffer .len @ 2 chars -
- else
- value_buffer .addr @ value_buffer .len @
- then
- strdup
- conf_files .len ! conf_files .addr !
-;
-
: set_nextboot_conf
nextboot_conf_file .addr @ ?dup if
free-memory
@@ -888,6 +886,11 @@
then
;
+: set_conf_files
+ set_environment_variable
+ s" loader_conf_files" getenv conf_files string=
+;
+
: set_nextboot_flag
yes_value? to nextboot?
;
@@ -1045,7 +1048,6 @@
\ Variables used for processing multiple conf files
string current_file_name
-variable current_conf_files
\ Indicates if any conf file was succesfully read
@@ -1053,18 +1055,10 @@
\ loader_conf_files processing support functions
-: set_current_conf_files
- conf_files .addr @ current_conf_files !
+: get_conf_files ( -- addr len ) \ put addr/len on stack, reset var
+ conf_files strget 0 0 conf_files strset
;
-: get_conf_files
- conf_files .addr @ conf_files .len @ strdup
-;
-
-: recurse_on_conf_files?
- current_conf_files @ conf_files .addr @ <>
-;
-
: skip_leading_spaces { addr len pos -- addr len pos' }
begin
pos len = if addr len pos exit then
@@ -1133,7 +1127,6 @@
\ Interface to loader_conf_files processing
: include_conf_files
- set_current_conf_files
get_conf_files 0
begin
get_next_file ?dup
@@ -1141,7 +1134,7 @@
set_current_file_name
['] load_conf catch
process_conf_errors
- recurse_on_conf_files? if recurse then
+ conf_files .addr @ if recurse then
repeat
;
==== //depot/projects/vimage-commit2/src/sys/boot/i386/boot0/boot0.S#5 (text+ko) ====
@@ -14,7 +14,7 @@
* warranties of merchantability and fitness for a particular
* purpose.
*
- * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.20 2008/12/03 14:53:59 luigi Exp $
+ * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.21 2008/12/08 20:53:27 sobomax Exp $
*/
/* build options: */
@@ -93,7 +93,7 @@
* %si pointer to the partition table from which we were loaded.
* Some boot code (e.g. syslinux) use this info to relocate
* themselves, so we want to pass a valid one to the next stage.
- * NOTE: the use of %is is not a standard.
+ * NOTE: the use of %si is not a standard.
*
* This boot block first relocates itself at a different address (0:0x600),
* to free the space at 0:0x7c00 for the next stage boot block.
==== //depot/projects/vimage-commit2/src/sys/boot/i386/btx/btxldr/btxldr.S#2 (text+ko) ====
@@ -12,9 +12,12 @@
* warranties of merchantability and fitness for a particular
* purpose.
*
- * $FreeBSD: src/sys/boot/i386/btx/btxldr/btxldr.S,v 1.17 2004/05/14 20:29:30 ru Exp $
+ * $FreeBSD: src/sys/boot/i386/btx/btxldr/btxldr.S,v 1.20 2008/12/09 00:25:57 sobomax Exp $
*/
+#define RBX_MUTE 0x10 /* -m */
+#define OPT_SET(opt) (1 << (opt))
+
/*
* Prototype BTX loader program, written in a couple of hours. The
* real thing should probably be more flexible, and in C.
@@ -64,6 +67,8 @@
* BTX program loader for ELF clients.
*/
start: cld # String ops inc
+ testl $OPT_SET(RBX_MUTE), 4(%esp) # Check first argument
+ setnz muted # for RBX_MUTE, set flag
movl $m_logo,%esi # Identify
call putstr # ourselves
movzwl BDA_MEM,%eax # Get base memory
@@ -288,7 +293,9 @@
/*
* Output character AL to the console.
*/
-putchr: pusha # Save
+putchr: testb $1,muted # Check muted
+ jnz putchr.5 # do a nop
+ pusha # Save
xorl %ecx,%ecx # Zero for loops
movb $SCR_MAT,%ah # Mode/attribute
movl $BDA_POS,%ebx # BDA pointer
@@ -325,7 +332,7 @@
movb $SCR_ROW-1,%dh # Bottom line
putchr.4: movw %dx,(%ebx) # Update position
popa # Restore
- ret # To caller
+putchr.5: ret # To caller
/*
* Convert EAX, AX, or AL to hex, saving the result to [EDI].
*/
@@ -390,6 +397,12 @@
.asciz " memsz=\0\n"
m_done: .asciz "Loading complete\n"
#endif
+
+/*
+ * Flags
+ */
+muted: .byte 0x0
+
/*
* Uninitialized data area.
*/
==== //depot/projects/vimage-commit2/src/sys/boot/zfs/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/zfs/Makefile,v 1.2 2008/11/22 14:24:55 dfr Exp $
+# $FreeBSD: src/sys/boot/zfs/Makefile,v 1.3 2008/12/06 14:45:03 ps Exp $
LIB= zfsboot
INTERNALLIB=
@@ -29,7 +29,7 @@
.if ${MACHINE_ARCH} == "amd64"
CLEANFILES+= machine
machine:
- ln -sf ${.CURDIR}/../../../i386/include machine
+ ln -sf ${.CURDIR}/../../i386/include machine
.endif
.include
==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#15 (text+ko) ====
@@ -42,7 +42,7 @@
#include "opt_compat.h"
#include
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.128 2008/12/02 21:37:28 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.130 2008/12/08 13:15:31 kib Exp $");
#include
#include
@@ -273,8 +273,7 @@
/* XXX per-cpu vendor / class / model / id? */
}
- sbuf_cat(sb,
- "flags\t\t:");
+ sbuf_cat(sb, "flags\t\t:");
if (!strcmp(cpu_vendor, "AuthenticAMD") && (class < 6)) {
flags[16] = "fcmov";
@@ -876,10 +875,12 @@
linprocfs_doprocmaps(PFS_FILL_ARGS)
{
vm_map_t map = &p->p_vmspace->vm_map;
- vm_map_entry_t entry;
+ vm_map_entry_t entry, tmp_entry;
vm_object_t obj, tobj, lobj;
- vm_offset_t saved_end;
+ vm_offset_t e_start, e_end;
vm_ooffset_t off = 0;
+ vm_prot_t e_prot;
+ unsigned int last_timestamp;
char *name = "", *freename = NULL;
ino_t ino;
int ref_count, shadow_count, flags;
@@ -905,7 +906,9 @@
freename = NULL;
if (entry->eflags & MAP_ENTRY_IS_SUB_MAP)
continue;
- saved_end = entry->end;
+ e_prot = entry->protection;
+ e_start = entry->start;
+ e_end = entry->end;
obj = entry->object.vm_object;
for (lobj = tobj = obj; tobj; tobj = tobj->backing_object) {
VM_OBJECT_LOCK(tobj);
@@ -913,6 +916,8 @@
VM_OBJECT_UNLOCK(lobj);
lobj = tobj;
}
+ last_timestamp = map->timestamp;
+ vm_map_unlock_read(map);
ino = 0;
if (lobj) {
off = IDX_TO_OFF(lobj->size);
@@ -950,10 +955,10 @@
*/
error = sbuf_printf(sb,
"%08lx-%08lx %s%s%s%s %08lx %02x:%02x %lu%s%s\n",
- (u_long)entry->start, (u_long)entry->end,
- (entry->protection & VM_PROT_READ)?"r":"-",
- (entry->protection & VM_PROT_WRITE)?"w":"-",
- (entry->protection & VM_PROT_EXECUTE)?"x":"-",
+ (u_long)e_start, (u_long)e_end,
+ (e_prot & VM_PROT_READ)?"r":"-",
+ (e_prot & VM_PROT_WRITE)?"w":"-",
+ (e_prot & VM_PROT_EXECUTE)?"x":"-",
"p",
(u_long)off,
0,
@@ -968,6 +973,16 @@
error = 0;
break;
}
+ vm_map_lock_read(map);
+ if (last_timestamp + 1 != map->timestamp) {
+ /*
+ * Look again for the entry because the map was
+ * modified while it was unlocked. Specifically,
+ * the entry may have been clipped, merged, or deleted.
+ */
+ vm_map_lookup_entry(map, e_end - 1, &tmp_entry);
+ entry = tmp_entry;
+ }
}
vm_map_unlock_read(map);
==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_table.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
#include "opt_inet6.h"
#include
-__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_table.c,v 1.9 2007/10/24 20:57:17 mlaier Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_table.c,v 1.10 2008/12/07 21:15:43 kmacy Exp $");
#endif
#include
@@ -43,6 +43,8 @@
#include
#include
#include
+#include
+#include
#ifdef __FreeBSD__
#include
#endif
==== //depot/projects/vimage-commit2/src/sys/dev/adb/adb.h#2 (text+ko) ====
@@ -22,7 +22,7 @@
* 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/adb/adb.h,v 1.1 2008/10/26 19:37:38 nwhitehorn Exp $
+ * $FreeBSD: src/sys/dev/adb/adb.h,v 1.2 2008/12/06 23:26:02 nwhitehorn Exp $
*/
#ifndef _POWERPC_ADB_H_
@@ -68,7 +68,7 @@
uint8_t adb_get_device_handler(device_t dev);
uint8_t adb_set_device_handler(device_t dev, uint8_t newhandler);
-uint8_t adb_read_register(device_t dev, u_char reg, size_t *len, void *data);
+size_t adb_read_register(device_t dev, u_char reg, void *data);
/* Bits for implementing ADB host bus adapters */
extern devclass_t adb_devclass;
==== //depot/projects/vimage-commit2/src/sys/dev/adb/adb_bus.c#4 (text+ko) ====
@@ -22,7 +22,7 @@
* 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/adb/adb_bus.c,v 1.3 2008/11/12 17:33:36 nwhitehorn Exp $
+ * $FreeBSD: src/sys/dev/adb/adb_bus.c,v 1.4 2008/12/06 23:26:02 nwhitehorn Exp $
*/
#include
@@ -48,7 +48,7 @@
static void adb_probe_nomatch(device_t dev, device_t child);
static int adb_print_child(device_t dev, device_t child);
-static int adb_send_raw_packet_sync(device_t dev, uint8_t to, uint8_t command, uint8_t reg, int len, u_char *data);
+static int adb_send_raw_packet_sync(device_t dev, uint8_t to, uint8_t command, uint8_t reg, int len, u_char *data, u_char *reply);
static char *adb_device_string[] = {
"HOST", "dongle", "keyboard", "mouse", "tablet", "modem", "RESERVED", "misc"
@@ -118,9 +118,8 @@
sc->packet_reply = 0;
sc->autopoll_mask = 0;
+ sc->sync_packet = 0xffff;
- mtx_init(&sc->sc_sync_mtx,"adbsyn",NULL,MTX_DEF | MTX_RECURSE);
-
/* Initialize devinfo */
for (i = 0; i < 16; i++) {
sc->devinfo[i].address = i;
@@ -128,7 +127,7 @@
}
/* Reset ADB bus */
- adb_send_raw_packet_sync(dev,0,ADB_COMMAND_BUS_RESET,0,0,NULL);
+ adb_send_raw_packet_sync(dev,0,ADB_COMMAND_BUS_RESET,0,0,NULL,NULL);
DELAY(1500);
/* Enumerate bus */
@@ -140,7 +139,7 @@
do {
reply = adb_send_raw_packet_sync(dev,i,
- ADB_COMMAND_TALK,3,0,NULL);
+ ADB_COMMAND_TALK,3,0,NULL,NULL);
if (reply) {
/* If we got a response, relocate to next_free */
@@ -150,10 +149,10 @@
r3 |= 0x00fe;
adb_send_raw_packet_sync(dev,i, ADB_COMMAND_LISTEN,3,
- sizeof(uint16_t),(u_char *)(&r3));
+ sizeof(uint16_t),(u_char *)(&r3),NULL);
adb_send_raw_packet_sync(dev,next_free,
- ADB_COMMAND_TALK,3,0,NULL);
+ ADB_COMMAND_TALK,3,0,NULL,NULL);
sc->devinfo[next_free].default_address = i;
if (first_relocated < 0)
@@ -169,9 +168,9 @@
adb_send_raw_packet_sync(dev,first_relocated,
ADB_COMMAND_LISTEN,3,
- sizeof(uint16_t),(u_char *)(&r3));
+ sizeof(uint16_t),(u_char *)(&r3),NULL);
adb_send_raw_packet_sync(dev,i,
- ADB_COMMAND_TALK,3,0,NULL);
+ ADB_COMMAND_TALK,3,0,NULL,NULL);
sc->devinfo[i].default_address = i;
sc->devinfo[(int)(first_relocated)].default_address = 0;
@@ -194,10 +193,6 @@
static int adb_bus_detach(device_t dev)
{
- struct adb_softc *sc = device_get_softc(dev);
-
- mtx_destroy(&sc->sc_sync_mtx);
-
return (bus_generic_detach(dev));
}
@@ -230,6 +225,7 @@
if (sc->sync_packet == command) {
memcpy(sc->syncreg,data,(len > 8) ? 8 : len);
atomic_store_rel_int(&sc->packet_reply,len + 1);
+ wakeup(sc);
}
if (sc->children[addr] != NULL) {
@@ -317,12 +313,12 @@
static int
adb_send_raw_packet_sync(device_t dev, uint8_t to, uint8_t command,
- uint8_t reg, int len, u_char *data)
+ uint8_t reg, int len, u_char *data, u_char *reply)
{
u_char command_byte = 0;
struct adb_softc *sc;
int result = -1;
- int i = 0;
+ int i = 1;
sc = device_get_softc(dev);
@@ -331,7 +327,8 @@
command_byte |= reg;
/* Wait if someone else has a synchronous request pending */
- mtx_lock(&sc->sc_sync_mtx);
+ while (!atomic_cmpset_int(&sc->sync_packet, 0xffff, command_byte))
+ tsleep(sc, 0, "ADB sync", hz/10);
sc->packet_reply = 0;
sc->sync_packet = command_byte;
@@ -343,21 +340,27 @@
* Maybe the command got lost? Try resending and polling the
* controller.
*/
- if (i > 40)
+ if (i % 40 == 0)
ADB_HB_SEND_RAW_PACKET(sc->parent, command_byte,
len, data, 1);
- DELAY(100);
+ tsleep(sc, 0, "ADB sync", hz/10);
i++;
}
result = sc->packet_reply - 1;
+ if (reply != NULL && result > 0)
+ memcpy(reply,sc->syncreg,result);
+
/* Clear packet sync */
sc->packet_reply = 0;
- sc->sync_packet = 0xffff; /* We can't match a 16 bit value */
- mtx_unlock(&sc->sc_sync_mtx);
+ /*
+ * We can't match a value beyond 8 bits, so set sync_packet to
+ * 0xffff to avoid collisions.
+ */
+ atomic_set_int(&sc->sync_packet, 0xffff);
return (result);
}
@@ -375,37 +378,27 @@
newr3 = dinfo->register3 & 0xff00;
newr3 |= (uint16_t)(newhandler);
+ adb_send_raw_packet_sync(sc->sc_dev,dinfo->address, ADB_COMMAND_LISTEN,
+ 3, sizeof(uint16_t), (u_char *)(&newr3), NULL);
adb_send_raw_packet_sync(sc->sc_dev,dinfo->address,
- ADB_COMMAND_LISTEN, 3, sizeof(uint16_t), (u_char *)(&newr3));
- adb_send_raw_packet_sync(sc->sc_dev,dinfo->address,
- ADB_COMMAND_TALK, 3, 0, NULL);
+ ADB_COMMAND_TALK, 3, 0, NULL, NULL);
return (dinfo->handler_id);
}
-uint8_t
-adb_read_register(device_t dev, u_char reg,
- size_t *len, void *data)
+size_t
+adb_read_register(device_t dev, u_char reg, void *data)
{
struct adb_softc *sc;
struct adb_devinfo *dinfo;
- size_t orig_len;
+ size_t result;
dinfo = device_get_ivars(dev);
sc = device_get_softc(device_get_parent(dev));
- orig_len = *len;
+ result = adb_send_raw_packet_sync(sc->sc_dev,dinfo->address,
+ ADB_COMMAND_TALK, reg, 0, NULL, data);
- mtx_lock(&sc->sc_sync_mtx);
-
- *len = adb_send_raw_packet_sync(sc->sc_dev,dinfo->address,
- ADB_COMMAND_TALK, reg, 0, NULL);
-
- if (*len > 0)
- memcpy(data,sc->syncreg,*len);
-
- mtx_unlock(&sc->sc_sync_mtx);
-
- return ((*len > 0) ? 0 : -1);
+ return (result);
}
==== //depot/projects/vimage-commit2/src/sys/dev/adb/adb_kbd.c#2 (text+ko) ====
@@ -22,7 +22,7 @@
* 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/adb/adb_kbd.c,v 1.1 2008/10/26 19:37:38 nwhitehorn Exp $
+ * $FreeBSD: src/sys/dev/adb/adb_kbd.c,v 1.2 2008/12/06 23:26:02 nwhitehorn Exp $
*/
#include
@@ -271,12 +271,13 @@
}
#endif
+ /* Check if we can read out the LED state from
+ this keyboard by reading the key state register */
+ if (adb_read_register(dev, 2, NULL) == 2)
+ sc->have_led_control = 1;
+
adb_set_autopoll(dev,1);
- /* Check (asynchronously) if we can read out the LED state from
- this keyboard by reading the key state register */
- adb_send_packet(dev,ADB_COMMAND_TALK,2,0,NULL);
-
return (0);
}
@@ -323,11 +324,6 @@
if (command != ADB_COMMAND_TALK)
return 0;
- if (reg == 2 && len == 2) {
- sc->have_led_control = 1;
- return 0;
- }
-
if (reg != 0 || len != 2)
return (0);
==== //depot/projects/vimage-commit2/src/sys/dev/adb/adb_mouse.c#3 (text+ko) ====
@@ -22,7 +22,7 @@
* 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/adb/adb_mouse.c,v 1.3 2008/11/02 19:08:10 ed Exp $
+ * $FreeBSD: src/sys/dev/adb/adb_mouse.c,v 1.4 2008/12/06 23:26:02 nwhitehorn Exp $
*/
#include
@@ -181,7 +181,7 @@
sc->mode.resolution = 200;
break;
case 4:
- adb_read_register(dev,1,&r1_len,r1);
+ r1_len = adb_read_register(dev,1,r1);
if (r1_len < 8)
break;
==== //depot/projects/vimage-commit2/src/sys/dev/adb/adbvar.h#3 (text+ko) ====
@@ -22,7 +22,7 @@
* 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/adb/adbvar.h,v 1.2 2008/10/30 15:27:13 nwhitehorn Exp $
+ * $FreeBSD: src/sys/dev/adb/adbvar.h,v 1.3 2008/12/06 23:26:02 nwhitehorn Exp $
*/
#ifndef _POWERPC_ADBVAR_H_
@@ -40,7 +40,6 @@
device_t parent;
struct intr_config_hook enum_hook;
- struct mtx sc_sync_mtx;
volatile int sync_packet;
volatile int packet_reply;
==== //depot/projects/vimage-commit2/src/sys/dev/ae/if_ae.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.1 2008/10/03 10:31:31 stas Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.2 2008/12/06 14:23:45 stas Exp $");
#include
#include
@@ -1105,12 +1105,9 @@
static int
ae_alloc_rings(ae_softc_t *sc)
{
- bus_dma_tag_t bustag;
bus_addr_t busaddr;
int error;
- bustag = bus_get_dma_tag(sc->dev);
-
/*
* Create parent DMA tag.
*/
@@ -1903,8 +1900,8 @@
if_printf(ifp, "Rx interrupt occuried.\n");
#endif
size = le16toh(rxd->len) - ETHER_CRC_LEN;
- if (size < 0) {
- if_printf(ifp, "Negative length packet received.");
+ if (size < (ETHER_MIN_LEN - ETHER_CRC_LEN - ETHER_VLAN_ENCAP_LEN)) {
+ if_printf(ifp, "Runt frame received.");
return (EIO);
}
==== //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#7 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.221 2008/12/01 16:53:01 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.223 2008/12/07 19:29:11 sam Exp $");
/*
* Driver for the Atheros Wireless LAN controller.
@@ -219,9 +219,15 @@
SYSCTL_DECL(_hw_ath);
/* XXX validate sysctl values */
-static int ath_calinterval = 30; /* calibrate every 30 secs */
-SYSCTL_INT(_hw_ath, OID_AUTO, calibrate, CTLFLAG_RW, &ath_calinterval,
- 0, "chip calibration interval (secs)");
+static int ath_longcalinterval = 30; /* long cals every 30 secs */
+SYSCTL_INT(_hw_ath, OID_AUTO, longcal, CTLFLAG_RW, &ath_longcalinterval,
+ 0, "long chip calibration interval (secs)");
+static int ath_shortcalinterval = 100; /* short cals every 100 ms */
+SYSCTL_INT(_hw_ath, OID_AUTO, shortcal, CTLFLAG_RW, &ath_shortcalinterval,
+ 0, "short chip calibration interval (msecs)");
+static int ath_resetcalinterval = 20*60; /* reset cal state 20 mins */
+SYSCTL_INT(_hw_ath, OID_AUTO, resetcal, CTLFLAG_RW, &ath_resetcalinterval,
+ 0, "reset chip calibration results (secs)");
static int ath_rxbuf = ATH_RXBUF; /* # rx buffers to allocate */
SYSCTL_INT(_hw_ath, OID_AUTO, rxbuf, CTLFLAG_RW, &ath_rxbuf,
@@ -1433,8 +1439,9 @@
* state cached in the driver.
*/
sc->sc_diversity = ath_hal_getdiversity(ah);
- sc->sc_calinterval = 1;
- sc->sc_caltries = 0;
+ sc->sc_lastlongcal = 0;
+ sc->sc_resetcal = 1;
+ sc->sc_lastcalreset = 0;
/*
* Setup the hardware after reset: the key cache
@@ -1566,8 +1573,6 @@
if_printf(ifp, "%s: unable to reset hardware; hal status %u\n",
__func__, status);
sc->sc_diversity = ath_hal_getdiversity(ah);
- sc->sc_calinterval = 1;
- sc->sc_caltries = 0;
if (ath_startrecv(sc) != 0) /* restart recv */
if_printf(ifp, "%s: unable to start recv logic\n", __func__);
/*
@@ -5493,8 +5498,6 @@
}
sc->sc_curchan = hchan;
sc->sc_diversity = ath_hal_getdiversity(ah);
- sc->sc_calinterval = 1;
- sc->sc_caltries = 0;
/*
* Re-enable rx framework.
@@ -5528,54 +5531,76 @@
{
struct ath_softc *sc = arg;
struct ath_hal *ah = sc->sc_ah;
- HAL_BOOL iqCalDone;
+ struct ifnet *ifp = sc->sc_ifp;
+ HAL_BOOL longCal, isCalDone;
+ int nextcal;
- sc->sc_stats.ast_per_cal++;
-
- if (ath_hal_getrfgain(ah) == HAL_RFGAIN_NEED_CHANGE) {
+ longCal = (ticks - sc->sc_lastlongcal >= ath_longcalinterval*hz);
+ if (longCal) {
+ sc->sc_stats.ast_per_cal++;
+ if (ath_hal_getrfgain(ah) == HAL_RFGAIN_NEED_CHANGE) {
+ /*
+ * Rfgain is out of bounds, reset the chip
+ * to load new gain values.
+ */
+ DPRINTF(sc, ATH_DEBUG_CALIBRATE,
+ "%s: rfgain change\n", __func__);
+ sc->sc_stats.ast_per_rfgain++;
+ ath_reset(ifp);
+ }
/*
- * Rfgain is out of bounds, reset the chip
- * to load new gain values.
+ * If this long cal is after an idle period, then
+ * reset the data collection state so we start fresh.
*/
- DPRINTF(sc, ATH_DEBUG_CALIBRATE,
- "%s: rfgain change\n", __func__);
- sc->sc_stats.ast_per_rfgain++;
- ath_reset(sc->sc_ifp);
+ if (sc->sc_resetcal) {
+ (void) ath_hal_calreset(ah, &sc->sc_curchan);
+ sc->sc_lastcalreset = ticks;
+ sc->sc_resetcal = 0;
+ }
}
- if (!ath_hal_calibrate(ah, &sc->sc_curchan, &iqCalDone)) {
+ if (ath_hal_calibrateN(ah, &sc->sc_curchan, longCal, &isCalDone)) {
+ if (longCal) {
+ /*
+ * Calibrate noise floor data again in case of change.
+ */
+ ath_hal_process_noisefloor(ah);
+ }
+ } else {
DPRINTF(sc, ATH_DEBUG_ANY,
"%s: calibration of channel %u failed\n",
__func__, sc->sc_curchan.channel);
sc->sc_stats.ast_per_calfail++;
}
- /*
- * Calibrate noise floor data again in case of change.
- */
- ath_hal_process_noisefloor(ah);
- /*
- * Poll more frequently when the IQ calibration is in
- * progress to speedup loading the final settings.
- * We temper this aggressive polling with an exponential
- * back off after 4 tries up to ath_calinterval.
- */
- if (iqCalDone || sc->sc_calinterval >= ath_calinterval) {
- sc->sc_caltries = 0;
- sc->sc_calinterval = ath_calinterval;
- } else if (sc->sc_caltries > 4) {
- sc->sc_caltries = 0;
- sc->sc_calinterval <<= 1;
- if (sc->sc_calinterval > ath_calinterval)
- sc->sc_calinterval = ath_calinterval;
+ if (!isCalDone) {
+ /*
+ * Use a shorter interval to potentially collect multiple
+ * data samples required to complete calibration. Once
+ * we're told the work is done we drop back to a longer
+ * interval between requests. We're more aggressive doing
+ * work when operating as an AP to improve operation right
+ * after startup.
+ */
+ nextcal = (1000*ath_shortcalinterval)/hz;
+ if (sc->sc_opmode != HAL_M_HOSTAP)
+ nextcal *= 10;
+ } else {
+ nextcal = ath_longcalinterval*hz;
+ sc->sc_lastlongcal = ticks;
+ if (sc->sc_lastcalreset == 0)
+ sc->sc_lastcalreset = sc->sc_lastlongcal;
+ else if (ticks - sc->sc_lastcalreset >= ath_resetcalinterval*hz)
+ sc->sc_resetcal = 1; /* setup reset next trip */
}
- KASSERT(0 < sc->sc_calinterval && sc->sc_calinterval <= ath_calinterval,
- ("bad calibration interval %u", sc->sc_calinterval));
- DPRINTF(sc, ATH_DEBUG_CALIBRATE,
- "%s: next +%u (%siqCalDone tries %u)\n", __func__,
- sc->sc_calinterval, iqCalDone ? "" : "!", sc->sc_caltries);
- sc->sc_caltries++;
- callout_reset(&sc->sc_cal_ch, sc->sc_calinterval * hz,
- ath_calibrate, sc);
+ if (nextcal != 0) {
+ DPRINTF(sc, ATH_DEBUG_CALIBRATE, "%s: next +%u (%sisCalDone)\n",
+ __func__, nextcal, isCalDone ? "" : "!");
+ callout_reset(&sc->sc_cal_ch, nextcal, ath_calibrate, sc);
+ } else {
+ DPRINTF(sc, ATH_DEBUG_CALIBRATE, "%s: calibration disabled\n",
+ __func__);
+ /* NB: don't rearm timer */
+ }
}
static void
@@ -5803,10 +5828,12 @@
* Finally, start any timers and the task q thread
* (in case we didn't go through SCAN state).
*/
- if (sc->sc_calinterval != 0) {
+ if (ath_longcalinterval != 0) {
/* start periodic recalibration timer */
- callout_reset(&sc->sc_cal_ch, sc->sc_calinterval * hz,
- ath_calibrate, sc);
+ callout_reset(&sc->sc_cal_ch, 1, ath_calibrate, sc);
+ } else {
+ DPRINTF(sc, ATH_DEBUG_CALIBRATE,
+ "%s: calibration disabled\n", __func__);
}
taskqueue_unblock(sc->sc_tq);
} else if (nstate == IEEE80211_S_INIT) {
@@ -6885,7 +6912,7 @@
struct ieee80211com *ic = ifp->if_l2com;
struct ath_hal *ah = sc->sc_ah;
int error, ismcast, ismrr;
- int hdrlen, pktlen, try0, txantenna;
+ int keyix, hdrlen, pktlen, try0, txantenna;
u_int8_t rix, cix, txrate, ctsrate, rate1, rate2, rate3;
struct ieee80211_frame *wh;
u_int flags, ctsduration;
@@ -6904,6 +6931,54 @@
/* XXX honor IEEE80211_BPF_DATAPAD */
pktlen = m0->m_pkthdr.len - (hdrlen & 3) + IEEE80211_CRC_LEN;
+ if (params->ibp_flags & IEEE80211_BPF_CRYPTO) {
+ const struct ieee80211_cipher *cip;
+ struct ieee80211_key *k;
+
+ /*
+ * Construct the 802.11 header+trailer for an encrypted
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Tue Dec 9 04:52:38 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0436C1065676; Tue, 9 Dec 2008 04:52:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id BC58C1065672
for ; Tue, 9 Dec 2008 04:52:37 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id AAC628FC08
for ; Tue, 9 Dec 2008 04:52:37 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB94qb9k066781
for ; Tue, 9 Dec 2008 04:52:37 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB94qbdB066779
for perforce@freebsd.org; Tue, 9 Dec 2008 04:52:37 GMT
(envelope-from sam@freebsd.org)
Date: Tue, 9 Dec 2008 04:52:37 GMT
Message-Id: <200812090452.mB94qbdB066779@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154383 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 09 Dec 2008 04:52:38 -0000
http://perforce.freebsd.org/chv.cgi?CH=154383
Change 154383 by sam@sam_ebb on 2008/12/09 04:51:47
one possible solution to the ath_rate/sample symbol dependency
problem; bundle rate control code into the driver
Affected files ...
.. //depot/projects/vap/sys/modules/ath/Makefile#9 edit
Differences ...
==== //depot/projects/vap/sys/modules/ath/Makefile#9 (text+ko) ====
@@ -29,44 +29,80 @@
# $FreeBSD: src/sys/modules/ath/Makefile,v 1.7 2008/12/02 21:37:28 bz Exp $
#
-.PATH: ${.CURDIR}/../../dev/ath \
- ${.CURDIR}/../../dev/ath/ath_hal \
- ${.CURDIR}/../../dev/ath/ath_hal/ar5210 \
- ${.CURDIR}/../../dev/ath/ath_hal/ar5211 \
- ${.CURDIR}/../../dev/ath/ath_hal/ar5212 \
- ${.CURDIR}/../../dev/ath/ath_hal/ar5416
+ATH_RATE= sample # tx rate control algorithm
+
+.PATH: ${.CURDIR}/../../dev/ath
+.PATH: ${.CURDIR}/../../dev/ath/ath_hal
+
+KMOD= if_ath
+SRCS= if_ath.c if_ath_pci.c
+# NB: v3 eeprom support used by both AR5211 and AR5212; just include it
+SRCS+= ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c
+SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h
-AR5210_SRCS=ah_eeprom_v1.c \
+#
+# AR5210 support; these are first generation 11a-only devices.
+#
+.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5210
+SRCS+= ah_eeprom_v1.c \
ar5210_attach.c ar5210_beacon.c ar5210_interrupts.c \
ar5210_keycache.c ar5210_misc.c ar5210_phy.c ar5210_power.c \
ar5210_recv.c ar5210_reset.c ar5210_xmit.c
-AR5211_SRCS=ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \
+
+#
+# AR5211 support; these are second generation 11b/g/a devices
+# (but 11g was OFDM only and is not supported).
+#
+.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5211
+SRCS+= ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \
ar5211_keycache.c ar5211_misc.c ar5211_phy.c ar5211_power.c \
ar5211_recv.c ar5211_reset.c ar5211_xmit.c
-AR5212_SRCS=ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \
+
+#
+# AR5212 support; this covers all other pci/cardbus legacy parts.
+#
+.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5212
+SRCS+= ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \
ar5212_gpio.c ar5212_interrupts.c ar5212_keycache.c ar5212_misc.c \
ar5212_phy.c ar5212_power.c ar5212_recv.c ar5212_reset.c \
- ar5212_rfgain.c ar5212_xmit.c \
- ar2413.c ar2425.c ar5111.c ar5112.c ar5413.c
-AR5416_SRCS=ah_eeprom_v14.c \
+ ar5212_rfgain.c ar5212_xmit.c
+# RF backends
+SRCS+= ar5111.c
+SRCS+= ar5112.c
+SRCS+= ar2413.c
+SRCS+= ar2425.c
+SRCS+= ar5413.c
+
+#
+# AR5416, AR9160 support; these are 11n parts but only really
+# supported (right now) operating in legacy mode. Note enabling
+# this support requires defining AH_SUPPORT_AR5416 in opt_ah.h
+# so the 11n tx/rx descriptor format is handled.
+#
+# NB: 9160 depends on 5416 but 5416 does not require 9160
+#
+.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5416
+SRCS+= ah_eeprom_v14.c \
ar5416_ani.c ar5416_attach.c ar5416_beacon.c ar5416_cal.c \
ar5416_cal_iq.c ar5416_cal_adcgain.c ar5416_cal_adcdc.c \
ar5416_eeprom.c ar5416_gpio.c ar5416_interrupts.c ar5416_keycache.c \
ar5416_misc.c ar5416_phy.c ar5416_power.c ar5416_recv.c \
- ar5416_reset.c ar5416_xmit.c \
- ar2133.c
-AR9160_SRCS=ar9160_attach.c
+ ar5416_reset.c ar5416_xmit.c
+SRCS+= ar9160_attach.c
+# RF backend for 5416 and 9160
+SRCS+= ar2133.c
-KMOD= if_ath
-SRCS= if_ath.c if_ath_pci.c
-# NB: v3 eeprom support used by both AR5211 and AR5212; just include it
-SRCS+= ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c
-SRCS+= ${AR5210_SRCS}
-SRCS+= ${AR5211_SRCS}
-SRCS+= ${AR5212_SRCS}
-SRCS+= ${AR5416_SRCS}
-SRCS+= ${AR9160_SRCS}
-SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h
+# NB: rate control is bound to the driver by symbol names so only pick one
+.if ${ATH_RATE} == "sample"
+.PATH: ${.CURDIR}/../../dev/ath/ath_rate/sample
+SRCS+= sample.c opt_wlan.h
+.elif ${ATH_RATE} == "onoe"
+.PATH: ${.CURDIR}/../../dev/ath/ath_rate/onoe
+SRCS+= onoe.c
+.elif ${ATH_RATE} == "amrr"
+.PATH: ${.CURDIR}/../../dev/ath/ath_rate/amrr
+SRCS+= amrr.c
+.endif
CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
From owner-p4-projects@FreeBSD.ORG Tue Dec 9 04:54:40 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 34AC61065677; Tue, 9 Dec 2008 04:54:40 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id ECFCC1065672
for ; Tue, 9 Dec 2008 04:54:39 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id DC10A8FC0C
for ; Tue, 9 Dec 2008 04:54:39 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB94sdti071437
for ; Tue, 9 Dec 2008 04:54:39 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB94sdcq071435
for perforce@freebsd.org; Tue, 9 Dec 2008 04:54:39 GMT
(envelope-from sam@freebsd.org)
Date: Tue, 9 Dec 2008 04:54:39 GMT
Message-Id: <200812090454.mB94sdcq071435@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154384 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 09 Dec 2008 04:54:40 -0000
http://perforce.freebsd.org/chv.cgi?CH=154384
Change 154384 by sam@sam_ebb on 2008/12/09 04:54:31
remove separate ath rate control modules; it's now bundled into ath
Affected files ...
.. //depot/projects/vap/sys/modules/Makefile#48 edit
.. //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#13 delete
.. //depot/projects/vap/sys/modules/ath_rate_onoe/Makefile#13 delete
.. //depot/projects/vap/sys/modules/ath_rate_sample/Makefile#14 delete
Differences ...
==== //depot/projects/vap/sys/modules/Makefile#48 (text+ko) ====
@@ -30,9 +30,6 @@
${_asr} \
ata \
ath \
- ath_rate_amrr \
- ath_rate_onoe \
- ath_rate_sample \
aue \
${_auxio} \
axe \
From owner-p4-projects@FreeBSD.ORG Tue Dec 9 06:22:09 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 3D3681065679; Tue, 9 Dec 2008 06:22:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id F3F04106564A
for ; Tue, 9 Dec 2008 06:22:08 +0000 (UTC)
(envelope-from qingli@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id E2C148FC12
for ; Tue, 9 Dec 2008 06:22:08 +0000 (UTC)
(envelope-from qingli@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB96M8Pl093441
for ; Tue, 9 Dec 2008 06:22:08 GMT
(envelope-from qingli@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB96M8wQ093439
for perforce@freebsd.org; Tue, 9 Dec 2008 06:22:08 GMT
(envelope-from qingli@freebsd.org)
Date: Tue, 9 Dec 2008 06:22:08 GMT
Message-Id: <200812090622.mB96M8wQ093439@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
qingli@freebsd.org using -f
From: Qing Li
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154385 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 09 Dec 2008 06:22:09 -0000
http://perforce.freebsd.org/chv.cgi?CH=154385
Change 154385 by qingli@FreeBSD-newarp on 2008/12/09 06:21:32
fixed loopback issue
unit test: ping 127.0.0.1
telnet 127.0.0.1
telnet -6 fe80::20f:1fff:fexx:xxxx%bge0
Affected files ...
.. //depot/projects/arp-v2/src/sys/net/if_ethersubr.c#6 edit
Differences ...
==== //depot/projects/arp-v2/src/sys/net/if_ethersubr.c#6 (text+ko) ====
@@ -287,8 +287,16 @@
senderr(EAFNOSUPPORT);
}
- if (lle && (lle->la_flags & LLE_IFADDR) && useloopback)
+ if (lle && (lle->la_flags & LLE_IFADDR) && useloopback) {
+ int csum_flags = 0;
+ if (m->m_pkthdr.csum_flags & CSUM_IP)
+ csum_flags |= (CSUM_IP_CHECKED|CSUM_IP_VALID);
+ if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA)
+ csum_flags |= (CSUM_DATA_VALID|CSUM_PSEUDO_HDR);
+ m->m_pkthdr.csum_flags |= csum_flags;
+ m->m_pkthdr.csum_data = 0xffff;
return (if_simloop(ifp, m, dst->sa_family, 0));
+ }
/*
* Add local net header. If no space in first mbuf,
From owner-p4-projects@FreeBSD.ORG Tue Dec 9 06:58:48 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 49D691065675; Tue, 9 Dec 2008 06:58:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 0C0151065672
for ; Tue, 9 Dec 2008 06:58:48 +0000 (UTC)
(envelope-from qingli@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id EC6FD8FC13
for ; Tue, 9 Dec 2008 06:58:47 +0000 (UTC)
(envelope-from qingli@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB96wlht096237
for ; Tue, 9 Dec 2008 06:58:47 GMT
(envelope-from qingli@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB96wjn8096235
for perforce@freebsd.org; Tue, 9 Dec 2008 06:58:45 GMT
(envelope-from qingli@freebsd.org)
Date: Tue, 9 Dec 2008 06:58:45 GMT
Message-Id: <200812090658.mB96wjn8096235@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
qingli@freebsd.org using -f
From: Qing Li
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154386 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 09 Dec 2008 06:58:48 -0000
http://perforce.freebsd.org/chv.cgi?CH=154386
Change 154386 by qingli@FreeBSD-newarp on 2008/12/09 06:57:54
IFC (changelist 154382) - getting ready for the locking revision
Affected files ...
.. //depot/projects/arp-v2/src/COPYRIGHT#3 integrate
.. //depot/projects/arp-v2/src/Makefile#6 integrate
.. //depot/projects/arp-v2/src/ObsoleteFiles.inc#6 integrate
.. //depot/projects/arp-v2/src/UPDATING#6 integrate
.. //depot/projects/arp-v2/src/bin/df/df.1#2 integrate
.. //depot/projects/arp-v2/src/bin/df/df.c#2 integrate
.. //depot/projects/arp-v2/src/bin/sh/eval.c#3 integrate
.. //depot/projects/arp-v2/src/bin/sh/exec.c#2 integrate
.. //depot/projects/arp-v2/src/cddl/compat/opensolaris/misc/deviceid.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/CREDITS#1 branch
.. //depot/projects/arp-v2/src/contrib/openbsm/HISTORY#2 delete
.. //depot/projects/arp-v2/src/contrib/openbsm/INSTALL#1 branch
.. //depot/projects/arp-v2/src/contrib/openbsm/LICENSE#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/Makefile.am#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/NEWS#1 branch
.. //depot/projects/arp-v2/src/contrib/openbsm/README#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/TODO#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/VERSION#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/audit/Makefile.am#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/audit/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/audit/audit.8#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/audit/audit.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/Makefile.am#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/audit_triggers.defs#1 branch
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/auditd.8#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/auditd.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/auditd.h#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/auditd_control.defs#1 branch
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditfilterd/Makefile.am#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditreduce/Makefile.am#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/praudit/Makefile.am#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/praudit/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/praudit/praudit.1#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bin/praudit/praudit.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bsm/Makefile.am#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bsm/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bsm/audit_uevents.h#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/bsm/libbsm.h#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/compat/clock_gettime.h#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/compat/strlcat.h#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/compat/strlcpy.h#1 branch
.. //depot/projects/arp-v2/src/contrib/openbsm/config/config.h#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/config/config.h.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/configure#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/configure.ac#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/etc/audit_event#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/Makefile.am#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/au_class.3#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/au_free_token.3#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/au_token.3#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/audit_submit.3#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_audit.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_class.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_control.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_event.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_flags.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_io.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_mask.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_notify.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_token.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_user.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/man/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/man/audit.2#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/man/audit.log.5#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/man/audit_class.5#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/man/audit_control.5#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/man/audit_event.5#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/man/audit_user.5#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/man/audit_warn.5#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/man/auditctl.2#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/man/auditon.2#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/man/getaudit.2#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/man/getauid.2#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/man/setaudit.2#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/man/setauid.2#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/modules/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/modules/auditfilter_noop/Makefile.am#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/sys/Makefile.am#1 branch
.. //depot/projects/arp-v2/src/contrib/openbsm/sys/Makefile.in#1 branch
.. //depot/projects/arp-v2/src/contrib/openbsm/sys/bsm/Makefile.am#1 branch
.. //depot/projects/arp-v2/src/contrib/openbsm/sys/bsm/Makefile.in#1 branch
.. //depot/projects/arp-v2/src/contrib/openbsm/sys/bsm/audit.h#1 branch
.. //depot/projects/arp-v2/src/contrib/openbsm/sys/bsm/audit_internal.h#1 branch
.. //depot/projects/arp-v2/src/contrib/openbsm/sys/bsm/audit_kevents.h#1 branch
.. //depot/projects/arp-v2/src/contrib/openbsm/sys/bsm/audit_record.h#1 branch
.. //depot/projects/arp-v2/src/contrib/openbsm/test/Makefile.am#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/test/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/test/bsm/Makefile.am#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/test/bsm/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/tools/Makefile.am#2 integrate
.. //depot/projects/arp-v2/src/contrib/openbsm/tools/Makefile.in#2 integrate
.. //depot/projects/arp-v2/src/etc/mtree/BSD.include.dist#4 integrate
.. //depot/projects/arp-v2/src/etc/newsyslog.conf#3 integrate
.. //depot/projects/arp-v2/src/etc/syslog.conf#2 integrate
.. //depot/projects/arp-v2/src/gnu/usr.bin/cc/libiberty/config.h#2 integrate
.. //depot/projects/arp-v2/src/gnu/usr.bin/sort/config.h#3 integrate
.. //depot/projects/arp-v2/src/include/Makefile#5 integrate
.. //depot/projects/arp-v2/src/include/string.h#3 integrate
.. //depot/projects/arp-v2/src/kerberos5/include/config.h#3 integrate
.. //depot/projects/arp-v2/src/lib/Makefile#6 integrate
.. //depot/projects/arp-v2/src/lib/bind/bind/port_after.h#2 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive.h#3 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_check_magic.c#2 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_endian.h#4 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_entry.h#6 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_platform.h#6 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_private.h#3 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read.c#4 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read_private.h#4 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_all.c#2 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_bzip2.c#4 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_compress.c#2 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_none.c#3 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_program.c#4 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_ar.c#5 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_cpio.c#4 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_empty.c#2 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_mtree.c#6 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_tar.c#6 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_zip.c#6 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_string.c#3 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_string.h#4 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/archive_write_disk.c#6 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/test/Makefile#6 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/test/main.c#6 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_bzip2.c#1 branch
.. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_bzip2_1.tbz.uu#1 branch
.. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_bzip2_2.tbz.uu#1 branch
.. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_gzip.c#1 branch
.. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_gzip_1.tgz.uu#1 branch
.. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_gzip_2.tgz.uu#1 branch
.. //depot/projects/arp-v2/src/lib/libarchive/test/test_fuzz.c#1 branch
.. //depot/projects/arp-v2/src/lib/libarchive/test/test_fuzz_1.iso.uu#1 branch
.. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#3 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_gtar_sparse.c#5 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_pax_truncated.c#4 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_disk_perms.c#5 integrate
.. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_cpio.c#4 integrate
.. //depot/projects/arp-v2/src/lib/libc/gen/Symbol.map#6 integrate
.. //depot/projects/arp-v2/src/lib/libc/gen/dlfcn.c#2 integrate
.. //depot/projects/arp-v2/src/lib/libc/gen/times.3#2 integrate
.. //depot/projects/arp-v2/src/lib/libc/stdio/fread.c#2 integrate
.. //depot/projects/arp-v2/src/lib/libc/stdlib/malloc.c#7 integrate
.. //depot/projects/arp-v2/src/lib/libc/string/Makefile.inc#4 integrate
.. //depot/projects/arp-v2/src/lib/libc/string/Symbol.map#4 integrate
.. //depot/projects/arp-v2/src/lib/libc/string/strdup.3#2 integrate
.. //depot/projects/arp-v2/src/lib/libc/string/strndup.c#1 branch
.. //depot/projects/arp-v2/src/lib/libc/string/strsep.3#2 integrate
.. //depot/projects/arp-v2/src/lib/libc/sys/cpuset_getaffinity.2#4 integrate
.. //depot/projects/arp-v2/src/lib/libc/sys/jail.2#3 integrate
.. //depot/projects/arp-v2/src/lib/libc/sys/recv.2#2 integrate
.. //depot/projects/arp-v2/src/lib/libkvm/kvm_proc.c#3 integrate
.. //depot/projects/arp-v2/src/lib/libmagic/config.h#3 integrate
.. //depot/projects/arp-v2/src/lib/libmd/Makefile#2 integrate
.. //depot/projects/arp-v2/src/lib/libpmc/libpmc.c#4 integrate
.. //depot/projects/arp-v2/src/lib/libpmc/libpmcinternal.h#1 branch
.. //depot/projects/arp-v2/src/lib/libpmc/pmc.3#4 integrate
.. //depot/projects/arp-v2/src/lib/libpmc/pmc.atom.3#2 integrate
.. //depot/projects/arp-v2/src/lib/libpmc/pmc.core.3#2 integrate
.. //depot/projects/arp-v2/src/lib/libpmc/pmc.core2.3#2 integrate
.. //depot/projects/arp-v2/src/lib/libpmc/pmclog.c#2 integrate
.. //depot/projects/arp-v2/src/lib/libstand/bootp.c#2 integrate
.. //depot/projects/arp-v2/src/lib/libstand/nfs.c#3 integrate
.. //depot/projects/arp-v2/src/lib/libthr/thread/thr_fork.c#2 integrate
.. //depot/projects/arp-v2/src/lib/libthr/thread/thr_rtld.c#4 integrate
.. //depot/projects/arp-v2/src/lib/libusb20/libusb20.3#2 integrate
.. //depot/projects/arp-v2/src/lib/libusb20/libusb20.c#2 integrate
.. //depot/projects/arp-v2/src/lib/libusb20/libusb20.h#2 integrate
.. //depot/projects/arp-v2/src/lib/libusb20/libusb20_compat01.c#2 integrate
.. //depot/projects/arp-v2/src/lib/libusb20/libusb20_compat01.h#2 integrate
.. //depot/projects/arp-v2/src/lib/libusb20/libusb20_desc.c#2 integrate
.. //depot/projects/arp-v2/src/lib/libusb20/libusb20_desc.h#2 integrate
.. //depot/projects/arp-v2/src/lib/libusb20/libusb20_ugen20.c#2 integrate
.. //depot/projects/arp-v2/src/lib/libutil/Makefile#5 integrate
.. //depot/projects/arp-v2/src/lib/libutil/gr_util.c#3 integrate
.. //depot/projects/arp-v2/src/lib/libutil/kinfo_getfile.3#1 branch
.. //depot/projects/arp-v2/src/lib/libutil/kinfo_getfile.c#1 branch
.. //depot/projects/arp-v2/src/lib/libutil/kinfo_getvmmap.3#1 branch
.. //depot/projects/arp-v2/src/lib/libutil/kinfo_getvmmap.c#1 branch
.. //depot/projects/arp-v2/src/lib/libutil/libutil.h#4 integrate
.. //depot/projects/arp-v2/src/lib/libutil/realhostname.c#3 integrate
.. //depot/projects/arp-v2/src/libexec/rtld-elf/Symbol.map#2 integrate
.. //depot/projects/arp-v2/src/libexec/rtld-elf/rtld.c#5 integrate
.. //depot/projects/arp-v2/src/libexec/rtld-elf/rtld_lock.c#4 integrate
.. //depot/projects/arp-v2/src/libexec/rtld-elf/rtld_lock.h#3 integrate
.. //depot/projects/arp-v2/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 integrate
.. //depot/projects/arp-v2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate
.. //depot/projects/arp-v2/src/sbin/geom/class/part/geom_part.c#6 integrate
.. //depot/projects/arp-v2/src/sbin/geom/class/part/gpart.8#4 integrate
.. //depot/projects/arp-v2/src/sbin/iscontrol/auth_subr.c#2 integrate
.. //depot/projects/arp-v2/src/sbin/iscontrol/config.c#2 integrate
.. //depot/projects/arp-v2/src/sbin/iscontrol/fsm.c#2 integrate
.. //depot/projects/arp-v2/src/sbin/iscontrol/iscontrol.8#2 integrate
.. //depot/projects/arp-v2/src/sbin/iscontrol/iscontrol.c#2 integrate
.. //depot/projects/arp-v2/src/sbin/iscontrol/iscontrol.h#2 integrate
.. //depot/projects/arp-v2/src/sbin/iscontrol/iscsi.conf.5#2 integrate
.. //depot/projects/arp-v2/src/sbin/iscontrol/login.c#2 integrate
.. //depot/projects/arp-v2/src/sbin/iscontrol/misc.c#3 integrate
.. //depot/projects/arp-v2/src/sbin/iscontrol/pdu.c#2 integrate
.. //depot/projects/arp-v2/src/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate
.. //depot/projects/arp-v2/src/sbin/newfs/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sbin/newfs/mkfs.c#4 integrate
.. //depot/projects/arp-v2/src/sbin/newfs/newfs.8#4 integrate
.. //depot/projects/arp-v2/src/sbin/newfs/newfs.c#3 integrate
.. //depot/projects/arp-v2/src/sbin/newfs/newfs.h#3 integrate
.. //depot/projects/arp-v2/src/sbin/newfs_msdos/newfs_msdos.8#2 integrate
.. //depot/projects/arp-v2/src/sbin/newfs_msdos/newfs_msdos.c#2 integrate
.. //depot/projects/arp-v2/src/secure/usr.sbin/sshd/Makefile#5 integrate
.. //depot/projects/arp-v2/src/share/man/man4/Makefile#8 integrate
.. //depot/projects/arp-v2/src/share/man/man4/ale.4#2 integrate
.. //depot/projects/arp-v2/src/share/man/man4/ath_hal.4#2 integrate
.. //depot/projects/arp-v2/src/share/man/man4/bce.4#3 integrate
.. //depot/projects/arp-v2/src/share/man/man4/ddb.4#8 integrate
.. //depot/projects/arp-v2/src/share/man/man4/man4.arm/Makefile#2 integrate
.. //depot/projects/arp-v2/src/share/man/man4/man4.arm/mge.4#1 branch
.. //depot/projects/arp-v2/src/share/man/man4/man4.powerpc/Makefile#3 integrate
.. //depot/projects/arp-v2/src/share/man/man4/man4.powerpc/pmu.4#1 branch
.. //depot/projects/arp-v2/src/share/man/man4/upgt.4#2 integrate
.. //depot/projects/arp-v2/src/share/man/man5/fstab.5#3 integrate
.. //depot/projects/arp-v2/src/share/man/man7/hier.7#3 integrate
.. //depot/projects/arp-v2/src/share/man/man7/ports.7#4 integrate
.. //depot/projects/arp-v2/src/share/man/man9/Makefile#5 integrate
.. //depot/projects/arp-v2/src/share/man/man9/ktr.9#2 integrate
.. //depot/projects/arp-v2/src/share/man/man9/style.9#6 integrate
.. //depot/projects/arp-v2/src/share/man/man9/vfs_mountedon.9#2 delete
.. //depot/projects/arp-v2/src/share/man/man9/vn_fullpath.9#2 integrate
.. //depot/projects/arp-v2/src/share/misc/bsd-family-tree#7 integrate
.. //depot/projects/arp-v2/src/share/mk/bsd.libnames.mk#5 integrate
.. //depot/projects/arp-v2/src/sys/amd64/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/amd64/amd64/amd64_mem.c#3 integrate
.. //depot/projects/arp-v2/src/sys/amd64/amd64/db_trace.c#2 integrate
.. //depot/projects/arp-v2/src/sys/amd64/amd64/elf_machdep.c#3 integrate
.. //depot/projects/arp-v2/src/sys/amd64/amd64/identcpu.c#5 integrate
.. //depot/projects/arp-v2/src/sys/amd64/amd64/initcpu.c#3 integrate
.. //depot/projects/arp-v2/src/sys/amd64/amd64/intr_machdep.c#4 integrate
.. //depot/projects/arp-v2/src/sys/amd64/amd64/local_apic.c#5 integrate
.. //depot/projects/arp-v2/src/sys/amd64/amd64/mp_machdep.c#5 integrate
.. //depot/projects/arp-v2/src/sys/amd64/amd64/msi.c#2 integrate
.. //depot/projects/arp-v2/src/sys/amd64/amd64/pmap.c#8 integrate
.. //depot/projects/arp-v2/src/sys/amd64/conf/GENERIC#7 integrate
.. //depot/projects/arp-v2/src/sys/amd64/conf/NOTES#8 integrate
.. //depot/projects/arp-v2/src/sys/amd64/include/atomic.h#3 integrate
.. //depot/projects/arp-v2/src/sys/amd64/include/cputypes.h#2 integrate
.. //depot/projects/arp-v2/src/sys/amd64/include/md_var.h#3 integrate
.. //depot/projects/arp-v2/src/sys/amd64/include/pmc_mdep.h#4 integrate
.. //depot/projects/arp-v2/src/sys/amd64/include/specialreg.h#4 integrate
.. //depot/projects/arp-v2/src/sys/amd64/linux32/linux.h#5 integrate
.. //depot/projects/arp-v2/src/sys/amd64/linux32/linux32_machdep.c#5 integrate
.. //depot/projects/arp-v2/src/sys/amd64/linux32/linux32_proto.h#5 integrate
.. //depot/projects/arp-v2/src/sys/amd64/linux32/linux32_syscall.h#5 integrate
.. //depot/projects/arp-v2/src/sys/amd64/linux32/linux32_sysent.c#5 integrate
.. //depot/projects/arp-v2/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate
.. //depot/projects/arp-v2/src/sys/amd64/linux32/syscalls.master#5 integrate
.. //depot/projects/arp-v2/src/sys/arm/arm/busdma_machdep.c#4 integrate
.. //depot/projects/arp-v2/src/sys/arm/arm/elf_machdep.c#3 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91.c#5 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_machdep.c#1 branch
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_mci.c#4 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_mcireg.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_pdcreg.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_pio.c#3 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_pioreg.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_piovar.h#3 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_pmc.c#4 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_pmcreg.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_pmcvar.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_rtc.c#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_rtcreg.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_spi.c#3 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_spireg.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_ssc.c#3 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_sscreg.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_st.c#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_streg.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_twi.c#3 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_twiio.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_twireg.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91_usartreg.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91board.h#1 branch
.. //depot/projects/arp-v2/src/sys/arm/at91/at91rm92reg.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/at91var.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/board_bwct.c#1 branch
.. //depot/projects/arp-v2/src/sys/arm/at91/board_hl200.c#1 branch
.. //depot/projects/arp-v2/src/sys/arm/at91/board_kb920x.c#1 branch
.. //depot/projects/arp-v2/src/sys/arm/at91/board_tsc4370.c#1 branch
.. //depot/projects/arp-v2/src/sys/arm/at91/files.at91#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/files.kb920x#2 delete
.. //depot/projects/arp-v2/src/sys/arm/at91/if_ate.c#5 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/if_atereg.h#3 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/kb920x_machdep.c#5 delete
.. //depot/projects/arp-v2/src/sys/arm/at91/ohci_atmelarm.c#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/std.at91#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/std.bwct#1 branch
.. //depot/projects/arp-v2/src/sys/arm/at91/std.hl200#1 branch
.. //depot/projects/arp-v2/src/sys/arm/at91/std.kb920x#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/std.tsc4370#1 branch
.. //depot/projects/arp-v2/src/sys/arm/at91/uart_bus_at91usart.c#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/at91/uart_dev_at91usart.c#7 integrate
.. //depot/projects/arp-v2/src/sys/arm/conf/AVILA#6 integrate
.. //depot/projects/arp-v2/src/sys/arm/conf/BWCT#5 integrate
.. //depot/projects/arp-v2/src/sys/arm/conf/CRB#5 integrate
.. //depot/projects/arp-v2/src/sys/arm/conf/DB-78XXX#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/conf/DB-88F5XXX#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/conf/DB-88F6XXX#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/conf/GUMSTIX#3 integrate
.. //depot/projects/arp-v2/src/sys/arm/conf/HL200#5 integrate
.. //depot/projects/arp-v2/src/sys/arm/conf/KB920X#6 integrate
.. //depot/projects/arp-v2/src/sys/arm/conf/NSLU#3 integrate
.. //depot/projects/arp-v2/src/sys/arm/conf/SIMICS#5 integrate
.. //depot/projects/arp-v2/src/sys/arm/conf/SKYEYE#5 integrate
.. //depot/projects/arp-v2/src/sys/arm/include/atomic.h#3 integrate
.. //depot/projects/arp-v2/src/sys/arm/mv/common.c#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/mv/discovery/db78xxx.c#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/mv/discovery/discovery.c#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/mv/files.mv#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/mv/kirkwood/kirkwood.c#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/mv/mv_machdep.c#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/mv/mv_pci.c#1 branch
.. //depot/projects/arp-v2/src/sys/arm/mv/mvreg.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/mv/mvvar.h#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/mv/obio.c#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/mv/orion/db88f5xxx.c#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/mv/orion/orion.c#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/mv/orion/std.db88f5xxx#2 integrate
.. //depot/projects/arp-v2/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate
.. //depot/projects/arp-v2/src/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate
.. //depot/projects/arp-v2/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate
.. //depot/projects/arp-v2/src/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate
.. //depot/projects/arp-v2/src/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate
.. //depot/projects/arp-v2/src/sys/arm/xscale/pxa/pxa_machdep.c#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/arm/uboot/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/arm/uboot/conf.c#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/arm/uboot/version#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/common/interp.c#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/common/loader.8#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/forth/support.4th#3 integrate
.. //depot/projects/arp-v2/src/sys/boot/i386/Makefile#3 integrate
.. //depot/projects/arp-v2/src/sys/boot/i386/boot0/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/i386/boot0/boot0.S#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/i386/gptzfsboot/Makefile#1 branch
.. //depot/projects/arp-v2/src/sys/boot/i386/libi386/biosdisk.c#3 integrate
.. //depot/projects/arp-v2/src/sys/boot/i386/zfsboot/zfsboot.c#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/uboot/lib/devicename.c#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/uboot/lib/disk.c#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/uboot/lib/glue.c#3 integrate
.. //depot/projects/arp-v2/src/sys/boot/uboot/lib/glue.h#3 integrate
.. //depot/projects/arp-v2/src/sys/boot/uboot/lib/libuboot.h#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/uboot/lib/net.c#3 integrate
.. //depot/projects/arp-v2/src/sys/boot/zfs/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/zfs/zfs.c#2 integrate
.. //depot/projects/arp-v2/src/sys/boot/zfs/zfsimpl.c#2 integrate
.. //depot/projects/arp-v2/src/sys/bsm/audit.h#3 integrate
.. //depot/projects/arp-v2/src/sys/bsm/audit_internal.h#4 integrate
.. //depot/projects/arp-v2/src/sys/bsm/audit_kevents.h#4 integrate
.. //depot/projects/arp-v2/src/sys/bsm/audit_record.h#4 integrate
.. //depot/projects/arp-v2/src/sys/cddl/boot/zfs/zfsimpl.h#2 integrate
.. //depot/projects/arp-v2/src/sys/cddl/boot/zfs/zfssubr.c#2 integrate
.. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate
.. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 integrate
.. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/vnode.h#3 integrate
.. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate
.. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#4 integrate
.. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 integrate
.. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate
.. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#5 integrate
.. //depot/projects/arp-v2/src/sys/cddl/dev/cyclic/cyclic.c#2 integrate
.. //depot/projects/arp-v2/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate
.. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32.h#2 integrate
.. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate
.. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate
.. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate
.. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate
.. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate
.. //depot/projects/arp-v2/src/sys/compat/freebsd32/syscalls.master#6 integrate
.. //depot/projects/arp-v2/src/sys/compat/ia32/ia32_sysvec.c#3 integrate
.. //depot/projects/arp-v2/src/sys/compat/linprocfs/linprocfs.c#4 integrate
.. //depot/projects/arp-v2/src/sys/compat/linux/linux_ioctl.c#4 integrate
.. //depot/projects/arp-v2/src/sys/compat/linux/linux_ipc.c#2 integrate
.. //depot/projects/arp-v2/src/sys/compat/linux/linux_socket.c#3 integrate
.. //depot/projects/arp-v2/src/sys/compat/linux/linux_socket.h#2 integrate
.. //depot/projects/arp-v2/src/sys/compat/svr4/svr4_sockio.c#3 integrate
.. //depot/projects/arp-v2/src/sys/compat/svr4/svr4_sysvec.c#4 integrate
.. //depot/projects/arp-v2/src/sys/conf/Makefile.arm#5 integrate
.. //depot/projects/arp-v2/src/sys/conf/files#10 integrate
.. //depot/projects/arp-v2/src/sys/conf/files.amd64#7 integrate
.. //depot/projects/arp-v2/src/sys/conf/files.arm#3 integrate
.. //depot/projects/arp-v2/src/sys/conf/files.i386#8 integrate
.. //depot/projects/arp-v2/src/sys/conf/files.mips#3 integrate
.. //depot/projects/arp-v2/src/sys/conf/files.pc98#6 integrate
.. //depot/projects/arp-v2/src/sys/conf/files.powerpc#7 integrate
.. //depot/projects/arp-v2/src/sys/conf/files.sparc64#5 integrate
.. //depot/projects/arp-v2/src/sys/conf/kern.pre.mk#5 integrate
.. //depot/projects/arp-v2/src/sys/conf/options#9 integrate
.. //depot/projects/arp-v2/src/sys/conf/options.arm#4 integrate
.. //depot/projects/arp-v2/src/sys/contrib/altq/altq/altq_subr.c#3 integrate
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/COPYRIGHT#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/README#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/ah_desc.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/ah_devid.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/ah_soc.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/alpha-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap30.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap30.opt_ah.h#2 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap43.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap43.opt_ah.h#2 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap51.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap51.opt_ah.h#2 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap61.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap61.opt_ah.h#2 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/i386-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips-be-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips-le-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/wackelf.c#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/wisoc.hal.o.uu#2 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/wisoc.inc#2 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/wisoc.opt_ah.h#2 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/x86_64-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/dev/ath/version.h#3 delete
.. //depot/projects/arp-v2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate
.. //depot/projects/arp-v2/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate
.. //depot/projects/arp-v2/src/sys/contrib/pf/net/pf.c#5 integrate
.. //depot/projects/arp-v2/src/sys/contrib/pf/net/pf_if.c#4 integrate
.. //depot/projects/arp-v2/src/sys/contrib/pf/net/pf_ioctl.c#6 integrate
.. //depot/projects/arp-v2/src/sys/contrib/pf/net/pf_subr.c#3 integrate
.. //depot/projects/arp-v2/src/sys/contrib/pf/net/pf_table.c#2 integrate
.. //depot/projects/arp-v2/src/sys/contrib/rdma/rdma_cma.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/aac/aac_pci.c#5 integrate
.. //depot/projects/arp-v2/src/sys/dev/acpica/acpi_hpet.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/acpica/acpi_pcib.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/adb/adb.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/adb/adb_bus.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/adb/adb_kbd.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/adb/adb_mouse.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/adb/adbvar.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/ae/if_ae.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/ale/if_ale.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/asmc/asmc.c#5 integrate
.. //depot/projects/arp-v2/src/sys/dev/ata/ata-pci.h#7 integrate
.. //depot/projects/arp-v2/src/sys/dev/ata/ata-queue.c#5 integrate
.. //depot/projects/arp-v2/src/sys/dev/ata/chipsets/ata-marvell.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/ath/ah_osdep.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/ath/ah_osdep.h#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_debug.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_decode.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_desc.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_devid.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_eeprom.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_eeprom_v1.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_eeprom_v1.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_eeprom_v14.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_eeprom_v3.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_internal.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_regdomain.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_soc.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_power.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210desc.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210phy.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210reg.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_power.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211desc.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211phy.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211reg.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/boss.ini#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar2316.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar2317.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar2413.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar2425.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5111.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5112.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212.ini#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212desc.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212phy.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5311reg.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5413.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312_power.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312phy.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312reg.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416.ini#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar9160.ini#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_rate/sample/sample.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/ath/ath_rate/sample/sample.h#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/ath/if_ath.c#6 integrate
.. //depot/projects/arp-v2/src/sys/dev/ath/if_ath_pci.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/ath/if_athvar.h#5 integrate
.. //depot/projects/arp-v2/src/sys/dev/bce/if_bce.c#7 integrate
.. //depot/projects/arp-v2/src/sys/dev/bce/if_bcereg.h#6 integrate
.. //depot/projects/arp-v2/src/sys/dev/cardbus/cardbus_device.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/cardbus/cardbusvar.h#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/coretemp/coretemp.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/common/cxgb_ael1002.c#5 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/common/cxgb_common.h#5 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_adapter.h#6 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_config.h#5 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_main.c#7 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_multiq.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_osdep.h#7 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_sge.c#6 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/sys/cxgb_support.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 integrate
.. //depot/projects/arp-v2/src/sys/dev/dc/if_dc.c#5 integrate
.. //depot/projects/arp-v2/src/sys/dev/dc/if_dcreg.h#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/dcons/dcons_crom.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/dcons/dcons_os.c#5 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_80003es2lan.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_82540.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_82541.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_82542.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_82543.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_82571.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_82575.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_82575.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_api.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_api.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_defines.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_hw.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_ich8lan.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_ich8lan.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_mac.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_mac.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_manage.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_nvm.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_osdep.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_osdep.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_phy.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_phy.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_regs.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/if_em.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/if_em.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/e1000/if_igb.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/fb/s3_pci.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/fdc/fdc_pccard.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/fxp/if_fxp.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/fxp/if_fxpreg.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/fxp/if_fxpvar.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_amd.c#5 integrate
.. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_arm.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_core.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_core.h#1 branch
.. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_intel.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_mod.c#6 integrate
.. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/hwpmc/pmc_events.h#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/if_ndis/if_ndis.c#6 integrate
.. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/isc_cam.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/isc_soc.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/isc_subr.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/iscsi.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/iscsi.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/iscsi_subr.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/iscsivar.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe.h#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_82598.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_api.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_api.h#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_common.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_common.h#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_osdep.h#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_phy.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_phy.h#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_type.h#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/jme/if_jme.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/jme/if_jmereg.h#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/jme/if_jmevar.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/k8temp/k8temp.c#6 integrate
.. //depot/projects/arp-v2/src/sys/dev/mfi/mfi_pci.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/mii/truephy.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/mmc/mmc.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/mmc/mmcsd.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/msk/if_msk.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/mxge/if_mxge.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/mxge/if_mxge_var.h#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/nmdm/nmdm.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/nxge/xge-osdep.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/patm/if_patm_intr.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/pccbb/pccbb.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/pccbb/pccbb_pci.c#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/pccbb/pccbbvar.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/random/randomdev.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/random/randomdev_soft.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/re/if_re.c#7 integrate
.. //depot/projects/arp-v2/src/sys/dev/sdhci/sdhci.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/sis/if_sis.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/sis/if_sisreg.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/sound/pci/hda/hdac.c#8 integrate
.. //depot/projects/arp-v2/src/sys/dev/sound/pci/hda/hdac_private.h#3 integrate
.. //depot/projects/arp-v2/src/sys/dev/uart/uart_dev_quicc.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb/if_upgt.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb/if_ural.c#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb/if_zyd.c#7 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb/if_zydreg.h#4 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb/rio500_usb.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb/u3g.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb/usbdevs#8 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/bluetooth/ng_ubt2.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/controller/ehci2.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/controller/ehci2.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/controller/uss820dci_pccard.c#2 delete
.. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_busdma.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_core.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_dev.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_dev.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_device.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_generic.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_generic.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_hub.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_msctest.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_msctest.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_request.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_util.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/core/usbdevs#2 delete
.. //depot/projects/arp-v2/src/sys/dev/usb2/ethernet/if_aue2.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/image/uscanner2.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/include/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/include/urio2_ioctl.h#2 delete
.. //depot/projects/arp-v2/src/sys/dev/usb2/include/usb2_devid.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/include/usb2_devtable.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/include/usb2_ioctl.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/include/usb2_standard.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/quirk/usb2_quirk.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/serial/u3g2.c#1 branch
.. //depot/projects/arp-v2/src/sys/dev/usb2/serial/ubsa2.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/serial/ugensa2.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/sound/uaudio2.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/storage/umass2.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/usb2/storage/urio2.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/xen/blkfront/blkfront.c#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/xen/blkfront/block.h#2 integrate
.. //depot/projects/arp-v2/src/sys/dev/xen/netfront/netfront.c#2 integrate
.. //depot/projects/arp-v2/src/sys/fs/cd9660/cd9660_bmap.c#2 integrate
.. //depot/projects/arp-v2/src/sys/fs/cd9660/cd9660_node.c#3 integrate
.. //depot/projects/arp-v2/src/sys/fs/cd9660/cd9660_node.h#2 integrate
.. //depot/projects/arp-v2/src/sys/fs/cd9660/cd9660_rrip.c#4 integrate
.. //depot/projects/arp-v2/src/sys/fs/cd9660/cd9660_vfsops.c#4 integrate
.. //depot/projects/arp-v2/src/sys/fs/cd9660/cd9660_vnops.c#4 integrate
.. //depot/projects/arp-v2/src/sys/fs/nullfs/null_vnops.c#4 integrate
.. //depot/projects/arp-v2/src/sys/fs/procfs/procfs_map.c#4 integrate
.. //depot/projects/arp-v2/src/sys/fs/unionfs/union.h#3 integrate
.. //depot/projects/arp-v2/src/sys/fs/unionfs/union_subr.c#6 integrate
.. //depot/projects/arp-v2/src/sys/fs/unionfs/union_vfsops.c#4 integrate
.. //depot/projects/arp-v2/src/sys/fs/unionfs/union_vnops.c#6 integrate
.. //depot/projects/arp-v2/src/sys/geom/geom_bsd.c#2 integrate
.. //depot/projects/arp-v2/src/sys/geom/geom_ccd.c#3 integrate
.. //depot/projects/arp-v2/src/sys/geom/geom_subr.c#5 integrate
.. //depot/projects/arp-v2/src/sys/geom/journal/g_journal.c#4 integrate
.. //depot/projects/arp-v2/src/sys/geom/journal/g_journal.h#2 integrate
.. //depot/projects/arp-v2/src/sys/geom/part/g_part.c#7 integrate
.. //depot/projects/arp-v2/src/sys/geom/part/g_part_bsd.c#8 integrate
.. //depot/projects/arp-v2/src/sys/geom/part/g_part_gpt.c#7 integrate
.. //depot/projects/arp-v2/src/sys/geom/part/g_part_mbr.c#6 integrate
.. //depot/projects/arp-v2/src/sys/geom/part/g_part_pc98.c#6 integrate
.. //depot/projects/arp-v2/src/sys/geom/vinum/geom_vinum.c#3 integrate
.. //depot/projects/arp-v2/src/sys/geom/vinum/geom_vinum_list.c#2 integrate
.. //depot/projects/arp-v2/src/sys/geom/vinum/geom_vinum_move.c#2 integrate
.. //depot/projects/arp-v2/src/sys/geom/vinum/geom_vinum_rename.c#3 integrate
.. //depot/projects/arp-v2/src/sys/geom/vinum/geom_vinum_rm.c#3 integrate
.. //depot/projects/arp-v2/src/sys/i386/conf/GENERIC#7 integrate
.. //depot/projects/arp-v2/src/sys/i386/conf/NOTES#7 integrate
.. //depot/projects/arp-v2/src/sys/i386/conf/PAE#4 integrate
.. //depot/projects/arp-v2/src/sys/i386/conf/XEN#3 integrate
.. //depot/projects/arp-v2/src/sys/i386/cpufreq/est.c#6 integrate
.. //depot/projects/arp-v2/src/sys/i386/cpufreq/p4tcc.c#4 integrate
.. //depot/projects/arp-v2/src/sys/i386/cpufreq/powernow.c#3 integrate
.. //depot/projects/arp-v2/src/sys/i386/i386/elf_machdep.c#3 integrate
.. //depot/projects/arp-v2/src/sys/i386/i386/i686_mem.c#3 integrate
.. //depot/projects/arp-v2/src/sys/i386/i386/identcpu.c#5 integrate
.. //depot/projects/arp-v2/src/sys/i386/i386/initcpu.c#4 integrate
.. //depot/projects/arp-v2/src/sys/i386/i386/intr_machdep.c#5 integrate
.. //depot/projects/arp-v2/src/sys/i386/i386/k6_mem.c#3 integrate
.. //depot/projects/arp-v2/src/sys/i386/i386/local_apic.c#5 integrate
.. //depot/projects/arp-v2/src/sys/i386/i386/longrun.c#2 integrate
.. //depot/projects/arp-v2/src/sys/i386/i386/mp_machdep.c#6 integrate
.. //depot/projects/arp-v2/src/sys/i386/i386/msi.c#2 integrate
.. //depot/projects/arp-v2/src/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate
.. //depot/projects/arp-v2/src/sys/i386/include/atomic.h#3 integrate
.. //depot/projects/arp-v2/src/sys/i386/include/cputypes.h#2 integrate
.. //depot/projects/arp-v2/src/sys/i386/include/md_var.h#3 integrate
.. //depot/projects/arp-v2/src/sys/i386/include/pmc_mdep.h#3 integrate
.. //depot/projects/arp-v2/src/sys/i386/include/specialreg.h#4 integrate
.. //depot/projects/arp-v2/src/sys/i386/include/xen/xen-os.h#2 integrate
.. //depot/projects/arp-v2/src/sys/i386/include/xen/xenbus.h#2 delete
.. //depot/projects/arp-v2/src/sys/i386/linux/linux.h#5 integrate
.. //depot/projects/arp-v2/src/sys/i386/linux/linux_sysvec.c#4 integrate
.. //depot/projects/arp-v2/src/sys/i386/xen/xen_machdep.c#2 integrate
.. //depot/projects/arp-v2/src/sys/ia64/conf/GENERIC#7 integrate
.. //depot/projects/arp-v2/src/sys/ia64/ia64/elf_machdep.c#4 integrate
.. //depot/projects/arp-v2/src/sys/ia64/include/atomic.h#4 integrate
.. //depot/projects/arp-v2/src/sys/kern/Make.tags.inc#3 integrate
.. //depot/projects/arp-v2/src/sys/kern/imgact_aout.c#4 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_conf.c#6 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_cpuset.c#4 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_descrip.c#7 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_exec.c#6 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_exit.c#5 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_fork.c#5 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_jail.c#7 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_ktrace.c#3 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_linker.c#6 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_lockf.c#6 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_module.c#3 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_poll.c#5 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_proc.c#7 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_rwlock.c#6 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_shutdown.c#5 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_sysctl.c#2 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_thr.c#5 integrate
.. //depot/projects/arp-v2/src/sys/kern/kern_uuid.c#3 integrate
.. //depot/projects/arp-v2/src/sys/kern/subr_bufring.c#1 branch
.. //depot/projects/arp-v2/src/sys/kern/subr_param.c#5 integrate
.. //depot/projects/arp-v2/src/sys/kern/subr_sleepqueue.c#6 integrate
.. //depot/projects/arp-v2/src/sys/kern/subr_witness.c#8 integrate
.. //depot/projects/arp-v2/src/sys/kern/uipc_mqueue.c#5 integrate
.. //depot/projects/arp-v2/src/sys/kern/uipc_shm.c#6 integrate
.. //depot/projects/arp-v2/src/sys/kern/uipc_socket.c#7 integrate
.. //depot/projects/arp-v2/src/sys/kern/vfs_cache.c#6 integrate
.. //depot/projects/arp-v2/src/sys/kern/vfs_export.c#5 integrate
.. //depot/projects/arp-v2/src/sys/kern/vfs_mount.c#7 integrate
.. //depot/projects/arp-v2/src/sys/kern/vfs_subr.c#8 integrate
.. //depot/projects/arp-v2/src/sys/kern/vfs_syscalls.c#6 integrate
.. //depot/projects/arp-v2/src/sys/kern/vfs_vnops.c#7 integrate
.. //depot/projects/arp-v2/src/sys/libkern/iconv.c#2 integrate
.. //depot/projects/arp-v2/src/sys/mips/conf/IDT#4 integrate
.. //depot/projects/arp-v2/src/sys/mips/conf/SENTRY5#4 integrate
.. //depot/projects/arp-v2/src/sys/mips/include/atomic.h#2 integrate
.. //depot/projects/arp-v2/src/sys/mips/mips/elf_machdep.c#3 integrate
.. //depot/projects/arp-v2/src/sys/mips/mips/machdep.c#6 integrate
.. //depot/projects/arp-v2/src/sys/modules/Makefile#8 integrate
.. //depot/projects/arp-v2/src/sys/modules/ae/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/modules/ath/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/modules/ath_hal/Makefile#2 delete
.. //depot/projects/arp-v2/src/sys/modules/ath_rate_amrr/Makefile#5 integrate
.. //depot/projects/arp-v2/src/sys/modules/ath_rate_onoe/Makefile#5 integrate
.. //depot/projects/arp-v2/src/sys/modules/ath_rate_sample/Makefile#5 integrate
.. //depot/projects/arp-v2/src/sys/modules/bridgestp/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/modules/cxgb/iw_cxgb/Makefile#4 integrate
.. //depot/projects/arp-v2/src/sys/modules/hwpmc/Makefile#4 integrate
.. //depot/projects/arp-v2/src/sys/modules/if_ef/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/modules/if_vlan/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/modules/ip_mroute_mod/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/modules/ipfw/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/modules/linprocfs/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/modules/linux/Makefile#3 integrate
.. //depot/projects/arp-v2/src/sys/modules/netgraph/atm/atm/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/modules/netgraph/ether/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/modules/netgraph/gif/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/modules/nfsclient/Makefile#3 integrate
.. //depot/projects/arp-v2/src/sys/modules/nfsserver/Makefile#3 integrate
.. //depot/projects/arp-v2/src/sys/modules/pf/Makefile#3 integrate
.. //depot/projects/arp-v2/src/sys/modules/powermac_nvram/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/modules/uart/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/modules/usb2/Makefile#2 integrate
.. //depot/projects/arp-v2/src/sys/modules/wlan/Makefile#4 integrate
.. //depot/projects/arp-v2/src/sys/net/bpf.c#9 integrate
.. //depot/projects/arp-v2/src/sys/net/bridgestp.c#3 integrate
.. //depot/projects/arp-v2/src/sys/net/if.c#9 integrate
.. //depot/projects/arp-v2/src/sys/net/if_bridge.c#6 integrate
.. //depot/projects/arp-v2/src/sys/net/if_ef.c#4 integrate
.. //depot/projects/arp-v2/src/sys/net/if_ethersubr.c#7 integrate
.. //depot/projects/arp-v2/src/sys/net/if_faith.c#3 integrate
.. //depot/projects/arp-v2/src/sys/net/if_fddisubr.c#5 integrate
.. //depot/projects/arp-v2/src/sys/net/if_fwsubr.c#5 integrate
.. //depot/projects/arp-v2/src/sys/net/if_gif.c#5 integrate
.. //depot/projects/arp-v2/src/sys/net/if_gre.c#6 integrate
.. //depot/projects/arp-v2/src/sys/net/if_lagg.c#6 integrate
.. //depot/projects/arp-v2/src/sys/net/if_loop.c#6 integrate
.. //depot/projects/arp-v2/src/sys/net/if_mib.c#3 integrate
.. //depot/projects/arp-v2/src/sys/net/if_spppsubr.c#3 integrate
.. //depot/projects/arp-v2/src/sys/net/if_stf.c#4 integrate
.. //depot/projects/arp-v2/src/sys/net/if_tun.c#4 integrate
.. //depot/projects/arp-v2/src/sys/net/if_var.h#9 integrate
.. //depot/projects/arp-v2/src/sys/net/if_vlan.c#4 integrate
.. //depot/projects/arp-v2/src/sys/net/radix.c#3 integrate
.. //depot/projects/arp-v2/src/sys/net/radix.h#3 integrate
.. //depot/projects/arp-v2/src/sys/net/raw_cb.c#5 integrate
.. //depot/projects/arp-v2/src/sys/net/raw_usrreq.c#4 integrate
.. //depot/projects/arp-v2/src/sys/net/route.c#12 integrate
.. //depot/projects/arp-v2/src/sys/net/route.h#6 integrate
.. //depot/projects/arp-v2/src/sys/net/rtsock.c#9 integrate
.. //depot/projects/arp-v2/src/sys/net/vnet.h#2 integrate
.. //depot/projects/arp-v2/src/sys/net80211/ieee80211_ddb.c#4 integrate
.. //depot/projects/arp-v2/src/sys/net80211/ieee80211_hostap.c#4 integrate
.. //depot/projects/arp-v2/src/sys/net80211/ieee80211_output.c#5 integrate
.. //depot/projects/arp-v2/src/sys/net80211/ieee80211_var.h#5 integrate
.. //depot/projects/arp-v2/src/sys/net80211/ieee80211_wds.c#4 integrate
.. //depot/projects/arp-v2/src/sys/netgraph/atm/ng_atm.c#3 integrate
.. //depot/projects/arp-v2/src/sys/netgraph/netgraph.h#6 integrate
.. //depot/projects/arp-v2/src/sys/netgraph/ng_base.c#9 integrate
.. //depot/projects/arp-v2/src/sys/netgraph/ng_eiface.c#3 integrate
.. //depot/projects/arp-v2/src/sys/netgraph/ng_ether.c#3 integrate
.. //depot/projects/arp-v2/src/sys/netgraph/ng_gif.c#3 integrate
.. //depot/projects/arp-v2/src/sys/netgraph/ng_iface.c#5 integrate
.. //depot/projects/arp-v2/src/sys/netgraph/ng_l2tp.c#6 integrate
.. //depot/projects/arp-v2/src/sys/netgraph/ng_mppc.c#3 integrate
.. //depot/projects/arp-v2/src/sys/netgraph/ng_socket.c#4 integrate
.. //depot/projects/arp-v2/src/sys/netinet/if_ether.c#21 integrate
.. //depot/projects/arp-v2/src/sys/netinet/igmp.c#3 integrate
.. //depot/projects/arp-v2/src/sys/netinet/in.c#8 integrate
.. //depot/projects/arp-v2/src/sys/netinet/in.h#5 integrate
.. //depot/projects/arp-v2/src/sys/netinet/in_gif.c#4 integrate
.. //depot/projects/arp-v2/src/sys/netinet/in_mcast.c#4 integrate
.. //depot/projects/arp-v2/src/sys/netinet/in_pcb.c#7 integrate
.. //depot/projects/arp-v2/src/sys/netinet/in_pcb.h#6 integrate
.. //depot/projects/arp-v2/src/sys/netinet/in_proto.c#5 integrate
.. //depot/projects/arp-v2/src/sys/netinet/in_rmx.c#5 integrate
.. //depot/projects/arp-v2/src/sys/netinet/in_var.h#5 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip6.h#3 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip_carp.c#5 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip_divert.c#5 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip_fastfwd.c#4 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip_fw2.c#6 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip_fw_pfil.c#4 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip_icmp.c#4 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip_icmp.h#2 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip_id.c#3 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip_input.c#6 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip_ipsec.c#5 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip_mroute.c#4 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip_options.c#5 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip_output.c#8 integrate
.. //depot/projects/arp-v2/src/sys/netinet/ip_var.h#4 integrate
.. //depot/projects/arp-v2/src/sys/netinet/raw_ip.c#5 integrate
.. //depot/projects/arp-v2/src/sys/netinet/sctp.h#4 integrate
.. //depot/projects/arp-v2/src/sys/netinet/sctp_asconf.c#4 integrate
.. //depot/projects/arp-v2/src/sys/netinet/sctp_asconf.h#4 integrate
.. //depot/projects/arp-v2/src/sys/netinet/sctp_auth.c#4 integrate
.. //depot/projects/arp-v2/src/sys/netinet/sctp_auth.h#2 integrate
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Tue Dec 9 08:22:12 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id B5D891065677; Tue, 9 Dec 2008 08:22:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 7963A1065670
for ; Tue, 9 Dec 2008 08:22:12 +0000 (UTC)
(envelope-from zec@icir.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 689BF8FC0C
for ; Tue, 9 Dec 2008 08:22:12 +0000 (UTC)
(envelope-from zec@icir.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB98MCEt004828
for ; Tue, 9 Dec 2008 08:22:12 GMT
(envelope-from zec@icir.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB98MCr2004826
for perforce@freebsd.org; Tue, 9 Dec 2008 08:22:12 GMT
(envelope-from zec@icir.org)
Date: Tue, 9 Dec 2008 08:22:12 GMT
Message-Id: <200812090822.mB98MCr2004826@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@icir.org using -f
From: Marko Zec
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154387 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 09 Dec 2008 08:22:13 -0000
http://perforce.freebsd.org/chv.cgi?CH=154387
Change 154387 by zec@zec_tca51 on 2008/12/09 08:21:36
Unbreak LINT build.
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#8 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#17 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#8 (text+ko) ====
@@ -46,6 +46,7 @@
#include
#include
#include
+#include
#include
#include
#include