From owner-p4-projects@FreeBSD.ORG Sun Apr 29 09:42:35 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 748821065675; Sun, 29 Apr 2012 09:42:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 122511065672
for ; Sun, 29 Apr 2012 09:42:35 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id EDC098FC08
for ; Sun, 29 Apr 2012 09:42:34 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q3T9gYb6005473
for ; Sun, 29 Apr 2012 09:42:34 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q3T9gYxj005470
for perforce@freebsd.org; Sun, 29 Apr 2012 09:42:34 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 29 Apr 2012 09:42:34 GMT
Message-Id: <201204290942.q3T9gYxj005470@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210344 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 29 Apr 2012 09:42:35 -0000
http://p4web.freebsd.org/@@210344?ac=10
Change 210344 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/04/29 09:41:59
Provide basic glue to allow syscons to be used on MIPS, modelled
on PowerPC support. This was clearly not something syscons was
designed to do (very specific assumptions about the nature of VGA
consoles on PCs), but fortunately others have long since blazed
the way on making it work regardless of that. Currently, no
display drivers attach so this is nascent and under-tested
support.
Affected files ...
.. //depot/projects/ctsrd/beribsd/src/sys/conf/files.mips#3 edit
.. //depot/projects/ctsrd/beribsd/src/sys/conf/options.mips#4 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/fb/fbreg.h#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/syscons/schistory.c#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/syscons/scterm-teken.c#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/syscons/syscons.c#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/include/sc_machdep.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/mips/mips/sc_machdep.c#1 branch
Differences ...
==== //depot/projects/ctsrd/beribsd/src/sys/conf/files.mips#3 (text+ko) ====
@@ -126,3 +126,9 @@
dev/fdt/fdt_mips.c optional fdt
+dev/fb/fb.c optional sc
+dev/kbd/kbd.c optional sc
+dev/syscons/scgfbrndr.c optional sc
+dev/syscons/scterm-teken.c optional sc
+dev/syscons/scvtb.c optional sc
+mips/mips/sc_machdep.c optional sc
==== //depot/projects/ctsrd/beribsd/src/sys/conf/options.mips#4 (text+ko) ====
@@ -55,6 +55,10 @@
CFE_ENV opt_global.h
CFE_ENV_SIZE opt_global.h
+GFB_DEBUG opt_gfb.h
+GFB_NO_FONT_LOADING opt_gfb.h
+GFB_NO_MODE_CHANGE opt_gfb.h
+
NOFPU opt_global.h
TICK_USE_YAMON_FREQ opt_global.h
==== //depot/projects/ctsrd/beribsd/src/sys/dev/fb/fbreg.h#2 (text+ko) ====
@@ -84,6 +84,29 @@
u_int16_t ofwfb_readw(u_int16_t *addr);
void ofwfb_writew(u_int16_t *addr, u_int16_t val);
+#elif defined(__mips__)
+
+/*
+ * Use amd64/i386-like settings under the assumption that MIPS-based display
+ * drivers will have to add a level of indirection between a syscons-managed
+ * frame buffer and the actual video hardware. We are forced to do this
+ * because syscons doesn't carry around required busspace handles and tags to
+ * use here. This is only really a problem for true VGA devices hooked up to
+ * MIPS, as others will be performing a translation anyway.
+ */
+#define bcopy_io(s, d, c) memcpy((void *)(d), (void *)(s), (c))
+#define bcopy_toio(s, d, c) memcpy((void *)(d), (void *)(s), (c))
+#define bcopy_fromio(s, d, c) memcpy((void *)(d), (void *)(s), (c))
+#define bzero_io(d, c) memset((void *)(d), 0, (c))
+#define fill_io(p, d, c) memset((void *)(d), (p), (c))
+static __inline void
+fillw(int val, uint16_t *buf, size_t size)
+{
+ while (size--)
+ *buf++ = val;
+}
+#define fillw_io(p, d, c) fillw((p), (void *)(d), (c))
+
#else /* !__i386__ && !__amd64__ && !__ia64__ && !__sparc64__ && !__powerpc__ */
#define bcopy_io(s, d, c) memcpy_io((d), (s), (c))
#define bcopy_toio(s, d, c) memcpy_toio((d), (void *)(s), (c))
==== //depot/projects/ctsrd/beribsd/src/sys/dev/syscons/schistory.c#2 (text+ko) ====
@@ -42,7 +42,7 @@
#include
#include
-#if defined(__sparc64__) || defined(__powerpc__)
+#if defined(__sparc64__) || defined(__powerpc__) || defined(__mips__)
#include
#else
#include
==== //depot/projects/ctsrd/beribsd/src/sys/dev/syscons/scterm-teken.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
#include
#include
-#if defined(__sparc64__) || defined(__powerpc__)
+#if defined(__sparc64__) || defined(__powerpc__) || defined(__mips__)
#include
#else
#include
==== //depot/projects/ctsrd/beribsd/src/sys/dev/syscons/syscons.c#2 (text+ko) ====
@@ -62,7 +62,7 @@
#include
#include
-#if defined(__sparc64__) || defined(__powerpc__)
+#if defined(__sparc64__) || defined(__powerpc__) || defined(__mips__)
#include
#else
#include
From owner-p4-projects@FreeBSD.ORG Sun Apr 29 09:51:35 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CE788106566B; Sun, 29 Apr 2012 09:51:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 8C8F41065675
for ; Sun, 29 Apr 2012 09:51:34 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id 74E108FC16
for ; Sun, 29 Apr 2012 09:51:34 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q3T9pYvZ007118
for ; Sun, 29 Apr 2012 09:51:34 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q3T9pYHU007111
for perforce@freebsd.org; Sun, 29 Apr 2012 09:51:34 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 29 Apr 2012 09:51:34 GMT
Message-Id: <201204290951.q3T9pYHU007111@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210345 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 29 Apr 2012 09:51:35 -0000
http://p4web.freebsd.org/@@210345?ac=10
Change 210345 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/04/29 09:50:26
Remove exist stub MTL driver, which simply allowed memory mapping
of the Terasic MTL's memory from userspace via a special device node,
and replace with a larger driver suite, consisting of several
sub-drivers capturing various aspects of MTL behaviour:
- Simple memory-mapped driver for the MTL pixel frame buffer
- Simple memory-mapped driver for the MTL control register set
- Simple memory-mapped driver for the MTL text frame buffer
- More complex syscons driver for the MTL text frame buffer
In the future we will want to provide an ioctl-driver control path
for the register set from both the driver-provided device nodes,
and perhaps via syscons. Although in hardware there is significant
overlap with the flash device on the DE4 due to sharing a physical bus, it is likely the DE4 flash driver for FreeBSD will be entirely
independent in practice.
This is just a code checkpoint, and will likely require significant
refinement for the syscons aspects to work properly.
Affected files ...
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.c#1 add
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#1 add
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_nexus.c#1 add
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_pixel.c#1 add
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#1 add
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_syscons.c#1 add
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_text.c#1 add
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtllcd/terasic_mtllcd.c#5 delete
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtllcd/terasic_mtllcd.h#3 delete
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtllcd/terasic_mtllcd_nexus.c#4 delete
.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#12 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI.hints#10 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_MDROOT#6 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_SDROOT#6 edit
Differences ...
==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#12 (text+ko) ====
@@ -6,8 +6,12 @@
dev/altera/sdcard/altera_sdcard_nexus.c optional altera_sdcard
dev/terasic/de4led/terasic_de4led.c optional terasic_de4led
dev/terasic/de4led/terasic_de4led_nexus.c optional terasic_de4led
-dev/terasic/mtllcd/terasic_mtllcd.c optional terasic_mtllcd
-dev/terasic/mtllcd/terasic_mtllcd_nexus.c optional terasic_mtllcd
+dev/terasic/mtl/terasic_mtl.c optional terasic_mtl
+dev/terasic/mtl/terasic_mtl_nexus.c optional terasic_mtl
+dev/terasic/mtl/terasic_mtl_pixel.c optional terasic_mtl
+dev/terasic/mtl/terasic_mtl_reg.c optional terasic_mtl
+dev/terasic/mtl/terasic_mtl_syscons.c optional terasic_mtl
+dev/terasic/mtl/terasic_mtl_text.c optional terasic_mtl
mips/beri/beri_machdep.c standard
mips/mips/intr_machdep.c standard
mips/mips/tick.c standard
==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI.hints#10 (text+ko) ====
@@ -24,6 +24,10 @@
#
# Terasic Multi-touch LCD (MTL), an optional feature in DE-4 configurations
#
-hint.terasic_mtllcd.0.at="nexus0"
-hint.terasic_mtllcd.0.maddr=0x70000000
-hint.terasic_mtllcd.0.msize=0x401000
+hint.terasic_mtl.0.at="nexus0"
+hint.terasic_mtl.0.reg_maddr=0x70400000
+hint.terasic_mtl.0.reg_msize=0x1000
+hint.terasic_mtl.0.pixel_maddr=0x70000000
+hint.terasic_mtl.0.pixel_msize=0x177000
+hint.terasic_mtl.0.text_maddr=0x70177000
+hint.terasic_mtl.0.text_msize=0x2000
==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_MDROOT#6 (text+ko) ====
@@ -52,8 +52,9 @@
device altera_jtag_uart
device altera_sdcard
device terasic_de4led
-device terasic_mtllcd
+device terasic_mtl
device md
device loop
device random
+device sc
==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_SDROOT#6 (text+ko) ====
@@ -44,8 +44,9 @@
device altera_jtag_uart
device altera_sdcard
device terasic_de4led
-device terasic_mtllcd
+device terasic_mtl
device md
device loop
device random
+device sc
From owner-p4-projects@FreeBSD.ORG Sun Apr 29 11:58:25 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 35C611065670; Sun, 29 Apr 2012 11:58:25 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id EBB8B106564A
for ; Sun, 29 Apr 2012 11:58:24 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id D2F2A8FC18
for ; Sun, 29 Apr 2012 11:58:24 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q3TBwOMU031916
for ; Sun, 29 Apr 2012 11:58:24 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q3TBwOPm031913
for perforce@freebsd.org; Sun, 29 Apr 2012 11:58:24 GMT
(envelope-from rene@FreeBSD.org)
Date: Sun, 29 Apr 2012 11:58:24 GMT
Message-Id: <201204291158.q3TBwOPm031913@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210350 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 29 Apr 2012 11:58:25 -0000
http://p4web.freebsd.org/@@210350?ac=10
Change 210350 by rene@rene_acer on 2012/04/29 11:57:37
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#138 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#84 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#27 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#139 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#76 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#59 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#48 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/issyl0.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#76 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#73 integrate
.. //depot/projects/docproj_nl/share/sgml/freebsd.ent#29 integrate
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#51 integrate
.. //depot/projects/docproj_nl/www/en/where.sgml#19 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#138 (text+ko) ====
@@ -1,4 +1,4 @@
-
+
+
@@ -2807,9 +2807,20 @@
perform many tasks like running &man.dump.8;,
&man.restore.8;, &man.fdisk.8;, &man.bsdlabel.8;,
&man.newfs.8;, &man.mount.8;, and more. Livefs CD image for
- &os;/&arch.i386; &rel.current;-RELEASE is available
+ &os;/&arch.i386; &rel2.current;-RELEASE is available
from .
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/&arch.i386;/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-&arch.i386;-livefs.iso">.
+
+
+ Livefs CD images are not available for
+ &os; &rel.current;-RELEASE and later. In addition to
+ the CDROM installation images, flash drive installation
+ images may be used to recover a system. The
+ memstick
image for
+ &os;/&arch.i386; &rel.current;-RELEASE is available
+ from .
+
Third, create backup tapes regularly. Any changes that
you make after your last backup may be irretrievably lost.
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#139 (text+ko) ====
@@ -1,7 +1,7 @@
http://search.cpan.org/dist/Module-Name/
(including the trailing slash).
+
+ It is recommended to avoid using
+ ${SITE_PERL} as a dependency listing. This is
+ problematic because it means that
+ bsd.perl.mk must be included
+ to satisfy the dependency. Additionally, if the module's
+ files change, it would require changing all
+ dependent ports.
+
+
+
+ PERL Dependency Example
+
+ p5-IO-Tee>=0.64:${PORTSDIR}/devel/p5-IO-Tee
+
@@ -6853,17 +6868,16 @@
USE_APACHE
The port requires Apache. Possible values:
yes (gets any version),
- 1.3, 2.0,
- 2.2, 2.0+,
- etc. Default dependency is on version
- 1.3.
+ 2.0, 2.2,
+ 2.0+, etc.
+ Default dependency is on version
+ 2.2.
WITH_APACHE2
- The port requires Apache 2.0. Without this
- variable, the port will depend on Apache 1.3. This
- variable is deprecated and should not be used
+ This variable is deprecated and should
+ not be used
anymore.
@@ -6885,9 +6899,8 @@
(read-only variable). This variable is only
available after inclusion of
bsd.port.pre.mk. Possible
- values: 13,
- 20,
- 22.
+ values: 20,
+ 22.
==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#76 (text+ko) ====
@@ -13,7 +13,7 @@
builds for the other languages, and we will poke fun of you
in public.
- $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.577 2012/04/22 16:45:13 jlh Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.578 2012/04/27 18:03:05 issyl0 Exp $
-->
aaron@FreeBSD.org">
@@ -532,6 +532,8 @@
issei@FreeBSD.org">
+issyl0@FreeBSD.org">
+
itetcu@FreeBSD.org">
itojun@FreeBSD.org">
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#59 (text+ko) ====
@@ -1,7 +1,7 @@
@@ -986,6 +986,11 @@
&pgpkey.avl;
+
+ &a.issyl0;
+ &pgpkey.issyl0;
+
+
&a.scottl;
&pgpkey.scottl;
==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#73 (text+ko) ====
@@ -1,5 +1,5 @@
-
+
@@ -141,6 +141,7 @@
+
==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#29 (text+ko) ====
@@ -1,7 +1,7 @@
-
+
==== //depot/projects/docproj_nl/www/en/releng/index.sgml#51 (text+ko) ====
@@ -1,6 +1,6 @@
-
+
@@ -48,9 +48,9 @@
- March 2012 |
- &os; 8.3 |
- Target Schedule |
+ 2012 |
+ &os; 9.1 |
+ Schedule under discussion. |
@@ -102,8 +102,8 @@
RELENG_8_3 |
Frozen |
- &contact.re; |
- Development branch for upcoming FreeBSD 8.3. |
+ &contact.so; |
+ FreeBSD 8.3 supported errata fix branch. |
@@ -145,7 +145,7 @@
RELENG_7_3 |
Frozen |
&contact.so; |
- FreeBSD 7.3 supported errata fix branch. |
+ FreeBSD 7.3 errata fix branch (not officially supported). |
==== //depot/projects/docproj_nl/www/en/where.sgml#19 (text+ko) ====
@@ -1,5 +1,5 @@
+
@@ -102,10 +102,10 @@
FreeBSD &rel2.current;-RELEASE |
|
- [View] |
- [View] |
- [View] |
- [View] |
+ [View] |
+ [View] |
+ [View] |
+ [View] |
|
@@ -121,24 +121,12 @@
|
- ia64 |
- [Distribution] |
- [ISO] |
-
-
- |
pc98 |
[Distribution] |
[ISO] |
|
- powerpc |
- [Distribution] |
- [ISO] |
-
-
- |
sparc64 |
[Distribution] |
[ISO] |
@@ -154,26 +142,26 @@
|
amd64 |
- [Distribution] |
- [ISO] |
+
+ [ISO] |
|
i386 |
- [Distribution] |
- [ISO] |
+
+ [ISO] |
|
pc98 |
- [Distribution] |
- [ISO] |
+
+ [ISO] |
|
sparc64 |
- [Distribution] |
- [ISO] |
+
+ [ISO] |
From owner-p4-projects@FreeBSD.ORG Sun Apr 29 12:40:45 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 539081065672; Sun, 29 Apr 2012 12:40:45 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 1508E106564A
for ; Sun, 29 Apr 2012 12:40:45 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id D88FA8FC0A
for ; Sun, 29 Apr 2012 12:40:44 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q3TCeita041015
for ; Sun, 29 Apr 2012 12:40:44 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q3TCeibm041009
for perforce@freebsd.org; Sun, 29 Apr 2012 12:40:44 GMT
(envelope-from rene@FreeBSD.org)
Date: Sun, 29 Apr 2012 12:40:44 GMT
Message-Id: <201204291240.q3TCeibm041009@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210353 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 29 Apr 2012 12:40:45 -0000
http://p4web.freebsd.org/@@210353?ac=10
Change 210353 by rene@rene_acer on 2012/04/29 12:39:50
MFen handbook/disks 1.315 -> 1.316 (plus local fixes)
Affected files ...
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#40 edit
Differences ...
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#40 (text+ko) ====
@@ -4,7 +4,7 @@
$FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.26 2012/03/04 22:10:54 rene Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/disks/chapter.sgml
- %SRCID% 1.315
+ %SRCID% 1.316
-->
@@ -3032,14 +3032,24 @@
livefs CD
- Ten derde dient een livefs
CD-ROM gebrandt te
+ Ten tweede dient een livefs
CD-ROM gebrandt te
worden. Deze CD-ROM biedt ondersteuning voor het opstarten in een
&os; livefs
reddingsmodus die gebruiker in staat stelt
om vele taken uit te voeren zoals het draaien van &man.dump.8;,
- &man.restore.8;, &man.fdisk.8;, &man.bsdlabel.8;, &man.newfs.8;, en
- meer. Een livefs CD-image voor
- &os;/&arch.i386; &rel.current;-RELEASE is beschikbaar op .
+ &man.restore.8;, &man.fdisk.8;, &man.bsdlabel.8;, &man.newfs.8; en
+ meer. Een livefs CD-beeld voor
+ &os;/&arch.i386; &rel2.current;-RELEASE is beschikbaar op .
+
+
+ Livefs CD-beelden zijn niet beschikbaar voor
+ &os; &rel.current;-RELEASE en nieuwer. Naast de beelden voor
+ CDROM-installaties kunnen ook beelden voor flash-drive-installaties
+ gebruikt worden om een systeem te redden. Het
+ memstick
-beelden voor
+ &os;/&arch.i386; &rel.current;-RELEASE is beschikbaar op .
+
Ten derde dienen regelmatig back-upbanden aangemaakt te
worden. Alle veranderingen die na de laatste back-up zijn
From owner-p4-projects@FreeBSD.ORG Sun Apr 29 14:55:08 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 7A0D61065676; Sun, 29 Apr 2012 14:55: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 3C7D71065674
for ; Sun, 29 Apr 2012 14:55:07 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id 13DEF8FC0C
for ; Sun, 29 Apr 2012 14:55:07 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q3TEt6QT067977
for ; Sun, 29 Apr 2012 14:55:06 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q3TEt6Th067974
for perforce@freebsd.org; Sun, 29 Apr 2012 14:55:06 GMT
(envelope-from rene@FreeBSD.org)
Date: Sun, 29 Apr 2012 14:55:06 GMT
Message-Id: <201204291455.q3TEt6Th067974@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210358 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 29 Apr 2012 14:55:08 -0000
http://p4web.freebsd.org/@@210358?ac=10
Change 210358 by rene@rene_acer on 2012/04/29 14:54:38
WWW update:
- where.sgml 1.126 -> 1.128
- igor fixes for features.sgml
Affected files ...
.. //depot/projects/docproj_nl/www/nl/features.sgml#6 edit
.. //depot/projects/docproj_nl/www/nl/where.sgml#38 edit
Differences ...
==== //depot/projects/docproj_nl/www/nl/features.sgml#6 (text+ko) ====
@@ -125,7 +125,7 @@
operaties synchroon moeten worden uitgevoerd. In plaats
daarvan wordt een interne status bijgehouden voor nog uit te
voeren bewerkingen op meta-gegevens en wordt deze informatie gebruikt
- om meta-gegevens te cachen, worden bewerkingen op meta-gegevens
+ om meta-gegevens te cachen, worden bewerkingen op meta-gegevens
gecombineerd om opeenvolgende bewerkingen op hetzelfde
bestanden te herschrijven en wordt de volgorde van bewerkingen op
meta-gegevens gewijzigd zodat ze efficiënter verwerkt kunnen
@@ -159,7 +159,7 @@
en met kernel preemption mogelijkheden biedt om
kerneltaken met een hoge prioriteit voorrang te geven boven
andere kerneltaken, wat minder vertraging oplevert.
- Dit geldt onder andere voor de multi-threaded netwerk-stack
+ Dit geldt onder andere voor de multi-threaded netwerk-stack
en een multi-threaded subsysteem voor virtueel geheugen.
Beginnend met &os; 6.X met ondersteuning voor een
volledig parallel VFS, is het mogelijk de UFS-bestandssysteem
==== //depot/projects/docproj_nl/www/nl/where.sgml#38 (text+ko) ====
@@ -6,7 +6,7 @@
]>
&header;
@@ -103,10 +103,10 @@
&os; &rel2.current;-RELEASE |
|
- [Bekijk] |
- [Bekijk] |
- [Bekijk] |
- [Bekijk] |
+ [Bekijk] |
+ [Bekijk] |
+ [Bekijk] |
+ [Bekijk] |
|
@@ -122,24 +122,12 @@
|
- i386 |
- [Distributie] |
- [ISO] |
-
-
- |
pc98 |
[Distributie] |
[ISO] |
|
- powerpc |
- [Distributie] |
- [ISO] |
-
-
- |
sparc64 |
[Distributie] |
[ISO] |
@@ -155,26 +143,26 @@
|
amd64 |
- [Distributie] |
- [ISO] |
+
+ [ISO] |
|
i386 |
- [Distributie] |
- [ISO] |
+
+ [ISO] |
|
pc98 |
- [Distributie] |
- [ISO] |
+
+ [ISO] |
|
sparc64 |
- [Distributie] |
- [ISO] |
+
+ [ISO] |
From owner-p4-projects@FreeBSD.ORG Sun Apr 29 16:46:29 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id AB2571065675; Sun, 29 Apr 2012 16:46:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 62B891065672
for ; Sun, 29 Apr 2012 16:46:29 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id 4848D8FC17
for ; Sun, 29 Apr 2012 16:46:29 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q3TGkTbH089920
for ; Sun, 29 Apr 2012 16:46:29 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q3TGkSJU089917
for perforce@freebsd.org; Sun, 29 Apr 2012 16:46:28 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 29 Apr 2012 16:46:28 GMT
Message-Id: <201204291646.q3TGkSJU089917@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210366 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 29 Apr 2012 16:46:30 -0000
http://p4web.freebsd.org/@@210366?ac=10
Change 210366 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/04/29 16:45:25
Commit a number of bug fixes and enhancements to the new Terasic
MTL driver:
- Add underlying I/O routines to allow syscons to control cursor
location and generate text frame buffer output.
- Fix nexus attachment resource allocation, which was incorrectly
allocating one-byte bus space-managed memory regions for the
register and frame buffers.
- Print out memory regions used by each of the sub-drivers during
attach.
- Fix bugs in the sub-driver device node write routines for each
of the register, pixel, and frame buffer devices that caused
write() to be off by four bytes.
- Add additional debugging information in cases where device
driver attach fails.
- Use printf() instead of panic() when syscons calls, somewhat
to our surprise, methods for functions declared unsupported
during video adapter attach.
- Add a work-around for a possible hardware bug in which the
base address for the text frame buffer is not as expected,
overwriting the apparent value with the desired value.
Even with these changes, the text frame buffer still does not
work, but it does an increasingly good job of thinking that it is
working, despite touch screen contents to the contrary!
Affected files ...
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.c#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_nexus.c#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_pixel.c#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_syscons.c#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_text.c#2 edit
Differences ...
==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.c#2 (text+ko) ====
==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#2 (text+ko) ====
@@ -76,6 +76,31 @@
#define TERASIC_MTL_ROWS 40
/*
+ * MTL control register offsets.
+ */
+#define TERASIC_MTL_OFF_FRAMEBLENDING 0
+#define TERASIC_MTL_OFF_TEXTCURSOR 4
+#define TERASIC_MTL_OFF_TEXTFRAMEBUFADDR 8
+#define TERASIC_MTL_OFF_TOUCHPOINT_X1 12
+#define TERASIC_MTL_OFF_TOUCHPOINT_Y1 16
+#define TERASIC_MTL_OFF_TOUCHPOINT_X2 20
+#define TERASIC_MTL_OFF_TOUCHPOINT_Y2 24
+#define TERASIC_MTL_OFF_TOUCHGESTURE 28
+
+/*
+ * Constants to help interpret various control registers.
+ */
+#define TERASIC_MTL_TEXTCURSOR_COL_MASK 0xff00
+#define TERASIC_MTL_TEXTCURSOR_COL_SHIFT 8
+#define TERASIC_MTL_TEXTCURSOR_ROW_MASK 0xff
+
+/*
+ * Constants to help interpret the text frame buffer.
+ */
+#define TERASIC_MTL_TEXTFRAMEBUF_CHAR_SHIFT 8
+#define TERASIC_MTL_TEXTFRAMEBUF_ATTR_SHIFT 0
+
+/*
* Driver setup routines from the bus attachment/teardown.
*/
int terasic_mtl_attach(struct terasic_mtl_softc *sc);
@@ -93,4 +118,21 @@
int terasic_mtl_text_attach(struct terasic_mtl_softc *sc);
void terasic_mtl_text_detach(struct terasic_mtl_softc *sc);
+/*
+ * Control register I/O routines.
+ */
+void terasic_mtl_reg_blank(struct terasic_mtl_softc *sc);
+void terasic_mtl_reg_textcursor_get(struct terasic_mtl_softc *sc,
+ uint8_t *colp, uint8_t *rowp);
+void terasic_mtl_reg_textcursor_set(struct terasic_mtl_softc *sc,
+ uint8_t col, uint8_t row);
+void terasic_mtl_reg_textframebufaddr_set(struct terasic_mtl_softc *sc,
+ uint32_t addr);
+
+/*
+ * Text frame buffer I/O routines.
+ */
+void terasic_mtl_text_putc(struct terasic_mtl_softc *sc, u_int x, u_int y,
+ uint8_t c, uint8_t a);
+
#endif /* _DEV_TERASIC_MTL_H_ */
==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_nexus.c#2 (text+ko) ====
@@ -114,34 +114,40 @@
*/
sc->mtl_reg_rid = 0;
sc->mtl_reg_res = bus_alloc_resource(dev, SYS_RES_MEMORY,
- &sc->mtl_reg_rid, reg_maddr, reg_maddr + reg_msize, 1, RF_ACTIVE);
+ &sc->mtl_reg_rid, reg_maddr, reg_maddr + reg_msize - 1,
+ reg_msize, RF_ACTIVE);
if (sc->mtl_reg_res == NULL) {
device_printf(dev, "couldn't map register memory\n");
error = ENXIO;
goto error;
}
+ device_printf(sc->mtl_dev, "registers at mem %p-%p\n",
+ (void *)reg_maddr, (void *)(reg_maddr + reg_msize));
sc->mtl_pixel_rid = 0;
sc->mtl_pixel_res = bus_alloc_resource(dev, SYS_RES_MEMORY,
- &sc->mtl_pixel_rid, pixel_maddr, pixel_maddr + pixel_msize, 1,
- RF_ACTIVE);
+ &sc->mtl_pixel_rid, pixel_maddr, pixel_maddr + pixel_msize - 1,
+ pixel_msize, RF_ACTIVE);
if (sc->mtl_pixel_res == NULL) {
device_printf(dev, "couldn't map pixel memory\n");
error = ENXIO;
goto error;
}
+ device_printf(sc->mtl_dev, "pixel frame buffer at mem %p-%p\n",
+ (void *)pixel_maddr, (void *)(pixel_maddr + pixel_msize));
sc->mtl_text_rid = 0;
sc->mtl_text_res = bus_alloc_resource(dev, SYS_RES_MEMORY,
- &sc->mtl_text_rid, text_maddr, text_maddr + text_msize, 1,
- RF_ACTIVE);
+ &sc->mtl_text_rid, text_maddr, text_maddr + text_msize - 1,
+ text_msize, RF_ACTIVE);
if (sc->mtl_text_res == NULL) {
device_printf(dev, "couldn't map text memory\n");
error = ENXIO;
goto error;
}
+ device_printf(sc->mtl_dev, "text frame buffer at mem %p-%p\n",
+ (void *)text_maddr, (void *)(text_maddr + text_msize));
error = terasic_mtl_attach(sc);
if (error == 0)
return (0);
-
error:
if (sc->mtl_text_res != NULL)
bus_release_resource(dev, SYS_RES_MEMORY, sc->mtl_text_rid,
==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_pixel.c#2 (text+ko) ====
@@ -106,12 +106,12 @@
size = rman_get_size(sc->mtl_pixel_res);
error = 0;
while (uio->uio_resid > 0) {
+ offset = uio->uio_offset;
+ if (offset + sizeof(v) > size)
+ return (ENODEV);
error = uiomove(&v, sizeof(v), uio);
if (error)
return (error);
- offset = uio->uio_offset;
- if (offset + sizeof(v) > size)
- return (ENODEV);
bus_write_4(sc->mtl_pixel_res, offset, v);
}
return (error);
@@ -141,8 +141,10 @@
sc->mtl_pixel_cdev = make_dev(&mtl_pixel_cdevsw, sc->mtl_unit,
UID_ROOT, GID_WHEEL, 0400, "mtl_pixel%d", sc->mtl_unit);
- if (sc->mtl_pixel_cdev == NULL)
+ if (sc->mtl_pixel_cdev == NULL) {
+ device_printf(sc->mtl_dev, "%s: make_dev failed\n", __func__);
return (ENXIO);
+ }
/* XXXRW: Slight race between make_dev(9) and here. */
sc->mtl_pixel_cdev->si_drv1 = sc;
return (0);
==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#2 (text+ko) ====
@@ -35,10 +35,12 @@
#include
#include
#include /* struct vt_mode */
+#include
#include /* video_adapter_t */
#include
#include
#include
+#include
#include
#include
@@ -107,12 +109,12 @@
size = rman_get_size(sc->mtl_reg_res);
error = 0;
while (uio->uio_resid > 0) {
+ offset = uio->uio_offset;
+ if (offset + sizeof(v) > size)
+ return (ENODEV);
error = uiomove(&v, sizeof(v), uio);
if (error)
return (error);
- offset = uio->uio_offset;
- if (offset + sizeof(v) > size)
- return (ENODEV);
bus_write_4(sc->mtl_reg_res, offset, v);
}
return (error);
@@ -136,14 +138,56 @@
return (error);
}
+void
+terasic_mtl_reg_textcursor_get(struct terasic_mtl_softc *sc, uint8_t *colp,
+ uint8_t *rowp)
+{
+ uint32_t v;
+
+ v = bus_read_4(sc->mtl_reg_res, TERASIC_MTL_OFF_TEXTCURSOR);
+ v = le32toh(v);
+ *rowp = (v & TERASIC_MTL_TEXTCURSOR_COL_MASK) >>
+ TERASIC_MTL_TEXTCURSOR_COL_SHIFT;
+ *colp = (v & TERASIC_MTL_TEXTCURSOR_ROW_MASK);
+}
+
+void
+terasic_mtl_reg_textcursor_set(struct terasic_mtl_softc *sc, uint8_t col,
+ uint8_t row)
+{
+ uint32_t v;
+
+ v = col << TERASIC_MTL_TEXTCURSOR_COL_SHIFT | row;
+ v = htole32(v);
+ bus_write_4(sc->mtl_reg_res, TERASIC_MTL_OFF_TEXTCURSOR, v);
+}
+
+void
+terasic_mtl_reg_blank(struct terasic_mtl_softc *sc)
+{
+
+ device_printf(sc->mtl_dev, "%s: not yet", __func__);
+}
+
+void
+terasic_mtl_reg_textframebufaddr_set(struct terasic_mtl_softc *sc,
+ uint32_t addr)
+{
+
+ addr = htole32(addr);
+ bus_write_4(sc->mtl_reg_res, TERASIC_MTL_OFF_TEXTFRAMEBUFADDR, addr);
+}
+
int
terasic_mtl_reg_attach(struct terasic_mtl_softc *sc)
{
sc->mtl_reg_cdev = make_dev(&terasic_mtl_reg_cdevsw, sc->mtl_unit,
UID_ROOT, GID_WHEEL, 0400, "mtl_reg%d", sc->mtl_unit);
- if (sc->mtl_reg_cdev == NULL)
+ if (sc->mtl_reg_cdev == NULL) {
+ device_printf(sc->mtl_dev, "%s: make_dev failed\n", __func__);
return (ENXIO);
+ }
/* XXXRW: Slight race between make_dev(9) and here. */
sc->mtl_reg_cdev->si_drv1 = sc;
return (0);
==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_syscons.c#2 (text+ko) ====
@@ -103,7 +103,7 @@
sc = (struct terasic_mtl_softc *)adp;
vi = &adp->va_info;
- vid_init_struct(adp, "mtlsc", -1, unit);
+ vid_init_struct(adp, "terasic_mtl_syscons", -1, unit);
vi->vi_width = TERASIC_MTL_COLS;
if (vi->vi_width > COL)
@@ -136,8 +136,11 @@
* V_ADP_REGISTERED.
*/
adp->va_flags |= V_ADP_COLOR | V_ADP_INITIALIZED;
- if (vid_register(adp) < 0)
+ if (vid_register(adp) < 0) {
+ device_printf(sc->mtl_dev, "%s: vid_register failed\n",
+ __func__);
return (ENXIO);
+ }
adp->va_flags |= V_ADP_REGISTERED;
return (0);
}
@@ -171,7 +174,8 @@
int width, u_char *data, int c, int count)
{
- panic("%s: not yet", __func__);
+ printf("%s: not yet\n", __func__);
+ return (ENODEV);
}
static int
@@ -179,67 +183,76 @@
int width, u_char *data, int c, int count)
{
- panic("%s: not yet", __func__);
+ printf("%s: not yet\n", __func__);
+ return (ENODEV);
}
static int
terasic_mtl_vidsw_show_font(video_adapter_t *adp, int page)
{
- panic("%s: not yet", __func__);
+ printf("%s: not yet\n", __func__);
+ return (ENODEV);
}
static int
terasic_mtl_vidsw_save_palette(video_adapter_t *adp, u_char *palette)
{
- panic("%s: not yet", __func__);
+ printf("%s: not yet\n", __func__);
+ return (ENODEV);
}
static int
terasic_mtl_vidsw_load_palette(video_adapter_t *adp, u_char *palette)
{
- panic("%s: not yet", __func__);
+ printf("%s: not yet\n", __func__);
+ return (ENODEV);
}
static int
terasic_mtl_vidsw_set_border(video_adapter_t *adp, int border)
{
- panic("%s: not yet", __func__);
+ printf("%s: not yet\n", __func__);
+ return (ENODEV);
}
static int
terasic_mtl_vidsw_save_state(video_adapter_t *adp, void *p, size_t size)
{
- panic("%s: not yet", __func__);
+ printf("%s: not yet\n", __func__);
+ return (ENODEV);
}
static int
terasic_mtl_vidsw_load_state(video_adapter_t *adp, void *p)
{
- panic("%s: not yet", __func__);
+ printf("%s: not yet\n", __func__);
+ return (ENODEV);
}
static int
terasic_mtl_vidsw_set_win_org(video_adapter_t *adp, off_t offset)
{
- panic("%s: not yet", __func__);
+ printf("%s: not yet\n", __func__);
+ return (ENODEV);
}
static int
-terasic_mtl_vidsw_read_hw_cursor(video_adapter_t *adp, int *col, int *row)
+terasic_mtl_vidsw_read_hw_cursor(video_adapter_t *adp, int *colp, int *rowp)
{
struct terasic_mtl_softc *sc;
+ uint8_t col, row;
sc = (struct terasic_mtl_softc *)adp;
- *col = *row = 0;
- printf("%s: not yet terasic_mtl_io_cursor_getxy(sc, col, row);\n",
- __func__);
+ terasic_mtl_reg_textcursor_get(sc, &col, &row);
+ *colp = col;
+ *rowp = row;
return (0);
}
@@ -249,7 +262,7 @@
struct terasic_mtl_softc *sc;
sc = (struct terasic_mtl_softc *)adp;
- printf("%s: not yet terasic_mtl_io_setxy(sc, col, row);\n", __func__);
+ terasic_mtl_reg_textcursor_set(sc, col, row);
return (0);
}
@@ -268,7 +281,7 @@
struct terasic_mtl_softc *sc;
sc = (struct terasic_mtl_softc *)adp;
- printf("%s: not yet terasic_mtl_io_blank(sc);\n", __func__);
+ terasic_mtl_reg_blank(sc);
return (0);
}
@@ -362,15 +375,12 @@
uint8_t a)
{
struct terasic_mtl_softc *sc;
- u_int x, y;
+ u_int col, row;
sc = (struct terasic_mtl_softc *)adp;
- x = (off % adp->va_info.vi_width);
- y = (off / adp->va_info.vi_width);
-
- /* XXXRW: more required here. */
- printf("%s: not yet terasic_mtl_io_putc(sc, x, y, c, a);\n",
- __func__);
+ col = (off % adp->va_info.vi_width);
+ row = (off / adp->va_info.vi_width);
+ terasic_mtl_text_putc(sc, col, row, c, a);
return (0);
}
@@ -390,7 +400,8 @@
uint8_t *pixel_image, uint32_t pixel_mask, int size, int width)
{
- panic("%s: not yet", __func__);
+ printf("%s: not yet\n", __func__);
+ return (ENODEV);
}
/*
@@ -417,9 +428,16 @@
sc->mtl_text_soft =
malloc(sizeof(uint16_t) * TERASIC_MTL_ROWS * TERASIC_MTL_COLS,
M_TERASIC_MTL, M_WAITOK | M_ZERO);
+ error = terasic_mtl_vidsw_init(0, &sc->mtl_va, 0);
+ if (error)
+ goto out;
error = sc_attach_unit(sc->mtl_unit, device_get_flags(sc->mtl_dev) |
SC_AUTODETECT_KBD);
if (error)
+ device_printf(sc->mtl_dev, "%s: sc_attach_unit failed (%d)\n",
+ __func__, error);
+out:
+ if (error)
free(sc->mtl_text_soft, M_TERASIC_MTL);
return (error);
}
==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_text.c#2 (text+ko) ====
@@ -35,10 +35,12 @@
#include
#include
#include /* struct vt_mode */
+#include
#include /* video_adapter_t */
#include
#include
#include
+#include
#include
#include
@@ -106,12 +108,12 @@
size = rman_get_size(sc->mtl_text_res);
error = 0;
while (uio->uio_resid > 0) {
+ offset = uio->uio_offset;
+ if (offset + sizeof(v) > size)
+ return (ENODEV);
error = uiomove(&v, sizeof(v), uio);
if (error)
return (error);
- offset = uio->uio_offset;
- if (offset + sizeof(v) > size)
- return (ENODEV);
bus_write_2(sc->mtl_text_res, offset, v);
}
return (error);
@@ -135,15 +137,38 @@
return (error);
}
+void
+terasic_mtl_text_putc(struct terasic_mtl_softc *sc, u_int x, u_int y,
+ uint8_t c, uint8_t a)
+{
+ u_int offset;
+ uint16_t v;
+
+ KASSERT(x < TERASIC_MTL_COLS, ("%s: TERASIC_MTL_COLS", __func__));
+ KASSERT(y < TERASIC_MTL_ROWS, ("%s: TERASIC_MTL_ROWS", __func__));
+
+ offset = sizeof(uint16_t) * (x + y * TERASIC_MTL_COLS);
+ v = (c << TERASIC_MTL_TEXTFRAMEBUF_CHAR_SHIFT) |
+ (a << TERASIC_MTL_TEXTFRAMEBUF_ATTR_SHIFT);
+ v = htole16(v);
+ bus_write_2(sc->mtl_text_res, offset, v);
+}
+
int
terasic_mtl_text_attach(struct terasic_mtl_softc *sc)
{
+ /*
+ * XXXRW: Work around a feature in which the default address of the
+ * text frame buffer is not initialised at reset as expected.
+ */
+ terasic_mtl_reg_textframebufaddr_set(sc, 0x0177000);
sc->mtl_text_cdev = make_dev(&terasic_mtl_text_cdevsw, sc->mtl_unit,
UID_ROOT, GID_WHEEL, 0400, "mtl_text%d", sc->mtl_unit);
- if (sc->mtl_text_cdev == NULL)
+ if (sc->mtl_text_cdev == NULL) {
+ device_printf(sc->mtl_dev, "%s: make_dev failed\n", __func__);
return (ENXIO);
-
+ }
/* XXXRW: Slight race between make_dev(9) and here. */
sc->mtl_text_cdev->si_drv1 = sc;
return (0);
From owner-p4-projects@FreeBSD.ORG Sun Apr 29 18:13:10 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0287C1065673; Sun, 29 Apr 2012 18:13:10 +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 B74FC1065670
for ; Sun, 29 Apr 2012 18:13:09 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id 868CA8FC0A
for ; Sun, 29 Apr 2012 18:13:09 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q3TID9Me006898
for ; Sun, 29 Apr 2012 18:13:09 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q3TID9pG006895
for perforce@freebsd.org; Sun, 29 Apr 2012 18:13:09 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 29 Apr 2012 18:13:09 GMT
Message-Id: <201204291813.q3TID9pG006895@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210369 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 29 Apr 2012 18:13:10 -0000
http://p4web.freebsd.org/@@210369?ac=10
Change 210369 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/04/29 18:13:09
When adjusting the MTL text frame buffer address register, print a
console warning, as this should not be necessary.
Affected files ...
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#3 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#3 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_text.c#3 edit
Differences ...
==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#3 (text+ko) ====
@@ -126,6 +126,8 @@
uint8_t *colp, uint8_t *rowp);
void terasic_mtl_reg_textcursor_set(struct terasic_mtl_softc *sc,
uint8_t col, uint8_t row);
+void terasic_mtl_reg_textframebufaddr_get(struct terasic_mtl_softc *sc,
+ uint32_t *addrp);
void terasic_mtl_reg_textframebufaddr_set(struct terasic_mtl_softc *sc,
uint32_t addr);
==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#3 (text+ko) ====
@@ -170,6 +170,16 @@
}
void
+terasic_mtl_reg_textframebufaddr_get(struct terasic_mtl_softc *sc,
+ uint32_t *addrp)
+{
+ uint32_t addr;
+
+ addr = bus_read_4(sc->mtl_reg_res, TERASIC_MTL_OFF_TEXTFRAMEBUFADDR);
+ *addrp = le32toh(addr);
+}
+
+void
terasic_mtl_reg_textframebufaddr_set(struct terasic_mtl_softc *sc,
uint32_t addr)
{
==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_text.c#3 (text+ko) ====
@@ -154,15 +154,33 @@
bus_write_2(sc->mtl_text_res, offset, v);
}
+/*
+ * XXXRW: Work around a feature in which the default address of the text frame
+ * buffer is not initialised at reset as expected.
+ */
+#define TERASIC_MTL_TEXT_EXPECTED_ADDR 0x0177000
+static void
+terasic_mtl_text_workaround(struct terasic_mtl_softc *sc)
+{
+ uint32_t v;
+
+ terasic_mtl_reg_textframebufaddr_get(sc, &v);
+ if (v == TERASIC_MTL_TEXT_EXPECTED_ADDR)
+ return;
+ device_printf(sc->mtl_dev,
+ "%s: adjusting text frame buffer reg from 0x%x to 0x%x\n",
+ __func__, v, TERASIC_MTL_TEXT_EXPECTED_ADDR);
+ terasic_mtl_reg_textframebufaddr_set(sc,
+ TERASIC_MTL_TEXT_EXPECTED_ADDR);
+}
+
int
terasic_mtl_text_attach(struct terasic_mtl_softc *sc)
{
- /*
- * XXXRW: Work around a feature in which the default address of the
- * text frame buffer is not initialised at reset as expected.
- */
- terasic_mtl_reg_textframebufaddr_set(sc, 0x0177000);
+ /* XXXRW: To go away. */
+ terasic_mtl_text_workaround(sc);
+
sc->mtl_text_cdev = make_dev(&terasic_mtl_text_cdevsw, sc->mtl_unit,
UID_ROOT, GID_WHEEL, 0400, "mtl_text%d", sc->mtl_unit);
if (sc->mtl_text_cdev == NULL) {
From owner-p4-projects@FreeBSD.ORG Mon Apr 30 20:42:04 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 4CDC71065673; Mon, 30 Apr 2012 20:42:04 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 0F3AA106564A
for ; Mon, 30 Apr 2012 20:42:04 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id EA1098FC08
for ; Mon, 30 Apr 2012 20:42:03 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q3UKg3Zk025100
for ; Mon, 30 Apr 2012 20:42:03 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q3UKg3rC025097
for perforce@freebsd.org; Mon, 30 Apr 2012 20:42:03 GMT
(envelope-from rene@FreeBSD.org)
Date: Mon, 30 Apr 2012 20:42:03 GMT
Message-Id: <201204302042.q3UKg3rC025097@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210425 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 30 Apr 2012 20:42:04 -0000
http://p4web.freebsd.org/@@210425?ac=10
Change 210425 by rene@rene_acer on 2012/04/30 20:41:48
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#139 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#30 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#140 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#41 integrate
.. //depot/projects/docproj_nl/www/en/developers.sgml#76 integrate
.. //depot/projects/docproj_nl/www/en/releng/Makefile#2 integrate
.. //depot/projects/docproj_nl/www/en/releng/dst_info.sgml#2 delete
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#52 integrate
.. //depot/projects/docproj_nl/www/nl/features.sgml#7 integrate
.. //depot/projects/docproj_nl/www/nl/where.sgml#39 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#141 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#139 (text+ko) ====
@@ -1,4 +1,4 @@
-
+
@@ -4621,9 +4621,10 @@
- version-RELEASE-arch-docs.iso
+ &os;-version-RELEASE-arch-docs.iso
- The &os; documentation.
+ The &os; documentation. This image is
+ not available for &os; 8.X.
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#140 (text+ko) ====
@@ -1,7 +1,7 @@
packing list because the
package is generated by packing the files listed here. The
pathnames are relative to the installation prefix (usually
- /usr/local or
- /usr/X11R6). If you are using the
+ /usr/local. If you are using the
MANn variables
(as you should be), do not list any manpages here. If the
port creates directories during installation, make sure to
@@ -596,7 +595,7 @@
Get the original sources (normally) as a compressed
tarball
(foo.tar.gz or
- foo.tar.Z) and
+ foo.tar.bz2) and
copy it into DISTDIR. Always use
mainstream sources when and where you
can.
@@ -857,10 +856,7 @@
EXTRACT_AFTER_ARGS,
EXTRACT_SUFX, or
DISTFILES variables, depending on how alien
- a format your port's distribution file is. (The most common
- case is EXTRACT_SUFX=.tar.Z, when the
- tarball is condensed by regular compress,
- not gzip.)
+ a format your port's distribution file is.
In the worst case, you can simply create your own
do-extract target to override the
@@ -2547,13 +2543,14 @@
DISTNAME= foo
EXTRACT_SUFX= .tgz
- The USE_BZIP2 and
+ The USE_BZIP2,
+ USE_XZ and
USE_ZIP variables automatically set
EXTRACT_SUFX to
- .tar.bz2 or .zip as
- necessary. If neither of these are set then
- EXTRACT_SUFX defaults to
- .tar.gz.
+ .tar.bz2, .tar.xz
+ or .zip as necessary. If neither of
+ these are set then EXTRACT_SUFX
+ defaults to .tar.gz.
You never need to set both
@@ -3526,7 +3523,7 @@
The official search PATH used on the
ports build cluster is
- /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
+ /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
The dependency is checked from within the
@@ -5630,19 +5627,18 @@
are:
bigreqsproto compositeproto damageproto dmx
- dmxproto evieproto fixesproto fontcacheproto fontenc
- fontsproto fontutil glproto ice inputproto kbproto libfs
- oldx printproto randrproto recordproto renderproto
- resourceproto scrnsaverproto sm trapproto videoproto x11
- xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite
- xcursor xdamage xdmcp xevie xext xextproto
- xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto
- xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft
- xi xinerama xineramaproto xkbfile xkbui xmu xmuu
- xorg-server xp xpm xprintapputil xprintutil xpr oto
- xproxymngproto xrandr xrender xres xscrnsaver xt xtrans
- xtrap xtst xv xvmc xxf86dga xxf86misc
- xxf86vm.
+ dmxproto dri2proto evieproto fixesproto fontcacheproto
+ fontenc fontsproto fontutil glproto ice inputproto kbproto
+ libfs oldx pciaccess pixman printproto randrproto
+ recordproto renderproto resourceproto scrnsaverproto sm
+ trapproto videoproto x11 xau xaw xaw6 xaw7 xbitmaps
+ xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext
+ xextproto xf86bigfontproto xf86dgaproto xf86driproto
+ xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont
+ xfontcache xft xi xinerama xineramaproto xkbfile xkbui
+ xmu xmuu xorg-server xp xpm xprintapputil xprintutil
+ xproto xproxymngproto xrandr xrender xres xscrnsaver xt
+ xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm.
Always up-to-date list can be found in
/usr/ports/Mk/bsd.xorg.mk.
@@ -5662,7 +5658,7 @@
USE_GL= glu
- Many ports define USE_XLIB, which
+ Some ports define USE_XLIB, which
makes the port depend on all the 50 or so libraries. This
variable exists for backwards compatibility, as it predates
modular X.Org, and should not be used on new ports.
@@ -5686,13 +5682,6 @@
- USE_X_PREFIX
- Deprecated. Today it is equivalent to
- USE_XLIB and can be replaced by
- it freely.
-
-
-
XMKMF
Set to the path of xmkmf if
not in the PATH. Defaults to
@@ -5847,8 +5836,8 @@
Note that MOTIFLIB (usually) expands
- to -L/usr/X11R6/lib -lXm or
- /usr/X11R6/lib/libXm.a, so there is no
+ to -L/usr/local/lib -lXm or
+ /usr/local/lib/libXm.a, so there is no
need to add -L or -l
in front.
@@ -7026,7 +7015,7 @@
DEFAULT_PHP_VER
Selects which major version of PHP will be
installed as a dependency when no PHP is installed
- yet. Default is 4. Possible
+ yet. Default is 5. Possible
values: 4,
5
@@ -7164,9 +7153,9 @@
USE_PYTHON
The port needs Python. Minimal required version
can be specified with values such as
- 2.3+. Version ranges can also be
+ 2.6+. Version ranges can also be
specified, by separating two version numbers with a
- dash, e.g.: 2.1-2.3
+ dash, e.g.: 2.6-2.7
@@ -7243,7 +7232,7 @@
USE_ZOPE
Add dependency on Zope, a web application
- platform. Change Python dependency to Python 2.3.
+ platform. Change Python dependency to Python 2.7.
Set ZOPEBASEDIR containing a
directory with Zope installation.
@@ -8928,6 +8917,14 @@
90+ will cause the
port to depend on a minimum version of 9.0.
+
+
+ USE_SQLITE
+ If variable is set to yes, add
+ dependency on databases/sqlite3
+ port. The variable may also be set to values: 3, 2.
+
@@ -9630,10 +9627,7 @@
ECHO_MSG and ECHO_CMD
should be kept in mind. The former is for printing
informational text to the screen, while the latter is for
- command pipelining.
-
- A good example for both can be found in
- shells/bash2/Makefile:
+ command pipelining:
update-etc-shells:
@${ECHO_MSG} "updating /etc/shells"
@@ -15386,15 +15380,6 @@
- PORTOBJFORMAT
- The object format of the system
- (elf or aout;
- note that for modern
versions of
- FreeBSD, aout is
- deprecated.)
-
-
-
LOCALBASE
The base of the local
tree (e.g.,
/usr/local/)
@@ -15412,8 +15397,7 @@
If you have to define the variables
- USE_IMAKE,
- USE_X_PREFIX, or
+ USE_IMAKE or
MASTERDIR, do so before including
bsd.port.pre.mk.
@@ -15765,7 +15749,7 @@
ONLY_FOR_ARCHS= i386 amd64
- NOT_FOR_ARCHS= alpha ia64 sparc64
+ NOT_FOR_ARCHS= ia64 sparc64
A custom IGNORE message can be
set using ONLY_FOR_ARCHS_REASON and
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#41 (text+ko) ====
@@ -1,7 +1,7 @@
@@ -255,6 +255,7 @@
+
==== //depot/projects/docproj_nl/www/en/releng/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/releng/Makefile,v 1.3 2007/02/26 22:35:28 kensmith Exp $
+# $FreeBSD: www/en/releng/Makefile,v 1.4 2012/04/29 21:35:32 simon Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@@ -7,6 +7,6 @@
.include "../Makefile.inc"
.endif
-DOCS?= index.sgml charter.sgml dst_info.sgml
+DOCS?= index.sgml charter.sgml
.include "${WEB_PREFIX}/share/mk/web.site.mk"
==== //depot/projects/docproj_nl/www/en/releng/index.sgml#52 (text+ko) ====
@@ -1,6 +1,6 @@
-
+
@@ -20,8 +20,6 @@
engineering process.
- - Information about 2007
- Daylight Savings Time
- Upcoming Release Schedule
- Code Freeze Status
- Charter for the Release
==== //depot/projects/docproj_nl/www/nl/features.sgml#7 (text+ko) ====
@@ -1,5 +1,5 @@
+
]>
==== //depot/projects/docproj_nl/www/nl/where.sgml#39 (text+ko) ====
@@ -1,5 +1,5 @@
+
==== //depot/projects/docproj_nl/www/share/sgml/news.xml#141 (text+ko) ====
@@ -25,7 +25,7 @@
- $FreeBSD: www/share/sgml/news.xml,v 1.435 2012/04/22 17:47:05 jlh Exp $
+ $FreeBSD: www/share/sgml/news.xml,v 1.436 2012/04/30 17:34:57 issyl0 Exp $
@@ -34,6 +34,15 @@
4
+ 26
+
+
+
New committer:
+ Isabell Long (doc/www)
+
+
+
+
22
From owner-p4-projects@FreeBSD.ORG Mon Apr 30 20:50:47 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 3B8441065672; Mon, 30 Apr 2012 20:50:47 +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 F158A106564A
for ; Mon, 30 Apr 2012 20:50:46 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id DB89F8FC08
for ; Mon, 30 Apr 2012 20:50:46 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q3UKok7p025917
for ; Mon, 30 Apr 2012 20:50:46 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q3UKokJa025912
for perforce@freebsd.org; Mon, 30 Apr 2012 20:50:46 GMT
(envelope-from rene@FreeBSD.org)
Date: Mon, 30 Apr 2012 20:50:46 GMT
Message-Id: <201204302050.q3UKokJa025912@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210426 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 30 Apr 2012 20:50:47 -0000
http://p4web.freebsd.org/@@210426?ac=10
Change 210426 by rene@rene_acer on 2012/04/30 20:50:30
MFen handbook/install 1.446 -> 1.447
Affected files ...
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#41 edit
Differences ...
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#41 (text+ko) ====
@@ -4,7 +4,7 @@
$FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml,v 1.31 2012/03/20 22:24:56 rene Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/install/chapter.sgml
- %SRCID% 1.446
+ %SRCID% 1.447
-->
@@ -4846,9 +4846,10 @@
- versie-RELEASE-arch-docs.iso
+ &os;-versie-RELEASE-arch-docs.iso
- De &os; documentatie.
+ De &os; documentatie. Dit beeld is niet beschikbaar
+ voor &os; 8.X.
From owner-p4-projects@FreeBSD.ORG Mon Apr 30 23:08:35 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id DDF571065673; Mon, 30 Apr 2012 23:08:33 +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 9F7BD106566C
for ; Mon, 30 Apr 2012 23:08:33 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id 881F58FC12
for ; Mon, 30 Apr 2012 23:08:33 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q3UN8X9U052567
for ; Mon, 30 Apr 2012 23:08:33 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q3UN8WI1052564
for perforce@freebsd.org; Mon, 30 Apr 2012 23:08:32 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 30 Apr 2012 23:08:32 GMT
Message-Id: <201204302308.q3UN8WI1052564@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210432 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 30 Apr 2012 23:08:35 -0000
http://p4web.freebsd.org/@@210432?ac=10
Change 210432 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/04/30 23:08:01
Include support for ethernet, IPv4, IPv6, and NFS (including NFS
root file systems) in our FreeBSD kernel configurations for BERI.
No MAC driver yet, of course, but one thing at a time.
Affected files ...
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_MDROOT#7 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_SDROOT#7 edit
Differences ...
==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_MDROOT#7 (text+ko) ====
@@ -33,6 +33,11 @@
options FFS #Berkeley Fast Filesystem
+options INET
+options INET6
+options NFSCL
+options NFS_ROOT
+
# Debugging for use in -current
#options DEADLKRES #Enable the deadlock resolver
options INVARIANTS #Enable calls of extra sanity checking
@@ -55,6 +60,7 @@
device terasic_mtl
device md
+device ether
device loop
device random
device sc
==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_SDROOT#7 (text+ko) ====
@@ -32,6 +32,11 @@
options FFS #Berkeley Fast Filesystem
+options INET
+options INET6
+options NFSCL
+options NFS_ROOT
+
# Debugging for use in -current
#options DEADLKRES #Enable the deadlock resolver
options INVARIANTS #Enable calls of extra sanity checking
@@ -47,6 +52,7 @@
device terasic_mtl
device md
+device ether
device loop
device random
device sc
From owner-p4-projects@FreeBSD.ORG Wed May 2 07:19:35 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 4A06F1065674; Wed, 2 May 2012 07:19:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id F12A0106566B
for ; Wed, 2 May 2012 07:19:34 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id D95BC8FC18
for ; Wed, 2 May 2012 07:19:34 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q427JYPw043239
for ; Wed, 2 May 2012 07:19:34 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q427JYtt043236
for perforce@freebsd.org; Wed, 2 May 2012 07:19:34 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 2 May 2012 07:19:34 GMT
Message-Id: <201205020719.q427JYtt043236@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210509 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Wed, 02 May 2012 07:19:35 -0000
http://p4web.freebsd.org/@@210509?ac=10
Change 210509 by rwatson@rwatson_cinnamon on 2012/05/02 07:19:11
Clarify XXXRW about intimate knowledge of MIPS direct map segments
in the gxemul console driver.
Affected files ...
.. //depot/projects/ctsrd/beribsd/src/sys/dev/gxemul/cons/gxemul_cons.c#2 edit
Differences ...
==== //depot/projects/ctsrd/beribsd/src/sys/dev/gxemul/cons/gxemul_cons.c#2 (text+ko) ====
@@ -93,7 +93,8 @@
/*
* I/O routines lifted from Deimos.
*
- * XXXRW: Should be using FreeBSD's bus routines here.
+ * XXXRW: Should be using FreeBSD's bus routines here, but they are not
+ * available until later in the boot.
*/
#define MIPS_XKPHYS_UNCACHED_BASE 0x9000000000000000
From owner-p4-projects@FreeBSD.ORG Wed May 2 07:25:03 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 76E301065672; Wed, 2 May 2012 07:25:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 2E2E8106566C
for ; Wed, 2 May 2012 07:25:03 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id 120368FC08
for ; Wed, 2 May 2012 07:25:03 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q427P2Ho044988
for ; Wed, 2 May 2012 07:25:02 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q427P2vN044985
for perforce@freebsd.org; Wed, 2 May 2012 07:25:02 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 2 May 2012 07:25:02 GMT
Message-Id: <201205020725.q427P2vN044985@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210510 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Wed, 02 May 2012 07:25:03 -0000
http://p4web.freebsd.org/@@210510?ac=10
Change 210510 by rwatson@rwatson_cinnamon on 2012/05/02 07:24:27
Give gxemul its own board-specific machdep.c file, copied from BERI,
to prepare to merge an "oldtestmips" configuration upstream.
Affected files ...
.. //depot/projects/ctsrd/beribsd/src/sys/mips/gxemul/files.gxemul#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/gxemul/gxemul_machdep.c#1 branch
Differences ...
==== //depot/projects/ctsrd/beribsd/src/sys/mips/gxemul/files.gxemul#2 (text+ko) ====
@@ -1,5 +1,5 @@
# $FreeBSD$
dev/gxemul/cons/gxemul_cons.c optional gxemul_cons
-mips/beri/beri_machdep.c standard
+mips/gxemul/gxemul_machdep.c standard
mips/mips/intr_machdep.c standard
mips/mips/tick.c standard
From owner-p4-projects@FreeBSD.ORG Wed May 2 07:27:15 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 31FBB1065675; Wed, 2 May 2012 07:27:15 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id D93B1106567D
for ; Wed, 2 May 2012 07:27:14 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id C189F8FC17
for ; Wed, 2 May 2012 07:27:14 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q427REP8045069
for ; Wed, 2 May 2012 07:27:14 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q427REdB045066
for perforce@freebsd.org; Wed, 2 May 2012 07:27:14 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 2 May 2012 07:27:14 GMT
Message-Id: <201205020727.q427REdB045066@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210511 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Wed, 02 May 2012 07:27:15 -0000
http://p4web.freebsd.org/@@210511?ac=10
Change 210511 by rwatson@rwatson_cinnamon on 2012/05/02 07:26:52
Many of our comments about BERI (e.g., real-time clock, lack of a
board-level soft reset) also apply to gxemul, in their own way.
Affected files ...
.. //depot/projects/ctsrd/beribsd/src/sys/mips/gxemul/gxemul_machdep.c#2 edit
Differences ...
==== //depot/projects/ctsrd/beribsd/src/sys/mips/gxemul/gxemul_machdep.c#2 (text+ko) ====
@@ -118,7 +118,7 @@
/*
* Perform a board-level soft-reset.
*
- * XXXRW: BERI doesn't yet have a board-level soft-reset.
+ * XXXRW: Does gxemul have a moral equivalent to board-level reset?
*/
void
platform_reset(void)
@@ -160,8 +160,9 @@
mips_pcpu0_init();
/*
- * XXXRW: We have no way to compare wallclock time to cycle rate on
- * BERI, so for now assume we run at the MALTA default (100MHz).
+ * XXXRW: Support for the gxemul real-time clock required in order to
+ * usefully determine our emulated timer frequency. Go with something
+ * classic as the default in the mean time.
*/
platform_counter_freq = MIPS_DEFAULT_HZ;
mips_timer_early_init(platform_counter_freq);
From owner-p4-projects@FreeBSD.ORG Wed May 2 07:33:54 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 02FE7106567A; Wed, 2 May 2012 07:33:54 +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 B93381065678
for ; Wed, 2 May 2012 07:33:53 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id 889AE8FC12
for ; Wed, 2 May 2012 07:33:53 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q427XrCm046720
for ; Wed, 2 May 2012 07:33:53 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q427XrMW046713
for perforce@freebsd.org; Wed, 2 May 2012 07:33:53 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 2 May 2012 07:33:53 GMT
Message-Id: <201205020733.q427XrMW046713@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210514 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Wed, 02 May 2012 07:33:54 -0000
http://p4web.freebsd.org/@@210514?ac=10
Change 210514 by rwatson@rwatson_cinnamon on 2012/05/02 07:33:41
Lift std.beri and make it std.gxemul in an effort to prepare our
local FreeBSD gxemul oldtestmips support for upstreaming without
pushing BERI support upstream yet.
Affected files ...
.. //depot/projects/ctsrd/beribsd/src/sys/mips/gxemul/std.gxemul#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Wed May 2 08:26:27 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 85DCB106567B; Wed, 2 May 2012 08:26:26 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 419AD106566C
for ; Wed, 2 May 2012 08:26:26 +0000 (UTC)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id 298BF8FC0A
for ; Wed, 2 May 2012 08:26:26 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q428QPU5057452
for ; Wed, 2 May 2012 08:26:25 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q428QPkm057449
for perforce@freebsd.org; Wed, 2 May 2012 08:26:25 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 2 May 2012 08:26:25 GMT
Message-Id: <201205020826.q428QPkm057449@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210519 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Wed, 02 May 2012 08:26:27 -0000
http://p4web.freebsd.org/@@210519?ac=10
Change 210519 by rwatson@rwatson_cinnamon on 2012/05/02 08:25:57
As done recently in the Altera JTAG UART device driver, rename
the gxemul console device from a device-specific name to "ttyu0",
allowing it to be used with the default /etc/ttys on
FreeBSD/mips.
Affected files ...
.. //depot/projects/ctsrd/beribsd/src/sys/dev/gxemul/cons/gxemul_cons.c#3 edit
Differences ...
==== //depot/projects/ctsrd/beribsd/src/sys/dev/gxemul/cons/gxemul_cons.c#3 (text+ko) ====
@@ -218,7 +218,7 @@
gxemul_cons_cnprobe(struct consdev *cp)
{
- sprintf(cp->cn_name, "gxcons");
+ sprintf(cp->cn_name, "ttyu0");
cp->cn_pri = CN_NORMAL;
}
@@ -279,7 +279,7 @@
tp = tty_alloc(&gxemul_cons_ttydevsw, NULL);
tty_init_console(tp, 0);
- tty_makedev(tp, NULL, "%s", "gxcons");
+ tty_makedev(tp, NULL, "%s", "ttyu0");
callout_init(&gxemul_cons_callout, CALLOUT_MPSAFE);
callout_reset(&gxemul_cons_callout, gxemul_cons_polltime,
gxemul_cons_timeout, tp);
From owner-p4-projects@FreeBSD.ORG Thu May 3 17:21:40 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 28AD61065673; Thu, 3 May 2012 17:21: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 D7DFD106564A
for ; Thu, 3 May 2012 17:21:39 +0000 (UTC)
(envelope-from peter@wemm.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id BDCE48FC14
for ; Thu, 3 May 2012 17:21:39 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q43HLdHV054163
for ; Thu, 3 May 2012 17:21:39 GMT
(envelope-from peter@wemm.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q43HKwdZ053457
for perforce@freebsd.org; Thu, 3 May 2012 17:20:58 GMT
(envelope-from peter@wemm.org)
Date: Thu, 3 May 2012 17:20:58 GMT
Message-Id: <201205031720.q43HKwdZ053457@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
peter@wemm.org using -f
From: Peter Wemm
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210589 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Thu, 03 May 2012 17:21:40 -0000
http://p4web.freebsd.org/@@210589?ac=10
Change 210589 by peter@peter_daintree on 2012/05/03 17:20:51
IFC @210587
Affected files ...
.. //depot/projects/hammer/Makefile#67 integrate
.. //depot/projects/hammer/Makefile.inc1#168 integrate
.. //depot/projects/hammer/ObsoleteFiles.inc#90 integrate
.. //depot/projects/hammer/UPDATING#155 integrate
.. //depot/projects/hammer/bin/ps/ps.1#36 integrate
.. //depot/projects/hammer/bin/pwait/pwait.1#4 integrate
.. //depot/projects/hammer/bin/setfacl/setfacl.1#17 integrate
.. //depot/projects/hammer/bin/sh/jobs.c#25 integrate
.. //depot/projects/hammer/bin/sh/sh.1#45 integrate
.. //depot/projects/hammer/bin/stty/stty.1#10 integrate
.. //depot/projects/hammer/cddl/compat/opensolaris/include/stdlib.h#2 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs.8#10 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#13 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool.8#7 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#4 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/CHANGES#27 integrate
.. //depot/projects/hammer/contrib/bind9/COPYRIGHT#13 integrate
.. //depot/projects/hammer/contrib/bind9/FAQ.xml#12 integrate
.. //depot/projects/hammer/contrib/bind9/Makefile.in#9 integrate
.. //depot/projects/hammer/contrib/bind9/README#15 integrate
.. //depot/projects/hammer/contrib/bind9/RELEASE-NOTES-BIND-9.8.1.html#2 delete
.. //depot/projects/hammer/contrib/bind9/RELEASE-NOTES-BIND-9.8.1.pdf#2 delete
.. //depot/projects/hammer/contrib/bind9/RELEASE-NOTES-BIND-9.8.1.txt#2 delete
.. //depot/projects/hammer/contrib/bind9/acconfig.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/check-tool.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/check-tool.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.8#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.docbook#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.8#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.c#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.docbook#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/ddns-confgen.8#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/ddns-confgen.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/ddns-confgen.docbook#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/ddns-confgen.html#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/include/confgen/os.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/keygen.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/keygen.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/rndc-confgen.8#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/rndc-confgen.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/rndc-confgen.docbook#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/rndc-confgen.html#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/unix/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/unix/os.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/util.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/util.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/dig.1#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/dig.c#12 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/dig.docbook#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/dig.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/dighost.c#15 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/host.1#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/host.c#12 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/host.docbook#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/host.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/include/dig/dig.h#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.1#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.c#12 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.docbook#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8#4 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook#4 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html#4 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.8#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-revoke.8#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-revoke.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-revoke.docbook#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-revoke.html#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-settime.8#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-settime.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-settime.docbook#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-settime.html#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.8#13 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.c#14 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.html#13 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssectool.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssectool.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/Makefile.in#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/bind.keys.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/bind9.xsl#4 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/bind9.xsl.h#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/builtin.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/client.c#15 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/config.c#12 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/control.c#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/controlconf.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/convertxsl.pl#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/dlz/dlz_dlopen_driver.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/builtin.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/client.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/config.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/control.h#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/globals.h#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/interfacemgr.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/listenlist.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/log.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/logconf.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/lwaddr.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/lwdclient.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/lwresd.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/lwsearch.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/main.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/notify.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/ns_smf_globals.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/query.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/server.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/sortlist.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/statschannel.h#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/tkeyconf.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/tsigconf.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/types.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/update.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/xfrout.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/zoneconf.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/interfacemgr.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/listenlist.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/log.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/logconf.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwaddr.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwdclient.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwderror.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwdgabn.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwdgnba.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwdgrbn.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwdnoop.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.8#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.docbook#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwsearch.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/main.c#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/named.8#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.5#12 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.docbook#12 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.html#12 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/named.docbook#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/named.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/notify.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/query.c#15 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/server.c#16 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/sortlist.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/statschannel.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/tkeyconf.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/tsigconf.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/unix/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/unix/dlz_dlopen_driver.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/unix/include/named/os.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/unix/os.c#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/update.c#14 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/xfrout.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/zoneconf.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/nsupdate/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.1#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.c#13 integrate
.. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.docbook#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/include/rndc/os.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.8#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.c#13 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.5#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.docbook#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/util.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/util.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/arpaname.1#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/arpaname.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/arpaname.docbook#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/arpaname.html#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/genrandom.8#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/genrandom.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/genrandom.docbook#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/genrandom.html#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/isc-hmac-fixup.8#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/isc-hmac-fixup.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/isc-hmac-fixup.docbook#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/isc-hmac-fixup.html#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/named-journalprint.8#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/named-journalprint.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/named-journalprint.docbook#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/named-journalprint.html#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/nsec3hash.8#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/nsec3hash.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/nsec3hash.docbook#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/nsec3hash.html#2 integrate
.. //depot/projects/hammer/contrib/bind9/config.h.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/config.threads.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/configure.in#14 integrate
.. //depot/projects/hammer/contrib/bind9/doc/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM-book.xml#17 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch01.html#13 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch02.html#12 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch03.html#14 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch04.html#14 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch05.html#14 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch06.html#16 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch07.html#15 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch08.html#15 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch09.html#15 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch10.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.html#15 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.pdf#14 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Makefile.in#8 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/README-SGML#4 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/dnssec.xml#2 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/libdns.xml#2 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.arpaname.html#3 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.ddns-confgen.html#3 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.dig.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#7 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#7 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-keygen.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-revoke.html#3 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-settime.html#3 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-signzone.html#12 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.genrandom.html#3 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.host.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.isc-hmac-fixup.html#3 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkconf.html#12 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkzone.html#12 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-journalprint.html#3 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.named.html#12 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.nsec3hash.html#3 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.nsupdate.html#8 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc-confgen.html#12 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.conf.html#12 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.html#12 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/managed-keys.xml#2 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/pkcs11.xml#2 integrate
.. //depot/projects/hammer/contrib/bind9/doc/misc/Makefile.in#9 integrate
.. //depot/projects/hammer/contrib/bind9/doc/misc/dnssec#4 integrate
.. //depot/projects/hammer/contrib/bind9/doc/misc/format-options.pl#6 integrate
.. //depot/projects/hammer/contrib/bind9/doc/misc/ipv6#5 integrate
.. //depot/projects/hammer/contrib/bind9/doc/misc/migration#8 integrate
.. //depot/projects/hammer/contrib/bind9/doc/misc/migration-4to9#4 integrate
.. //depot/projects/hammer/contrib/bind9/doc/misc/options#10 integrate
.. //depot/projects/hammer/contrib/bind9/doc/misc/rfc-compliance#4 integrate
.. //depot/projects/hammer/contrib/bind9/doc/misc/roadmap#4 integrate
.. //depot/projects/hammer/contrib/bind9/doc/misc/sdb#4 integrate
.. //depot/projects/hammer/contrib/bind9/doc/misc/sort-options.pl#4 integrate
.. //depot/projects/hammer/contrib/bind9/isc-config.sh.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/bind9/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/bind9/api#13 integrate
.. //depot/projects/hammer/contrib/bind9/lib/bind9/check.c#15 integrate
.. //depot/projects/hammer/contrib/bind9/lib/bind9/getaddresses.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/bind9/include/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/bind9/include/bind9/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/bind9/include/bind9/check.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/bind9/include/bind9/version.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/bind9/version.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/Makefile.in#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/acache.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/acl.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/adb.c#12 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/api#21 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/byaddr.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/cache.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/callbacks.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/client.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/compress.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/db.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dbiterator.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dbtable.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/diff.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dispatch.c#14 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dlz.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dns64.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dnssec.c#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/ds.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dst_api.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dst_internal.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dst_lib.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dst_openssl.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dst_parse.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dst_parse.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dst_result.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/ecdb.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/forward.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/gen-unix.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/gen.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/gssapi_link.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/gssapictx.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/hmac_link.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/acache.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/acl.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/adb.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/bit.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/byaddr.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/cache.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/callbacks.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/cert.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/client.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/compress.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/db.h#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dbiterator.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dbtable.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/diff.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dispatch.h#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dlz.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dlz_dlopen.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dns64.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dnssec.h#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ds.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ecdb.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/events.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/fixedname.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/forward.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/iptable.h#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/journal.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/keydata.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/keyflags.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/keytable.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/keyvalues.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/lib.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/log.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/lookup.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/master.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/masterdump.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/message.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/name.h#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ncache.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/nsec.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/nsec3.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/opcode.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/order.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/peer.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/portlist.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/private.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rbt.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rcode.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdata.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdataclass.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdatalist.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdataset.h#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdataslab.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdatatype.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/request.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/resolver.h#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/result.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rootns.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rpz.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rriterator.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/sdb.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/sdlz.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/secalg.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/secproto.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/soa.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ssu.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/stats.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/tcpmsg.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/time.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/timer.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/tkey.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/tsec.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/tsig.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ttl.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/types.h#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/validator.h#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/version.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/view.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/xfrin.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/zone.h#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/zonekey.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/zt.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/dst.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/gssapi.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/lib.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/result.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/iptable.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/journal.c#12 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/key.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/keydata.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/keytable.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/lib.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/log.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/lookup.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/master.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/masterdump.c#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/message.c#12 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/name.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/ncache.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/nsec.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/nsec3.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/openssl_link.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/openssldh_link.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/openssldsa_link.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/opensslgost_link.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/opensslrsa_link.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/order.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/peer.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/portlist.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/private.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rbt.c#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb.c#15 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb64.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb64.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rcode.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/cert_37.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/cert_37.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/cname_5.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/cname_5.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dname_39.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dname_39.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ds_43.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ds_43.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/hip_55.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/hip_55.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/key_25.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/key_25.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/keydata_65533.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/loc_29.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/loc_29.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mb_7.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mb_7.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/md_3.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/md_3.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mf_4.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mf_4.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mg_8.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mg_8.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mr_9.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mr_9.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mx_15.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mx_15.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ns_2.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ns_2.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/null_10.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/null_10.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/opt_41.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/opt_41.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/proforma.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/proforma.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rp_17.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rp_17.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rt_21.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rt_21.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/sig_24.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/sig_24.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/soa_6.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/soa_6.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/spf_99.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/spf_99.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/txt_16.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/txt_16.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/x25_19.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/x25_19.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/a_1.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/a_1.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/px_26.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/px_26.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/rdatastructpre.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdatalist.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdatalist_p.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdataset.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdatasetiter.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdataslab.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/request.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/resolver.c#20 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/result.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rootns.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rpz.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rriterator.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/sdb.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/sdlz.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/soa.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/spnego.asn1#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/spnego.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/spnego.h#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/spnego_asn1.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/spnego_asn1.pl#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/ssu.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/ssu_external.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/stats.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/tcpmsg.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/time.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/timer.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/tkey.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/tsec.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/tsig.c#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/ttl.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/validator.c#19 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/version.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/view.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/xfrin.c#13 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/zone.c#13 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/zonekey.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/zt.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/dns/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/dns/include/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/dns/include/dns/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/dns/include/dst/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/irs/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/irs/include/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/irs/include/irs/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/include/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/include/isc/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/include/isc/bind9.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/nls/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/nothreads/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/nothreads/include/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/nothreads/include/isc/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/pthreads/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/pthreads/include/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/pthreads/include/isc/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/unix/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/unix/include/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/unix/include/isc/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isccfg/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isccfg/include/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/isccfg/include/isccfg/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/Makefile-postinstall.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/nsprobe.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/sample-async.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/sample-gai.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/sample-request.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/sample-update.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/sample.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/api#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/context.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/dnsconf.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/gai_strerror.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/getaddrinfo.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/getnameinfo.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/context.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/dnsconf.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/netdb.h.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/platform.h.in#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/resconf.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/types.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/version.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/resconf.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/irs/version.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/Makefile.in#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/alpha/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/alpha/include/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/api#14 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/app_api.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/assertions.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/backtrace-emptytbl.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/backtrace.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/base32.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/base64.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/bitstring.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/buffer.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/bufferlist.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/commandline.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/entropy.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/error.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/event.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/fsaccess.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/hash.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/heap.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/hex.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/hmacmd5.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/hmacsha.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/httpd.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/ia64/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/ia64/include/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/app.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/assertions.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/backtrace.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/base32.h#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/base64.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/bind9.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/bitstring.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/boolean.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/buffer.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/bufferlist.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/commandline.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/entropy.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/error.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/event.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/eventclass.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/file.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/formatcheck.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/fsaccess.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hash.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/heap.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hex.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hmacmd5.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hmacsha.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/httpd.h#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/interfaceiter.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/ipv6.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/iterated_hash.h#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lang.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lex.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lfsr.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lib.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/list.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/log.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/magic.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/md5.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/mem.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/msgcat.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/msgs.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/mutexblock.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/namespace.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/netaddr.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/netscope.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/ondestroy.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/os.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/parseint.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/platform.h.in#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/portset.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/print.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/quota.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/radix.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/random.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/ratelimiter.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/refcount.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/region.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/resource.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/result.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/resultclass.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/rwlock.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/serial.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/sha1.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/sha2.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/sockaddr.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/socket.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/stats.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/stdio.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/stdlib.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/string.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/symtab.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/task.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/taskpool.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/timer.h#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/types.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/util.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/version.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/xml.h#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/inet_aton.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/inet_ntop.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/inet_pton.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/iterated_hash.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/lex.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/lfsr.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/lib.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/log.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/md5.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/mem.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/mem_api.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/mips/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/mips/include/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/mips/include/isc/atomic.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/mutexblock.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/netaddr.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/netscope.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/nls/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/nls/msgcat.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/noatomic/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/noatomic/include/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/condition.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/include/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/include/isc/once.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/include/isc/thread.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/mutex.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/thread.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/ondestroy.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/parseint.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/portset.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/powerpc/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/powerpc/include/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/print.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/condition.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/include/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/include/isc/condition.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/include/isc/once.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/include/isc/thread.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/mutex.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/thread.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/quota.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/radix.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/random.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/ratelimiter.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/refcount.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/region.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/result.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/rwlock.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/serial.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/sha1.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/sha2.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/sockaddr.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/socket_api.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/sparc64/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/sparc64/include/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/stats.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/string.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/strtoul.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/symtab.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/task.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/task_api.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/task_p.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/taskpool.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/timer.c#12 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/timer_api.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/timer_p.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/app.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/dir.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/entropy.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/errno2result.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/errno2result.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/file.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/fsaccess.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/dir.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/int.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/keyboard.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/net.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/netdb.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/offset.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/stat.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/stdtime.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/strerror.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/syslog.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/time.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/interfaceiter.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/ipv6.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/keyboard.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/net.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/os.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/resource.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket.c#15 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket_p.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/stdio.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/stdtime.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/strerror.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/syslog.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/time.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/version.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/x86_32/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/x86_32/include/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/x86_64/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/x86_64/include/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/alist.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/api#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/base64.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/cc.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/ccmsg.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/alist.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/base64.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/cc.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/ccmsg.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/events.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/lib.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/result.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/sexpr.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/symtab.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/symtype.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/types.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/util.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/version.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/lib.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/result.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/sexpr.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/symtab.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/version.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/aclconf.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/api#13 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/dnsconf.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/dnsconf.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/log.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/version.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/log.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/namedconf.c#12 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/parser.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/version.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/api#12 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/assert_p.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/context.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/context_p.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/gai_strerror.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/getaddrinfo.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/gethost.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/getipnode.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/getnameinfo.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/getrrset.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/herror.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/context.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/int.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/ipv6.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/lang.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/list.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/lwpacket.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/lwres.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/platform.h.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/result.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/stdlib.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/version.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/lwbuffer.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/lwconfig.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/lwinetaton.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/lwinetntop.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/lwinetpton.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/lwpacket.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/lwres_gabn.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/lwres_gnba.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/lwres_grbn.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/lwres_noop.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/lwresutil.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_buffer.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_buffer.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_config.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_config.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_config.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_context.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_context.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_context.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gabn.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gabn.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gethostent.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gethostent.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getipnode.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getipnode.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gnba.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gnba.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_inetntop.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_inetntop.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_noop.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_noop.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_noop.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_packet.3#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_packet.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_packet.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_resutil.3#9 integrate
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sat May 5 09:27:43 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id EC3751065670; Sat, 5 May 2012 09:27:42 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id A5BB0106566B
for ; Sat, 5 May 2012 09:27:42 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id 8DF8E8FC14
for ; Sat, 5 May 2012 09:27:42 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q459RgBC048189
for ; Sat, 5 May 2012 09:27:42 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q459Rguh048186
for perforce@freebsd.org; Sat, 5 May 2012 09:27:42 GMT
(envelope-from rene@FreeBSD.org)
Date: Sat, 5 May 2012 09:27:42 GMT
Message-Id: <201205050927.q459Rguh048186@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210671 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sat, 05 May 2012 09:27:43 -0000
http://p4web.freebsd.org/@@210671?ac=10
Change 210671 by rene@rene_acer on 2012/05/05 09:26:37
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#37 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#141 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#42 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/des.key#6 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/gjb.key#2 integrate
.. //depot/projects/docproj_nl/www/en/donations/donors.sgml#46 integrate
.. //depot/projects/docproj_nl/www/en/projects/netperf/cluster.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/releng/Makefile#3 integrate
.. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#25 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#37 (text+ko) ====
@@ -1,6 +1,6 @@
@@ -189,11 +189,12 @@
&prompt.root; pkg_add -r firefox
- This will install Firefox 10.0,
- if you want to run Firefox 3.6,
- use instead:
+ This will install the latest release version of
+ Firefox,
+ if you want to run Firefox
+ Extended Support Release (ESR) version, use instead:
- &prompt.root; pkg_add -r firefox36
+ &prompt.root; pkg_add -r firefox-esr
You can also use the Ports Collection if you
prefer to compile from source code:
@@ -201,9 +202,9 @@
&prompt.root; cd /usr/ports/www/firefox
&prompt.root; make install clean
- For Firefox 3.6, in the
+ For Firefox ESR, in the
previous command replace firefox with
- firefox36.
+ firefox-esr.
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#141 (text+ko) ====
@@ -1,7 +1,7 @@
10-CURRENT import of LLVM/Clang 3.1 trunk r154661
(rev 234353).
+
+
+ 1000012
+ May 2, 2012
+ 10-CURRENT jemalloc import
+ (rev 234924).
+
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#42 (text+ko) ====
@@ -1,7 +1,7 @@
+
uid Dag-Erling Smørgrav
+uid Dag-Erling Smørgrav
uid [jpeg image of size 3315]
-sub 2048g/920C3313 2006-11-11 [expires: 2011-05-31]
+sub 2048g/920C3313 2006-11-11 [expires: 2012-12-31]
]]>
==== //depot/projects/docproj_nl/share/pgpkeys/gjb.key#2 (text+ko) ====
@@ -1,14 +1,13 @@
-
+
uid Glen Barber
-uid Glen Barber
uid Glen Barber
-uid Glen Barber
sub 2048R/6C0527E5 2010-08-03
]]>
==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#46 (text+ko) ====
@@ -1,6 +1,6 @@
-
+
%developers;
@@ -2883,6 +2883,25 @@
tabthorpe |
received |
+
+
+ Anton Shterenlikht |
+ Linksys WPC11 ver.3 (no driver)
+ US Robotics USR5410 (Texas Instruments, no driver)
+ Cisco Aironet 350 (no driver)
+ Linksys WPC54G ver3.1 (Broadcom BCM4318, bwi(4))
+ NEC CMZ-RT-WP (NEC CMZ-RT-WP, wi(4), unsupported)
+ Netgear WG111v2 (Realtek RTL8187L, urtw(4)) |
+ adrian |
+ received |
+
+
+
+ Garrett Cooper |
+ Macbook 2.2GHz Santa Rosa |
+ marcel |
+ received |
+
&footer;
==== //depot/projects/docproj_nl/www/en/projects/netperf/cluster.sgml#2 (text+ko) ====
@@ -1,6 +1,6 @@
-
+
@@ -82,6 +82,9 @@
Intel Corporation, who
have donated two 10gbps network cards.
+ Meinberg, who
+ have donated a LANTIME M600 IEEE 1588 Grandmaster Clock.
+
&a.gnn;, who has donated a quad-core AMD test
system.
==== //depot/projects/docproj_nl/www/en/releng/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/releng/Makefile,v 1.4 2012/04/29 21:35:32 simon Exp $
+# $FreeBSD: www/en/releng/Makefile,v 1.5 2012/05/03 16:02:43 eadler Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@@ -7,6 +7,6 @@
.include "../Makefile.inc"
.endif
-DOCS?= index.sgml charter.sgml
+DOCS?= index.sgml charter.sgml dst_info.sgml
.include "${WEB_PREFIX}/share/mk/web.site.mk"
==== //depot/projects/docproj_nl/www/share/sgml/advisories.xml#25 (text+ko) ====
@@ -2,11 +2,27 @@
- $FreeBSD: www/share/sgml/advisories.xml,v 1.245 2011/12/23 15:46:20 cperciva Exp $
+ $FreeBSD: www/share/sgml/advisories.xml,v 1.246 2012/05/03 16:02:28 bz Exp $
+ 2012
+
+
+ 5
+
+
+ 3
+
+
+ FreeBSD-SA-12:01.openssl
+
+
+
+
+
+
2011
From owner-p4-projects@FreeBSD.ORG Sat May 5 09:41:59 2012
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 595A51065677; Sat, 5 May 2012 09:41:59 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 132591065673
for ; Sat, 5 May 2012 09:41:59 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id F04DD8FC16
for ; Sat, 5 May 2012 09:41:58 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q459fw3E051739
for ; Sat, 5 May 2012 09:41:58 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q459fwHo051736
for perforce@freebsd.org; Sat, 5 May 2012 09:41:58 GMT
(envelope-from rene@FreeBSD.org)
Date: Sat, 5 May 2012 09:41:58 GMT
Message-Id: <201205050941.q459fwHo051736@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 210674 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sat, 05 May 2012 09:41:59 -0000
http://p4web.freebsd.org/@@210674?ac=10
Change 210674 by rene@rene_acer on 2012/05/05 09:41:31
MFen handbook/desktop 1.129 -> 1.130
Affected files ...
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#63 edit
Differences ...
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#63 (text+ko) ====
@@ -4,7 +4,7 @@
$FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.43 2012/04/15 10:36:30 rene Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
- %SRCID% 1.129
+ %SRCID% 1.130
-->
@@ -216,11 +216,11 @@
&prompt.root; pkg_add -r firefox
- Dit zal Firefox 10.0 installeren,
- als u in plaats hiervan Firefox 3.6
- wilt draaien, gebruik dan:
+ Dit zal de laatste uitgave van Firefox
+ installeren, als u in plaats hiervan de Extended Support Release (ESR)
+ van Firefox wilt draaien, gebruik dan:
- &prompt.root; pkg_add -r firefox36
+ &prompt.root; pkg_add -r firefox-esr
De Portscollectie kan ook gebruikt worden als u liever
vanuit de broncode installeert.
@@ -228,9 +228,9 @@
&prompt.root; cd /usr/ports/www/firefox
&prompt.root; make install clean
- Voor Firefox 3.6 dient
+ Voor Firefox ESR dient
firefox in het vorige commando vervangen te
- worden door firefox36.
+ worden door firefox-esr.