PERFORCE change 109338 for review
John Birrell
jb at FreeBSD.org
Mon Nov 6 05:51:29 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=109338
Change 109338 by jb at jb_freebsd8 on 2006/11/06 05:51:01
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#33 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#8 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#6 integrate
.. //depot/projects/dtrace/ports/GIDs#8 integrate
.. //depot/projects/dtrace/ports/MOVED#29 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#11 integrate
.. //depot/projects/dtrace/ports/UIDs#9 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#15 integrate
.. //depot/projects/dtrace/src/contrib/bind9/CHANGES#5 integrate
.. //depot/projects/dtrace/src/contrib/bind9/bin/named/query.c#5 integrate
.. //depot/projects/dtrace/src/contrib/bind9/configure.in#4 integrate
.. //depot/projects/dtrace/src/contrib/bind9/lib/dns/opensslrsa_link.c#4 integrate
.. //depot/projects/dtrace/src/contrib/bind9/lib/dns/resolver.c#5 integrate
.. //depot/projects/dtrace/src/contrib/bind9/version#5 integrate
.. //depot/projects/dtrace/src/lib/libc/net/gethostbyname.3#6 integrate
.. //depot/projects/dtrace/src/lib/libc/net/resolver.3#5 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/clock_gettime.2#5 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#23 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_cond_init.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_create.3#6 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_mutex_init.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man9/VOP_REMOVE.9#4 integrate
.. //depot/projects/dtrace/src/share/man/man9/VOP_RENAME.9#4 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.sys.mk#6 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/DEFAULTS#8 integrate
.. //depot/projects/dtrace/src/sys/boot/Makefile#7 integrate
.. //depot/projects/dtrace/src/sys/boot/efi/include/efilib.h#5 integrate
.. //depot/projects/dtrace/src/sys/boot/efi/libefi/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/boot/efi/libefi/bootinfo.c#5 delete
.. //depot/projects/dtrace/src/sys/boot/efi/libefi/copy.c#4 delete
.. //depot/projects/dtrace/src/sys/boot/efi/libefi/devicename.c#5 delete
.. //depot/projects/dtrace/src/sys/boot/efi/libefi/efiboot.h#5 delete
.. //depot/projects/dtrace/src/sys/boot/efi/libefi/efifpswa.c#4 delete
.. //depot/projects/dtrace/src/sys/boot/efi/libefi/efifs.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/efi/libefi/efinet.c#4 integrate
.. //depot/projects/dtrace/src/sys/boot/efi/libefi/elf_freebsd.c#4 delete
.. //depot/projects/dtrace/src/sys/boot/efi/libefi/errno.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/efi/libefi/handles.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/efi/libefi/module.c#4 delete
.. //depot/projects/dtrace/src/sys/boot/efi/libefi/time.c#4 integrate
.. //depot/projects/dtrace/src/sys/boot/ia64/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/boot/ia64/common/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/boot/ia64/common/autoload.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/ia64/common/bootinfo.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/ia64/common/copy.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/ia64/common/devicename.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/ia64/common/exec.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/ia64/common/libia64.h#1 branch
.. //depot/projects/dtrace/src/sys/boot/ia64/efi/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/boot/ia64/efi/conf.c#4 integrate
.. //depot/projects/dtrace/src/sys/boot/ia64/efi/efimd.c#4 integrate
.. //depot/projects/dtrace/src/sys/boot/ia64/efi/main.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/ia64/efi/version#4 integrate
.. //depot/projects/dtrace/src/sys/boot/ia64/ski/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/boot/ia64/ski/bootinfo.c#5 delete
.. //depot/projects/dtrace/src/sys/boot/ia64/ski/copy.c#4 delete
.. //depot/projects/dtrace/src/sys/boot/ia64/ski/devicename.c#5 delete
.. //depot/projects/dtrace/src/sys/boot/ia64/ski/efi_stub.c#4 integrate
.. //depot/projects/dtrace/src/sys/boot/ia64/ski/elf_freebsd.c#4 delete
.. //depot/projects/dtrace/src/sys/boot/ia64/ski/libski.h#5 integrate
.. //depot/projects/dtrace/src/sys/boot/ia64/ski/main.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/ia64/ski/skifs.c#4 integrate
.. //depot/projects/dtrace/src/sys/boot/ia64/ski/skimd.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/ia64/ski/version#4 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci.c#11 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_node.c#4 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_smb.c#4 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vnops.c#4 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/DEFAULTS#8 integrate
.. //depot/projects/dtrace/src/sys/ia64/conf/DEFAULTS#9 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#16 integrate
.. //depot/projects/dtrace/src/sys/net/if_bridge.c#16 integrate
.. //depot/projects/dtrace/src/sys/net/if_tap.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_bsd_addr.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_crc32.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_indata.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_input.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_timer.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_uio.h#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctputil.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctputil.h#2 integrate
.. //depot/projects/dtrace/src/sys/netinet6/sctp6_usrreq.c#2 integrate
.. //depot/projects/dtrace/src/sys/netsmb/smb_subr.c#4 integrate
.. //depot/projects/dtrace/src/sys/pc98/conf/DEFAULTS#8 integrate
.. //depot/projects/dtrace/src/sys/powerpc/conf/DEFAULTS#7 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_arg.c#6 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_private.h#5 integrate
.. //depot/projects/dtrace/src/sys/sparc64/conf/DEFAULTS#7 integrate
.. //depot/projects/dtrace/src/sys/sun4v/conf/DEFAULTS#7 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#10 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/faq216.sgml#4 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#9 integrate
.. //depot/projects/dtrace/www/tools/portsgrowth/ports.log#5 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#33 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.633 2006/11/02 09:39:25 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.635 2006/11/05 20:58:19 alepulver Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -2346,6 +2346,11 @@
</listitem>
<listitem>
+ <para>Dominic Fandrey
+ <email>lon_kamikaze at gmx.de</email></para>
+ </listitem>
+
+ <listitem>
<para>Dominic Marks
<email>dominic_marks at btinternet.com</email></para>
</listitem>
@@ -7247,6 +7252,11 @@
</listitem>
<listitem>
+ <para>Pawel Pekala
+ <email>c0rn at o2.pl</email></para>
+ </listitem>
+
+ <listitem>
<para>Pawel Worach
<email>pawel.worach at gmail.com</email></para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.45 2006/01/05 20:03:35 delphij Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.46 2006/11/05 18:32:05 keramida Exp $
-->
<chapter id="sgml-primer">
@@ -360,9 +360,9 @@
<programlisting>SGML_ROOT=/usr/local/share/sgml
SGML_CATALOG_FILES=${SGML_ROOT}/jade/catalog
+SGML_CATALOG_FILES=${SGML_ROOT}/docbook/4.1/catalog:$SGML_CATALOG_FILES
+SGML_CATALOG_FILES=${SGML_ROOT}/html/catalog:$SGML_CATALOG_FILES
SGML_CATALOG_FILES=${SGML_ROOT}/iso8879/catalog:$SGML_CATALOG_FILES
-SGML_CATALOG_FILES=${SGML_ROOT}/html/catalog:$SGML_CATALOG_FILES
-SGML_CATALOG_FILES=${SGML_ROOT}/docbook/4.1/catalog:$SGML_CATALOG_FILES
SGML_CATALOG_FILES=/usr/doc/share/sgml/catalog:$SGML_CATALOG_FILES
SGML_CATALOG_FILES=/usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATALOG_FILES
export SGML_CATALOG_FILES</programlisting>
@@ -374,9 +374,9 @@
<programlisting>setenv SGML_ROOT /usr/local/share/sgml
setenv SGML_CATALOG_FILES ${SGML_ROOT}/jade/catalog
+setenv SGML_CATALOG_FILES ${SGML_ROOT}/docbook/4.1/catalog:$SGML_CATALOG_FILES
+setenv SGML_CATALOG_FILES ${SGML_ROOT}/html/catalog:$SGML_CATALOG_FILES
setenv SGML_CATALOG_FILES ${SGML_ROOT}/iso8879/catalog:$SGML_CATALOG_FILES
-setenv SGML_CATALOG_FILES ${SGML_ROOT}/html/catalog:$SGML_CATALOG_FILES
-setenv SGML_CATALOG_FILES ${SGML_ROOT}/docbook/4.1/catalog:$SGML_CATALOG_FILES
setenv SGML_CATALOG_FILES /usr/doc/share/sgml/catalog:$SGML_CATALOG_FILES
setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATALOG_FILES</programlisting>
</example>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#4 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.145 2006/05/30 23:08:23 trhodes Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.146 2006/11/05 18:40:13 trhodes Exp $
-->
<chapter id="basics">
@@ -1209,11 +1209,8 @@
<entry><literal>d</literal></entry>
<entry>Partition <literal>d</literal> used to have a special
- meaning associated with it, although that is now gone. To
- this day, some tools may operate oddly if told to work on
- partition <literal>d</literal>, so
- <application>sysinstall</application> will not normally create
- partition <literal>d</literal>.</entry>
+ meaning associated with it, although that is now gone and
+ <literal>d</literal> may work as any normal partition.</entry>
</row>
</tbody>
</tgroup>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#8 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.265 2006/08/25 19:12:37 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.267 2006/11/05 00:49:34 trhodes Exp $
-->
<chapter id="disks">
@@ -3414,7 +3414,7 @@
unauthorized data access. File permissions and Mandatory
Access Control (MAC) (see <xref linkend="mac">) help prevent
unauthorized third-parties from accessing data while the operating
- system is active and the computer is powered up. However,
+ system is active and the computer is powered up. However,
the permissions enforced by the operating system are irrelevant if an
attacker has physical access to a computer and can simply move
the computer's hard drive to another system to copy and analyze
@@ -3428,7 +3428,7 @@
highly-motivated attackers with significant resources. Unlike
cumbersome encryption methods that encrypt only individual files,
<command>gbde</command> and <command>geli</command> transparently
- encrypt entire file systems. No cleartext ever touches the hard
+ encrypt entire file systems. No cleartext ever touches the hard
drive's platter.</para>
<sect2>
@@ -3458,6 +3458,17 @@
<para>Reboot into the new kernel.</para>
</step>
+
+ <step>
+ <para>An alternative to recompiling the kernel is to use
+ <command>kldload</command> to load &man.gbde.4;:</para>
+
+ <screen>&prompt.root; <userinput>kldload geom_bde</userinput></screen>
+
+ <para>At this time there is no option in
+ <filename>/boot/loader.conf</filename>
+ to load the kernel module at boot time.</para>
+ </step>
</procedure>
<sect3>
@@ -3478,7 +3489,7 @@
<para>Install the new drive to the system as explained in <xref
linkend="disks-adding">. For the purposes of this example,
a new hard drive partition has been added as
- <filename>/dev/ad4s1c</filename>. The
+ <filename>/dev/ad4s1c</filename>. The
<filename>/dev/ad0s1<replaceable>*</replaceable></filename>
devices represent existing standard FreeBSD partitions on
the example system.</para>
@@ -3670,11 +3681,11 @@
<para>It is possible to create a script to automatically attach,
check, and mount an encrypted partition, but for security reasons
- the script should not contain the &man.gbde.8; password. Instead,
+ the script should not contain the &man.gbde.8; password. Instead,
it is recommended that such scripts be run manually while
providing the password via the console or &man.ssh.1;.</para>
- <para>As of &os; 5.2-RELEASE, there is a new <filename>rc.d</filename> script
+ <para>As an alternative, an <filename>rc.d</filename> script is
provided. Arguments for this script can be passed via
&man.rc.conf.5;, for example:</para>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#6 (text+ko) ====
@@ -1,5 +1,5 @@
<!--
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml,v 1.33 2006/10/22 20:01:44 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml,v 1.35 2006/11/05 09:22:09 danger Exp $
-->
<preface id="book-preface">
@@ -37,7 +37,7 @@
<listitem>
<para><xref linkend="config-tuning">, Configuration and
Tuning, has been expanded with new information about the
- ACPI power and resource management, the cron system utility,
+ ACPI power and resource management, the <command>cron</command> system utility,
and more kernel tuning options.</para>
</listitem>
@@ -77,16 +77,16 @@
<listitem>
<para><xref linkend="mail">, Electronic Mail, has been
expanded with new information about using alternative
- transport agents, SMTP authentication, UUCP, fetchmail,
- procmail, and other advanced topics.</para>
+ transport agents, SMTP authentication, UUCP, <application>fetchmail</application>,
+ <application>procmail</application>, and other advanced topics.</para>
</listitem>
<listitem>
<para><xref linkend="network-servers">, Network Servers, is
all new with this edition. This chapter includes
- information about setting up the Apache HTTP Server, FTPd,
- and setting up a server for Microsoft Windows clients with
- Samba. Some sections from <xref
+ information about setting up the <application>Apache HTTP Server</application>, <application>ftpd</application>,
+ and setting up a server for µsoft; &windows; clients with
+ <application>Samba</application>. Some sections from <xref
linkend="advanced-networking">, Advanced Networking, were
moved here to improve the presentation.</para>
</listitem>
@@ -94,7 +94,7 @@
<listitem>
<para><xref linkend="advanced-networking">, Advanced
Networking, has been expanded with new information about
- using Bluetooth devices with FreeBSD, setting up wireless
+ using &bluetooth; devices with FreeBSD, setting up wireless
networks, and Asynchronous Transfer Mode (ATM)
networking.</para>
</listitem>
==== //depot/projects/dtrace/ports/GIDs#8 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: ports/GIDs,v 1.14 2006/11/04 00:30:02 rafan Exp $
+$FreeBSD: ports/GIDs,v 1.15 2006/11/05 17:07:03 alepulver Exp $
# Please keep this file sorted by GID!
bind:*:53:
rdfdb:*:55:
@@ -84,6 +84,7 @@
realtime:*:557:
avahi:*:558:
tacacs:*:559:
+_xsi:*:600:
bnetd:*:700:
bopm:*:717:
openxpki:*:777:
==== //depot/projects/dtrace/ports/MOVED#29 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1174 2006/11/01 15:36:54 leeym Exp $
+# $FreeBSD: ports/MOVED,v 1.1176 2006/11/05 17:55:55 alepulver Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -2514,3 +2514,5 @@
www/firefox-devel|www/firefox|2006-11-01|Firefox 2.0 is now stable
graphics/php4-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion
graphics/php5-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion
+chinese/xcin25|chinese/xcin|2006-11-05|Reflect its real portname
+mail/nail|mail/heirloom-mailx|2006-11-05|Project name changed
==== //depot/projects/dtrace/ports/Mk/bsd.sites.mk#11 (text+ko) ====
@@ -20,7 +20,7 @@
#
# Note: all entries should terminate with a slash.
#
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.400 2006/10/07 17:47:05 dinoex Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.401 2006/11/05 12:27:42 sat Exp $
#
# Where to put distfiles that don't have any other master site
@@ -964,7 +964,7 @@
.endif
.if !defined(IGNORE_MASTER_SITE_SOURCEFORGE)
-.for mirror in heanet nchc kent easynews ufpr jaist umn
+.for mirror in heanet nchc kent easynews ufpr umn
MASTER_SITE_SOURCEFORGE+= \
http://${mirror}.dl.sourceforge.net/sourceforge/%SUBDIR%/
.endfor
@@ -973,7 +973,7 @@
# official sf.net mirrors that don't mirror all projects, check
# http://prdownloads.sourceforge.net/%SUBDIR%/
.if !defined(IGNORE_MASTER_SITE_SOURCEFORGE_EXTENDED)
-.for mirror in easynews switch puzzle ovh peterhost citkit keihanna
+.for mirror in easynews switch puzzle belnet osdn ovh keihanna
MASTER_SITE_SOURCEFORGE_EXTENDED+= \
http://${mirror}.dl.sourceforge.net/sourceforge/%SUBDIR%/
.endfor
==== //depot/projects/dtrace/ports/UIDs#9 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: ports/UIDs,v 1.16 2006/11/04 00:30:02 rafan Exp $
+$FreeBSD: ports/UIDs,v 1.17 2006/11/05 17:07:03 alepulver Exp $
# Please keep this file sorted by UID!
bind:*:53:53:Bind Sandbox:/:/sbin/nologin
majordom:*:54:54:Majordomo Pseudo User:/usr/local/majordomo:/nonexistent
@@ -95,6 +95,7 @@
messagebus:*:556:556:D-BUS Daemon User:/nonexistent:/sbin/nologin
avahi:*:558:558:Avahi Daemon User:/nonexistent:/sbin/nologin
tacacs:*:559:559:TACACS+ Daemon User:/nonexistent:/sbin/nologin
+_xsi:*:600:600:XMLSysInfo User:/nonexistent:/sbin/nologin
bnetd:*:700:700:Bnetd user:/nonexistent:/sbin/nologin
bopm:*:717:717:Blitzed Open Proxy Monitor:/nonexistent:/bin/sh
openxpki:*:777:777:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin
==== //depot/projects/dtrace/src/ObsoleteFiles.inc#15 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.57 2006/10/31 21:05:35 jmg Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.58 2006/11/05 00:39:56 trhodes Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -183,6 +183,17 @@
# 20041109: replaced by em(4)
OLD_FILES+=usr/share/man/man4/gx.4.gz
OLD_FILES+=usr/share/man/man4/if_gx.4.gz
+# 20041017: rune interface removed
+OLD_FILES+=usr/include/rune.h
+OLD_FILES+=usr/share/man/man3/fgetrune.3.gz
+OLD_FILES+=usr/share/man/man3/fputrune.3.gz
+OLD_FILES+=usr/share/man/man3/fungetrune.3.gz
+OLD_FILES+=usr/share/man/man3/mbrrune.3.gz
+OLD_FILES+=usr/share/man/man3/mbrune.3.gz
+OLD_FILES+=usr/share/man/man3/rune.3.gz
+OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz
+OLD_FILES+=usr/share/man/man3/sgetrune.3.gz
+OLD_FILES+=usr/share/man/man3/sputrune.3.gz
# 20040925: bind9 import
OLD_FILES+=usr/bin/dnskeygen
OLD_FILES+=usr/bin/dnsquery
==== //depot/projects/dtrace/src/contrib/bind9/CHANGES#5 (text+ko) ====
@@ -1,4 +1,19 @@
+ --- 9.3.2-P2 released ---
+
+2090. [port] win32: Visual C++ 2005 command line manifest support.
+ [RT #16417]
+
+2089. [security] Raise the minimum safe OpenSSL versions to
+ OpenSSL 0.9.7l and OpenSSL 0.9.8d. Versions
+ prior to these have known security flaws which
+ are (potentially) exploitable in named. [RT #16391]
+
+2088. [security] Change the default RSA exponent from 3 to 65537.
+ [RT #16391]
+
+2083. [port] win32: Visual C++ 2005 support.
+
--- 9.3.2-P1 released ---
2066. [security] Handle SIG queries gracefully. [RT #16300]
==== //depot/projects/dtrace/src/contrib/bind9/bin/named/query.c#5 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: query.c,v 1.198.2.13.4.36.6.1 2006/08/17 07:12:31 marka Exp $ */
+/* $Id: query.c,v 1.198.2.13.4.36.6.2 2006/10/04 07:06:01 marka Exp $ */
#include <config.h>
==== //depot/projects/dtrace/src/contrib/bind9/configure.in#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1998-2003 Internet Software Consortium.
#
# Permission to use, copy, modify, and distribute this software for any
@@ -18,7 +18,7 @@
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl
-AC_REVISION($Revision: 1.294.2.23.2.51 $)
+AC_REVISION($Revision: 1.294.2.23.2.51.4.3 $)
AC_INIT(lib/dns/name.c)
AC_PREREQ(2.13)
@@ -357,6 +357,7 @@
#
# was --with-openssl specified?
#
+OPENSSL_WARNING=
AC_MSG_CHECKING(for OpenSSL library)
AC_ARG_WITH(openssl,
[ --with-openssl[=PATH] Build with OpenSSL [yes|no|path].
@@ -462,51 +463,38 @@
[AC_MSG_RESULT(assuming it does work on target platform)]
)
-#
-# OpenSSLDie is new with CERT CS-2002-23. If we see it we have may
-# have a patched library otherwise check that we are greater than
-# the fixed versions
-#
- AC_CHECK_FUNC(OpenSSLDie,
+AC_ARG_ENABLE(openssl-version-check,
+[AC_HELP_STRING([--enable-openssl-version-check],
+ [Check OpenSSL Version @<:@default=yes@:>@])])
+case "$enable_openssl_version_check" in
+yes|'')
AC_MSG_CHECKING(OpenSSL library version)
AC_TRY_RUN([
#include <stdio.h>
#include <openssl/opensslv.h>
int main() {
- if (OPENSSL_VERSION_NUMBER >= 0x0090581fL)
+ if ((OPENSSL_VERSION_NUMBER >= 0x009070cfL &&
+ OPENSSL_VERSION_NUMBER < 0x009080000L) ||
+ OPENSSL_VERSION_NUMBER >= 0x0090804fL)
return (0);
printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n",
OPENSSL_VERSION_NUMBER);
- printf("Require OPENSSL_VERSION_NUMBER 0x0090581f or greater\n\n");
+ printf("Require OPENSSL_VERSION_NUMBER 0x009070cf or greater (0.9.7l)\n"
+ "Require OPENSSL_VERSION_NUMBER 0x0090804f or greater (0.9.8d)\n\n");
return (1);
}
-],
+ ],
[AC_MSG_RESULT(ok)],
[AC_MSG_RESULT(not compatible)
- AC_MSG_ERROR(you need OpenSSL 0.9.5a or newer)],
+ OPENSSL_WARNING=yes
+ ],
[AC_MSG_RESULT(assuming target platform has compatible version)])
- ,
- AC_MSG_RESULT(did not find fixes for CERT CA-2002-23)
- AC_MSG_CHECKING(OpenSSL library version)
- AC_TRY_RUN([
-#include <stdio.h>
-#include <openssl/opensslv.h>
-int main() {
- if ((OPENSSL_VERSION_NUMBER >= 0x0090605fL &&
- OPENSSL_VERSION_NUMBER < 0x009070000L) ||
- OPENSSL_VERSION_NUMBER >= 0x00907003L)
- return (0);
- printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n",
- OPENSSL_VERSION_NUMBER);
- printf("Require OPENSSL_VERSION_NUMBER 0x0090605f or greater (0.9.6e)\n"
- "Require OPENSSL_VERSION_NUMBER 0x00907003 or greater (0.9.7-beta2)\n\n");
- return (1);
-}
-],
- [AC_MSG_RESULT(ok)],
- [AC_MSG_RESULT(not compatible)
- AC_MSG_ERROR(you need OpenSSL 0.9.6e/0.9.7-beta2 (or newer): CERT CA-2002-23)],
- [AC_MSG_RESULT(assuming target platform has compatible version)]))
+;;
+no)
+ AC_MSG_RESULT(Skipped OpenSSL version check)
+;;
+esac
+
AC_MSG_CHECKING(for OpenSSL DSA support)
if test -f $use_openssl/include/openssl/dsa.h
then
@@ -2116,6 +2104,30 @@
)
chmod a+x isc-config.sh
+if test "X$OPENSSL_WARNING" != "X"; then
+cat << \EOF
+WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+WARNING WARNING
+WARNING Your OpenSSL crypto library may be vulnerable to WARNING
+WARNING one or more of the the following known security WARNING
+WARNING flaws: WARNING
+WARNING WARNING
+WARNING CAN-2002-0659, CAN-2006-4339, CVE-2006-2937 and WARNING
+WARNING CVE-2006-2940. WARNING
+WARNING WARNING
+WARNING It is recommended that you upgrade to OpenSSL WARNING
+WARNING version 0.9.8d/0.9.7l (or greater). WARNING
+WARNING WARNING
+WARNING You can disable this warning by specifying: WARNING
+WARNING WARNING
+WARNING --disable-openssl-version-check WARNING
+WARNING WARNING
+WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+EOF
+fi
+
# Tell Emacs to edit this file in shell mode.
# Local Variables:
# mode: sh
==== //depot/projects/dtrace/src/contrib/bind9/lib/dns/opensslrsa_link.c#4 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -17,7 +17,7 @@
/*
* Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.1.4.1.10.5 2006/10/11 03:58:50 marka Exp $
*/
#ifdef OPENSSL
@@ -39,7 +39,23 @@
#include <openssl/err.h>
#include <openssl/objects.h>
#include <openssl/rsa.h>
+#if OPENSSL_VERSION_NUMBER > 0x00908000L
+#include <openssl/bn.h>
+#endif
+
+/*
+ * We don't use configure for windows so enforce the OpenSSL version
+ * here. Unlike with configure we don't support overriding this test.
+ */
+#ifdef WIN32
+#if !((OPENSSL_VERSION_NUMBER >= 0x009070cfL && \
+ OPENSSL_VERSION_NUMBER < 0x009080000L) || \
+ OPENSSL_VERSION_NUMBER >= 0x0090804fL)
+#error Please upgrade OpenSSL to 0.9.8d/0.9.7l or greater.
+#endif
+#endif
+
/*
* XXXMPA Temporarially disable RSA_BLINDING as it requires
* good quality random data that cannot currently be guarenteed.
@@ -260,13 +276,47 @@
static isc_result_t
opensslrsa_generate(dst_key_t *key, int exp) {
+#if OPENSSL_VERSION_NUMBER > 0x00908000L
+ BN_GENCB cb;
+ RSA *rsa = RSA_new();
+ BIGNUM *e = BN_new();
+
+ if (rsa == NULL || e == NULL)
+ goto err;
+
+ if (exp == 0) {
+ /* RSA_F4 0x10001 */
+ BN_set_bit(e, 0);
+ BN_set_bit(e, 16);
+ } else {
+ /* F5 0x100000001 */
+ BN_set_bit(e, 0);
+ BN_set_bit(e, 32);
+ }
+
+ BN_GENCB_set_old(&cb, NULL, NULL);
+
+ if (RSA_generate_key_ex(rsa, key->key_size, e, &cb)) {
+ BN_free(e);
+ SET_FLAGS(rsa);
+ key->opaque = rsa;
+ return (ISC_R_SUCCESS);
+ }
+
+ err:
+ if (e != NULL)
+ BN_free(e);
+ if (rsa != NULL)
+ RSA_free(rsa);
+ return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
+#else
RSA *rsa;
unsigned long e;
if (exp == 0)
- e = RSA_3;
+ e = RSA_F4;
else
- e = RSA_F4;
+ e = 0x40000003;
rsa = RSA_generate_key(key->key_size, e, NULL, NULL);
if (rsa == NULL)
return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
@@ -274,6 +324,7 @@
key->opaque = rsa;
return (ISC_R_SUCCESS);
+#endif
}
static isc_boolean_t
==== //depot/projects/dtrace/src/contrib/bind9/lib/dns/resolver.c#5 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: resolver.c,v 1.218.2.18.4.56.4.1 2006/08/17 07:12:31 marka Exp $ */
+/* $Id: resolver.c,v 1.218.2.18.4.56.4.2 2006/10/04 07:06:02 marka Exp $ */
#include <config.h>
==== //depot/projects/dtrace/src/contrib/bind9/version#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $Id: version,v 1.26.2.17.2.21.4.1 2006/08/17 07:12:31 marka Exp $
+# $Id: version,v 1.26.2.17.2.21.4.2 2006/10/04 07:00:13 marka Exp $
#
# This file must follow /bin/sh rules. It is imported directly via
# configure.
@@ -7,4 +7,4 @@
MINORVER=3
PATCHVER=2
RELEASETYPE=-P
-RELEASEVER=1
+RELEASEVER=2
==== //depot/projects/dtrace/src/lib/libc/net/gethostbyname.3#6 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)gethostbyname.3 8.4 (Berkeley) 5/25/95
-.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.36 2006/09/17 21:27:33 ru Exp $
+.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.37 2006/11/04 09:42:22 lawrance Exp $
.\"
.Dd May 12, 2006
.Dt GETHOSTBYNAME 3
@@ -49,7 +49,7 @@
.Lb libc
.Sh SYNOPSIS
.In netdb.h
-.Vt extern int h_errno ;
+.Vt int h_errno ;
.Ft struct hostent *
.Fn gethostbyname "const char *name"
.Ft struct hostent *
@@ -261,7 +261,7 @@
is indicated by return of a
.Dv NULL
pointer.
-The external integer
+The integer
.Va h_errno
may then be checked to see whether this is a temporary failure
or an invalid or unknown host.
==== //depot/projects/dtrace/src/lib/libc/net/resolver.3#5 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)resolver.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.31 2006/07/17 09:27:26 stefanf Exp $
+.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.32 2006/11/04 09:42:22 lawrance Exp $
.\"
-.Dd June 4, 1993
+.Dd November 4, 2006
.Dt RESOLVER 3
.Os
.Sh NAME
@@ -410,6 +410,20 @@
.Fn res_init
function will return 0 on success, or \-1 in a threaded program if
per-thread storage could not be allocated.
+.Pp
+The
+.Fn res_mkquery ,
+.Fn res_search ,
+and
+.Fn res_query
+functions return the size of the response on success, or \-1 if an
+error occurs.
+The integer
+.Vt h_errno
+may be checked to determine the reason for error.
+See
+.Xr gethostbyname 3
+for more information.
.Sh FILES
.Bl -tag -width /etc/resolv.conf
.It Pa /etc/resolv.conf
==== //depot/projects/dtrace/src/lib/libc/sys/clock_gettime.2#5 (text+ko) ====
@@ -31,9 +31,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.22 2006/09/17 21:27:34 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.23 2006/11/04 09:35:36 danger Exp $
.\"
-.Dd November 18, 2005
+.Dd November 4, 2006
.Dt CLOCK_GETTIME 2
.Os
.Sh NAME
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.In sys/time.h
+.In time.h
.Ft int
.Fn clock_gettime "clockid_t clock_id" "struct timespec *tp"
.Ft int
@@ -82,7 +82,7 @@
The structure pointed to by
.Fa tp
is defined in
-.In sys/time.h
+.In sys/timespec.h
as:
.Pp
.Bd -literal
==== //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#23 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.981 2006/10/21 14:06:34 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.982 2006/11/04 02:01:52 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -619,7 +619,7 @@
architectures such as sparc64. &merged;</para>
<para>The &man.em.4; driver has been updated to
- version 6.1.4 from Intel. Among other changes, it now supports
+ version 6.2.9 from Intel. Among other changes, it now supports
80003, 82571, 82571EB and 82572 based adapters, as well as
onboard-NICs on ICH8-based motherboards. &merged;</para>
==== //depot/projects/dtrace/src/share/man/man3/pthread_cond_init.3#5 (text+ko) ====
@@ -25,9 +25,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man3/pthread_cond_init.3,v 1.16 2006/09/30 11:22:25 ru Exp $
+.\" $FreeBSD: src/share/man/man3/pthread_cond_init.3,v 1.17 2006/11/04 10:08:16 trhodes Exp $
.\"
-.Dd July 28, 1998
+.Dd November 4, 2006
.Dt PTHREAD_COND_INIT 3
.Os
.Sh NAME
@@ -71,6 +71,7 @@
variable.
.El
.Sh SEE ALSO
+.Xr pthread_condattr 3 ,
.Xr pthread_cond_broadcast 3 ,
.Xr pthread_cond_destroy 3 ,
.Xr pthread_cond_signal 3 ,
==== //depot/projects/dtrace/src/share/man/man3/pthread_create.3#6 (text+ko) ====
@@ -28,9 +28,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man3/pthread_create.3,v 1.22 2006/11/01 04:46:06 maxim Exp $
+.\" $FreeBSD: src/share/man/man3/pthread_create.3,v 1.23 2006/11/04 10:08:16 trhodes Exp $
.\"
-.Dd November 1, 2006
+.Dd November 4, 2006
.Dt PTHREAD_CREATE 3
.Os
.Sh NAME
@@ -118,6 +118,7 @@
.El
.Sh SEE ALSO
.Xr fork 2 ,
+.Xr pthread_attr 3 ,
.Xr pthread_cleanup_pop 3 ,
.Xr pthread_cleanup_push 3 ,
.Xr pthread_exit 3 ,
==== //depot/projects/dtrace/src/share/man/man3/pthread_mutex_init.3#5 (text+ko) ====
@@ -25,9 +25,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man3/pthread_mutex_init.3,v 1.16 2006/09/30 11:22:25 ru Exp $
+.\" $FreeBSD: src/share/man/man3/pthread_mutex_init.3,v 1.17 2006/11/04 10:08:16 trhodes Exp $
.\"
-.Dd July 29, 1998
+.Dd November 4, 2006
.Dt PTHREAD_MUTEX_INIT 3
.Os
.Sh NAME
@@ -67,6 +67,7 @@
The process cannot allocate enough memory to create another mutex.
.El
.Sh SEE ALSO
+.Xr pthread_mutexattr 3 ,
.Xr pthread_mutex_destroy 3 ,
.Xr pthread_mutex_lock 3 ,
.Xr pthread_mutex_trylock 3 ,
==== //depot/projects/dtrace/src/share/man/man9/VOP_REMOVE.9#4 (text+ko) ====
@@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/VOP_REMOVE.9,v 1.14 2005/06/28 20:15:18 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/VOP_REMOVE.9,v 1.15 2006/11/04 23:58:15 pjd Exp $
.\"
.Dd July 24, 1996
.Os
@@ -80,16 +80,6 @@
*/
...;
- /*
- * Careful about trying to remove ".". XXX this should be handled
- * higher up.
- */
- if (dvp == vp)
- vrele(vp);
- else
- vput(vp);
- vput(dvp);
-
return error;
}
.Ed
==== //depot/projects/dtrace/src/share/man/man9/VOP_RENAME.9#4 (text+ko) ====
@@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/VOP_RENAME.9,v 1.21 2005/01/28 10:43:05 ru Exp $
+.\" $FreeBSD: src/share/man/man9/VOP_RENAME.9,v 1.22 2006/11/04 23:59:51 pjd Exp $
.\"
.Dd July 24, 1996
.Os
@@ -104,34 +104,13 @@
}
/*
- * Check if just deleting a link name.
+ * POSIX: "If the old argument and the new argument
+ * both refer to links to the same existing file,
+ * the rename() function shall return successfully
+ * and perform no other action."
+ * The upper layers already handle this case.
*/
- if (fvp == tvp) {
- if (fvp->v_type == VDIR) {
- error = EINVAL;
- goto abortit;
- }
-
- /*
- * Release destination.
- */
- vput(tdvp);
- vput(tvp);
-
- /*
- * Delete source. Pretty bizarre stuff.
- */
- vrele(fdvp);
- vrele(fvp);
- fcnp->cn_flags &= ~MODMASK;
- fcnp->cn_flags |= LOCKPARENT | LOCKLEAF;
- fcnp->cn_nameiop = DELETE;
- VREF(fdvp);
- error = relookup(fdvp, &fvp, fcnp);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list