CVS commit: [netbsd-4] src/sys/arch
Module Name:src
Committed By: bouyer
Date: Sun Jun 21 11:21:12 UTC 2009
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-4]: mainbus.c
src/sys/arch/i386/i386 [netbsd-4]: mainbus.c
src/sys/arch/x86/x86 [netbsd-4]: mpacpi.c mpbios.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1327):
sys/arch/amd64/amd64/mainbus.c: revision 1.28 via patch
sys/arch/x86/x86/mp.c: revision 1.2 via patch
sys/arch/i386/i386/mainbus.c: revision 1.85 via patch
sys/arch/x86/x86/mpacpi.c: patch
sys/arch/x86/x86/mpbios.c patch
Apply fixes from jmcneill@ for PR port-i386/38729
(ACPI kernel booted under qemu cannot detect devices):
- make MP SCANPCI function for ACPI_SCANPCI and MPBIOS_SCANPCI
return a number of attached PCI busses
- if no valid PCI busses are attached in the MP SCANPCI function,
try to probe and attach pci0 at mainbus as well as kernels
with no SCANPCI options
Feel free to check it in from jmcne...@.
Tested in pkgsrc qemu-0.9.1 (both i386 and x86_64) on NetBSD/i386.
Note original jmcneill's patch was posted on March:
http://mail-index.NetBSD.org/port-i386/2009/03/24/msg001281.html
and I also applied it to amd64:
http://mail-index.NetBSD.org/port-i386/2009/03/24/msg001283.html
but x86 MP attach functions have been reorganized by dyoung@ on April:
http://mail-index.NetBSD.org/source-changes/2009/04/17/msg219992.html
so I've modified the original patches to adapt the changes.
(mpacpi_scan_pci() and mpbios_scan_pci() have been merged into
common mp_pci_scan() in new arch/x86/x86/mp.c)
For netbsd-5 and netbsd-5-0 branches, the original patches should be
applied cleanly, and they have been tested by abs@ on a selection of
i386 boxes and in qemu.
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 src/sys/arch/amd64/amd64/mainbus.c
cvs rdiff -u -r1.70 -r1.70.2.1 src/sys/arch/i386/i386/mainbus.c
cvs rdiff -u -r1.44.2.2 -r1.44.2.3 src/sys/arch/x86/x86/mpacpi.c
cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/arch/x86/x86/mpbios.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/amd64/amd64/mainbus.c
diff -u src/sys/arch/amd64/amd64/mainbus.c:1.14.2.1 src/sys/arch/amd64/amd64/mainbus.c:1.14.2.2
--- src/sys/arch/amd64/amd64/mainbus.c:1.14.2.1 Wed Dec 19 19:38:53 2007
+++ src/sys/arch/amd64/amd64/mainbus.c Sun Jun 21 11:21:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.14.2.1 2007/12/19 19:38:53 ghen Exp $ */
+/* $NetBSD: mainbus.c,v 1.14.2.2 2009/06/21 11:21:12 bouyer Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.14.2.1 2007/12/19 19:38:53 ghen Exp $);
+__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.14.2.2 2009/06/21 11:21:12 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -234,6 +234,8 @@
#if NPCI 0
if (pci_mode != 0) {
+ int npcibus = 0;
+
mba.mba_pba.pba_iot = X86_BUS_SPACE_IO;
mba.mba_pba.pba_memt = X86_BUS_SPACE_MEM;
mba.mba_pba.pba_dmat = pci_bus_dma_tag;
@@ -243,17 +245,18 @@
mba.mba_pba.pba_bus = 0;
mba.mba_pba.pba_bridgetag = NULL;
#if NACPI 0 defined(ACPI_SCANPCI)
- if (mpacpi_active)
- mpacpi_scan_pci(self, mba.mba_pba, pcibusprint);
- else
+ if (npcibus == 0 mpacpi_active)
+ npcibus = mpacpi_scan_pci(self, mba.mba_pba,
+ pcibusprint);
#endif
#if defined(MPBIOS) defined(MPBIOS_SCANPCI)
- if (mpbios_scanned != 0)
- mpbios_scan_pci(self, mba.mba_pba, pcibusprint);
- else
-#endif
- config_found_ia(self, pcibus, mba.mba_pba, pcibusprint);
-
+ if (npcibus == 0 mpbios_scanned != 0)
+ npcibus = mpbios_scan_pci(self, mba.mba_pba,
+ pcibusprint);
+#endif
+ if (npcibus == 0)
+ config_found_ia(self, pcibus, mba.mba_pba,
+ pcibusprint);
#if NACPI 0
if (mp_verbose)
acpi_pci_link_state();
Index: src/sys/arch/i386/i386/mainbus.c
diff -u src/sys/arch/i386/i386/mainbus.c:1.70 src/sys/arch/i386/i386/mainbus.c:1.70.2.1
--- src/sys/arch/i386/i386/mainbus.c:1.70 Sun Nov 26 12:30:05 2006
+++ src/sys/arch/i386/i386/mainbus.c Sun Jun 21 11:21:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.70 2006/11/26 12:30:05 cube Exp $ */
+/* $NetBSD: mainbus.c,v 1.70.2.1 2009/06/21 11:21:12 bouyer Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.70 2006/11/26 12:30:05 cube Exp $);
+__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.70.2.1 2009/06/21 11:21:12 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -314,6 +314,8 @@
*/
#if NPCI 0
if (pci_mode != 0) {
+ int npcibus = 0;
+
mba.mba_pba.pba_iot = X86_BUS_SPACE_IO;
mba.mba_pba.pba_memt = X86_BUS_SPACE_MEM;
mba.mba_pba.pba_dmat = pci_bus_dma_tag;
@@ -323,16 +325,18 @@
mba.mba_pba.pba_bus = 0;
CVS commit: [netbsd-4] src/sys/compat/linux/common
Module Name:src Committed By: bouyer Date: Sun Jun 21 11:22:24 UTC 2009 Modified Files: src/sys/compat/linux/common [netbsd-4]: linux_sched.c Log Message: Pull up following revision(s) (requested by njoly in ticket #1328): sys/compat/linux/common/linux_sched.c: revision 1.59 In linux_sys_sched_getaffinity(), do not leak memory on error. To generate a diff of this commit: cvs rdiff -u -r1.37.2.1 -r1.37.2.2 src/sys/compat/linux/common/linux_sched.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/compat/linux/common/linux_sched.c diff -u src/sys/compat/linux/common/linux_sched.c:1.37.2.1 src/sys/compat/linux/common/linux_sched.c:1.37.2.2 --- src/sys/compat/linux/common/linux_sched.c:1.37.2.1 Wed Mar 28 20:38:41 2007 +++ src/sys/compat/linux/common/linux_sched.c Sun Jun 21 11:22:24 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sched.c,v 1.37.2.1 2007/03/28 20:38:41 jdc Exp $ */ +/* $NetBSD: linux_sched.c,v 1.37.2.2 2009/06/21 11:22:24 bouyer Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux_sched.c,v 1.37.2.1 2007/03/28 20:38:41 jdc Exp $); +__KERNEL_RCSID(0, $NetBSD: linux_sched.c,v 1.37.2.2 2009/06/21 11:22:24 bouyer Exp $); #include sys/param.h #include sys/mount.h @@ -557,12 +557,11 @@ retp = (int *)data[SCARG(uap, len) - sizeof(ret)]; *retp = ret; - if ((error = copyout(data, SCARG(uap, mask), SCARG(uap, len))) != 0) - return error; + error = copyout(data, SCARG(uap, mask), SCARG(uap, len)); free(data, M_TEMP); - return 0; + return error; }
CVS commit: [netbsd-4-0] src/sys/compat/linux/common
Module Name:src Committed By: bouyer Date: Sun Jun 21 11:22:41 UTC 2009 Modified Files: src/sys/compat/linux/common [netbsd-4-0]: linux_sched.c Log Message: Pull up following revision(s) (requested by njoly in ticket #1328): sys/compat/linux/common/linux_sched.c: revision 1.59 In linux_sys_sched_getaffinity(), do not leak memory on error. To generate a diff of this commit: cvs rdiff -u -r1.37.2.1 -r1.37.2.1.6.1 \ src/sys/compat/linux/common/linux_sched.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/compat/linux/common/linux_sched.c diff -u src/sys/compat/linux/common/linux_sched.c:1.37.2.1 src/sys/compat/linux/common/linux_sched.c:1.37.2.1.6.1 --- src/sys/compat/linux/common/linux_sched.c:1.37.2.1 Wed Mar 28 20:38:41 2007 +++ src/sys/compat/linux/common/linux_sched.c Sun Jun 21 11:22:41 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sched.c,v 1.37.2.1 2007/03/28 20:38:41 jdc Exp $ */ +/* $NetBSD: linux_sched.c,v 1.37.2.1.6.1 2009/06/21 11:22:41 bouyer Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux_sched.c,v 1.37.2.1 2007/03/28 20:38:41 jdc Exp $); +__KERNEL_RCSID(0, $NetBSD: linux_sched.c,v 1.37.2.1.6.1 2009/06/21 11:22:41 bouyer Exp $); #include sys/param.h #include sys/mount.h @@ -557,12 +557,11 @@ retp = (int *)data[SCARG(uap, len) - sizeof(ret)]; *retp = ret; - if ((error = copyout(data, SCARG(uap, mask), SCARG(uap, len))) != 0) - return error; + error = copyout(data, SCARG(uap, mask), SCARG(uap, len)); free(data, M_TEMP); - return 0; + return error; }
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Sun Jun 21 11:23:15 UTC 2009 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: tickets 1327, 1328 To generate a diff of this commit: cvs rdiff -u -r1.1.2.156 -r1.1.2.157 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.156 src/doc/CHANGES-4.1:1.1.2.157 --- src/doc/CHANGES-4.1:1.1.2.156 Wed Jun 17 20:56:23 2009 +++ src/doc/CHANGES-4.1 Sun Jun 21 11:23:15 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.156 2009/06/17 20:56:23 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.157 2009/06/21 11:23:15 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -3460,3 +3460,23 @@ first and then checks for null pointer for underline and bold. [christos, ticket #1324] +sys/arch/amd64/amd64/mainbus.c 1.28 via patch +sys/arch/i386/i386/mainbus.c 1.85 via patch +sys/arch/x86/x86/mp.c1.2 via patch +sys/arch/x86/x86/mpacpi.c patch +sys/arch/x86/x86/mpbios.c patch + + Apply fixes from jmcneill@ for PR port-i386/38729 (ACPI kernel booted + under qemu cannot detect devices): + - make MP SCANPCI function for ACPI_SCANPCI and MPBIOS_SCANPCI + return a number of attached PCI busses + - if no valid PCI busses are attached in the MP SCANPCI function, + try to probe and attach pci0 at mainbus as well as kernels + with no SCANPCI options + [tsutsui, ticket #1327] + +sys/compat/linux/common/linux_sched.c 1.59 + + In linux_sys_sched_getaffinity(), do not leak memory on error. + [njoly, ticket #1328] +
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Jun 21 11:23:22 UTC 2009 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1328 To generate a diff of this commit: cvs rdiff -u -r1.1.2.35 -r1.1.2.36 src/doc/CHANGES-4.0.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-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.35 src/doc/CHANGES-4.0.2:1.1.2.36 --- src/doc/CHANGES-4.0.2:1.1.2.35 Wed Jun 17 20:17:40 2009 +++ src/doc/CHANGES-4.0.2 Sun Jun 21 11:23:22 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.35 2009/06/17 20:17:40 jdc Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.36 2009/06/21 11:23:22 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -625,3 +625,8 @@ problem, and checked that root can still change the root password.) [tonnerre, ticket #1326] +sys/compat/linux/common/linux_sched.c 1.59 + + In linux_sys_sched_getaffinity(), do not leak memory on error. + [njoly, ticket #1328] +
CVS commit: [netbsd-5] src/external/bsd/pkg_install/dist
Module Name:src
Committed By: bouyer
Date: Sun Jun 21 11:41:03 UTC 2009
Modified Files:
src/external/bsd/pkg_install/dist/admin [netbsd-5]: pkg_admin.1
src/external/bsd/pkg_install/dist/lib [netbsd-5]: license.c version.h
Log Message:
Pullup the following revisions (requested by joerg in ticket 815):
external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.7
external/bsd/pkg_install/dist/lib/license.c:1.1.1.3
external/bsd/pkg_install/dist/lib/version.h:1.1.1.16
Merge pkg_install-20090610 from HEAD
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.6.1 -r1.1.1.1.6.2 \
src/external/bsd/pkg_install/dist/admin/pkg_admin.1
cvs rdiff -u -r1.1.1.2.4.2 -r1.1.1.2.4.3 \
src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.1.1.2.6.1 -r1.1.1.2.6.2 \
src/external/bsd/pkg_install/dist/lib/version.h
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/pkg_install/dist/admin/pkg_admin.1
diff -u src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.1.6.1 src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.1.6.2
--- src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.1.6.1 Sat May 30 16:40:31 2009
+++ src/external/bsd/pkg_install/dist/admin/pkg_admin.1 Sun Jun 21 11:41:02 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: pkg_admin.1,v 1.1.1.1.6.1 2009/05/30 16:40:31 snj Exp $
+.\ $NetBSD: pkg_admin.1,v 1.1.1.1.6.2 2009/06/21 11:41:02 bouyer Exp $
.\
.\ Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -176,7 +176,7 @@
Reports if
.Ar file
is a correctly signed package.
-.It Cm check-single-license Ar liccense
+.It Cm check-single-license Ar license
Check if
.Ar license
is a valid license name and if it is in the set of acceptable licenses.
Index: src/external/bsd/pkg_install/dist/lib/license.c
diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.4.2 src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.4.3
--- src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.4.2 Sat May 30 16:40:32 2009
+++ src/external/bsd/pkg_install/dist/lib/license.c Sun Jun 21 11:41:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: license.c,v 1.1.1.2.4.2 2009/05/30 16:40:32 snj Exp $ */
+/* $NetBSD: license.c,v 1.1.1.2.4.3 2009/06/21 11:41:03 bouyer Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger jo...@netbsd.org.
@@ -51,7 +51,7 @@
gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1
gnu-gpl-v3 gnu-lgpl-v3
original-bsd modified-bsd
-x11
+x11 mit miros
apache-1.1 apache-2.0
artistic artistic-2.0
cddl-1.0
@@ -156,14 +156,16 @@
size_t len;
len = strlen(license);
- if (strspn(license, license_chars) != len)
+ if (strspn(license, license_chars) != len) {
+ warnx(Invalid character in license name at position %zu, len);
return -1;
+ }
return acceptable_license_internal(license, len);
}
static int
-acceptable_pkg_license_internal(const char **licensep, int toplevel)
+acceptable_pkg_license_internal(const char **licensep, int toplevel, const char *start)
{
const char *license = *licensep;
int need_parenthesis, is_true = 0;
@@ -182,7 +184,7 @@
for (;;) {
if (*license == '(') {
- switch (acceptable_pkg_license_internal(license, 0)) {
+ switch (acceptable_pkg_license_internal(license, 0, start)) {
case -1:
return -1;
case 0:
@@ -196,8 +198,10 @@
license += strspn(license, license_spaces);
} else {
len = strspn(license, license_chars);
- if (len == 0)
+ if (len == 0) {
+warnx(Invalid character in license name at position %zu, license - start + 1);
return -1;
+ }
if (acceptable_license_internal(license, len)) {
if (expr_type != 2)
@@ -209,40 +213,53 @@
license += len;
len = strspn(license, license_spaces);
- if (len == 0 *license *license != ')')
+ if (len == 0 *license *license != ')') {
+warnx(Missing space at position %zu, license - start + 1);
return -1;
+ }
license += len;
}
if (*license == ')') {
- if (!need_parenthesis)
+ if (!need_parenthesis) {
+warnx(Missing open parenthesis at position %zu, license - start + 1);
return -1;
+ }
*licensep = license + 1;
return is_true;
}
if (*license == '\0') {
- if (need_parenthesis)
+ if (need_parenthesis) {
+warnx(Unbalanced parenthesis at position %zu, license - start + 1);
return -1;
+ }
*licensep = license;
return is_true;
}
if (strncmp(license, AND, 3) == 0) {
- if (expr_type == 1)
+ if (expr_type == 1) {
+warnx(Invalid operator in OR expression at position %zu, license - start + 1);
return -1;
+ }
expr_type = 2;
license += 3;
} else if (strncmp(license, OR, 2) == 0) {
- if (expr_type == 2)
+ if (expr_type == 2) {
+warnx(Invalid operator in AND expression at position %zu, license - start + 1);
CVS commit: [netbsd-5-0] src/external/bsd/pkg_install/dist
Module Name:src
Committed By: bouyer
Date: Sun Jun 21 11:42:20 UTC 2009
Modified Files:
src/external/bsd/pkg_install/dist/admin [netbsd-5-0]: pkg_admin.1
src/external/bsd/pkg_install/dist/lib [netbsd-5-0]: license.c version.h
Log Message:
Pullup the following revisions (requested by joerg in ticket 815):
external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.7
external/bsd/pkg_install/dist/lib/license.c:1.1.1.3
external/bsd/pkg_install/dist/lib/version.h:1.1.1.16
Merge pkg_install-20090610 from HEAD
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.8.1 -r1.1.1.1.8.2 \
src/external/bsd/pkg_install/dist/admin/pkg_admin.1
cvs rdiff -u -r1.1.1.2.2.2 -r1.1.1.2.2.3 \
src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.1.1.2.8.1 -r1.1.1.2.8.2 \
src/external/bsd/pkg_install/dist/lib/version.h
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/pkg_install/dist/admin/pkg_admin.1
diff -u src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.1.8.1 src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.1.8.2
--- src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.1.8.1 Sat May 30 16:21:36 2009
+++ src/external/bsd/pkg_install/dist/admin/pkg_admin.1 Sun Jun 21 11:42:19 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: pkg_admin.1,v 1.1.1.1.8.1 2009/05/30 16:21:36 snj Exp $
+.\ $NetBSD: pkg_admin.1,v 1.1.1.1.8.2 2009/06/21 11:42:19 bouyer Exp $
.\
.\ Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -176,7 +176,7 @@
Reports if
.Ar file
is a correctly signed package.
-.It Cm check-single-license Ar liccense
+.It Cm check-single-license Ar license
Check if
.Ar license
is a valid license name and if it is in the set of acceptable licenses.
Index: src/external/bsd/pkg_install/dist/lib/license.c
diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.2.2 src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.2.3
--- src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.2.2 Sat May 30 16:21:37 2009
+++ src/external/bsd/pkg_install/dist/lib/license.c Sun Jun 21 11:42:20 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: license.c,v 1.1.1.2.2.2 2009/05/30 16:21:37 snj Exp $ */
+/* $NetBSD: license.c,v 1.1.1.2.2.3 2009/06/21 11:42:20 bouyer Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger jo...@netbsd.org.
@@ -51,7 +51,7 @@
gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1
gnu-gpl-v3 gnu-lgpl-v3
original-bsd modified-bsd
-x11
+x11 mit miros
apache-1.1 apache-2.0
artistic artistic-2.0
cddl-1.0
@@ -156,14 +156,16 @@
size_t len;
len = strlen(license);
- if (strspn(license, license_chars) != len)
+ if (strspn(license, license_chars) != len) {
+ warnx(Invalid character in license name at position %zu, len);
return -1;
+ }
return acceptable_license_internal(license, len);
}
static int
-acceptable_pkg_license_internal(const char **licensep, int toplevel)
+acceptable_pkg_license_internal(const char **licensep, int toplevel, const char *start)
{
const char *license = *licensep;
int need_parenthesis, is_true = 0;
@@ -182,7 +184,7 @@
for (;;) {
if (*license == '(') {
- switch (acceptable_pkg_license_internal(license, 0)) {
+ switch (acceptable_pkg_license_internal(license, 0, start)) {
case -1:
return -1;
case 0:
@@ -196,8 +198,10 @@
license += strspn(license, license_spaces);
} else {
len = strspn(license, license_chars);
- if (len == 0)
+ if (len == 0) {
+warnx(Invalid character in license name at position %zu, license - start + 1);
return -1;
+ }
if (acceptable_license_internal(license, len)) {
if (expr_type != 2)
@@ -209,40 +213,53 @@
license += len;
len = strspn(license, license_spaces);
- if (len == 0 *license *license != ')')
+ if (len == 0 *license *license != ')') {
+warnx(Missing space at position %zu, license - start + 1);
return -1;
+ }
license += len;
}
if (*license == ')') {
- if (!need_parenthesis)
+ if (!need_parenthesis) {
+warnx(Missing open parenthesis at position %zu, license - start + 1);
return -1;
+ }
*licensep = license + 1;
return is_true;
}
if (*license == '\0') {
- if (need_parenthesis)
+ if (need_parenthesis) {
+warnx(Unbalanced parenthesis at position %zu, license - start + 1);
return -1;
+ }
*licensep = license;
return is_true;
}
if (strncmp(license, AND, 3) == 0) {
- if (expr_type == 1)
+ if (expr_type == 1) {
+warnx(Invalid operator in OR expression at position %zu, license - start + 1);
return -1;
+ }
expr_type = 2;
license += 3;
} else if (strncmp(license, OR, 2) == 0) {
- if (expr_type == 2)
+ if (expr_type == 2) {
+warnx(Invalid operator in AND expression at position %zu, license - start + 1);
CVS commit: [netbsd-4-0] src/external/bsd/pkg_install/dist
Module Name:src
Committed By: bouyer
Date: Sun Jun 21 11:42:52 UTC 2009
Modified Files:
src/external/bsd/pkg_install/dist/admin [netbsd-4-0]: pkg_admin.1
src/external/bsd/pkg_install/dist/lib [netbsd-4-0]: license.c version.h
Log Message:
Pullup the following revisions (requested by joerg in ticket 1325):
external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.7
external/bsd/pkg_install/dist/lib/license.c:1.1.1.3
external/bsd/pkg_install/dist/lib/version.h:1.1.1.16
Merge pkg_install-20090610 from HEAD
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6.2.2 -r1.1.1.6.2.3 \
src/external/bsd/pkg_install/dist/admin/pkg_admin.1
cvs rdiff -u -r1.1.1.2.6.2 -r1.1.1.2.6.3 \
src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.1.1.15.2.2 -r1.1.1.15.2.3 \
src/external/bsd/pkg_install/dist/lib/version.h
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/pkg_install/dist/admin/pkg_admin.1
diff -u src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.6.2.2 src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.6.2.3
--- src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.6.2.2 Fri Jun 5 17:01:58 2009
+++ src/external/bsd/pkg_install/dist/admin/pkg_admin.1 Sun Jun 21 11:42:52 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: pkg_admin.1,v 1.1.1.6.2.2 2009/06/05 17:01:58 snj Exp $
+.\ $NetBSD: pkg_admin.1,v 1.1.1.6.2.3 2009/06/21 11:42:52 bouyer Exp $
.\
.\ Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -176,7 +176,7 @@
Reports if
.Ar file
is a correctly signed package.
-.It Cm check-single-license Ar liccense
+.It Cm check-single-license Ar license
Check if
.Ar license
is a valid license name and if it is in the set of acceptable licenses.
Index: src/external/bsd/pkg_install/dist/lib/license.c
diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.6.2 src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.6.3
--- src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.6.2 Fri Jun 5 17:02:00 2009
+++ src/external/bsd/pkg_install/dist/lib/license.c Sun Jun 21 11:42:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: license.c,v 1.1.1.2.6.2 2009/06/05 17:02:00 snj Exp $ */
+/* $NetBSD: license.c,v 1.1.1.2.6.3 2009/06/21 11:42:52 bouyer Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger jo...@netbsd.org.
@@ -51,7 +51,7 @@
gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1
gnu-gpl-v3 gnu-lgpl-v3
original-bsd modified-bsd
-x11
+x11 mit miros
apache-1.1 apache-2.0
artistic artistic-2.0
cddl-1.0
@@ -156,14 +156,16 @@
size_t len;
len = strlen(license);
- if (strspn(license, license_chars) != len)
+ if (strspn(license, license_chars) != len) {
+ warnx(Invalid character in license name at position %zu, len);
return -1;
+ }
return acceptable_license_internal(license, len);
}
static int
-acceptable_pkg_license_internal(const char **licensep, int toplevel)
+acceptable_pkg_license_internal(const char **licensep, int toplevel, const char *start)
{
const char *license = *licensep;
int need_parenthesis, is_true = 0;
@@ -182,7 +184,7 @@
for (;;) {
if (*license == '(') {
- switch (acceptable_pkg_license_internal(license, 0)) {
+ switch (acceptable_pkg_license_internal(license, 0, start)) {
case -1:
return -1;
case 0:
@@ -196,8 +198,10 @@
license += strspn(license, license_spaces);
} else {
len = strspn(license, license_chars);
- if (len == 0)
+ if (len == 0) {
+warnx(Invalid character in license name at position %zu, license - start + 1);
return -1;
+ }
if (acceptable_license_internal(license, len)) {
if (expr_type != 2)
@@ -209,40 +213,53 @@
license += len;
len = strspn(license, license_spaces);
- if (len == 0 *license *license != ')')
+ if (len == 0 *license *license != ')') {
+warnx(Missing space at position %zu, license - start + 1);
return -1;
+ }
license += len;
}
if (*license == ')') {
- if (!need_parenthesis)
+ if (!need_parenthesis) {
+warnx(Missing open parenthesis at position %zu, license - start + 1);
return -1;
+ }
*licensep = license + 1;
return is_true;
}
if (*license == '\0') {
- if (need_parenthesis)
+ if (need_parenthesis) {
+warnx(Unbalanced parenthesis at position %zu, license - start + 1);
return -1;
+ }
*licensep = license;
return is_true;
}
if (strncmp(license, AND, 3) == 0) {
- if (expr_type == 1)
+ if (expr_type == 1) {
+warnx(Invalid operator in OR expression at position %zu, license - start + 1);
return -1;
+ }
expr_type = 2;
license += 3;
} else if (strncmp(license, OR, 2) == 0) {
- if (expr_type == 2)
+ if (expr_type == 2) {
+warnx(Invalid operator in AND expression at position %zu, license - start +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Jun 21 11:44:31 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.1 Log Message: ticket 1325 To generate a diff of this commit: cvs rdiff -u -r1.1.2.25 -r1.1.2.26 src/doc/CHANGES-5.0.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.0.1 diff -u src/doc/CHANGES-5.0.1:1.1.2.25 src/doc/CHANGES-5.0.1:1.1.2.26 --- src/doc/CHANGES-5.0.1:1.1.2.25 Fri Jun 19 21:42:15 2009 +++ src/doc/CHANGES-5.0.1 Sun Jun 21 11:44:30 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.1,v 1.1.2.25 2009/06/19 21:42:15 snj Exp $ +# $NetBSD: CHANGES-5.0.1,v 1.1.2.26 2009/06/21 11:44:30 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.0.1 release: @@ -453,3 +453,10 @@ In linux_sys_sched_getaffinity(), do not leak memory on error. [njoly, ticket #822] +external/bsd/pkg_install/dist/admin/pkg_admin.1: 1.1.1.7 +external/bsd/pkg_install/dist/lib/license.c: 1.1.1.3 +external/bsd/pkg_install/dist/lib/version.h: 1.1.1.16 + + Merge pkg_install-20090610 from HEAD + [joerg, ticket #815] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Sun Jun 21 11:44:54 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: ticket 1325 To generate a diff of this commit: cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/doc/CHANGES-5.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 diff -u src/doc/CHANGES-5.1:1.1.2.34 src/doc/CHANGES-5.1:1.1.2.35 --- src/doc/CHANGES-5.1:1.1.2.34 Sun Jun 21 01:11:26 2009 +++ src/doc/CHANGES-5.1 Sun Jun 21 11:44:54 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.34 2009/06/21 01:11:26 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.35 2009/06/21 11:44:54 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -1281,3 +1281,10 @@ for the current thread. [mlelstv, ticket #824] +external/bsd/pkg_install/dist/admin/pkg_admin.1: 1.1.1.7 +external/bsd/pkg_install/dist/lib/license.c: 1.1.1.3 +external/bsd/pkg_install/dist/lib/version.h: 1.1.1.16 + + Merge pkg_install-20090610 from HEAD + [joerg, ticket #815] +
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Jun 21 11:45:57 UTC 2009 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket 1325 To generate a diff of this commit: cvs rdiff -u -r1.1.2.36 -r1.1.2.37 src/doc/CHANGES-4.0.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-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.36 src/doc/CHANGES-4.0.2:1.1.2.37 --- src/doc/CHANGES-4.0.2:1.1.2.36 Sun Jun 21 11:23:22 2009 +++ src/doc/CHANGES-4.0.2 Sun Jun 21 11:45:57 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.36 2009/06/21 11:23:22 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.37 2009/06/21 11:45:57 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -630,3 +630,10 @@ In linux_sys_sched_getaffinity(), do not leak memory on error. [njoly, ticket #1328] +external/bsd/pkg_install/dist/admin/pkg_admin.1: 1.1.1.7 +external/bsd/pkg_install/dist/lib/license.c: 1.1.1.3 +external/bsd/pkg_install/dist/lib/version.h: 1.1.1.16 + + Merge pkg_install-20090610 from HEAD + [joerg, ticket #1325] +
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: jakllsch Date: Sun Jun 21 14:06:49 UTC 2009 Modified Files: src/sys/dev/scsipi: sd.c Log Message: Move call of sd_set_properties() to end of sd_get_parms(), rather than sdattach(). This allows DIOCGDISKINFO to do the right thing even when the media has changed. Note that drvctl -p will only DTRT if disk has been opened since the most recent media chenged. To generate a diff of this commit: cvs rdiff -u -r1.287 -r1.288 src/sys/dev/scsipi/sd.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/scsipi/sd.c diff -u src/sys/dev/scsipi/sd.c:1.287 src/sys/dev/scsipi/sd.c:1.288 --- src/sys/dev/scsipi/sd.c:1.287 Fri Jun 5 21:52:32 2009 +++ src/sys/dev/scsipi/sd.c Sun Jun 21 14:06:49 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: sd.c,v 1.287 2009/06/05 21:52:32 haad Exp $ */ +/* $NetBSD: sd.c,v 1.288 2009/06/21 14:06:49 jakllsch Exp $ */ /*- * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sd.c,v 1.287 2009/06/05 21:52:32 haad Exp $); +__KERNEL_RCSID(0, $NetBSD: sd.c,v 1.288 2009/06/21 14:06:49 jakllsch Exp $); #include opt_scsi.h #include rnd.h @@ -322,8 +322,6 @@ /* Discover wedges on this disk. */ dkwedge_discover(sd-sc_dk); - - sd_set_properties(sd); } static int @@ -2107,6 +2105,9 @@ dp-cyls = dp-disksize / (64 * 32); } dp-rot_rate = 3600; + + sd_set_properties(sd); + return (SDGP_RESULT_OK); }
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jakllsch
Date: Sun Jun 21 14:15:38 UTC 2009
Modified Files:
src/sys/dev/ic: siisata.c
Log Message:
Use PRO_PS and PRO_PCS correctly.
From Wolfgang Stukenbrock as part of kern/41579.
While here, remove a line of whitespace, and add an else case to
the ATAPI command length toggle.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/siisata.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/ic/siisata.c
diff -u src/sys/dev/ic/siisata.c:1.4 src/sys/dev/ic/siisata.c:1.5
--- src/sys/dev/ic/siisata.c:1.4 Wed Jun 17 19:12:48 2009
+++ src/sys/dev/ic/siisata.c Sun Jun 21 14:15:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.4 2009/06/17 19:12:48 cegger Exp $ */
+/* $NetBSD: siisata.c,v 1.5 2009/06/21 14:15:38 jakllsch Exp $ */
/* from ahcisata_core.c */
@@ -524,7 +524,7 @@
wait = wait ? wait : 1;
/* wait for ready */
- while (!(PRREAD(sc, PRX(chp-ch_channel, PRO_PCS)) PR_PS_PORT_READY))
+ while (!(PRREAD(sc, PRX(chp-ch_channel, PRO_PS)) PR_PS_PORT_READY))
DELAY(10);
prb = schp-sch_prb[slot];
@@ -593,7 +593,7 @@
/* XXX and then ? */
}
/* wait for ready */
- while (!(PRREAD(sc, PRX(chp-ch_channel, PRO_PCS)) PR_PS_PORT_READY))
+ while (!(PRREAD(sc, PRX(chp-ch_channel, PRO_PS)) PR_PS_PORT_READY))
DELAY(10);
PRWRITE(sc, PRX(chp-ch_channel, PRO_SERROR),
PRREAD(sc, PRX(chp-ch_channel, PRO_SERROR)));
@@ -656,7 +656,7 @@
schp-sch_sstatus)) {
case SStatus_DET_DEV:
/* wait for ready */
- while (!(PRREAD(sc, PRX(chp-ch_channel, PRO_PCS))
+ while (!(PRREAD(sc, PRX(chp-ch_channel, PRO_PS))
PR_PS_PORT_READY))
DELAY(10);
@@ -890,7 +890,6 @@
else
callout_stop(chp-ch_callout);
-
if (chp-ch_drive[xfer-c_drive].drive_flags DRIVE_WAITDRAIN) {
siisata_cmd_kill_xfer(chp, xfer, KILL_GONE);
chp-ch_drive[xfer-c_drive].drive_flags = ~DRIVE_WAITDRAIN;
@@ -1254,9 +1253,8 @@
{
struct siisata_softc *sc = (struct siisata_softc *)chp-ch_atac;
- PRWRITE(sc, PRX(chp-ch_channel, PRO_PCS),
- PRREAD(sc, PRX(chp-ch_channel, PRO_PCS)) | PR_PC_PORT_INITIALIZE);
- while (!(PRREAD(sc, PRX(chp-ch_channel, PRO_PCS)) PR_PS_PORT_READY))
+ PRWRITE(sc, PRX(chp-ch_channel, PRO_PCS), PR_PC_PORT_INITIALIZE);
+ while (!(PRREAD(sc, PRX(chp-ch_channel, PRO_PS)) PR_PS_PORT_READY))
DELAY(10);
}
@@ -1265,9 +1263,8 @@
{
struct siisata_softc *sc = (struct siisata_softc *)chp-ch_atac;
- PRWRITE(sc, PRX(chp-ch_channel, PRO_PCS),
- PRREAD(sc, PRX(chp-ch_channel, PRO_PCS)) | PR_PC_DEVICE_RESET);
- while (!(PRREAD(sc, PRX(chp-ch_channel, PRO_PCS)) PR_PS_PORT_READY))
+ PRWRITE(sc, PRX(chp-ch_channel, PRO_PCS), PR_PC_DEVICE_RESET);
+ while (!(PRREAD(sc, PRX(chp-ch_channel, PRO_PS)) PR_PS_PORT_READY))
DELAY(10);
}
@@ -1441,9 +1438,12 @@
/* configure port for packet length */
PRWRITE(siic, PRX(chp-ch_channel, PRO_PCS),
- PRREAD(siic, PRX(chp-ch_channel, PRO_PCS)) |
+ PR_PC_PACKET_LENGTH);
+ } else {
+ PRWRITE(siic, PRX(chp-ch_channel, PRO_PCC),
PR_PC_PACKET_LENGTH);
}
+
/* XXX This is gross. */
periph-periph_cap |= (id-atap_config ATAPI_CFG_DRQ_MASK);
CVS commit: src/usr.bin/ypcat
Module Name:src Committed By: wiz Date: Sun Jun 21 14:57:33 UTC 2009 Modified Files: src/usr.bin/ypcat: ypcat.1 Log Message: Use Pa for paths. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/usr.bin/ypcat/ypcat.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ypcat/ypcat.1 diff -u src/usr.bin/ypcat/ypcat.1:1.15 src/usr.bin/ypcat/ypcat.1:1.16 --- src/usr.bin/ypcat/ypcat.1:1.15 Sat Jun 20 19:27:26 2009 +++ src/usr.bin/ypcat/ypcat.1 Sun Jun 21 14:57:33 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: ypcat.1,v 1.15 2009/06/20 19:27:26 christos Exp $ +.\ $NetBSD: ypcat.1,v 1.16 2009/06/21 14:57:33 wiz Exp $ .\ .\ Copyright (c) 1993 Winning Strategies, Inc. .\ All rights reserved. @@ -61,8 +61,10 @@ Inhibit translation of map nicknames to their corresponding map names. .It Fl x -Display the map nickname table, found in /var/yp/nicknames. -A built-in default translation table is used if /var/yp/nicknames +Display the map nickname table, found in +.Pa /var/yp/nicknames . +A built-in default translation table is used if +.Pa /var/yp/nicknames does not exist (see .Xr nicknames 5 for details).
CVS commit: src/usr.bin/ypcat
Module Name:src
Committed By: wiz
Date: Sun Jun 21 14:58:16 UTC 2009
Modified Files:
src/usr.bin/ypcat: ypcat.c
Log Message:
Sync usage with man page.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/ypcat/ypcat.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.bin/ypcat/ypcat.c
diff -u src/usr.bin/ypcat/ypcat.c:1.13 src/usr.bin/ypcat/ypcat.c:1.14
--- src/usr.bin/ypcat/ypcat.c:1.13 Sat Jun 20 19:27:26 2009
+++ src/usr.bin/ypcat/ypcat.c Sun Jun 21 14:58:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ypcat.c,v 1.13 2009/06/20 19:27:26 christos Exp $ */
+/* $NetBSD: ypcat.c,v 1.14 2009/06/21 14:58:16 wiz Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt dera...@fsa.ca
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: ypcat.c,v 1.13 2009/06/20 19:27:26 christos Exp $);
+__RCSID($NetBSD: ypcat.c,v 1.14 2009/06/21 14:58:16 wiz Exp $);
#endif
#include sys/param.h
@@ -148,7 +148,7 @@
usage(void)
{
- (void)fprintf(stderr, Usage: %s [-k] [-d domainname] [-t] mapname\n,
+ (void)fprintf(stderr, Usage: %s [-kt] [-d domainname] mapname\n,
getprogname());
(void)fprintf(stderr,%s -x\n, getprogname());
exit(1);
CVS commit: src/usr.bin/ypmatch
Module Name:src Committed By: wiz Date: Sun Jun 21 14:58:58 UTC 2009 Modified Files: src/usr.bin/ypmatch: ypmatch.1 Log Message: Use Pa for paths. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/usr.bin/ypmatch/ypmatch.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ypmatch/ypmatch.1 diff -u src/usr.bin/ypmatch/ypmatch.1:1.15 src/usr.bin/ypmatch/ypmatch.1:1.16 --- src/usr.bin/ypmatch/ypmatch.1:1.15 Sat Jun 20 19:27:26 2009 +++ src/usr.bin/ypmatch/ypmatch.1 Sun Jun 21 14:58:58 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: ypmatch.1,v 1.15 2009/06/20 19:27:26 christos Exp $ +.\ $NetBSD: ypmatch.1,v 1.16 2009/06/21 14:58:58 wiz Exp $ .\ .\ Copyright (c) 1993 Winning Strategies, Inc. .\ All rights reserved. @@ -62,8 +62,10 @@ Inhibit translation of map nicknames to their corresponding map names. .It Fl x -Display the map nickname table, found in /var/yp/nicknames. -A built-in default translation table is used if /var/yp/nicknames +Display the map nickname table, found in +.Pa /var/yp/nicknames . +A built-in default translation table is used if +.Pa /var/yp/nicknames does not exist (see .Xr nicknames 5 for details).
CVS commit: src/usr.bin/ypmatch
Module Name:src
Committed By: wiz
Date: Sun Jun 21 14:59:53 UTC 2009
Modified Files:
src/usr.bin/ypmatch: ypmatch.c
Log Message:
Sync usage with man page.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/ypmatch/ypmatch.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.bin/ypmatch/ypmatch.c
diff -u src/usr.bin/ypmatch/ypmatch.c:1.18 src/usr.bin/ypmatch/ypmatch.c:1.19
--- src/usr.bin/ypmatch/ypmatch.c:1.18 Sat Jun 20 19:27:26 2009
+++ src/usr.bin/ypmatch/ypmatch.c Sun Jun 21 14:59:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ypmatch.c,v 1.18 2009/06/20 19:27:26 christos Exp $ */
+/* $NetBSD: ypmatch.c,v 1.19 2009/06/21 14:59:53 wiz Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt dera...@fsa.ca
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: ypmatch.c,v 1.18 2009/06/20 19:27:26 christos Exp $);
+__RCSID($NetBSD: ypmatch.c,v 1.19 2009/06/21 14:59:53 wiz Exp $);
#endif
#include sys/param.h
@@ -147,7 +147,7 @@
usage(void)
{
- (void)fprintf(stderr, Usage: %s [-d domain] [-tkz] key [key ...]
+ (void)fprintf(stderr, Usage: %s [-ktz] [-d domain] key ...
mapname\n, getprogname());
(void)fprintf(stderr,%s -x\n, getprogname());
exit(1);
CVS commit: src/usr.bin/ypwhich
Module Name:src Committed By: wiz Date: Sun Jun 21 15:02:54 UTC 2009 Modified Files: src/usr.bin/ypwhich: ypwhich.1 Log Message: Sort options and option descriptions. Use EXIT STATUS header for exit status description. Use Pa for paths. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.bin/ypwhich/ypwhich.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ypwhich/ypwhich.1 diff -u src/usr.bin/ypwhich/ypwhich.1:1.16 src/usr.bin/ypwhich/ypwhich.1:1.17 --- src/usr.bin/ypwhich/ypwhich.1:1.16 Sat Jun 20 19:27:26 2009 +++ src/usr.bin/ypwhich/ypwhich.1 Sun Jun 21 15:02:54 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: ypwhich.1,v 1.16 2009/06/20 19:27:26 christos Exp $ +.\ $NetBSD: ypwhich.1,v 1.17 2009/06/21 15:02:54 wiz Exp $ .\ .\ Copyright (c) 1994 Christopher G. Demetriou .\ All rights reserved. @@ -36,18 +36,13 @@ .Nd return hostname of NIS server of map master .Sh SYNOPSIS .Nm -.Op Fl d Ar domain -.Oo -.Op Fl h -.Ar host -.Oc .Op Fl T +.Op Fl d Ar domain +.Op Op Fl h Ar host .Nm +.Op Fl fTt .Op Fl d Ar domain .Op Fl h Ar host -.Op Fl f -.Op Fl t -.Op Fl T .Fl m Op Ar mname .Nm .Fl x @@ -71,8 +66,6 @@ .Bl -tag -width Fl .It Fl d Ar domain Specify a domain other than the default domain. -.It Fl h Ar host -Specify a host other than localhost to query for information. .It Fl f When used in conjunction with .Fl m , @@ -82,11 +75,8 @@ .Ar host directly, without using the local copy of .Xr ypbind 8 . -.It Fl t -Inhibit translation of map nicknames -to their corresponding map names. -.It Fl T -Use TCP protocol instead of UDP. +.It Fl h Ar host +Specify a host other than localhost to query for information. .It Fl m Op Ar mname Find the master .Tn NIS @@ -98,14 +88,21 @@ is omitted, .Nm will produce a list of available maps. +.It Fl T +Use TCP protocol instead of UDP. +.It Fl t +Inhibit translation of map nicknames +to their corresponding map names. .It Fl x -Display the map nickname table, found in /var/yp/nicknames. -A built-in default translation table is used if /var/yp/nicknames +Display the map nickname table, found in +.Pa /var/yp/nicknames . +A built-in default translation table is used if +.Pa /var/yp/nicknames does not exist (see .Xr nicknames 5 for details). .El -.Pp +.Sh EXIT STATUS .Nm exits with a non-zero exit code if .Fl m
CVS commit: src/usr.bin/ypwhich
Module Name:src Committed By: wiz Date: Sun Jun 21 15:04:07 UTC 2009 Modified Files: src/usr.bin/ypwhich: ypwhich.1 Log Message: Fix error in previous. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.bin/ypwhich/ypwhich.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ypwhich/ypwhich.1 diff -u src/usr.bin/ypwhich/ypwhich.1:1.17 src/usr.bin/ypwhich/ypwhich.1:1.18 --- src/usr.bin/ypwhich/ypwhich.1:1.17 Sun Jun 21 15:02:54 2009 +++ src/usr.bin/ypwhich/ypwhich.1 Sun Jun 21 15:04:07 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: ypwhich.1,v 1.17 2009/06/21 15:02:54 wiz Exp $ +.\ $NetBSD: ypwhich.1,v 1.18 2009/06/21 15:04:07 wiz Exp $ .\ .\ Copyright (c) 1994 Christopher G. Demetriou .\ All rights reserved. @@ -38,7 +38,7 @@ .Nm .Op Fl T .Op Fl d Ar domain -.Op Op Fl h Ar host +.Op Oo Fl h Oc Ar host .Nm .Op Fl fTt .Op Fl d Ar domain
CVS commit: src/usr.bin/ypwhich
Module Name:src
Committed By: wiz
Date: Sun Jun 21 15:04:56 UTC 2009
Modified Files:
src/usr.bin/ypwhich: ypwhich.c
Log Message:
Sync usage with man page.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/ypwhich/ypwhich.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.bin/ypwhich/ypwhich.c
diff -u src/usr.bin/ypwhich/ypwhich.c:1.16 src/usr.bin/ypwhich/ypwhich.c:1.17
--- src/usr.bin/ypwhich/ypwhich.c:1.16 Sat Jun 20 19:27:26 2009
+++ src/usr.bin/ypwhich/ypwhich.c Sun Jun 21 15:04:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ypwhich.c,v 1.16 2009/06/20 19:27:26 christos Exp $ */
+/* $NetBSD: ypwhich.c,v 1.17 2009/06/21 15:04:56 wiz Exp $ */
/*
*
@@ -192,7 +192,7 @@
{
const char *pname = getprogname();
(void)fprintf(stderr, Usage:\t%s [-T] [-d domain] [[-h] host]\n
- \t%s [-T] [-h host] [-d domain] [-f] [-t] -m [mapname]\n
+ \t%s [-fTt] [-d domain] [-h host] -m [mapname]\n
\t%s [-T] -x\n, pname, pname, pname);
exit(1);
}
CVS commit: src/usr.bin/ypcat
Module Name:src Committed By: wiz Date: Sun Jun 21 15:05:59 UTC 2009 Modified Files: src/usr.bin/ypcat: ypcat.1 Log Message: Remove superfluous quotes. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.bin/ypcat/ypcat.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ypcat/ypcat.1 diff -u src/usr.bin/ypcat/ypcat.1:1.16 src/usr.bin/ypcat/ypcat.1:1.17 --- src/usr.bin/ypcat/ypcat.1:1.16 Sun Jun 21 14:57:33 2009 +++ src/usr.bin/ypcat/ypcat.1 Sun Jun 21 15:05:59 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: ypcat.1,v 1.16 2009/06/21 14:57:33 wiz Exp $ +.\ $NetBSD: ypcat.1,v 1.17 2009/06/21 15:05:59 wiz Exp $ .\ .\ Copyright (c) 1993 Winning Strategies, Inc. .\ All rights reserved. @@ -33,7 +33,7 @@ .Os .Sh NAME .Nm ypcat -.Nd print the values of all keys in a NIS database +.Nd print the values of all keys in a NIS database .Sh SYNOPSIS .Nm .Op Fl kt
CVS commit: src
Module Name:src Committed By: mrg Date: Sun Jun 21 20:08:36 UTC 2009 Modified Files: src: UPDATING Log Message: add a note about native xorg updates To generate a diff of this commit: cvs rdiff -u -r1.196 -r1.197 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.196 src/UPDATING:1.197 --- src/UPDATING:1.196 Wed May 27 18:02:57 2009 +++ src/UPDATING Sun Jun 21 20:08:36 2009 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.196 2009/05/27 18:02:57 dholland Exp $ +$NetBSD: UPDATING,v 1.197 2009/06/21 20:08:36 mrg 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 @@ -16,6 +16,13 @@ Recent changes: ^^^ +20090616: + Native Xorg was upgraded. Builds will need a clean objdir for + src/external/mit/xorg. Upgrading a system from sets will not + work properly yet as the /usr/X11R7/lib/X11/xkb/symbols/pc + subdirectory has been changed into a file, and this needs to + be manually rm -r'ed before installing xbase.tgz. + 20090501: Several new functions were added to string.h/libc, and this can cause autoconf problems during the tool build for people
CVS commit: src/dist/nawk
Module Name:src Committed By: christos Date: Sun Jun 21 20:08:44 UTC 2009 Modified Files: src/dist/nawk: b.c Log Message: PR/40689: Nicolas Joly: awk(1) trashes memory with RE and ^ anchor Another place to special-case HAT. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/dist/nawk/b.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/nawk/b.c diff -u src/dist/nawk/b.c:1.17 src/dist/nawk/b.c:1.18 --- src/dist/nawk/b.c:1.17 Tue Nov 25 13:40:26 2008 +++ src/dist/nawk/b.c Sun Jun 21 16:08:44 2009 @@ -946,7 +946,8 @@ overflo(out of space in cgoto); f-posns[f-curstat] = p; - f-gototab[s][c] = f-curstat; + if (c != HAT) + f-gototab[s][c] = f-curstat; for (i = 0; i = setcnt; i++) p[i] = tmpset[i]; if (setvec[f-accept])
CVS commit: src/sys
Module Name:src
Committed By: mrg
Date: Sun Jun 21 20:15:27 UTC 2009
Modified Files:
src/sys/conf: files
src/sys/dev/pci: files.pci
Added Files:
src/sys/external/bsd/drm/conf: files.drm
Log Message:
make external drm the default.
To generate a diff of this commit:
cvs rdiff -u -r1.948 -r1.949 src/sys/conf/files
cvs rdiff -u -r1.315 -r1.316 src/sys/dev/pci/files.pci
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm/conf/files.drm
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.948 src/sys/conf/files:1.949
--- src/sys/conf/files:1.948 Wed Jun 17 04:02:59 2009
+++ src/sys/conf/files Sun Jun 21 20:15:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.948 2009/06/17 04:02:59 jakllsch Exp $
+# $NetBSD: files,v 1.949 2009/06/21 20:15:26 mrg Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20090313
@@ -1026,7 +1026,7 @@
# DRM - Direct Rendering Infrastructure: dev/drm
define drm {}
-include dev/drm/files.drm
+include external/bsd/drm/conf/files.drm
# Definitions for wscons
# device attributes: display, display with emulator, keyboard, and mouse
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.315 src/sys/dev/pci/files.pci:1.316
--- src/sys/dev/pci/files.pci:1.315 Wed Jun 17 04:37:57 2009
+++ src/sys/dev/pci/files.pci Sun Jun 21 20:15:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.315 2009/06/17 04:37:57 jakllsch Exp $
+# $NetBSD: files.pci,v 1.316 2009/06/21 20:15:26 mrg Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -913,11 +913,6 @@
attach sdhc at pci with sdhc_pci
file dev/pci/sdhc_pci.c sdhc_pci
-#
-# Direct Rendering Manager
-#
-include dev/pci/drm/files.pcidrm
-
# generic framebuffer console driver, PCI frontend
attach genfb at pci with genfb_pci
file dev/pci/genfb_pci.c genfb_pci
Added files:
Index: src/sys/external/bsd/drm/conf/files.drm
diff -u /dev/null src/sys/external/bsd/drm/conf/files.drm:1.1
--- /dev/null Sun Jun 21 20:15:27 2009
+++ src/sys/external/bsd/drm/conf/files.drm Sun Jun 21 20:15:26 2009
@@ -0,0 +1,96 @@
+# $NetBSD: files.drm,v 1.1 2009/06/21 20:15:26 mrg Exp $
+
+# direct rendering modules
+define drmbase
+define drmpci
+
+defflag opt_drm.h DRM_DEBUG DRM_NO_AGP DRM_NO_MTRR
+
+makeoptions drmbase CPPFLAGS+=-I$S/external/bsd/drm/dist/bsd-core -I$S/external/bsd/drm/dist/shared-core
+
+file external/bsd/drm/dist/bsd-core/drm_agpsupport.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_auth.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_bufs.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_context.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_dma.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_drawable.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_drv.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_fops.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_ioctl.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_irq.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_lock.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_memory.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_pci.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_scatter.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_sysctl.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_vm.c drmbase
+
+device i915drm: drmbase, drmpci
+attach i915drm at drm
+file external/bsd/drm/dist/bsd-core/i915_drv.c i915drm
+file external/bsd/drm/dist/shared-core/i915_dma.c i915drm
+file external/bsd/drm/dist/shared-core/i915_irq.c i915drm
+file external/bsd/drm/dist/shared-core/i915_mem.c i915drm
+file external/bsd/drm/dist/shared-core/i915_suspend.c i915drm
+
+device mach64drm: drmbase, drmpci
+attach mach64drm at drm
+file external/bsd/drm/dist/bsd-core/mach64_drv.c mach64drm
+file external/bsd/drm/dist/shared-core/mach64_dma.c mach64drm
+file external/bsd/drm/dist/shared-core/mach64_irq.c mach64drm
+file external/bsd/drm/dist/shared-core/mach64_state.c mach64drm
+
+device mgadrm: drmbase, drmpci
+attach mgadrm at drm
+file external/bsd/drm/dist/bsd-core/mga_drv.c mgadrm
+file external/bsd/drm/dist/shared-core/mga_dma.c mgadrm
+file external/bsd/drm/dist/shared-core/mga_irq.c mgadrm
+file external/bsd/drm/dist/shared-core/mga_state.c mgadrm
+file external/bsd/drm/dist/shared-core/mga_warp.c mgadrm
+
+# XXX missing: nouveau, nv
+
+device r128drm: drmbase, drmpci
+attach r128drm at drm
+file external/bsd/drm/dist/bsd-core/ati_pcigart.c (r128drm | radeondrm)
+file external/bsd/drm/dist/bsd-core/r128_drv.c r128drm
+file external/bsd/drm/dist/shared-core/r128_cce.c r128drm
+file external/bsd/drm/dist/shared-core/r128_irq.c r128drm
+file external/bsd/drm/dist/shared-core/r128_state.c r128drm
+
+device radeondrm: drmbase, drmpci
+attach radeondrm at drm
+file
CVS commit: src/sys/dev
Module Name:src Committed By: mrg Date: Sun Jun 21 20:15:50 UTC 2009 Removed Files: src/sys/dev/drm: drm.h drmP.h drm_agpsupport.c drm_atomic.h drm_auth.c drm_bufs.c drm_context.c drm_dma.c drm_drawable.c drm_drv.c drm_fops.c drm_ioctl.c drm_irq.c drm_linux_list.h drm_lock.c drm_memory.c drm_pci.c drm_sarea.h drm_scatter.c drm_sysctl.c drm_vm.c files.drm src/sys/dev/pci/drm: ati_pcigart.c drm_pciids.h files.pcidrm i915_dma.c i915_drm.h i915_drv.c i915_drv.h i915_irq.c i915_mem.c mach64_dma.c mach64_drm.h mach64_drv.c mach64_drv.h mach64_irq.c mach64_state.c mga_dma.c mga_drm.h mga_drv.c mga_drv.h mga_irq.c mga_state.c mga_ucode.h mga_warp.c r128_cce.c r128_drm.h r128_drv.c r128_drv.h r128_irq.c r128_state.c r300_cmdbuf.c r300_reg.h radeon_cp.c radeon_drm.h radeon_drv.c radeon_drv.h radeon_irq.c radeon_mem.c radeon_state.c savage_bci.c savage_drm.h savage_drv.c savage_drv.h savage_state.c sis_drm.h sis_drv.c sis_drv.h sis_ds.c sis_ds.h sis_mm.c tdfx_drv.c tdfx_drv.h via_3d_reg.h via_dma.c via_dmablit.h via_drm.h via_drv.c via_drv.h via_ds.c via_ds.h via_irq.c via_map.c via_mm.c via_mm.h via_verifier.c via_verifier.h via_video.c Log Message: remove the old drm sources. To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/sys/dev/drm/drm.h src/sys/dev/drm/drm_drawable.c \ src/sys/dev/drm/drm_ioctl.c src/sys/dev/drm/drm_linux_list.h \ src/sys/dev/drm/drm_sysctl.c cvs rdiff -u -r1.35 -r0 src/sys/dev/drm/drmP.h cvs rdiff -u -r1.7 -r0 src/sys/dev/drm/drm_agpsupport.c \ src/sys/dev/drm/drm_atomic.h src/sys/dev/drm/drm_dma.c \ src/sys/dev/drm/drm_lock.c src/sys/dev/drm/files.drm cvs rdiff -u -r1.6 -r0 src/sys/dev/drm/drm_auth.c cvs rdiff -u -r1.11 -r0 src/sys/dev/drm/drm_bufs.c cvs rdiff -u -r1.4 -r0 src/sys/dev/drm/drm_context.c \ src/sys/dev/drm/drm_fops.c cvs rdiff -u -r1.25 -r0 src/sys/dev/drm/drm_drv.c cvs rdiff -u -r1.17 -r0 src/sys/dev/drm/drm_irq.c src/sys/dev/drm/drm_vm.c cvs rdiff -u -r1.16 -r0 src/sys/dev/drm/drm_memory.c cvs rdiff -u -r1.14 -r0 src/sys/dev/drm/drm_pci.c cvs rdiff -u -r1.2 -r0 src/sys/dev/drm/drm_sarea.h cvs rdiff -u -r1.8 -r0 src/sys/dev/drm/drm_scatter.c cvs rdiff -u -r1.8 -r0 src/sys/dev/pci/drm/ati_pcigart.c \ src/sys/dev/pci/drm/mach64_drv.c src/sys/dev/pci/drm/mga_drv.c \ src/sys/dev/pci/drm/r128_cce.c src/sys/dev/pci/drm/r128_drv.c \ src/sys/dev/pci/drm/radeon_irq.c src/sys/dev/pci/drm/savage_drv.c \ src/sys/dev/pci/drm/sis_drv.c src/sys/dev/pci/drm/tdfx_drv.c cvs rdiff -u -r1.6 -r0 src/sys/dev/pci/drm/drm_pciids.h \ src/sys/dev/pci/drm/mach64_dma.c src/sys/dev/pci/drm/mach64_irq.c \ src/sys/dev/pci/drm/mach64_state.c src/sys/dev/pci/drm/mga_dma.c \ src/sys/dev/pci/drm/mga_irq.c src/sys/dev/pci/drm/r128_irq.c \ src/sys/dev/pci/drm/r128_state.c src/sys/dev/pci/drm/radeon_mem.c \ src/sys/dev/pci/drm/via_drv.c cvs rdiff -u -r1.5 -r0 src/sys/dev/pci/drm/files.pcidrm \ src/sys/dev/pci/drm/i915_mem.c src/sys/dev/pci/drm/via_dma.c \ src/sys/dev/pci/drm/via_map.c cvs rdiff -u -r1.7 -r0 src/sys/dev/pci/drm/i915_dma.c \ src/sys/dev/pci/drm/i915_irq.c src/sys/dev/pci/drm/mga_state.c \ src/sys/dev/pci/drm/r300_cmdbuf.c src/sys/dev/pci/drm/radeon_drv.h \ src/sys/dev/pci/drm/via_irq.c src/sys/dev/pci/drm/via_video.c cvs rdiff -u -r1.2 -r0 src/sys/dev/pci/drm/i915_drm.h \ src/sys/dev/pci/drm/r300_reg.h src/sys/dev/pci/drm/via_drv.h \ src/sys/dev/pci/drm/via_ds.h cvs rdiff -u -r1.11 -r0 src/sys/dev/pci/drm/i915_drv.c cvs rdiff -u -r1.4 -r0 src/sys/dev/pci/drm/i915_drv.h \ src/sys/dev/pci/drm/mga_warp.c src/sys/dev/pci/drm/r128_drv.h \ src/sys/dev/pci/drm/savage_bci.c src/sys/dev/pci/drm/savage_state.c \ src/sys/dev/pci/drm/sis_ds.c src/sys/dev/pci/drm/sis_mm.c cvs rdiff -u -r1.1 -r0 src/sys/dev/pci/drm/mach64_drm.h \ src/sys/dev/pci/drm/mga_drm.h src/sys/dev/pci/drm/mga_ucode.h \ src/sys/dev/pci/drm/r128_drm.h src/sys/dev/pci/drm/savage_drm.h \ src/sys/dev/pci/drm/savage_drv.h src/sys/dev/pci/drm/sis_drm.h \ src/sys/dev/pci/drm/sis_drv.h src/sys/dev/pci/drm/sis_ds.h \ src/sys/dev/pci/drm/tdfx_drv.h src/sys/dev/pci/drm/via_3d_reg.h \ src/sys/dev/pci/drm/via_dmablit.h src/sys/dev/pci/drm/via_drm.h \ src/sys/dev/pci/drm/via_mm.h src/sys/dev/pci/drm/via_verifier.h cvs rdiff -u -r1.3 -r0 src/sys/dev/pci/drm/mach64_drv.h \ src/sys/dev/pci/drm/mga_drv.h src/sys/dev/pci/drm/radeon_drm.h \ src/sys/dev/pci/drm/via_ds.c src/sys/dev/pci/drm/via_mm.c \ src/sys/dev/pci/drm/via_verifier.c cvs rdiff -u -r1.12 -r0 src/sys/dev/pci/drm/radeon_cp.c cvs rdiff -u -r1.13 -r0 src/sys/dev/pci/drm/radeon_drv.c cvs rdiff -u -r1.9 -r0 src/sys/dev/pci/drm/radeon_state.c Please note that diffs are not public domain; they are subject to the copyright notices on the
CVS commit: src/libexec/lfs_cleanerd
Module Name:src
Committed By: christos
Date: Sun Jun 21 20:20:50 UTC 2009
Modified Files:
src/libexec/lfs_cleanerd: Makefile
Log Message:
PR/40965: NAKAJIMA Yoshihiro: lfs_cleanerd isn't adapted to !MKDYNAMICROOT
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/libexec/lfs_cleanerd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/lfs_cleanerd/Makefile
diff -u src/libexec/lfs_cleanerd/Makefile:1.13 src/libexec/lfs_cleanerd/Makefile:1.14
--- src/libexec/lfs_cleanerd/Makefile:1.13 Sun Mar 15 22:24:56 2009
+++ src/libexec/lfs_cleanerd/Makefile Sun Jun 21 16:20:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/03/16 02:24:56 lukem Exp $
+# $NetBSD: Makefile,v 1.14 2009/06/21 20:20:50 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
WARNS?=3 # XXX: too many sign-compare issues
@@ -21,5 +21,8 @@
#CPPFLAGS+=-DTEST_PATTERN
BINDIR= /libexec
+.if (${MKDYNAMICROOT} == no)
+LDSTATIC?= -static
+.endif
.include bsd.prog.mk
CVS commit: xsrc/external/mit/xf86-video-s3/dist/src
Module Name:xsrc
Committed By: ahoka
Date: Sun Jun 21 20:42:30 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-s3/dist/src: s3_bios.c
Log Message:
Do better error checking around libpciaccess, like the intel driver does.
This makes the driver working again after the last Xorg update.
Although this doesn't really fix the real issue, but makes the driver more
robust, thus it reports the error in the logfile instead of dumping core.
This should go to upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-s3/dist/src/s3_bios.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-s3/dist/src/s3_bios.c
diff -u xsrc/external/mit/xf86-video-s3/dist/src/s3_bios.c:1.1.1.2 xsrc/external/mit/xf86-video-s3/dist/src/s3_bios.c:1.2
--- xsrc/external/mit/xf86-video-s3/dist/src/s3_bios.c:1.1.1.2 Fri Jun 5 20:58:36 2009
+++ xsrc/external/mit/xf86-video-s3/dist/src/s3_bios.c Sun Jun 21 20:42:29 2009
@@ -36,27 +36,38 @@
#include s3.h
-static unsigned char *find_bios_string(S3Ptr pS3, int BIOSbase,
+static unsigned char *find_bios_string(ScrnInfoPtr pScrn, int BIOSbase,
char *match1, char *match2)
{
- static unsigned char bios[BIOS_BSIZE];
+ static unsigned char *bios;
static int init=0;
- int i, j, l1, l2;
+ int i, j, l1, l2, ret;
+
+ S3Ptr pS3 = S3PTR(pScrn);
+
+ bios = xalloc(BIOS_BSIZE);
+ if (bios = NULL)
+ return NULL;
if (!init) {
init = 1;
#ifndef XSERVER_LIBPCIACCESS
if (xf86ReadDomainMemory(pS3-PciTag, BIOSbase, BIOS_BSIZE, bios) != BIOS_BSIZE)
- return NULL;
+ goto error;
#else
- if (pci_device_read_rom(pS3-PciInfo, bios))
- return NULL;
+ ret = pci_device_read_rom(pS3-PciInfo, bios);
+ if (ret) {
+ xf86DrvMsg(pScrn-scrnIndex, X_WARNING,
+libpciaccess failed to read video BIOS: %s\n,
+strerror(-ret));
+ goto error;
+ }
#endif
if ((bios[0] != 0x55) || (bios[1] != 0xaa))
- return NULL;
+ goto error;
}
if (match1 == NULL)
- return NULL;
+ goto error;
l1 = strlen(match1);
if (match2 != NULL)
@@ -74,17 +85,17 @@
!memcmp(bios[j], match2, l2))
return bios[j+l2];
}
-
+error:
+ xfree(bios);
return NULL;
}
int S3GetRefClock(ScrnInfoPtr pScrn)
{
- S3Ptr pS3 = S3PTR(pScrn);
int RefClock = 16000; /* default */
- if (find_bios_string(pS3, BIOS_BASE, Number Nine Visual Technology,
+ if (find_bios_string(pScrn, BIOS_BASE, Number Nine Visual Technology,
Motion 771) != NULL)
RefClock = 16000;
CVS commit: src/external/bsd/iscsi
Module Name:src
Committed By: agc
Date: Sun Jun 21 21:11:17 UTC 2009
Added Files:
src/external/bsd/iscsi: Makefile
src/external/bsd/iscsi/initiator: Makefile iscsi-initiator.8
iscsi-initiator.c libkmod.c libkmod.h virtdir.c virtdir.h
src/external/bsd/iscsi/lib: Makefile shlib_version
src/external/bsd/iscsi/target: Makefile
Log Message:
Add the reachover framework for the iSCSI target and initiator, in
preparation for moving it from dist/iscsi to the external framework
external/bsd/iscsi.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/iscsi/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/iscsi/initiator/Makefile \
src/external/bsd/iscsi/initiator/iscsi-initiator.8 \
src/external/bsd/iscsi/initiator/iscsi-initiator.c \
src/external/bsd/iscsi/initiator/libkmod.c \
src/external/bsd/iscsi/initiator/libkmod.h \
src/external/bsd/iscsi/initiator/virtdir.c \
src/external/bsd/iscsi/initiator/virtdir.h
cvs rdiff -u -r0 -r1.1 src/external/bsd/iscsi/lib/Makefile \
src/external/bsd/iscsi/lib/shlib_version
cvs rdiff -u -r0 -r1.1 src/external/bsd/iscsi/target/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/iscsi/Makefile
diff -u /dev/null src/external/bsd/iscsi/Makefile:1.1
--- /dev/null Sun Jun 21 21:11:17 2009
+++ src/external/bsd/iscsi/Makefile Sun Jun 21 21:11:16 2009
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2009/06/21 21:11:16 agc Exp $
+
+.if exists(${.CURDIR}/../../Makefile.inc)
+.include ${.CURDIR}/../../Makefile.inc
+.endif
+
+SUBDIR= lib .WAIT
+
+SUBDIR+= target initiator
+
+.include bsd.subdir.mk
Index: src/external/bsd/iscsi/initiator/Makefile
diff -u /dev/null src/external/bsd/iscsi/initiator/Makefile:1.1
--- /dev/null Sun Jun 21 21:11:17 2009
+++ src/external/bsd/iscsi/initiator/Makefile Sun Jun 21 21:11:16 2009
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2009/06/21 21:11:16 agc Exp $
+
+.sinclude ${.CURDIR}/../../Makefile.inc
+
+USE_FORT?=yes # network client
+
+PROG=iscsi-initiator
+SRCS=iscsi-initiator.c virtdir.c initiator.c libkmod.c
+LDADD+= -lrefuse -liscsi
+DPADD+= ${LIBREFUSE} ${LIBISCSI}
+CPPFLAGS+= -g -I${ISCSI_DIST}/include
+MAN=iscsi-initiator.8
+WARNS=4
+
+ISCSI_DIST=${.CURDIR}/../dist
+
+.ifdef MODULAR_KERNEL
+CPPFLAGS+= -DUSE_LIBKMOD
+LDADD+= -lprop
+DPADD+= ${LIBPROP}
+.endif
+
+.PATH: ${ISCSI_DIST}/src
+
+.include bsd.prog.mk
Index: src/external/bsd/iscsi/initiator/iscsi-initiator.8
diff -u /dev/null src/external/bsd/iscsi/initiator/iscsi-initiator.8:1.1
--- /dev/null Sun Jun 21 21:11:17 2009
+++ src/external/bsd/iscsi/initiator/iscsi-initiator.8 Sun Jun 21 21:11:16 2009
@@ -0,0 +1,150 @@
+.\ $NetBSD: iscsi-initiator.8,v 1.1 2009/06/21 21:11:16 agc Exp $
+.\
+.\ Copyright © 2007 Alistair Crooks. All rights reserved.
+.\
+.\ 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.
+.\ 3. The name of the author may not be used to endorse or promote
+.\products derived from this software without specific prior written
+.\permission.
+.\
+.\ 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.
+.\
+.Dd September 20, 2007
+.Dt ISCSI-INITIATOR 8
+.Os
+.Sh NAME
+.Nm iscsi-initiator
+.Nd refuse-based iSCSI initiator
+.Sh SYNOPSIS
+.Nm
+.Op Fl 46bcfVv
+.Op Fl a Ar authentication-type
+.Op Fl d Ar digest-type
+.Op Fl h Ar target-hostname
+.Op Fl p Ar target-port-number
+.Op Fl t Ar target-number
+.Op Fl u Ar username
+.Ar mount_point
+.Sh DESCRIPTION
+The
+.Nm
+utility can be used to access an iSCSI target, such as
+.Xr iscsi-target 8 ,
+to access block storage which has been exported.
+Information pertaining to the target is displayed underneath
+the mount point, along with the device corresponding
+to the storage which the target
CVS commit: src/external/bsd/iscsi/dist/src/examples
Module Name:src Committed By: agc Date: Sun Jun 21 21:23:46 UTC 2009 Added Files: src/external/bsd/iscsi/dist/src/examples: 1.conf 2.conf 3.conf 4.conf Log Message: Add example configuration files To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/bsd/iscsi/dist/src/examples/1.conf \ src/external/bsd/iscsi/dist/src/examples/2.conf \ src/external/bsd/iscsi/dist/src/examples/3.conf \ src/external/bsd/iscsi/dist/src/examples/4.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/bsd/iscsi/dist/src/examples/1.conf diff -u /dev/null src/external/bsd/iscsi/dist/src/examples/1.conf:1.1 --- /dev/null Sun Jun 21 21:23:46 2009 +++ src/external/bsd/iscsi/dist/src/examples/1.conf Sun Jun 21 21:23:46 2009 @@ -0,0 +1,20 @@ +# Simple file showing 1 extent, device and target + +# extent +# name storage offset (in bytes) size +extent0 /tmp/iscsi-target0 0 100MB + +# devices +# name resilience devices/extents +device0 RAID0 extent0 + +# targets +# name device netmask +target0 device0 10.4.0.0/16 + + + +# NB, in the above, the intermediate device definition is not necessary. +# It could have been simply: +extent1 /tmp/iscsi-target1 0 100MB +target1 extent1 10.4.0.0/16 Index: src/external/bsd/iscsi/dist/src/examples/2.conf diff -u /dev/null src/external/bsd/iscsi/dist/src/examples/2.conf:1.1 --- /dev/null Sun Jun 21 21:23:46 2009 +++ src/external/bsd/iscsi/dist/src/examples/2.conf Sun Jun 21 21:23:46 2009 @@ -0,0 +1,19 @@ +# Complex file showing 3-way RAID1 (with RAID1 components), +# also using local and (NFS) remote components + +# extents +extent0 /iscsi/extents/0 0 100MB +extent1 /imports/remote1/iscsi/extents/0 0 100MB +extent2 /iscsi/extents/1 0 100MB +extent3 /imports/remote1/iscsi/extents/1 0 100MB +extent4 /iscsi/extents/2 0 100MB +extent5 /imports/remote1/iscsi/extents/2 0 100MB + +# devices +device0 RAID1 extent0 extent1 +device1 RAID1 extent2 extent3 +device2 RAID1 extent4 extent5 +device3 RAID1 device0 device1 device2 + +# targets +target0 device3 10.4.0.0/16 Index: src/external/bsd/iscsi/dist/src/examples/3.conf diff -u /dev/null src/external/bsd/iscsi/dist/src/examples/3.conf:1.1 --- /dev/null Sun Jun 21 21:23:46 2009 +++ src/external/bsd/iscsi/dist/src/examples/3.conf Sun Jun 21 21:23:46 2009 @@ -0,0 +1,22 @@ +# Complex file showing 3-way RAID1 (with RAID1 components), +# also using local and (NFS) remote components + +# extents +extent0 /iscsi/extents/0 0 100MB +extent1 /imports/remote1/iscsi/extents/0 0 100MB +extent2 /iscsi/extents/1 0 100MB +extent3 /imports/remote1/iscsi/extents/1 0 100MB +extent4 /iscsi/extents/2 0 100MB +extent5 /imports/remote1/iscsi/extents/2 0 100MB +extent6 /iscsi/extents/3 0 100MB + +# devices +device0 RAID1 extent0 extent1 +device1 RAID1 extent2 extent3 +device2 RAID1 extent4 extent5 +device3 RAID1 device0 device1 device2 +device4 RAID0 extent6 + +# targets +target0 device3 10.4.0.0/16 +target1 device4 127.0.0.0/8 Index: src/external/bsd/iscsi/dist/src/examples/4.conf diff -u /dev/null src/external/bsd/iscsi/dist/src/examples/4.conf:1.1 --- /dev/null Sun Jun 21 21:23:46 2009 +++ src/external/bsd/iscsi/dist/src/examples/4.conf Sun Jun 21 21:23:46 2009 @@ -0,0 +1,23 @@ +# Complex file showing 3-way RAID1 (with RAID1 components), +# also using local and (NFS) remote components + +# extents +extent0 /iscsi/extents/0 0 100MB +extent1 /imports/remote1/iscsi/extents/0 0 100MB +extent2 /iscsi/extents/1 0 100MB +extent3 /imports/remote1/iscsi/extents/1 0 100MB +extent4 /iscsi/extents/2 0 100MB +extent5 /imports/remote1/iscsi/extents/2 0 100MB +extent6 /iscsi/extents/3 0 100GB + +# devices +device0 RAID1 extent0 extent1 +device1 RAID1 extent2 extent3 +device2 RAID1 extent4 extent5 +device3 RAID1 device0 device1 device2 + +# targets +target0 device3 10.4.0.0/16 + +# a target can be made from just an extent +target1 extent6 127.0.0.0/8
CVS commit: [netbsd-4-0] src/dist/tcpdump
Module Name:src
Committed By: snj
Date: Sun Jun 21 21:26:41 UTC 2009
Modified Files:
src/dist/tcpdump [netbsd-4-0]: print-bgp.c print-isoclns.c print-ldp.c
print-rsvp.c
Log Message:
Apply patch (requested by tonnerre in ticket #1329):
Fix CAN-2005-1278, CAN-2005-1279 and CAN-2005-1280.
To generate a diff of this commit:
cvs rdiff -u -r1.5.14.1 -r1.5.14.2 src/dist/tcpdump/print-bgp.c
cvs rdiff -u -r1.6.14.1 -r1.6.14.2 src/dist/tcpdump/print-isoclns.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.14.1 src/dist/tcpdump/print-ldp.c \
src/dist/tcpdump/print-rsvp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/tcpdump/print-bgp.c
diff -u src/dist/tcpdump/print-bgp.c:1.5.14.1 src/dist/tcpdump/print-bgp.c:1.5.14.2
--- src/dist/tcpdump/print-bgp.c:1.5.14.1 Mon Apr 14 21:03:49 2008
+++ src/dist/tcpdump/print-bgp.c Sun Jun 21 21:26:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: print-bgp.c,v 1.5.14.1 2008/04/14 21:03:49 jdc Exp $ */
+/* $NetBSD: print-bgp.c,v 1.5.14.2 2009/06/21 21:26:41 snj Exp $ */
/*
* Copyright (C) 1999 WIDE Project.
@@ -42,7 +42,7 @@
static const char rcsid[] _U_ =
@(#) Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.72.2.4 2004/03/24 00:04:04 guy Exp;
#else
-__RCSID($NetBSD: print-bgp.c,v 1.5.14.1 2008/04/14 21:03:49 jdc Exp $);
+__RCSID($NetBSD: print-bgp.c,v 1.5.14.2 2009/06/21 21:26:41 snj Exp $);
#endif
#endif
@@ -1254,6 +1254,8 @@
tptr = pptr + len;
break;
}
+if (advance 0) /* infinite loop protection */
+break;
tptr += advance;
}
break;
@@ -1684,9 +1686,10 @@
while (dat + length p) {
char buf[MAXHOSTNAMELEN + 100];
i = decode_prefix4(p, buf, sizeof(buf));
- if (i == -1)
+ if (i == -1) {
printf(\n\t(illegal prefix length));
- else if (i == -2)
+break;
+ } else if (i == -2)
goto trunc;
else {
printf(\n\t%s, buf);
Index: src/dist/tcpdump/print-isoclns.c
diff -u src/dist/tcpdump/print-isoclns.c:1.6.14.1 src/dist/tcpdump/print-isoclns.c:1.6.14.2
--- src/dist/tcpdump/print-isoclns.c:1.6.14.1 Mon Apr 14 21:03:49 2008
+++ src/dist/tcpdump/print-isoclns.c Sun Jun 21 21:26:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: print-isoclns.c,v 1.6.14.1 2008/04/14 21:03:49 jdc Exp $ */
+/* $NetBSD: print-isoclns.c,v 1.6.14.2 2009/06/21 21:26:41 snj Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996
@@ -32,7 +32,7 @@
static const char rcsid[] _U_ =
@(#) Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.106.2.5 2004/03/24 01:45:26 guy Exp (LBL);
#else
-__RCSID($NetBSD: print-isoclns.c,v 1.6.14.1 2008/04/14 21:03:49 jdc Exp $);
+__RCSID($NetBSD: print-isoclns.c,v 1.6.14.2 2009/06/21 21:26:41 snj Exp $);
#endif
#endif
@@ -1522,6 +1522,9 @@
if (tlv_len == 0) /* something is malformed */
continue;
+if (tlv_len == 0) /* something is malformed */
+break;
+
/* now check if we have a decoder otherwise do a hexdump at the end*/
switch (tlv_type) {
case TLV_AREA_ADDR:
Index: src/dist/tcpdump/print-ldp.c
diff -u src/dist/tcpdump/print-ldp.c:1.1.1.1 src/dist/tcpdump/print-ldp.c:1.1.1.1.14.1
--- src/dist/tcpdump/print-ldp.c:1.1.1.1 Mon Sep 27 17:07:12 2004
+++ src/dist/tcpdump/print-ldp.c Sun Jun 21 21:26:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: print-ldp.c,v 1.1.1.1 2004/09/27 17:07:12 dyoung Exp $ */
+/* $NetBSD: print-ldp.c,v 1.1.1.1.14.1 2009/06/21 21:26:41 snj Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
@@ -328,6 +328,9 @@
EXTRACT_32BITS(ldp_msg_header-id),
LDP_MASK_U_BIT(EXTRACT_16BITS(ldp_msg_header-type)) ? continue processing : ignore);
+if (msg_len == 0) /* infinite loop protection */
+break;
+
msg_tptr=tptr+sizeof(struct ldp_msg_header);
msg_tlen=msg_len-sizeof(struct ldp_msg_header)+4; /* Type Length fields not included */
Index: src/dist/tcpdump/print-rsvp.c
diff -u src/dist/tcpdump/print-rsvp.c:1.1.1.1 src/dist/tcpdump/print-rsvp.c:1.1.1.1.14.1
--- src/dist/tcpdump/print-rsvp.c:1.1.1.1 Mon Sep 27 17:07:24 2004
+++ src/dist/tcpdump/print-rsvp.c Sun Jun 21 21:26:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: print-rsvp.c,v 1.1.1.1 2004/09/27 17:07:24 dyoung Exp $ */
+/* $NetBSD: print-rsvp.c,v 1.1.1.1.14.1 2009/06/21 21:26:41 snj Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
@@ -877,10 +877,17 @@
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_IPV4:
while(obj_tlen = 4 ) {
-printf(\n\tSubobject Type: %s,
+printf(\n\tSubobject Type: %s, length %u,
tok2str(rsvp_obj_xro_values,
Unknown %u,
-
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: snj Date: Sun Jun 21 21:29:04 UTC 2009 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1329. To generate a diff of this commit: cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/doc/CHANGES-4.0.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-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.37 src/doc/CHANGES-4.0.2:1.1.2.38 --- src/doc/CHANGES-4.0.2:1.1.2.37 Sun Jun 21 11:45:57 2009 +++ src/doc/CHANGES-4.0.2 Sun Jun 21 21:29:04 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.37 2009/06/21 11:45:57 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.38 2009/06/21 21:29:04 snj Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -630,10 +630,18 @@ In linux_sys_sched_getaffinity(), do not leak memory on error. [njoly, ticket #1328] -external/bsd/pkg_install/dist/admin/pkg_admin.1: 1.1.1.7 -external/bsd/pkg_install/dist/lib/license.c: 1.1.1.3 -external/bsd/pkg_install/dist/lib/version.h: 1.1.1.16 +external/bsd/pkg_install/dist/admin/pkg_admin.1 1.1.1.7 +external/bsd/pkg_install/dist/lib/license.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/version.h 1.1.1.16 Merge pkg_install-20090610 from HEAD [joerg, ticket #1325] +dist/tcpdump/print-bgp.c patch +dist/tcpdump/print-isoclns.c patch +dist/tcpdump/print-ldp.c patch +dist/tcpdump/print-rsvp.c patch + + Fix CAN-2005-1278, CAN-2005-1279 and CAN-2005-1280. + [tonnerre, ticket #1329] +
CVS commit: [netbsd-4] src/dist/tcpdump
Module Name:src
Committed By: snj
Date: Sun Jun 21 21:30:23 UTC 2009
Modified Files:
src/dist/tcpdump [netbsd-4]: print-bgp.c print-isoclns.c print-ldp.c
print-rsvp.c
Log Message:
Apply patch (requested by tonnerre in ticket #1329):
Fix CAN-2005-1278, CAN-2005-1279 and CAN-2005-1280.
To generate a diff of this commit:
cvs rdiff -u -r1.5.10.1 -r1.5.10.2 src/dist/tcpdump/print-bgp.c
cvs rdiff -u -r1.6.10.1 -r1.6.10.2 src/dist/tcpdump/print-isoclns.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.10.1 src/dist/tcpdump/print-ldp.c \
src/dist/tcpdump/print-rsvp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/tcpdump/print-bgp.c
diff -u src/dist/tcpdump/print-bgp.c:1.5.10.1 src/dist/tcpdump/print-bgp.c:1.5.10.2
--- src/dist/tcpdump/print-bgp.c:1.5.10.1 Mon Apr 14 21:04:29 2008
+++ src/dist/tcpdump/print-bgp.c Sun Jun 21 21:30:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: print-bgp.c,v 1.5.10.1 2008/04/14 21:04:29 jdc Exp $ */
+/* $NetBSD: print-bgp.c,v 1.5.10.2 2009/06/21 21:30:22 snj Exp $ */
/*
* Copyright (C) 1999 WIDE Project.
@@ -42,7 +42,7 @@
static const char rcsid[] _U_ =
@(#) Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.72.2.4 2004/03/24 00:04:04 guy Exp;
#else
-__RCSID($NetBSD: print-bgp.c,v 1.5.10.1 2008/04/14 21:04:29 jdc Exp $);
+__RCSID($NetBSD: print-bgp.c,v 1.5.10.2 2009/06/21 21:30:22 snj Exp $);
#endif
#endif
@@ -1254,6 +1254,8 @@
tptr = pptr + len;
break;
}
+if (advance 0) /* infinite loop protection */
+break;
tptr += advance;
}
break;
@@ -1684,9 +1686,10 @@
while (dat + length p) {
char buf[MAXHOSTNAMELEN + 100];
i = decode_prefix4(p, buf, sizeof(buf));
- if (i == -1)
+ if (i == -1) {
printf(\n\t(illegal prefix length));
- else if (i == -2)
+break;
+ } else if (i == -2)
goto trunc;
else {
printf(\n\t%s, buf);
Index: src/dist/tcpdump/print-isoclns.c
diff -u src/dist/tcpdump/print-isoclns.c:1.6.10.1 src/dist/tcpdump/print-isoclns.c:1.6.10.2
--- src/dist/tcpdump/print-isoclns.c:1.6.10.1 Mon Apr 14 21:04:29 2008
+++ src/dist/tcpdump/print-isoclns.c Sun Jun 21 21:30:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: print-isoclns.c,v 1.6.10.1 2008/04/14 21:04:29 jdc Exp $ */
+/* $NetBSD: print-isoclns.c,v 1.6.10.2 2009/06/21 21:30:22 snj Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996
@@ -32,7 +32,7 @@
static const char rcsid[] _U_ =
@(#) Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.106.2.5 2004/03/24 01:45:26 guy Exp (LBL);
#else
-__RCSID($NetBSD: print-isoclns.c,v 1.6.10.1 2008/04/14 21:04:29 jdc Exp $);
+__RCSID($NetBSD: print-isoclns.c,v 1.6.10.2 2009/06/21 21:30:22 snj Exp $);
#endif
#endif
@@ -1522,6 +1522,9 @@
if (tlv_len == 0) /* something is malformed */
continue;
+if (tlv_len == 0) /* something is malformed */
+break;
+
/* now check if we have a decoder otherwise do a hexdump at the end*/
switch (tlv_type) {
case TLV_AREA_ADDR:
Index: src/dist/tcpdump/print-ldp.c
diff -u src/dist/tcpdump/print-ldp.c:1.1.1.1 src/dist/tcpdump/print-ldp.c:1.1.1.1.10.1
--- src/dist/tcpdump/print-ldp.c:1.1.1.1 Mon Sep 27 17:07:12 2004
+++ src/dist/tcpdump/print-ldp.c Sun Jun 21 21:30:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: print-ldp.c,v 1.1.1.1 2004/09/27 17:07:12 dyoung Exp $ */
+/* $NetBSD: print-ldp.c,v 1.1.1.1.10.1 2009/06/21 21:30:23 snj Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
@@ -328,6 +328,9 @@
EXTRACT_32BITS(ldp_msg_header-id),
LDP_MASK_U_BIT(EXTRACT_16BITS(ldp_msg_header-type)) ? continue processing : ignore);
+if (msg_len == 0) /* infinite loop protection */
+break;
+
msg_tptr=tptr+sizeof(struct ldp_msg_header);
msg_tlen=msg_len-sizeof(struct ldp_msg_header)+4; /* Type Length fields not included */
Index: src/dist/tcpdump/print-rsvp.c
diff -u src/dist/tcpdump/print-rsvp.c:1.1.1.1 src/dist/tcpdump/print-rsvp.c:1.1.1.1.10.1
--- src/dist/tcpdump/print-rsvp.c:1.1.1.1 Mon Sep 27 17:07:24 2004
+++ src/dist/tcpdump/print-rsvp.c Sun Jun 21 21:30:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: print-rsvp.c,v 1.1.1.1 2004/09/27 17:07:24 dyoung Exp $ */
+/* $NetBSD: print-rsvp.c,v 1.1.1.1.10.1 2009/06/21 21:30:23 snj Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
@@ -877,10 +877,17 @@
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_IPV4:
while(obj_tlen = 4 ) {
-printf(\n\tSubobject Type: %s,
+printf(\n\tSubobject Type: %s, length %u,
tok2str(rsvp_obj_xro_values,
Unknown %u,
- RSVP_OBJ_XRO_MASK_SUBOBJ(*obj_tptr)));
CVS commit: src/external/bsd/iscsi/dist/src/etc
Module Name:src Committed By: agc Date: Mon Jun 22 01:51:02 UTC 2009 Added Files: src/external/bsd/iscsi/dist/src/etc: auths targets src/external/bsd/iscsi/dist/src/etc/rc.d: iscsi_target Log Message: Add example files and rc.d script - taken from dist To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/bsd/iscsi/dist/src/etc/auths \ src/external/bsd/iscsi/dist/src/etc/targets cvs rdiff -u -r0 -r1.1 src/external/bsd/iscsi/dist/src/etc/rc.d/iscsi_target Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/bsd/iscsi/dist/src/etc/auths diff -u /dev/null src/external/bsd/iscsi/dist/src/etc/auths:1.1 --- /dev/null Mon Jun 22 01:51:02 2009 +++ src/external/bsd/iscsi/dist/src/etc/auths Mon Jun 22 01:51:02 2009 @@ -0,0 +1,17 @@ +# $NetBSD: auths,v 1.1 2009/06/22 01:51:02 agc Exp $ + +# test passwd file for iSCSI use + +nulltest:none: + +#chaptest1:chap:crysanthemum +#chaptest2:CHAP:bannister +#chaptest3:chap:Rhode Island Red + +# test users - throwback +#alice:chap:alicePass +#tom:chap:tomPass + +# real users +#billy.nomates:chap:officer +#iqn.1991-05.com.microsoft\:ws2:CHAP:1234567890123456 Index: src/external/bsd/iscsi/dist/src/etc/targets diff -u /dev/null src/external/bsd/iscsi/dist/src/etc/targets:1.1 --- /dev/null Mon Jun 22 01:51:02 2009 +++ src/external/bsd/iscsi/dist/src/etc/targets Mon Jun 22 01:51:02 2009 @@ -0,0 +1,21 @@ +# $NetBSD: targets,v 1.1 2009/06/22 01:51:02 agc Exp $ +# +# Structure of this file: +# +# + an extent is a straight (offset, length) pair of a file or device +# it's the lowest common storage denominator +# at least one is needed +# + a device is made up of one or more extents or other devices +# devices can be added in a hierachical manner, to enhance resilience +# + in this example, no device definitions are necessary, as the target +# will just use a simple extent for persistent storage +# + a target is made up of 1 or more devices +# The code does not support RAID1 recovery at present + +# Simple file showing 1 extent, mapped straight into 1 target + +# extents file start length +extent0 /tmp/iscsi-target0 0 100MB + +# target flags storage netmask +target0 rw extent0 10.4.0.0/16 Index: src/external/bsd/iscsi/dist/src/etc/rc.d/iscsi_target diff -u /dev/null src/external/bsd/iscsi/dist/src/etc/rc.d/iscsi_target:1.1 --- /dev/null Mon Jun 22 01:51:02 2009 +++ src/external/bsd/iscsi/dist/src/etc/rc.d/iscsi_target Mon Jun 22 01:51:02 2009 @@ -0,0 +1,18 @@ +#!/bin/sh +# +# $NetBSD: iscsi_target,v 1.1 2009/06/22 01:51:02 agc Exp $ +# + +# PROVIDE: iscsi_target +# REQUIRE: NETWORKING mountall beforemountlkm quota + +$_rc_subr_loaded . /etc/rc.subr + +name=iscsi_target +rcvar=$name +command=/usr/local/bin/iscsi-target +required_files=/usr/local/etc/iscsi/targets +pidfile=/var/run/iscsi-target.pid + +load_rc_config $name +run_rc_command $1
CVS commit: src/share/man/man4
Module Name:src Committed By: mrg Date: Mon Jun 22 02:34:10 UTC 2009 Modified Files: src/share/man/man4: drm.4 Log Message: remove reference to now dead DRM_EXTERNAL option. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/drm.4 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/drm.4 diff -u src/share/man/man4/drm.4:1.9 src/share/man/man4/drm.4:1.10 --- src/share/man/man4/drm.4:1.9 Sat Jun 20 22:55:20 2009 +++ src/share/man/man4/drm.4 Mon Jun 22 02:34:10 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: drm.4,v 1.9 2009/06/20 22:55:20 wiz Exp $ +.\ $NetBSD: drm.4,v 1.10 2009/06/22 02:34:10 mrg Exp $ .\ .\ Copyright (c) 2007 Thomas Klausner .\ All rights reserved. @@ -23,7 +23,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd June 19, 2009 +.Dd June 21, 2009 .Dt DRM 4 .Os .Sh NAME @@ -41,7 +41,6 @@ .Cd viadrm*at vga? .Pp .Cd optionsDRM_DEBUG -.Cd optionsDRM_EXTERNAL .Cd optionsDRM_NO_AGP .Sh DESCRIPTION The @@ -207,7 +206,3 @@ can slow DRI down a lot, disable it once .Nm works. -.Pp -To use the latest drivers, -.Cd optionsDRM_EXTERNAL -must be added to the kernel configuration file.
