svn commit: r184527 - in projects/releng_7_xen: crypto/openssh
lib/libarchive lib/libarchive/test lib/libc/stdlib
lib/libfetch lib/libutil libexec/rtld-elf release
release/doc/en_US.ISO8859-1/hardw...
Kip Macy
kmacy at FreeBSD.org
Sat Nov 1 11:58:00 PDT 2008
Author: kmacy
Date: Sat Nov 1 18:57:58 2008
New Revision: 184527
URL: http://svn.freebsd.org/changeset/base/184527
Log:
IF_RELENG7 183757:184526
Added:
projects/releng_7_xen/sys/dev/ae/
projects/releng_7_xen/sys/modules/ae/
Modified:
projects/releng_7_xen/crypto/openssh/ (props changed)
projects/releng_7_xen/crypto/openssh/loginrec.c
projects/releng_7_xen/crypto/openssh/sshd.c
projects/releng_7_xen/lib/libarchive/ (props changed)
projects/releng_7_xen/lib/libarchive/archive_write_disk.c
projects/releng_7_xen/lib/libarchive/test/Makefile
projects/releng_7_xen/lib/libc/stdlib/grantpt.3
projects/releng_7_xen/lib/libc/stdlib/grantpt.c
projects/releng_7_xen/lib/libfetch/ (props changed)
projects/releng_7_xen/lib/libfetch/http.c
projects/releng_7_xen/lib/libutil/ (props changed)
projects/releng_7_xen/lib/libutil/pty.c
projects/releng_7_xen/libexec/rtld-elf/ (props changed)
projects/releng_7_xen/libexec/rtld-elf/rtld_lock.c
projects/releng_7_xen/release/ (props changed)
projects/releng_7_xen/release/Makefile
projects/releng_7_xen/release/doc/en_US.ISO8859-1/hardware/article.sgml
projects/releng_7_xen/release/doc/zh_CN.GB2312/hardware/article.sgml
projects/releng_7_xen/release/doc/zh_CN.GB2312/relnotes/article.sgml
projects/releng_7_xen/release/scripts/src-install.sh (props changed)
projects/releng_7_xen/sbin/dhclient/ (props changed)
projects/releng_7_xen/sbin/dhclient/dhclient.c
projects/releng_7_xen/sbin/dhclient/dhcp.h
projects/releng_7_xen/sbin/dhclient/tables.c
projects/releng_7_xen/sbin/fsck_ffs/ (props changed)
projects/releng_7_xen/sbin/fsck_ffs/pass5.c
projects/releng_7_xen/share/man/man4/ (props changed)
projects/releng_7_xen/share/man/man4/Makefile
projects/releng_7_xen/share/man/man4/ata.4
projects/releng_7_xen/share/man/man4/vlan.4
projects/releng_7_xen/share/zoneinfo/ (props changed)
projects/releng_7_xen/share/zoneinfo/africa
projects/releng_7_xen/share/zoneinfo/asia
projects/releng_7_xen/share/zoneinfo/southamerica
projects/releng_7_xen/share/zoneinfo/zone.tab
projects/releng_7_xen/sys/ (props changed)
projects/releng_7_xen/sys/amd64/amd64/local_apic.c
projects/releng_7_xen/sys/amd64/linux32/linux32_proto.h
projects/releng_7_xen/sys/amd64/linux32/linux32_syscall.h
projects/releng_7_xen/sys/amd64/linux32/linux32_sysent.c
projects/releng_7_xen/sys/amd64/linux32/linux32_sysvec.c
projects/releng_7_xen/sys/amd64/linux32/syscalls.master
projects/releng_7_xen/sys/boot/i386/libi386/bootinfo64.c
projects/releng_7_xen/sys/compat/freebsd32/freebsd32_misc.c
projects/releng_7_xen/sys/compat/freebsd32/freebsd32_proto.h
projects/releng_7_xen/sys/compat/freebsd32/freebsd32_syscall.h
projects/releng_7_xen/sys/compat/freebsd32/freebsd32_syscalls.c
projects/releng_7_xen/sys/compat/freebsd32/freebsd32_sysent.c
projects/releng_7_xen/sys/compat/freebsd32/syscalls.master
projects/releng_7_xen/sys/compat/linprocfs/linprocfs.c
projects/releng_7_xen/sys/compat/linux/linux_misc.c
projects/releng_7_xen/sys/conf/NOTES
projects/releng_7_xen/sys/conf/files
projects/releng_7_xen/sys/contrib/pf/net/pf.c
projects/releng_7_xen/sys/dev/ata/ata-chipset.c
projects/releng_7_xen/sys/dev/ata/ata-pci.h
projects/releng_7_xen/sys/dev/bm/if_bm.c
projects/releng_7_xen/sys/dev/if_ndis/if_ndis.c
projects/releng_7_xen/sys/dev/if_ndis/if_ndisvar.h
projects/releng_7_xen/sys/dev/jme/if_jme.c
projects/releng_7_xen/sys/dev/jme/if_jmereg.h
projects/releng_7_xen/sys/dev/lmc/if_lmc.c
projects/releng_7_xen/sys/dev/mii/atphy.c
projects/releng_7_xen/sys/dev/mii/e1000phy.c
projects/releng_7_xen/sys/dev/mii/miidevs
projects/releng_7_xen/sys/dev/mxge/eth_z8e.h
projects/releng_7_xen/sys/dev/mxge/ethp_z8e.h
projects/releng_7_xen/sys/dev/mxge/rss_eth_z8e.h
projects/releng_7_xen/sys/dev/mxge/rss_ethp_z8e.h
projects/releng_7_xen/sys/dev/puc/pucdata.c
projects/releng_7_xen/sys/dev/twa/tw_osl_freebsd.c
projects/releng_7_xen/sys/dev/usb/if_zyd.c
projects/releng_7_xen/sys/dev/usb/usb_quirks.c
projects/releng_7_xen/sys/dev/usb/usbdevs
projects/releng_7_xen/sys/fs/portalfs/portal_vnops.c
projects/releng_7_xen/sys/fs/procfs/procfs_map.c
projects/releng_7_xen/sys/geom/part/g_part_bsd.c
projects/releng_7_xen/sys/i386/i386/identcpu.c
projects/releng_7_xen/sys/i386/i386/local_apic.c
projects/releng_7_xen/sys/i386/include/profile.h
projects/releng_7_xen/sys/i386/include/specialreg.h
projects/releng_7_xen/sys/i386/linux/linux_proto.h
projects/releng_7_xen/sys/i386/linux/linux_syscall.h
projects/releng_7_xen/sys/i386/linux/linux_sysent.c
projects/releng_7_xen/sys/i386/linux/syscalls.master
projects/releng_7_xen/sys/kern/imgact_elf.c
projects/releng_7_xen/sys/kern/kern_descrip.c
projects/releng_7_xen/sys/kern/kern_exec.c
projects/releng_7_xen/sys/kern/kern_lockf.c
projects/releng_7_xen/sys/kern/kern_prot.c
projects/releng_7_xen/sys/kern/kern_time.c
projects/releng_7_xen/sys/kern/subr_stack.c
projects/releng_7_xen/sys/kern/sys_socket.c
projects/releng_7_xen/sys/kern/uipc_sockbuf.c
projects/releng_7_xen/sys/kern/uipc_socket.c
projects/releng_7_xen/sys/kern/uipc_usrreq.c
projects/releng_7_xen/sys/kern/vfs_syscalls.c
projects/releng_7_xen/sys/libkern/qdivrem.c
projects/releng_7_xen/sys/modules/Makefile
projects/releng_7_xen/sys/net/if.c
projects/releng_7_xen/sys/net/if_stf.c
projects/releng_7_xen/sys/netinet/in_pcb.c
projects/releng_7_xen/sys/netinet/in_pcb.h
projects/releng_7_xen/sys/netinet/ip_divert.c
projects/releng_7_xen/sys/netinet/ip_dummynet.c
projects/releng_7_xen/sys/netinet/ip_fw.h
projects/releng_7_xen/sys/netinet/ip_fw2.c
projects/releng_7_xen/sys/netinet/ip_options.c
projects/releng_7_xen/sys/netinet/libalias/alias_db.c
projects/releng_7_xen/sys/netinet/raw_ip.c
projects/releng_7_xen/sys/netinet/tcp_debug.c
projects/releng_7_xen/sys/netinet/tcp_input.c
projects/releng_7_xen/sys/netinet/tcp_subr.c
projects/releng_7_xen/sys/netinet/udp_usrreq.c
projects/releng_7_xen/sys/netinet6/in6_pcb.c
projects/releng_7_xen/sys/netinet6/ip6_output.c
projects/releng_7_xen/sys/netinet6/mld6.c
projects/releng_7_xen/sys/netinet6/udp6_usrreq.c
projects/releng_7_xen/sys/nfsserver/nfs_serv.c
projects/releng_7_xen/sys/pc98/pc98/pc98_machdep.c
projects/releng_7_xen/sys/pc98/pc98/pc98_machdep.h
projects/releng_7_xen/sys/powerpc/include/dbdma.h
projects/releng_7_xen/sys/powerpc/powermac/dbdma.c
projects/releng_7_xen/sys/powerpc/powermac/dbdmavar.h
projects/releng_7_xen/sys/security/audit/audit.c
projects/releng_7_xen/sys/security/mac/mac_framework.h
projects/releng_7_xen/sys/security/mac/mac_inet.c
projects/releng_7_xen/sys/security/mac/mac_policy.h
projects/releng_7_xen/sys/security/mac_biba/mac_biba.c
projects/releng_7_xen/sys/security/mac_lomac/mac_lomac.c
projects/releng_7_xen/sys/security/mac_mls/mac_mls.c
projects/releng_7_xen/sys/security/mac_partition/mac_partition.c
projects/releng_7_xen/sys/security/mac_seeotheruids/mac_seeotheruids.c
projects/releng_7_xen/sys/security/mac_stub/mac_stub.c
projects/releng_7_xen/sys/security/mac_test/mac_test.c
projects/releng_7_xen/sys/sys/syscallsubr.h
projects/releng_7_xen/sys/sys/systm.h
projects/releng_7_xen/sys/sys/un.h
projects/releng_7_xen/sys/ufs/ffs/ffs_snapshot.c
projects/releng_7_xen/usr.sbin/nscd/ (props changed)
projects/releng_7_xen/usr.sbin/nscd/agent.c
projects/releng_7_xen/usr.sbin/nscd/agents/group.c
projects/releng_7_xen/usr.sbin/nscd/agents/passwd.c
projects/releng_7_xen/usr.sbin/nscd/agents/services.c
projects/releng_7_xen/usr.sbin/nscd/cachelib.c
projects/releng_7_xen/usr.sbin/nscd/cacheplcs.c
projects/releng_7_xen/usr.sbin/nscd/config.c
projects/releng_7_xen/usr.sbin/nscd/hashtable.h
projects/releng_7_xen/usr.sbin/nscd/mp_rs_query.c
projects/releng_7_xen/usr.sbin/nscd/mp_ws_query.c
projects/releng_7_xen/usr.sbin/nscd/nscd.c
projects/releng_7_xen/usr.sbin/nscd/nscdcli.c
projects/releng_7_xen/usr.sbin/nscd/query.c
projects/releng_7_xen/usr.sbin/pkg_install/ (props changed)
projects/releng_7_xen/usr.sbin/pkg_install/add/main.c
projects/releng_7_xen/usr.sbin/sysinstall/ (props changed)
projects/releng_7_xen/usr.sbin/sysinstall/config.c
projects/releng_7_xen/usr.sbin/sysinstall/devices.c
projects/releng_7_xen/usr.sbin/sysinstall/globals.c
projects/releng_7_xen/usr.sbin/sysinstall/index.c
projects/releng_7_xen/usr.sbin/sysinstall/keymap.c
projects/releng_7_xen/usr.sbin/sysinstall/package.c
projects/releng_7_xen/usr.sbin/sysinstall/sysinstall.h
Modified: projects/releng_7_xen/crypto/openssh/loginrec.c
==============================================================================
--- projects/releng_7_xen/crypto/openssh/loginrec.c Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/crypto/openssh/loginrec.c Sat Nov 1 18:57:58 2008 (r184527)
@@ -146,7 +146,6 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD$");
#include <sys/types.h>
#include <sys/stat.h>
@@ -689,8 +688,8 @@ construct_utmp(struct logininfo *li,
strncpy(ut->ut_name, li->username,
MIN_SIZEOF(ut->ut_name, li->username));
# ifdef HAVE_HOST_IN_UTMP
- realhostname_sa(ut->ut_host, sizeof ut->ut_host,
- &li->hostaddr.sa, li->hostaddr.sa.sa_len);
+ strncpy(ut->ut_host, li->hostname,
+ MIN_SIZEOF(ut->ut_host, li->hostname));
# endif
# ifdef HAVE_ADDR_IN_UTMP
/* this is just a 32-bit IP address */
Modified: projects/releng_7_xen/crypto/openssh/sshd.c
==============================================================================
--- projects/releng_7_xen/crypto/openssh/sshd.c Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/crypto/openssh/sshd.c Sat Nov 1 18:57:58 2008 (r184527)
@@ -72,6 +72,7 @@ __RCSID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <utmp.h>
#include <openssl/dh.h>
#include <openssl/bn.h>
@@ -238,7 +239,7 @@ u_char *session_id2 = NULL;
u_int session_id2_len = 0;
/* record remote hostname or ip */
-u_int utmp_len = MAXHOSTNAMELEN;
+u_int utmp_len = UT_HOSTSIZE;
/* options.max_startup sized array of fd ints */
int *startup_pipes = NULL;
Modified: projects/releng_7_xen/lib/libarchive/archive_write_disk.c
==============================================================================
--- projects/releng_7_xen/lib/libarchive/archive_write_disk.c Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/lib/libarchive/archive_write_disk.c Sat Nov 1 18:57:58 2008 (r184527)
@@ -641,10 +641,6 @@ _archive_write_finish_entry(struct archi
int r2 = set_mode(a, a->mode);
if (r2 < ret) ret = r2;
}
- if (a->todo & TODO_TIMES) {
- int r2 = set_time(a);
- if (r2 < ret) ret = r2;
- }
if (a->todo & TODO_ACLS) {
int r2 = set_acls(a);
if (r2 < ret) ret = r2;
@@ -657,6 +653,10 @@ _archive_write_finish_entry(struct archi
int r2 = set_fflags(a);
if (r2 < ret) ret = r2;
}
+ if (a->todo & TODO_TIMES) {
+ int r2 = set_time(a);
+ if (r2 < ret) ret = r2;
+ }
/* If there's an fd, we can close it now. */
if (a->fd >= 0) {
Modified: projects/releng_7_xen/lib/libarchive/test/Makefile
==============================================================================
--- projects/releng_7_xen/lib/libarchive/test/Makefile Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/lib/libarchive/test/Makefile Sat Nov 1 18:57:58 2008 (r184527)
@@ -9,6 +9,7 @@ LA_SRCS!=make -f ${LA_SRCDIR}/Makefile -
TESTS= \
test_acl_basic.c \
+ test_acl_freebsd.c \
test_acl_pax.c \
test_archive_api_feature.c \
test_bad_fd.c \
Modified: projects/releng_7_xen/lib/libc/stdlib/grantpt.3
==============================================================================
--- projects/releng_7_xen/lib/libc/stdlib/grantpt.3 Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/lib/libc/stdlib/grantpt.3 Sat Nov 1 18:57:58 2008 (r184527)
@@ -212,11 +212,6 @@ and
functions appeared in
.Fx 5.0 .
.Sh NOTES
-The purpose of the
-.Fn unlockpt
-function has no meaning in
-.Fx .
-.Pp
The flag
.Dv O_NOCTTY
is included for compatibility; in
Modified: projects/releng_7_xen/lib/libc/stdlib/grantpt.c
==============================================================================
--- projects/releng_7_xen/lib/libc/stdlib/grantpt.c Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/lib/libc/stdlib/grantpt.c Sat Nov 1 18:57:58 2008 (r184527)
@@ -281,14 +281,20 @@ invalid:
int
unlockpt(int fildes)
{
+ const char *slave;
/*
- * Unlocking a master/slave pseudo-terminal pair has no meaning in a
- * non-streams PTY environment. However, we do ensure fildes is a
- * valid master pseudo-terminal device.
+ * Even though unlocking a PTY has no meaning in a non-streams
+ * PTY environment, make this function call revoke() to ensure
+ * the PTY slave device is not being evesdropped.
*/
- if (ptsname(fildes) == NULL)
+ if ((slave = ptsname(fildes)) == NULL)
return (-1);
+ if (revoke(slave) == -1) {
+ errno = EINVAL;
+ return (-1);
+ }
+
return (0);
}
Modified: projects/releng_7_xen/lib/libfetch/http.c
==============================================================================
--- projects/releng_7_xen/lib/libfetch/http.c Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/lib/libfetch/http.c Sat Nov 1 18:57:58 2008 (r184527)
@@ -1064,6 +1064,7 @@ http_request(struct url *URL, const char
if (url->offset == size && url->length == 0) {
/* asked for 0 bytes; fake it */
offset = url->offset;
+ clength = -1;
conn->err = HTTP_OK;
break;
} else {
Modified: projects/releng_7_xen/lib/libutil/pty.c
==============================================================================
--- projects/releng_7_xen/lib/libutil/pty.c Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/lib/libutil/pty.c Sat Nov 1 18:57:58 2008 (r184527)
@@ -56,37 +56,26 @@ openpty(int *amaster, int *aslave, char
const char *slavename;
int master, slave;
- master = posix_openpt(O_RDWR);
+ master = posix_openpt(O_RDWR|O_NOCTTY);
if (master == -1)
return (-1);
- if (grantpt(master) == -1) {
- close(master);
- return (-1);
- }
+ if (grantpt(master) == -1)
+ goto bad;
+
+ if (unlockpt(master) == -1)
+ goto bad;
slavename = ptsname(master);
- if (slavename == NULL) {
- close(master);
- return (-1);
- }
+ if (slavename == NULL)
+ goto bad;
- if (revoke(slavename) == -1) {
- close(master);
- return (-1);
- }
+ if (revoke(slavename) == -1)
+ goto bad;
slave = open(slavename, O_RDWR);
- if (slave == -1) {
- close(master);
- return (-1);
- }
-
- if (unlockpt(master) == -1) {
- close(master);
- close(slave);
- return (-1);
- }
+ if (slave == -1)
+ goto bad;
*amaster = master;
*aslave = slave;
@@ -99,6 +88,9 @@ openpty(int *amaster, int *aslave, char
ioctl(slave, TIOCSWINSZ, (char *)winp);
return (0);
+
+bad: close(master);
+ return (-1);
}
int
Modified: projects/releng_7_xen/libexec/rtld-elf/rtld_lock.c
==============================================================================
--- projects/releng_7_xen/libexec/rtld-elf/rtld_lock.c Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/libexec/rtld-elf/rtld_lock.c Sat Nov 1 18:57:58 2008 (r184527)
@@ -184,7 +184,7 @@ rtld_lock_t rtld_phdr_lock = &rtld_locks
int
rlock_acquire(rtld_lock_t lock)
{
- if (thread_mask_set(lock->mask)) {
+ if (thread_mask_set(lock->mask) & lock->mask) {
dbg("rlock_acquire: recursed");
return (0);
}
@@ -195,7 +195,7 @@ rlock_acquire(rtld_lock_t lock)
int
wlock_acquire(rtld_lock_t lock)
{
- if (thread_mask_set(lock->mask)) {
+ if (thread_mask_set(lock->mask) & lock->mask) {
dbg("wlock_acquire: recursed");
return (0);
}
Modified: projects/releng_7_xen/release/Makefile
==============================================================================
--- projects/releng_7_xen/release/Makefile Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/release/Makefile Sat Nov 1 18:57:58 2008 (r184527)
@@ -192,6 +192,7 @@ MNT= /mnt
.undef MAKE_FLOPPIES
.if ${TARGET_ARCH} == "i386"
MAKE_FLOPPIES= true
+MAKE_DVD=
SEPARATE_LIVEFS=
SPLIT_MFSROOT=
.if ${TARGET} == "pc98"
@@ -221,6 +222,7 @@ MFSLABEL= auto
SEPARATE_LIVEFS=
.elif ${TARGET_ARCH} == "amd64"
MAKE_FLOPPIES= true
+MAKE_DVD=
FLOPPYSIZE= 1440
FLOPPYSPLITSIZE= 1392
FLOPPYINODE= 40000
@@ -261,6 +263,9 @@ CD_BOOT= ${CD}/bootonly
CD_DISC1= ${CD}/disc1
CD_DISC2= ${CD}/disc2
CD_DISC3= ${CD}/disc3
+.if defined(MAKE_DVD)
+CD_DVD1= ${CD}/dvd1
+.endif
.if !defined(NODOC)
CD_DOCS= ${CD}/docs
.endif
@@ -479,6 +484,7 @@ release rerelease:
KERNELS \
KERNELS_BASE \
KERNEL_FLAGS \
+ MAKE_DVD \
MAKE_FLOPPIES \
MAKE_ISOS \
NOCDROM \
@@ -924,6 +930,18 @@ cdrom.1:
find . -depth -print | cpio -dumpl ${CD_LIVEFS} ) ; \
fi \
done
+.if defined(MAKE_DVD)
+ @echo "Building DVD filesystem image as well as CDROM"
+ @mkdir -p ${CD_DVD1}/${BUILDNAME}
+ @for i in ${DISTRIBUTIONS} ; \
+ do \
+ if [ -d ${RD}/trees/$${i} ] ; then \
+ chflags -R noschg ${RD}/trees/$${i} || true ; \
+ ( cd ${RD}/trees/$${i} && \
+ find . -depth -print | cpio -dumpl ${CD_DVD1} ) ; \
+ fi \
+ done
+.endif
@echo "Copy GENERIC kernel to boot area"
@cp -Rp ${RD}/kernels/GENERIC/ ${CD_LIVEFS}/boot/kernel
@rm -f ${CD_LIVEFS}/boot/kernel/*.symbols
@@ -942,6 +960,23 @@ cdrom.1:
@cp ${RD}/trees/base/boot/device.hints ${CD_LIVEFS}/boot/device.hints
.endif
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf
+.if defined(MAKE_DVD)
+ @cp -Rp ${RD}/kernels/GENERIC/ ${CD_DVD1}/boot/kernel
+ @rm -f ${CD_DVD1}/boot/kernel/*.symbols
+ @rm -f ${CD_DVD1}/.profile
+ @cp ${.CURDIR}/fixit.profile ${CD_DVD1}/.profile
+ @ln -sf /rescue ${CD_DVD1}/stand
+ @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD1}/cdrom.inf
+ @rm -f ${CD_DVD1}/boot/loader.conf
+ @cp ${RD}/mfsroot/mfsroot.gz ${CD_DVD1}/boot/mfsroot.gz
+ @echo 'mfsroot_load="YES"' > ${CD_DVD1}/boot/loader.conf
+ @echo 'mfsroot_type="mfs_root"' >> ${CD_DVD1}/boot/loader.conf
+ @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DVD1}/boot/loader.conf
+.if exists(${RD}/trees/base/boot/device.hints)
+ @rm -f ${CD_DVD1}/boot/device.hints
+ @cp ${RD}/trees/base/boot/device.hints ${CD_DVD1}/boot/device.hints
+.endif
+.endif
touch ${.TARGET}
# Build disc1, disc2 and disc3 cdrom images
@@ -980,11 +1015,37 @@ cdrom.2:
@mkdir -p ${CD_DISC3}
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC3}/cdrom.inf
@echo "CD_VOLUME = 3" >> ${CD_DISC3}/cdrom.inf
+.if defined(MAKE_DVD)
+.if defined(MAKE_FLOPPIES)
+ @cd ${RD} && find floppies -print | cpio -dumpl ${CD_DVD1}
+.endif
+ @cd ${RD}/dists && find . -print | cpio -dumpl ${CD_DVD1}/${BUILDNAME}
.if !defined(NODOC)
- echo "Building CDROM docs filesystem image"
+ @for i in ${DIST_DOCS_ARCH_INDEP}; do \
+ cp ${RND}/${RELNOTES_LANG}/$$i/article.txt \
+ ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+ cp ${RND}/${RELNOTES_LANG}/$$i/article.html \
+ ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+ done
+ @for i in ${DIST_DOCS_ARCH_DEP}; do \
+ cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt \
+ ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+ cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.html \
+ ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+ done
+ @cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DVD1}
+.endif
+ @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD1}/cdrom.inf
+ @echo "CD_VOLUME = 1" >> ${CD_DVD1}/cdrom.inf
+.endif
+.if !defined(NODOC)
+ @echo "Building CDROM docs filesystem image"
@mkdir -p ${CD_DOCS}
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf
@mkdir -p ${CD_DOCS}/usr/share/doc
+.if defined(MAKE_DVD)
+ @mkdir -p ${CD_DVD1}/usr/share/doc
+.endif
@for i in `ls ${CD_LIVEFS}/usr/share/doc`; do \
if [ -L ${CD_LIVEFS}/usr/share/doc/$$i -o \
-d /usr/doc/$$i ]; then \
@@ -992,6 +1053,10 @@ cdrom.2:
${CD_DOCS}/usr/share/doc; \
fi \
done
+.if defined(MAKE_DVD)
+ @cd ${CD_DOCS}/usr/share/doc && find . -print | \
+ cpio -dumpl ${CD_DVD1}/usr/share/doc
+.endif
.endif
touch ${.TARGET}
@@ -1025,6 +1090,9 @@ CD_DISC2_PKGS= ${CD_PACKAGE_TREE}/disc2
.if exists(${CD_PACKAGE_TREE}/disc3)
CD_DISC3_PKGS= ${CD_PACKAGE_TREE}/disc3
.endif
+.if exists(${CD_PACKAGE_TREE}/dvd1)
+CD_DVD_PKGS= ${CD_PACKAGE_TREE}/dvd1
+.endif
.endif
.endif
@@ -1048,6 +1116,12 @@ iso.1:
FreeBSD_Packages_2 \
${CD}/${BUILDNAME}-${TARGET}-disc3.iso ${CD_DISC3} \
${CD_DISC3_PKGS}
+.if defined(MAKE_DVD)
+ @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
+ FreeBSD_Install \
+ ${CD}/${BUILDNAME}-${TARGET}-dvd1.iso ${CD_DVD1} \
+ ${CD_DVD1_PKGS}
+.endif
.if !defined(NODOC)
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \
FreeBSD_Documentation \
Modified: projects/releng_7_xen/release/doc/en_US.ISO8859-1/hardware/article.sgml
==============================================================================
--- projects/releng_7_xen/release/doc/en_US.ISO8859-1/hardware/article.sgml Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/release/doc/en_US.ISO8859-1/hardware/article.sgml Sat Nov 1 18:57:58 2008 (r184527)
@@ -91,7 +91,7 @@
</listitem>
<listitem>
- <para>&intel; 64-bit &xeon; (<quote>Nacona</quote>).
+ <para>&intel; 64-bit &xeon; (<quote>Nocona</quote>).
This processor is fabricated on 90nm process technology, and operates
with 2.80 to 3.60 GHz (FSB 800MHz) and &intel; E7520/E7525/E7320 chipsets.</para>
</listitem>
Modified: projects/releng_7_xen/release/doc/zh_CN.GB2312/hardware/article.sgml
==============================================================================
--- projects/releng_7_xen/release/doc/zh_CN.GB2312/hardware/article.sgml Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/release/doc/zh_CN.GB2312/hardware/article.sgml Sat Nov 1 18:57:58 2008 (r184527)
@@ -88,7 +88,7 @@
</listitem>
<listitem>
- <para>&intel; 64-λ &xeon; (<quote>Nacona</quote>)¡£
+ <para>&intel; 64-λ &xeon; (<quote>Nocona</quote>)¡£
ÕâÀà´¦ÀíÆ÷²ÉÓà 90nm ÖƳ̹¤ÒÕÖÆÔ죬 ÅäºÏ &intel; E7520/E7525/E7320 оƬ×飬
Äܹ»ÔËÐÐÓÚ 2.80 µ½ 3.60 GHz (FSB 800MHz)¡£</para>
</listitem>
@@ -392,7 +392,7 @@
<!--
The FreeBSD Simplified Chinese Project
- Original Revision: 175946
+ Original Revision: 184311
-->
<!--
Modified: projects/releng_7_xen/release/doc/zh_CN.GB2312/relnotes/article.sgml
==============================================================================
--- projects/releng_7_xen/release/doc/zh_CN.GB2312/relnotes/article.sgml Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/release/doc/zh_CN.GB2312/relnotes/article.sgml Sat Nov 1 18:57:58 2008 (r184527)
@@ -6,7 +6,7 @@
%release;
<!-- The FreeBSD Simplified Chinese Project -->
-<!-- Original Revision: 182188 -->
+<!-- Original Revision: 183702 -->
<!-- Text constants which probably don't need to be changed.-->
<!-- The marker for MFCs. -->
@@ -129,7 +129,7 @@
<title>¶ÔÄں˵ĸĶ¯</title>
<para>ΪÄں˵÷ÊÔÆ÷ &man.ddb.4; ÐÂÔöÁËÊä³ö²¶×½»úÖÆ¡£
- À´×Ô &man.ddb.4; µÄÝ”ÈëºÍÊä³öÄÚÈÝ»á×Ô¶¯²¶×½µ½Ò»¸öÄڴ滺³åÇø£¬
+ À´×Ô &man.ddb.4; µÄÊäÈëºÍÊä³öÄÚÈÝ»á×Ô¶¯²¶×½µ½Ò»¸öÄڴ滺³åÇø£¬
ÒÔ±ãÔÚËæºóͨ¹ý &man.sysctl.8; »ò textdump À´¶ÁÈ¡ºÍ·ÖÎö¡£
ÐÂÔöµÄ <command>capture</command> ÃüÁî¿ÉÒÔ¿ØÖÆÕâ¸ö¹¦ÄÜ¡£</para>
@@ -253,6 +253,12 @@
<para><application>OpenPAM</application> ´Ó
Figwort °æÉý¼¶µ½ÁË Hydrangea °æ¡£</para>
+ <para><application>OpenSSH</application> ´Ó
+ 4.5p1 °æÉý¼¶µ½ÁË 5.1p1 °æ¡£</para>
+
+ <para><application>sendmail</application> ´Ó
+ 8.14.2 °æÉý¼¶µ½ÁË 8.14.3 °æ¡£</para>
+
<para>ʱÇøÊý¾Ý¿â´Ó
<application>tzdata2007h</application> °æÉý¼¶µ½ÁË
<application>tzdata2008b</application> °æ¡£</para>
Modified: projects/releng_7_xen/sbin/dhclient/dhclient.c
==============================================================================
--- projects/releng_7_xen/sbin/dhclient/dhclient.c Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/sbin/dhclient/dhclient.c Sat Nov 1 18:57:58 2008 (r184527)
@@ -2317,12 +2317,16 @@ check_option(struct client_lease *l, int
case DHO_NETBIOS_DD_SERVER:
case DHO_FONT_SERVERS:
case DHO_DHCP_SERVER_IDENTIFIER:
+ case DHO_NISPLUS_SERVERS:
+ case DHO_MOBILE_IP_HOME_AGENT:
case DHO_SMTP_SERVER:
case DHO_POP_SERVER:
case DHO_NNTP_SERVER:
case DHO_WWW_SERVER:
case DHO_FINGER_SERVER:
case DHO_IRC_SERVER:
+ case DHO_STREETTALK_SERVER:
+ case DHO_STREETTALK_DA_SERVER:
if (!ipv4addrs(opbuf)) {
warning("Invalid IP address in option: %s", opbuf);
return (0);
@@ -2330,6 +2334,8 @@ check_option(struct client_lease *l, int
return (1) ;
case DHO_HOST_NAME:
case DHO_NIS_DOMAIN:
+ case DHO_NISPLUS_DOMAIN:
+ case DHO_TFTP_SERVER_NAME:
if (!res_hnok(sbuf)) {
warning("Bogus Host Name option %d: %s (%s)", option,
sbuf, opbuf);
@@ -2388,6 +2394,7 @@ check_option(struct client_lease *l, int
case DHO_DHCP_REBINDING_TIME:
case DHO_DHCP_CLASS_IDENTIFIER:
case DHO_DHCP_CLIENT_IDENTIFIER:
+ case DHO_BOOTFILE_NAME:
case DHO_DHCP_USER_CLASS_ID:
case DHO_END:
return (1);
Modified: projects/releng_7_xen/sbin/dhclient/dhcp.h
==============================================================================
--- projects/releng_7_xen/sbin/dhclient/dhcp.h Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/sbin/dhclient/dhcp.h Sat Nov 1 18:57:58 2008 (r184527)
@@ -155,12 +155,19 @@ struct dhcp_packet {
#define DHO_DHCP_REBINDING_TIME 59
#define DHO_DHCP_CLASS_IDENTIFIER 60
#define DHO_DHCP_CLIENT_IDENTIFIER 61
+#define DHO_NISPLUS_DOMAIN 64
+#define DHO_NISPLUS_SERVERS 65
+#define DHO_TFTP_SERVER_NAME 66
+#define DHO_BOOTFILE_NAME 67
+#define DHO_MOBILE_IP_HOME_AGENT 68
#define DHO_SMTP_SERVER 69
#define DHO_POP_SERVER 70
#define DHO_NNTP_SERVER 71
#define DHO_WWW_SERVER 72
#define DHO_FINGER_SERVER 73
#define DHO_IRC_SERVER 74
+#define DHO_STREETTALK_SERVER 75
+#define DHO_STREETTALK_DA_SERVER 76
#define DHO_DHCP_USER_CLASS_ID 77
#define DHO_CLASSLESS_ROUTES 121
#define DHO_END 255
Modified: projects/releng_7_xen/sbin/dhclient/tables.c
==============================================================================
--- projects/releng_7_xen/sbin/dhclient/tables.c Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/sbin/dhclient/tables.c Sat Nov 1 18:57:58 2008 (r184527)
@@ -387,13 +387,25 @@ unsigned char dhcp_option_default_priori
DHO_FONT_SERVERS,
DHO_X_DISPLAY_MANAGER,
DHO_DHCP_PARAMETER_REQUEST_LIST,
+ DHO_NISPLUS_DOMAIN,
+ DHO_NISPLUS_SERVERS,
+ DHO_TFTP_SERVER_NAME,
+ DHO_BOOTFILE_NAME,
+ DHO_MOBILE_IP_HOME_AGENT,
+ DHO_SMTP_SERVER,
+ DHO_POP_SERVER,
+ DHO_NNTP_SERVER,
+ DHO_WWW_SERVER,
+ DHO_FINGER_SERVER,
+ DHO_IRC_SERVER,
+ DHO_STREETTALK_SERVER,
+ DHO_STREETTALK_DA_SERVER,
/* Presently-undefined options... */
- 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
- 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 122, 123, 124, 125, 126, 127, 128, 129, 130,
+ 62, 63, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 122, 123, 124, 125, 126, 127, 128, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
Modified: projects/releng_7_xen/sbin/fsck_ffs/pass5.c
==============================================================================
--- projects/releng_7_xen/sbin/fsck_ffs/pass5.c Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/sbin/fsck_ffs/pass5.c Sat Nov 1 18:57:58 2008 (r184527)
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
#include "fsck.h"
-static void check_maps(u_char *, u_char *, int, int, const char *, int *, int, int);
+static void check_maps(u_char *, u_char *, int, ufs2_daddr_t, const char *, int *, int, int);
void
pass5(void)
@@ -291,10 +291,17 @@ pass5(void)
sump[run]++;
}
}
- cstotal.cs_nffree += newcg->cg_cs.cs_nffree;
- cstotal.cs_nbfree += newcg->cg_cs.cs_nbfree;
- cstotal.cs_nifree += newcg->cg_cs.cs_nifree;
- cstotal.cs_ndir += newcg->cg_cs.cs_ndir;
+ if (bkgrdflag != 0) {
+ cstotal.cs_nffree += cg->cg_cs.cs_nffree;
+ cstotal.cs_nbfree += cg->cg_cs.cs_nbfree;
+ cstotal.cs_nifree += cg->cg_cs.cs_nifree;
+ cstotal.cs_ndir += cg->cg_cs.cs_ndir;
+ } else {
+ cstotal.cs_nffree += newcg->cg_cs.cs_nffree;
+ cstotal.cs_nbfree += newcg->cg_cs.cs_nbfree;
+ cstotal.cs_nifree += newcg->cg_cs.cs_nifree;
+ cstotal.cs_ndir += newcg->cg_cs.cs_ndir;
+ }
cs = &fs->fs_cs(fs, c);
if (cursnapshot == 0 &&
memcmp(&newcg->cg_cs, cs, sizeof *cs) != 0 &&
@@ -321,13 +328,17 @@ pass5(void)
}
if (excessdirs > 0)
check_maps(cg_inosused(newcg), cg_inosused(cg),
- inomapsize, cg->cg_cgx * fs->fs_ipg, "DIR",
+ inomapsize,
+ cg->cg_cgx * (ufs2_daddr_t) fs->fs_ipg,
+ "DIR",
freedirs, 0, excessdirs);
check_maps(cg_inosused(newcg), cg_inosused(cg),
- inomapsize, cg->cg_cgx * fs->fs_ipg, "FILE",
+ inomapsize,
+ cg->cg_cgx * (ufs2_daddr_t) fs->fs_ipg, "FILE",
freefiles, excessdirs, fs->fs_ipg);
check_maps(cg_blksfree(cg), cg_blksfree(newcg),
- blkmapsize, cg->cg_cgx * fs->fs_fpg, "FRAG",
+ blkmapsize,
+ cg->cg_cgx * (ufs2_daddr_t) fs->fs_fpg, "FRAG",
freeblks, 0, fs->fs_fpg);
}
if (cursnapshot == 0 &&
@@ -407,7 +418,7 @@ check_maps(
u_char *map1, /* map of claimed allocations */
u_char *map2, /* map of determined allocations */
int mapsize, /* size of above two maps */
- int startvalue, /* resource value for first element in map */
+ ufs2_daddr_t startvalue, /* resource value for first element in map */
const char *name, /* name of resource found in maps */
int *opcode, /* sysctl opcode to free resource */
int skip, /* number of entries to skip before starting to free */
@@ -415,8 +426,8 @@ check_maps(
{
# define BUFSIZE 16
char buf[BUFSIZE];
- long i, j, k, l, m, n, size;
- int astart, aend, ustart, uend;
+ long i, j, k, l, m, size;
+ ufs2_daddr_t n, astart, aend, ustart, uend;
void (*msg)(const char *fmt, ...);
if (bkgrdflag)
@@ -443,10 +454,12 @@ check_maps(
continue;
}
if (astart == aend)
- (*msg)("ALLOCATED %s %d MARKED FREE\n",
+ (*msg)("ALLOCATED %s %" PRId64
+ " MARKED FREE\n",
name, astart);
else
- (*msg)("%s %sS %d-%d MARKED FREE\n",
+ (*msg)("%s %sS %" PRId64 "-%" PRId64
+ " MARKED FREE\n",
"ALLOCATED", name, astart, aend);
astart = aend = n;
} else {
@@ -472,10 +485,12 @@ check_maps(
if (size > limit)
size = limit;
if (debug && size == 1)
- pwarn("%s %s %d MARKED USED\n",
+ pwarn("%s %s %" PRId64
+ " MARKED USED\n",
"UNALLOCATED", name, ustart);
else if (debug)
- pwarn("%s %sS %d-%ld MARKED USED\n",
+ pwarn("%s %sS %" PRId64 "-%" PRId64
+ " MARKED USED\n",
"UNALLOCATED", name, ustart,
ustart + size - 1);
if (bkgrdflag != 0) {
@@ -497,9 +512,11 @@ check_maps(
}
if (astart != -1) {
if (astart == aend)
- (*msg)("ALLOCATED %s %d MARKED FREE\n", name, astart);
+ (*msg)("ALLOCATED %s %" PRId64
+ " MARKED FREE\n", name, astart);
else
- (*msg)("ALLOCATED %sS %d-%d MARKED FREE\n",
+ (*msg)("ALLOCATED %sS %" PRId64 "-%" PRId64
+ " MARKED FREE\n",
name, astart, aend);
}
if (ustart != -1) {
@@ -514,10 +531,12 @@ check_maps(
size = limit;
if (debug) {
if (size == 1)
- pwarn("UNALLOCATED %s %d MARKED USED\n",
+ pwarn("UNALLOCATED %s %" PRId64
+ " MARKED USED\n",
name, ustart);
else
- pwarn("UNALLOCATED %sS %d-%ld MARKED USED\n",
+ pwarn("UNALLOCATED %sS %" PRId64 "-%" PRId64
+ " MARKED USED\n",
name, ustart, ustart + size - 1);
}
if (bkgrdflag != 0) {
Modified: projects/releng_7_xen/share/man/man4/Makefile
==============================================================================
--- projects/releng_7_xen/share/man/man4/Makefile Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/share/man/man4/Makefile Sat Nov 1 18:57:58 2008 (r184527)
@@ -8,6 +8,7 @@ MAN= aac.4 \
acpi_video.4 \
adv.4 \
adw.4 \
+ ae.4 \
age.4 \
agp.4 \
aha.4 \
Modified: projects/releng_7_xen/share/man/man4/ata.4
==============================================================================
--- projects/releng_7_xen/share/man/man4/ata.4 Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/share/man/man4/ata.4 Sat Nov 1 18:57:58 2008 (r184527)
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 31, 2008
+.Dd October 4, 2008
.Dt ATA 4
.Os
.Sh NAME
@@ -121,9 +121,9 @@ Cyrix 5530.
.It HighPoint:
HPT302, HPT366, HPT368, HPT370, HPT371, HPT372, HPT372N, HPT374.
.It Intel:
-6300ESB, 31244, PIIX, PIIX3, PIIX4, ESB2, ICH, ICH0, ICH2, ICH3, ICH4, ICH5, ICH6, ICH7, ICH8, ICH9.
+6300ESB, 31244, PIIX, PIIX3, PIIX4, ESB2, ICH, ICH0, ICH2, ICH3, ICH4, ICH5, ICH6, ICH7, ICH8, ICH9, ICH10.
.It ITE:
-IT8211F, IT8212F.
+IT8211F, IT8212F, IT8213F.
.It JMicron:
JMB360, JMB361, JMB363, JMB365, JMB366, JMB368.
.It Marvell
@@ -171,7 +171,8 @@ the
driver has detected that the required 80 conductor cable is not present
or could not be detected properly,
or that one of the devices on the channel only accepts up
-to UDMA2/ATA33. The
+to UDMA2/ATA33.
+The
.Va hw.ata.ata_dma_check_80pin
tunable can be set to 0 to disable this check.
.Pp
Modified: projects/releng_7_xen/share/man/man4/vlan.4
==============================================================================
--- projects/releng_7_xen/share/man/man4/vlan.4 Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/share/man/man4/vlan.4 Sat Nov 1 18:57:58 2008 (r184527)
@@ -122,6 +122,7 @@ The whole issue is very specific to a pa
.Pp
By now, the list of physical interfaces able of full VLAN processing
in the hardware is limited to the following devices:
+.Xr ae 4 ,
.Xr age 4 ,
.Xr bce 4 ,
.Xr bge 4 ,
Modified: projects/releng_7_xen/share/zoneinfo/africa
==============================================================================
--- projects/releng_7_xen/share/zoneinfo/africa Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/share/zoneinfo/africa Sat Nov 1 18:57:58 2008 (r184527)
@@ -1,4 +1,4 @@
-# @(#)africa 8.16
+# @(#)africa 8.17
# <pre>
# This data is by no means authoritative; if you think you know better,
@@ -453,11 +453,19 @@ Zone Africa/Nouakchott -1:03:48 - LMT 19
# year 2008 - 2009 will, therefore, be effective as from 26 October 2008
# and end on 29 March 2009.
+# From Ed Maste (2008-10-07):
+# THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
+# beginning / ending of summer time is 2 o'clock standard time in the
+# morning of the last Sunday of October / last Sunday of March.
+# <a href="http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf">
+# http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
+# </a>
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Mauritius 1982 only - Oct 10 0:00 1:00 S
Rule Mauritius 1983 only - Mar 21 0:00 0 -
-Rule Mauritius 2008 max - Oct lastSun 2:00 1:00 S
-Rule Mauritius 2009 max - Mar lastSun 2:00 0 -
+Rule Mauritius 2008 max - Oct lastSun 2:00s 1:00 S
+Rule Mauritius 2009 max - Mar lastSun 2:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
4:00 Mauritius MU%sT # Mauritius Time
Modified: projects/releng_7_xen/share/zoneinfo/asia
==============================================================================
--- projects/releng_7_xen/share/zoneinfo/asia Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/share/zoneinfo/asia Sat Nov 1 18:57:58 2008 (r184527)
@@ -1,4 +1,4 @@
-# @(#)asia 8.23
+# @(#)asia 8.24
# <pre>
# This data is by no means authoritative; if you think you know better,
@@ -1957,8 +1957,20 @@ Rule Syria 2007 only - Nov Fri>=1 0:00
# compilers can't handle or having multiple Rules (a la Israel).
# For now, use "Apr Fri>=1", and go with IATA on a uniform Sep 30 end.
+# From Steffen Thorsen (2008-10-07):
+# Syria has now officially decided to end DST on 2008-11-01 this year,
+# according to the following article in the Syrian Arab News Agency (SANA).
+#
+# The article is in Arabic, and seems to tell that they will go back to
+# winter time on 2008-11-01 at 00:00 local daylight time (delaying/setting
+# clocks back 60 minutes).
+#
+# <a href="http://sana.sy/ara/2/2008/10/07/195459.htm">
+# http://sana.sy/ara/2/2008/10/07/195459.htm
+# </a>
+
Rule Syria 2008 max - Apr Fri>=1 0:00 1:00 S
-Rule Syria 2008 max - Oct 1 0:00 0 -
+Rule Syria 2008 max - Nov 1 0:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq
Modified: projects/releng_7_xen/share/zoneinfo/southamerica
==============================================================================
--- projects/releng_7_xen/share/zoneinfo/southamerica Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/share/zoneinfo/southamerica Sat Nov 1 18:57:58 2008 (r184527)
@@ -1,4 +1,4 @@
-# @(#)southamerica 8.29
+# @(#)southamerica 8.33
# <pre>
# This data is by no means authoritative; if you think you know better,
@@ -177,6 +177,42 @@ Rule Arg 2000 only - Mar 3 0:00 0 -
# http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)
# </a>
+# From Rodrigo Severo (2008-10-06):
+# Here is some info available at a Gentoo bug related to TZ on Argentina's DST:
+# ...
+# ------- Comment #1 from [jmdocile] 2008-10-06 16:28 0000 -------
+# Hi, there is a problem with timezone-data-2008e and maybe with
+# timezone-data-2008f
+# Argentinian law [Number] 25.155 is no longer valid.
+# <a href="http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm">
+# http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm
+# </a>
+# The new one is law [Number] 26.350
+# <a href="http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm">
+# http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm
+# </a>
+# So there is no summer time in Argentina for now.
+
+# From Mariano Absatz (2008-10-20):
+# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST in Argentina
+# From 2008-10-19 until 2009-03-15
+# <a href="http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01">
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01
+# </a>
+#
+# Decree 1705/2008 excepting 12 Provinces from applying DST in the summer 2008/2009:
+# Catamarca, La Rioja, Mendoza, Salta, San Juan, San Luis, La Pampa, Neuquen, Rio Negro, Chubut, Santa Cruz
+# and Tierra del Fuego
+# <a href="http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01">
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01
+# </a>
+#
+# Press release 235 dated Saturday October 18th, from the Government of the Province of Jujuy saying
+# it will not apply DST either (even when it was not included in Decree 1705/2008)
+# <a href="http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc">
+# http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+# </a>
+
Rule Arg 2007 only - Dec 30 0:00 1:00 S
Rule Arg 2008 max - Mar Sun>=15 0:00 0 -
Rule Arg 2008 max - Oct Sun>=15 0:00 1:00 S
@@ -327,9 +363,8 @@ Zone America/Argentina/Buenos_Aires -3:5
-4:00 Arg AR%sT 2000 Mar 3
-3:00 Arg AR%sT
#
-# Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
-# Formosa (FM), Salta (SA), Santiago del Estero (SE), Cordoba (CB),
-# La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+# Cordoba (CB), Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN),
+# Chaco (CC), Formosa (FM), Santiago del Estero (SE)
#
# Shanks & Pottenger also make the following claims, which we haven't verified:
# - Formosa switched to -3:00 on 1991-01-07.
@@ -348,6 +383,18 @@ Zone America/Argentina/Cordoba -4:16:48
-4:00 Arg AR%sT 2000 Mar 3
-3:00 Arg AR%sT
#
+# Salta (SA), La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+Zone America/Argentina/Salta -4:21:40 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1991 Mar 3
+ -4:00 - WART 1991 Oct 20
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
+#
# Tucuman (TM)
Zone America/Argentina/Tucuman -4:20:52 - LMT 1894 Oct 31
-4:16:48 - CMT 1920 May
@@ -372,7 +419,8 @@ Zone America/Argentina/La_Rioja -4:27:24
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 Jun 1
-4:00 - WART 2004 Jun 20
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
#
# San Juan (SJ)
Zone America/Argentina/San_Juan -4:34:04 - LMT 1894 Oct 31
@@ -385,7 +433,8 @@ Zone America/Argentina/San_Juan -4:34:04
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 May 31
-4:00 - WART 2004 Jul 25
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
#
# Jujuy (JY)
Zone America/Argentina/Jujuy -4:21:12 - LMT 1894 Oct 31
@@ -399,7 +448,8 @@ Zone America/Argentina/Jujuy -4:21:12 -
-3:00 1:00 ARST 1992
-3:00 Arg AR%sT 1999 Oct 3
-4:00 Arg AR%sT 2000 Mar 3
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
#
# Catamarca (CT), Chubut (CH)
Zone America/Argentina/Catamarca -4:23:08 - LMT 1894 Oct 31
@@ -412,7 +462,8 @@ Zone America/Argentina/Catamarca -4:23:0
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 Jun 1
-4:00 - WART 2004 Jun 20
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
#
# Mendoza (MZ)
Zone America/Argentina/Mendoza -4:35:16 - LMT 1894 Oct 31
@@ -429,7 +480,8 @@ Zone America/Argentina/Mendoza -4:35:16
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 May 23
-4:00 - WART 2004 Sep 26
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
#
# San Luis (SL)
Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31
@@ -457,7 +509,8 @@ Zone America/Argentina/Rio_Gallegos -4:3
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 Jun 1
-4:00 - WART 2004 Jun 20
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
#
# Tierra del Fuego, Antartida e Islas del Atlantico Sur (TF)
Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
@@ -468,7 +521,8 @@ Zone America/Argentina/Ushuaia -4:33:12
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 May 30
-4:00 - WART 2004 Jun 20
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
# Aruba
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Modified: projects/releng_7_xen/share/zoneinfo/zone.tab
==============================================================================
--- projects/releng_7_xen/share/zoneinfo/zone.tab Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/share/zoneinfo/zone.tab Sat Nov 1 18:57:58 2008 (r184527)
@@ -1,4 +1,4 @@
-# @(#)zone.tab 8.18
+# @(#)zone.tab 8.21
#
# TZ zone descriptions
#
@@ -42,14 +42,15 @@ AQ -7824+10654 Antarctica/Vostok Vostok
AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie
AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
-AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF)
-AR -3319-06621 America/Argentina/San_Luis San Luis (SL)
+AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN)
AR -2411-06518 America/Argentina/Jujuy Jujuy (JY)
AR -2649-06513 America/Argentina/Tucuman Tucuman (TM)
AR -2828-06547 America/Argentina/Catamarca Catamarca (CT), Chubut (CH)
AR -2926-06651 America/Argentina/La_Rioja La Rioja (LR)
AR -3132-06831 America/Argentina/San_Juan San Juan (SJ)
AR -3253-06849 America/Argentina/Mendoza Mendoza (MZ)
+AR -3319-06621 America/Argentina/San_Luis San Luis (SL)
AR -5138-06913 America/Argentina/Rio_Gallegos Santa Cruz (SC)
AR -5448-06818 America/Argentina/Ushuaia Tierra del Fuego (TF)
AS -1416-17042 Pacific/Pago_Pago
@@ -293,7 +294,7 @@ NL +5222+00454 Europe/Amsterdam
NO +5955+01045 Europe/Oslo
NP +2743+08519 Asia/Katmandu
NR -0031+16655 Pacific/Nauru
-NU -1901+16955 Pacific/Niue
+NU -1901-16955 Pacific/Niue
NZ -3652+17446 Pacific/Auckland most locations
NZ -4357-17633 Pacific/Chatham Chatham Islands
OM +2336+05835 Asia/Muscat
@@ -384,13 +385,13 @@ US +381515-0854534 America/Kentucky/Loui
US +364947-0845057 America/Kentucky/Monticello Eastern Time - Kentucky - Wayne County
US +394606-0860929 America/Indiana/Indianapolis Eastern Time - Indiana - most locations
US +384038-0873143 America/Indiana/Vincennes Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
-US +411745-0863730 America/Indiana/Knox Eastern Time - Indiana - Starke County
US +410305-0863611 America/Indiana/Winamac Eastern Time - Indiana - Pulaski County
US +382232-0862041 America/Indiana/Marengo Eastern Time - Indiana - Crawford County
+US +382931-0871643 America/Indiana/Petersburg Eastern Time - Indiana - Pike County
US +384452-0850402 America/Indiana/Vevay Eastern Time - Indiana - Switzerland County
US +415100-0873900 America/Chicago Central Time
US +375711-0864541 America/Indiana/Tell_City Central Time - Indiana - Perry County
-US +382931-0871643 America/Indiana/Petersburg Central Time - Indiana - Pike County
+US +411745-0863730 America/Indiana/Knox Central Time - Indiana - Starke County
US +450628-0873651 America/Menominee Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
US +470659-1011757 America/North_Dakota/Center Central Time - North Dakota - Oliver County
US +465042-1012439 America/North_Dakota/New_Salem Central Time - North Dakota - Morton County (except Mandan area)
Modified: projects/releng_7_xen/sys/amd64/amd64/local_apic.c
==============================================================================
--- projects/releng_7_xen/sys/amd64/amd64/local_apic.c Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/sys/amd64/amd64/local_apic.c Sat Nov 1 18:57:58 2008 (r184527)
@@ -401,7 +401,10 @@ lapic_setup_clock(void)
lapic_timer_hz = hz * 2;
else
lapic_timer_hz = hz * 4;
- stathz = lapic_timer_hz / (lapic_timer_hz / 128);
+ if (lapic_timer_hz < 128)
+ stathz = lapic_timer_hz;
+ else
+ stathz = lapic_timer_hz / (lapic_timer_hz / 128);
profhz = lapic_timer_hz;
lapic_timer_period = value / lapic_timer_hz;
Modified: projects/releng_7_xen/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- projects/releng_7_xen/sys/amd64/linux32/linux32_proto.h Sat Nov 1 17:57:20 2008 (r184526)
+++ projects/releng_7_xen/sys/amd64/linux32/linux32_proto.h Sat Nov 1 18:57:58 2008 (r184527)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp
+ * created from FreeBSD: stable/7/sys/amd64/linux32/syscalls.master 184075 2008-10-20 11:15:57Z kib
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -11,6 +11,7 @@
#include <sys/signal.h>
#include <sys/acl.h>
+#include <sys/cpuset.h>
#include <sys/_semaphore.h>
#include <sys/ucontext.h>
@@ -734,6 +735,11 @@ struct linux_sys_futex_args {
char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)];
char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)];
};
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list