PERFORCE change 109382 for review
Olivier Houchard
cognet at FreeBSD.org
Mon Nov 6 21:22:50 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=109382
Change 109382 by cognet at cognet on 2006/11/06 21:22:26
IFC
Affected files ...
.. //depot/projects/arm/src/ObsoleteFiles.inc#10 integrate
.. //depot/projects/arm/src/contrib/bind9/CHANGES#3 integrate
.. //depot/projects/arm/src/contrib/bind9/bin/named/query.c#3 integrate
.. //depot/projects/arm/src/contrib/bind9/configure.in#2 integrate
.. //depot/projects/arm/src/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate
.. //depot/projects/arm/src/contrib/bind9/lib/dns/resolver.c#3 integrate
.. //depot/projects/arm/src/contrib/bind9/version#3 integrate
.. //depot/projects/arm/src/lib/libc/net/gethostbyname.3#3 integrate
.. //depot/projects/arm/src/lib/libc/net/resolver.3#2 integrate
.. //depot/projects/arm/src/lib/libc/sys/clock_gettime.2#3 integrate
.. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_cond_init.3#3 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_create.3#4 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_mutex_init.3#3 integrate
.. //depot/projects/arm/src/share/man/man9/VOP_REMOVE.9#2 integrate
.. //depot/projects/arm/src/share/man/man9/VOP_RENAME.9#2 integrate
.. //depot/projects/arm/src/share/mk/bsd.sys.mk#3 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/io.c#2 integrate
.. //depot/projects/arm/src/sys/boot/Makefile#7 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efilib.h#3 integrate
.. //depot/projects/arm/src/sys/boot/efi/libefi/Makefile#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/libefi/bootinfo.c#4 delete
.. //depot/projects/arm/src/sys/boot/efi/libefi/copy.c#2 delete
.. //depot/projects/arm/src/sys/boot/efi/libefi/devicename.c#3 delete
.. //depot/projects/arm/src/sys/boot/efi/libefi/efiboot.h#3 delete
.. //depot/projects/arm/src/sys/boot/efi/libefi/efifpswa.c#2 delete
.. //depot/projects/arm/src/sys/boot/efi/libefi/efifs.c#3 integrate
.. //depot/projects/arm/src/sys/boot/efi/libefi/efinet.c#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/libefi/elf_freebsd.c#2 delete
.. //depot/projects/arm/src/sys/boot/efi/libefi/errno.c#1 branch
.. //depot/projects/arm/src/sys/boot/efi/libefi/handles.c#1 branch
.. //depot/projects/arm/src/sys/boot/efi/libefi/module.c#2 delete
.. //depot/projects/arm/src/sys/boot/efi/libefi/time.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/Makefile#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/common/Makefile#1 branch
.. //depot/projects/arm/src/sys/boot/ia64/common/autoload.c#1 branch
.. //depot/projects/arm/src/sys/boot/ia64/common/bootinfo.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/common/copy.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/common/devicename.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/common/exec.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/common/libia64.h#1 branch
.. //depot/projects/arm/src/sys/boot/ia64/efi/Makefile#3 integrate
.. //depot/projects/arm/src/sys/boot/ia64/efi/conf.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/efi/efimd.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/efi/main.c#3 integrate
.. //depot/projects/arm/src/sys/boot/ia64/efi/version#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/ski/Makefile#3 integrate
.. //depot/projects/arm/src/sys/boot/ia64/ski/bootinfo.c#4 delete
.. //depot/projects/arm/src/sys/boot/ia64/ski/copy.c#2 delete
.. //depot/projects/arm/src/sys/boot/ia64/ski/devicename.c#3 delete
.. //depot/projects/arm/src/sys/boot/ia64/ski/efi_stub.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/ski/elf_freebsd.c#2 delete
.. //depot/projects/arm/src/sys/boot/ia64/ski/libski.h#3 integrate
.. //depot/projects/arm/src/sys/boot/ia64/ski/main.c#3 integrate
.. //depot/projects/arm/src/sys/boot/ia64/ski/skifs.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/ski/skimd.c#1 branch
.. //depot/projects/arm/src/sys/boot/ia64/ski/version#2 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#17 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_uid16.c#3 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_fcntl.c#4 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_misc.c#8 integrate
.. //depot/projects/arm/src/sys/conf/files#52 integrate
.. //depot/projects/arm/src/sys/contrib/altq/altq/altq_cbq.c#3 integrate
.. //depot/projects/arm/src/sys/contrib/altq/altq/altq_cdnr.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/altq/altq/altq_hfsc.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/altq/altq/altq_priq.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/altq/altq/altq_red.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/altq/altq/altq_rio.c#3 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/if_pfsync.c#6 integrate
.. //depot/projects/arm/src/sys/ddb/db_main.c#2 integrate
.. //depot/projects/arm/src/sys/dev/acpi_support/acpi_aiboost.c#2 integrate
.. //depot/projects/arm/src/sys/dev/an/if_an.c#6 integrate
.. //depot/projects/arm/src/sys/dev/arl/if_arl.c#4 integrate
.. //depot/projects/arm/src/sys/dev/asr/asr.c#10 integrate
.. //depot/projects/arm/src/sys/dev/ata/atapi-cd.c#7 integrate
.. //depot/projects/arm/src/sys/dev/ce/if_ce.c#4 integrate
.. //depot/projects/arm/src/sys/dev/cnw/if_cnw.c#4 integrate
.. //depot/projects/arm/src/sys/dev/cp/if_cp.c#5 integrate
.. //depot/projects/arm/src/sys/dev/ctau/if_ct.c#5 integrate
.. //depot/projects/arm/src/sys/dev/cx/if_cx.c#4 integrate
.. //depot/projects/arm/src/sys/dev/dcons/dcons_os.c#6 integrate
.. //depot/projects/arm/src/sys/dev/drm/drmP.h#6 integrate
.. //depot/projects/arm/src/sys/dev/fdc/fdc.c#8 integrate
.. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#12 integrate
.. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_mod.c#11 integrate
.. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis.c#7 integrate
.. //depot/projects/arm/src/sys/dev/kbd/kbd.c#4 integrate
.. //depot/projects/arm/src/sys/dev/lmc/if_lmc.c#5 integrate
.. //depot/projects/arm/src/sys/dev/lmc/if_lmc.h#5 integrate
.. //depot/projects/arm/src/sys/dev/nmdm/nmdm.c#4 integrate
.. //depot/projects/arm/src/sys/dev/null/null.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ofw/ofw_console.c#5 integrate
.. //depot/projects/arm/src/sys/dev/random/randomdev.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sbni/if_sbni.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sbsh/if_sbsh.c#5 integrate
.. //depot/projects/arm/src/sys/dev/si/si.c#4 integrate
.. //depot/projects/arm/src/sys/dev/syscons/syscons.c#11 integrate
.. //depot/projects/arm/src/sys/dev/syscons/sysmouse.c#4 integrate
.. //depot/projects/arm/src/sys/dev/wi/if_wi.c#8 integrate
.. //depot/projects/arm/src/sys/dev/wl/if_wl.c#4 integrate
.. //depot/projects/arm/src/sys/dev/zs/zs.c#4 integrate
.. //depot/projects/arm/src/sys/fs/devfs/devfs_rule.c#6 integrate
.. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#12 integrate
.. //depot/projects/arm/src/sys/fs/hpfs/hpfs_vnops.c#7 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate
.. //depot/projects/arm/src/sys/fs/procfs/procfs_ioctl.c#4 integrate
.. //depot/projects/arm/src/sys/fs/smbfs/smbfs_node.c#5 integrate
.. //depot/projects/arm/src/sys/fs/smbfs/smbfs_smb.c#4 integrate
.. //depot/projects/arm/src/sys/fs/smbfs/smbfs_vnops.c#6 integrate
.. //depot/projects/arm/src/sys/fs/udf/udf_vfsops.c#10 integrate
.. //depot/projects/arm/src/sys/fs/umapfs/umap_vfsops.c#4 integrate
.. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate
.. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate
.. //depot/projects/arm/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#3 integrate
.. //depot/projects/arm/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate
.. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#5 integrate
.. //depot/projects/arm/src/sys/i386/i386/io.c#2 integrate
.. //depot/projects/arm/src/sys/i386/i386/sys_machdep.c#6 integrate
.. //depot/projects/arm/src/sys/i386/i386/vm86.c#3 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_misc.c#6 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_sysi86.c#3 integrate
.. //depot/projects/arm/src/sys/i386/linux/linux_machdep.c#10 integrate
.. //depot/projects/arm/src/sys/i4b/driver/i4b_ipr.c#3 integrate
.. //depot/projects/arm/src/sys/ia64/ia64/ssc.c#6 integrate
.. //depot/projects/arm/src/sys/isofs/cd9660/cd9660_vfsops.c#7 integrate
.. //depot/projects/arm/src/sys/kern/kern_acct.c#11 integrate
.. //depot/projects/arm/src/sys/kern/kern_descrip.c#14 integrate
.. //depot/projects/arm/src/sys/kern/kern_environment.c#8 integrate
.. //depot/projects/arm/src/sys/kern/kern_exec.c#14 integrate
.. //depot/projects/arm/src/sys/kern/kern_fork.c#13 integrate
.. //depot/projects/arm/src/sys/kern/kern_jail.c#5 integrate
.. //depot/projects/arm/src/sys/kern/kern_ktrace.c#9 integrate
.. //depot/projects/arm/src/sys/kern/kern_linker.c#9 integrate
.. //depot/projects/arm/src/sys/kern/kern_ntptime.c#3 integrate
.. //depot/projects/arm/src/sys/kern/kern_priv.c#1 branch
.. //depot/projects/arm/src/sys/kern/kern_prot.c#8 integrate
.. //depot/projects/arm/src/sys/kern/kern_resource.c#11 integrate
.. //depot/projects/arm/src/sys/kern/kern_shutdown.c#6 integrate
.. //depot/projects/arm/src/sys/kern/kern_sysctl.c#7 integrate
.. //depot/projects/arm/src/sys/kern/kern_thr.c#12 integrate
.. //depot/projects/arm/src/sys/kern/kern_time.c#11 integrate
.. //depot/projects/arm/src/sys/kern/kern_umtx.c#13 integrate
.. //depot/projects/arm/src/sys/kern/kern_xxx.c#2 integrate
.. //depot/projects/arm/src/sys/kern/subr_acl_posix1e.c#3 integrate
.. //depot/projects/arm/src/sys/kern/subr_firmware.c#6 integrate
.. //depot/projects/arm/src/sys/kern/subr_prf.c#8 integrate
.. //depot/projects/arm/src/sys/kern/subr_witness.c#12 integrate
.. //depot/projects/arm/src/sys/kern/sysv_ipc.c#2 integrate
.. //depot/projects/arm/src/sys/kern/sysv_msg.c#5 integrate
.. //depot/projects/arm/src/sys/kern/tty.c#10 integrate
.. //depot/projects/arm/src/sys/kern/tty_cons.c#6 integrate
.. //depot/projects/arm/src/sys/kern/tty_pts.c#7 integrate
.. //depot/projects/arm/src/sys/kern/tty_pty.c#9 integrate
.. //depot/projects/arm/src/sys/kern/uipc_mqueue.c#8 integrate
.. //depot/projects/arm/src/sys/kern/uipc_sem.c#7 integrate
.. //depot/projects/arm/src/sys/kern/vfs_mount.c#22 integrate
.. //depot/projects/arm/src/sys/kern/vfs_subr.c#28 integrate
.. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#22 integrate
.. //depot/projects/arm/src/sys/kern/vfs_vnops.c#12 integrate
.. //depot/projects/arm/src/sys/net/bpf.c#15 integrate
.. //depot/projects/arm/src/sys/net/if.c#16 integrate
.. //depot/projects/arm/src/sys/net/if_bridge.c#26 integrate
.. //depot/projects/arm/src/sys/net/if_gre.c#9 integrate
.. //depot/projects/arm/src/sys/net/if_ppp.c#8 integrate
.. //depot/projects/arm/src/sys/net/if_sl.c#4 integrate
.. //depot/projects/arm/src/sys/net/if_tap.c#9 integrate
.. //depot/projects/arm/src/sys/net/if_tun.c#8 integrate
.. //depot/projects/arm/src/sys/net/ppp_tty.c#4 integrate
.. //depot/projects/arm/src/sys/net/raw_usrreq.c#6 integrate
.. //depot/projects/arm/src/sys/net/rtsock.c#9 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#13 integrate
.. //depot/projects/arm/src/sys/netatalk/at_control.c#3 integrate
.. //depot/projects/arm/src/sys/netatalk/ddp_pcb.c#4 integrate
.. //depot/projects/arm/src/sys/netatm/atm_usrreq.c#5 integrate
.. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate
.. //depot/projects/arm/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#6 integrate
.. //depot/projects/arm/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_socket.c#9 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_tty.c#3 integrate
.. //depot/projects/arm/src/sys/netinet/in.c#6 integrate
.. //depot/projects/arm/src/sys/netinet/in_pcb.c#14 integrate
.. //depot/projects/arm/src/sys/netinet/ip_carp.c#10 integrate
.. //depot/projects/arm/src/sys/netinet/ip_divert.c#8 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fw2.c#23 integrate
.. //depot/projects/arm/src/sys/netinet/ip_mroute.c#10 integrate
.. //depot/projects/arm/src/sys/netinet/ip_output.c#18 integrate
.. //depot/projects/arm/src/sys/netinet/raw_ip.c#10 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.c#2 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_crc32.c#2 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_indata.c#2 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_input.c#2 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_output.c#2 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_uio.h#2 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#2 integrate
.. //depot/projects/arm/src/sys/netinet/sctputil.c#2 integrate
.. //depot/projects/arm/src/sys/netinet/sctputil.h#2 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_subr.c#15 integrate
.. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#15 integrate
.. //depot/projects/arm/src/sys/netinet6/in6.c#9 integrate
.. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#10 integrate
.. //depot/projects/arm/src/sys/netinet6/in6_src.c#6 integrate
.. //depot/projects/arm/src/sys/netinet6/ipsec.c#8 integrate
.. //depot/projects/arm/src/sys/netinet6/sctp6_usrreq.c#2 integrate
.. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#10 integrate
.. //depot/projects/arm/src/sys/netipsec/ipsec_osdep.h#3 integrate
.. //depot/projects/arm/src/sys/netipx/ipx_pcb.c#3 integrate
.. //depot/projects/arm/src/sys/netipx/ipx_usrreq.c#5 integrate
.. //depot/projects/arm/src/sys/netncp/ncp_conn.c#4 integrate
.. //depot/projects/arm/src/sys/netncp/ncp_mod.c#2 integrate
.. //depot/projects/arm/src/sys/netncp/ncp_subr.h#2 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_conn.c#4 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_subr.c#4 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_subr.h#2 integrate
.. //depot/projects/arm/src/sys/nfsserver/nfs_syscalls.c#6 integrate
.. //depot/projects/arm/src/sys/pc98/cbus/fdc.c#6 integrate
.. //depot/projects/arm/src/sys/posix4/p1003_1b.c#7 integrate
.. //depot/projects/arm/src/sys/security/audit/audit.c#12 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_arg.c#6 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_pipe.c#6 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_private.h#8 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_framework.h#4 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_internal.h#3 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_net.c#5 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_priv.c#1 branch
.. //depot/projects/arm/src/sys/security/mac/mac_system.c#4 integrate
.. //depot/projects/arm/src/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate
.. //depot/projects/arm/src/sys/security/mac_lomac/mac_lomac.c#5 integrate
.. //depot/projects/arm/src/sys/security/mac_partition/mac_partition.c#3 integrate
.. //depot/projects/arm/src/sys/security/mac_portacl/mac_portacl.c#4 integrate
.. //depot/projects/arm/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate
.. //depot/projects/arm/src/sys/security/mac_stub/mac_stub.c#3 integrate
.. //depot/projects/arm/src/sys/sun4v/sun4v/hvcons.c#4 integrate
.. //depot/projects/arm/src/sys/sys/jail.h#3 integrate
.. //depot/projects/arm/src/sys/sys/mac_policy.h#10 integrate
.. //depot/projects/arm/src/sys/sys/priv.h#1 branch
.. //depot/projects/arm/src/sys/sys/systm.h#16 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_alloc.c#6 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#19 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_vnops.c#6 integrate
.. //depot/projects/arm/src/sys/ufs/ufs/ufs_extattr.c#4 integrate
.. //depot/projects/arm/src/sys/ufs/ufs/ufs_quota.c#11 integrate
.. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#12 integrate
.. //depot/projects/arm/src/sys/vm/swap_pager.c#9 integrate
.. //depot/projects/arm/src/sys/vm/vm_mmap.c#7 integrate
Differences ...
==== //depot/projects/arm/src/ObsoleteFiles.inc#10 (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/arm/src/contrib/bind9/CHANGES#3 (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/arm/src/contrib/bind9/bin/named/query.c#3 (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/arm/src/contrib/bind9/configure.in#2 (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/arm/src/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/arm/src/contrib/bind9/lib/dns/resolver.c#3 (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/arm/src/contrib/bind9/version#3 (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/arm/src/lib/libc/net/gethostbyname.3#3 (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/arm/src/lib/libc/net/resolver.3#2 (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/arm/src/lib/libc/sys/clock_gettime.2#3 (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/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 (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/arm/src/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/arm/src/share/man/man3/pthread_create.3#4 (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/arm/src/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/arm/src/share/man/man9/VOP_REMOVE.9#2 (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/arm/src/share/man/man9/VOP_RENAME.9#2 (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);
- if (error == 0)
- vrele(fdvp);
- return VOP_REMOVE(fdvp, fvp, fcnp);
- }
+ KASSERT(fvp != tvp, ("vop_rename: source and destination are the same"));
if (fvp is immutable) {
error = EPERM;
==== //depot/projects/arm/src/share/mk/bsd.sys.mk#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.38 2006/08/11 17:28:59 des Exp $
+# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.39 2006/11/04 04:39:05 jb Exp $
#
# This file contains common settings used for building FreeBSD
# sources.
@@ -67,5 +67,9 @@
. endif
.endif
+.if defined(IGNORE_PRAGMA)
+CWARNFLAGS += -Wno-unknown-pragmas
+.endif
+
# Allow user-specified additional warning flags
CFLAGS += ${CWARNFLAGS}
==== //depot/projects/arm/src/sys/amd64/amd64/io.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.1 2004/08/01 11:40:50 markm Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.2 2006/11/06 13:41:49 rwatson Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -33,6 +33,7 @@
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
+#include <sys/priv.h>
#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/systm.h>
@@ -54,7 +55,7 @@
{
int error;
- error = suser(td);
+ error = priv_check(td, PRIV_IO);
if (error != 0)
return (error);
error = securelevel_gt(td->td_ucred, 0);
==== //depot/projects/arm/src/sys/boot/Makefile#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/Makefile,v 1.31 2006/10/09 04:43:06 kmacy Exp $
+# $FreeBSD: src/sys/boot/Makefile,v 1.32 2006/11/05 22:03:02 marcel Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@
.endif
# Build EFI library.
-.if ${MACHINE_ARCH} == "ia64"
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "ia64"
SUBDIR+= efi
.endif
==== //depot/projects/arm/src/sys/boot/efi/include/efilib.h#3 (text+ko) ====
@@ -1,5 +1,6 @@
/*-
* Copyright (c) 2000 Doug Rabson
+ * Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,24 +24,31 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.5 2006/11/02 02:42:47 marcel Exp $
+ * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.6 2006/11/05 22:03:02 marcel Exp $
*/
-#include <efifpswa.h>
+#include <stand.h>
extern EFI_HANDLE IH;
extern EFI_SYSTEM_TABLE *ST;
extern EFI_BOOT_SERVICES *BS;
extern EFI_RUNTIME_SERVICES *RS;
-/* DIG64 Headless Console & Debug Port Table. */
-#define HCDP_TABLE_GUID \
- {0xf951938d,0x620b,0x42ef,{0x82,0x79,0xa8,0x4b,0x79,0x61,0x78,0x98}}
+extern struct devsw efifs_dev;
+extern struct fs_ops efifs_fsops;
+
+extern struct devsw efinet_dev;
+extern struct netif_driver efinetif;
void *efi_get_table(EFI_GUID *tbl);
void efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table);
-EFI_PHYSICAL_ADDRESS efimd_va2pa(EFI_VIRTUAL_ADDRESS);
+int efi_register_handles(struct devsw *, EFI_HANDLE *, int);
+EFI_HANDLE efi_find_handle(struct devsw *, int);
+int efi_handle_lookup(EFI_HANDLE, struct devsw **, int *);
+
+int efi_status_to_errno(EFI_STATUS);
+time_t efi_time(EFI_TIME *);
EFI_STATUS main(int argc, CHAR16 *argv[]);
void exit(EFI_STATUS status);
==== //depot/projects/arm/src/sys/boot/efi/libefi/Makefile#2 (text+ko) ====
@@ -1,27 +1,16 @@
-# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.16 2004/11/28 00:30:22 marcel Exp $
+# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.17 2006/11/05 22:03:03 marcel Exp $
-.PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH}
-
LIB= efi
INTERNALLIB=
-SRCS= bootinfo.c copy.c delay.c devicename.c efi_console.c efifs.c efinet.c \
- elf_freebsd.c libefi.c module.c time.c
+SRCS= delay.c efi_console.c efifs.c efinet.c errno.c handles.c libefi.c \
+ time.c
-.if ${MACHINE_ARCH} == "ia64"
-SRCS+= efifpswa.c pal.S
-.endif
-
CFLAGS+= -I${.CURDIR}/../include
-CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH}
+CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/}
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list