CVS commit: src
Module Name:src Committed By: mbalmer Date: Sat Dec 26 11:00:47 UTC 2009 Modified Files: src: UPDATING Log Message: Fold long lines. To generate a diff of this commit: cvs rdiff -u -r1.206 -r1.207 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.206 src/UPDATING:1.207 --- src/UPDATING:1.206 Mon Nov 16 07:45:50 2009 +++ src/UPDATING Sat Dec 26 11:00:46 2009 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.206 2009/11/16 07:45:50 dholland Exp $ +$NetBSD: UPDATING,v 1.207 2009/12/26 11:00:46 mbalmer Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -61,9 +61,9 @@ cleaning your src/tools directory and $TOOLDIR and rebuilding them. 20090126: - The __posix_fadvise50 system call changed assembly stub type. You need to - 'rm -f __posix_fadvise50.*' in the libc build directory to avoid using - the old assembly stub. + The __posix_fadvise50 system call changed assembly stub type. You + need to 'rm -f __posix_fadvise50.*' in the libc build directory + to avoid using the old assembly stub. 20090202: pkg_install now depends on the pkgdb cache for automatic conflict @@ -456,7 +456,8 @@ (If you built the tree without make obj in the past, obsolete files may remain. The command tries to clean everything up) -Symptom:.../sysinst/run.c:xx: warning: initialization from incompatible pointer type +Symptom:.../sysinst/run.c:xx: warning: initialization from incompatible + pointer type Fix: Rebuild and install usr.bin/menuc Symptom:mklocale not found during build in share/locale/ctype
CVS commit: src
Module Name:src
Committed By: mbalmer
Date: Sat Dec 26 14:13:08 UTC 2009
Modified Files:
src: build.sh
Log Message:
'build.sh ... modules' only builds modules, but does not install them,
reflect that in the scripts output. While here, fix the past form of build.
To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.225 src/build.sh:1.226
--- src/build.sh:1.225 Thu Dec 17 15:30:37 2009
+++ src/build.sh Sat Dec 26 14:13:08 2009
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.225 2009/12/17 15:30:37 matt Exp $
+# $NetBSD: build.sh,v 1.226 2009/12/26 14:13:08 mbalmer Exp $
#
# Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -586,7 +586,7 @@
except \`etc'. Useful after distribution or release
kernel=conf Build kernel with config file \`conf'
releasekernel=conf Install kernel built by kernel=conf to RELEASEDIR.
-modules Build and install kernel modules.
+modules Build kernel modules.
rumptestDo a linktest for rump (for developers).
setsCreate binary sets in
RELEASEDIR/RELEASEMACHINEDIR/binary/sets.
@@ -1352,7 +1352,7 @@
eval cat EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy make building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.225 2009/12/17 15:30:37 matt Exp $
+# Generated from: \$NetBSD: build.sh,v 1.226 2009/12/26 14:13:08 mbalmer Exp $
# with these arguments: ${_args}
#
@@ -1512,7 +1512,7 @@
${runcmd} ${makewrapper} ${parallel} do-sys-modules ||
bomb Failed to make do-sys-modules
- statusmsg Successful build kernel modules for NetBSD/${MACHINE} ${DISTRIBVER}
+ statusmsg Successful built kernel modules for NetBSD/${MACHINE} ${DISTRIBVER}
}
installworld()
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Sat Dec 26 16:01:25 UTC 2009 Modified Files: src/sys/arch/arm/at91: at91bus.c src/sys/arch/evbarm/adi_brh: brh_machdep.c src/sys/arch/evbarm/armadillo: armadillo9_machdep.c src/sys/arch/evbarm/beagle: beagle_machdep.c src/sys/arch/evbarm/evbarm: initarm_common.c src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c src/sys/arch/evbarm/gemini: gemini_machdep.c src/sys/arch/evbarm/gumstix: gumstix_machdep.c src/sys/arch/evbarm/hdl_g: hdlg_machdep.c src/sys/arch/evbarm/imx31: imx31lk_machdep.c src/sys/arch/evbarm/integrator: integrator_machdep.c src/sys/arch/evbarm/iq80310: iq80310_machdep.c src/sys/arch/evbarm/iq80321: iq80321_machdep.c src/sys/arch/evbarm/ixdp425: ixdp425_machdep.c src/sys/arch/evbarm/ixm1200: ixm1200_machdep.c src/sys/arch/evbarm/lubbock: lubbock_machdep.c src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c src/sys/arch/evbarm/nslu2: nslu2_machdep.c src/sys/arch/evbarm/osk5912: osk5912_machdep.c src/sys/arch/evbarm/smdk2xx0: smdk2410_machdep.c smdk2800_machdep.c src/sys/arch/evbarm/tisdp24xx: sdp24xx_machdep.c src/sys/arch/evbarm/tsarm: tsarm_machdep.c src/sys/arch/evbarm/viper: viper_machdep.c src/sys/arch/hpcarm/hpcarm: hpc_machdep.c Log Message: Use cpu_* prefix to call cpu_* functions (setttb() - cpu_setttb()); no functional changes. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/at91/at91bus.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/adi_brh/brh_machdep.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/beagle/beagle_machdep.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/evbarm/initarm_common.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/gemini/gemini_machdep.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/gumstix/gumstix_machdep.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/imx31/imx31lk_machdep.c cvs rdiff -u -r1.65 -r1.66 \ src/sys/arch/evbarm/integrator/integrator_machdep.c cvs rdiff -u -r1.77 -r1.78 src/sys/arch/evbarm/iq80310/iq80310_machdep.c cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/iq80321/iq80321_machdep.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c cvs rdiff -u -r1.45 -r1.46 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/lubbock/lubbock_machdep.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/nslu2/nslu2_machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/osk5912/osk5912_machdep.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/tsarm/tsarm_machdep.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/viper/viper_machdep.c cvs rdiff -u -r1.94 -r1.95 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/at91/at91bus.c diff -u src/sys/arch/arm/at91/at91bus.c:1.9 src/sys/arch/arm/at91/at91bus.c:1.10 --- src/sys/arch/arm/at91/at91bus.c:1.9 Fri Nov 27 03:23:05 2009 +++ src/sys/arch/arm/at91/at91bus.c Sat Dec 26 16:01:23 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: at91bus.c,v 1.9 2009/11/27 03:23:05 rmind Exp $ */ +/* $NetBSD: at91bus.c,v 1.10 2009/12/26 16:01:23 uebayasi Exp $ */ /* * Copyright (c) 2007 Embedtronics Oy @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: at91bus.c,v 1.9 2009/11/27 03:23:05 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: at91bus.c,v 1.10 2009/12/26 16:01:23 uebayasi Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -450,7 +450,7 @@ printf(switching to new L1 page table @%#lx..., kernel_l1pt.pv_pa); #endif cpu_domains((DOMAIN_CLIENT (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT); - setttb(kernel_l1pt.pv_pa); + cpu_setttb(kernel_l1pt.pv_pa); cpu_tlb_flushID(); cpu_domains(DOMAIN_CLIENT (PMAP_DOMAIN_KERNEL*2)); Index: src/sys/arch/evbarm/adi_brh/brh_machdep.c diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.35 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.36 --- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.35 Sat Dec 26 15:47:14 2009 +++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Sat Dec 26 16:01:23 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: brh_machdep.c,v 1.35 2009/12/26 15:47:14 uebayasi Exp $ */ +/* $NetBSD: brh_machdep.c,v 1.36 2009/12/26 16:01:23 uebayasi Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@
CVS commit: src/sys/kern
Module Name:src Committed By: elad Date: Sat Dec 26 21:41:14 UTC 2009 Modified Files: src/sys/kern: kern_ssp.c Log Message: Put a space after ':'... To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/kern/kern_ssp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_ssp.c diff -u src/sys/kern/kern_ssp.c:1.2 src/sys/kern/kern_ssp.c:1.3 --- src/sys/kern/kern_ssp.c:1.2 Thu Feb 26 05:50:54 2009 +++ src/sys/kern/kern_ssp.c Sat Dec 26 21:41:14 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_ssp.c,v 1.2 2009/02/26 05:50:54 kenh Exp $ */ +/* $NetBSD: kern_ssp.c,v 1.3 2009/12/26 21:41:14 elad Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_ssp.c,v 1.2 2009/02/26 05:50:54 kenh Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_ssp.c,v 1.3 2009/12/26 21:41:14 elad Exp $); #include sys/param.h #include sys/systm.h @@ -49,7 +49,7 @@ int s; #ifdef DIAGNOSTIC - printf(Initializing SSP:); + printf(Initializing SSP: ); #endif /* * We initialize ssp here carefully:
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Sat Dec 26 23:13:15 UTC 2009 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi Log Message: sets for new bind. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base/ad.mips64eb \ src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.77 -r1.78 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.509 -r1.510 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.4 src/distrib/sets/lists/base/ad.mips64eb:1.5 --- src/distrib/sets/lists/base/ad.mips64eb:1.4 Tue Dec 15 00:59:50 2009 +++ src/distrib/sets/lists/base/ad.mips64eb Sat Dec 26 18:13:15 2009 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.4 2009/12/15 05:59:50 mrg Exp $ +# $NetBSD: ad.mips64eb,v 1.5 2009/12/26 23:13:15 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib compat @@ -54,7 +54,7 @@ ./usr/lib/64/libbfd.so.11 base-compat-shlib compat,pic ./usr/lib/64/libbfd.so.11.0 base-compat-shlib compat,pic ./usr/lib/64/libbind9.so.5 base-compat-shlib compat,pic -./usr/lib/64/libbind9.so.5.0 base-compat-shlib compat,pic +./usr/lib/64/libbind9.so.5.1 base-compat-shlib compat,pic ./usr/lib/64/libbluetooth.so.4 base-compat-shlib compat,pic ./usr/lib/64/libbluetooth.so.4.2 base-compat-shlib compat,pic ./usr/lib/64/libbsdmalloc.so.0 base-compat-shlib compat,pic @@ -74,7 +74,7 @@ ./usr/lib/64/libdes.so.8 base-compat-shlib compat,pic ./usr/lib/64/libdes.so.8.1 base-compat-shlib compat,pic ./usr/lib/64/libdns.so.5 base-compat-shlib compat,pic -./usr/lib/64/libdns.so.5.0 base-compat-shlib compat,pic +./usr/lib/64/libdns.so.5.1 base-compat-shlib compat,pic ./usr/lib/64/libedit.so.3 base-compat-shlib compat,pic ./usr/lib/64/libedit.so.3.0 base-compat-shlib compat,pic ./usr/lib/64/libevent.so.3 base-compat-shlib compat,pic @@ -98,11 +98,11 @@ ./usr/lib/64/libipsec.so.3 base-compat-shlib compat,pic ./usr/lib/64/libipsec.so.3.0 base-compat-shlib compat,pic ./usr/lib/64/libisc.so.5 base-compat-shlib compat,pic -./usr/lib/64/libisc.so.5.0 base-compat-shlib compat,pic +./usr/lib/64/libisc.so.5.1 base-compat-shlib compat,pic ./usr/lib/64/libisccc.so.5 base-compat-shlib compat,pic -./usr/lib/64/libisccc.so.5.0 base-compat-shlib compat,pic +./usr/lib/64/libisccc.so.5.1 base-compat-shlib compat,pic ./usr/lib/64/libisccfg.so.5 base-compat-shlib compat,pic -./usr/lib/64/libisccfg.so.5.0 base-compat-shlib compat,pic +./usr/lib/64/libisccfg.so.5.1 base-compat-shlib compat,pic ./usr/lib/64/libiscsi.so.2 base-compat-shlib compat,pic ./usr/lib/64/libiscsi.so.2.0 base-compat-shlib compat,pic ./usr/lib/64/libkadm5clnt.so.12 base-compat-shlib compat,pic @@ -122,7 +122,7 @@ ./usr/lib/64/libldap_r.so.4 base-compat-shlib compat,pic ./usr/lib/64/libldap_r.so.4.0 base-compat-shlib compat,pic ./usr/lib/64/liblwres.so.5 base-compat-shlib compat,pic -./usr/lib/64/liblwres.so.5.0 base-compat-shlib compat,pic +./usr/lib/64/liblwres.so.5.1 base-compat-shlib compat,pic ./usr/lib/64/libm.so.0base-compat-shlib compat,pic ./usr/lib/64/libm.so.0.7 base-compat-shlib compat,pic ./usr/lib/64/libmagic.so.3 base-compat-shlib compat,pic @@ -354,7 +354,7 @@ ./usr/lib/o32/libldap_r.so.4 base-compat-shlib compat,pic ./usr/lib/o32/libldap_r.so.4.0 base-compat-shlib compat,pic ./usr/lib/o32/liblwres.so.5 base-compat-shlib compat,pic -./usr/lib/o32/liblwres.so.5.0 base-compat-shlib compat,pic +./usr/lib/o32/liblwres.so.5.1 base-compat-shlib compat,pic ./usr/lib/o32/libm.so.0base-compat-shlib compat,pic ./usr/lib/o32/libm.so.0.7 base-compat-shlib compat,pic ./usr/lib/o32/libmagic.so.3 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.4 src/distrib/sets/lists/base/ad.mips64el:1.5 --- src/distrib/sets/lists/base/ad.mips64el:1.4 Tue Dec 15 00:59:51 2009 +++ src/distrib/sets/lists/base/ad.mips64el Sat Dec 26 18:13:15 2009 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.4 2009/12/15 05:59:51 mrg Exp $ +# $NetBSD: ad.mips64el,v 1.5 2009/12/26 23:13:15 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib compat @@ -54,7 +54,7 @@ ./usr/lib/64/libbfd.so.11 base-compat-shlib compat,pic ./usr/lib/64/libbfd.so.11.0 base-compat-shlib compat,pic ./usr/lib/64/libbind9.so.5 base-compat-shlib compat,pic -./usr/lib/64/libbind9.so.5.0 base-compat-shlib compat,pic
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Dec 26 23:14:32 UTC 2009 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention new bind To generate a diff of this commit: cvs rdiff -u -r1.740 -r1.741 src/doc/3RDPARTY cvs rdiff -u -r1.1333 -r1.1334 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.740 src/doc/3RDPARTY:1.741 --- src/doc/3RDPARTY:1.740 Wed Dec 23 03:33:58 2009 +++ src/doc/3RDPARTY Sat Dec 26 18:14:32 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.740 2009/12/23 08:33:58 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.741 2009/12/26 23:14:32 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -91,8 +91,8 @@ bc includes dc, both of which are in the NetBSD tree. Package: bind [named and utils] -Version: 9.7.0-b1 -Current Vers: 9.7.0-b1 +Version: 9.7.0-rc1 +Current Vers: 9.7.0-rc1 Maintainer: Paul Vixie vi...@vix.com Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/sw/bind/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1333 src/doc/CHANGES:1.1334 --- src/doc/CHANGES:1.1333 Wed Dec 23 03:33:58 2009 +++ src/doc/CHANGES Sat Dec 26 18:14:32 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1333 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1334 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -506,3 +506,4 @@ zaurus: Add support Xorg. [nonaka 20091213] atf(7): Import 0.7. [jmmv 20091222] dhcpcd(8): Import dhcpcd-5.1.4. [roy 20091223] + bind: Update to 9.7.0-rc1. [christos 20091226]
CVS commit: src/crypto/external/bsd/openssl
Module Name:src
Committed By: christos
Date: Sun Dec 27 00:48:56 UTC 2009
Modified Files:
src/crypto/external/bsd/openssl/dist/apps: ca.c ocsp.c speed.c
src/crypto/external/bsd/openssl/dist/crypto/bio: b_sock.c bss_file.c
src/crypto/external/bsd/openssl/dist/crypto/cast: cast.h
src/crypto/external/bsd/openssl/dist/crypto/dso: dso_dlfcn.c
src/crypto/external/bsd/openssl/dist/crypto/pkcs12: p12_decr.c
src/crypto/external/bsd/openssl/dist/crypto/ui: ui_openssl.c
src/crypto/external/bsd/openssl/dist/ssl: s23_clnt.c s3_lib.c s3_pkt.c
s3_srvr.c ssl_ciph.c
src/crypto/external/bsd/openssl/lib/libcrypto: cms.inc shlib_version
src/crypto/external/bsd/openssl/lib/libssl: shlib_version ssl.inc
Log Message:
merge conflicts and undo the session renegotiation disabling code.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/apps/ca.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/apps/ocsp.c \
src/crypto/external/bsd/openssl/dist/apps/speed.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/bio/b_sock.c \
src/crypto/external/bsd/openssl/dist/crypto/bio/bss_file.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/cast/cast.h
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_decr.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/ui/ui_openssl.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/openssl/dist/ssl/s23_clnt.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c \
src/crypto/external/bsd/openssl/dist/ssl/s3_srvr.c \
src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/cms.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libssl/shlib_version
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libssl/ssl.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/apps/ca.c
diff -u src/crypto/external/bsd/openssl/dist/apps/ca.c:1.3 src/crypto/external/bsd/openssl/dist/apps/ca.c:1.4
--- src/crypto/external/bsd/openssl/dist/apps/ca.c:1.3 Wed Aug 5 14:38:21 2009
+++ src/crypto/external/bsd/openssl/dist/apps/ca.c Sat Dec 26 19:48:55 2009
@@ -215,7 +215,6 @@
char *startdate, char *enddate, long days, char *ext_sect,
CONF *conf, int verbose, unsigned long certopt,
unsigned long nameopt, int default_op, int ext_copy);
-static int fix_data(int nid, int *type);
static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext);
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,char *subj,unsigned long chtype, int multirdn,
@@ -1263,7 +1262,12 @@
BIO_printf(bio_err,\n%d out of %d certificate requests certified, commit? [y/n],total_done,total);
(void)BIO_flush(bio_err);
buf[0][0]='\0';
-fgets(buf[0],10,stdin);
+if (!fgets(buf[0],10,stdin))
+ {
+ BIO_printf(bio_err,CERTIFICATION CANCELED: I/O error\n);
+ ret=0;
+ goto err;
+ }
if ((buf[0][0] != 'y') (buf[0][0] != 'Y'))
{
BIO_printf(bio_err,CERTIFICATION CANCELED\n);
@@ -1403,7 +1407,12 @@
if (!tmptm) goto err;
X509_gmtime_adj(tmptm,0);
X509_CRL_set_lastUpdate(crl, tmptm);
- X509_time_adj_ex(tmptm, crldays, crlhours*60*60 + crlsec, NULL);
+ if (!X509_time_adj_ex(tmptm, crldays, crlhours*60*60 + crlsec,
+ NULL))
+ {
+ BIO_puts(bio_err, error setting CRL nextUpdate\n);
+ goto err;
+ }
X509_CRL_set_nextUpdate(crl, tmptm);
ASN1_TIME_free(tmptm);
@@ -2117,7 +2126,12 @@
BIO_printf(bio_err,Sign the certificate? [y/n]:);
(void)BIO_flush(bio_err);
buf[0]='\0';
- fgets(buf,sizeof(buf)-1,stdin);
+ if (!fgets(buf,sizeof(buf)-1,stdin))
+ {
+ BIO_printf(bio_err,CERTIFICATE WILL NOT BE CERTIFIED: I/O error\n);
+ ok=0;
+ goto err;
+ }
if (!((buf[0] == 'y') || (buf[0] == 'Y')))
{
BIO_printf(bio_err,CERTIFICATE WILL NOT BE CERTIFIED\n);
@@ -2319,25 +2333,9 @@
continue;
}
- /*
- if ((nid == NID_pkcs9_emailAddress) (email_dn == 0))
- continue;
- */
-
- j=ASN1_PRINTABLE_type((unsigned char *)buf,-1);
- if (fix_data(nid, j) == 0)
- {
- BIO_printf(bio_err,
-invalid characters in string %s\n,buf);
- goto err;
- }
-
- if ((ne=X509_NAME_ENTRY_create_by_NID(ne,nid,j,
- (unsigned char *)buf,
- strlen(buf))) == NULL)
+ if
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Sun Dec 27 00:53:35 UTC 2009 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi Log Message: new openssl To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base/ad.mips64eb \ src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.510 -r1.511 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.5 src/distrib/sets/lists/base/ad.mips64eb:1.6 --- src/distrib/sets/lists/base/ad.mips64eb:1.5 Sat Dec 26 18:13:15 2009 +++ src/distrib/sets/lists/base/ad.mips64eb Sat Dec 26 19:53:35 2009 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.5 2009/12/26 23:13:15 christos Exp $ +# $NetBSD: ad.mips64eb,v 1.6 2009/12/27 00:53:35 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib compat @@ -68,11 +68,11 @@ ./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic ./usr/lib/64/libcrypt.so.1.0 base-compat-shlib compat,pic ./usr/lib/64/libcrypto.so.6 base-compat-shlib compat,pic -./usr/lib/64/libcrypto.so.6.0 base-compat-shlib compat,pic +./usr/lib/64/libcrypto.so.6.1 base-compat-shlib compat,pic ./usr/lib/64/libcurses.so.7 base-compat-shlib compat,pic ./usr/lib/64/libcurses.so.7.0 base-compat-shlib compat,pic ./usr/lib/64/libdes.so.8 base-compat-shlib compat,pic -./usr/lib/64/libdes.so.8.1 base-compat-shlib compat,pic +./usr/lib/64/libdes.so.8.2 base-compat-shlib compat,pic ./usr/lib/64/libdns.so.5 base-compat-shlib compat,pic ./usr/lib/64/libdns.so.5.1 base-compat-shlib compat,pic ./usr/lib/64/libedit.so.3 base-compat-shlib compat,pic @@ -190,7 +190,7 @@ ./usr/lib/64/libssh.so.14 base-compat-shlib compat,pic ./usr/lib/64/libssh.so.14.0 base-compat-shlib compat,pic ./usr/lib/64/libssl.so.8 base-compat-shlib compat,pic -./usr/lib/64/libssl.so.8.0 base-compat-shlib compat,pic +./usr/lib/64/libssl.so.8.1 base-compat-shlib compat,pic ./usr/lib/64/libstdc++.so.6 base-compat-shlib compat,pic,cxx ./usr/lib/64/libstdc++.so.6.0 base-compat-shlib compat,pic,cxx ./usr/lib/64/libsupc++.so.0 base-compat-shlib compat,pic,cxx @@ -300,11 +300,11 @@ ./usr/lib/o32/libcrypt.so.1 base-compat-shlib compat,pic ./usr/lib/o32/libcrypt.so.1.0 base-compat-shlib compat,pic ./usr/lib/o32/libcrypto.so.6 base-compat-shlib compat,pic -./usr/lib/o32/libcrypto.so.6.0 base-compat-shlib compat,pic +./usr/lib/o32/libcrypto.so.6.1 base-compat-shlib compat,pic ./usr/lib/o32/libcurses.so.7 base-compat-shlib compat,pic ./usr/lib/o32/libcurses.so.7.0 base-compat-shlib compat,pic ./usr/lib/o32/libdes.so.8 base-compat-shlib compat,pic -./usr/lib/o32/libdes.so.8.1 base-compat-shlib compat,pic +./usr/lib/o32/libdes.so.8.2 base-compat-shlib compat,pic ./usr/lib/o32/libdns.so.5 base-compat-shlib compat,pic ./usr/lib/o32/libdns.so.5.0 base-compat-shlib compat,pic ./usr/lib/o32/libedit.so.3 base-compat-shlib compat,pic @@ -422,7 +422,7 @@ ./usr/lib/o32/libssh.so.14 base-compat-shlib compat,pic ./usr/lib/o32/libssh.so.14.0 base-compat-shlib compat,pic ./usr/lib/o32/libssl.so.8 base-compat-shlib compat,pic -./usr/lib/o32/libssl.so.8.0 base-compat-shlib compat,pic +./usr/lib/o32/libssl.so.8.1 base-compat-shlib compat,pic ./usr/lib/o32/libstdc++.so.6 base-compat-shlib compat,pic,cxx ./usr/lib/o32/libstdc++.so.6.0 base-compat-shlib compat,pic,cxx ./usr/lib/o32/libsupc++.so.0 base-compat-shlib compat,pic,cxx Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.5 src/distrib/sets/lists/base/ad.mips64el:1.6 --- src/distrib/sets/lists/base/ad.mips64el:1.5 Sat Dec 26 18:13:15 2009 +++ src/distrib/sets/lists/base/ad.mips64el Sat Dec 26 19:53:35 2009 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.5 2009/12/26 23:13:15 christos Exp $ +# $NetBSD: ad.mips64el,v 1.6 2009/12/27 00:53:35 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib compat @@ -68,11 +68,11 @@ ./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic ./usr/lib/64/libcrypt.so.1.0 base-compat-shlib compat,pic ./usr/lib/64/libcrypto.so.6 base-compat-shlib compat,pic -./usr/lib/64/libcrypto.so.6.0 base-compat-shlib compat,pic +./usr/lib/64/libcrypto.so.6.1 base-compat-shlib compat,pic ./usr/lib/64/libcurses.so.7 base-compat-shlib compat,pic ./usr/lib/64/libcurses.so.7.0 base-compat-shlib compat,pic ./usr/lib/64/libdes.so.8 base-compat-shlib
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sun Dec 27 00:54:16 UTC 2009 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openssl. To generate a diff of this commit: cvs rdiff -u -r1.741 -r1.742 src/doc/3RDPARTY cvs rdiff -u -r1.1334 -r1.1335 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.741 src/doc/3RDPARTY:1.742 --- src/doc/3RDPARTY:1.741 Sat Dec 26 18:14:32 2009 +++ src/doc/3RDPARTY Sat Dec 26 19:54:15 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.741 2009/12/26 23:14:32 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.742 2009/12/27 00:54:15 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -802,7 +802,7 @@ - always bump major when importing to avoid api problems. Package: OpenSSL -Version: SNAP-20090805 +Version: SNAP-20091226 Current Vers: 0.9.8k Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1334 src/doc/CHANGES:1.1335 --- src/doc/CHANGES:1.1334 Sat Dec 26 18:14:32 2009 +++ src/doc/CHANGES Sat Dec 26 19:54:15 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1334 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1335 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -507,3 +507,4 @@ atf(7): Import 0.7. [jmmv 20091222] dhcpcd(8): Import dhcpcd-5.1.4. [roy 20091223] bind: Update to 9.7.0-rc1. [christos 20091226] + openssl(1): Import SNAP-20091226 [christos 20091226]
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Sun Dec 27 01:07:22 UTC 2009 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20149 Log Message: import openssh 5.3 Status: Vendor Tag: OPENSSH Release Tags: v53-20091226 U src/crypto/external/bsd/openssh/dist/auth1.c U src/crypto/external/bsd/openssh/dist/LICENCE U src/crypto/external/bsd/openssh/dist/PROTOCOL.agent U src/crypto/external/bsd/openssh/dist/OVERVIEW U src/crypto/external/bsd/openssh/dist/PROTOCOL U src/crypto/external/bsd/openssh/dist/addrmatch.c U src/crypto/external/bsd/openssh/dist/README C src/crypto/external/bsd/openssh/dist/auth2.c U src/crypto/external/bsd/openssh/dist/README.smartcard U src/crypto/external/bsd/openssh/dist/atomicio.c U src/crypto/external/bsd/openssh/dist/atomicio.h U src/crypto/external/bsd/openssh/dist/auth-bsdauth.c U src/crypto/external/bsd/openssh/dist/auth-chall.c U src/crypto/external/bsd/openssh/dist/auth-krb5.c U src/crypto/external/bsd/openssh/dist/auth-options.c U src/crypto/external/bsd/openssh/dist/auth-options.h U src/crypto/external/bsd/openssh/dist/auth-passwd.c U src/crypto/external/bsd/openssh/dist/auth-rh-rsa.c U src/crypto/external/bsd/openssh/dist/auth-rhosts.c U src/crypto/external/bsd/openssh/dist/auth-rsa.c U src/crypto/external/bsd/openssh/dist/auth.c U src/crypto/external/bsd/openssh/dist/auth.h U src/crypto/external/bsd/openssh/dist/auth2-gss.c U src/crypto/external/bsd/openssh/dist/auth2-hostbased.c U src/crypto/external/bsd/openssh/dist/auth2-chall.c U src/crypto/external/bsd/openssh/dist/gss-serv.c C src/crypto/external/bsd/openssh/dist/auth2-jpake.c U src/crypto/external/bsd/openssh/dist/auth2-kbdint.c U src/crypto/external/bsd/openssh/dist/auth2-none.c U src/crypto/external/bsd/openssh/dist/auth2-passwd.c U src/crypto/external/bsd/openssh/dist/auth2-pubkey.c U src/crypto/external/bsd/openssh/dist/authfd.c U src/crypto/external/bsd/openssh/dist/authfd.h U src/crypto/external/bsd/openssh/dist/authfile.c U src/crypto/external/bsd/openssh/dist/authfile.h U src/crypto/external/bsd/openssh/dist/bufaux.c U src/crypto/external/bsd/openssh/dist/bufbn.c U src/crypto/external/bsd/openssh/dist/buffer.c U src/crypto/external/bsd/openssh/dist/buffer.h C src/crypto/external/bsd/openssh/dist/canohost.c C src/crypto/external/bsd/openssh/dist/canohost.h C src/crypto/external/bsd/openssh/dist/channels.c U src/crypto/external/bsd/openssh/dist/channels.h U src/crypto/external/bsd/openssh/dist/crc32.c U src/crypto/external/bsd/openssh/dist/cipher-3des1.c U src/crypto/external/bsd/openssh/dist/cipher.c U src/crypto/external/bsd/openssh/dist/cipher-bf1.c U src/crypto/external/bsd/openssh/dist/cipher-ctr.c U src/crypto/external/bsd/openssh/dist/cipher.h U src/crypto/external/bsd/openssh/dist/cleanup.c C src/crypto/external/bsd/openssh/dist/clientloop.c U src/crypto/external/bsd/openssh/dist/clientloop.h U src/crypto/external/bsd/openssh/dist/compat.c U src/crypto/external/bsd/openssh/dist/compat.h U src/crypto/external/bsd/openssh/dist/compress.c U src/crypto/external/bsd/openssh/dist/compress.h U src/crypto/external/bsd/openssh/dist/crc32.h U src/crypto/external/bsd/openssh/dist/deattack.c U src/crypto/external/bsd/openssh/dist/deattack.h U src/crypto/external/bsd/openssh/dist/dh.c U src/crypto/external/bsd/openssh/dist/dh.h U src/crypto/external/bsd/openssh/dist/dispatch.c U src/crypto/external/bsd/openssh/dist/dispatch.h U src/crypto/external/bsd/openssh/dist/dns.c U src/crypto/external/bsd/openssh/dist/dns.h U src/crypto/external/bsd/openssh/dist/fatal.c U src/crypto/external/bsd/openssh/dist/groupaccess.c U src/crypto/external/bsd/openssh/dist/groupaccess.h C src/crypto/external/bsd/openssh/dist/gss-genr.c U src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c U src/crypto/external/bsd/openssh/dist/hostfile.c U src/crypto/external/bsd/openssh/dist/hostfile.h C src/crypto/external/bsd/openssh/dist/jpake.c C src/crypto/external/bsd/openssh/dist/jpake.h C src/crypto/external/bsd/openssh/dist/kex.c C src/crypto/external/bsd/openssh/dist/kex.h U src/crypto/external/bsd/openssh/dist/kexdh.c U src/crypto/external/bsd/openssh/dist/kexdhc.c C src/crypto/external/bsd/openssh/dist/kexdhs.c U src/crypto/external/bsd/openssh/dist/kexgex.c U src/crypto/external/bsd/openssh/dist/kexgexc.c C src/crypto/external/bsd/openssh/dist/kexgexs.c U src/crypto/external/bsd/openssh/dist/key.c U src/crypto/external/bsd/openssh/dist/key.h U src/crypto/external/bsd/openssh/dist/log.c U src/crypto/external/bsd/openssh/dist/log.h U src/crypto/external/bsd/openssh/dist/mac.c U src/crypto/external/bsd/openssh/dist/mac.h U src/crypto/external/bsd/openssh/dist/match.c U src/crypto/external/bsd/openssh/dist/match.h U src/crypto/external/bsd/openssh/dist/misc.c U src/crypto/external/bsd/openssh/dist/misc.h U src/crypto/external/bsd/openssh/dist/moduli.c C src/crypto/external/bsd/openssh/dist/monitor.c U src/crypto/external/bsd/openssh/dist/monitor.h U
CVS commit: src/sys/dev/dkwedge
Module Name:src
Committed By: jakllsch
Date: Sun Dec 27 01:37:17 UTC 2009
Modified Files:
src/sys/dev/dkwedge: dk.c
Log Message:
Implement and use a dkminphys() that calls the parent device's minphys
function with b_dev temporarily adjusted to the parent device's dev_t.
Fixes PR/37390.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/dkwedge/dk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.51 src/sys/dev/dkwedge/dk.c:1.52
--- src/sys/dev/dkwedge/dk.c:1.51 Tue Sep 8 21:14:33 2009
+++ src/sys/dev/dkwedge/dk.c Sun Dec 27 01:37:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.51 2009/09/08 21:14:33 pooka Exp $ */
+/* $NetBSD: dk.c,v 1.52 2009/12/27 01:37:17 jakllsch Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dk.c,v 1.51 2009/09/08 21:14:33 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: dk.c,v 1.52 2009/12/27 01:37:17 jakllsch Exp $);
#ifdef _KERNEL_OPT
#include opt_dkwedge.h
@@ -95,6 +95,7 @@
static void dkstart(struct dkwedge_softc *);
static void dkiodone(struct buf *);
static void dkrestart(void *);
+static void dkminphys(struct buf *);
static int dklastclose(struct dkwedge_softc *);
static int dkwedge_detach(device_t, int);
@@ -1242,6 +1243,23 @@
}
/*
+ * dkminphys:
+ *
+ * Call parent's minphys function.
+ */
+static void
+dkminphys(struct buf *bp)
+{
+ struct dkwedge_softc *sc = dkwedge_lookup(bp-b_dev);
+ dev_t dev;
+
+ dev = bp-b_dev;
+ bp-b_dev = sc-sc_pdev;
+ (*sc-sc_parent-dk_driver-d_minphys)(bp);
+ bp-b_dev = dev;
+}
+
+/*
* dkread: [devsw entry point]
*
* Read from a wedge.
@@ -1254,8 +1272,7 @@
if (sc-sc_state != DKW_STATE_RUNNING)
return (ENXIO);
- return (physio(dkstrategy, NULL, dev, B_READ,
- sc-sc_parent-dk_driver-d_minphys, uio));
+ return (physio(dkstrategy, NULL, dev, B_READ, dkminphys, uio));
}
/*
@@ -1271,8 +1288,7 @@
if (sc-sc_state != DKW_STATE_RUNNING)
return (ENXIO);
- return (physio(dkstrategy, NULL, dev, B_WRITE,
- sc-sc_parent-dk_driver-d_minphys, uio));
+ return (physio(dkstrategy, NULL, dev, B_WRITE, dkminphys, uio));
}
/*
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Sun Dec 27 01:42:41 UTC 2009 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.elf shl.mi Log Message: new openssh To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/base/ad.mips64eb \ src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.195 -r1.196 src/distrib/sets/lists/base/shl.elf cvs rdiff -u -r1.511 -r1.512 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.6 src/distrib/sets/lists/base/ad.mips64eb:1.7 --- src/distrib/sets/lists/base/ad.mips64eb:1.6 Sat Dec 26 19:53:35 2009 +++ src/distrib/sets/lists/base/ad.mips64eb Sat Dec 26 20:42:40 2009 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.6 2009/12/27 00:53:35 christos Exp $ +# $NetBSD: ad.mips64eb,v 1.7 2009/12/27 01:42:40 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib compat @@ -187,8 +187,8 @@ ./usr/lib/64/libsl.so.4.0 base-compat-shlib compat,pic ./usr/lib/64/libss.so.6base-compat-shlib compat,pic ./usr/lib/64/libss.so.6.0 base-compat-shlib compat,pic -./usr/lib/64/libssh.so.14 base-compat-shlib compat,pic -./usr/lib/64/libssh.so.14.0 base-compat-shlib compat,pic +./usr/lib/64/libssh.so.15 base-compat-shlib compat,pic +./usr/lib/64/libssh.so.15.0 base-compat-shlib compat,pic ./usr/lib/64/libssl.so.8 base-compat-shlib compat,pic ./usr/lib/64/libssl.so.8.1 base-compat-shlib compat,pic ./usr/lib/64/libstdc++.so.6 base-compat-shlib compat,pic,cxx @@ -419,8 +419,8 @@ ./usr/lib/o32/libsl.so.4.0 base-compat-shlib compat,pic ./usr/lib/o32/libss.so.6 base-compat-shlib compat,pic ./usr/lib/o32/libss.so.6.0 base-compat-shlib compat,pic -./usr/lib/o32/libssh.so.14 base-compat-shlib compat,pic -./usr/lib/o32/libssh.so.14.0 base-compat-shlib compat,pic +./usr/lib/o32/libssh.so.15 base-compat-shlib compat,pic +./usr/lib/o32/libssh.so.15.0 base-compat-shlib compat,pic ./usr/lib/o32/libssl.so.8 base-compat-shlib compat,pic ./usr/lib/o32/libssl.so.8.1 base-compat-shlib compat,pic ./usr/lib/o32/libstdc++.so.6 base-compat-shlib compat,pic,cxx Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.6 src/distrib/sets/lists/base/ad.mips64el:1.7 --- src/distrib/sets/lists/base/ad.mips64el:1.6 Sat Dec 26 19:53:35 2009 +++ src/distrib/sets/lists/base/ad.mips64el Sat Dec 26 20:42:40 2009 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.6 2009/12/27 00:53:35 christos Exp $ +# $NetBSD: ad.mips64el,v 1.7 2009/12/27 01:42:40 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib compat @@ -187,8 +187,8 @@ ./usr/lib/64/libsl.so.4.0 base-compat-shlib compat,pic ./usr/lib/64/libss.so.6base-compat-shlib compat,pic ./usr/lib/64/libss.so.6.0 base-compat-shlib compat,pic -./usr/lib/64/libssh.so.14 base-compat-shlib compat,pic -./usr/lib/64/libssh.so.14.0 base-compat-shlib compat,pic +./usr/lib/64/libssh.so.15 base-compat-shlib compat,pic +./usr/lib/64/libssh.so.15.0 base-compat-shlib compat,pic ./usr/lib/64/libssl.so.8 base-compat-shlib compat,pic ./usr/lib/64/libssl.so.8.1 base-compat-shlib compat,pic ./usr/lib/64/libstdc++.so.6 base-compat-shlib compat,pic,cxx @@ -419,8 +419,8 @@ ./usr/lib/o32/libsl.so.4.0 base-compat-shlib compat,pic ./usr/lib/o32/libss.so.6 base-compat-shlib compat,pic ./usr/lib/o32/libss.so.6.0 base-compat-shlib compat,pic -./usr/lib/o32/libssh.so.14 base-compat-shlib compat,pic -./usr/lib/o32/libssh.so.14.0 base-compat-shlib compat,pic +./usr/lib/o32/libssh.so.15 base-compat-shlib compat,pic +./usr/lib/o32/libssh.so.15.0 base-compat-shlib compat,pic ./usr/lib/o32/libssl.so.8 base-compat-shlib compat,pic ./usr/lib/o32/libssl.so.8.1 base-compat-shlib compat,pic ./usr/lib/o32/libstdc++.so.6 base-compat-shlib compat,pic,cxx Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.79 src/distrib/sets/lists/base/md.amd64:1.80 --- src/distrib/sets/lists/base/md.amd64:1.79 Sat Dec 26 19:53:35 2009 +++ src/distrib/sets/lists/base/md.amd64 Sat Dec 26 20:42:40 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.79 2009/12/27 00:53:35 christos Exp $ +# $NetBSD: md.amd64,v 1.80 2009/12/27 01:42:40 christos Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -190,8 +190,8 @@
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sun Dec 27 01:44:13 UTC 2009 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention new openssh To generate a diff of this commit: cvs rdiff -u -r1.742 -r1.743 src/doc/3RDPARTY cvs rdiff -u -r1.1335 -r1.1336 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.742 src/doc/3RDPARTY:1.743 --- src/doc/3RDPARTY:1.742 Sat Dec 26 19:54:15 2009 +++ src/doc/3RDPARTY Sat Dec 26 20:44:13 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.742 2009/12/27 00:54:15 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.743 2009/12/27 01:44:13 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -765,8 +765,8 @@ Patch applied after OpenSSH import. Package: OpenSSH -Version: 5.2 -Current Vers: 5.2 / portable 5.2p1 +Version: 5.3 +Current Vers: 5.3 / portable 5.3p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Home Page: http://www.openssh.com/portable.html Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1335 src/doc/CHANGES:1.1336 --- src/doc/CHANGES:1.1335 Sat Dec 26 19:54:15 2009 +++ src/doc/CHANGES Sat Dec 26 20:44:13 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1335 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1336 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -508,3 +508,4 @@ dhcpcd(8): Import dhcpcd-5.1.4. [roy 20091223] bind: Update to 9.7.0-rc1. [christos 20091226] openssl(1): Import SNAP-20091226 [christos 20091226] + openssh: Import 5.3. [christos 20091226]
CVS commit: src/sys/arch
Module Name:src
Committed By: uebayasi
Date: Sun Dec 27 05:14:56 UTC 2009
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
src/sys/arch/arm/arm32: pmap.c
src/sys/arch/arm/conf: files.arm
src/sys/arch/arm/include/arm32: pmap.h
src/sys/arch/evbarm/conf: std.imx31
Log Message:
Add write-through cache work-around for ARM11 as well as ARM9/ARM10. Analyzed
tested on i.MX35 with help from Tsubai Masanari.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/arm/arm/cpufunc.c
cvs rdiff -u -r1.203 -r1.204 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/arm/conf/files.arm
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/arm/include/arm32/pmap.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/std.imx31
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.93 src/sys/arch/arm/arm/cpufunc.c:1.94
--- src/sys/arch/arm/arm/cpufunc.c:1.93 Sun Mar 15 22:23:16 2009
+++ src/sys/arch/arm/arm/cpufunc.c Sun Dec 27 05:14:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.93 2009/03/15 22:23:16 cegger Exp $ */
+/* $NetBSD: cpufunc.c,v 1.94 2009/12/27 05:14:56 uebayasi Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.93 2009/03/15 22:23:16 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.94 2009/12/27 05:14:56 uebayasi Exp $);
#include opt_compat_netbsd.h
#include opt_cpuoptions.h
@@ -1426,7 +1426,11 @@
cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */
cpu_do_powersave = 1; /* Enable powersave */
get_cachetype_cp15();
+#ifdef ARM11_CACHE_WRITE_THROUGH
+ pmap_pte_init_arm11();
+#else
pmap_pte_init_generic();
+#endif
if (arm_cache_prefer_mask)
uvmexp.ncolors = (arm_cache_prefer_mask PGSHIFT) + 1;
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.203 src/sys/arch/arm/arm32/pmap.c:1.204
--- src/sys/arch/arm/arm32/pmap.c:1.203 Sat Nov 28 11:44:45 2009
+++ src/sys/arch/arm/arm32/pmap.c Sun Dec 27 05:14:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.203 2009/11/28 11:44:45 scw Exp $ */
+/* $NetBSD: pmap.c,v 1.204 2009/12/27 05:14:56 uebayasi Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -211,7 +211,7 @@
#include machine/param.h
#include arm/arm32/katelib.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.203 2009/11/28 11:44:45 scw Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.204 2009/12/27 05:14:56 uebayasi Exp $);
#ifdef PMAP_DEBUG
@@ -5971,7 +5971,7 @@
pte_l2_l_cache_mode_pt = L2_C;
pte_l2_s_cache_mode_pt = L2_C;
}
-#endif /* CPU_ARM9 */
+#endif /* CPU_ARM9 ARM9_CACHE_WRITE_THROUGH */
#endif /* (ARM_MMU_GENERIC + ARM_MMU_SA1 + ARM_MMU_V6) != 0 */
#if defined(CPU_ARM10)
@@ -5996,6 +5996,27 @@
}
#endif /* CPU_ARM10 */
+#if defined(CPU_ARM11) defined(ARM11_CACHE_WRITE_THROUGH)
+void
+pmap_pte_init_arm11(void)
+{
+
+ /*
+ * ARM11 is compatible with generic, but we want to use
+ * write-through caching for now.
+ */
+ pmap_pte_init_generic();
+
+ pte_l1_s_cache_mode = L1_S_C;
+ pte_l2_l_cache_mode = L2_C;
+ pte_l2_s_cache_mode = L2_C;
+
+ pte_l1_s_cache_mode_pt = L1_S_C;
+ pte_l2_l_cache_mode_pt = L2_C;
+ pte_l2_s_cache_mode_pt = L2_C;
+}
+#endif /* CPU_ARM11 ARM11_CACHE_WRITE_THROUGH */
+
#if ARM_MMU_SA1 == 1
void
pmap_pte_init_sa1(void)
Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.96 src/sys/arch/arm/conf/files.arm:1.97
--- src/sys/arch/arm/conf/files.arm:1.96 Sun Jan 18 16:42:09 2009
+++ src/sys/arch/arm/conf/files.arm Sun Dec 27 05:14:56 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.arm,v 1.96 2009/01/18 16:42:09 bjh21 Exp $
+# $NetBSD: files.arm,v 1.97 2009/12/27 05:14:56 uebayasi Exp $
# temporary define to allow easy moving to ../arch/arm/arm32
defflagARM32
@@ -27,6 +27,7 @@
defflag opt_cpuoptions.h PROCESS_ID_IS_CURLWP
defflag opt_cpuoptions.h PROCESS_ID_IS_CURCPU
defflag opt_cpuoptions.h ARM11_PMC
+defflag opt_cpuoptions.h ARM11_CACHE_WRITE_THROUGH
# Interrupt implementation header definition.
defparam opt_arm_intr_impl.h ARM_INTR_IMPL
Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.93 src/sys/arch/arm/include/arm32/pmap.h:1.94
--- src/sys/arch/arm/include/arm32/pmap.h:1.93 Thu Oct 22 19:50:55 2009
+++ src/sys/arch/arm/include/arm32/pmap.h Sun Dec 27 05:14:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.93 2009/10/22 19:50:55 rmind Exp $ */
+/* $NetBSD: pmap.h,v 1.94 2009/12/27 05:14:56 uebayasi Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -462,6 +462,9 @@
#if defined(CPU_ARM10)
void pmap_pte_init_arm10(void);
#endif /* CPU_ARM10 */
+#if defined(CPU_ARM11)
+void pmap_pte_init_arm11(void);
+#endif /* CPU_ARM11 */
#endif /* (ARM_MMU_GENERIC +
