PERFORCE change 109321 for review
Marcel Moolenaar
marcel at FreeBSD.org
Mon Nov 6 00:54:50 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=109321
Change 109321 by marcel at marcel_cluster on 2006/11/06 00:53:52
IFC @109316
Affected files ...
.. //depot/projects/ia64/ObsoleteFiles.inc#11 integrate
.. //depot/projects/ia64/contrib/bind9/CHANGES#6 integrate
.. //depot/projects/ia64/contrib/bind9/bin/named/query.c#4 integrate
.. //depot/projects/ia64/contrib/bind9/configure.in#4 integrate
.. //depot/projects/ia64/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate
.. //depot/projects/ia64/contrib/bind9/lib/dns/resolver.c#6 integrate
.. //depot/projects/ia64/contrib/bind9/version#6 integrate
.. //depot/projects/ia64/lib/libc/net/gethostbyname.3#12 integrate
.. //depot/projects/ia64/lib/libc/net/resolver.3#11 integrate
.. //depot/projects/ia64/lib/libc/sparc64/sys/Makefile.inc#9 integrate
.. //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_utrap_gen.S#4 integrate
.. //depot/projects/ia64/lib/libc/sys/clock_gettime.2#10 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#164 integrate
.. //depot/projects/ia64/sbin/mdmfs/mdmfs.8#17 integrate
.. //depot/projects/ia64/sbin/mdmfs/mdmfs.c#17 integrate
.. //depot/projects/ia64/share/man/man3/pthread_cond_init.3#3 integrate
.. //depot/projects/ia64/share/man/man3/pthread_create.3#5 integrate
.. //depot/projects/ia64/share/man/man3/pthread_mutex_init.3#3 integrate
.. //depot/projects/ia64/share/man/man4/aac.4#13 integrate
.. //depot/projects/ia64/share/man/man9/VOP_REMOVE.9#6 integrate
.. //depot/projects/ia64/share/man/man9/VOP_RENAME.9#8 integrate
.. //depot/projects/ia64/share/mk/bsd.sys.mk#27 integrate
.. //depot/projects/ia64/sys/amd64/conf/DEFAULTS#6 integrate
.. //depot/projects/ia64/sys/arm/at91/if_ate.c#6 integrate
.. //depot/projects/ia64/sys/boot/Makefile#21 integrate
.. //depot/projects/ia64/sys/boot/efi/include/efilib.h#12 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/Makefile#17 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/efifs.c#18 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#10 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/errno.c#2 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/handles.c#2 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/libefi.c#9 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/time.c#5 integrate
.. //depot/projects/ia64/sys/boot/ia64/Makefile#5 integrate
.. //depot/projects/ia64/sys/boot/ia64/common/Makefile#2 integrate
.. //depot/projects/ia64/sys/boot/ia64/common/autoload.c#2 integrate
.. //depot/projects/ia64/sys/boot/ia64/common/bootinfo.c#4 integrate
.. //depot/projects/ia64/sys/boot/ia64/common/copy.c#3 integrate
.. //depot/projects/ia64/sys/boot/ia64/common/devicename.c#5 integrate
.. //depot/projects/ia64/sys/boot/ia64/common/exec.c#2 integrate
.. //depot/projects/ia64/sys/boot/ia64/common/libia64.h#2 integrate
.. //depot/projects/ia64/sys/boot/ia64/efi/Makefile#9 integrate
.. //depot/projects/ia64/sys/boot/ia64/efi/conf.c#6 integrate
.. //depot/projects/ia64/sys/boot/ia64/efi/efimd.c#6 integrate
.. //depot/projects/ia64/sys/boot/ia64/efi/main.c#9 integrate
.. //depot/projects/ia64/sys/boot/ia64/efi/version#3 integrate
.. //depot/projects/ia64/sys/boot/ia64/ski/Makefile#9 integrate
.. //depot/projects/ia64/sys/boot/ia64/ski/efi_stub.c#4 integrate
.. //depot/projects/ia64/sys/boot/ia64/ski/libski.h#5 integrate
.. //depot/projects/ia64/sys/boot/ia64/ski/main.c#5 integrate
.. //depot/projects/ia64/sys/boot/ia64/ski/skifs.c#3 integrate
.. //depot/projects/ia64/sys/boot/ia64/ski/skimd.c#2 integrate
.. //depot/projects/ia64/sys/boot/ia64/ski/version#3 integrate
.. //depot/projects/ia64/sys/cam/scsi/scsi_all.h#10 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_proto.h#22 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscall.h#22 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscalls.c#22 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_sysent.c#22 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/syscalls.master#22 integrate
.. //depot/projects/ia64/sys/conf/NOTES#109 integrate
.. //depot/projects/ia64/sys/conf/files#149 integrate
.. //depot/projects/ia64/sys/conf/options#100 integrate
.. //depot/projects/ia64/sys/dev/aac/aac_pci.c#38 integrate
.. //depot/projects/ia64/sys/dev/pci/pci.c#60 integrate
.. //depot/projects/ia64/sys/fs/smbfs/smbfs_node.c#21 integrate
.. //depot/projects/ia64/sys/fs/smbfs/smbfs_smb.c#16 integrate
.. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#32 integrate
.. //depot/projects/ia64/sys/i386/conf/DEFAULTS#6 integrate
.. //depot/projects/ia64/sys/ia64/conf/DEFAULTS#6 integrate
.. //depot/projects/ia64/sys/kern/init_sysent.c#56 integrate
.. //depot/projects/ia64/sys/kern/syscalls.c#57 integrate
.. //depot/projects/ia64/sys/kern/syscalls.master#58 integrate
.. //depot/projects/ia64/sys/kern/systrace_args.c#3 integrate
.. //depot/projects/ia64/sys/kern/tty_cons.c#28 integrate
.. //depot/projects/ia64/sys/kern/uipc_syscalls.c#65 integrate
.. //depot/projects/ia64/sys/kern/vfs_subr.c#93 integrate
.. //depot/projects/ia64/sys/modules/ath_rate_amrr/Makefile#4 integrate
.. //depot/projects/ia64/sys/modules/bge/Makefile#5 integrate
.. //depot/projects/ia64/sys/modules/nfe/Makefile#2 integrate
.. //depot/projects/ia64/sys/net/if_bridge.c#12 integrate
.. //depot/projects/ia64/sys/net/if_tap.c#37 integrate
.. //depot/projects/ia64/sys/net/rtsock.c#37 integrate
.. //depot/projects/ia64/sys/netinet/in_proto.c#20 integrate
.. //depot/projects/ia64/sys/netinet/sctp.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_asconf.c#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_asconf.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_auth.c#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_auth.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_bsd_addr.c#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_bsd_addr.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_constants.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_crc32.c#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_crc32.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_header.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_indata.c#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_indata.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_input.c#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_input.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_lock_bsd.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_os.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_os_bsd.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_output.c#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_output.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_pcb.c#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_pcb.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_peeloff.c#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_peeloff.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_structs.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_timer.c#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_timer.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_uio.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_usrreq.c#1 branch
.. //depot/projects/ia64/sys/netinet/sctp_var.h#1 branch
.. //depot/projects/ia64/sys/netinet/sctputil.c#1 branch
.. //depot/projects/ia64/sys/netinet/sctputil.h#1 branch
.. //depot/projects/ia64/sys/netinet6/in6_proto.c#17 integrate
.. //depot/projects/ia64/sys/netinet6/sctp6_usrreq.c#1 branch
.. //depot/projects/ia64/sys/netinet6/sctp6_var.h#1 branch
.. //depot/projects/ia64/sys/netsmb/smb_subr.c#17 integrate
.. //depot/projects/ia64/sys/pc98/conf/DEFAULTS#6 integrate
.. //depot/projects/ia64/sys/powerpc/conf/DEFAULTS#4 integrate
.. //depot/projects/ia64/sys/security/audit/audit_arg.c#5 integrate
.. //depot/projects/ia64/sys/security/audit/audit_private.h#4 integrate
.. //depot/projects/ia64/sys/sparc64/conf/DEFAULTS#4 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#31 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#63 integrate
.. //depot/projects/ia64/sys/sun4v/conf/DEFAULTS#3 integrate
.. //depot/projects/ia64/sys/sun4v/include/elf.h#2 integrate
.. //depot/projects/ia64/sys/sun4v/include/hypervisor_api.h#2 integrate
.. //depot/projects/ia64/sys/sun4v/include/trap.h#2 integrate
.. //depot/projects/ia64/sys/sun4v/include/utrap.h#2 integrate
.. //depot/projects/ia64/sys/sun4v/sun4v/exception.S#3 integrate
.. //depot/projects/ia64/sys/sun4v/sun4v/hvcons.c#3 integrate
.. //depot/projects/ia64/sys/sun4v/sun4v/machdep.c#4 integrate
.. //depot/projects/ia64/sys/sun4v/sun4v/pmap.c#3 integrate
.. //depot/projects/ia64/sys/sun4v/sun4v/trap.c#3 integrate
.. //depot/projects/ia64/sys/sun4v/sun4v/wbuf.S#2 integrate
.. //depot/projects/ia64/sys/sys/mbuf.h#45 integrate
.. //depot/projects/ia64/sys/sys/socket.h#29 integrate
.. //depot/projects/ia64/sys/sys/syscall.h#56 integrate
.. //depot/projects/ia64/sys/sys/syscall.mk#56 integrate
.. //depot/projects/ia64/sys/sys/sysproto.h#59 integrate
Differences ...
==== //depot/projects/ia64/ObsoleteFiles.inc#11 (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/ia64/contrib/bind9/CHANGES#6 (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/ia64/contrib/bind9/bin/named/query.c#4 (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/ia64/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/ia64/contrib/bind9/lib/dns/opensslrsa_link.c#2 (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/ia64/contrib/bind9/lib/dns/resolver.c#6 (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/ia64/contrib/bind9/version#6 (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/ia64/lib/libc/net/gethostbyname.3#12 (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/ia64/lib/libc/net/resolver.3#11 (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/ia64/lib/libc/sparc64/sys/Makefile.inc#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.9 2003/08/11 07:14:07 bms Exp $
+# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.10 2006/11/03 23:43:18 kmacy Exp $
SRCS+= __sparc_sigtramp_setup.c \
__sparc_utrap.c \
@@ -11,6 +11,9 @@
sigcode.S
CFLAGS+= -I${.CURDIR}/sparc64/fpu
+.if ${MACHINE} == "sun4v"
+CFLAGS+= -DSUN4V
+.endif
MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S sigaction.S
==== //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_utrap_gen.S#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_gen.S,v 1.4 2002/06/30 05:36:49 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_gen.S,v 1.5 2006/11/03 23:43:18 kmacy Exp $");
.register %g2, #ignore
.register %g3, #ignore
@@ -38,6 +38,10 @@
#include "assym.s"
ENTRY(__sparc_utrap_gen)
+#ifdef SUN4V
+ save
+ ta %xcc, ST_FPEMU_CONTEXT
+#endif
sub %sp, UF_SIZEOF, %sp
stx %o0, [%sp + SPOFF + CCFSZ + UF_TYPE]
==== //depot/projects/ia64/lib/libc/sys/clock_gettime.2#10 (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/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#164 (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/ia64/sbin/mdmfs/mdmfs.8#17 (text+ko) ====
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.25 2006/10/21 16:02:42 ru Exp $
+.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.26 2006/11/03 12:02:24 ru Exp $
.\"
-.Dd October 1, 2006
+.Dd November 3, 2006
.Dt MDMFS 8
.Os
.Sh NAME
@@ -56,26 +56,6 @@
.Op Fl w Ar user : Ns Ar group
.Ar md-device
.Ar mount-point
-.Nm
-.Fl C
-.Op Fl lNU
-.Op Fl a Ar maxcontig
-.Op Fl b Ar block-size
-.Op Fl c Ar cylinders
-.Op Fl d Ar rotdelay
-.Op Fl E Ar path-mdconfig
-.Op Fl e Ar maxbpg
-.Op Fl F Ar file
-.Op Fl f Ar frag-size
-.Op Fl i Ar bytes
-.Op Fl m Ar percent-free
-.Op Fl n Ar rotational-positions
-.Op Fl O Ar optimization
-.Op Fl o Ar mount-options
-.Op Fl s Ar size
-.Op Fl v Ar version
-.Ar md-device
-.Ar mount-point
.Sh DESCRIPTION
The
.Nm
@@ -134,12 +114,6 @@
option).
.It Fl b Ar block-size
The block size of the file system, in bytes.
-.It Fl C
-Enable full compatibility mode with
-.Xr mount_mfs 8 .
-See the
-.Sx COMPATIBILITY
-section for more information.
.It Fl c Ar cylinders
The number of cylinders per cylinder group in the file system.
.It Fl D
@@ -250,7 +224,7 @@
.Pq Dv MD_MALLOC .
.It Fl U
Enable soft-updates on the file system.
-This is the default, even in compatibility mode, and is accepted only
+This is the default, and is accepted only
for compatibility.
It is only really useful to negate the
.Fl S
@@ -337,19 +311,16 @@
.Sh COMPATIBILITY
The
.Nm
-utility, while designed to be fully compatible with
+utility, while designed to be compatible with
.Xr mount_mfs 8 ,
can be useful by itself.
Since
.Xr mount_mfs 8
had some silly defaults, a
-.Dq full compatibility
+.Dq compatibility
mode is provided for the case where bug-to-bug compatibility is desired.
.Pp
-Full compatibility is enabled with the
-.Fl C
-flag,
-or by starting
+Compatibility is enabled by starting
.Nm
with the name
.Li mount_mfs
@@ -357,17 +328,14 @@
.Li mfs
(as returned by
.Xr getprogname 3 ) .
-In this mode, only the options which would be accepted by
-.Xr mount_mfs 8
-are valid.
-Furthermore, the following behavior, as done by
+In this mode, the following behavior, as done by
.Xr mount_mfs 8 ,
is duplicated:
.Bl -bullet -offset indent
.It
The file mode of
.Ar mount-point
-is set to
+is set by default to
.Li 01777
as if
.Fl p Ar 1777
==== //depot/projects/ia64/sbin/mdmfs/mdmfs.c#17 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.27 2006/02/16 21:28:54 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.28 2006/11/03 12:02:24 ru Exp $");
#include <sys/param.h>
#include <sys/mdioctl.h>
@@ -61,7 +61,6 @@
bool mi_have_mode;
};
-static bool compat; /* Full compatibility with mount_mfs? */
static bool debug; /* Emit debugging information? */
static bool loudsubs; /* Suppress output from helper programs? */
static bool norun; /* Actually run the helper programs? */
@@ -119,8 +118,11 @@
/* If we were started as mount_mfs or mfs, imply -C. */
if (strcmp(getprogname(), "mount_mfs") == 0 ||
- strcmp(getprogname(), "mfs") == 0)
- compat = true;
+ strcmp(getprogname(), "mfs") == 0) {
+ /* Make compatibility assumptions. */
+ mi.mi_mode = 01777;
+ mi.mi_have_mode = true;
+ }
while ((ch = getopt(argc, argv,
"a:b:Cc:Dd:E:e:F:f:hi:LlMm:Nn:O:o:Pp:Ss:t:Uv:w:X")) != -1)
@@ -132,16 +134,12 @@
argappend(&newfs_arg, "-b %s", optarg);
break;
case 'C':
- if (compat)
- usage();
- compat = true;
+ /* Ignored for compatibility. */
break;
case 'c':
argappend(&newfs_arg, "-c %s", optarg);
break;
case 'D':
- if (compat)
- usage();
detach = false;
break;
case 'd':
@@ -170,8 +168,6 @@
argappend(&newfs_arg, "-i %s", optarg);
break;
case 'L':
- if (compat)
- usage();
loudsubs = true;
break;
case 'l':
@@ -187,8 +183,6 @@
argappend(&newfs_arg, "-m %s", optarg);
break;
case 'N':
- if (compat)
- usage();
norun = true;
break;
case 'n':
@@ -201,13 +195,9 @@
argappend(&mount_arg, "-o %s", optarg);
break;
case 'P':
- if (compat)
- usage();
newfs = false;
break;
case 'p':
- if (compat)
- usage();
if ((set = setmode(optarg)) == NULL)
usage();
mi.mi_mode = getmode(set, S_IRWXU | S_IRWXG | S_IRWXO);
@@ -215,8 +205,6 @@
free(set);
break;
case 'S':
- if (compat)
- usage();
softdep = false;
break;
case 's':
@@ -229,13 +217,9 @@
argappend(&newfs_arg, "-O %s", optarg);
break;
case 'w':
- if (compat)
- usage();
extract_ugid(optarg, &mi);
break;
case 'X':
- if (compat)
- usage();
debug = true;
break;
default:
@@ -246,12 +230,6 @@
if (argc < 2)
usage();
- /* Make compatibility assumptions. */
- if (compat) {
- mi.mi_mode = 01777;
- mi.mi_have_mode = true;
- }
-
/* Derive 'unit' (global). */
unitstr = argv[0];
if (strncmp(unitstr, "/dev/", 5) == 0)
@@ -671,23 +649,12 @@
static void
usage(void)
{
- const char *name;
- if (compat)
- name = getprogname();
- else
- name = "mdmfs";
- if (!compat)
- fprintf(stderr,
+ fprintf(stderr,
"usage: %s [-DLlMNPSUX] [-a maxcontig] [-b block-size] [-c cylinders]\n"
"\t[-d rotdelay] [-E path-mdconfig] [-e maxbpg] [-F file] [-f frag-size]\n"
"\t[-i bytes] [-m percent-free] [-n rotational-positions] [-O optimization]\n"
"\t[-o mount-options] [-p permissions] [-s size] [-v version]\n"
-"\t[-w user:group] md-device mount-point\n", name);
- fprintf(stderr,
-"usage: %s -C [-lNU] [-a maxcontig] [-b block-size] [-c cylinders]\n"
-"\t[-d rotdelay] [-E path-mdconfig] [-e maxbpg] [-F file] [-f frag-size]\n"
-"\t[-i bytes] [-m percent-free] [-n rotational-positions] [-O optimization]\n"
-"\t[-o mount-options] [-s size] [-v version] md-device mount-point\n", name);
+"\t[-w user:group] md-device mount-point\n", getprogname());
exit(1);
}
==== //depot/projects/ia64/share/man/man3/pthread_cond_init.3#3 (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/ia64/share/man/man3/pthread_create.3#5 (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/ia64/share/man/man3/pthread_mutex_init.3#3 (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/ia64/share/man/man4/aac.4#13 (text+ko) ====
@@ -22,8 +22,8 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/aac.4,v 1.33 2006/06/18 07:33:51 brueffer Exp $
-.Dd June 17, 2006
+.\" $FreeBSD: src/share/man/man4/aac.4,v 1.34 2006/11/03 06:50:03 brueffer Exp $
+.Dd November 3, 2006
.Dt AAC 4
.Os
.Sh NAME
@@ -181,6 +181,8 @@
.It
IBM ServeRAID 8i
.It
+IBM ServeRAID 8k
+.It
ICP ICP5085BR SAS RAID
.It
ICP ICP9085LI SAS RAID
==== //depot/projects/ia64/share/man/man9/VOP_REMOVE.9#6 (text+ko) ====
@@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $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 $
.\"
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list