CVS commit: [uebayasi-xip] src/sys/arch
Module Name:src Committed By: uebayasi Date: Wed Nov 10 08:05:00 UTC 2010 Modified Files: src/sys/arch/alpha/alpha [uebayasi-xip]: pmap.c src/sys/arch/arm/arm32 [uebayasi-xip]: pmap.c Log Message: opt_xip.h isn't needed any more here. To generate a diff of this commit: cvs rdiff -u -r1.252.2.7 -r1.252.2.8 src/sys/arch/alpha/alpha/pmap.c cvs rdiff -u -r1.211.2.20 -r1.211.2.21 src/sys/arch/arm/arm32/pmap.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/alpha/alpha/pmap.c diff -u src/sys/arch/alpha/alpha/pmap.c:1.252.2.7 src/sys/arch/alpha/alpha/pmap.c:1.252.2.8 --- src/sys/arch/alpha/alpha/pmap.c:1.252.2.7 Wed Nov 10 03:36:25 2010 +++ src/sys/arch/alpha/alpha/pmap.c Wed Nov 10 08:04:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.252.2.7 2010/11/10 03:36:25 uebayasi Exp $ */ +/* $NetBSD: pmap.c,v 1.252.2.8 2010/11/10 08:04:59 uebayasi Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008 The NetBSD Foundation, Inc. @@ -137,11 +137,10 @@ #include opt_lockdebug.h #include opt_sysv.h #include opt_multiprocessor.h -#include opt_xip.h #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.252.2.7 2010/11/10 03:36:25 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.252.2.8 2010/11/10 08:04:59 uebayasi Exp $); #include sys/param.h #include sys/systm.h Index: src/sys/arch/arm/arm32/pmap.c diff -u src/sys/arch/arm/arm32/pmap.c:1.211.2.20 src/sys/arch/arm/arm32/pmap.c:1.211.2.21 --- src/sys/arch/arm/arm32/pmap.c:1.211.2.20 Wed Nov 10 03:36:26 2010 +++ src/sys/arch/arm/arm32/pmap.c Wed Nov 10 08:04:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.211.2.20 2010/11/10 03:36:26 uebayasi Exp $ */ +/* $NetBSD: pmap.c,v 1.211.2.21 2010/11/10 08:04:59 uebayasi Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -191,7 +191,6 @@ #include opt_ddb.h #include opt_lockdebug.h #include opt_multiprocessor.h -#include opt_xip.h #include sys/param.h #include sys/types.h @@ -212,7 +211,7 @@ #include machine/param.h #include arm/arm32/katelib.h -__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.211.2.20 2010/11/10 03:36:26 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.211.2.21 2010/11/10 08:04:59 uebayasi Exp $); #define VM_PAGE_TO_MD(pg) ((pg)-mdpage)
CVS commit: [uebayasi-xip] src/sys/arch/ia64/ia64
Module Name:src Committed By: uebayasi Date: Wed Nov 10 08:37:46 UTC 2010 Modified Files: src/sys/arch/ia64/ia64 [uebayasi-xip]: pmap.c Log Message: opt_xip.h is no more here. To generate a diff of this commit: cvs rdiff -u -r1.24.2.6 -r1.24.2.7 src/sys/arch/ia64/ia64/pmap.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/ia64/ia64/pmap.c diff -u src/sys/arch/ia64/ia64/pmap.c:1.24.2.6 src/sys/arch/ia64/ia64/pmap.c:1.24.2.7 --- src/sys/arch/ia64/ia64/pmap.c:1.24.2.6 Wed Nov 10 03:36:27 2010 +++ src/sys/arch/ia64/ia64/pmap.c Wed Nov 10 08:37:45 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.24.2.6 2010/11/10 03:36:27 uebayasi Exp $ */ +/* $NetBSD: pmap.c,v 1.24.2.7 2010/11/10 08:37:45 uebayasi Exp $ */ /*- @@ -85,9 +85,7 @@ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.24.2.6 2010/11/10 03:36:27 uebayasi Exp $); - -#include opt_xip.h +__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.24.2.7 2010/11/10 08:37:45 uebayasi Exp $); #include sys/param.h #include sys/systm.h
CVS commit: src/sys
Module Name:src
Committed By: uebayasi
Date: Wed Nov 10 09:27:25 UTC 2010
Modified Files:
src/sys/arch/acorn26/acorn26: pmap.c
src/sys/arch/alpha/alpha: machdep.c pmap.c
src/sys/arch/amd64/amd64: machdep.c
src/sys/arch/arm/arm32: pmap.c
src/sys/arch/i386/i386: machdep.c
src/sys/arch/ia64/ia64: machdep.c pmap.c
src/sys/arch/m68k/m68k: pmap_motorola.c
src/sys/arch/mips/mips: mips_machdep.c pmap.c
src/sys/arch/powerpc/ibm4xx: pmap.c
src/sys/arch/powerpc/isa: isadma_machdep.c
src/sys/arch/powerpc/oea: pmap.c
src/sys/arch/powerpc/powerpc: bus_dma.c
src/sys/arch/sh3/sh3: mem.c pmap.c
src/sys/arch/vax/vax: pmap.c
src/sys/arch/x68k/x68k: machdep.c mem.c
src/sys/uvm: uvm_page.h
Log Message:
Use more VM_PHYSMEM_*() accessors. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/acorn26/acorn26/pmap.c
cvs rdiff -u -r1.327 -r1.328 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.253 -r1.254 src/sys/arch/alpha/alpha/pmap.c
cvs rdiff -u -r1.154 -r1.155 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.217 -r1.218 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.696 -r1.697 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/ia64/ia64/machdep.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/ia64/ia64/pmap.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/m68k/m68k/pmap_motorola.c
cvs rdiff -u -r1.227 -r1.228 src/sys/arch/mips/mips/mips_machdep.c
cvs rdiff -u -r1.190 -r1.191 src/sys/arch/mips/mips/pmap.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/powerpc/ibm4xx/pmap.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/isa/isadma_machdep.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/powerpc/oea/pmap.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/powerpc/powerpc/bus_dma.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sh3/sh3/mem.c
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/sh3/sh3/pmap.c
cvs rdiff -u -r1.177 -r1.178 src/sys/arch/vax/vax/pmap.c
cvs rdiff -u -r1.167 -r1.168 src/sys/arch/x68k/x68k/machdep.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/x68k/x68k/mem.c
cvs rdiff -u -r1.62 -r1.63 src/sys/uvm/uvm_page.h
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/acorn26/acorn26/pmap.c
diff -u src/sys/arch/acorn26/acorn26/pmap.c:1.30 src/sys/arch/acorn26/acorn26/pmap.c:1.31
--- src/sys/arch/acorn26/acorn26/pmap.c:1.30 Sat Nov 7 07:27:40 2009
+++ src/sys/arch/acorn26/acorn26/pmap.c Wed Nov 10 09:27:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.30 2009/11/07 07:27:40 cegger Exp $ */
+/* $NetBSD: pmap.c,v 1.31 2010/11/10 09:27:21 uebayasi Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 Ben Harris
* All rights reserved.
@@ -102,7 +102,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.30 2009/11/07 07:27:40 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.31 2010/11/10 09:27:21 uebayasi Exp $);
#include sys/kernel.h /* for cold */
#include sys/malloc.h
@@ -299,11 +299,11 @@
addr = 0;
size = round_page(size);
for (i = 0; i vm_nphysseg; i++) {
- if (vm_physmem[i].avail_start vm_physmem[i].avail_end) {
+ if (VM_PHYSMEM_PTR(i)-avail_start VM_PHYSMEM_PTR(i)-avail_end) {
addr = (vaddr_t)
((char*)MEMC_PHYS_BASE +
-ptoa(vm_physmem[i].avail_start));
- vm_physmem[i].avail_start++;
+ptoa(VM_PHYSMEM_PTR(i)-avail_start));
+ VM_PHYSMEM_PTR(i)-avail_start++;
break;
}
}
Index: src/sys/arch/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.327 src/sys/arch/alpha/alpha/machdep.c:1.328
--- src/sys/arch/alpha/alpha/machdep.c:1.327 Sat Nov 6 11:46:00 2010
+++ src/sys/arch/alpha/alpha/machdep.c Wed Nov 10 09:27:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.327 2010/11/06 11:46:00 uebayasi Exp $ */
+/* $NetBSD: machdep.c,v 1.328 2010/11/10 09:27:21 uebayasi Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.327 2010/11/06 11:46:00 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.328 2010/11/10 09:27:21 uebayasi Exp $);
#include sys/param.h
#include sys/systm.h
@@ -604,7 +604,7 @@
vsize_t sz = (vsize_t)round_page(MSGBUFSIZE);
vsize_t reqsz = sz;
- vps = vm_physmem[vm_nphysseg - 1];
+ vps = VM_PHYSMEM_PTR(vm_nphysseg - 1);
/* shrink so that it'll fit in the last segment */
if ((vps-avail_end - vps-avail_start) atop(sz))
Index: src/sys/arch/alpha/alpha/pmap.c
diff -u src/sys/arch/alpha/alpha/pmap.c:1.253 src/sys/arch/alpha/alpha/pmap.c:1.254
--- src/sys/arch/alpha/alpha/pmap.c:1.253 Sat Oct 30 17:00:54 2010
+++ src/sys/arch/alpha/alpha/pmap.c Wed Nov 10 09:27:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.253 2010/10/30 17:00:54 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.254 2010/11/10 09:27:21 uebayasi
CVS commit: [uebayasi-xip] src/sys
Module Name:src
Committed By: uebayasi
Date: Wed Nov 10 08:59:14 UTC 2010
Modified Files:
src/sys/arch/alpha/alpha [uebayasi-xip]: pmap.c
src/sys/arch/amd64/amd64 [uebayasi-xip]: machdep.c
src/sys/arch/arm/arm32 [uebayasi-xip]: pmap.c
src/sys/arch/i386/i386 [uebayasi-xip]: machdep.c
src/sys/arch/ia64/ia64 [uebayasi-xip]: pmap.c
src/sys/arch/mips/mips [uebayasi-xip]: pmap.c
src/sys/arch/sh3/sh3 [uebayasi-xip]: pmap.c
src/sys/uvm [uebayasi-xip]: uvm_page.h
Log Message:
Fix thinko; make vm_physseg ptr swap really work.
To generate a diff of this commit:
cvs rdiff -u -r1.252.2.8 -r1.252.2.9 src/sys/arch/alpha/alpha/pmap.c
cvs rdiff -u -r1.141.2.6 -r1.141.2.7 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.211.2.21 -r1.211.2.22 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.681.2.6 -r1.681.2.7 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.24.2.7 -r1.24.2.8 src/sys/arch/ia64/ia64/pmap.c
cvs rdiff -u -r1.188.2.10 -r1.188.2.11 src/sys/arch/mips/mips/pmap.c
cvs rdiff -u -r1.74.2.7 -r1.74.2.8 src/sys/arch/sh3/sh3/pmap.c
cvs rdiff -u -r1.59.2.33 -r1.59.2.34 src/sys/uvm/uvm_page.h
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/alpha/alpha/pmap.c
diff -u src/sys/arch/alpha/alpha/pmap.c:1.252.2.8 src/sys/arch/alpha/alpha/pmap.c:1.252.2.9
--- src/sys/arch/alpha/alpha/pmap.c:1.252.2.8 Wed Nov 10 08:04:59 2010
+++ src/sys/arch/alpha/alpha/pmap.c Wed Nov 10 08:59:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.252.2.8 2010/11/10 08:04:59 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.252.2.9 2010/11/10 08:59:12 uebayasi Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008 The NetBSD Foundation, Inc.
@@ -140,7 +140,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.252.2.8 2010/11/10 08:04:59 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.252.2.9 2010/11/10 08:59:12 uebayasi Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1063,7 +1063,7 @@
vm_nphysseg--;
for (x = bank; x vm_nphysseg; x++) {
/* structure copy */
-*VM_PHYSMEM_PTR(x) = *VM_PHYSMEM_PTR(x + 1);
+VM_PHYSMEM_PTR_SWAP(x, x + 1);
}
}
Index: src/sys/arch/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.141.2.6 src/sys/arch/amd64/amd64/machdep.c:1.141.2.7
--- src/sys/arch/amd64/amd64/machdep.c:1.141.2.6 Wed Nov 10 03:36:26 2010
+++ src/sys/arch/amd64/amd64/machdep.c Wed Nov 10 08:59:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.141.2.6 2010/11/10 03:36:26 uebayasi Exp $ */
+/* $NetBSD: machdep.c,v 1.141.2.7 2010/11/10 08:59:12 uebayasi Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008
@@ -107,7 +107,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.141.2.6 2010/11/10 03:36:26 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.141.2.7 2010/11/10 08:59:12 uebayasi Exp $);
/* #define XENDEBUG_LOW */
@@ -1182,7 +1182,7 @@
/* Remove the last segment if it now has no pages. */
if (vps-start == vps-end) {
for (vm_nphysseg--; x vm_nphysseg; x++)
- *VM_PHYSMEM_PTR(x) = *VM_PHYSMEM_PTR(x + 1);
+ VM_PHYSMEM_PTR_SWAP(x, x + 1);
}
/* Now find where the new avail_end is. */
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.211.2.21 src/sys/arch/arm/arm32/pmap.c:1.211.2.22
--- src/sys/arch/arm/arm32/pmap.c:1.211.2.21 Wed Nov 10 08:04:59 2010
+++ src/sys/arch/arm/arm32/pmap.c Wed Nov 10 08:59:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.211.2.21 2010/11/10 08:04:59 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.211.2.22 2010/11/10 08:59:13 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.211.2.21 2010/11/10 08:04:59 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.211.2.22 2010/11/10 08:59:13 uebayasi Exp $);
#define VM_PAGE_TO_MD(pg) ((pg)-mdpage)
@@ -,8 +,8 @@
* If we consumed the entire physseg, remove it.
*/
if (ps-avail_start == ps-avail_end) {
-for (--vm_nphysseg; i vm_nphysseg; i++, ps++)
- *(ps[0]) = *(ps[1]);
+for (--vm_nphysseg; i vm_nphysseg; i++)
+ VM_PHYSMEM_PTR_SWAP(i, i + 1);
}
memset((void *)rpv-pv_va, 0, rpv-pv_size);
return;
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.681.2.6 src/sys/arch/i386/i386/machdep.c:1.681.2.7
--- src/sys/arch/i386/i386/machdep.c:1.681.2.6 Wed Nov 10 03:36:27 2010
+++ src/sys/arch/i386/i386/machdep.c Wed Nov 10 08:59:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.681.2.6 2010/11/10 03:36:27 uebayasi Exp $ */
+/* $NetBSD: machdep.c,v 1.681.2.7 2010/11/10 08:59:13 uebayasi Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
CVS commit: src/tests/lib/semaphore
Module Name:src
Committed By: pooka
Date: Wed Nov 10 11:14:12 UTC 2010
Modified Files:
src/tests/lib/semaphore: sem.c
Log Message:
Now that copyinstr() correctly returns error, trim the semaphore
name to fit into SEM_MAX_NAMELEN.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/semaphore/sem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/semaphore/sem.c
diff -u src/tests/lib/semaphore/sem.c:1.6 src/tests/lib/semaphore/sem.c:1.7
--- src/tests/lib/semaphore/sem.c:1.6 Sat Jul 3 08:18:30 2010
+++ src/tests/lib/semaphore/sem.c Wed Nov 10 11:14:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sem.c,v 1.6 2010/07/03 08:18:30 jmmv Exp $ */
+/* $NetBSD: sem.c,v 1.7 2010/11/10 11:14:12 pooka Exp $ */
/*
* Common code for semaphore tests. This can be included both into
@@ -207,7 +207,7 @@
* Wow, easy naming rules. it's these times i'm really happy i can
* single-step into the kernel.
*/
-#define SEM1 /my_precious_sem
+#define SEM1 /precious_sem
#define SEM2 /justsem
ATF_TC_BODY(named, tc)
{
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: dholland Date: Wed Nov 10 10:07:44 UTC 2010 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: spacetab I went and wrote a gizmo to automate this a while back, but I seem to have *lost* the thing. grr. To generate a diff of this commit: cvs rdiff -u -r1.289 -r1.290 src/sys/arch/amd64/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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.289 src/sys/arch/amd64/conf/GENERIC:1.290 --- src/sys/arch/amd64/conf/GENERIC:1.289 Fri Nov 5 10:28:21 2010 +++ src/sys/arch/amd64/conf/GENERIC Wed Nov 10 10:07:44 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.289 2010/11/05 10:28:21 gsutre Exp $ +# $NetBSD: GENERIC,v 1.290 2010/11/10 10:07:44 dholland Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.289 $ +#ident GENERIC-$Revision: 1.290 $ maxusers 64 # estimated number of users @@ -66,7 +66,7 @@ options SYSVSHM # System V-like memory sharing #options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options MODULAR # new style module framework +options MODULAR # new style module framework options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel @@ -265,8 +265,8 @@ options MPBIOS # configure CPUs and APICs using MPBIOS options MPBIOS_SCANPCI # MPBIOS configures PCI roots #options PCI_INTR_FIXUP # PCI interrupt routing via ACPI -#options PCI_BUS_FIXUP # fixup PCI bus numbering -#options PCI_ADDR_FIXUP # fixup PCI I/O addresses +#options PCI_BUS_FIXUP # fixup PCI bus numbering +#options PCI_ADDR_FIXUP # fixup PCI I/O addresses #options ACPI_ACTIVATE_DEV # If set, activate inactive devices options VGA_POST # in-kernel support for VGA POST @@ -611,7 +611,7 @@ # ATA (IDE) bus support atabus* at ata? -options ATADEBUG +options ATADEBUG # IDE drives # Flags are used only with controllers that support DMA operations @@ -673,7 +673,7 @@ gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG -iwn*at pci? dev ? function ?# Intel PRO/Wireless 4965AGN +iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN jme* at pci? dev ? function ? # JMicron JMC2[56]0 ethernet hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ le* at pci? dev ? function ? # PCnet-PCI Ethernet @@ -1108,8 +1108,8 @@ pseudo-device putter # for puffs and pud pseudo-device md 1 # memory disk device (ramdisk) -options MEMORY_DISK_HOOKS # enable root ramdisk -options MEMORY_DISK_DYNAMIC # loaded via kernel module +options MEMORY_DISK_HOOKS # enable root ramdisk +options MEMORY_DISK_DYNAMIC # loaded via kernel module pseudo-device vnd # disk-like interface to files #options VND_COMPRESSION # compressed vnd(4)
CVS commit: src/external/bsd/dhcpcd/sbin/dhcpcd
Module Name:src
Committed By: roy
Date: Wed Nov 10 14:12:29 UTC 2010
Modified Files:
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
Log Message:
Put correct init.d hooks into dhcpcd-run-hooks.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.7 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.8
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.7 Sat Feb 27 15:55:09 2010
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Wed Nov 10 14:12:28 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/02/27 15:55:09 roy Exp $
+# $NetBSD: Makefile,v 1.8 2010/11/10 14:12:28 roy Exp $
#
PROG= dhcpcd
@@ -34,11 +34,18 @@
CLEANFILES= dhcpcd.conf.5 dhcpcd.8 \
dhcpcd-run-hooks dhcpcd-run-hooks.8
+SERVICEEXISTS= [ -x /etc/rc.d/$$1 ]
+SERVICECMD= /etc/rc.d/$$1 $$2
+SERVICESTATUS= service_command $$1 status /dev/null 2\1
.for f in dhcpcd-run-hooks dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8
${f}: ${f}.in
${TOOL_SED} -e 's:@SYSCONFDIR@:/etc:g' -e 's:@DBDIR@:/var/db:g' \
-e 's:@HOOKDIR@:/libexec/dhcpcd-hooks:g' \
- -e 's:@SCRIPT@:/libexec/dhcpcd-run-hooks:g' ${DIST}/${f}.in $@
+ -e 's:@SCRIPT@:/libexec/dhcpcd-run-hooks:g' \
+ -e 's:@SERVICEEXISTS@:[ -x /etc/rc.d/$$1 ]:g' \
+ -e 's:@SERVICECMD@:/etc/rc.d/$$1 $$2:g' \
+ -e 's:@SERVICESTATUS@:service_command $$1 status /dev/null 2\1:g' \
+ ${DIST}/${f}.in $@
.endfor
.include bsd.prog.mk
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Wed Nov 10 16:12:15 UTC 2010
Modified Files:
src/lib/librumpuser: sp_common.c
Log Message:
Don't puff sigpipe if the connection has been severed. May happen
e.g. when a client executes a blocking call such a poll() and
decides to exit before the result is ready.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/librumpuser/sp_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/sp_common.c
diff -u src/lib/librumpuser/sp_common.c:1.2 src/lib/librumpuser/sp_common.c:1.3
--- src/lib/librumpuser/sp_common.c:1.2 Fri Nov 5 14:23:45 2010
+++ src/lib/librumpuser/sp_common.c Wed Nov 10 16:12:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sp_common.c,v 1.2 2010/11/05 14:23:45 pooka Exp $ */
+/* $NetBSD: sp_common.c,v 1.3 2010/11/10 16:12:15 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -150,7 +150,7 @@
}
}
- n = write(fd, sdata + sent, dlen - sent);
+ n = send(fd, sdata + sent, dlen - sent, MSG_NOSIGNAL);
if (n == 0) {
return EFAULT;
}
CVS commit: src/gnu/dist/gcc4/gcc/config/pa
Module Name:src
Committed By: skrll
Date: Wed Nov 10 18:28:29 UTC 2010
Modified Files:
src/gnu/dist/gcc4/gcc/config/pa: pa-netbsd.h
Log Message:
Update pa-netbsd.h to match pa-linux.h where it should. That is, remove
local definitions of
ASM_PREFERRED_EH_DATA_FORMAT
ASM_MAYBE_OUTPUT_ENCODED_ADDR_RTX
and make it obvious we're not using local ASM_OUTPUT_INTERNAL_LABEL
This fixes the current build problems (and probably more)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/gnu/dist/gcc4/gcc/config/pa/pa-netbsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gcc4/gcc/config/pa/pa-netbsd.h
diff -u src/gnu/dist/gcc4/gcc/config/pa/pa-netbsd.h:1.4 src/gnu/dist/gcc4/gcc/config/pa/pa-netbsd.h:1.5
--- src/gnu/dist/gcc4/gcc/config/pa/pa-netbsd.h:1.4 Mon Nov 12 12:58:10 2007
+++ src/gnu/dist/gcc4/gcc/config/pa/pa-netbsd.h Wed Nov 10 18:28:29 2010
@@ -19,43 +19,6 @@
Boston, MA 02111-1307, USA. */
-/* A C expression whose value is RTL representing the location of the
- incoming return address at the beginning of any function, before the
- prologue. You only need to define this macro if you want to support
- call frame debugging information like that provided by DWARF 2. */
-#define INCOMING_RETURN_ADDR_RTX (gen_rtx_REG (word_mode, 2))
-#define DWARF_FRAME_RETURN_COLUMN (DWARF_FRAME_REGNUM (2))
-
-/* This macro chooses the encoding of pointers embedded in the exception
- handling sections. If at all possible, this should be defined such
- that the exception handling section will not require dynamic relocations,
- and so may be read-only.
-
- FIXME: We use DW_EH_PE_aligned to output a PLABEL constructor for
- global function pointers. */
-/* XXXMRG: should we use the version in pa/pa.h? */
-#undef ASM_PREFERRED_EH_DATA_FORMAT
-#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \
- (CODE == 2 GLOBAL ? DW_EH_PE_aligned : DW_EH_PE_absptr)
-
-/* Handle special EH pointer encodings. Absolute, pc-relative, and
- indirect are handled automatically. Since pc-relative encoding is
- not possible on the PA and we don't have the infrastructure for
- data relative encoding, we use aligned plabels for global function
- pointers. */
-/* XXXMRG: should we use the version in pa/pa.h? */
-#undef ASM_MAYBE_OUTPUT_ENCODED_ADDR_RTX
-#define ASM_MAYBE_OUTPUT_ENCODED_ADDR_RTX(FILE, ENCODING, SIZE, ADDR, DONE) \
- do { \
-if (((ENCODING) 0x0F) == DW_EH_PE_aligned) \
- { \
- fputs (integer_asm_op (SIZE, FALSE), FILE); \
- fputs (P%, FILE); \
- assemble_name (FILE, XSTR (ADDR, 0));\
- goto DONE; \
- } \
-} while (0)
-
#undef TARGET_OS_CPP_BUILTINS
#define TARGET_OS_CPP_BUILTINS() \
do \
@@ -130,6 +93,9 @@
ASM_GENERATE_INTERNAL_LABEL(), so do not define it here. */
/* Use the default. */
+#undef ASM_OUTPUT_INTERNAL_LABEL
+
+/* Use the default. */
#undef TARGET_ASM_GLOBALIZE_LABEL
/* Globalizing directive for a label. */
#define GLOBAL_ASM_OP .globl
CVS commit: src/usr.sbin/rpc.yppasswdd
Module Name:src
Committed By: christos
Date: Wed Nov 10 18:56:19 UTC 2010
Modified Files:
src/usr.sbin/rpc.yppasswdd: Makefile
Removed Files:
src/usr.sbin/rpc.yppasswdd: yppasswdd_xdr.c
Log Message:
PR/44077: Dr. Wolfgang Stukenbrock: redundant xdr_passwd implementation should
be removed, and the one from -lrpcsvc should be used.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/rpc.yppasswdd/Makefile
cvs rdiff -u -r1.3 -r0 src/usr.sbin/rpc.yppasswdd/yppasswdd_xdr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/rpc.yppasswdd/Makefile
diff -u src/usr.sbin/rpc.yppasswdd/Makefile:1.5 src/usr.sbin/rpc.yppasswdd/Makefile:1.6
--- src/usr.sbin/rpc.yppasswdd/Makefile:1.5 Tue Jul 28 21:19:00 1998
+++ src/usr.sbin/rpc.yppasswdd/Makefile Wed Nov 10 13:56:17 2010
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 1998/07/29 01:19:00 simonb Exp $
+# $NetBSD: Makefile,v 1.6 2010/11/10 18:56:17 christos Exp $
PROG= rpc.yppasswdd
-SRCS= rpc.yppasswdd.c yppasswdd_xdr.c yppasswdd_mkpw.c
+SRCS= rpc.yppasswdd.c yppasswdd_mkpw.c
MAN= rpc.yppasswdd.8
MLINKS= rpc.yppasswdd.8 yppasswdd.8
-DPADD+= ${LIBCRYPT} ${LIBUTIL}
-LDADD+= -lcrypt -lutil
+DPADD+= ${LIBRPCSVC} ${LIBCRYPT} ${LIBUTIL}
+LDADD+= -lrpcsvc -lcrypt -lutil
.include bsd.prog.mk
CVS commit: src/sys
Module Name:src Committed By: skrll Date: Wed Nov 10 22:34:25 UTC 2010 Modified Files: src/sys/arch/hp700/conf: GENERIC src/sys/dev/pci: files.pci Added Files: src/sys/dev/pci: nside.c pciide_natsemi_reg.h Log Message: Add nside(4) - a driver for the National Semiconductor PC87415 IDE controller as found in many HP PA-RISC machines. From OpenBSD. Reviewed by Manuel Bouyer. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/sys/arch/hp700/conf/GENERIC cvs rdiff -u -r1.332 -r1.333 src/sys/dev/pci/files.pci cvs rdiff -u -r0 -r1.1 src/sys/dev/pci/nside.c \ src/sys/dev/pci/pciide_natsemi_reg.h 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/hp700/conf/GENERIC diff -u src/sys/arch/hp700/conf/GENERIC:1.103 src/sys/arch/hp700/conf/GENERIC:1.104 --- src/sys/arch/hp700/conf/GENERIC:1.103 Tue Nov 9 12:24:47 2010 +++ src/sys/arch/hp700/conf/GENERIC Wed Nov 10 22:34:24 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.103 2010/11/09 12:24:47 skrll Exp $ +# $NetBSD: GENERIC,v 1.104 2010/11/10 22:34:24 skrll Exp $ # # GENERIC machine description file # @@ -23,7 +23,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel -#ident GENERIC-$Revision: 1.103 $ +#ident GENERIC-$Revision: 1.104 $ maxusers 32 # estimated number of users @@ -416,6 +416,7 @@ cypide* at pci? dev ? function ? # Cypress IDE controllers geodeide* at pci? dev ? function ? # AMD Geode IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers +nside* at pci? dev ? function ? # National Semiconductor IDE controllers optiide* at pci? dev ? function ? # Opti IDE controllers pdcide* at pci? dev ? function ? # Promise IDE controllers pdcsata* at pci? dev ? function ? # Promise SATA150 controllers Index: src/sys/dev/pci/files.pci diff -u src/sys/dev/pci/files.pci:1.332 src/sys/dev/pci/files.pci:1.333 --- src/sys/dev/pci/files.pci:1.332 Tue Nov 9 12:24:48 2010 +++ src/sys/dev/pci/files.pci Wed Nov 10 22:34:24 2010 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.332 2010/11/09 12:24:48 skrll Exp $ +# $NetBSD: files.pci,v 1.333 2010/11/10 22:34:24 skrll Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -274,6 +274,11 @@ attach ahcisata at jmide_hl with jmahci file dev/pci/jmide.c jmide | jmahci needs-flag +# National Semiconductor IDE controllers +device nside: ata, ata_dma, ata_udma, pciide_common, wdc_common +attach nside at pci +file dev/pci/nside.c nside + # Opti IDE controllers device optiide: ata, ata_dma, pciide_common, wdc_common attach optiide at pci Added files: Index: src/sys/dev/pci/nside.c diff -u /dev/null src/sys/dev/pci/nside.c:1.1 --- /dev/null Wed Nov 10 22:34:25 2010 +++ src/sys/dev/pci/nside.c Wed Nov 10 22:34:24 2010 @@ -0,0 +1,260 @@ +/* $NetBSD: nside.c,v 1.1 2010/11/10 22:34:24 skrll Exp $ */ + +/* + * Copyright (c) 1999, 2000, 2001 Manuel Bouyer. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include sys/cdefs.h +__KERNEL_RCSID(0, $NetBSD: nside.c,v 1.1 2010/11/10 22:34:24 skrll Exp $); + +#include sys/param.h +#include sys/systm.h + +#include dev/pci/pcivar.h +#include dev/pci/pcidevs.h +#include dev/pci/pciidereg.h +#include dev/pci/pciidevar.h +#include dev/pci/pciide_natsemi_reg.h + +static void natsemi_chip_map(struct pciide_softc*, struct pci_attach_args*); +static void natsemi_setup_channel(struct ata_channel*); +static int natsemi_pci_intr(void *); +static void natsemi_irqack(struct ata_channel *); + +static int
CVS commit: src/doc
Module Name:src Committed By: skrll Date: Wed Nov 10 22:37:24 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Note nside(4). To generate a diff of this commit: cvs rdiff -u -r1.1454 -r1.1455 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/CHANGES diff -u src/doc/CHANGES:1.1454 src/doc/CHANGES:1.1455 --- src/doc/CHANGES:1.1454 Tue Nov 9 15:06:08 2010 +++ src/doc/CHANGES Wed Nov 10 22:37:23 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1454 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1455 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -776,3 +776,5 @@ atf(7): Import 0.12. [jmmv 20101107] hp700: Update sti(4) from OpenBSD and add pci(4) attachment. [skrll 20101109] + nside(4): Add a driver for the National Semiconductor PC87415 IDE + controler. [skrll 20101110]
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src
Committed By: agc
Date: Thu Nov 11 01:08:26 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: packet-parse.c
Log Message:
make this compile on amd64: clean up a debug statement, pointed out by jak
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.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/external/bsd/netpgp/dist/src/lib/packet-parse.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.46 src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.47
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.46 Thu Nov 11 00:58:04 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c Thu Nov 11 01:08:26 2010
@@ -58,7 +58,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: packet-parse.c,v 1.46 2010/11/11 00:58:04 agc Exp $);
+__RCSID($NetBSD: packet-parse.c,v 1.47 2010/11/11 01:08:26 agc Exp $);
#endif
#include sys/types.h
@@ -2935,7 +2935,7 @@
decrypt = pgp_get_decrypt(stream);
if (decrypt) {
if (pgp_get_debug_level(__FILE__)) {
- (void) fprintf(stderr, pgp_decrypt_se_ip_data: decrypt: num %d, alg %d, blocksize %d, keysize %d\n, decrypt-num, decrypt-alg, decrypt-blocksize, decrypt-keysize);
+ (void) fprintf(stderr, pgp_decrypt_se_ip_data: decrypt\n);
}
pgp_reader_push_decrypt(stream, decrypt, region);
pgp_reader_push_se_ip_data(stream, decrypt, region);
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src
Committed By: agc
Date: Thu Nov 11 00:58:05 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: compress.c crypto.h misc.c
packet-parse.c packet-parse.h packet.h reader.c validate.c
version.h
Log Message:
Changes to 3.99.15/20101110
+ add support for partial blocks, defined in rfc 4880, and used fairly
extensively by gnupg where the input size may not be known in advance
(e.g. for encrypted compressed data, as produced by default by gpg -e)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/external/bsd/netpgp/dist/src/lib/compress.c
cvs rdiff -u -r1.27 -r1.28 \
src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h
cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
cvs rdiff -u -r1.45 -r1.46 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.h
cvs rdiff -u -r1.28 -r1.29 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet.h
cvs rdiff -u -r1.44 -r1.45 \
src/crypto/external/bsd/netpgp/dist/src/lib/reader.c \
src/crypto/external/bsd/netpgp/dist/src/lib/version.h
cvs rdiff -u -r1.42 -r1.43 \
src/crypto/external/bsd/netpgp/dist/src/lib/validate.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/external/bsd/netpgp/dist/src/lib/compress.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/compress.c:1.19 src/crypto/external/bsd/netpgp/dist/src/lib/compress.c:1.20
--- src/crypto/external/bsd/netpgp/dist/src/lib/compress.c:1.19 Sun Nov 7 08:39:59 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/compress.c Thu Nov 11 00:58:04 2010
@@ -57,7 +57,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: compress.c,v 1.19 2010/11/07 08:39:59 agc Exp $);
+__RCSID($NetBSD: compress.c,v 1.20 2010/11/11 00:58:04 agc Exp $);
#endif
#ifdef HAVE_ZLIB_H
@@ -112,7 +112,7 @@
* bzip2_compressed_data_reader
*/
static int
-zlib_compressed_data_reader(void *dest, size_t length,
+zlib_compressed_data_reader(pgp_stream_t *stream, void *dest, size_t length,
pgp_error_t **errors,
pgp_reader_t *readinfo,
pgp_cbdata_t *cbinfo)
@@ -164,7 +164,7 @@
} else {
n = sizeof(z-in);
}
-if (!pgp_stacked_limited_read(z-in, n,
+if (!pgp_stacked_limited_read(stream, z-in, n,
z-region,
errors, readinfo, cbinfo)) {
return -1;
@@ -207,7 +207,7 @@
#ifdef HAVE_BZLIB_H
/* \todo remove code duplication between this and zlib_compressed_data_reader */
static int
-bzip2_compressed_data_reader(void *dest, size_t length,
+bzip2_compressed_data_reader(pgp_stream_t *stream, void *dest, size_t length,
pgp_error_t **errors,
pgp_reader_t *readinfo,
pgp_cbdata_t *cbinfo)
@@ -249,7 +249,7 @@
} else
n = sizeof(bz-in);
-if (!pgp_stacked_limited_read(
+if (!pgp_stacked_limited_read(stream,
(uint8_t *) bz-in,
n, bz-region,
errors, readinfo, cbinfo))
Index: src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h:1.27 src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h:1.28
--- src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h:1.27 Sun Nov 7 08:39:59 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h Thu Nov 11 00:58:04 2010
@@ -300,6 +300,12 @@
unsigned reading_v3_secret:1;
unsigned reading_mpi_len:1;
unsigned exact_read:1;
+ unsigned partial_read:1;
+ unsigned coalescing:1;
+ /* used for partial length coalescing */
+ unsigned virtualc;
+ unsigned virtualoff;
+ uint8_t *virtualpkt;
};
#endif /* CRYPTO_H_ */
Index: src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.38 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.39
--- src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.38 Sun Nov 7 08:39:59 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/misc.c Thu Nov 11 00:58:04 2010
@@ -57,7 +57,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: misc.c,v 1.38 2010/11/07 08:39:59 agc Exp $);
+__RCSID($NetBSD: misc.c,v 1.39 2010/11/11 00:58:04 agc Exp $);
#endif
#include sys/types.h
@@ -1159,7 +1159,7 @@
}
static int
-sum16_reader(void *dest_, size_t length, pgp_error_t **errors,
+sum16_reader(pgp_stream_t *stream, void *dest_, size_t length, pgp_error_t **errors,
pgp_reader_t *readinfo, pgp_cbdata_t *cbinfo)
{
const uint8_t *dest = dest_;
@@ -1167,7 +1167,7 @@
int r;
int n;
- r = pgp_stacked_read(dest_, length, errors, readinfo, cbinfo);
+ r = pgp_stacked_read(stream, dest_, length, errors, readinfo, cbinfo
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src
Committed By: agc
Date: Thu Nov 11 04:51:18 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile
netpgpverify.1
Log Message:
Bring the netpgpverify(1) manual page into line with current output, etc.
With thanks to Jeremy Reed for the fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1
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/netpgp/dist/src/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.18 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.19
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.18 Thu Nov 4 07:01:53 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile Thu Nov 11 04:51:18 2010
@@ -49,8 +49,7 @@
PROGRAMS = $(bin_PROGRAMS)
am_netpgpverify_OBJECTS = netpgpverify-verify.$(OBJEXT)
netpgpverify_OBJECTS = $(am_netpgpverify_OBJECTS)
-netpgpverify_DEPENDENCIES = ../lib/libnetpgp.la
-netpgpverify_LDADD = ../lib/libnetpgp.la
+netpgpverify_DEPENDENCIES = ../lib/libnetpgp.la ../libmj/libmj.la
DEFAULT_INCLUDES = -I. -I$(top_builddir)/src/lib
depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
am__depfiles_maybe = depfiles
@@ -67,7 +66,7 @@
DIST_SOURCES = $(netpgpverify_SOURCES)
man1dir = $(mandir)/man1
NROFF = nroff
-MANS = $(dist_man_MANS) $(man1_MANS)
+MANS = $(dist_man_MANS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -82,59 +81,52 @@
CANONICAL_HOST = i386-unknown-netbsdelf5.99.26
CC = gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include
+CFLAGS = -g -O2
CPP = gcc -E
-CPPFLAGS = -I/usr/include
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
+CPPFLAGS =
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO = /bin/echo
+DSYMUTIL =
+DUMPBIN =
ECHO_C =
ECHO_N = -n
ECHO_T =
EGREP = /usr/bin/grep -E
EXEEXT =
-F77 =
-FFLAGS =
-FGREP = @FGREP@
+FGREP = /usr/bin/grep -F
GREP = /usr/bin/grep
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = @LD@
-LDFLAGS = -L/usr/lib
+LD = /usr/bin/ld
+LDFLAGS =
LIBOBJS =
-LIBS = -lcrypto -lbz2 -lz -lssl -lcrypto
+LIBS = -lcrypto -lbz2 -lz
LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIPO = @LIPO@
+LIPO =
LN_S = ln -s
LTLIBOBJS =
MAINT = #
MAKEINFO = ${SHELL} /usr/src/crypto/external/bsd/netpgp/dist/buildaux/missing --run makeinfo
MKDIR_P = ../../buildaux/install-sh -c -d
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
+NM = /usr/bin/nm -B
+NMEDIT =
+OBJDUMP = objdump
OBJEXT = o
OPENSSL_INCLUDES = -I/usr/include
OPENSSL_LDFLAGS = -L/usr/lib
OPENSSL_LIBS = -lssl -lcrypto
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
+OTOOL =
+OTOOL64 =
PACKAGE = netpgp
PACKAGE_BUGREPORT = Alistair Crooks a...@netbsd.org c0596823
PACKAGE_NAME = netpgp
-PACKAGE_STRING = netpgp 20101103
+PACKAGE_STRING = netpgp 20101107
PACKAGE_TARNAME = netpgp
-PACKAGE_VERSION = 20101103
+PACKAGE_VERSION = 20101107
PATH_SEPARATOR = :
PKG_CONFIG = /usr/pkg/bin/pkg-config
RANLIB = ranlib
@@ -142,16 +134,14 @@
SET_MAKE =
SHELL = /bin/ksh
STRIP = strip
-VERSION = 20101103
+VERSION = 20101107
WARNCFLAGS = -Werror -Wall -Wpointer-arith
abs_builddir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgpverify
abs_srcdir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgpverify
abs_top_builddir = /usr/src/crypto/external/bsd/netpgp/dist
abs_top_srcdir = /usr/src/crypto/external/bsd/netpgp/dist
ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_F77 =
+ac_ct_DUMPBIN =
am__include = include
am__leading_dot = .
am__quote =
@@ -182,7 +172,7 @@
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
-lt_ECHO = @lt_ECHO@
+lt_ECHO = /bin/echo
mandir = ${datarootdir}/man
mkdir_p = $(top_builddir)/buildaux/install-sh -c -d
oldincludedir = /usr/include
@@ -201,8 +191,7 @@
AM_CFLAGS = $(WARNCFLAGS)
netpgpverify_SOURCES = verify.c
netpgpverify_CPPFLAGS = -I$(top_srcdir)/include
-netpgpverify_LDADD = ../lib/libnetpgp.la
-man1_MANS = netpgpverify.1
+netpgpverify_LDADD = ../lib/libnetpgp.la ../libmj/libmj.la
dist_man_MANS = netpgpverify.1
all: all-am
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.4
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.3
