CVS commit: src/sys/netsmb
Module Name:src
Committed By: christos
Date: Sat Dec 11 04:21:17 UTC 2010
Modified Files:
src/sys/netsmb: smb_dev.c smb_iod.c
Log Message:
Back this out. Fails lockdebug with duplicate lock initialization.
Please test with LOCKDEBUG!
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/netsmb/smb_dev.c
cvs rdiff -u -r1.36 -r1.37 src/sys/netsmb/smb_iod.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/netsmb/smb_dev.c
diff -u src/sys/netsmb/smb_dev.c:1.34 src/sys/netsmb/smb_dev.c:1.35
--- src/sys/netsmb/smb_dev.c:1.34 Fri Dec 10 14:44:18 2010
+++ src/sys/netsmb/smb_dev.c Fri Dec 10 23:21:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_dev.c,v 1.34 2010/12/10 19:44:18 ahoka Exp $ */
+/* $NetBSD: smb_dev.c,v 1.35 2010/12/11 04:21:17 christos Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.34 2010/12/10 19:44:18 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.35 2010/12/11 04:21:17 christos Exp $");
#include
#include
@@ -68,10 +68,6 @@
#include
#ifdef __NetBSD__
-#include
-#endif
-
-#ifdef __NetBSD__
static struct smb_dev **smb_devtbl; /* indexed by minor */
#define SMB_GETDEV(dev) (smb_devtbl[minor(dev)])
#define NSMB_DEFNUM 4
@@ -466,42 +462,6 @@
}
DEV_MODULE (dev_netsmb, nsmb_dev_load, 0);
-#else
-MODULE(MODULE_CLASS_MISC, nsmb, NULL);
-
-static int
-nsmb_modcmd(modcmd_t cmd, void *arg)
-{
- devmajor_t cmajor = NODEVMAJOR, bmajor = NODEVMAJOR;
- int error = 0;
-
- switch (cmd) {
- case MODULE_CMD_INIT:
- error = smb_sm_init();
- if (error)
- break;
- error = smb_iod_init();
- if (error) {
- smb_sm_done();
- break;
- }
- error =
- devsw_attach("nsmb", NULL, &bmajor, &nsmb_cdevsw, &cmajor);
- if (error)
- return error;
-
- break;
- case MODULE_CMD_FINI:
- smb_iod_done();
- smb_sm_done();
- error = devsw_detach(NULL, &nsmb_cdevsw);
- break;
- default:
- error = ENOTTY;
- break;
- }
- return error;
-}
#endif /* !__NetBSD__ */
/*
Index: src/sys/netsmb/smb_iod.c
diff -u src/sys/netsmb/smb_iod.c:1.36 src/sys/netsmb/smb_iod.c:1.37
--- src/sys/netsmb/smb_iod.c:1.36 Fri Dec 10 14:44:18 2010
+++ src/sys/netsmb/smb_iod.c Fri Dec 10 23:21:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_iod.c,v 1.36 2010/12/10 19:44:18 ahoka Exp $ */
+/* $NetBSD: smb_iod.c,v 1.37 2010/12/11 04:21:17 christos Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: smb_iod.c,v 1.36 2010/12/10 19:44:18 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_iod.c,v 1.37 2010/12/11 04:21:17 christos Exp $");
#include
#include
@@ -744,8 +744,10 @@
return 0;
}
+#ifndef __NetBSD__
int
smb_iod_done(void)
{
return 0;
}
+#endif
CVS commit: src
Module Name:src
Committed By: pgoyette
Date: Sat Dec 11 04:13:03 UTC 2010
Modified Files:
src/share/man/man4: swsensor.4
src/sys/dev/sysmon: swsensor.c
Log Message:
Enhance the swsensor(4) pseudo-device's capabilities to emulate more
sensor types
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/swsensor.4
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/sysmon/swsensor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/swsensor.4
diff -u src/share/man/man4/swsensor.4:1.2 src/share/man/man4/swsensor.4:1.3
--- src/share/man/man4/swsensor.4:1.2 Tue Oct 19 12:53:23 2010
+++ src/share/man/man4/swsensor.4 Sat Dec 11 04:13:03 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: swsensor.4,v 1.2 2010/10/19 12:53:23 wiz Exp $
+.\" $NetBSD: swsensor.4,v 1.3 2010/12/11 04:13:03 pgoyette Exp $
.\"
.\" Copyright (c) 2010 The NetBSD Foundation
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 19, 2010
+.Dd December 9, 2010
.Dt SWSENSOR 4
.Os
.Sh NAME
@@ -42,17 +42,50 @@
.Xr sysctl 8
and
.Xr envstat 8 .
-The driver creates a single sensor which is intended to be loaded as a
-kernel module.
+The driver is intended to be loaded as a kernel module.
+One can, however, include the
+.Nm
+driver directly in a kernel using the configuration from the synopsis.
By default, the sensor is of type
.Dv ENVSYS_UNITS_INTEGER .
-This can be overridden when the module is loaded by passing the desired
-sensor type in the property list with
-.Xr modload 8 .
+.Pp
+The following integer values can be specified in the
+.Xr modload 8
+command when loading the
+.Nm
+module to alter the driver's behavior.
+.Pp
+.Bl -tag -width "variable"
+.It Sy "Variable" Sy "Usage"
+.It Li "mode"
+Controls whether or not
+.Nm
+provides internally-maintained limits and limit checking
+.Bl -tag -width "Value"
+.It Sy "Value" Sy "Meaning"
+.It Li "0"
+sensor has no internally-maintained limits
+.It Li "1"
+sensor provides its own internal limit value
+.It Li "2"
+sensor maintains an internal adjustable limit and performs its own
+comparison between the sensor's limit and its current value
+.El
+.It Li "limit"
+The initial limit value, if limit emulation is selected (ie, if
+.Dv mode
+is set to 1 or 2)
+.It Li "type"
+Override the sensor's unit/type.
+.El
+.Pp
For example,
.Dl Ic modload -i type=1 swsensor
will create a sensor of type
-.Dv ENVSYS_UNITS_SFANRPM .
+.Dv ENVSYS_UNITS_SFANRPM ,
+while
+.Dl Ic modload -i mode=1 -i limit=50 swsensor
+will create a sensor which has an initial, device-provided limit of 50.
.Pp
The sensor's raw value can be manually updated by modifying the
.Xr sysctl 8
@@ -62,6 +95,17 @@
.Xr modctl 2 ,
.Xr envstat 8 ,
.Xr sysctl 8
+.Sh BUGS
+The
+.Nm
+driver emulates a device with only a single sensor.
+.Pp
+The
+.Nm
+driver can only emulate one hardware-managed limit; this is assumed to
+be the
+.Dv critical-min
+limit.
.Sh HISTORY
The
.Nm
Index: src/sys/dev/sysmon/swsensor.c
diff -u src/sys/dev/sysmon/swsensor.c:1.4 src/sys/dev/sysmon/swsensor.c:1.5
--- src/sys/dev/sysmon/swsensor.c:1.4 Sat Oct 23 11:24:16 2010
+++ src/sys/dev/sysmon/swsensor.c Sat Dec 11 04:13:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: swsensor.c,v 1.4 2010/10/23 11:24:16 pooka Exp $ */
+/* $NetBSD: swsensor.c,v 1.5 2010/12/11 04:13:03 pgoyette Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: swsensor.c,v 1.4 2010/10/23 11:24:16 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swsensor.c,v 1.5 2010/12/11 04:13:03 pgoyette Exp $");
#include
#include
@@ -38,6 +38,10 @@
#include
+#ifndef _MODULE
+#include "opt_modular.h"
+#endif
+
int swsensorattach(int);
static struct sysctllog *swsensor_sysctllog = NULL;
@@ -48,6 +52,10 @@
static envsys_data_t swsensor_edata;
static int32_t sw_sensor_value;
+static int32_t sw_sensor_limit;
+static int32_t sw_sensor_mode;
+static int32_t sw_sensor_defprops;
+sysmon_envsys_lim_t sw_sensor_deflims;
MODULE(MODULE_CLASS_DRIVER, swsensor, NULL);
@@ -93,7 +101,53 @@
{
edata->value_cur = sw_sensor_value;
- edata->state = ENVSYS_SVALID;
+
+ /*
+ * Set state. If we're handling the limits ourselves, do the
+ * compare; otherwise just assume the value is valid.
+ */
+ if ((sw_sensor_mode == 2) && (edata->upropset & PROP_CRITMIN) &&
+ (edata->upropset & PROP_DRIVER_LIMITS) &&
+ (edata->value_cur < edata->limits.sel_critmin))
+ edata->state = ENVSYS_SCRITUNDER;
+ else
+ edata->state = ENVSYS_SVALID;
+}
+
+/*
+ * Sensor get/set limit routines
+ */
+
+static void
+swsensor_get_limits(struct sysmon_envsys *sme, envsys_data_t *edata,
+ sysmon_envsys_lim_t *limits, uint32_t *props)
+{
+
+ *props = PROP_CRITMIN
CVS commit: src/sys/dev/raidframe
Module Name:src
Committed By: mrg
Date: Sat Dec 11 03:12:11 UTC 2010
Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c
Log Message:
add a hack to fix up old labels that do not have zero's in numBlocksHi:
if the total sectors reported (via disklabel or otherwise) is smaller
than 2^32, but numBlocksHi is set, zero it out instead.
tested by myself and christos, should fix reports of weirdness seen.
To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.277 src/sys/dev/raidframe/rf_netbsdkintf.c:1.278
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.277 Wed Dec 8 16:18:06 2010
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Sat Dec 11 03:12:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.277 2010/12/08 16:18:06 christos Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.278 2010/12/11 03:12:10 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -139,7 +139,7 @@
***/
#include
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.277 2010/12/08 16:18:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.278 2010/12/11 03:12:10 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -341,6 +341,7 @@
void rf_cleanup_config_set(RF_ConfigSet_t *);
int rf_have_enough_components(RF_ConfigSet_t *);
int rf_auto_config_set(RF_ConfigSet_t *, int *);
+static void rf_fix_old_label_size(RF_ComponentLabel_t *, uint64_t);
static int raidautoconfig = 0; /* Debugging, mostly. Set to 0 to not
allow autoconfig to take place.
@@ -2985,6 +2986,7 @@
/* Got the label. Does it look reasonable? */
if (rf_reasonable_label(clabel) &&
(clabel->partitionSize <= size)) {
+ rf_fix_old_label_size(clabel, numsecs);
#ifdef DEBUG
printf("Component on: %s: %llu\n",
cname, (unsigned long long)size);
@@ -3193,6 +3195,24 @@
}
+/*
+ * For reasons yet unknown, some old component labels have garbage in
+ * the newer numBlocksHi region, and this causes lossage. Since those
+ * disks will also have numsecs set to less than 32 bits of sectors,
+ * we can determine when this corruption has occured, and fix it.
+ */
+static void
+rf_fix_old_label_size(RF_ComponentLabel_t *clabel, uint64_t numsecs)
+{
+
+ if (clabel->numBlocksHi && numsecs < ((uint64_t)1 << 32)) {
+ printf("WARNING: total sectors < 32 bits, yet numBlocksHi set\n"
+ "WARNING: resetting numBlocksHi to zero.\n");
+ clabel->numBlocksHi = 0;
+ }
+}
+
+
#ifdef DEBUG
void
rf_print_component_label(RF_ComponentLabel_t *clabel)
CVS commit: [netbsd-4] src/sbin/bioctl
Module Name:src Committed By: bouyer Date: Fri Dec 10 22:23:23 UTC 2010 Modified Files: src/sbin/bioctl [netbsd-4]: Makefile Log Message: Remove spurious -I/usr/src/sys introduced by patch from ticket 1175. This cause build failure in some cases. To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sbin/bioctl/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/bioctl/Makefile diff -u src/sbin/bioctl/Makefile:1.1.2.2 src/sbin/bioctl/Makefile:1.1.2.3 --- src/sbin/bioctl/Makefile:1.1.2.2 Fri Aug 29 21:24:18 2008 +++ src/sbin/bioctl/Makefile Fri Dec 10 22:23:23 2010 @@ -5,6 +5,5 @@ MAN= bioctl.8 WARNS= 4 -CPPFLAGS+=-I/usr/src/sys .include
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Fri Dec 10 22:16:45 UTC 2010 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Tickets 1410, 1412 To generate a diff of this commit: cvs rdiff -u -r1.1.2.212 -r1.1.2.213 src/doc/CHANGES-4.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.212 src/doc/CHANGES-4.1:1.1.2.213 --- src/doc/CHANGES-4.1:1.1.2.212 Sun Nov 21 21:53:13 2010 +++ src/doc/CHANGES-4.1 Fri Dec 10 22:16:45 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.212 2010/11/21 21:53:13 riz Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.213 2010/12/10 22:16:45 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4269,3 +4269,18 @@ Fix an issue with >2TB disks. [mrg, ticket #1411] +sys/arch/i386/i386/locore.S patch + + In cpu_switch, avoid flipping interrupts on while holding the + scheduler lock. Doing so can cause locking against oneself via + endtsleep(). Fixes PR kern/38183, where the overt symptom was + that LOCKDEBUG + INSTALL_LARGE would panic during boot. + Should fix PR 38183. + [dholland, ticket #1410] + +sys/dev/sbus/spif.c1.19 + + Fix warning about missing initializer that showed up in sparc64 + builds, but, strangely enough, not in sparc builds. + [hauke, ticket #1412] +
CVS commit: [netbsd-4] src/sys/dev/sbus
Module Name:src
Committed By: bouyer
Date: Fri Dec 10 22:16:16 UTC 2010
Modified Files:
src/sys/dev/sbus [netbsd-4]: spif.c
Log Message:
Pull up following revision(s) (requested by hauke in ticket #1412):
sys/dev/sbus/spif.c: revision 1.19
Fix warning about missing initializer that showed up in sparc64
builds, but, strangely enough, not in sparc builds.
Relevant for netbsd-{4,5} release branches.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/dev/sbus/spif.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/sbus/spif.c
diff -u src/sys/dev/sbus/spif.c:1.9 src/sys/dev/sbus/spif.c:1.9.2.1
--- src/sys/dev/sbus/spif.c:1.9 Sun Oct 1 20:31:51 2006
+++ src/sys/dev/sbus/spif.c Fri Dec 10 22:16:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: spif.c,v 1.9 2006/10/01 20:31:51 elad Exp $ */
+/* $NetBSD: spif.c,v 1.9.2.1 2010/12/10 22:16:16 bouyer Exp $ */
/* $OpenBSD: spif.c,v 1.12 2003/10/03 16:44:51 miod Exp $ */
/*
@@ -41,7 +41,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.9 2006/10/01 20:31:51 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.9.2.1 2010/12/10 22:16:16 bouyer Exp $");
#include "spif.h"
#if NSPIF > 0
@@ -110,7 +110,7 @@
const struct cdevsw sbpp_cdevsw = {
sbpp_open, sbpp_close, sbpp_read, sbpp_write, sbpp_ioctl,
- nostop, notty, sbpp_poll, nommap, nokqfilter,
+ nostop, notty, sbpp_poll, nommap, nokqfilter, D_OTHER
};
CVS commit: [netbsd-4] src/sys/arch/i386/i386
Module Name:src Committed By: bouyer Date: Fri Dec 10 22:14:57 UTC 2010 Modified Files: src/sys/arch/i386/i386 [netbsd-4]: locore.S Log Message: Apply patch, requested by dholland in ticket #1410: sys/arch/i386/i386/locore.S: patch In cpu_switch, avoid flipping interrupts on while holding the scheduler lock. Doing so can cause locking against oneself via endtsleep(). Fixes PR kern/38183, where the overt symptom was that LOCKDEBUG + INSTALL_LARGE would panic during boot. Should fix PR 38183. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.44.2.1 src/sys/arch/i386/i386/locore.S 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/i386/i386/locore.S diff -u src/sys/arch/i386/i386/locore.S:1.44 src/sys/arch/i386/i386/locore.S:1.44.2.1 --- src/sys/arch/i386/i386/locore.S:1.44 Wed Oct 25 13:56:15 2006 +++ src/sys/arch/i386/i386/locore.S Fri Dec 10 22:14:57 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.44 2006/10/25 13:56:15 jmmv Exp $ */ +/* $NetBSD: locore.S,v 1.44.2.1 2010/12/10 22:14:57 bouyer Exp $ */ /*- * Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc. @@ -920,7 +920,7 @@ * we're running at splhigh(), but it's otherwise okay to take * interrupts here. */ - sti + /*sti -- no it isn't! */ leal _C_LABEL(sched_qs)(,%ebx,8),%eax # select q movl L_FORW(%eax),%edi # unlink from front of process q @@ -1049,7 +1049,7 @@ SET_CURPCB(%esi) /* Interrupts are okay again. */ - sti + /*sti -- nope, not yet! */ /* * Check for restartable atomic sequences (RAS) @@ -1065,6 +1065,7 @@ #if defined(MULTIPROCESSOR) || defined(LOCKDEBUG) call_C_LABEL(sched_unlock_idle) #endif + sti /* NOW we can do this, after releasing sched_lock */ cmpl $0,CPUVAR(IPENDING) jz 3f pushl $IPL_NONE # spl0() @@ -1129,7 +1130,7 @@ * We're running at splhigh(), but it's otherwise okay to take * interrupts here. */ - sti + /*sti -- no it isn't! */ /* Jump into the middle of cpu_switch */ xorl %eax,%eax
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Fri Dec 10 21:45:34 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: tickets 1509 and 1510 To generate a diff of this commit: cvs rdiff -u -r1.1.2.36 -r1.1.2.37 src/doc/CHANGES-5.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.36 src/doc/CHANGES-5.2:1.1.2.37 --- src/doc/CHANGES-5.2:1.1.2.36 Thu Dec 9 04:18:20 2010 +++ src/doc/CHANGES-5.2 Fri Dec 10 21:45:33 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.36 2010/12/09 04:18:20 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.37 2010/12/10 21:45:33 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -924,3 +924,22 @@ Add "optional" keyword to rc.d/xdm and rc.d/xfs. PR#43307. [uwe, ticket #1494] +crypto/external/bsd/openssl/dist/ssl/s3_clnt.c 1.3 via patch +crypto/external/bsd/openssl/dist/ssl/s3_srvr.c 1.6 via patch + + openssl security patch of the day: + Fix a flaw in the OpenSSL SSL/TLS server code where an old bug + workaround allows malicous clients to modify the stored session cache + ciphersuite. In some cases the ciphersuite can be downgraded to a + weaker one on subsequent connections. See + http://www.openssl.org/news/secadv_20101202.txt + (CVE-2010-4180) + [drochner, ticket #1509] + +crypto/external/bsd/openssl/dist/ssl/t1_lib.c 1.3 via patch + + fix bug introduced by last security patch, from upstream CVS: + Don't assume a decode error if session tlsext_ecpointformatlist is + not NULL: it can be legitimately set elsewhere. + [drochner, ticket #1510] +
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: bouyer Date: Fri Dec 10 21:45:20 UTC 2010 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.1 Log Message: tickets 1509 and 1510 To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/CHANGES-5.1.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.1 diff -u src/doc/CHANGES-5.1.1:1.1.2.3 src/doc/CHANGES-5.1.1:1.1.2.4 --- src/doc/CHANGES-5.1.1:1.1.2.3 Mon Nov 22 02:53:51 2010 +++ src/doc/CHANGES-5.1.1 Fri Dec 10 21:45:20 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.1,v 1.1.2.3 2010/11/22 02:53:51 riz Exp $ +# $NetBSD: CHANGES-5.1.1,v 1.1.2.4 2010/12/10 21:45:20 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -20,3 +20,22 @@ freeing free block" panics. [hannken, ticket #1477] +crypto/external/bsd/openssl/dist/ssl/s3_clnt.c 1.3 via patch +crypto/external/bsd/openssl/dist/ssl/s3_srvr.c 1.6 via patch + + openssl security patch of the day: + Fix a flaw in the OpenSSL SSL/TLS server code where an old bug + workaround allows malicous clients to modify the stored session cache + ciphersuite. In some cases the ciphersuite can be downgraded to a + weaker one on subsequent connections. See + http://www.openssl.org/news/secadv_20101202.txt + (CVE-2010-4180) + [drochner, ticket #1509] + +crypto/external/bsd/openssl/dist/ssl/t1_lib.c 1.3 via patch + + fix bug introduced by last security patch, from upstream CVS: + Don't assume a decode error if session tlsext_ecpointformatlist is + not NULL: it can be legitimately set elsewhere. + [drochner, ticket #1510] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Fri Dec 10 21:45:17 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: tickets 1509 and 1510 To generate a diff of this commit: cvs rdiff -u -r1.1.2.22 -r1.1.2.23 src/doc/CHANGES-5.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.22 src/doc/CHANGES-5.0.3:1.1.2.23 --- src/doc/CHANGES-5.0.3:1.1.2.22 Mon Nov 22 02:54:30 2010 +++ src/doc/CHANGES-5.0.3 Fri Dec 10 21:45:17 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.22 2010/11/22 02:54:30 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.23 2010/12/10 21:45:17 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -356,3 +356,22 @@ freeing free block" panics. [hannken, ticket #1477] +crypto/external/bsd/openssl/dist/ssl/s3_clnt.c 1.3 via patch +crypto/external/bsd/openssl/dist/ssl/s3_srvr.c 1.6 via patch + + openssl security patch of the day: + Fix a flaw in the OpenSSL SSL/TLS server code where an old bug + workaround allows malicous clients to modify the stored session cache + ciphersuite. In some cases the ciphersuite can be downgraded to a + weaker one on subsequent connections. See + http://www.openssl.org/news/secadv_20101202.txt + (CVE-2010-4180) + [drochner, ticket #1509] + +crypto/external/bsd/openssl/dist/ssl/t1_lib.c 1.3 via patch + + fix bug introduced by last security patch, from upstream CVS: + Don't assume a decode error if session tlsext_ecpointformatlist is + not NULL: it can be legitimately set elsewhere. + [drochner, ticket #1510] +
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/ssl
Module Name:src
Committed By: bouyer
Date: Fri Dec 10 21:44:33 UTC 2010
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5-0]: t1_lib.c
Log Message:
Pull up following revision(s) (requested by drochner in ticket #1510):
crypto/external/bsd/openssl/dist/ssl/t1_lib.c: revision 1.3 via patch
fix bug introduced by last security patch, from upstream CVS:
Don't assume a decode error if session tlsext_ecpointformatlist is
not NULL: it can be legitimately set elsewhere.
To generate a diff of this commit:
cvs rdiff -u -r1.2.8.1 -r1.2.8.2 src/crypto/dist/openssl/ssl/t1_lib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/ssl/t1_lib.c
diff -u src/crypto/dist/openssl/ssl/t1_lib.c:1.2.8.1 src/crypto/dist/openssl/ssl/t1_lib.c:1.2.8.2
--- src/crypto/dist/openssl/ssl/t1_lib.c:1.2.8.1 Fri Nov 19 21:12:02 2010
+++ src/crypto/dist/openssl/ssl/t1_lib.c Fri Dec 10 21:44:33 2010
@@ -689,8 +689,8 @@
{
if(s->session->tlsext_ecpointformatlist)
{
- *al = TLS1_AD_DECODE_ERROR;
- return 0;
+ OPENSSL_free(s->session->tlsext_ecpointformatlist);
+ s->session->tlsext_ecpointformatlist = NULL;
}
s->session->tlsext_ecpointformatlist_length = 0;
if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
CVS commit: [netbsd-5-1] src/crypto/dist/openssl/ssl
Module Name:src
Committed By: bouyer
Date: Fri Dec 10 21:44:25 UTC 2010
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5-1]: t1_lib.c
Log Message:
Pull up following revision(s) (requested by drochner in ticket #1510):
crypto/external/bsd/openssl/dist/ssl/t1_lib.c: revision 1.3 via patch
fix bug introduced by last security patch, from upstream CVS:
Don't assume a decode error if session tlsext_ecpointformatlist is
not NULL: it can be legitimately set elsewhere.
To generate a diff of this commit:
cvs rdiff -u -r1.2.12.1 -r1.2.12.2 src/crypto/dist/openssl/ssl/t1_lib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/ssl/t1_lib.c
diff -u src/crypto/dist/openssl/ssl/t1_lib.c:1.2.12.1 src/crypto/dist/openssl/ssl/t1_lib.c:1.2.12.2
--- src/crypto/dist/openssl/ssl/t1_lib.c:1.2.12.1 Fri Nov 19 21:29:26 2010
+++ src/crypto/dist/openssl/ssl/t1_lib.c Fri Dec 10 21:44:25 2010
@@ -689,8 +689,8 @@
{
if(s->session->tlsext_ecpointformatlist)
{
- *al = TLS1_AD_DECODE_ERROR;
- return 0;
+ OPENSSL_free(s->session->tlsext_ecpointformatlist);
+ s->session->tlsext_ecpointformatlist = NULL;
}
s->session->tlsext_ecpointformatlist_length = 0;
if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
CVS commit: [netbsd-5] src/crypto/dist/openssl/ssl
Module Name:src
Committed By: bouyer
Date: Fri Dec 10 21:44:17 UTC 2010
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5]: t1_lib.c
Log Message:
Pull up following revision(s) (requested by drochner in ticket #1510):
crypto/external/bsd/openssl/dist/ssl/t1_lib.c: revision 1.3 via patch
fix bug introduced by last security patch, from upstream CVS:
Don't assume a decode error if session tlsext_ecpointformatlist is
not NULL: it can be legitimately set elsewhere.
To generate a diff of this commit:
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/crypto/dist/openssl/ssl/t1_lib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/ssl/t1_lib.c
diff -u src/crypto/dist/openssl/ssl/t1_lib.c:1.2.4.1 src/crypto/dist/openssl/ssl/t1_lib.c:1.2.4.2
--- src/crypto/dist/openssl/ssl/t1_lib.c:1.2.4.1 Fri Nov 19 21:11:24 2010
+++ src/crypto/dist/openssl/ssl/t1_lib.c Fri Dec 10 21:44:17 2010
@@ -689,8 +689,8 @@
{
if(s->session->tlsext_ecpointformatlist)
{
- *al = TLS1_AD_DECODE_ERROR;
- return 0;
+ OPENSSL_free(s->session->tlsext_ecpointformatlist);
+ s->session->tlsext_ecpointformatlist = NULL;
}
s->session->tlsext_ecpointformatlist_length = 0;
if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/ssl
Module Name:src
Committed By: bouyer
Date: Fri Dec 10 21:42:43 UTC 2010
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5-0]: s3_clnt.c s3_srvr.c
Log Message:
Pull up following revision(s) (requested by drochner in ticket #1509):
crypto/external/bsd/openssl/dist/ssl/s3_srvr.c: revision 1.6 via patch
crypto/external/bsd/openssl/dist/ssl/s3_clnt.c: revision 1.3 via patch
openssl security patch of the day:
Fix a flaw in the OpenSSL SSL/TLS server code where an old bug
workaround allows malicous clients to modify the stored session cache
ciphersuite. In some cases the ciphersuite can be downgraded to a weaker one
on subsequent connections. See
http://www.openssl.org/news/secadv_20101202.txt
(CVE-2010-4180)
To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1.2.1 -r1.12.4.1.2.2 \
src/crypto/dist/openssl/ssl/s3_clnt.c
cvs rdiff -u -r1.15.4.1.2.2 -r1.15.4.1.2.3 \
src/crypto/dist/openssl/ssl/s3_srvr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/ssl/s3_clnt.c
diff -u src/crypto/dist/openssl/ssl/s3_clnt.c:1.12.4.1.2.1 src/crypto/dist/openssl/ssl/s3_clnt.c:1.12.4.1.2.2
--- src/crypto/dist/openssl/ssl/s3_clnt.c:1.12.4.1.2.1 Tue Sep 7 19:31:04 2010
+++ src/crypto/dist/openssl/ssl/s3_clnt.c Fri Dec 10 21:42:43 2010
@@ -842,8 +842,11 @@
s->session->cipher_id = s->session->cipher->id;
if (s->hit && (s->session->cipher_id != c->id))
{
+/* Workaround is now obsolete */
+#if 0
if (!(s->options &
SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG))
+#endif
{
al=SSL_AD_ILLEGAL_PARAMETER;
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED);
Index: src/crypto/dist/openssl/ssl/s3_srvr.c
diff -u src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.1.2.2 src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.1.2.3
--- src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.1.2.2 Mon Apr 12 00:46:57 2010
+++ src/crypto/dist/openssl/ssl/s3_srvr.c Fri Dec 10 21:42:43 2010
@@ -959,12 +959,17 @@
}
if (j == 0)
{
+/* Disabled because it can be used in a ciphersuite downgrade
+ * attack: CVE-2010-4180.
+ */
+#if 0
if ((s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1))
{
/* Very bad for multi-threading */
s->session->cipher=sk_SSL_CIPHER_value(ciphers, 0);
}
else
+#endif
{
/* we need to have the cipher in the cipher
* list if we are asked to reuse it */
CVS commit: [netbsd-5-1] src/crypto/dist/openssl/ssl
Module Name:src
Committed By: bouyer
Date: Fri Dec 10 21:42:28 UTC 2010
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5-1]: s3_clnt.c s3_srvr.c
Log Message:
Pull up following revision(s) (requested by drochner in ticket #1509):
crypto/external/bsd/openssl/dist/ssl/s3_srvr.c: revision 1.6 via patch
crypto/external/bsd/openssl/dist/ssl/s3_clnt.c: revision 1.3 via patch
openssl security patch of the day:
Fix a flaw in the OpenSSL SSL/TLS server code where an old bug
workaround allows malicous clients to modify the stored session cache
ciphersuite. In some cases the ciphersuite can be downgraded to a weaker one
on subsequent connections. See
http://www.openssl.org/news/secadv_20101202.txt
(CVE-2010-4180)
To generate a diff of this commit:
cvs rdiff -u -r1.12.4.2 -r1.12.4.2.2.1 src/crypto/dist/openssl/ssl/s3_clnt.c
cvs rdiff -u -r1.15.4.3 -r1.15.4.3.2.1 src/crypto/dist/openssl/ssl/s3_srvr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/ssl/s3_clnt.c
diff -u src/crypto/dist/openssl/ssl/s3_clnt.c:1.12.4.2 src/crypto/dist/openssl/ssl/s3_clnt.c:1.12.4.2.2.1
--- src/crypto/dist/openssl/ssl/s3_clnt.c:1.12.4.2 Tue Sep 7 19:31:14 2010
+++ src/crypto/dist/openssl/ssl/s3_clnt.c Fri Dec 10 21:42:28 2010
@@ -842,8 +842,11 @@
s->session->cipher_id = s->session->cipher->id;
if (s->hit && (s->session->cipher_id != c->id))
{
+/* Workaround is now obsolete */
+#if 0
if (!(s->options &
SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG))
+#endif
{
al=SSL_AD_ILLEGAL_PARAMETER;
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED);
Index: src/crypto/dist/openssl/ssl/s3_srvr.c
diff -u src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.3 src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.3.2.1
--- src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.3 Mon Apr 12 00:40:12 2010
+++ src/crypto/dist/openssl/ssl/s3_srvr.c Fri Dec 10 21:42:28 2010
@@ -959,12 +959,17 @@
}
if (j == 0)
{
+/* Disabled because it can be used in a ciphersuite downgrade
+ * attack: CVE-2010-4180.
+ */
+#if 0
if ((s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1))
{
/* Very bad for multi-threading */
s->session->cipher=sk_SSL_CIPHER_value(ciphers, 0);
}
else
+#endif
{
/* we need to have the cipher in the cipher
* list if we are asked to reuse it */
CVS commit: [netbsd-5] src/crypto/dist/openssl/ssl
Module Name:src
Committed By: bouyer
Date: Fri Dec 10 21:42:16 UTC 2010
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5]: s3_clnt.c s3_srvr.c
Log Message:
Pull up following revision(s) (requested by drochner in ticket #1509):
crypto/external/bsd/openssl/dist/ssl/s3_srvr.c: revision 1.6 via patch
crypto/external/bsd/openssl/dist/ssl/s3_clnt.c: revision 1.3 via patch
openssl security patch of the day:
Fix a flaw in the OpenSSL SSL/TLS server code where an old bug
workaround allows malicous clients to modify the stored session cache
ciphersuite. In some cases the ciphersuite can be downgraded to a weaker one
on subsequent connections. See
http://www.openssl.org/news/secadv_20101202.txt
(CVE-2010-4180)
To generate a diff of this commit:
cvs rdiff -u -r1.12.4.2 -r1.12.4.3 src/crypto/dist/openssl/ssl/s3_clnt.c
cvs rdiff -u -r1.15.4.3 -r1.15.4.4 src/crypto/dist/openssl/ssl/s3_srvr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/ssl/s3_clnt.c
diff -u src/crypto/dist/openssl/ssl/s3_clnt.c:1.12.4.2 src/crypto/dist/openssl/ssl/s3_clnt.c:1.12.4.3
--- src/crypto/dist/openssl/ssl/s3_clnt.c:1.12.4.2 Tue Sep 7 19:31:14 2010
+++ src/crypto/dist/openssl/ssl/s3_clnt.c Fri Dec 10 21:42:16 2010
@@ -842,8 +842,11 @@
s->session->cipher_id = s->session->cipher->id;
if (s->hit && (s->session->cipher_id != c->id))
{
+/* Workaround is now obsolete */
+#if 0
if (!(s->options &
SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG))
+#endif
{
al=SSL_AD_ILLEGAL_PARAMETER;
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED);
Index: src/crypto/dist/openssl/ssl/s3_srvr.c
diff -u src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.3 src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.4
--- src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.3 Mon Apr 12 00:40:12 2010
+++ src/crypto/dist/openssl/ssl/s3_srvr.c Fri Dec 10 21:42:16 2010
@@ -959,12 +959,17 @@
}
if (j == 0)
{
+/* Disabled because it can be used in a ciphersuite downgrade
+ * attack: CVE-2010-4180.
+ */
+#if 0
if ((s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1))
{
/* Very bad for multi-threading */
s->session->cipher=sk_SSL_CIPHER_value(ciphers, 0);
}
else
+#endif
{
/* we need to have the cipher in the cipher
* list if we are asked to reuse it */
CVS commit: src/sys/arch/ofppc/conf
Module Name:src Committed By: phx Date: Fri Dec 10 21:27:21 UTC 2010 Modified Files: src/sys/arch/ofppc/conf: GENERIC GENERIC.MP Log Message: Added viaenv(4), which no longer crashes the system during attachment since todays bug fix in the driver. To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/sys/arch/ofppc/conf/GENERIC cvs rdiff -u -r1.12 -r1.13 src/sys/arch/ofppc/conf/GENERIC.MP 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/ofppc/conf/GENERIC diff -u src/sys/arch/ofppc/conf/GENERIC:1.131 src/sys/arch/ofppc/conf/GENERIC:1.132 --- src/sys/arch/ofppc/conf/GENERIC:1.131 Tue Nov 23 11:14:04 2010 +++ src/sys/arch/ofppc/conf/GENERIC Fri Dec 10 21:27:21 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.131 2010/11/23 11:14:04 hannken Exp $ +# $NetBSD: GENERIC,v 1.132 2010/12/10 21:27:21 phx Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.131 $" +#ident "GENERIC-$Revision: 1.132 $" maxusers 32 @@ -215,6 +215,9 @@ pcppi0 at isa? # PC prog. periph. interface # FIX ISABEEP LATER +# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer +viaenv* at pci? dev ? function ? + # Serial Devices # ISA serial interfaces com0 at isa? port 0x3f8 irq 4 # standard PC serial ports Index: src/sys/arch/ofppc/conf/GENERIC.MP diff -u src/sys/arch/ofppc/conf/GENERIC.MP:1.12 src/sys/arch/ofppc/conf/GENERIC.MP:1.13 --- src/sys/arch/ofppc/conf/GENERIC.MP:1.12 Tue Nov 23 11:14:04 2010 +++ src/sys/arch/ofppc/conf/GENERIC.MP Fri Dec 10 21:27:21 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.MP,v 1.12 2010/11/23 11:14:04 hannken Exp $ +# $NetBSD: GENERIC.MP,v 1.13 2010/12/10 21:27:21 phx Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.12 $" +#ident "GENERIC-$Revision: 1.13 $" maxusers 32 @@ -216,6 +216,9 @@ pcppi0 at isa? # PC prog. periph. interface # FIX ISABEEP LATER +# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer +viaenv* at pci? dev ? function ? + # Serial Devices # ISA serial interfaces com0 at isa? port 0x3f8 irq 4 # standard PC serial ports
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: phx
Date: Fri Dec 10 21:20:09 UTC 2010
Modified Files:
src/sys/dev/pci: viaenv.c
Log Message:
Initialize sc_iot early enough to avoid a crash when the hardware monitor
function was found disabled.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/viaenv.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/pci/viaenv.c
diff -u src/sys/dev/pci/viaenv.c:1.29 src/sys/dev/pci/viaenv.c:1.30
--- src/sys/dev/pci/viaenv.c:1.29 Wed Apr 30 14:07:14 2008
+++ src/sys/dev/pci/viaenv.c Fri Dec 10 21:20:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: viaenv.c,v 1.29 2008/04/30 14:07:14 ad Exp $ */
+/* $NetBSD: viaenv.c,v 1.30 2010/12/10 21:20:09 phx Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: viaenv.c,v 1.29 2008/04/30 14:07:14 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viaenv.c,v 1.30 2010/12/10 21:20:09 phx Exp $");
#include
#include
@@ -295,6 +295,8 @@
break;
}
+ sc->sc_iot = pa->pa_iot;
+
iobase = pci_conf_read(pa->pa_pc, pa->pa_tag, VIAENV_HWMON_CONF);
DPRINTF(("%s: iobase 0x%x\n", device_xname(self), iobase));
control = pci_conf_read(pa->pa_pc, pa->pa_tag, VIAENV_HWMON_CTL);
@@ -306,7 +308,6 @@
}
/* Map Hardware Monitor I/O space */
- sc->sc_iot = pa->pa_iot;
if (bus_space_map(sc->sc_iot, iobase & 0xff80,
VIAENV_PMSIZE, 0, &sc->sc_ioh)) {
aprint_error_dev(self, "failed to map I/O space\n");
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Fri Dec 10 20:08:17 UTC 2010
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
Revert last, gcc(1) checks explicitly for -r on some platforms to disable
passing down --relax as well.
To generate a diff of this commit:
cvs rdiff -u -r1.253 -r1.254 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.253 src/share/mk/bsd.prog.mk:1.254
--- src/share/mk/bsd.prog.mk:1.253 Wed Dec 8 02:04:13 2010
+++ src/share/mk/bsd.prog.mk Fri Dec 10 20:08:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.253 2010/12/08 02:04:13 joerg Exp $
+# $NetBSD: bsd.prog.mk,v 1.254 2010/12/10 20:08:17 joerg Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -310,7 +310,7 @@
${_P}.ro: ${OBJS.${_P}} ${DPADD}
${_MKTARGET_LINK}
- ${CC} ${LDFLAGS} -nostdlib -Wl,-r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
+ ${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
.if defined(_PROGDEBUG.${_P})
${_PROGDEBUG.${_P}}: ${_P}
CVS commit: src/lib/libpam/libpam
Module Name:src
Committed By: joerg
Date: Fri Dec 10 20:06:17 UTC 2010
Modified Files:
src/lib/libpam/libpam: Makefile
Log Message:
Revert last as gcc(1) checks for -r to disable passing down --relax e.g.
on Sparc.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libpam/libpam/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/libpam/Makefile
diff -u src/lib/libpam/libpam/Makefile:1.10 src/lib/libpam/libpam/Makefile:1.11
--- src/lib/libpam/libpam/Makefile:1.10 Wed Dec 8 02:07:25 2010
+++ src/lib/libpam/libpam/Makefile Fri Dec 10 20:06:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/12/08 02:07:25 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/12/10 20:06:17 joerg Exp $
#-
# Copyright (c) 1998 Juniper Networks, Inc.
# All rights reserved.
@@ -184,7 +184,7 @@
# XXX Using ${.ALLSRC} in the ld command causes openpam_static.c to be
# XXX used. Why??!! --thorpej
openpam_static_modules.o: openpam_static.o ${STATIC_MODULE_LIBS}
- ${CC} ${LDFLAGS} -nostdlib -o ${.TARGET} -Wl,-r -Wl,--whole-archive \
+ ${CC} ${LDFLAGS} -nostdlib -o ${.TARGET} -r -Wl,--whole-archive \
openpam_static.o ${STATIC_MODULE_LIBS}
.include
CVS commit: src/sys/modules/nsmb
Module Name:src
Committed By: ahoka
Date: Fri Dec 10 19:46:40 UTC 2010
Added Files:
src/sys/modules/nsmb: Makefile
Log Message:
nsmb module makefile
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/nsmb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/modules/nsmb/Makefile
diff -u /dev/null src/sys/modules/nsmb/Makefile:1.1
--- /dev/null Fri Dec 10 19:46:40 2010
+++ src/sys/modules/nsmb/Makefile Fri Dec 10 19:46:40 2010
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2010/12/10 19:46:40 ahoka Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/netsmb
+
+KMOD= nsmb
+SRCS= iconv.c smb_conn.c smb_crypt.c smb_dev.c smb_iod.c smb_rq.c \
+ smb_smb.c smb_subr.c smb_trantcp.c smb_usr.c subr_mchain.c
+
+.include
+
CVS commit: src/sys/netsmb
Module Name:src
Committed By: ahoka
Date: Fri Dec 10 19:44:18 UTC 2010
Modified Files:
src/sys/netsmb: smb_dev.c smb_iod.c
Log Message:
Module support for NetBSD
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/netsmb/smb_dev.c
cvs rdiff -u -r1.35 -r1.36 src/sys/netsmb/smb_iod.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/netsmb/smb_dev.c
diff -u src/sys/netsmb/smb_dev.c:1.33 src/sys/netsmb/smb_dev.c:1.34
--- src/sys/netsmb/smb_dev.c:1.33 Mon Sep 21 14:13:35 2009
+++ src/sys/netsmb/smb_dev.c Fri Dec 10 19:44:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_dev.c,v 1.33 2009/09/21 14:13:35 njoly Exp $ */
+/* $NetBSD: smb_dev.c,v 1.34 2010/12/10 19:44:18 ahoka Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.33 2009/09/21 14:13:35 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.34 2010/12/10 19:44:18 ahoka Exp $");
#include
#include
@@ -68,6 +68,10 @@
#include
#ifdef __NetBSD__
+#include
+#endif
+
+#ifdef __NetBSD__
static struct smb_dev **smb_devtbl; /* indexed by minor */
#define SMB_GETDEV(dev) (smb_devtbl[minor(dev)])
#define NSMB_DEFNUM 4
@@ -462,6 +466,42 @@
}
DEV_MODULE (dev_netsmb, nsmb_dev_load, 0);
+#else
+MODULE(MODULE_CLASS_MISC, nsmb, NULL);
+
+static int
+nsmb_modcmd(modcmd_t cmd, void *arg)
+{
+ devmajor_t cmajor = NODEVMAJOR, bmajor = NODEVMAJOR;
+ int error = 0;
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ error = smb_sm_init();
+ if (error)
+ break;
+ error = smb_iod_init();
+ if (error) {
+ smb_sm_done();
+ break;
+ }
+ error =
+ devsw_attach("nsmb", NULL, &bmajor, &nsmb_cdevsw, &cmajor);
+ if (error)
+ return error;
+
+ break;
+ case MODULE_CMD_FINI:
+ smb_iod_done();
+ smb_sm_done();
+ error = devsw_detach(NULL, &nsmb_cdevsw);
+ break;
+ default:
+ error = ENOTTY;
+ break;
+ }
+ return error;
+}
#endif /* !__NetBSD__ */
/*
Index: src/sys/netsmb/smb_iod.c
diff -u src/sys/netsmb/smb_iod.c:1.35 src/sys/netsmb/smb_iod.c:1.36
--- src/sys/netsmb/smb_iod.c:1.35 Fri Sep 4 16:18:34 2009
+++ src/sys/netsmb/smb_iod.c Fri Dec 10 19:44:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_iod.c,v 1.35 2009/09/04 16:18:34 pooka Exp $ */
+/* $NetBSD: smb_iod.c,v 1.36 2010/12/10 19:44:18 ahoka Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: smb_iod.c,v 1.35 2009/09/04 16:18:34 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_iod.c,v 1.36 2010/12/10 19:44:18 ahoka Exp $");
#include
#include
@@ -744,10 +744,8 @@
return 0;
}
-#ifndef __NetBSD__
int
smb_iod_done(void)
{
return 0;
}
-#endif
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: phx Date: Fri Dec 10 17:54:34 UTC 2010 Modified Files: src/sys/arch/macppc/conf: GENERIC Log Message: Add uthum(4), which I just verified working. To generate a diff of this commit: cvs rdiff -u -r1.285 -r1.286 src/sys/arch/macppc/conf/GENERIC 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/macppc/conf/GENERIC diff -u src/sys/arch/macppc/conf/GENERIC:1.285 src/sys/arch/macppc/conf/GENERIC:1.286 --- src/sys/arch/macppc/conf/GENERIC:1.285 Fri Dec 10 00:36:03 2010 +++ src/sys/arch/macppc/conf/GENERIC Fri Dec 10 17:54:34 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.285 2010/12/10 00:36:03 macallan Exp $ +# $NetBSD: GENERIC,v 1.286 2010/12/10 17:54:34 phx Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.285 $" +#ident "GENERIC-$Revision: 1.286 $" maxusers 32 @@ -477,6 +477,8 @@ ukbd* at uhidev? reportid ?# USB Keyboards +uthum* at uhidev? reportid ?# TEMPerHUM sensors + ucycom* at uhidev? reportid ?# USB serial adapter uhid* at uhidev? reportid ?# USB Generic HID
