CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: macallan
Date: Tue Oct 23 11:53:18 UTC 2012
Modified Files:
src/sys/dev/sbus: agten.c
Log Message:
support anti-aliased fonts
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/sbus/agten.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sbus/agten.c
diff -u src/sys/dev/sbus/agten.c:1.29 src/sys/dev/sbus/agten.c:1.30
--- src/sys/dev/sbus/agten.c:1.29 Sat Oct 20 13:52:11 2012
+++ src/sys/dev/sbus/agten.c Tue Oct 23 11:53:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: agten.c,v 1.29 2012/10/20 13:52:11 macallan Exp $ */
+/* $NetBSD: agten.c,v 1.30 2012/10/23 11:53:18 macallan Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: agten.c,v 1.29 2012/10/20 13:52:11 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: agten.c,v 1.30 2012/10/23 11:53:18 macallan Exp $);
/*
* a driver for the Fujitsu AG-10e SBus framebuffer
@@ -136,6 +136,7 @@ static int agten_getcmap(struct agten_s
static int agten_putpalreg(struct agten_softc *, uint8_t, uint8_t,
uint8_t, uint8_t);
static void agten_init(struct agten_softc *);
+static void agten_init_cmap(struct agten_softc *, struct rasops_info *);
static void agten_gfx(struct agten_softc *);
static void agten_set_video(struct agten_softc *, int);
static int agten_get_video(struct agten_softc *);
@@ -360,6 +361,7 @@ agten_attach(device_t parent, device_t d
}
/* Initialize the default color map. */
+ agten_init_cmap(sc, ri);
aa.console = console;
aa.scrdata = sc-sc_screenlist;
@@ -434,6 +436,8 @@ agten_ioctl(void *v, void *vs, u_long cm
sc-sc_mode = new_mode;
if(new_mode == WSDISPLAYIO_MODE_EMUL) {
agten_init(sc);
+ agten_init_cmap(sc,
+ ms-scr_ri);
vcons_redraw_screen(ms);
} else {
agten_gfx(sc);
@@ -501,7 +505,7 @@ agten_init_screen(void *cookie, struct v
ri-ri_width = sc-sc_width;
ri-ri_height = sc-sc_height;
ri-ri_stride = sc-sc_stride;
- ri-ri_flg = RI_CENTER | RI_FULLCLEAR;
+ ri-ri_flg = RI_CENTER | RI_FULLCLEAR | RI_8BIT_IS_RGB | RI_ENABLE_ALPHA;
ri-ri_bits = (char *)sc-sc_fb.fb_pixels;
@@ -610,19 +614,10 @@ agten_putpalreg(struct agten_softc *sc,
static void
agten_init(struct agten_softc *sc)
{
- int i, j;
+ int i;
uint32_t src, srcw;
volatile uint32_t junk;
- /* first we set up the colour map */
- j = 0;
- for (i = 0; i 256; i++) {
-
- agten_putpalreg(sc, i, rasops_cmap[j], rasops_cmap[j + 1],
- rasops_cmap[j + 2]);
- j += 3;
- }
-
/* then we set up a linear LUT for 24bit colour */
agten_write_idx(sc, IBM561_CMAP_TABLE + 256);
for (i = 0; i 256; i++) {
@@ -695,6 +690,21 @@ agten_init(struct agten_softc *sc)
}
static void
+agten_init_cmap(struct agten_softc *sc, struct rasops_info *ri)
+{
+ int i, j;
+ uint8_t cmap[768];
+
+ rasops_get_cmap(ri, cmap, 768);
+ j = 0;
+ for (i = 0; i 256; i++) {
+
+ agten_putpalreg(sc, i, cmap[j], cmap[j + 1], cmap[j + 2]);
+ j += 3;
+ }
+}
+
+static void
agten_gfx(struct agten_softc *sc)
{
/* enable overlay transparency on colour 0x00 */
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: skrll
Date: Tue Oct 23 12:23:20 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
Log Message:
Correct inverted boolean logic for the coherent flag introduced in r1.61
Fixes slow nfs seen by msaitoh@
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/arm/arm32/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.65 src/sys/arch/arm/arm32/bus_dma.c:1.66
--- src/sys/arch/arm/arm32/bus_dma.c:1.65 Mon Oct 22 15:01:18 2012
+++ src/sys/arch/arm/arm32/bus_dma.c Tue Oct 23 12:23:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.65 2012/10/22 15:01:18 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.66 2012/10/23 12:23:20 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define _ARM32_BUS_DMA_PRIVATE
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.65 2012/10/22 15:01:18 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.66 2012/10/23 12:23:20 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1408,7 +1408,7 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
}
#endif
curaddr = (*pde s_frame) | (vaddr s_offset);
-coherent = (*pde L1_S_CACHE_MASK) != 0;
+coherent = (*pde L1_S_CACHE_MASK) == 0;
} else {
pt_entry_t pte = *ptep;
KDASSERTMSG((pte L2_TYPE_MASK) != L2_TYPE_INV,
@@ -1418,11 +1418,11 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
== L2_TYPE_L)) {
curaddr = (pte L2_L_FRAME) |
(vaddr L2_L_OFFSET);
- coherent = (pte L2_L_CACHE_MASK) != 0;
+ coherent = (pte L2_L_CACHE_MASK) == 0;
} else {
curaddr = (pte L2_S_FRAME) |
(vaddr L2_S_OFFSET);
- coherent = (pte L2_S_CACHE_MASK) != 0;
+ coherent = (pte L2_S_CACHE_MASK) == 0;
}
}
} else {
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp
Module Name:src
Committed By: agc
Date: Tue Oct 23 15:00:57 UTC 2012
Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify [agc-netpgp-standalone]:
Makefile
src/crypto/external/bsd/netpgp/dist/src/libverify
[agc-netpgp-standalone]:
libnetpgpverify.3 libverify.c verify.h
Added Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify [agc-netpgp-standalone]:
dsa-pubring.gpg expected36 expected37 expected38 expected39
expected40 expected41 expected42 expected43
Log Message:
Fix a tyop in the getopt string so that it specifies that -k takes an
argument - makes the specification of public keyrings work again.
Make pgpv_verify return a cookie if the signature matches, rather than
just a plain pseudo-boolean value. The cookie can be used
subsequently to retrieve the verified data
Use the cookie as input to pgp_get_verified()
Add tests for DSA key verification
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r0 -r1.1.2.1 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/dsa-pubring.gpg \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected36 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected37 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected38 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected39 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected40 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected41 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected42 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected43
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 \
src/crypto/external/bsd/netpgp/dist/src/libverify/libnetpgpverify.3
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 \
src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 \
src/crypto/external/bsd/netpgp/dist/src/libverify/verify.h
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/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.1.2.3 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.1.2.4
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.1.2.3 Sat Oct 20 12:22:00 2012
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Tue Oct 23 15:00:56 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.3 2012/10/20 12:22:00 agc Exp $
+# $NetBSD: Makefile,v 1.1.2.4 2012/10/23 15:00:56 agc Exp $
.include bsd.own.mk
@@ -14,12 +14,6 @@ LDADD+=-lnetpgpverify
CPPFLAGS+=-I${EXTDIST}/libverify
-# XXX - debugging
-#CPPFLAGS+=-g -O0
-#LDFLAGS+=-g -O0
-#CPPFLAGS+=-O3
-#LDFLAGS+=-O3
-
LIBNETPGPVERIFYDIR!= cd ${.CURDIR}/../../lib/verify ${PRINTOBJDIR}
LDADD+= -L${LIBNETPGPVERIFYDIR} -lnetpgpverify
DPADD+= ${LIBNETPGPVERIFYDIR}/libnetpgpverify.a
@@ -90,3 +84,27 @@ t: ${PROG}
env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -c cat det.sig output35
diff expected35 output35
rm -f output35
+ env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg in1.gpg output36
+ diff expected36 output36
+ rm -f output36
+ env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg in1.gpg output37
+ diff expected37 output37
+ rm -f output37
+ env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg in1.asc output38
+ diff expected38 output38
+ rm -f output38
+ env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg in1.asc output39
+ diff expected39 output39
+ rm -f output39
+ env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg -c cat in1.gpg output40
+ diff expected40 output40
+ rm -f output40
+ env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg -c cat in1.gpg output41
+ diff expected41 output41
+ rm -f output41
+ env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg -c cat in1.asc output42
+ diff expected42 output42
+ rm -f output42
+ env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg -c cat in1.asc output43
+ diff expected43 output43
+ rm -f output43
Index: src/crypto/external/bsd/netpgp/dist/src/libverify/libnetpgpverify.3
diff -u src/crypto/external/bsd/netpgp/dist/src/libverify/libnetpgpverify.3:1.1.2.3 src/crypto/external/bsd/netpgp/dist/src/libverify/libnetpgpverify.3:1.1.2.4
--- src/crypto/external/bsd/netpgp/dist/src/libverify/libnetpgpverify.3:1.1.2.3 Sat Oct 20 06:01:57 2012
+++ src/crypto/external/bsd/netpgp/dist/src/libverify/libnetpgpverify.3 Tue Oct 23 15:00:56 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: libnetpgpverify.3,v 1.1.2.3 2012/10/20 06:01:57 agc Exp $
+.\ $NetBSD: libnetpgpverify.3,v 1.1.2.4 2012/10/23 15:00:56 agc Exp $
.\
.\ Copyright (c) 2012 Alistair Crooks a...@netbsd.org
.\ All rights reserved.
@@
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src
Committed By: agc
Date: Tue Oct 23 15:03:37 UTC 2012
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify
[agc-netpgp-standalone]:
main.c
Log Message:
Fix a tyop in the getopt string so that it specifies that -k takes an
argument - makes the specification of public keyrings work again.
Make pgpv_verify return a cookie if the signature matches, rather than
just a plain pseudo-boolean value. The cookie can be used
subsequently to retrieve the verified data
Use the cookie as input to pgp_get_verified()
Add tests for DSA key verification
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.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/netpgpverify/main.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.1.2.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.1.2.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.1.2.2 Sat Oct 20 05:55:43 2012
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c Tue Oct 23 15:03:37 2012
@@ -87,16 +87,17 @@ getstdin(ssize_t *cc, size_t *size)
/* verify memory or file */
static int
-verify_data(pgpv_t *pgp, const char *cmd, const char *inname, char *in, size_t cc, unsigned n)
+verify_data(pgpv_t *pgp, const char *cmd, const char *inname, char *in, ssize_t cc)
{
pgpv_cursor_t cursor;
size_t size;
+ size_t cookie;
char *data;
memset(cursor, 0x0, sizeof(cursor));
if (strcasecmp(cmd, cat) == 0) {
- if (pgpv_verify(cursor, pgp, in, cc)) {
- if ((size = pgpv_get_verified(cursor, ARRAY_ELEMENT(cursor.datacookies, n), data)) 0) {
+ if ((cookie = pgpv_verify(cursor, pgp, in, cc)) != 0) {
+ if ((size = pgpv_get_verified(cursor, cookie, data)) 0) {
printf(%.*s, (int)size, data);
}
return 1;
@@ -131,7 +132,7 @@ main(int argc, char **argv)
cmd = NULL;
keyring = NULL;
ok = 1;
- while ((i = getopt(argc, argv, c:k)) != -1) {
+ while ((i = getopt(argc, argv, c:k:)) != -1) {
switch(i) {
case 'c':
cmd = optarg;
@@ -151,10 +152,10 @@ main(int argc, char **argv)
}
if (optind == argc) {
in = getstdin(cc, size);
- ok = verify_data(pgp, cmd, [stdin], in, cc, 0);
+ ok = verify_data(pgp, cmd, [stdin], in, cc);
} else {
for (ok = 1, i = optind ; i argc ; i++) {
- if (!verify_data(pgp, cmd, argv[i], argv[i], -1, i)) {
+ if (!verify_data(pgp, cmd, argv[i], argv[i], -1)) {
ok = 0;
}
}
CVS commit: src/sys/dev/rasops
Module Name:src
Committed By: macallan
Date: Tue Oct 23 15:12:59 UTC 2012
Modified Files:
src/sys/dev/rasops: rasops32.c
Log Message:
make anti-aliased character drawing work on hardware where stride != width *
bytes per pixel
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/rasops/rasops32.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/rasops/rasops32.c
diff -u src/sys/dev/rasops/rasops32.c:1.24 src/sys/dev/rasops/rasops32.c:1.25
--- src/sys/dev/rasops/rasops32.c:1.24 Wed Jan 4 17:01:52 2012
+++ src/sys/dev/rasops/rasops32.c Tue Oct 23 15:12:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops32.c,v 1.24 2012/01/04 17:01:52 macallan Exp $ */
+/* $NetBSD: rasops32.c,v 1.25 2012/10/23 15:12:59 macallan Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rasops32.c,v 1.24 2012/01/04 17:01:52 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: rasops32.c,v 1.25 2012/10/23 15:12:59 macallan Exp $);
#include opt_rasops.h
@@ -166,6 +166,7 @@ rasops32_putchar_aa(void *cookie, int ro
struct rasops_info *ri = (struct rasops_info *)cookie;
struct wsdisplay_font *font = PICK_FONT(ri, uc);
int32_t *dp, *rp, *hp, *hrp;
+ uint8_t *rrp;
u_char *fr;
int x, y, r, g, b, aval;
int r1, g1, b1, r0, g0, b0;
@@ -185,7 +186,8 @@ rasops32_putchar_aa(void *cookie, int ro
if (!CHAR_IN_FONT(uc, font))
return;
- rp = (int32_t *)(ri-ri_bits + row*ri-ri_yscale + col*ri-ri_xscale);
+ rrp = (ri-ri_bits + row*ri-ri_yscale + col*ri-ri_xscale);
+ rp = (int32_t *)rrp;
if (ri-ri_hwbits)
hrp = (int32_t *)(ri-ri_hwbits + row*ri-ri_yscale +
col*ri-ri_xscale);
@@ -223,7 +225,7 @@ rasops32_putchar_aa(void *cookie, int ro
b1 = clr[1] 0xff;
for (y = 0; y height; y++) {
- dp = rp + ri-ri_width * y;
+ dp = (uint32_t *)(rrp + ri-ri_stride * y);
for (x = 0; x width; x++) {
aval = *fr;
if (aval == 0) {
CVS commit: src/sbin/wsconsctl
Module Name:src
Committed By: christos
Date: Tue Oct 23 15:30:45 UTC 2012
Modified Files:
src/sbin/wsconsctl: map_parse.y
Log Message:
allow non-command keysyms to be mapped as commands (experimental)
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sbin/wsconsctl/map_parse.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/wsconsctl/map_parse.y
diff -u src/sbin/wsconsctl/map_parse.y:1.11 src/sbin/wsconsctl/map_parse.y:1.12
--- src/sbin/wsconsctl/map_parse.y:1.11 Mon Oct 22 21:59:18 2012
+++ src/sbin/wsconsctl/map_parse.y Tue Oct 23 11:30:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: map_parse.y,v 1.11 2012/10/23 01:59:18 christos Exp $ */
+/* $NetBSD: map_parse.y,v 1.12 2012/10/23 15:30:45 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -152,7 +152,8 @@ keysym_cmd : /* empty */
cur_mp-group1[0] = $2;
}
| T_CMD T_KEYSYM_VAR {
- yyerror(Not a command keysym);
+ cur_mp-command = KS_Cmd;
+ cur_mp-group1[0] = $2;
}
;
CVS commit: src/sys/arch/i386
Module Name:src
Committed By: dyoung
Date: Tue Oct 23 16:08:12 UTC 2012
Modified Files:
src/sys/arch/i386: Makefile
Log Message:
Run $(TOOL_CTAGS) instead of ctags: sometimes it's better than the host's
native ctags, and it's nice to have consistent ctags from one host to another.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/i386/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/Makefile
diff -u src/sys/arch/i386/Makefile:1.42 src/sys/arch/i386/Makefile:1.43
--- src/sys/arch/i386/Makefile:1.42 Fri Sep 2 22:12:48 2011
+++ src/sys/arch/i386/Makefile Tue Oct 23 16:08:12 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2011/09/02 22:12:48 dyoung Exp $
+# $NetBSD: Makefile,v 1.43 2012/10/23 16:08:12 dyoung Exp $
# Makefile for i386 tags file and boot blocks
@@ -34,10 +34,10 @@ DI386= i386 eisa isa include pci
tags:
-rm -f ${TI386}
- -echo ${SI386} | xargs ctags -wadtf ${TI386}
+ -echo ${SI386} | xargs $(TOOL_CTAGS) -wadtf ${TI386}
-find -H ${SYSDIR}/external/bsd/acpica/dist/ -name '*.[ch]' | \
- sort -t / -u | xargs ctags -wadtf ${TI386}
- -${FINDCOMM} | xargs ctags -wadtf ${TI386}
+ sort -t / -u | xargs $(TOOL_CTAGS) -wadtf ${TI386}
+ -${FINDCOMM} | xargs $(TOOL_CTAGS) -wadtf ${TI386}
egrep ^ENTRY(.*)|^ALTENTRY(.*) ${AI386} | \
${TOOL_SED} -e \
s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/; \
CVS commit: [netbsd-6] src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: riz Date: Tue Oct 23 16:17:39 UTC 2012 Modified Files: src/external/gpl3/gcc/dist/gcc [netbsd-6]: ChangeLog src/external/gpl3/gcc/dist/gcc/config/arm [netbsd-6]: arm.md Log Message: Pull up following revision(s) (requested by msaitoh in ticket #615): external/gpl3/gcc/dist/gcc/ChangeLog: revision 1.4 external/gpl3/gcc/dist/gcc/config/arm/arm.md: revision 1.2 Fix gcc bugid 51408 for arm. Fix gcc bugid 51408 for arm. To generate a diff of this commit: cvs rdiff -u -r1.2.2.1 -r1.2.2.2 src/external/gpl3/gcc/dist/gcc/ChangeLog cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/external/gpl3/gcc/dist/gcc/config/arm/arm.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/ChangeLog diff -u src/external/gpl3/gcc/dist/gcc/ChangeLog:1.2.2.1 src/external/gpl3/gcc/dist/gcc/ChangeLog:1.2.2.2 --- src/external/gpl3/gcc/dist/gcc/ChangeLog:1.2.2.1 Sun Jun 24 16:41:22 2012 +++ src/external/gpl3/gcc/dist/gcc/ChangeLog Tue Oct 23 16:17:39 2012 @@ -1,3 +1,13 @@ +2011-12-09 Kazu Hirata k...@codesourcery.com + + Backport from mainline: + + 2011-12-05 Kazu Hirata k...@codesourcery.com + + PR target/51408 + * config/arm/arm.md (*minmax_arithsi): Always require the else + clause in the MINUS case. + 2011-10-29 John David Anglin dave.ang...@nrc-cnrc.gc.ca PR target/50691 Index: src/external/gpl3/gcc/dist/gcc/config/arm/arm.md diff -u src/external/gpl3/gcc/dist/gcc/config/arm/arm.md:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/arm/arm.md:1.1.1.1.4.1 --- src/external/gpl3/gcc/dist/gcc/config/arm/arm.md:1.1.1.1 Tue Jun 21 01:22:22 2011 +++ src/external/gpl3/gcc/dist/gcc/config/arm/arm.md Tue Oct 23 16:17:39 2012 @@ -3134,7 +3134,7 @@ bool need_else; if (which_alternative != 0 || operands[3] != const0_rtx -|| (code != PLUS code != MINUS code != IOR code != XOR)) +|| (code != PLUS code != IOR code != XOR)) need_else = true; else need_else = false;
CVS commit: [netbsd-6] src/sys
Module Name:src
Committed By: riz
Date: Tue Oct 23 16:19:48 UTC 2012
Modified Files:
src/sys/net [netbsd-6]: if_arcsubr.c
src/sys/netinet [netbsd-6]: if_atm.c ip_mroute.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #616):
sys/netinet/if_atm.c: revision 1.33
sys/net/if_arcsubr.c: revision 1.64
sys/netinet/ip_mroute.c: revision 1.126
Add missing \n in log(9)
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.14.1 src/sys/net/if_arcsubr.c
cvs rdiff -u -r1.32 -r1.32.10.1 src/sys/netinet/if_atm.c
cvs rdiff -u -r1.122 -r1.122.2.1 src/sys/netinet/ip_mroute.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/net/if_arcsubr.c
diff -u src/sys/net/if_arcsubr.c:1.63 src/sys/net/if_arcsubr.c:1.63.14.1
--- src/sys/net/if_arcsubr.c:1.63 Mon Apr 5 07:22:22 2010
+++ src/sys/net/if_arcsubr.c Tue Oct 23 16:19:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arcsubr.c,v 1.63 2010/04/05 07:22:22 joerg Exp $ */
+/* $NetBSD: if_arcsubr.c,v 1.63.14.1 2012/10/23 16:19:47 riz Exp $ */
/*
* Copyright (c) 1994, 1995 Ignatios Souvatzis
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_arcsubr.c,v 1.63 2010/04/05 07:22:22 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_arcsubr.c,v 1.63.14.1 2012/10/23 16:19:47 riz Exp $);
#include opt_inet.h
@@ -633,7 +633,7 @@ arc_ifattach(struct ifnet *ifp, uint8_t
ifp-if_flags |= IFF_MULTICAST|IFF_ALLMULTI;
if (ifp-if_flags IFF_LINK0 arc_ipmtu ARC_PHDS_MAXMTU)
log(LOG_ERR,
- %s: arc_ipmtu is %d, but must not exceed %d,
+ %s: arc_ipmtu is %d, but must not exceed %d\n,
ifp-if_xname, arc_ipmtu, ARC_PHDS_MAXMTU);
ifp-if_output = arc_output;
Index: src/sys/netinet/if_atm.c
diff -u src/sys/netinet/if_atm.c:1.32 src/sys/netinet/if_atm.c:1.32.10.1
--- src/sys/netinet/if_atm.c:1.32 Tue Feb 1 19:43:12 2011
+++ src/sys/netinet/if_atm.c Tue Oct 23 16:19:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atm.c,v 1.32 2011/02/01 19:43:12 chuck Exp $ */
+/* $NetBSD: if_atm.c,v 1.32.10.1 2012/10/23 16:19:47 riz Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_atm.c,v 1.32 2011/02/01 19:43:12 chuck Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_atm.c,v 1.32.10.1 2012/10/23 16:19:47 riz Exp $);
#include opt_inet.h
#include opt_natm.h
@@ -125,7 +125,7 @@ atm_rtrequest(int req, struct rtentry *r
}
if (gate-sa_family != AF_LINK ||
gate-sa_len sockaddr_dl_measure(namelen, addrlen)) {
- log(LOG_DEBUG, atm_rtrequest: bad gateway value);
+ log(LOG_DEBUG, atm_rtrequest: bad gateway value\n);
break;
}
@@ -228,7 +228,7 @@ atmresolve(struct rtentry *rt, struct mb
const struct sockaddr_dl *sdl;
if (m-m_flags (M_BCAST|M_MCAST)) {
- log(LOG_INFO, atmresolve: BCAST/MCAST packet detected/dumped);
+ log(LOG_INFO, atmresolve: BCAST/MCAST packet detected/dumped\n);
goto bad;
}
Index: src/sys/netinet/ip_mroute.c
diff -u src/sys/netinet/ip_mroute.c:1.122 src/sys/netinet/ip_mroute.c:1.122.2.1
--- src/sys/netinet/ip_mroute.c:1.122 Mon Dec 19 11:59:57 2011
+++ src/sys/netinet/ip_mroute.c Tue Oct 23 16:19:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_mroute.c,v 1.122 2011/12/19 11:59:57 drochner Exp $ */
+/* $NetBSD: ip_mroute.c,v 1.122.2.1 2012/10/23 16:19:47 riz Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,7 +93,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_mroute.c,v 1.122 2011/12/19 11:59:57 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_mroute.c,v 1.122.2.1 2012/10/23 16:19:47 riz Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -3027,7 +3027,7 @@ pim_register_send(struct ip *ip, struct
struct mbuf *mb_copy, *mm;
if (mrtdebug DEBUG_PIM)
-log(LOG_DEBUG, pim_register_send: );
+log(LOG_DEBUG, pim_register_send: \n);
mb_copy = pim_register_prepare(ip, m);
if (mb_copy == NULL)
@@ -3147,7 +3147,7 @@ pim_register_send_upcall(struct ip *ip,
if (socket_send(ip_mrouter, mb_first, k_igmpsrc) 0) {
if (mrtdebug DEBUG_PIM)
log(LOG_WARNING,
- mcast: pim_register_send_upcall: ip_mrouter socket queue full);
+ mcast: pim_register_send_upcall: ip_mrouter socket queue full\n);
++mrtstat.mrts_upq_sockfull;
return ENOBUFS;
}
@@ -3315,7 +3315,7 @@ pim_input(struct mbuf *m, ...)
} else if (in_cksum(m, datalen)) {
pimstat.pims_rcv_badsum++;
if (mrtdebug DEBUG_PIM)
- log(LOG_DEBUG, pim_input: invalid checksum);
+ log(LOG_DEBUG, pim_input: invalid checksum\n);
m_freem(m);
return;
}
CVS commit: [netbsd-6] src/sys/arch/arm/arm
Module Name:src
Committed By: riz
Date: Tue Oct 23 16:21:32 UTC 2012
Modified Files:
src/sys/arch/arm/arm [netbsd-6]: disksubr_mbr.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #617):
sys/arch/arm/arm/disksubr_mbr.c: revision 1.14
Fix a bug that armeb machine misunderstand MBR partition's offset
and size. Fixes PR#47081
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.4.1 src/sys/arch/arm/arm/disksubr_mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/disksubr_mbr.c
diff -u src/sys/arch/arm/arm/disksubr_mbr.c:1.13 src/sys/arch/arm/arm/disksubr_mbr.c:1.13.4.1
--- src/sys/arch/arm/arm/disksubr_mbr.c:1.13 Fri Dec 2 00:25:37 2011
+++ src/sys/arch/arm/arm/disksubr_mbr.c Tue Oct 23 16:21:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr_mbr.c,v 1.13 2011/12/02 00:25:37 jakllsch Exp $ */
+/* $NetBSD: disksubr_mbr.c,v 1.13.4.1 2012/10/23 16:21:32 riz Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: disksubr_mbr.c,v 1.13 2011/12/02 00:25:37 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: disksubr_mbr.c,v 1.13.4.1 2012/10/23 16:21:32 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -151,23 +151,23 @@ mbr_label_read(dev_t dev,
/* Install in partition e, f, g, or h. */
pp = lp-d_partitions['e' - 'a' + i];
- pp-p_offset = mbrp-mbrp_start;
- pp-p_size = mbrp-mbrp_size;
+ pp-p_offset = le32toh(mbrp-mbrp_start);
+ pp-p_size = le32toh(mbrp-mbrp_size);
pp-p_fstype = xlat_mbr_fstype(mbrp-mbrp_type);
/* is this ours? */
if (mbrp == ourmbrp) {
/* need sector address for SCSI/IDE,
cylinder for ESDI/ST506/RLL */
-mbrpartoff = mbrp-mbrp_start;
+mbrpartoff = le32toh(mbrp-mbrp_start);
cyl = MBR_PCYL(mbrp-mbrp_scyl, mbrp-mbrp_ssect);
#ifdef __i386__ /* XXX? */
/* update disklabel with details */
lp-d_partitions[2].p_size =
-mbrp-mbrp_size;
+le32toh(mbrp-mbrp_size);
lp-d_partitions[2].p_offset =
-mbrp-mbrp_start;
+le32toh(mbrp-mbrp_start);
lp-d_ntracks = mbrp-mbrp_ehd + 1;
lp-d_nsectors = MBR_PSECT(mbrp-mbrp_esect);
lp-d_secpercyl =
@@ -250,7 +250,7 @@ mbr_label_locate(dev_t dev,
}
/* need sector address for SCSI/IDE, cylinder for ESDI/ST506/RLL */
- mbrpartoff = ourmbrp-mbrp_start;
+ mbrpartoff = le32toh(ourmbrp-mbrp_start);
cyl = MBR_PCYL(ourmbrp-mbrp_scyl, ourmbrp-mbrp_ssect);
*cylp = cyl;
CVS commit: [netbsd-6] src/distrib/notes/common
Module Name:src Committed By: riz Date: Tue Oct 23 16:25:21 UTC 2012 Modified Files: src/distrib/notes/common [netbsd-6]: main Log Message: Remove duplicate entries (requested by enami in ticket #618) To generate a diff of this commit: cvs rdiff -u -r1.484.2.4 -r1.484.2.5 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.484.2.4 src/distrib/notes/common/main:1.484.2.5 --- src/distrib/notes/common/main:1.484.2.4 Fri Oct 12 22:06:59 2012 +++ src/distrib/notes/common/main Tue Oct 23 16:25:21 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.484.2.4 2012/10/12 22:06:59 riz Exp $ +.\ $NetBSD: main,v 1.484.2.5 2012/10/23 16:25:21 riz Exp $ .\ .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -557,9 +557,6 @@ pseudodevice from the bitstream generati and entropy-pool code .Xr rnd 9 . .It -.Xr kmem_alloc 9 : -add more extensive runtime debugging facilities. -.It Kernel support for .Xr posix_spawn 3 . .bullet)
CVS commit: [netbsd-6] src/sys/arch/arm/marvell
Module Name:src Committed By: riz Date: Tue Oct 23 16:27:16 UTC 2012 Modified Files: src/sys/arch/arm/marvell [netbsd-6]: kirkwood.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #620): sys/arch/arm/marvell/kirkwood.c: revision 1.7 Add missing ',' It will fix a bug that vmstat -e shows the incorrect counts in wrong entries. To generate a diff of this commit: cvs rdiff -u -r1.4.10.1 -r1.4.10.2 src/sys/arch/arm/marvell/kirkwood.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/marvell/kirkwood.c diff -u src/sys/arch/arm/marvell/kirkwood.c:1.4.10.1 src/sys/arch/arm/marvell/kirkwood.c:1.4.10.2 --- src/sys/arch/arm/marvell/kirkwood.c:1.4.10.1 Sat Oct 20 22:31:05 2012 +++ src/sys/arch/arm/marvell/kirkwood.c Tue Oct 23 16:27:15 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: kirkwood.c,v 1.4.10.1 2012/10/20 22:31:05 riz Exp $ */ +/* $NetBSD: kirkwood.c,v 1.4.10.2 2012/10/23 16:27:15 riz Exp $ */ /* * Copyright (c) 2010 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kirkwood.c,v 1.4.10.1 2012/10/20 22:31:05 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: kirkwood.c,v 1.4.10.2 2012/10/23 16:27:15 riz Exp $); #define _INTR_PRIVATE @@ -64,15 +64,15 @@ static const char * const sources[64] = GbE1Rx(16), GbE1Tx(17), GbE1Misc(18),USB0Cnt(19), Reserved(20),Sata(21),SecurityInt(22), SPIInt(23), AudioINT(24),Reserved(25),TS0Int(26), Reserved(27), -SDIOInt(28), TWSI(29),AVBInt(30), TDMInt(31) +SDIOInt(28), TWSI(29),AVBInt(30), TDMInt(31), -Reserved(32),Uart0Int(33),Uart1Int(34),GPIOLo7_0(35) -GPIOLo8_15(36), GPIOLo16_23(37), GPIOLo24_31(38), GPIOHi7_0(39) -GPIOHi8_15(40), GPIOHi16_23(41), XOR0Err(42), XOR1Err(43) -PEX0Err(44), Reserved(45),GbE0Err(46), GbE1Err(47) -USBErr(48), SecurityErr(49), AudioErr(50),Reserved(51) -Reserved(52),RTCInt(53), Reserved(54),Reserved(55) -Reserved(56),Reserved(57),Reserved(58),Reserved(59) +Reserved(32),Uart0Int(33),Uart1Int(34),GPIOLo7_0(35), +GPIOLo8_15(36), GPIOLo16_23(37), GPIOLo24_31(38), GPIOHi7_0(39), +GPIOHi8_15(40), GPIOHi16_23(41), XOR0Err(42), XOR1Err(43), +PEX0Err(44), Reserved(45),GbE0Err(46), GbE1Err(47), +USBErr(48), SecurityErr(49), AudioErr(50),Reserved(51), +Reserved(52),RTCInt(53), Reserved(54),Reserved(55), +Reserved(56),Reserved(57),Reserved(58),Reserved(59), Reserved(60),Reserved(61),Reserved(62),Reserved(63) };
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 16:28:07 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 615-618,620. To generate a diff of this commit: cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-6.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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.7 src/doc/CHANGES-6.1:1.1.2.8 --- src/doc/CHANGES-6.1:1.1.2.7 Mon Oct 22 19:46:36 2012 +++ src/doc/CHANGES-6.1 Tue Oct 23 16:28:06 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.7 2012/10/22 19:46:36 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.8 2012/10/23 16:28:06 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -199,3 +199,31 @@ sbin/ping6/ping6.c1.81 Allow ping6 to send 0-length packets. [msaitoh, ticket #614] +external/gpl3/gcc/dist/gcc/ChangeLog 1.4 +external/gpl3/gcc/dist/gcc/config/arm/arm.md 1.2 + + Fix gcc bugid 51408 for arm. PR#46972. + [msaitoh, ticket #615] + +sys/net/if_arcsubr.c1.64 +sys/netinet/if_atm.c1.33 +sys/netinet/ip_mroute.c1.126 + + Fix output by adding some newlines. + [msaitoh, ticket #616] + +sys/arch/arm/arm/disksubr_mbr.c 1.14 + + Make armeb get the MBR partition and offset correct. PR#47081. + [msaitoh, ticket #617] + +distrib/notes/common/main patch + + Remove duplicate lines in install notes. + [enami, ticket #618] + +sys/arch/arm/marvell/kirkwood.c 1.7 + + Fix incorrect counts for 'vmstat -e' on Kirkwood. + [msaitoh, ticket #620] +
CVS commit: src/sbin/chown
Module Name:src Committed By: wiz Date: Tue Oct 23 17:31:00 UTC 2012 Modified Files: src/sbin/chown: chown.8 Log Message: + ly To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sbin/chown/chown.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/chown/chown.8 diff -u src/sbin/chown/chown.8:1.5 src/sbin/chown/chown.8:1.6 --- src/sbin/chown/chown.8:1.5 Mon Oct 22 18:02:26 2012 +++ src/sbin/chown/chown.8 Tue Oct 23 17:30:59 2012 @@ -26,7 +26,7 @@ .\ SUCH DAMAGE. .\ .\ from: @(#)chown.8 8.3 (Berkeley) 3/31/94 -.\ $NetBSD: chown.8,v 1.5 2012/10/22 18:02:26 christos Exp $ +.\ $NetBSD: chown.8,v 1.6 2012/10/23 17:30:59 wiz Exp $ .\ .Dd October 22, 2012 .Dt CHOWN 8 @@ -115,7 +115,7 @@ The .Ar owner and .Ar group -operands are both optional, however, one must be specified; alternative +operands are both optional, however, one must be specified; alternatively, both the owner and group may be specified using a reference .Ar rfile specified using the
CVS commit: src/sbin/chown
Module Name:src
Committed By: christos
Date: Tue Oct 23 17:55:46 UTC 2012
Modified Files:
src/sbin/chown: chown.c
Log Message:
- use {g,s}etprogname()
- fix usage
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sbin/chown/chown.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/chown/chown.c
diff -u src/sbin/chown/chown.c:1.6 src/sbin/chown/chown.c:1.7
--- src/sbin/chown/chown.c:1.6 Mon Oct 22 14:02:26 2012
+++ src/sbin/chown/chown.c Tue Oct 23 13:55:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: chown.c,v 1.6 2012/10/22 18:02:26 christos Exp $ */
+/* $NetBSD: chown.c,v 1.7 2012/10/23 17:55:46 christos Exp $ */
/*
* Copyright (c) 1988, 1993, 1994, 2003
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = @(#)chown.c 8.8 (Berkeley) 4/4/94;
#else
-__RCSID($NetBSD: chown.c,v 1.6 2012/10/22 18:02:26 christos Exp $);
+__RCSID($NetBSD: chown.c,v 1.7 2012/10/23 17:55:46 christos Exp $);
#endif
#endif /* not lint */
@@ -68,7 +68,7 @@ __dead static void usage(void);
static uid_t uid;
static gid_t gid;
static int ischown;
-static char *myname;
+static const char *myname;
struct option chown_longopts[] = {
{ reference, required_argument, 0,
@@ -86,9 +86,11 @@ main(int argc, char **argv)
char *cp, *reference;
int (*change_owner)(const char *, uid_t, gid_t);
+ setprogname(*argv);
+
(void)setlocale(LC_ALL, );
- myname = (cp = strrchr(*argv, '/')) ? cp + 1 : *argv;
+ myname = getprogname();
ischown = (myname[2] == 'o');
reference = NULL;
@@ -292,7 +294,9 @@ usage(void)
{
(void)fprintf(stderr,
- usage: %s [-R [-H | -L | -P]] [-fhv] %s file ...\n,
- myname, ischown ? [owner][:group] : group);
+ Usage: %s [-R [-H | -L | -P]] [-fhv] %s file ...\n
+ \t%s [-R [-H | -L | -P]] [-fhv] --reference=rfile file ...\n,
+ myname, ischown ? owner:group|owner|:group : group,
+ myname);
exit(EXIT_FAILURE);
}
CVS commit: [netbsd-6] src/sbin/ping
Module Name:src Committed By: riz Date: Tue Oct 23 19:44:45 UTC 2012 Modified Files: src/sbin/ping [netbsd-6]: ping.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #621): sbin/ping/ping.c: revision 1.103 Fix a bug that misunderstand F_TIMING64, F_POLICY and F_AUTHHDR. To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.102.2.1 src/sbin/ping/ping.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/ping/ping.c diff -u src/sbin/ping/ping.c:1.102 src/sbin/ping/ping.c:1.102.2.1 --- src/sbin/ping/ping.c:1.102 Wed Jan 4 16:09:42 2012 +++ src/sbin/ping/ping.c Tue Oct 23 19:44:44 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ping.c,v 1.102 2012/01/04 16:09:42 drochner Exp $ */ +/* $NetBSD: ping.c,v 1.102.2.1 2012/10/23 19:44:44 riz Exp $ */ /* * Copyright (c) 1989, 1993 @@ -58,7 +58,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: ping.c,v 1.102 2012/01/04 16:09:42 drochner Exp $); +__RCSID($NetBSD: ping.c,v 1.102.2.1 2012/10/23 19:44:44 riz Exp $); #endif #include stdio.h @@ -116,10 +116,10 @@ __RCSID($NetBSD: ping.c,v 1.102 2012/01 #define F_TIMING64 0x1 /* 64 bit time, nanoseconds */ #ifdef IPSEC #ifdef IPSEC_POLICY_IPSEC -#define F_POLICY 0x1 +#define F_POLICY 0x2 #else -#define F_AUTHHDR 0x1 -#define F_ENCRYPT 0x2 +#define F_AUTHHDR 0x2 +#define F_ENCRYPT 0x4 #endif /*IPSEC_POLICY_IPSEC*/ #endif /*IPSEC*/
CVS commit: [netbsd-6] src/external/gpl3/gcc/usr.bin
Module Name:src Committed By: riz Date: Tue Oct 23 19:48:25 UTC 2012 Removed Files: src/external/gpl3/gcc/usr.bin/g++ [netbsd-6]: g++.1 src/external/gpl3/gcc/usr.bin/gcc [netbsd-6]: gcc.1 Log Message: Pull up following revision(s) (requested by msaitoh in ticket #622): external/gpl3/gcc/usr.bin/gcc/gcc.1: file removal external/gpl3/gcc/usr.bin/g++/g++.1: file removal Remove OLD manunal to install correct manual. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/external/gpl3/gcc/usr.bin/g++/g++.1 cvs rdiff -u -r1.1 -r0 src/external/gpl3/gcc/usr.bin/gcc/gcc.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/arch/arm/marvell
Module Name:src
Committed By: riz
Date: Tue Oct 23 19:50:49 UTC 2012
Modified Files:
src/sys/arch/arm/marvell [netbsd-6]: mvsocgpp.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #623):
sys/arch/arm/marvell/mvsocgpp.c: revision 1.4
Fix a bug that the irq_masks of GPIO are set on Marvell SoCs.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/arm/marvell/mvsocgpp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/marvell/mvsocgpp.c
diff -u src/sys/arch/arm/marvell/mvsocgpp.c:1.3 src/sys/arch/arm/marvell/mvsocgpp.c:1.3.8.1
--- src/sys/arch/arm/marvell/mvsocgpp.c:1.3 Sat Aug 13 15:38:47 2011
+++ src/sys/arch/arm/marvell/mvsocgpp.c Tue Oct 23 19:50:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsocgpp.c,v 1.3 2011/08/13 15:38:47 jakllsch Exp $ */
+/* $NetBSD: mvsocgpp.c,v 1.3.8.1 2012/10/23 19:50:49 riz Exp $ */
/*
* Copyright (c) 2008, 2010 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mvsocgpp.c,v 1.3 2011/08/13 15:38:47 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: mvsocgpp.c,v 1.3.8.1 2012/10/23 19:50:49 riz Exp $);
#include gpio.h
@@ -71,6 +71,7 @@ struct mvsocgpp_softc {
struct mvsocgpp_pic {
struct pic_softc gpio_pic;
int group;
+ int shift;
uint32_t edge;
uint32_t level;
} *sc_pic;
@@ -183,6 +184,7 @@ mvsocgpp_attach(device_t parent, device_
aprint_normal(, intr %d\n, mva-mva_irq + j);
(sc-sc_pic + j)-group = j;
+ (sc-sc_pic + j)-shift = (j 3) * 8;
}
#ifdef MVSOCGPP_DUMPREG
@@ -244,6 +246,7 @@ gpio_pic_unblock_irqs(struct pic_softc *
uint32_t mask;
int pin = mvsocgpp_pic-group 3;
+ irq_mask = irq_mask mvsocgpp_pic-shift;
MVSOCGPP_WRITE(sc, MVSOCGPP_GPIOIC(pin),
MVSOCGPP_READ(sc, MVSOCGPP_GPIOIC(pin)) ~irq_mask);
if (irq_mask mvsocgpp_pic-edge) {
@@ -266,6 +269,7 @@ gpio_pic_block_irqs(struct pic_softc *pi
struct mvsocgpp_pic *mvsocgpp_pic = (struct mvsocgpp_pic *)pic;
int pin = mvsocgpp_pic-group 3;
+ irq_mask = irq_mask mvsocgpp_pic-shift;
MVSOCGPP_WRITE(sc, MVSOCGPP_GPIOIM(pin),
MVSOCGPP_READ(sc, MVSOCGPP_GPIOIM(pin)) ~irq_mask);
MVSOCGPP_WRITE(sc, MVSOCGPP_GPIOILM(pin),
@@ -281,9 +285,10 @@ gpio_pic_find_pending_irqs(struct pic_so
int pin = mvsocgpp_pic-group 3;
pending = MVSOCGPP_READ(sc, MVSOCGPP_GPIOIC(pin));
- pending = (0xff mvsocgpp_pic-group);
+ pending = (0xff mvsocgpp_pic-shift);
pending = (MVSOCGPP_READ(sc, MVSOCGPP_GPIOIM(pin)) |
MVSOCGPP_READ(sc, MVSOCGPP_GPIOILM(pin)));
+ pending = pending mvsocgpp_pic-shift;
if (pending == 0)
return 0;
CVS commit: [netbsd-6] src/distrib/sets/lists/base
Module Name:src Committed By: riz Date: Tue Oct 23 19:55:38 UTC 2012 Modified Files: src/distrib/sets/lists/base [netbsd-6]: md.evbarm.armeb Log Message: distrib/sets/lists/base/md.evbarm.armeb 1.4 Add missing file for big-endian ARM so make release completes. [msaitoh, ticket #624] To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.10.1 src/distrib/sets/lists/base/md.evbarm.armeb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.evbarm.armeb diff -u src/distrib/sets/lists/base/md.evbarm.armeb:1.3 src/distrib/sets/lists/base/md.evbarm.armeb:1.3.10.1 --- src/distrib/sets/lists/base/md.evbarm.armeb:1.3 Sat Nov 29 17:57:33 2008 +++ src/distrib/sets/lists/base/md.evbarm.armeb Tue Oct 23 19:55:37 2012 @@ -1,2 +1,3 @@ -# $NetBSD: md.evbarm.armeb,v 1.3 2008/11/29 17:57:33 tsutsui Exp $ +# $NetBSD: md.evbarm.armeb,v 1.3.10.1 2012/10/23 19:55:37 riz Exp $ ./usr/mdec/gzboot_ADI_BRH_0x0014.bin base-sysutil-bin +./usr/mdec/bootmini2440base-sysutil-bin
CVS commit: [netbsd-6] src/sys/dev/usb
Module Name:src
Committed By: riz
Date: Tue Oct 23 20:01:14 UTC 2012
Modified Files:
src/sys/dev/usb [netbsd-6]: uftdi.c usbdevs
Log Message:
sys/dev/usb/usbdevs 1.626
sys/dev/usb/usbdevs.h regen
sys/dev/usb/usbdevs_data.h regen
sys/dev/usb/uftdi.c 1.52
Add OpenRD JTAG serial console support.
[msaitoh, ticket #625]
To generate a diff of this commit:
cvs rdiff -u -r1.51.2.1 -r1.51.2.2 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.607.2.4 -r1.607.2.5 src/sys/dev/usb/usbdevs
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/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.51.2.1 src/sys/dev/usb/uftdi.c:1.51.2.2
--- src/sys/dev/usb/uftdi.c:1.51.2.1 Mon Aug 13 20:29:32 2012
+++ src/sys/dev/usb/uftdi.c Tue Oct 23 20:01:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.51.2.1 2012/08/13 20:29:32 riz Exp $ */
+/* $NetBSD: uftdi.c,v 1.51.2.2 2012/10/23 20:01:14 riz Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uftdi.c,v 1.51.2.1 2012/08/13 20:29:32 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: uftdi.c,v 1.51.2.2 2012/10/23 20:01:14 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -150,6 +150,7 @@ static const struct usb_devno uftdi_devs
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_633 },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_634 },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_635 },
+ { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_OPENRD_JTAGKEY },
{ USB_VENDOR_xxFTDI, USB_PRODUCT_xxFTDI_SHEEVAPLUG_JTAG },
{ USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_VALUECAN },
{ USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_NEOVI },
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.607.2.4 src/sys/dev/usb/usbdevs:1.607.2.5
--- src/sys/dev/usb/usbdevs:1.607.2.4 Fri Jun 15 08:48:47 2012
+++ src/sys/dev/usb/usbdevs Tue Oct 23 20:01:14 2012
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.607.2.4 2012/06/15 08:48:47 sborrill Exp $
+$NetBSD: usbdevs,v 1.607.2.5 2012/10/23 20:01:14 riz Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1362,6 +1362,7 @@ product FTDI SERIAL_2232C 0x6010 2232C U
product FTDI SERIAL_4232H 0x6011 2232H USB quad FAST SERIAL ADAPTER
product FTDI PS2KBDMS 0x8371 PS/2 Keyboard/Mouse
product FTDI SERIAL_8U100AX 0x8372 8U100AX Serial converter
+product FTDI OPENRD_JTAGKEY 0x9e90 OpenRD JTAGKey FT2232D B
product FTDI MHAM_KW 0xeee8 KW
product FTDI MHAM_YS 0xeee9 YS
product FTDI MHAM_Y6 0xeeea Y6
CVS commit: [netbsd-6] src/sys/dev/usb
Module Name:src
Committed By: riz
Date: Tue Oct 23 20:01:41 UTC 2012
Modified Files:
src/sys/dev/usb [netbsd-6]: usbdevs.h usbdevs_data.h
Log Message:
Regen for ticket 625.
To generate a diff of this commit:
cvs rdiff -u -r1.600.2.4 -r1.600.2.5 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.601.2.4 -r1.601.2.5 src/sys/dev/usb/usbdevs_data.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/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.600.2.4 src/sys/dev/usb/usbdevs.h:1.600.2.5
--- src/sys/dev/usb/usbdevs.h:1.600.2.4 Fri Jun 15 08:49:19 2012
+++ src/sys/dev/usb/usbdevs.h Tue Oct 23 20:01:41 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.600.2.4 2012/06/15 08:49:19 sborrill Exp $ */
+/* $NetBSD: usbdevs.h,v 1.600.2.5 2012/10/23 20:01:41 riz Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.607.2.4 2012/06/15 08:48:47 sborrill Exp
+ * NetBSD
*/
/*
@@ -1369,6 +1369,7 @@
#define USB_PRODUCT_FTDI_SERIAL_4232H 0x6011 /* 2232H USB quad FAST SERIAL ADAPTER */
#define USB_PRODUCT_FTDI_PS2KBDMS 0x8371 /* PS/2 Keyboard/Mouse */
#define USB_PRODUCT_FTDI_SERIAL_8U100AX 0x8372 /* 8U100AX Serial converter */
+#define USB_PRODUCT_FTDI_OPENRD_JTAGKEY 0x9e90 /* OpenRD JTAGKey FT2232D B */
#define USB_PRODUCT_FTDI_MHAM_KW 0xeee8 /* KW */
#define USB_PRODUCT_FTDI_MHAM_YS 0xeee9 /* YS */
#define USB_PRODUCT_FTDI_MHAM_Y6 0xeeea /* Y6 */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.601.2.4 src/sys/dev/usb/usbdevs_data.h:1.601.2.5
--- src/sys/dev/usb/usbdevs_data.h:1.601.2.4 Fri Jun 15 08:49:19 2012
+++ src/sys/dev/usb/usbdevs_data.h Tue Oct 23 20:01:41 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.601.2.4 2012/06/15 08:49:19 sborrill Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.601.2.5 2012/10/23 20:01:41 riz Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.607.2.4 2012/06/15 08:48:47 sborrill Exp
+ * NetBSD
*/
/*
@@ -4279,6 +4279,10 @@ const struct usb_product usb_products[]
8U100AX Serial converter,
},
{
+ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_OPENRD_JTAGKEY,
+ OpenRD JTAGKey FT2232D B,
+ },
+ {
USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_KW,
KW,
},
@@ -9047,4 +9051,4 @@ const struct usb_product usb_products[]
Prestige,
},
};
-const int usb_nproducts = 1749;
+const int usb_nproducts = 1750;
CVS commit: [netbsd-6] src/share/man/man4
Module Name:src Committed By: riz Date: Tue Oct 23 20:04:17 UTC 2012 Modified Files: src/share/man/man4 [netbsd-6]: uftdi.4 Log Message: Pull up following revision(s) (requested by msaitoh in ticket #626): share/man/man4/uftdi.4: revision 1.17 Add some deivces. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.16.10.1 src/share/man/man4/uftdi.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/uftdi.4 diff -u src/share/man/man4/uftdi.4:1.16 src/share/man/man4/uftdi.4:1.16.10.1 --- src/share/man/man4/uftdi.4:1.16 Sun May 24 19:06:45 2009 +++ src/share/man/man4/uftdi.4 Tue Oct 23 20:04:16 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: uftdi.4,v 1.16 2009/05/24 19:06:45 wiz Exp $ +.\ $NetBSD: uftdi.4,v 1.16.10.1 2012/10/23 20:04:16 riz Exp $ .\ .\ Copyright (c) 2000 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 24, 2009 +.Dd October 18, 2012 .Dt UFTDI 4 .Os .Sh NAME @@ -61,6 +61,7 @@ driver supports the following adapters: .It Tn Crystalfontz CFA-633 LCD .It Tn Crystalfontz CFA-634 LCD .It Tn Crystalfontz CFA-635 LCD +.It Tn CTI USB-485-Mini and and USB-Nano-485 .It Tn Falcom Samba 55/56 GSM/GPRS modem .It Tn Falcom Twist GSM/GPRS modem .It Tn Future Technology Devices DB9 @@ -71,6 +72,7 @@ driver supports the following adapters: .It Tn Future Technology Devices Y8 .It Tn Future Technology Devices Y9 .It Tn Future Technology Devices YS +.It Tn GlobalScale Technogogies SheevaPlug and OpenRD .It Tn HP USB-Serial adapter shipped with some HP laptops .It Tn Inland UAS111 .It Tn Interpid Control Systems NeoVI Blue @@ -80,9 +82,11 @@ driver supports the following adapters: .It Tn Matrix Orbital MX2/MX3/MX6 Series .It Tn Matrix Orbital MX4/MX5 Series LCD .It Tn QVS USC-1000 +.It Tn RATOC Systems REX-USB60F .It Tn Robot Electronics USB to I2C Communications Module -.It Tn SIIG US2308 Serial .It Tn Sealevel Systems USB-Serial adapter +.It Tn SIIG US2308 Serial +.It Tn Telldus Tellstick and Tellstick Duo .It Tn VScom USB-COM Mini .El .Sh SEE ALSO
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 20:12:07 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 621-626. To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-6.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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.8 src/doc/CHANGES-6.1:1.1.2.9 --- src/doc/CHANGES-6.1:1.1.2.8 Tue Oct 23 16:28:06 2012 +++ src/doc/CHANGES-6.1 Tue Oct 23 20:12:07 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.8 2012/10/23 16:28:06 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.9 2012/10/23 20:12:07 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -227,3 +227,38 @@ sys/arch/arm/marvell/kirkwood.c 1.7 Fix incorrect counts for 'vmstat -e' on Kirkwood. [msaitoh, ticket #620] +sbin/ping/ping.c1.103 + + Fix the #define of F_TIMING64, F_POLICY and F_AUTHHDR. + [msaitoh, ticket #621] + +external/gpl3/gcc/usr.bin/g++/g++.1 delete +external/gpl3/gcc/usr.bin/gcc/gcc.1 delete + + Remove old man pages. + [msaitoh, ticket #622] + +sys/arch/arm/marvell/mvsocgpp.c 1.4 + + Fix a bug where the irq_masks of GPIO were set incorrectly on Marvell + SoCs. + [msaitoh, ticket #623] + +distrib/sets/lists/base/md.evbarm.armeb 1.4 + + Add missing file for big-endian ARM so make release completes. + [msaitoh, ticket #624] + +sys/dev/usb/usbdevs1.626 +sys/dev/usb/usbdevs.hregen +sys/dev/usb/usbdevs_data.h regen +sys/dev/usb/uftdi.c1.52 + + Note some additional devices. + [msaitoh, ticket #625] + +share/man/man4/uftdi.41.17 + + Note some additional devices. + [msaitoh, ticket #626] +
CVS commit: [netbsd-6] src
Module Name:src Committed By: riz Date: Tue Oct 23 20:19:51 UTC 2012 Modified Files: src/doc [netbsd-6]: 3RDPARTY src/share/zoneinfo [netbsd-6]: asia australasia Log Message: doc/3RDPARTYpatch share/zoneinfo/asia patch share/zoneinfo/australasia patch Update timezone definitions to tzdata2012g from ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz Changes from tzdata2012f to tzdata2012g: Samoa fall 2012 and later. (Thanks to Nicholas Pereira and Robert Elz.) Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #627] To generate a diff of this commit: cvs rdiff -u -r1.909.2.14 -r1.909.2.15 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.50.4.3 -r1.1.1.50.4.4 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.4 -r1.23.4.5 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.909.2.14 src/doc/3RDPARTY:1.909.2.15 --- src/doc/3RDPARTY:1.909.2.14 Sun Sep 30 18:26:24 2012 +++ src/doc/3RDPARTY Tue Oct 23 20:19:50 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.909.2.14 2012/09/30 18:26:24 bouyer Exp $ +# $NetBSD: 3RDPARTY,v 1.909.2.15 2012/10/23 20:19:50 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1143,10 +1143,9 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2011i / tzdata2012f -Current Vers: tzcode2012f / tzdata2012f -Maintainer: Arthur David Olson a...@elsie.nci.nih.gov -Maintainer: Robert Elz k...@munnari.oz.au +Version: tzcode2011i / tzdata2012g +Current Vers: tzcode2012g / tzdata2012g +Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://elsie.nci.nih.gov/pub/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Home Page: http://www.iana.org/time-zones Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.50.4.3 src/share/zoneinfo/asia:1.1.1.50.4.4 --- src/share/zoneinfo/asia:1.1.1.50.4.3 Mon Aug 13 19:34:51 2012 +++ src/share/zoneinfo/asia Tue Oct 23 20:19:50 2012 @@ -2293,6 +2293,8 @@ Rule Palestine 2010 only - Aug 11 0:00 0 # From Arthur David Olson (2011-09-20): # 2011 transitions per http://www.timeanddate.com as of 2011-09-20. +# From Paul Eggert (2012-10-12): +# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2303,7 +2305,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct 2:00 Palestine EE%sT 2011 Apr 2 12:01 2:00 1:00 EEST 2011 Aug 1 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET Zone Asia/Hebron 2:20:23 - LMT 1900 Oct @@ -2318,7 +2320,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct 2:00 - EET 2011 Aug 30 2:00 1:00 EEST 2011 Sep 30 3:00 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 3:00 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET # Paracel Is Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.23.4.4 src/share/zoneinfo/australasia:1.23.4.5 --- src/share/zoneinfo/australasia:1.23.4.4 Sun Sep 30 18:26:24 2012 +++ src/share/zoneinfo/australasia Tue Oct 23 20:19:51 2012 @@ -628,6 +628,23 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 # seasons, there is not yet any indication that this trend will continue on # a regular basis. For now, we have explicitly listed the transitions below. +# +# From Nicky (2012-09-10): +# Daylight Saving Time commences on Sunday 30th September 2012 and +# ends on Sunday 7th of April 2013. +# +# Please find link below for more information. +# http://www.mcil.gov.ws/mcil_publications.html +# +# That publication also includes dates for Summer of 2013/4 as well +# which give the impression of a pattern in selecting dates for the +# future, so for now, we will guess this will continue. + +# Western Samoa +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule WS 2012 max - Sep lastSun 3:00 1 D +Rule WS 2012 max - Apr Sun=1 4:00 0 - +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time @@ -635,8 +652,8 @@ Zone Pacific/Apia 12:33:04 - LMT 1879 J -11:00 1:00 WSDT 2011 Apr 2 4:00 -11:00 - WST 2011 Sep 24 3:00 -11:00 1:00 WSDT 2011 Dec 30 - 13:00 1:00 WSDT 2012 Apr 1 4:00 - 13:00 - WST + 13:00 1:00 WSDT 2012 Apr Sun=1 4:00 + 13:00 WS WS%sT # Solomon Is # excludes Bougainville, for which see Papua New Guinea
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 20:20:15 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Ticket 627. To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/doc/CHANGES-6.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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.9 src/doc/CHANGES-6.1:1.1.2.10 --- src/doc/CHANGES-6.1:1.1.2.9 Tue Oct 23 20:12:07 2012 +++ src/doc/CHANGES-6.1 Tue Oct 23 20:20:15 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.9 2012/10/23 20:12:07 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.10 2012/10/23 20:20:15 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -262,3 +262,15 @@ share/man/man4/uftdi.41.17 Note some additional devices. [msaitoh, ticket #626] +doc/3RDPARTYpatch +share/zoneinfo/asia patch +share/zoneinfo/australasia patch + + Update timezone definitions to tzdata2012g from + ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz + Changes from tzdata2012f to tzdata2012g: + Samoa fall 2012 and later. (Thanks to Nicholas Pereira + and Robert Elz.) + Palestine fall 2012. (Thanks to Steffen Thorsen.) + [apb, ticket #627] +
CVS commit: [netbsd-6-0] src
Module Name:src Committed By: riz Date: Tue Oct 23 20:20:40 UTC 2012 Modified Files: src/doc [netbsd-6-0]: 3RDPARTY src/share/zoneinfo [netbsd-6-0]: asia australasia Log Message: doc/3RDPARTYpatch share/zoneinfo/asia patch share/zoneinfo/australasia patch Update timezone definitions to tzdata2012g from ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz Changes from tzdata2012f to tzdata2012g: Samoa fall 2012 and later. (Thanks to Nicholas Pereira and Robert Elz.) Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #627] To generate a diff of this commit: cvs rdiff -u -r1.909.2.14 -r1.909.2.14.2.1 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.50.4.3 -r1.1.1.50.4.3.4.1 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.4 -r1.23.4.4.2.1 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.909.2.14 src/doc/3RDPARTY:1.909.2.14.2.1 --- src/doc/3RDPARTY:1.909.2.14 Sun Sep 30 18:26:24 2012 +++ src/doc/3RDPARTY Tue Oct 23 20:20:39 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.909.2.14 2012/09/30 18:26:24 bouyer Exp $ +# $NetBSD: 3RDPARTY,v 1.909.2.14.2.1 2012/10/23 20:20:39 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1143,10 +1143,9 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2011i / tzdata2012f -Current Vers: tzcode2012f / tzdata2012f -Maintainer: Arthur David Olson a...@elsie.nci.nih.gov -Maintainer: Robert Elz k...@munnari.oz.au +Version: tzcode2011i / tzdata2012g +Current Vers: tzcode2012g / tzdata2012g +Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://elsie.nci.nih.gov/pub/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Home Page: http://www.iana.org/time-zones Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.50.4.3 src/share/zoneinfo/asia:1.1.1.50.4.3.4.1 --- src/share/zoneinfo/asia:1.1.1.50.4.3 Mon Aug 13 19:34:51 2012 +++ src/share/zoneinfo/asia Tue Oct 23 20:20:39 2012 @@ -2293,6 +2293,8 @@ Rule Palestine 2010 only - Aug 11 0:00 0 # From Arthur David Olson (2011-09-20): # 2011 transitions per http://www.timeanddate.com as of 2011-09-20. +# From Paul Eggert (2012-10-12): +# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2303,7 +2305,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct 2:00 Palestine EE%sT 2011 Apr 2 12:01 2:00 1:00 EEST 2011 Aug 1 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET Zone Asia/Hebron 2:20:23 - LMT 1900 Oct @@ -2318,7 +2320,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct 2:00 - EET 2011 Aug 30 2:00 1:00 EEST 2011 Sep 30 3:00 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 3:00 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET # Paracel Is Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.23.4.4 src/share/zoneinfo/australasia:1.23.4.4.2.1 --- src/share/zoneinfo/australasia:1.23.4.4 Sun Sep 30 18:26:24 2012 +++ src/share/zoneinfo/australasia Tue Oct 23 20:20:39 2012 @@ -628,6 +628,23 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 # seasons, there is not yet any indication that this trend will continue on # a regular basis. For now, we have explicitly listed the transitions below. +# +# From Nicky (2012-09-10): +# Daylight Saving Time commences on Sunday 30th September 2012 and +# ends on Sunday 7th of April 2013. +# +# Please find link below for more information. +# http://www.mcil.gov.ws/mcil_publications.html +# +# That publication also includes dates for Summer of 2013/4 as well +# which give the impression of a pattern in selecting dates for the +# future, so for now, we will guess this will continue. + +# Western Samoa +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule WS 2012 max - Sep lastSun 3:00 1 D +Rule WS 2012 max - Apr Sun=1 4:00 0 - +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time @@ -635,8 +652,8 @@ Zone Pacific/Apia 12:33:04 - LMT 1879 J -11:00 1:00 WSDT 2011 Apr 2 4:00 -11:00 - WST 2011 Sep 24 3:00 -11:00 1:00 WSDT 2011 Dec 30 - 13:00 1:00 WSDT 2012 Apr 1 4:00 - 13:00 - WST + 13:00 1:00 WSDT 2012 Apr Sun=1 4:00 + 13:00 WS WS%sT # Solomon Is # excludes Bougainville, for which see Papua New Guinea
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 20:20:57 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Ticket 627 To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/CHANGES-6.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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.3 src/doc/CHANGES-6.0.1:1.1.2.4 --- src/doc/CHANGES-6.0.1:1.1.2.3 Sat Oct 20 22:24:24 2012 +++ src/doc/CHANGES-6.0.1 Tue Oct 23 20:20:57 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.3 2012/10/20 22:24:24 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.4 2012/10/23 20:20:57 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -24,3 +24,15 @@ doc/CHANGES patch Typo fix: OpenSSL, not OpenSSH. [khorben, ticket #608] +doc/3RDPARTYpatch +share/zoneinfo/asia patch +share/zoneinfo/australasia patch + + Update timezone definitions to tzdata2012g from + ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz + Changes from tzdata2012f to tzdata2012g: + Samoa fall 2012 and later. (Thanks to Nicholas Pereira + and Robert Elz.) + Palestine fall 2012. (Thanks to Steffen Thorsen.) + [apb, ticket #627] +
CVS commit: src/usr.bin/touch
Module Name:src Committed By: wiz Date: Tue Oct 23 20:44:22 UTC 2012 Modified Files: src/usr.bin/touch: touch.1 Log Message: Add --date and --reference to SYNOPSIS. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/usr.bin/touch/touch.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/touch/touch.1 diff -u src/usr.bin/touch/touch.1:1.23 src/usr.bin/touch/touch.1:1.24 --- src/usr.bin/touch/touch.1:1.23 Mon Oct 22 22:59:33 2012 +++ src/usr.bin/touch/touch.1 Tue Oct 23 20:44:22 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: touch.1,v 1.23 2012/10/22 22:59:33 pgoyette Exp $ +.\ $NetBSD: touch.1,v 1.24 2012/10/23 20:44:22 wiz Exp $ .\ .\ Copyright (c) 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -42,7 +42,9 @@ .Nm .Op Fl acfhm .Op Fl d Ar human-datetime +.Op Fl Fl date Ar human-datetime .Op Fl r Ar file +.Op Fl Fl reference Ar file .Op Fl t Ar datetime .Ar file ... .Sh DESCRIPTION
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: matt Date: Tue Oct 23 22:50:00 UTC 2012 Modified Files: src/sys/arch/arm/arm32: vm_machdep.c Log Message: When allocating the kernel virtual addresses, make sure to match the color of the user addresses. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/arm/arm32/vm_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/vm_machdep.c diff -u src/sys/arch/arm/arm32/vm_machdep.c:1.60 src/sys/arch/arm/arm32/vm_machdep.c:1.61 --- src/sys/arch/arm/arm32/vm_machdep.c:1.60 Wed Aug 29 07:09:12 2012 +++ src/sys/arch/arm/arm32/vm_machdep.c Tue Oct 23 22:50:00 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.60 2012/08/29 07:09:12 matt Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.61 2012/10/23 22:50:00 matt Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -44,7 +44,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.60 2012/08/29 07:09:12 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.61 2012/10/23 22:50:00 matt Exp $); #include opt_armfpe.h #include opt_pmap_debug.h @@ -251,7 +251,8 @@ vmapbuf(struct buf *bp, vsize_t len) faddr = trunc_page((vaddr_t)bp-b_data); off = (vaddr_t)bp-b_data - faddr; len = round_page(off + len); - taddr = uvm_km_alloc(phys_map, len, 0, UVM_KMF_VAONLY | UVM_KMF_WAITVA); + taddr = uvm_km_alloc(phys_map, len, atop(faddr) uvmexp.colormask, + UVM_KMF_VAONLY | UVM_KMF_WAITVA | UVM_KMF_COLORMATCH); bp-b_data = (void *)(taddr + off); /*
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: matt Date: Tue Oct 23 23:13:20 UTC 2012 Modified Files: src/sys/arch/arm/broadcom: files.bcm53xx Log Message: Add MEMSIZE as an option. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/broadcom/files.bcm53xx Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/broadcom/files.bcm53xx diff -u src/sys/arch/arm/broadcom/files.bcm53xx:1.1 src/sys/arch/arm/broadcom/files.bcm53xx:1.2 --- src/sys/arch/arm/broadcom/files.bcm53xx:1.1 Sat Sep 1 00:04:44 2012 +++ src/sys/arch/arm/broadcom/files.bcm53xx Tue Oct 23 23:13:20 2012 @@ -1,4 +1,4 @@ -# $NetBSD: files.bcm53xx,v 1.1 2012/09/01 00:04:44 matt Exp $ +# $NetBSD: files.bcm53xx,v 1.2 2012/10/23 23:13:20 matt Exp $ # # Configuration info for Broadcom BCM5301X ARM Peripherals # @@ -18,6 +18,7 @@ file arch/arm/broadcom/bcmgen_space.c defparam opt_broadcom.hCONADDR defparam opt_broadcom.hCONSPEED defparam opt_broadcom.hCONMODE +defparam opt_broadcom.hMEMSIZE defflag opt_broadcom.hBCM53XX_CONSOLE_EARLY # ChipCommonA attach point
CVS commit: src/sys/arch/evbarm/bcm53xx
Module Name:src Committed By: matt Date: Tue Oct 23 23:16:05 UTC 2012 Modified Files: src/sys/arch/evbarm/bcm53xx: bcm53xx_machdep.c Log Message: Support a MEMSIZE option To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.5 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.6 --- src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.5 Wed Oct 17 20:20:54 2012 +++ src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Tue Oct 23 23:16:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm53xx_machdep.c,v 1.5 2012/10/17 20:20:54 matt Exp $ */ +/* $NetBSD: bcm53xx_machdep.c,v 1.6 2012/10/23 23:16:05 matt Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #define IDM_PRIVATE #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bcm53xx_machdep.c,v 1.5 2012/10/17 20:20:54 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bcm53xx_machdep.c,v 1.6 2012/10/23 23:16:05 matt Exp $); #include opt_evbarm_boardtype.h #include opt_broadcom.h @@ -244,7 +244,10 @@ initarm(void *arg) #endif psize_t memsize = bcm53xx_memprobe(); - //memsize = 512*1024*1024; +#ifdef MEMSIZE + if ((memsize 20) MEMSIZE) + memsize = MEMSIZE*1024*1024; +#endif const bool bigmem_p = (memsize 20) 256; arm32_bootmem_init(KERN_VTOPHYS(KERNEL_BASE), memsize,
CVS commit: [netbsd-5-1] src/share/zoneinfo
Module Name:src Committed By: riz Date: Tue Oct 23 23:21:01 UTC 2012 Modified Files: src/share/zoneinfo [netbsd-5-1]: asia australasia Log Message: doc/3RDPARTYpatch share/zoneinfo/asia patch share/zoneinfo/australasia patch Update timezone definitions to tzdata2012g from ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz Changes from tzdata2012f to tzdata2012g: Samoa fall 2012 and later. (Thanks to Nicholas Pereira and Robert Elz.) Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #1803] To generate a diff of this commit: cvs rdiff -u -r1.1.1.44.10.3 -r1.1.1.44.10.4 src/share/zoneinfo/asia cvs rdiff -u -r1.17.10.4 -r1.17.10.5 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.44.10.3 src/share/zoneinfo/asia:1.1.1.44.10.4 --- src/share/zoneinfo/asia:1.1.1.44.10.3 Sat Sep 15 09:26:52 2012 +++ src/share/zoneinfo/asia Tue Oct 23 23:21:01 2012 @@ -2293,6 +2293,8 @@ Rule Palestine 2010 only - Aug 11 0:00 0 # From Arthur David Olson (2011-09-20): # 2011 transitions per http://www.timeanddate.com as of 2011-09-20. +# From Paul Eggert (2012-10-12): +# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2303,7 +2305,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct 2:00 Palestine EE%sT 2011 Apr 2 12:01 2:00 1:00 EEST 2011 Aug 1 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET Zone Asia/Hebron 2:20:23 - LMT 1900 Oct @@ -2318,7 +2320,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct 2:00 - EET 2011 Aug 30 2:00 1:00 EEST 2011 Sep 30 3:00 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 3:00 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET # Paracel Is Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.17.10.4 src/share/zoneinfo/australasia:1.17.10.5 --- src/share/zoneinfo/australasia:1.17.10.4 Sun Sep 30 18:12:36 2012 +++ src/share/zoneinfo/australasia Tue Oct 23 23:21:01 2012 @@ -628,6 +628,23 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 # seasons, there is not yet any indication that this trend will continue on # a regular basis. For now, we have explicitly listed the transitions below. +# +# From Nicky (2012-09-10): +# Daylight Saving Time commences on Sunday 30th September 2012 and +# ends on Sunday 7th of April 2013. +# +# Please find link below for more information. +# http://www.mcil.gov.ws/mcil_publications.html +# +# That publication also includes dates for Summer of 2013/4 as well +# which give the impression of a pattern in selecting dates for the +# future, so for now, we will guess this will continue. + +# Western Samoa +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule WS 2012 max - Sep lastSun 3:00 1 D +Rule WS 2012 max - Apr Sun=1 4:00 0 - +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time @@ -635,8 +652,8 @@ Zone Pacific/Apia 12:33:04 - LMT 1879 J -11:00 1:00 WSDT 2011 Apr 2 4:00 -11:00 - WST 2011 Sep 24 3:00 -11:00 1:00 WSDT 2011 Dec 30 - 13:00 1:00 WSDT 2012 Apr 1 4:00 - 13:00 - WST + 13:00 1:00 WSDT 2012 Apr Sun=1 4:00 + 13:00 WS WS%sT # Solomon Is # excludes Bougainville, for which see Papua New Guinea
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 23:21:23 UTC 2012 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Ticket 1803 To generate a diff of this commit: cvs rdiff -u -r1.1.2.25 -r1.1.2.26 src/doc/CHANGES-5.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.25 src/doc/CHANGES-5.1.3:1.1.2.26 --- src/doc/CHANGES-5.1.3:1.1.2.25 Wed Oct 17 20:57:02 2012 +++ src/doc/CHANGES-5.1.3 Tue Oct 23 23:21:23 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.25 2012/10/17 20:57:02 bouyer Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.26 2012/10/23 23:21:23 riz Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2220,3 +2220,15 @@ usr.bin/calendar/calendars/calendar.netb note NetBSD 6.0 release [jnemeth, ticket #1802] +doc/3RDPARTYpatch +share/zoneinfo/asia patch +share/zoneinfo/australasia patch + + Update timezone definitions to tzdata2012g from + ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz + Changes from tzdata2012f to tzdata2012g: + Samoa fall 2012 and later. (Thanks to Nicholas Pereira + and Robert Elz.) + Palestine fall 2012. (Thanks to Steffen Thorsen.) + [apb, ticket #1803] +
CVS commit: [netbsd-5-0] src
Module Name:src Committed By: riz Date: Tue Oct 23 23:25:19 UTC 2012 Modified Files: src/doc [netbsd-5-0]: 3RDPARTY src/share/zoneinfo [netbsd-5-0]: asia australasia Log Message: doc/3RDPARTYpatch share/zoneinfo/asia patch share/zoneinfo/australasia patch Update timezone definitions to tzdata2012g from ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz Changes from tzdata2012f to tzdata2012g: Samoa fall 2012 and later. (Thanks to Nicholas Pereira and Robert Elz.) Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #1803] To generate a diff of this commit: cvs rdiff -u -r1.647.2.6.2.8 -r1.647.2.6.2.9 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.44.6.3 -r1.1.1.44.6.4 src/share/zoneinfo/asia cvs rdiff -u -r1.17.6.4 -r1.17.6.5 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.6.2.8 src/doc/3RDPARTY:1.647.2.6.2.9 --- src/doc/3RDPARTY:1.647.2.6.2.8 Sun Sep 30 18:12:46 2012 +++ src/doc/3RDPARTY Tue Oct 23 23:25:18 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.6.2.8 2012/09/30 18:12:46 bouyer Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.6.2.9 2012/10/23 23:25:18 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,10 +924,9 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012f -Current Vers: tzcode2012f / tzdata2012f -Maintainer: Arthur David Olson a...@elsie.nci.nih.gov -Maintainer: Robert Elz k...@munnari.oz.au +Version: tzcode2004a / tzdata2012g +Current Vers: tzcode2012g / tzdata2012g +Maintainer:Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Old Archive Site: ftp://elsie.nci.nih.gov/pub/ Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.44.6.3 src/share/zoneinfo/asia:1.1.1.44.6.4 --- src/share/zoneinfo/asia:1.1.1.44.6.3 Sat Sep 15 09:26:28 2012 +++ src/share/zoneinfo/asia Tue Oct 23 23:25:18 2012 @@ -2293,6 +2293,8 @@ Rule Palestine 2010 only - Aug 11 0:00 0 # From Arthur David Olson (2011-09-20): # 2011 transitions per http://www.timeanddate.com as of 2011-09-20. +# From Paul Eggert (2012-10-12): +# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2303,7 +2305,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct 2:00 Palestine EE%sT 2011 Apr 2 12:01 2:00 1:00 EEST 2011 Aug 1 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET Zone Asia/Hebron 2:20:23 - LMT 1900 Oct @@ -2318,7 +2320,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct 2:00 - EET 2011 Aug 30 2:00 1:00 EEST 2011 Sep 30 3:00 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 3:00 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET # Paracel Is Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.17.6.4 src/share/zoneinfo/australasia:1.17.6.5 --- src/share/zoneinfo/australasia:1.17.6.4 Sun Sep 30 18:12:46 2012 +++ src/share/zoneinfo/australasia Tue Oct 23 23:25:19 2012 @@ -628,6 +628,23 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 # seasons, there is not yet any indication that this trend will continue on # a regular basis. For now, we have explicitly listed the transitions below. +# +# From Nicky (2012-09-10): +# Daylight Saving Time commences on Sunday 30th September 2012 and +# ends on Sunday 7th of April 2013. +# +# Please find link below for more information. +# http://www.mcil.gov.ws/mcil_publications.html +# +# That publication also includes dates for Summer of 2013/4 as well +# which give the impression of a pattern in selecting dates for the +# future, so for now, we will guess this will continue. + +# Western Samoa +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule WS 2012 max - Sep lastSun 3:00 1 D +Rule WS 2012 max - Apr Sun=1 4:00 0 - +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time @@ -635,8 +652,8 @@ Zone Pacific/Apia 12:33:04 - LMT 1879 J -11:00 1:00 WSDT 2011 Apr 2 4:00 -11:00 - WST 2011 Sep 24 3:00 -11:00 1:00 WSDT 2011 Dec 30 - 13:00 1:00 WSDT 2012 Apr 1 4:00 - 13:00 - WST + 13:00 1:00 WSDT 2012 Apr Sun=1 4:00 + 13:00 WS WS%sT # Solomon Is # excludes Bougainville, for which see Papua New Guinea
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 23:25:41 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1803. To generate a diff of this commit: cvs rdiff -u -r1.1.2.84 -r1.1.2.85 src/doc/CHANGES-5.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.84 src/doc/CHANGES-5.0.3:1.1.2.85 --- src/doc/CHANGES-5.0.3:1.1.2.84 Wed Oct 17 20:57:15 2012 +++ src/doc/CHANGES-5.0.3 Tue Oct 23 23:25:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.84 2012/10/17 20:57:15 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.85 2012/10/23 23:25:41 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5133,3 +5133,15 @@ usr.bin/calendar/calendars/calendar.netb note NetBSD 6.0 release [jnemeth, ticket #1802] +doc/3RDPARTYpatch +share/zoneinfo/asia patch +share/zoneinfo/australasia patch + + Update timezone definitions to tzdata2012g from + ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz + Changes from tzdata2012f to tzdata2012g: + Samoa fall 2012 and later. (Thanks to Nicholas Pereira + and Robert Elz.) + Palestine fall 2012. (Thanks to Steffen Thorsen.) + [apb, ticket #1803] +
CVS commit: [netbsd-5] src
Module Name:src Committed By: riz Date: Tue Oct 23 23:27:21 UTC 2012 Modified Files: src/doc [netbsd-5]: 3RDPARTY src/share/zoneinfo [netbsd-5]: asia australasia Log Message: doc/3RDPARTYpatch share/zoneinfo/asia patch share/zoneinfo/australasia patch Update timezone definitions to tzdata2012g from ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz Changes from tzdata2012f to tzdata2012g: Samoa fall 2012 and later. (Thanks to Nicholas Pereira and Robert Elz.) Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #1803] To generate a diff of this commit: cvs rdiff -u -r1.647.2.19 -r1.647.2.20 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.44.2.3 -r1.1.1.44.2.4 src/share/zoneinfo/asia cvs rdiff -u -r1.17.2.4 -r1.17.2.5 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.19 src/doc/3RDPARTY:1.647.2.20 --- src/doc/3RDPARTY:1.647.2.19 Sun Sep 30 18:12:51 2012 +++ src/doc/3RDPARTY Tue Oct 23 23:27:20 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.19 2012/09/30 18:12:51 bouyer Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.20 2012/10/23 23:27:20 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,10 +924,9 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012f -Current Vers: tzcode2012f / tzdata2012f -Maintainer: Arthur David Olson a...@elsie.nci.nih.gov -Maintainer: Robert Elz k...@munnari.oz.au +Version: tzcode2004a / tzdata2012g +Current Vers: tzcode2012g / tzdata2012g +Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Old Archive Site: ftp://elsie.nci.nih.gov/pub/ Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.44.2.3 src/share/zoneinfo/asia:1.1.1.44.2.4 --- src/share/zoneinfo/asia:1.1.1.44.2.3 Sat Sep 15 09:26:42 2012 +++ src/share/zoneinfo/asia Tue Oct 23 23:27:21 2012 @@ -2293,6 +2293,8 @@ Rule Palestine 2010 only - Aug 11 0:00 0 # From Arthur David Olson (2011-09-20): # 2011 transitions per http://www.timeanddate.com as of 2011-09-20. +# From Paul Eggert (2012-10-12): +# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2303,7 +2305,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct 2:00 Palestine EE%sT 2011 Apr 2 12:01 2:00 1:00 EEST 2011 Aug 1 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET Zone Asia/Hebron 2:20:23 - LMT 1900 Oct @@ -2318,7 +2320,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct 2:00 - EET 2011 Aug 30 2:00 1:00 EEST 2011 Sep 30 3:00 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 3:00 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET # Paracel Is Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.17.2.4 src/share/zoneinfo/australasia:1.17.2.5 --- src/share/zoneinfo/australasia:1.17.2.4 Sun Sep 30 18:12:51 2012 +++ src/share/zoneinfo/australasia Tue Oct 23 23:27:21 2012 @@ -628,6 +628,23 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 # seasons, there is not yet any indication that this trend will continue on # a regular basis. For now, we have explicitly listed the transitions below. +# +# From Nicky (2012-09-10): +# Daylight Saving Time commences on Sunday 30th September 2012 and +# ends on Sunday 7th of April 2013. +# +# Please find link below for more information. +# http://www.mcil.gov.ws/mcil_publications.html +# +# That publication also includes dates for Summer of 2013/4 as well +# which give the impression of a pattern in selecting dates for the +# future, so for now, we will guess this will continue. + +# Western Samoa +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule WS 2012 max - Sep lastSun 3:00 1 D +Rule WS 2012 max - Apr Sun=1 4:00 0 - +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time @@ -635,8 +652,8 @@ Zone Pacific/Apia 12:33:04 - LMT 1879 J -11:00 1:00 WSDT 2011 Apr 2 4:00 -11:00 - WST 2011 Sep 24 3:00 -11:00 1:00 WSDT 2011 Dec 30 - 13:00 1:00 WSDT 2012 Apr 1 4:00 - 13:00 - WST + 13:00 1:00 WSDT 2012 Apr Sun=1 4:00 + 13:00 WS WS%sT # Solomon Is # excludes Bougainville, for which see Papua New Guinea
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 23:27:49 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket 1803. To generate a diff of this commit: cvs rdiff -u -r1.1.2.187 -r1.1.2.188 src/doc/CHANGES-5.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.187 src/doc/CHANGES-5.2:1.1.2.188 --- src/doc/CHANGES-5.2:1.1.2.187 Wed Oct 17 20:57:41 2012 +++ src/doc/CHANGES-5.2 Tue Oct 23 23:27:49 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.187 2012/10/17 20:57:41 bouyer Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.188 2012/10/23 23:27:49 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -8673,3 +8673,15 @@ usr.bin/calendar/calendars/calendar.netb note NetBSD 6.0 release [jnemeth, ticket #1802] +doc/3RDPARTYpatch +share/zoneinfo/asia patch +share/zoneinfo/australasia patch + + Update timezone definitions to tzdata2012g from + ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz + Changes from tzdata2012f to tzdata2012g: + Samoa fall 2012 and later. (Thanks to Nicholas Pereira + and Robert Elz.) + Palestine fall 2012. (Thanks to Steffen Thorsen.) + [apb, ticket #1803] +
CVS commit: src/sys/fs/ptyfs
Module Name:src Committed By: christos Date: Tue Oct 23 23:31:01 UTC 2012 Modified Files: src/sys/fs/ptyfs: ptyfs_subr.c Log Message: fix the mystery of the bad directory times. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/fs/ptyfs/ptyfs_subr.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/fs/ptyfs/ptyfs_subr.c diff -u src/sys/fs/ptyfs/ptyfs_subr.c:1.23 src/sys/fs/ptyfs/ptyfs_subr.c:1.24 --- src/sys/fs/ptyfs/ptyfs_subr.c:1.23 Sat Jun 11 23:35:53 2011 +++ src/sys/fs/ptyfs/ptyfs_subr.c Tue Oct 23 19:31:00 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ptyfs_subr.c,v 1.23 2011/06/12 03:35:53 rmind Exp $ */ +/* $NetBSD: ptyfs_subr.c,v 1.24 2012/10/23 23:31:00 christos Exp $ */ /* * Copyright (c) 1993 @@ -73,7 +73,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ptyfs_subr.c,v 1.23 2011/06/12 03:35:53 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: ptyfs_subr.c,v 1.24 2012/10/23 23:31:00 christos Exp $); #include sys/param.h #include sys/systm.h @@ -174,7 +174,7 @@ ptyfs_getinfo(struct ptyfsnode *ptyfs, s } out: ptyfs-ptyfs_uid = ptyfs-ptyfs_gid = 0; - ptyfs-ptyfs_flags |= PTYFS_CHANGE; + ptyfs-ptyfs_flag |= PTYFS_CHANGE; PTYFS_ITIMES(ptyfs, NULL, NULL, NULL); ptyfs-ptyfs_birthtime = ptyfs-ptyfs_mtime = ptyfs-ptyfs_atime = ptyfs-ptyfs_ctime;
CVS commit: [netbsd-4] src/bin/pax
Module Name:src
Committed By: riz
Date: Tue Oct 23 23:31:13 UTC 2012
Modified Files:
src/bin/pax [netbsd-4]: ftree.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1459):
bin/pax/ftree.c: revision 1.42
deal properly with empty lines in spec file
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.34.4.1 src/bin/pax/ftree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/ftree.c
diff -u src/bin/pax/ftree.c:1.34 src/bin/pax/ftree.c:1.34.4.1
--- src/bin/pax/ftree.c:1.34 Sat Feb 11 10:43:18 2006
+++ src/bin/pax/ftree.c Tue Oct 23 23:31:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ftree.c,v 1.34 2006/02/11 10:43:18 dsl Exp $ */
+/* $NetBSD: ftree.c,v 1.34.4.1 2012/10/23 23:31:13 riz Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -78,7 +78,7 @@
#if 0
static char sccsid[] = @(#)ftree.c 8.2 (Berkeley) 4/18/94;
#else
-__RCSID($NetBSD: ftree.c,v 1.34 2006/02/11 10:43:18 dsl Exp $);
+__RCSID($NetBSD: ftree.c,v 1.34.4.1 2012/10/23 23:31:13 riz Exp $);
#endif
#endif /* not lint */
@@ -361,7 +361,7 @@ ftree_arg(void)
* the user didn't supply any args, get the file trees
* to process from stdin;
*/
- for (i = 0; i PAXPATHLEN + 2; i++) {
+ for (i = 0; i PAXPATHLEN + 2;) {
c = getchar();
if (c == EOF)
break;
@@ -369,7 +369,7 @@ ftree_arg(void)
if (i != 0)
break;
} else
- farray[0][i] = c;
+ farray[0][i++] = c;
}
if (i == 0)
return -1;
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 23:38:54 UTC 2012 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Ticket 1459. To generate a diff of this commit: cvs rdiff -u -r1.1.2.251 -r1.1.2.252 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.251 src/doc/CHANGES-4.1:1.1.2.252 --- src/doc/CHANGES-4.1:1.1.2.251 Wed Oct 17 21:03:59 2012 +++ src/doc/CHANGES-4.1 Tue Oct 23 23:38:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.251 2012/10/17 21:03:59 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.252 2012/10/23 23:38:54 riz Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4769,3 +4769,8 @@ usr.bin/calendar/calendars/calendar.netb note NetBSD 6.0 release [jnemeth, ticket #1460] +bin/pax/ftree.c 1.42 + + Deal properly with empty lines in spec file. + [msaitoh, ticket #1459] +
CVS commit: [netbsd-4] src
Module Name:src Committed By: riz Date: Tue Oct 23 23:43:09 UTC 2012 Modified Files: src/doc [netbsd-4]: 3RDPARTY src/share/zoneinfo [netbsd-4]: asia australasia Log Message: doc/3RDPARTYpatch share/zoneinfo/asia patch share/zoneinfo/australasia patch Update timezone definitions to tzdata2012g from ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz Changes from tzdata2012f to tzdata2012g: Samoa fall 2012 and later. (Thanks to Nicholas Pereira and Robert Elz.) Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #1461] To generate a diff of this commit: cvs rdiff -u -r1.486.2.18 -r1.486.2.19 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.40.2.5 -r1.1.1.40.2.6 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.9 -r1.11.2.10 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.486.2.18 src/doc/3RDPARTY:1.486.2.19 --- src/doc/3RDPARTY:1.486.2.18 Sun Sep 30 18:22:41 2012 +++ src/doc/3RDPARTY Tue Oct 23 23:43:08 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.18 2012/09/30 18:22:41 bouyer Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.19 2012/10/23 23:43:08 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,10 +845,9 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012f -Current Vers: tzcode2012f / tzdata2012f -Maintainer: Arthur David Olson a...@elsie.nci.nih.gov -Maintainer: Robert Elz k...@munnari.oz.au +Version: tzcode2004a / tzdata2012g +Current Vers: tzcode2012g / tzdata2012g +Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Old Archive Site: ftp://elsie.nci.nih.gov/pub/ Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.40.2.5 src/share/zoneinfo/asia:1.1.1.40.2.6 --- src/share/zoneinfo/asia:1.1.1.40.2.5 Sat Sep 15 09:04:07 2012 +++ src/share/zoneinfo/asia Tue Oct 23 23:43:09 2012 @@ -2293,6 +2293,8 @@ Rule Palestine 2010 only - Aug 11 0:00 0 # From Arthur David Olson (2011-09-20): # 2011 transitions per http://www.timeanddate.com as of 2011-09-20. +# From Paul Eggert (2012-10-12): +# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2303,7 +2305,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct 2:00 Palestine EE%sT 2011 Apr 2 12:01 2:00 1:00 EEST 2011 Aug 1 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET Zone Asia/Hebron 2:20:23 - LMT 1900 Oct @@ -2318,7 +2320,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct 2:00 - EET 2011 Aug 30 2:00 1:00 EEST 2011 Sep 30 3:00 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 3:00 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET # Paracel Is Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.11.2.9 src/share/zoneinfo/australasia:1.11.2.10 --- src/share/zoneinfo/australasia:1.11.2.9 Sun Sep 30 18:22:41 2012 +++ src/share/zoneinfo/australasia Tue Oct 23 23:43:09 2012 @@ -628,6 +628,23 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 # seasons, there is not yet any indication that this trend will continue on # a regular basis. For now, we have explicitly listed the transitions below. +# +# From Nicky (2012-09-10): +# Daylight Saving Time commences on Sunday 30th September 2012 and +# ends on Sunday 7th of April 2013. +# +# Please find link below for more information. +# http://www.mcil.gov.ws/mcil_publications.html +# +# That publication also includes dates for Summer of 2013/4 as well +# which give the impression of a pattern in selecting dates for the +# future, so for now, we will guess this will continue. + +# Western Samoa +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule WS 2012 max - Sep lastSun 3:00 1 D +Rule WS 2012 max - Apr Sun=1 4:00 0 - +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time @@ -635,8 +652,8 @@ Zone Pacific/Apia 12:33:04 - LMT 1879 J -11:00 1:00 WSDT 2011 Apr 2 4:00 -11:00 - WST 2011 Sep 24 3:00 -11:00 1:00 WSDT 2011 Dec 30 - 13:00 1:00 WSDT 2012 Apr 1 4:00 - 13:00 - WST + 13:00 1:00 WSDT 2012 Apr Sun=1 4:00 + 13:00 WS WS%sT # Solomon Is # excludes Bougainville, for which see Papua New Guinea
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 23:43:31 UTC 2012 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Ticket 1461. To generate a diff of this commit: cvs rdiff -u -r1.1.2.252 -r1.1.2.253 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.252 src/doc/CHANGES-4.1:1.1.2.253 --- src/doc/CHANGES-4.1:1.1.2.252 Tue Oct 23 23:38:54 2012 +++ src/doc/CHANGES-4.1 Tue Oct 23 23:43:31 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.252 2012/10/23 23:38:54 riz Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.253 2012/10/23 23:43:31 riz Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4774,3 +4774,15 @@ bin/pax/ftree.c 1.42 Deal properly with empty lines in spec file. [msaitoh, ticket #1459] +doc/3RDPARTYpatch +share/zoneinfo/asia patch +share/zoneinfo/australasia patch + +Update timezone definitions to tzdata2012g from +ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz +Changes from tzdata2012f to tzdata2012g: +Samoa fall 2012 and later. (Thanks to Nicholas Pereira +and Robert Elz.) +Palestine fall 2012. (Thanks to Steffen Thorsen.) +[apb, ticket #1461] +
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Tue Oct 23 23:44:17 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-0]: asia australasia Log Message: doc/3RDPARTYpatch share/zoneinfo/asia patch share/zoneinfo/australasia patch Update timezone definitions to tzdata2012g from ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz Changes from tzdata2012f to tzdata2012g: Samoa fall 2012 and later. (Thanks to Nicholas Pereira and Robert Elz.) Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #1461] To generate a diff of this commit: cvs rdiff -u -r1.486.2.9.2.9 -r1.486.2.9.2.10 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.40.2.1.2.4 -r1.1.1.40.2.1.2.5 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.4.2.5 -r1.11.2.4.2.6 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.486.2.9.2.9 src/doc/3RDPARTY:1.486.2.9.2.10 --- src/doc/3RDPARTY:1.486.2.9.2.9 Sun Sep 30 18:23:36 2012 +++ src/doc/3RDPARTY Tue Oct 23 23:44:16 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.9.2.9 2012/09/30 18:23:36 bouyer Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.9.2.10 2012/10/23 23:44:16 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,10 +845,9 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012f -Current Vers: tzcode2012f / tzdata2012f -Maintainer: Arthur David Olson a...@elsie.nci.nih.gov -Maintainer: Robert Elz k...@munnari.oz.au +Version: tzcode2004a / tzdata2012g +Current Vers: tzcode2012g / tzdata2012g +Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Old Archive Site: ftp://elsie.nci.nih.gov/pub/ Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.40.2.1.2.4 src/share/zoneinfo/asia:1.1.1.40.2.1.2.5 --- src/share/zoneinfo/asia:1.1.1.40.2.1.2.4 Sat Sep 15 09:03:52 2012 +++ src/share/zoneinfo/asia Tue Oct 23 23:44:16 2012 @@ -2293,6 +2293,8 @@ Rule Palestine 2010 only - Aug 11 0:00 0 # From Arthur David Olson (2011-09-20): # 2011 transitions per http://www.timeanddate.com as of 2011-09-20. +# From Paul Eggert (2012-10-12): +# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2303,7 +2305,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct 2:00 Palestine EE%sT 2011 Apr 2 12:01 2:00 1:00 EEST 2011 Aug 1 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET Zone Asia/Hebron 2:20:23 - LMT 1900 Oct @@ -2318,7 +2320,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct 2:00 - EET 2011 Aug 30 2:00 1:00 EEST 2011 Sep 30 3:00 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 3:00 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET # Paracel Is Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.11.2.4.2.5 src/share/zoneinfo/australasia:1.11.2.4.2.6 --- src/share/zoneinfo/australasia:1.11.2.4.2.5 Sun Sep 30 18:23:36 2012 +++ src/share/zoneinfo/australasia Tue Oct 23 23:44:16 2012 @@ -628,6 +628,23 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 # seasons, there is not yet any indication that this trend will continue on # a regular basis. For now, we have explicitly listed the transitions below. +# +# From Nicky (2012-09-10): +# Daylight Saving Time commences on Sunday 30th September 2012 and +# ends on Sunday 7th of April 2013. +# +# Please find link below for more information. +# http://www.mcil.gov.ws/mcil_publications.html +# +# That publication also includes dates for Summer of 2013/4 as well +# which give the impression of a pattern in selecting dates for the +# future, so for now, we will guess this will continue. + +# Western Samoa +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule WS 2012 max - Sep lastSun 3:00 1 D +Rule WS 2012 max - Apr Sun=1 4:00 0 - +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time @@ -635,8 +652,8 @@ Zone Pacific/Apia 12:33:04 - LMT 1879 J -11:00 1:00 WSDT 2011 Apr 2 4:00 -11:00 - WST 2011 Sep 24 3:00 -11:00 1:00 WSDT 2011 Dec 30 - 13:00 1:00 WSDT 2012 Apr 1 4:00 - 13:00 - WST + 13:00 1:00 WSDT 2012 Apr Sun=1 4:00 + 13:00 WS WS%sT # Solomon Is # excludes Bougainville, for which see Papua New Guinea
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 23:44:37 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1461. To generate a diff of this commit: cvs rdiff -u -r1.1.2.110 -r1.1.2.111 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.110 src/doc/CHANGES-4.0.2:1.1.2.111 --- src/doc/CHANGES-4.0.2:1.1.2.110 Wed Oct 17 21:05:01 2012 +++ src/doc/CHANGES-4.0.2 Tue Oct 23 23:44:37 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.110 2012/10/17 21:05:01 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.111 2012/10/23 23:44:37 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1486,3 +1486,15 @@ usr.bin/calendar/calendars/calendar.netb note NetBSD 6.0 release [jnemeth, ticket #1460] +doc/3RDPARTYpatch +share/zoneinfo/asia patch +share/zoneinfo/australasia patch + +Update timezone definitions to tzdata2012g from +ftp://ftp.iana.org/tz/releases/tzdata2012g.tar.gz +Changes from tzdata2012f to tzdata2012g: +Samoa fall 2012 and later. (Thanks to Nicholas Pereira +and Robert Elz.) +Palestine fall 2012. (Thanks to Steffen Thorsen.) +[apb, ticket #1461] +
CVS commit: [netbsd-4-0] src/share/misc
Module Name:src Committed By: riz Date: Tue Oct 23 23:52:35 UTC 2012 Modified Files: src/share/misc [netbsd-4-0]: bsd-family-tree Log Message: Pull up following revision(s) (requested by jnemeth in ticket #1462): share/misc/bsd-family-tree: revision 1.45 Sync with FreeBSD rev. 241698. Adds: - FreeBSD 8.32012-04-18 [FBD] - OpenBSD 5.12012-05-01 [OBD] - Mac OS X 10.82012-07-25 [APL] - NetBSD 6.02012-10-17 [NBD] To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.37.8.1 src/share/misc/bsd-family-tree Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/bsd-family-tree diff -u src/share/misc/bsd-family-tree:1.37 src/share/misc/bsd-family-tree:1.37.8.1 --- src/share/misc/bsd-family-tree:1.37 Wed Aug 2 00:33:22 2006 +++ src/share/misc/bsd-family-tree Tue Oct 23 23:52:35 2012 @@ -25,7 +25,7 @@ Seventh Edition (V7)| \/ | 3BSD| | | - 4.0BSD 2.7.9BSD + 4.0BSD2.79BSD | | 4.1BSD -- 2.8BSD | | @@ -62,9 +62,9 @@ Tenth Edition | || 4.4BSD| ||/ | | || 4.4BSD-Encumbered | | - | - NetBSD 0.8| BSD/386 1.0 - | / | | | -FreeBSD 1.0 ' NetBSD 0.9| BSD/386 1.1 + | NetBSD 0.8| BSD/386 1.0 + || | | +FreeBSD 1.0 NetBSD 0.9| BSD/386 1.1 || .- 4.4BSD Lite | FreeBSD 1.1 | / / | \ | || / /| \ | @@ -151,7 +151,7 @@ FreeBSD 4.0 | | | | | NetBSD 1. | FreeBSD 4.5 || ||| | | | \ | ||| BSD/OS 4.3 | FreeBSD 4.6 \ | ||OpenBSD 3.1 | - | | \ | | NetBSD 1.5.3| | + | | \ | | NetBSD 1.5.3| | | FreeBSD 4.6.2 Mac OS X | | | | |10.2| | | | FreeBSD 4.7 | | | | @@ -169,12 +169,12 @@ FreeBSD 4.0 | | | | | NetBSD 1. | FreeBSD 4.10 | | | | | | | | | | | FreeBSD 4.11 | | | | - | | | | | | - | v `-|--|-|-. + | | | | | + | `-|--|-|-. || | | \ FreeBSD 5.0 | | | | || | | | -FreeBSD 5.1 | | | DragonFly 1.0 +FreeBSD 5.1 | | | DragonFly 1.0 | \ | | | | | - Mac OS X | | | | 10.3| | | @@ -185,7 +185,7 @@ FreeBSD 5.2 | | *---FreeBSD 5.3 | | | | | || | OpenBSD 3.6 | | || NetBSD 2.0 | | - | || | | || DragonFly 1.2.0 + | || | | ||DragonFly 1.2.0 | | Mac OS X | | NetBSD 2.0.2 | | | | 10.4| | || | | FreeBSD 5.4 | | | || | @@ -198,14 +198,67 @@ FreeBSD 5.2 | | | | || | NetBSD 2.1 | | | | || | | | | | || NetBSD 3.0 | | - | | || ||| DragonFly 1.4.0 - | | || ||OpenBSD 3.9 | - | FreeBSD || |||
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 23:56:51 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1462. To generate a diff of this commit: cvs rdiff -u -r1.1.2.111 -r1.1.2.112 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.111 src/doc/CHANGES-4.0.2:1.1.2.112 --- src/doc/CHANGES-4.0.2:1.1.2.111 Tue Oct 23 23:44:37 2012 +++ src/doc/CHANGES-4.0.2 Tue Oct 23 23:56:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.111 2012/10/23 23:44:37 riz Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.112 2012/10/23 23:56:51 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1498,3 +1498,8 @@ share/zoneinfo/australasia Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #1461] +share/misc/bsd-family-tree 1.45 via patch + + Update the family tree for NetBSD 6. + [jnemeth, ticket #1462] +
CVS commit: [netbsd-4] src/share/misc
Module Name:src Committed By: riz Date: Tue Oct 23 23:57:45 UTC 2012 Modified Files: src/share/misc [netbsd-4]: bsd-family-tree Log Message: Pull up following revision(s) (requested by jnemeth in ticket #1462): share/misc/bsd-family-tree: revision 1.45 Sync with FreeBSD rev. 241698. Adds: - FreeBSD 8.32012-04-18 [FBD] - OpenBSD 5.12012-05-01 [OBD] - Mac OS X 10.82012-07-25 [APL] - NetBSD 6.02012-10-17 [NBD] To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.37.4.1 src/share/misc/bsd-family-tree Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/bsd-family-tree diff -u src/share/misc/bsd-family-tree:1.37 src/share/misc/bsd-family-tree:1.37.4.1 --- src/share/misc/bsd-family-tree:1.37 Wed Aug 2 00:33:22 2006 +++ src/share/misc/bsd-family-tree Tue Oct 23 23:57:45 2012 @@ -25,7 +25,7 @@ Seventh Edition (V7)| \/ | 3BSD| | | - 4.0BSD 2.7.9BSD + 4.0BSD2.79BSD | | 4.1BSD -- 2.8BSD | | @@ -62,9 +62,9 @@ Tenth Edition | || 4.4BSD| ||/ | | || 4.4BSD-Encumbered | | - | - NetBSD 0.8| BSD/386 1.0 - | / | | | -FreeBSD 1.0 ' NetBSD 0.9| BSD/386 1.1 + | NetBSD 0.8| BSD/386 1.0 + || | | +FreeBSD 1.0 NetBSD 0.9| BSD/386 1.1 || .- 4.4BSD Lite | FreeBSD 1.1 | / / | \ | || / /| \ | @@ -151,7 +151,7 @@ FreeBSD 4.0 | | | | | NetBSD 1. | FreeBSD 4.5 || ||| | | | \ | ||| BSD/OS 4.3 | FreeBSD 4.6 \ | ||OpenBSD 3.1 | - | | \ | | NetBSD 1.5.3| | + | | \ | | NetBSD 1.5.3| | | FreeBSD 4.6.2 Mac OS X | | | | |10.2| | | | FreeBSD 4.7 | | | | @@ -169,12 +169,12 @@ FreeBSD 4.0 | | | | | NetBSD 1. | FreeBSD 4.10 | | | | | | | | | | | FreeBSD 4.11 | | | | - | | | | | | - | v `-|--|-|-. + | | | | | + | `-|--|-|-. || | | \ FreeBSD 5.0 | | | | || | | | -FreeBSD 5.1 | | | DragonFly 1.0 +FreeBSD 5.1 | | | DragonFly 1.0 | \ | | | | | - Mac OS X | | | | 10.3| | | @@ -185,7 +185,7 @@ FreeBSD 5.2 | | *---FreeBSD 5.3 | | | | | || | OpenBSD 3.6 | | || NetBSD 2.0 | | - | || | | || DragonFly 1.2.0 + | || | | ||DragonFly 1.2.0 | | Mac OS X | | NetBSD 2.0.2 | | | | 10.4| | || | | FreeBSD 5.4 | | | || | @@ -198,14 +198,67 @@ FreeBSD 5.2 | | | | || | NetBSD 2.1 | | | | || | | | | | || NetBSD 3.0 | | - | | || ||| DragonFly 1.4.0 - | | || ||OpenBSD 3.9 | - | FreeBSD || |||
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: riz Date: Tue Oct 23 23:58:09 UTC 2012 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Ticket 1462. To generate a diff of this commit: cvs rdiff -u -r1.1.2.253 -r1.1.2.254 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.253 src/doc/CHANGES-4.1:1.1.2.254 --- src/doc/CHANGES-4.1:1.1.2.253 Tue Oct 23 23:43:31 2012 +++ src/doc/CHANGES-4.1 Tue Oct 23 23:58:09 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.253 2012/10/23 23:43:31 riz Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.254 2012/10/23 23:58:09 riz Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4786,3 +4786,8 @@ share/zoneinfo/australasia Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #1461] +share/misc/bsd-family-tree 1.45 via patch + + Update the family tree for NetBSD 6. + [jnemeth, ticket #1462] +
CVS commit: src/lib/libc/time
Module Name:src
Committed By: christos
Date: Wed Oct 24 00:10:03 UTC 2012
Modified Files:
src/lib/libc/time: Makefile asctime.c ialloc.c localtime.c private.h
scheck.c strftime.c zdump.c zic.c
Log Message:
apply 2012g via patch
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/time/Makefile
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/time/asctime.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/time/ialloc.c
cvs rdiff -u -r1.67 -r1.68 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.26 -r1.27 src/lib/libc/time/private.h
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/time/scheck.c
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/time/strftime.c
cvs rdiff -u -r1.25 -r1.26 src/lib/libc/time/zdump.c
cvs rdiff -u -r1.30 -r1.31 src/lib/libc/time/zic.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/libc/time/Makefile
diff -u src/lib/libc/time/Makefile:1.6 src/lib/libc/time/Makefile:1.7
--- src/lib/libc/time/Makefile:1.6 Thu Aug 9 08:38:25 2012
+++ src/lib/libc/time/Makefile Tue Oct 23 20:10:03 2012
@@ -3,7 +3,7 @@
# 2009-05-17 by Arthur David Olson.
# Version numbers of the code and data distributions.
-VERSION = 2012e
+VERSION = 2012g
# Change the line below for your time zone (after finding the zone you want in
# the time zone files, or adding it to a time zone file).
@@ -120,10 +120,18 @@ LDLIBS=
# -DZIC_MAX_ABBR_LEN_WO_WARN=3
# (or some other number) to set the maximum time zone abbreviation length
# that zic will accept without a warning (the default is 6)
-GCC_DEBUG_FLAGS = -Dlint -g -O3 -fno-common \
- -Wall -Wcast-qual -Wconversion -Wmissing-prototypes \
- -Wnested-externs -Wpointer-arith -Wshadow \
- -Wtraditional # -Wstrict-prototypes -Wwrite-strings
+GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \
+ -Wall -Wextra \
+ -Wbad-function-cast -Wcast-align -Wcast-qual \
+ -Wformat=2 -Winit-self \
+ -Wmissing-declarations -Wmissing-noreturn -Wmissing-prototypes \
+ -Wnested-externs \
+ -Wno-format-nonliteral -Wno-sign-compare -Wno-sign-conversion \
+ -Wno-type-limits \
+ -Wno-unused-parameter -Woverlength-strings -Wpointer-arith \
+ -Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \
+ -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wtrampolines \
+ -Wwrite-strings
#
# If you want to use System V compatibility code, add
# -DUSG_COMPAT
@@ -276,7 +284,8 @@ NEWUCBSRCS= date.c strftime.c
SOURCES= $(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) tzselect.ksh
MANS= newctime.3 newstrftime.3 newtzset.3 time2posix.3 \
tzfile.5 tzselect.8 zic.8 zdump.8
-DOCS= README Theory $(MANS) date.1 Makefile
+COMMON= Makefile
+DOCS= README Theory $(MANS) date.1
PRIMARY_YDATA= africa antarctica asia australasia \
europe northamerica southamerica
YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward
@@ -289,7 +298,7 @@ WEB_PAGES= tz-art.htm tz-link.htm
MISC= usno1988 usno1989 usno1989a usno1995 usno1997 usno1998 \
$(WEB_PAGES) checktab.awk workman.sh \
zoneinfo2tdf.pl
-ENCHILADA= $(DOCS) $(SOURCES) $(DATA) $(MISC)
+ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC)
# And for the benefit of csh users on systems that assume the user
# shell should be used to handle commands in Makefiles. . .
@@ -437,10 +446,11 @@ public: $(ENCHILADA) set-timestamps
done
$(AWK) -f checktab.awk $(PRIMARY_YDATA)
LC_ALL=C export LC_ALL \
- tar $(TARFLAGS) -cf - $(DOCS) $(SOURCES) $(MISC) *.[1-8].txt | \
+ tar $(TARFLAGS) -cf - \
+ $(COMMON) $(DOCS) $(SOURCES) $(MISC) *.[1-8].txt | \
gzip $(GZIPFLAGS) tzcode$(VERSION).tar.gz
LC_ALL=C export LC_ALL \
- tar $(TARFLAGS) -cf - $(DATA) | \
+ tar $(TARFLAGS) -cf - $(COMMON) $(DATA) | \
gzip $(GZIPFLAGS) tzdata$(VERSION).tar.gz
typecheck:
Index: src/lib/libc/time/asctime.c
diff -u src/lib/libc/time/asctime.c:1.15 src/lib/libc/time/asctime.c:1.16
--- src/lib/libc/time/asctime.c:1.15 Mon Jun 25 18:32:46 2012
+++ src/lib/libc/time/asctime.c Tue Oct 23 20:10:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: asctime.c,v 1.15 2012/06/25 22:32:46 abs Exp $ */
+/* $NetBSD: asctime.c,v 1.16 2012/10/24 00:10:03 christos Exp $ */
/*
** This file is in the public domain, so clarified as of
@@ -16,7 +16,7 @@
#if 0
static char elsieid[] = @(#)asctime.c 8.5;
#else
-__RCSID($NetBSD: asctime.c,v 1.15 2012/06/25 22:32:46 abs Exp $);
+__RCSID($NetBSD: asctime.c,v 1.16 2012/10/24 00:10:03 christos Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -94,7 +94,7 @@ static char buf_asctime[MAX_ASCTIME_BUF_
#define ASCTIME_BUFLEN (3 * 2 + 5 * INT_STRLEN_MAXIMUM(int) + 3 + 2 + 1 + 1)
char *
-asctime_r(const struct tm * timeptr, char * buf)
+asctime_r(const struct tm *timeptr, char *buf)
{
static const char *wday_name[7] = {
Sun, Mon, Tue, Wed, Thu, Fri, Sat
Index: src/lib/libc/time/ialloc.c
diff -u src/lib/libc/time/ialloc.c:1.7 src/lib/libc/time/ialloc.c:1.8
---
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Oct 24 00:12:09 UTC 2012 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: update for tzcode2012g To generate a diff of this commit: cvs rdiff -u -r1.975 -r1.976 src/doc/3RDPARTY cvs rdiff -u -r1.1751 -r1.1752 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.975 src/doc/3RDPARTY:1.976 --- src/doc/3RDPARTY:1.975 Thu Oct 18 04:59:00 2012 +++ src/doc/3RDPARTY Tue Oct 23 20:12:08 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.975 2012/10/18 08:59:00 apb Exp $ +# $NetBSD: 3RDPARTY,v 1.976 2012/10/24 00:12:08 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1189,7 +1189,7 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2012f / tzdata2012g +Version: tzcode2012g / tzdata2012g Current Vers: tzcode2012g / tzdata2012g Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ @@ -1202,7 +1202,7 @@ License: Public domain Location: lib/libc/time,share/zoneinfo Notes: Use src/lib/libc/time/tzcode2netbsd to prepare the source tree for import. -The tzcode2011i - 2012e patch was applied by hand, since we have too +The tzcode2012f - 2012g patch was applied by hand, since we have too many diffs (re-entrant tzcode) to apply. The diffs have been submitted upstream but there is too much inertia to apply them. Check for .gitignore files. Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1751 src/doc/CHANGES:1.1752 --- src/doc/CHANGES:1.1751 Mon Oct 22 06:37:44 2012 +++ src/doc/CHANGES Tue Oct 23 20:12:08 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1751 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1752 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -131,3 +131,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: kernel: Added experimental support for the (mostly SSD specific) discard, or ATA TRIM command to wd(4) and ffs [drochner 20121019] + zoneinfo: Import tzcode2012g. [christos 20121023]
CVS commit: src/lib/libc/time
Module Name:src
Committed By: christos
Date: Wed Oct 24 00:30:53 UTC 2012
Modified Files:
src/lib/libc/time: zic.c
Log Message:
remove error(1) output.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/time/zic.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/libc/time/zic.c
diff -u src/lib/libc/time/zic.c:1.31 src/lib/libc/time/zic.c:1.32
--- src/lib/libc/time/zic.c:1.31 Tue Oct 23 20:10:03 2012
+++ src/lib/libc/time/zic.c Tue Oct 23 20:30:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: zic.c,v 1.31 2012/10/24 00:10:03 christos Exp $ */
+/* $NetBSD: zic.c,v 1.32 2012/10/24 00:30:52 christos Exp $ */
/*
** This file is in the public domain, so clarified as of
** 2006-07-17 by Arthur David Olson.
@@ -10,7 +10,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: zic.c,v 1.31 2012/10/24 00:10:03 christos Exp $);
+__RCSID($NetBSD: zic.c,v 1.32 2012/10/24 00:30:52 christos Exp $);
#endif /* !defined lint */
#include version.h
@@ -2023,9 +2023,6 @@ outzone(const struct zone *const zpfirst
if (zp-z_nrules == 0) {
stdoff = zp-z_stdoff;
doabbr(startbuf, max_abbr_len + 1, zp-z_format,
-/*###2025 [cc] error: passing argument 4 of 'doabbr' makes integer from pointer without a cast%%%*/
-/*###2025 [cc] error: passing argument 2 of 'doabbr' makes pointer from integer without a cast%%%*/
-/*###2025 [cc] error: too many arguments to function 'doabbr'%%%*/
NULL, stdoff != 0, FALSE);
type = addtype(oadd(zp-z_gmtoff, stdoff),
startbuf, stdoff != 0, startttisstd,
@@ -2114,9 +2111,6 @@ outzone(const struct zone *const zpfirst
zp-z_format,
rp-r_abbrvar,
rp-r_stdoff != 0,
-/*###2113 [cc] error: too many arguments to function 'doabbr'%%%*/
-/*###2113 [cc] error: passing argument 4 of 'doabbr' makes integer from pointer without a cast%%%*/
-/*###2113 [cc] error: passing argument 2 of 'doabbr' makes pointer from integer without a cast%%%*/
FALSE);
continue;
}
@@ -2129,18 +2123,12 @@ outzone(const struct zone *const zpfirst
rp-r_abbrvar,
rp-r_stdoff !=
0,
-/*###2125 [cc] error: passing argument 4 of 'doabbr' makes integer from pointer without a cast%%%*/
-/*###2125 [cc] error: too many arguments to function 'doabbr'%%%*/
-/*###2125 [cc] error: passing argument 2 of 'doabbr' makes pointer from integer without a cast%%%*/
FALSE);
}
}
eats(zp-z_filename, zp-z_linenum,
rp-r_filename, rp-r_linenum);
doabbr(ab, max_abbr_len+1, zp-z_format, rp-r_abbrvar,
-/*###2131 [cc] error: too many arguments to function 'doabbr'%%%*/
-/*###2131 [cc] error: passing argument 2 of 'doabbr' makes pointer from integer without a cast%%%*/
-/*###2131 [cc] error: passing argument 4 of 'doabbr' makes integer from pointer without a cast%%%*/
rp-r_stdoff != 0, FALSE);
offset = oadd(zp-z_gmtoff, rp-r_stdoff);
type = addtype(offset, ab, rp-r_stdoff != 0,
CVS commit: src/sbin/chown
Module Name:src Committed By: enami Date: Wed Oct 24 01:12:52 UTC 2012 Modified Files: src/sbin/chown: chown.c Log Message: The id chgrp command is required to change is not uid but gid. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sbin/chown/chown.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/chown/chown.c diff -u src/sbin/chown/chown.c:1.7 src/sbin/chown/chown.c:1.8 --- src/sbin/chown/chown.c:1.7 Tue Oct 23 17:55:46 2012 +++ src/sbin/chown/chown.c Wed Oct 24 01:12:51 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: chown.c,v 1.7 2012/10/23 17:55:46 christos Exp $ */ +/* $NetBSD: chown.c,v 1.8 2012/10/24 01:12:51 enami Exp $ */ /* * Copyright (c) 1988, 1993, 1994, 2003 @@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19 #if 0 static char sccsid[] = @(#)chown.c 8.8 (Berkeley) 4/4/94; #else -__RCSID($NetBSD: chown.c,v 1.7 2012/10/23 17:55:46 christos Exp $); +__RCSID($NetBSD: chown.c,v 1.8 2012/10/24 01:12:51 enami Exp $); #endif #endif /* not lint */ @@ -181,9 +181,9 @@ main(int argc, char **argv) if (stat(reference, st) == -1) err(EXIT_FAILURE, Cannot stat `%s', reference); - uid = st.st_uid; if (ischown) - gid = st.st_gid; + uid = st.st_uid; + gid = st.st_gid; } if ((ftsp = fts_open(argv, fts_options, NULL)) == NULL)
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/bin/netpgpverify
Module Name:src
Committed By: agc
Date: Wed Oct 24 02:18:57 UTC 2012
Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify [agc-netpgp-standalone]:
Makefile expected36 expected37 expected38 expected39 expected40
expected41 expected42 expected43
Added Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify [agc-netpgp-standalone]:
expected16 expected17 expected18 expected19 expected20 expected21
expected22 expected23 expected24 expected25 expected26 expected27
expected28 expected29 expected30 expected31 expected32 expected33
expected34 expected35 expected44 expected45 in1.asc in2.asc in2.gpg
Log Message:
get rid of RCS Ids in test files - both input and expected output
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r0 -r1.1.2.1 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected16 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected17 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected18 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected19 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected20 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected21 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected22 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected23 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected24 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected25 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected26 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected27 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected28 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected29 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected30 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected31 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected32 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected33 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected34 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected35 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected44 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected45 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/in1.asc \
src/crypto/external/bsd/netpgp/bin/netpgpverify/in2.asc \
src/crypto/external/bsd/netpgp/bin/netpgpverify/in2.gpg
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected36 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected37 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected38 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected39 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected40 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected41 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected42 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/expected43
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/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.1.2.4 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.1.2.5
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.1.2.4 Tue Oct 23 15:00:56 2012
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Wed Oct 24 02:18:56 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.4 2012/10/23 15:00:56 agc Exp $
+# $NetBSD: Makefile,v 1.1.2.5 2012/10/24 02:18:56 agc Exp $
.include bsd.own.mk
@@ -108,3 +108,9 @@ t: ${PROG}
env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg -c cat in1.asc output43
diff expected43 output43
rm -f output43
+ env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg in2.gpg output44
+ diff expected44 output44
+ rm -f output44
+ env LD_LIBRARY_PATH=${LIBNETPGPVERIFYDIR} ./${PROG} -k dsa-pubring.gpg in2.asc output45
+ diff expected45 output45
+ rm -f output45
Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/expected36
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/expected36:1.1.2.1 src/crypto/external/bsd/netpgp/bin/netpgpverify/expected36:1.1.2.2
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/expected36:1.1.2.1 Tue Oct 23 15:00:56 2012
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/expected36 Wed Oct 24 02:18:56 2012
@@ -1,5 +1,5 @@
-Good signature for in1.gpg made Sun Oct 21 19:36:06 2012
-signature 3072/DSA 263fe78562e2fc7e 2012-10-21
+Good signature for in1.gpg made Mon Oct 22 04:45:41 2012
+signature 2048/DSA 263fe78562e2fc7e 2012-10-21
fingerprint: d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e
uid David Armstrong (Test DSA key - do not use)
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/dist/src/libverify
Module Name:src
Committed By: agc
Date: Wed Oct 24 02:27:25 UTC 2012
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/libverify
[agc-netpgp-standalone]:
libverify.c pgpsum.c verify.h
Log Message:
various improvements in netpgpverify:
+ store the revocation code in the signature
+ attempt to be bug compatible with gpg - if a signature on a text
document does not match the first time, try again, this time trimming
trailing white space (' ' and '\t' characters) from the text document.
this makes the verification work the same as gpg. this behavior is
not activated for binary documents. i have absolutely no idea why
this is done in the first place; christoph badura thinks it may be to
do with original pgp compatibility. this and the stripping of the
trailing \r\n on text document digest calculation make no sense to me.
+ only compare the leading Q bits (i.e. the length of the DSA Q
value) when verifying a DSA signature, per RFC 4880. helps with
sha256 digests and smaller keys.
+ calculate the displayed size of DSA keys a bit differently, no functional
difference.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 \
src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \
src/crypto/external/bsd/netpgp/dist/src/libverify/pgpsum.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 \
src/crypto/external/bsd/netpgp/dist/src/libverify/verify.h
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/libverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.1.2.6 src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.1.2.7
--- src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.1.2.6 Tue Oct 23 15:00:56 2012
+++ src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c Wed Oct 24 02:27:25 2012
@@ -713,10 +713,10 @@ static int
read_sig_subpackets(pgpv_sigpkt_t *sigpkt, uint8_t *p, size_t pktlen)
{
pgpv_sigsubpkt_t subpkt;
- const int is_subpkt = 0;
- unsigned lenlen;
- unsigned i;
- uint8_t *start;
+ const int is_subpkt = 0;
+ unsigned lenlen;
+ unsigned i;
+ uint8_t *start;
start = p;
for (i = 0 ; (unsigned)(p - start) sigpkt-subslen ; i++) {
@@ -784,6 +784,7 @@ read_sig_subpackets(pgpv_sigpkt_t *sigpk
sigpkt-sig.features = (char *)(void *)p;
break;
case SUBPKT_REVOCATION_REASON:
+ sigpkt-sig.revoked = *p++ + 1;
sigpkt-sig.why_revoked = (char *)(void *)p;
break;
default:
@@ -1326,16 +1327,7 @@ numkeybits(const pgpv_pubkey_t *pubkey)
return pubkey-bn[RSA_N].bits;
case PUBKEY_DSA:
case PUBKEY_ECDSA:
- switch(BITS_TO_BYTES(pubkey-bn[DSA_Q].bits)) {
- case 20:
- return 1024;
- case 28:
- return 2048;
- case 32:
- return 3072;
- default:
- return 0;
- }
+ return BITS_TO_BYTES(pubkey-bn[DSA_Q].bits) * 64;
case PUBKEY_ELGAMAL_ENCRYPT:
case PUBKEY_ELGAMAL_ENCRYPT_OR_SIGN:
return pubkey-bn[ELGAMAL_P].bits;
@@ -1356,6 +1348,7 @@ fmt_pubkey(char *s, size_t size, pgpv_pu
if (pubkey-expiry) {
cc += fmt_time(s[cc], size - cc, [Expiry , pubkey-birth + pubkey-expiry, ], 0);
}
+ /* XXX - revoked? */
cc += snprintf(s[cc], size - cc, \n);
cc += fmt_fingerprint(s[cc], size - cc, pubkey-fingerprint, fingerprint: );
return cc;
@@ -1451,18 +1444,23 @@ rsa_verify(uint8_t *calculated, unsigned
return memcmp(decrypted[i + prefixlen], calculated, calclen) == 0;
}
+#define BAD_BIGNUM(s, k) \
+ (BN_is_zero((s)-bn) || BN_is_negative((s)-bn) || BN_cmp((s)-bn, (k)-bn) = 0)
+
#ifndef DSA_MAX_MODULUS_BITS
#define DSA_MAX_MODULUS_BITS 1
#endif
/* verify DSA signature */
static int
-verify_dsa_verify(uint8_t *calculated, unsigned calclen, pgpv_bignum_t *sig, pgpv_pubkey_t *pubkey)
+verify_dsa_sig(uint8_t *calculated, unsigned calclen, pgpv_bignum_t *sig, pgpv_pubkey_t *pubkey)
{
unsigned qbits;
BIGNUM *M;
BIGNUM *W;
BIGNUM *t1;
+ uint8_t calcnum[128];
+ uint8_t signum[128];
int ret;
if (pubkey[DSA_P].bn == NULL || pubkey[DSA_Q].bn == NULL || pubkey[DSA_G].bn == NULL) {
@@ -1489,8 +1487,8 @@ verify_dsa_verify(uint8_t *calculated, u
}
ret = 0;
if ((M = BN_new()) == NULL || (W = BN_new()) == NULL || (t1 = BN_new()) == NULL ||
- BN_is_zero(sig[DSA_R].bn) || BN_is_negative(sig[DSA_R].bn) || BN_cmp(sig[DSA_R].bn, pubkey-bn[DSA_Q].bn) = 0 ||
- BN_is_zero(sig[DSA_S].bn) || BN_is_negative(sig[DSA_S].bn) || BN_cmp(sig[DSA_S].bn, pubkey-bn[DSA_Q].bn) = 0 ||
+ BAD_BIGNUM(sig[DSA_R], pubkey-bn[DSA_Q]) ||
+ BAD_BIGNUM(sig[DSA_S], pubkey-bn[DSA_Q]) ||
BN_mod_inverse(W, sig[DSA_S].bn, pubkey-bn[DSA_Q].bn, NULL) == NULL) {
goto done;
}
@@ -1506,7 +1504,10 @@ verify_dsa_verify(uint8_t *calculated, u
!BN_div(NULL, t1, t1, pubkey-bn[DSA_Q].bn, NULL)) {
goto done;
}
- ret = (BN_cmp(t1, sig[DSA_R].bn) ==
CVS commit: src/usr.bin/touch
Module Name:src Committed By: pgoyette Date: Wed Oct 24 02:46:25 UTC 2012 Modified Files: src/usr.bin/touch: touch.1 Log Message: Note that -d, -r, and -t are mutually exclusive and only the last one is used. While here, alphabetize the other list of r/d/t flags. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/usr.bin/touch/touch.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/touch/touch.1 diff -u src/usr.bin/touch/touch.1:1.24 src/usr.bin/touch/touch.1:1.25 --- src/usr.bin/touch/touch.1:1.24 Tue Oct 23 20:44:22 2012 +++ src/usr.bin/touch/touch.1 Wed Oct 24 02:46:25 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: touch.1,v 1.24 2012/10/23 20:44:22 wiz Exp $ +.\ $NetBSD: touch.1,v 1.25 2012/10/24 02:46:25 pgoyette Exp $ .\ .\ Copyright (c) 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -138,6 +138,14 @@ If the .Dq SS letter pair is not specified, the value defaults to 0. .El +.Pp +The +.Fl d , +.Fl r , +and +.Fl t +options are mutually exclusive. +If more than one of these options is present, the last one is used. .Sh EXIT STATUS .Ex -std .Sh COMPATIBILITY @@ -145,8 +153,8 @@ The obsolescent form of .Nm , where a time format is specified as the first argument, is supported. When no -.Fl r , .Fl d , +.Fl r , or .Fl t option is specified, there are at least two arguments, and the first
CVS commit: [netbsd-5] src/sys/dev/raidframe
Module Name:src
Committed By: riz
Date: Wed Oct 24 03:03:53 UTC 2012
Modified Files:
src/sys/dev/raidframe [netbsd-5]: rf_netbsdkintf.c
Log Message:
sys/dev/raidframe/rf_netbsdkintf.c patch
Implement DIOCGSTRATEGY and DIOCSSTRATEGY for raidframe devices.
(The default strategy is not changed)
[buhrow, ticket #1788]
To generate a diff of this commit:
cvs rdiff -u -r1.250.4.12 -r1.250.4.13 src/sys/dev/raidframe/rf_netbsdkintf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.250.4.12 src/sys/dev/raidframe/rf_netbsdkintf.c:1.250.4.13
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.250.4.12 Wed Jun 13 14:00:49 2012
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Wed Oct 24 03:03:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.250.4.12 2012/06/13 14:00:49 sborrill Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.250.4.13 2012/10/24 03:03:53 riz Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -139,7 +139,7 @@
***/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.250.4.12 2012/06/13 14:00:49 sborrill Exp $);
+__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.250.4.13 2012/10/24 03:03:53 riz Exp $);
#include sys/param.h
#include sys/errno.h
@@ -973,7 +973,7 @@ raidioctl(dev_t dev, u_long cmd, void *d
{
int unit = raidunit(dev);
int error = 0;
- int part, pmask;
+ int part, pmask, s;
struct cfdata *cf;
struct raid_softc *rs;
RF_Config_t *k_cfg, *u_cfg;
@@ -1026,6 +1026,7 @@ raidioctl(dev_t dev, u_long cmd, void *d
case DIOCWLABEL:
case DIOCAWEDGE:
case DIOCDWEDGE:
+ case DIOCSSTRATEGY:
if ((flag FWRITE) == 0)
return (EBADF);
}
@@ -1078,6 +1079,8 @@ raidioctl(dev_t dev, u_long cmd, void *d
case RAIDFRAME_PARITYMAP_GET_DISABLE:
case RAIDFRAME_PARITYMAP_SET_DISABLE:
case RAIDFRAME_PARITYMAP_SET_PARAMS:
+ case DIOCGSTRATEGY:
+ case DIOCSSTRATEGY:
if ((rs-sc_flags RAIDF_INITED) == 0)
return (ENXIO);
}
@@ -1840,6 +1843,45 @@ raidioctl(dev_t dev, u_long cmd, void *d
(struct dkwedge_list *)data, l);
case DIOCCACHESYNC:
return rf_sync_component_caches(raidPtr);
+
+ case DIOCGSTRATEGY:
+ {
+ struct disk_strategy *dks = (void *)data;
+
+ s = splbio();
+ strlcpy(dks-dks_name, bufq_getstrategyname(rs-buf_queue),
+ sizeof(dks-dks_name));
+ splx(s);
+ dks-dks_paramlen = 0;
+
+ return 0;
+ }
+
+ case DIOCSSTRATEGY:
+ {
+ struct disk_strategy *dks = (void *)data;
+ struct bufq_state *new;
+ struct bufq_state *old;
+
+ if (dks-dks_param != NULL) {
+ return EINVAL;
+ }
+ dks-dks_name[sizeof(dks-dks_name) - 1] = 0; /* ensure term */
+ error = bufq_alloc(new, dks-dks_name,
+ BUFQ_EXACT|BUFQ_SORT_RAWBLOCK);
+ if (error) {
+ return error;
+ }
+ s = splbio();
+ old = rs-buf_queue;
+ bufq_move(new, old);
+ rs-buf_queue = new;
+ splx(s);
+ bufq_free(old);
+
+ return 0;
+ }
+
default:
retcode = ENOTTY;
}
CVS commit: [netbsd-5] src/share/misc
Module Name:src Committed By: riz Date: Wed Oct 24 03:08:09 UTC 2012 Modified Files: src/share/misc [netbsd-5]: bsd-family-tree Log Message: Pull up following revision(s) (requested by jnemeth in ticket #1804): share/misc/bsd-family-tree: revision 1.45 Sync with FreeBSD rev. 241698. Adds: - FreeBSD 8.32012-04-18 [FBD] - OpenBSD 5.12012-05-01 [OBD] - Mac OS X 10.82012-07-25 [APL] - NetBSD 6.02012-10-17 [NBD] To generate a diff of this commit: cvs rdiff -u -r1.40.12.2 -r1.40.12.3 src/share/misc/bsd-family-tree Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/bsd-family-tree diff -u src/share/misc/bsd-family-tree:1.40.12.2 src/share/misc/bsd-family-tree:1.40.12.3 --- src/share/misc/bsd-family-tree:1.40.12.2 Mon Jan 26 00:52:25 2009 +++ src/share/misc/bsd-family-tree Wed Oct 24 03:08:08 2012 @@ -25,7 +25,7 @@ Seventh Edition (V7)| \/ | 3BSD| | | - 4.0BSD 2.7.9BSD + 4.0BSD2.79BSD | | 4.1BSD -- 2.8BSD | | @@ -62,9 +62,9 @@ Tenth Edition | || 4.4BSD| ||/ | | || 4.4BSD-Encumbered | | - | - NetBSD 0.8| BSD/386 1.0 - | / | | | -FreeBSD 1.0 ' NetBSD 0.9| BSD/386 1.1 + | NetBSD 0.8| BSD/386 1.0 + || | | +FreeBSD 1.0 NetBSD 0.9| BSD/386 1.1 || .- 4.4BSD Lite | FreeBSD 1.1 | / / | \ | || / /| \ | @@ -151,7 +151,7 @@ FreeBSD 4.0 | | | | | NetBSD 1. | FreeBSD 4.5 || ||| | | | \ | ||| BSD/OS 4.3 | FreeBSD 4.6 \ | ||OpenBSD 3.1 | - | | \ | | NetBSD 1.5.3| | + | | \ | | NetBSD 1.5.3| | | FreeBSD 4.6.2 Mac OS X | | | | |10.2| | | | FreeBSD 4.7 | | | | @@ -226,10 +226,39 @@ FreeBSD 5.2 | | | | 6.4 | | | | | | | | | | | FreeBSD 7.1 | | | | - | | | | | | - | V | | | | + | | | | |DragonFly 2.2.0 + | FreeBSD 7.2 | NetBSD 5.0 OpenBSD 4.5 | + | \ | ||| | + | | Mac OS X ||| | + | |10.6||| | + | | | |||DragonFly 2.4.0 + | | | ||OpenBSD 4.6 | + | | | ||| | + *--FreeBSD | | ||| | + |8.0 | | ||| | + | | FreeBSD | ||| | + | | 7.3| |||DragonFly 2.6.0 + | || | ||OpenBSD 4.7 | + | FreeBSD | | ||| | + |8.1 | | ||| | + | || | |||DragonFly 2.8.2 + | || | ||OpenBSD 4.8 | + | || | | NetBSD 5.1 | | + | FreeBSD FreeBSD | | | | + |8.2 7.4| | | DragonFly 2.10.1 + | | | | OpenBSD 4.9 | + | `-. Mac OS X | | | + |\ 10.7| | | + | | | | OpenBSD
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Wed Oct 24 03:08:51 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1788, 1804 To generate a diff of this commit: cvs rdiff -u -r1.1.2.188 -r1.1.2.189 src/doc/CHANGES-5.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.188 src/doc/CHANGES-5.2:1.1.2.189 --- src/doc/CHANGES-5.2:1.1.2.188 Tue Oct 23 23:27:49 2012 +++ src/doc/CHANGES-5.2 Wed Oct 24 03:08:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.188 2012/10/23 23:27:49 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.189 2012/10/24 03:08:51 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -8685,3 +8685,14 @@ share/zoneinfo/australasia patch Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #1803] +sys/dev/raidframe/rf_netbsdkintf.c patch + + Implement DIOCGSTRATEGY and DIOCSSTRATEGY for raidframe devices. + (The default strategy is not changed) + [buhrow, ticket #1788] + +share/misc/bsd-family-tree 1.45 via patch + + Update the family tree for NetBSD 6. + [jnemeth, ticket #1804] +
CVS commit: [netbsd-5-0] src/share/misc
Module Name:src Committed By: riz Date: Wed Oct 24 03:09:07 UTC 2012 Modified Files: src/share/misc [netbsd-5-0]: bsd-family-tree Log Message: Pull up following revision(s) (requested by jnemeth in ticket #1804): share/misc/bsd-family-tree: revision 1.45 Sync with FreeBSD rev. 241698. Adds: - FreeBSD 8.32012-04-18 [FBD] - OpenBSD 5.12012-05-01 [OBD] - Mac OS X 10.82012-07-25 [APL] - NetBSD 6.02012-10-17 [NBD] To generate a diff of this commit: cvs rdiff -u -r1.40.12.2 -r1.40.12.2.2.1 src/share/misc/bsd-family-tree Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/bsd-family-tree diff -u src/share/misc/bsd-family-tree:1.40.12.2 src/share/misc/bsd-family-tree:1.40.12.2.2.1 --- src/share/misc/bsd-family-tree:1.40.12.2 Mon Jan 26 00:52:25 2009 +++ src/share/misc/bsd-family-tree Wed Oct 24 03:09:07 2012 @@ -25,7 +25,7 @@ Seventh Edition (V7)| \/ | 3BSD| | | - 4.0BSD 2.7.9BSD + 4.0BSD2.79BSD | | 4.1BSD -- 2.8BSD | | @@ -62,9 +62,9 @@ Tenth Edition | || 4.4BSD| ||/ | | || 4.4BSD-Encumbered | | - | - NetBSD 0.8| BSD/386 1.0 - | / | | | -FreeBSD 1.0 ' NetBSD 0.9| BSD/386 1.1 + | NetBSD 0.8| BSD/386 1.0 + || | | +FreeBSD 1.0 NetBSD 0.9| BSD/386 1.1 || .- 4.4BSD Lite | FreeBSD 1.1 | / / | \ | || / /| \ | @@ -151,7 +151,7 @@ FreeBSD 4.0 | | | | | NetBSD 1. | FreeBSD 4.5 || ||| | | | \ | ||| BSD/OS 4.3 | FreeBSD 4.6 \ | ||OpenBSD 3.1 | - | | \ | | NetBSD 1.5.3| | + | | \ | | NetBSD 1.5.3| | | FreeBSD 4.6.2 Mac OS X | | | | |10.2| | | | FreeBSD 4.7 | | | | @@ -226,10 +226,39 @@ FreeBSD 5.2 | | | | 6.4 | | | | | | | | | | | FreeBSD 7.1 | | | | - | | | | | | - | V | | | | + | | | | |DragonFly 2.2.0 + | FreeBSD 7.2 | NetBSD 5.0 OpenBSD 4.5 | + | \ | ||| | + | | Mac OS X ||| | + | |10.6||| | + | | | |||DragonFly 2.4.0 + | | | ||OpenBSD 4.6 | + | | | ||| | + *--FreeBSD | | ||| | + |8.0 | | ||| | + | | FreeBSD | ||| | + | | 7.3| |||DragonFly 2.6.0 + | || | ||OpenBSD 4.7 | + | FreeBSD | | ||| | + |8.1 | | ||| | + | || | |||DragonFly 2.8.2 + | || | ||OpenBSD 4.8 | + | || | | NetBSD 5.1 | | + | FreeBSD FreeBSD | | | | + |8.2 7.4| | | DragonFly 2.10.1 + | | | | OpenBSD 4.9 | + | `-. Mac OS X | | | + |\ 10.7| | | + | | | |
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Wed Oct 24 03:09:28 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1804. To generate a diff of this commit: cvs rdiff -u -r1.1.2.85 -r1.1.2.86 src/doc/CHANGES-5.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.85 src/doc/CHANGES-5.0.3:1.1.2.86 --- src/doc/CHANGES-5.0.3:1.1.2.85 Tue Oct 23 23:25:41 2012 +++ src/doc/CHANGES-5.0.3 Wed Oct 24 03:09:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.85 2012/10/23 23:25:41 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.86 2012/10/24 03:09:28 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5145,3 +5145,8 @@ share/zoneinfo/australasia patch Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #1803] +share/misc/bsd-family-tree 1.45 via patch + + Update the family tree for NetBSD 6. + [jnemeth, ticket #1804] +
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/bin/netpgpverify
Module Name:src Committed By: agc Date: Wed Oct 24 03:09:33 UTC 2012 Added Files: src/crypto/external/bsd/netpgp/bin/netpgpverify [agc-netpgp-standalone]: NetBSD-6.0_RC1_hashes.gpg NetBSD-6.0_RC1_hashes_ascii.gpg NetBSD-6.0_RC2_hashes.asc NetBSD-6.0_hashes.asc a.gpg b.gpg gpgsigned-a.gpg in1.gpg jj.asc Log Message: add all of the test input files To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 \ src/crypto/external/bsd/netpgp/bin/netpgpverify/NetBSD-6.0_RC1_hashes.gpg \ src/crypto/external/bsd/netpgp/bin/netpgpverify/NetBSD-6.0_RC1_hashes_ascii.gpg \ src/crypto/external/bsd/netpgp/bin/netpgpverify/NetBSD-6.0_RC2_hashes.asc \ src/crypto/external/bsd/netpgp/bin/netpgpverify/NetBSD-6.0_hashes.asc \ src/crypto/external/bsd/netpgp/bin/netpgpverify/a.gpg \ src/crypto/external/bsd/netpgp/bin/netpgpverify/b.gpg \ src/crypto/external/bsd/netpgp/bin/netpgpverify/gpgsigned-a.gpg \ src/crypto/external/bsd/netpgp/bin/netpgpverify/in1.gpg \ src/crypto/external/bsd/netpgp/bin/netpgpverify/jj.asc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: [netbsd-5-1] src/share/misc
Module Name:src Committed By: riz Date: Wed Oct 24 03:09:45 UTC 2012 Modified Files: src/share/misc [netbsd-5-1]: bsd-family-tree Log Message: Pull up following revision(s) (requested by jnemeth in ticket #1804): share/misc/bsd-family-tree: revision 1.45 Sync with FreeBSD rev. 241698. Adds: - FreeBSD 8.32012-04-18 [FBD] - OpenBSD 5.12012-05-01 [OBD] - Mac OS X 10.82012-07-25 [APL] - NetBSD 6.02012-10-17 [NBD] To generate a diff of this commit: cvs rdiff -u -r1.40.12.2 -r1.40.12.2.6.1 src/share/misc/bsd-family-tree Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/bsd-family-tree diff -u src/share/misc/bsd-family-tree:1.40.12.2 src/share/misc/bsd-family-tree:1.40.12.2.6.1 --- src/share/misc/bsd-family-tree:1.40.12.2 Mon Jan 26 00:52:25 2009 +++ src/share/misc/bsd-family-tree Wed Oct 24 03:09:45 2012 @@ -25,7 +25,7 @@ Seventh Edition (V7)| \/ | 3BSD| | | - 4.0BSD 2.7.9BSD + 4.0BSD2.79BSD | | 4.1BSD -- 2.8BSD | | @@ -62,9 +62,9 @@ Tenth Edition | || 4.4BSD| ||/ | | || 4.4BSD-Encumbered | | - | - NetBSD 0.8| BSD/386 1.0 - | / | | | -FreeBSD 1.0 ' NetBSD 0.9| BSD/386 1.1 + | NetBSD 0.8| BSD/386 1.0 + || | | +FreeBSD 1.0 NetBSD 0.9| BSD/386 1.1 || .- 4.4BSD Lite | FreeBSD 1.1 | / / | \ | || / /| \ | @@ -151,7 +151,7 @@ FreeBSD 4.0 | | | | | NetBSD 1. | FreeBSD 4.5 || ||| | | | \ | ||| BSD/OS 4.3 | FreeBSD 4.6 \ | ||OpenBSD 3.1 | - | | \ | | NetBSD 1.5.3| | + | | \ | | NetBSD 1.5.3| | | FreeBSD 4.6.2 Mac OS X | | | | |10.2| | | | FreeBSD 4.7 | | | | @@ -226,10 +226,39 @@ FreeBSD 5.2 | | | | 6.4 | | | | | | | | | | | FreeBSD 7.1 | | | | - | | | | | | - | V | | | | + | | | | |DragonFly 2.2.0 + | FreeBSD 7.2 | NetBSD 5.0 OpenBSD 4.5 | + | \ | ||| | + | | Mac OS X ||| | + | |10.6||| | + | | | |||DragonFly 2.4.0 + | | | ||OpenBSD 4.6 | + | | | ||| | + *--FreeBSD | | ||| | + |8.0 | | ||| | + | | FreeBSD | ||| | + | | 7.3| |||DragonFly 2.6.0 + | || | ||OpenBSD 4.7 | + | FreeBSD | | ||| | + |8.1 | | ||| | + | || | |||DragonFly 2.8.2 + | || | ||OpenBSD 4.8 | + | || | | NetBSD 5.1 | | + | FreeBSD FreeBSD | | | | + |8.2 7.4| | | DragonFly 2.10.1 + | | | | OpenBSD 4.9 | + | `-. Mac OS X | | | + |\ 10.7| | | + | | | |
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Wed Oct 24 03:10:11 UTC 2012 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Ticket 1804. To generate a diff of this commit: cvs rdiff -u -r1.1.2.26 -r1.1.2.27 src/doc/CHANGES-5.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.26 src/doc/CHANGES-5.1.3:1.1.2.27 --- src/doc/CHANGES-5.1.3:1.1.2.26 Tue Oct 23 23:21:23 2012 +++ src/doc/CHANGES-5.1.3 Wed Oct 24 03:10:11 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.26 2012/10/23 23:21:23 riz Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.27 2012/10/24 03:10:11 riz Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2232,3 +2232,8 @@ share/zoneinfo/australasia patch Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #1803] +share/misc/bsd-family-tree 1.45 via patch + + Update the family tree for NetBSD 6. + [jnemeth, ticket #1804] +
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/bin/netpgpverify
Module Name:src Committed By: agc Date: Wed Oct 24 03:11:17 UTC 2012 Added Files: src/crypto/external/bsd/netpgp/bin/netpgpverify [agc-netpgp-standalone]: det.sig Log Message: add the detached signature as well To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 \ src/crypto/external/bsd/netpgp/bin/netpgpverify/det.sig Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/det.sig
CVS commit: [agc-netpgp-standalone] src/crypto/external/bsd/netpgp/bin/netpgpverify
Module Name:src Committed By: agc Date: Wed Oct 24 03:13:12 UTC 2012 Added Files: src/crypto/external/bsd/netpgp/bin/netpgpverify [agc-netpgp-standalone]: det Log Message: add the detached file to be the input for the detached signature verification To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 \ src/crypto/external/bsd/netpgp/bin/netpgpverify/det Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/det diff -u /dev/null src/crypto/external/bsd/netpgp/bin/netpgpverify/det:1.1.2.1 --- /dev/null Wed Oct 24 03:13:12 2012 +++ src/crypto/external/bsd/netpgp/bin/netpgpverify/det Wed Oct 24 03:13:12 2012 @@ -0,0 +1,16 @@ +To Do += +tests with -k sig +detached sigs +DSA + +Done + +basics +localise pgp_read_packets +fix lint +WARNS=5 +lib man page +prog man page +do we do it statically linked as well? +multiple files in netpgpverify
CVS commit: [netbsd-6-0] src/usr.bin/calendar/calendars
Module Name:src Committed By: riz Date: Wed Oct 24 03:14:37 UTC 2012 Modified Files: src/usr.bin/calendar/calendars [netbsd-6-0]: calendar.netbsd Log Message: Pull up following revision(s) (requested by jnemeth in ticket #611): usr.bin/calendar/calendars/calendar.netbsd: revision 1.22 note NetBSD 6.0 release To generate a diff of this commit: cvs rdiff -u -r1.20.8.1 -r1.20.8.1.4.1 \ src/usr.bin/calendar/calendars/calendar.netbsd 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/calendar/calendars/calendar.netbsd diff -u src/usr.bin/calendar/calendars/calendar.netbsd:1.20.8.1 src/usr.bin/calendar/calendars/calendar.netbsd:1.20.8.1.4.1 --- src/usr.bin/calendar/calendars/calendar.netbsd:1.20.8.1 Mon May 7 16:52:04 2012 +++ src/usr.bin/calendar/calendars/calendar.netbsd Wed Oct 24 03:14:37 2012 @@ -77,6 +77,7 @@ 10/14 NetBSD 4.0.1 released, 2008 10/14 NetBSD/bebox port started, 1997 10/16 NetBSD/playstation2 port started, 2001 +10/17 NetBSD 6.0 released, 2012 10/26 NetBSD 1.0 released, 1994 10/30 pkgsrc/Darwin support added, 2001 10/31 NetBSD 2.0.3 released, 2005
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Wed Oct 24 03:15:04 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Ticket 611. To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-6.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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.4 src/doc/CHANGES-6.0.1:1.1.2.5 --- src/doc/CHANGES-6.0.1:1.1.2.4 Tue Oct 23 20:20:57 2012 +++ src/doc/CHANGES-6.0.1 Wed Oct 24 03:15:04 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.4 2012/10/23 20:20:57 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.5 2012/10/24 03:15:04 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -36,3 +36,8 @@ share/zoneinfo/australasia patch Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #627] +usr.bin/calendar/calendars/calendar.netbsd 1.22 + + Note the date of the NetBSD 6.0 release. + [jnemeth, ticket #611] +
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src
Committed By: riz
Date: Wed Oct 24 03:20:07 UTC 2012
Modified Files:
src/sys/dev/pci [netbsd-6]: pcidevs.h pcidevs_data.h
Log Message:
Regen for ticket 628.
To generate a diff of this commit:
cvs rdiff -u -r1.1097.2.6 -r1.1097.2.7 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1096.2.6 -r1.1096.2.7 src/sys/dev/pci/pcidevs_data.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/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1097.2.6 src/sys/dev/pci/pcidevs.h:1.1097.2.7
--- src/sys/dev/pci/pcidevs.h:1.1097.2.6 Thu Jun 28 16:07:16 2012
+++ src/sys/dev/pci/pcidevs.h Wed Oct 24 03:19:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pcidevs.h,v 1.1097.2.6 2012/06/28 16:07:16 riz Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1097.2.7 2012/10/24 03:19:51 riz Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -3410,6 +3410,7 @@
#define PCI_PRODUCT_SYMBIOS_SAS1068E 0x0058 /* SAS1068E */
#define PCI_PRODUCT_SYMBIOS_SAS1068E_2 0x0059 /* SAS1068E */
#define PCI_PRODUCT_SYMBIOS_SAS1066E 0x005A /* SAS1066E */
+#define PCI_PRODUCT_SYMBIOS_MEGARAID_2208 0x005B /* MegaRAID SAS2208 */
#define PCI_PRODUCT_SYMBIOS_SAS1064A 0x005C /* SAS1064A */
#define PCI_PRODUCT_SYMBIOS_SAS1066 0x005E /* SAS1066 */
#define PCI_PRODUCT_SYMBIOS_SAS1078 0x0060 /* SAS1078 PCI */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1096.2.6 src/sys/dev/pci/pcidevs_data.h:1.1096.2.7
--- src/sys/dev/pci/pcidevs_data.h:1.1096.2.6 Thu Jun 28 16:07:17 2012
+++ src/sys/dev/pci/pcidevs_data.h Wed Oct 24 03:19:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pcidevs_data.h,v 1.1096.2.6 2012/06/28 16:07:17 riz Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1096.2.7 2012/10/24 03:19:52 riz Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -5440,54 +5440,56 @@ static const uint16_t pci_products[] = {
20596, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS1066E,
20605, 0,
+ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_MEGARAID_2208,
+ 8156, 20614, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS1064A,
- 20614, 0,
+ 20622, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS1066,
- 20623, 0,
+ 20631, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS1078,
- 20631, 615, 0,
+ 20639, 615, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS1078_PCIE,
- 20631, 615, 4329, 0,
+ 20639, 615, 4329, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2116_1,
- 20639, 0,
+ 20647, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2116_2,
- 20639, 0,
- PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2308_3,
20647, 0,
- PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2004,
+ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2308_3,
20655, 0,
- PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2008,
+ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2004,
20663, 0,
+ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2008,
+ 20671, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2008_1,
- 8156, 20663, 0,
+ 8156, 20671, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2108_3,
- 20671, 0,
+ 20679, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2108_4,
- 20671, 0,
+ 20679, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2108_5,
- 20671, 0,
+ 20679, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2108_1,
- 8156, 20671, 20679, 20686, 0,
+ 8156, 20679, 20687, 20694, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2108_2,
- 8156, 20671, 20686, 0,
+ 8156, 20679, 20694, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS1078DE,
- 20691, 0,
+ 20699, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2208_1,
- 20701, 0,
+ 20614, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2208_2,
- 20701, 0,
+ 20614, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2208_3,
- 20701, 0,
+ 20614, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2208_4,
- 20701, 0,
+ 20614, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2208_5,
- 20701, 0,
+ 20614, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2208_6,
- 20701, 0,
+ 20614, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2308_1,
- 20647, 0,
+ 20655, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2308_2,
- 20647, 0,
+ 20655, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_875J,
20709, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_FC909,
@@ -9059,7 +9061,7 @@ static const char pci_words[] = { .
(port\0 /* 3 refs @ 8144 */
1)\0 /* 1 refs @ 8150 */
2)\0 /* 1 refs @ 8153 */
- MegaRAID\0 /* 8 refs @ 8156 */
+ MegaRAID\0 /* 9 refs @ 8156 */
Crypto\0 /* 2 refs @ 8165 */
Accelerator\0 /* 17 refs @ 8172 */
ADSP-2141\0 /* 1 refs @ 8184 */
@@
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Wed Oct 24 03:23:46 UTC 2012
Modified Files:
src/etc [netbsd-6]: MAKEDEV.tmpl
src/etc/etc.amd64 [netbsd-6]: MAKEDEV.conf
src/etc/etc.i386 [netbsd-6]: MAKEDEV.conf
src/sys/compat/linux/common [netbsd-6]: linux_ioctl.c
src/sys/conf [netbsd-6]: majors
src/sys/dev/ic [netbsd-6]: mfi.c mfireg.h mfivar.h
Added Files:
src/sys/dev/ic [netbsd-6]: mfiio.h
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #629):
sys/compat/linux/common/linux_ioctl.c: revision 1.57
sys/dev/ic/mfi.c: revision 1.47
sys/conf/majors: revision 1.62
etc/etc.i386/MAKEDEV.conf: revision 1.24
sys/dev/ic/mfivar.h: revision 1.20
etc/MAKEDEV.tmpl: revision 1.159
sys/dev/ic/mfiio.h: revision 1.1
etc/etc.amd64/MAKEDEV.conf: revision 1.19
sys/dev/ic/mfireg.h: revision 1.8
Add a pass-through ioctl for mfi(4), allowing userland to send raw commands
to the controller. This is compatible with the linux and FreeBSD
implementations.
Add the needed conversion for mfi ioctls in COMPAT_LINUX
Allocate a character major number, and create /dev/mfi0 by default
on amd64 and i386.
This allows (along with a hand-created /emul/linux/proc/devices file)
to run the MegaCLI linux binary provided by LSI.
To generate a diff of this commit:
cvs rdiff -u -r1.151.2.6 -r1.151.2.7 src/etc/MAKEDEV.tmpl
cvs rdiff -u -r1.17 -r1.17.6.1 src/etc/etc.amd64/MAKEDEV.conf
cvs rdiff -u -r1.21 -r1.21.6.1 src/etc/etc.i386/MAKEDEV.conf
cvs rdiff -u -r1.56 -r1.56.8.1 src/sys/compat/linux/common/linux_ioctl.c
cvs rdiff -u -r1.61 -r1.61.2.1 src/sys/conf/majors
cvs rdiff -u -r1.36.8.3 -r1.36.8.4 src/sys/dev/ic/mfi.c
cvs rdiff -u -r0 -r1.1.2.2 src/sys/dev/ic/mfiio.h
cvs rdiff -u -r1.4.16.2 -r1.4.16.3 src/sys/dev/ic/mfireg.h
cvs rdiff -u -r1.14.16.2 -r1.14.16.3 src/sys/dev/ic/mfivar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.151.2.6 src/etc/MAKEDEV.tmpl:1.151.2.7
--- src/etc/MAKEDEV.tmpl:1.151.2.6 Thu Sep 13 22:20:58 2012
+++ src/etc/MAKEDEV.tmpl Wed Oct 24 03:23:45 2012
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.151.2.6 2012/09/13 22:20:58 riz Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.151.2.7 2012/10/24 03:23:45 riz Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -254,6 +254,7 @@
# lockstat kernel locking statistics
# magma* Magma multiport serial/parallel cards
# midi* MIDI
+# mfi* LSI MegaRAID/MegaSAS control interface
# mlx* Mylex DAC960 control interface
# mly* Mylex AcceleRAID/eXtremeRAID control interface
# np* UNIBUS Ethernet co-processor interface, for downloading.
@@ -1558,6 +1559,11 @@ iop[0-9]*)
mkdev iop$unit c %iop_chr% $unit
;;
+mfi[0-9]*)
+ unit=${i#mfi}
+ mkdev mfi$unit c %mfi_chr% $unit
+ ;;
+
mlx[0-9]*)
unit=${i#mlx}
mkdev mlx$unit c %mlx_chr% $unit
Index: src/etc/etc.amd64/MAKEDEV.conf
diff -u src/etc/etc.amd64/MAKEDEV.conf:1.17 src/etc/etc.amd64/MAKEDEV.conf:1.17.6.1
--- src/etc/etc.amd64/MAKEDEV.conf:1.17 Sat Feb 26 18:07:16 2011
+++ src/etc/etc.amd64/MAKEDEV.conf Wed Oct 24 03:23:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.17 2011/02/26 18:07:16 ahoka Exp $
+# $NetBSD: MAKEDEV.conf,v 1.17.6.1 2012/10/24 03:23:45 riz Exp $
# As of 2003-04-17, the init case must not create more than 890 entries.
all_md)
@@ -11,7 +11,7 @@ all_md)
makedev bpf
makedev ccd0 md0 ch0 random
makedev cgd0 cgd1
- makedev amr0 iop0 mlx0 mly0 dpti0 dpt0 twe0
+ makedev amr0 iop0 mfi0 mlx0 mly0 dpti0 dpt0 twe0
makedev raid0 raid1 raid2 raid3
makedev ld0 ld1 ld2 ld3
makedev xbd0 xbd1 xbd2 xbd3 xen
Index: src/etc/etc.i386/MAKEDEV.conf
diff -u src/etc/etc.i386/MAKEDEV.conf:1.21 src/etc/etc.i386/MAKEDEV.conf:1.21.6.1
--- src/etc/etc.i386/MAKEDEV.conf:1.21 Sat Feb 26 18:07:17 2011
+++ src/etc/etc.i386/MAKEDEV.conf Wed Oct 24 03:23:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.21 2011/02/26 18:07:17 ahoka Exp $
+# $NetBSD: MAKEDEV.conf,v 1.21.6.1 2012/10/24 03:23:45 riz Exp $
# As of 2005-03-15, the init case must not create more than 1024 entries.
all_md)
@@ -11,7 +11,7 @@ all_md)
makedev bpf
makedev ccd0 md0 ch0 random
makedev cgd0 cgd1
- makedev amr0 iop0 mlx0 mly0 dpti0 dpt0 twe0 icp0
+ makedev amr0 iop0 mfi0 mlx0 mly0 dpti0 dpt0 twe0 icp0
makedev ed0 ed1
makedev raid0 raid1 raid2 raid3
makedev ld0 ld1 ld2 ld3
Index: src/sys/compat/linux/common/linux_ioctl.c
diff -u src/sys/compat/linux/common/linux_ioctl.c:1.56 src/sys/compat/linux/common/linux_ioctl.c:1.56.8.1
--- src/sys/compat/linux/common/linux_ioctl.c:1.56 Fri Oct 14 09:23:28 2011
+++ src/sys/compat/linux/common/linux_ioctl.c Wed Oct 24 03:23:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ioctl.c,v 1.56 2011/10/14 09:23:28 hannken Exp $ */
+/* $NetBSD: linux_ioctl.c,v 1.56.8.1
CVS commit: [netbsd-6] src/share/misc
Module Name:src Committed By: riz Date: Wed Oct 24 03:26:39 UTC 2012 Modified Files: src/share/misc [netbsd-6]: bsd-family-tree Log Message: Pull up following revision(s) (requested by jnemeth in ticket #630): share/misc/bsd-family-tree: revision 1.45 Sync with FreeBSD rev. 241698. Adds: - FreeBSD 8.32012-04-18 [FBD] - OpenBSD 5.12012-05-01 [OBD] - Mac OS X 10.8 2012-07-25 [APL] - NetBSD 6.0 2012-10-17 [NBD] To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.43.2.1 src/share/misc/bsd-family-tree Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/bsd-family-tree diff -u src/share/misc/bsd-family-tree:1.43 src/share/misc/bsd-family-tree:1.43.2.1 --- src/share/misc/bsd-family-tree:1.43 Fri Jan 27 14:34:30 2012 +++ src/share/misc/bsd-family-tree Wed Oct 24 03:26:38 2012 @@ -246,13 +246,17 @@ FreeBSD 5.2 | | | || | | NetBSD 5.1 | | | FreeBSD FreeBSD | | | | |8.2 7.4| | | DragonFly 2.10.1 - | v | | OpenBSD 4.9 | + | | | | OpenBSD 4.9 | + | `-. Mac OS X | | | + |\ 10.7| | | + | | | | OpenBSD 5.0 | + *--FreeBSD| | | | | + |9.0 | | | | DragonFly 3.0.1 + | vFreeBSD | | | | + |8.3 | | OpenBSD 5.1 | | Mac OS X | | | - | 10.7| | | - || | OpenBSD 5.0 | - +--FreeBSD | | | | - |9.0 | | | | - | v | | | | + | 10.8| | | + || NetBSD 6.0 | | || | | | FreeBSD 10 -current | NetBSD -current OpenBSD -current | || | | | @@ -543,6 +547,11 @@ OpenBSD 4.9 2011-05-01 [OBD] Mac OS X 10.7 2011-07-20 [APL] OpenBSD 5.0 2011-11-01 [OBD] FreeBSD 9.0 2012-01-12 [FBD] +DragonFly 3.0.1 2012-02-21 [DFB] +FreeBSD 8.3 2012-04-18 [FBD] +OpenBSD 5.1 2012-05-01 [OBD] +Mac OS X 10.8 2012-07-25 [APL] +NetBSD 6.0 2012-10-17 [NBD] Bibliography @@ -603,4 +612,4 @@ Steven M. Schultz for providing 2.8BSD, Copyright (c) 1997-2012 Wolfram Schneider wo...@freebsd.org URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.150 2012/01/13 06:18:23 maxim Exp $ +$FreeBSD$
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Wed Oct 24 03:27:02 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 628-630. To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-6.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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.10 src/doc/CHANGES-6.1:1.1.2.11 --- src/doc/CHANGES-6.1:1.1.2.10 Tue Oct 23 20:20:15 2012 +++ src/doc/CHANGES-6.1 Wed Oct 24 03:27:02 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.10 2012/10/23 20:20:15 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.11 2012/10/24 03:27:02 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -274,3 +274,33 @@ share/zoneinfo/australasia patch Palestine fall 2012. (Thanks to Steffen Thorsen.) [apb, ticket #627] +sys/dev/ic/mfi.c1.39-1.46 +sys/dev/ic/mfireg.h1.6-1.7 +sys/dev/ic/mfivar.h1.16-1.19 +sys/dev/pci/mfi_pci.c1.15-1.16 +sys/dev/pci/pcidevs1.1128 +sys/dev/pci/pcidevs.hregen +sys/dev/pci/pcidevs_data.h regen + + Add support for LSI Thunderbolt (SAS2208) controllers. + [bouyer, ticket #628] + +etc/MAKEDEV.tmpl1.159 +etc/etc.amd64/MAKEDEV.conf 1.19 +etc/etc.i386/MAKEDEV.conf 1.24 +sys/compat/linux/common/linux_ioctl.c 1.57 +sys/conf/majors 1.62 +sys/dev/ic/mfi.c1.47 +sys/dev/ic/mfiio.h1.1 +sys/dev/ic/mfireg.h1.8 +sys/dev/ic/mfivar.h1.20 + + Add support for running the MegaCLI linux binary for mfi(4) + controllers under NetBSD. + [bouyer, ticket #629] + +share/misc/bsd-family-tree 1.45 via patch + + Update the family tree to include the latest releases. + [jnemeth, ticket #630] +
CVS commit: [netbsd-6-0] src/share/misc
Module Name:src Committed By: riz Date: Wed Oct 24 03:27:13 UTC 2012 Modified Files: src/share/misc [netbsd-6-0]: bsd-family-tree Log Message: Pull up following revision(s) (requested by jnemeth in ticket #630): share/misc/bsd-family-tree: revision 1.45 Sync with FreeBSD rev. 241698. Adds: - FreeBSD 8.32012-04-18 [FBD] - OpenBSD 5.12012-05-01 [OBD] - Mac OS X 10.8 2012-07-25 [APL] - NetBSD 6.0 2012-10-17 [NBD] To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.43.6.1 src/share/misc/bsd-family-tree Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/bsd-family-tree diff -u src/share/misc/bsd-family-tree:1.43 src/share/misc/bsd-family-tree:1.43.6.1 --- src/share/misc/bsd-family-tree:1.43 Fri Jan 27 14:34:30 2012 +++ src/share/misc/bsd-family-tree Wed Oct 24 03:27:13 2012 @@ -246,13 +246,17 @@ FreeBSD 5.2 | | | || | | NetBSD 5.1 | | | FreeBSD FreeBSD | | | | |8.2 7.4| | | DragonFly 2.10.1 - | v | | OpenBSD 4.9 | + | | | | OpenBSD 4.9 | + | `-. Mac OS X | | | + |\ 10.7| | | + | | | | OpenBSD 5.0 | + *--FreeBSD| | | | | + |9.0 | | | | DragonFly 3.0.1 + | vFreeBSD | | | | + |8.3 | | OpenBSD 5.1 | | Mac OS X | | | - | 10.7| | | - || | OpenBSD 5.0 | - +--FreeBSD | | | | - |9.0 | | | | - | v | | | | + | 10.8| | | + || NetBSD 6.0 | | || | | | FreeBSD 10 -current | NetBSD -current OpenBSD -current | || | | | @@ -543,6 +547,11 @@ OpenBSD 4.9 2011-05-01 [OBD] Mac OS X 10.7 2011-07-20 [APL] OpenBSD 5.0 2011-11-01 [OBD] FreeBSD 9.0 2012-01-12 [FBD] +DragonFly 3.0.1 2012-02-21 [DFB] +FreeBSD 8.3 2012-04-18 [FBD] +OpenBSD 5.1 2012-05-01 [OBD] +Mac OS X 10.8 2012-07-25 [APL] +NetBSD 6.0 2012-10-17 [NBD] Bibliography @@ -603,4 +612,4 @@ Steven M. Schultz for providing 2.8BSD, Copyright (c) 1997-2012 Wolfram Schneider wo...@freebsd.org URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.150 2012/01/13 06:18:23 maxim Exp $ +$FreeBSD$
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Wed Oct 24 03:28:07 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Ticket 630. To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-6.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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.5 src/doc/CHANGES-6.0.1:1.1.2.6 --- src/doc/CHANGES-6.0.1:1.1.2.5 Wed Oct 24 03:15:04 2012 +++ src/doc/CHANGES-6.0.1 Wed Oct 24 03:28:07 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.5 2012/10/24 03:15:04 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.6 2012/10/24 03:28:07 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -41,3 +41,8 @@ usr.bin/calendar/calendars/calendar.netb Note the date of the NetBSD 6.0 release. [jnemeth, ticket #611] +share/misc/bsd-family-tree 1.45 via patch + + Update the family tree to include the latest releases. + [jnemeth, ticket #630] +
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src Committed By: riz Date: Wed Oct 24 03:35:42 UTC 2012 Modified Files: src/sys/dev/pci [netbsd-6]: pcidevs Log Message: Apply patch (requested by msaitoh in ticket #631): This patch doesn't include any changes that rename ID. == sys/dev/pci/pcidevs 1.1103,1.1105,1.1109-1.1112,1.1114,1.1119-1.1124, 1.1126-1.1128,1.1130-1.1136,1.1138-1.1142 Added Ricoh 5CE823. Added some AMD/ATI devices. Add Marvell Yukon 88e8040 ethernet. More broadcom stuff. Add IDs for Fresco Logic and their FL1000 and FL1009 xHCI chips. NEC uPD720100A is USB2. Add NEC uPD720200, a USB3 Host Controller. Add Intel Sandybridge integrated graphics. Add Marvell SoC 88F6282. Add XGI Technology's devices. Add some Intel's devices. Add more FREESCALE devices. Fix RICOH RU5230 description. Add some Intel 7 series devices. Add some ATI and SIS devices. Fixes PR#39580. Add VirtualBox ids. Add EG20T PCH. Closes PR/45567. Add LSI MegaRAID SAS2208. Add 82GM45_KT for puc(4). Add some Intel's KT (Serial over LAN) devices. Add some PCI AHCI controllers, from linux. Added ALTERA EP4CGX15BF14C8N entry. Add Broadcom BCM57762 Gigabit Ethernet, per PR kern/46961. Add ASMEDIA ASM1061. Add Lava Computers SSERIAL-PCI single serial port adapter. Add Intel Ivy Bridge host bridge and integrated graphics device IDs. Add Intel Centrino Wireless-N 2230. Pull in changes from matt-nb5-mips64 (RMI NETLOGIC). Add SB600_USB_OHCI0 again. This was (accidentally) removed in rev. 1.1105. To generate a diff of this commit: cvs rdiff -u -r1.1102.2.7 -r1.1102.2.8 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1102.2.7 src/sys/dev/pci/pcidevs:1.1102.2.8 --- src/sys/dev/pci/pcidevs:1.1102.2.7 Wed Oct 24 03:19:19 2012 +++ src/sys/dev/pci/pcidevs Wed Oct 24 03:35:41 2012 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1102.2.7 2012/10/24 03:19:19 riz Exp $ +$NetBSD: pcidevs,v 1.1102.2.8 2012/10/24 03:35:41 riz Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -617,14 +617,18 @@ vendor S2IO 0x17d5 S2io Technologies vendor RDC 0x17F3 RDC Semiconductor vendor LINKSYS2 0x17fe Linksys vendor RALINK 0x1814 Ralink Technologies -vendor RMI 0x182e Raza Microelectronics Inc. (NetLogic) +vendor RMI 0x182e Raza Microelectronics Inc. (Broadcom) +vendor NETLOGIC 0x184e Netlogic Microsystems (Broadcom) vendor BBELEC 0x1896 B B Electronics +vendor XGI 0x18ca XGI Technology vendor RENESAS 0x1912 Renesas Technologies vendor FREESCALE 0x1957 Freescale Semiconductor vendor ATTANSIC 0x1969 Attansic Technologies vendor JMICRON 0x197b JMicron Technology vendor EVE 0x1adb EVE vendor QUMRANET 0x1af4 Qumranet +vendor ASMEDIA 0x1b21 ASMedia +vendor FRESCO 0x1b73 Fresco Logic vendor SYMPHONY2 0x1c1c Symphony Labs (2nd PCI Vendor ID) vendor TEKRAM2 0x1de1 Tekram Technology (2nd PCI Vendor ID) vendor SUNIX2 0x1fd4 SUNIX Co @@ -649,6 +653,7 @@ vendor KURUSUGAWA 0x6809 Kurusugawa Elec vendor PCHDTV 0x7063 pcHDTV vendor QUANCOM 0x8008 QUANCOM Electronic GmbH vendor INTEL 0x8086 Intel +vendor VIRTUALBOX 0x80ee VirtualBox vendor TRIGEM2 0x8800 Trigem Computer (2nd PCI Vendor ID) vendor PROLAN 0x8c4a ProLAN vendor COMPUTONE 0x8e0e Computone @@ -910,6 +915,9 @@ product ALTEON ACENIC_COPPER 0x0002 ACEn product ALTEON BCM5700 0x0003 ACEnic BCM5700 10/100/1000 Ethernet product ALTEON BCM5701 0x0004 ACEnic BCM5701 10/100/1000 Ethernet +/* Altera products */ +product ALTERA EP4CGX15BF14C8N 0x4c15 EP4CGX15BF14C8N + /* Altima products */ product ALTIMA AC1000 0x03e8 AC1000 Gigabit Ethernet product ALTIMA AC1001 0x03e9 AC1001 Gigabit Ethernet @@ -1008,8 +1016,18 @@ product AMD PBC8111_ACPI 0x746b AMD8111 product AMD PBC8111_AC 0x746d AMD8111 AC97 Audio product AMD PBC8111_MC97 0x746e AMD8111 MC97 Modem product AMD PBC8111_AC_756b 0x756b AMD8111 756b ACPI Controller -product AMD HUDSON2_IDE 0x780c HUDSON-2 IDE Controller -product AMD HUDSON2_SATA 0x7800 HUDSON-2 SATA Controller +product AMD HUDSON_SATA 0x7800 Hudson SATA Controller +product AMD HUDSON_SATA_AHCI 0x7801 Hudson AHCI SATA Controller +product AMD HUDSON_SDHC 0x7806 Hudson SD Flash Controller +product AMD HUDSON_OHCI 0x7807 Hudson USB OHCI Controller +product AMD HUDSON_EHCI 0x7808 Hudson USB EHCI Controller +product AMD HUDSON_OHCI_2 0x7809 Hudson USB OHCI Controller +product AMD HUDSON_SMB 0x780b Hudson SMBus Controller +product AMD HUDSON_IDE 0x780c Hudson IDE Controller +product AMD HUDSON_HDAUDIO 0x780d Hudson HD Audio Controller +product AMD
CVS commit: [netbsd-6] src/usr.bin/netstat
Module Name:src
Committed By: riz
Date: Wed Oct 24 03:39:18 UTC 2012
Modified Files:
src/usr.bin/netstat [netbsd-6]: if.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #632):
usr.bin/netstat/if.c: revision 1.75
Line up total numbers again (for -b case and -X case).
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.73.2.1 src/usr.bin/netstat/if.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/netstat/if.c
diff -u src/usr.bin/netstat/if.c:1.73 src/usr.bin/netstat/if.c:1.73.2.1
--- src/usr.bin/netstat/if.c:1.73 Sun Feb 12 19:11:33 2012
+++ src/usr.bin/netstat/if.c Wed Oct 24 03:39:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.73 2012/02/12 19:11:33 christos Exp $ */
+/* $NetBSD: if.c,v 1.73.2.1 2012/10/24 03:39:17 riz Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)if.c 8.2 (Berkeley) 2/21/94;
#else
-__RCSID($NetBSD: if.c,v 1.73 2012/02/12 19:11:33 christos Exp $);
+__RCSID($NetBSD: if.c,v 1.73.2.1 2012/10/24 03:39:17 riz Exp $);
#endif
#endif /* not lint */
@@ -604,11 +604,11 @@ static void
iftot_print(struct iftot *cur, struct iftot *old)
{
if (bflag)
- printf(%10 PRIu64 %8.8s %10 PRIu64 %5.5s,
+ printf(%10 PRIu64 %8.8s %10 PRIu64 %5.5s,
cur-ift_ib - old-ift_ib, ,
cur-ift_ob - old-ift_ob, );
else
- printf(%8 PRIu64 %5 PRIu64 %8 PRIu64 %5 PRIu64 %5 PRIu64,
+ printf(%8 PRIu64 %5 PRIu64 %8 PRIu64 %5 PRIu64 %5 PRIu64,
cur-ift_ip - old-ift_ip,
cur-ift_ie - old-ift_ie,
cur-ift_op - old-ift_op,
@@ -624,11 +624,11 @@ static void
iftot_print_sum(struct iftot *cur, struct iftot *old)
{
if (bflag)
- printf( %10 PRIu64 %8.8s %10 PRIu64 %5.5s,
+ printf( %10 PRIu64 %8.8s %10 PRIu64 %5.5s,
cur-ift_ib - old-ift_ib, ,
cur-ift_ob - old-ift_ob, );
else
- printf( %8 PRIu64 %5 PRIu64 %8 PRIu64 %5 PRIu64 %5 PRIu64,
+ printf( %8 PRIu64 %5 PRIu64 %8 PRIu64 %5 PRIu64 %5 PRIu64,
cur-ift_ip - old-ift_ip,
cur-ift_ie - old-ift_ie,
cur-ift_op - old-ift_op,
CVS commit: [netbsd-6] src/sys/dev/mii
Module Name:src Committed By: riz Date: Wed Oct 24 03:41:51 UTC 2012 Modified Files: src/sys/dev/mii [netbsd-6]: miidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #633): sys/dev/mii/miidevs: revision 1.106 sys/dev/mii/miidevs: revision 1.107 sys/dev/mii/miidevs: revision 1.108 sys/dev/mii/miidevs: revision 1.109 Sync a comment with a fact. There is MII_OUI() in miivar.h not mii.h after 2001. Add VSC8221 Add AR8035 Add another Broadcom OUI and BCM57765 1000BASE-T media interface. Per PR kern/46961. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.105.4.1 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.105 src/sys/dev/mii/miidevs:1.105.4.1 --- src/sys/dev/mii/miidevs:1.105 Fri Nov 25 23:28:14 2011 +++ src/sys/dev/mii/miidevs Wed Oct 24 03:41:51 2012 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.105 2011/11/25 23:28:14 jakllsch Exp $ +$NetBSD: miidevs,v 1.105.4.1 2012/10/24 03:41:51 riz Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ $NetBSD: miidevs,v 1.105 2011/11/25 23:2 * mapping; the bit positions are defined in IEEE 802-1990, figure 5.2. * (There is a formal 802.3 interpretation, number 1-07/98 of July 09 1998, * about this.) - * The MII_OUI() macro in mii.h reflects this. + * The MII_OUI() macro in miivar.h reflects this. * If a vendor uses a different mapping, an xx prefixed OUI is defined here * which is mangled accordingly to compensate. */ @@ -56,6 +56,7 @@ oui ATHEROS 0x001374 Atheros oui ATTANSIC 0x00c82e Attansic Technology oui BROADCOM 0x001018 Broadcom Corporation oui BROADCOM2 0x000af7 Broadcom Corporation +oui BROADCOM3 0x001be9 Broadcom Corporation oui CICADA 0x0003F1 Cicada Semiconductor oui DAVICOM 0x00606e Davicom Semiconductor oui ENABLESEMI 0x0010dd Enable Semiconductor @@ -122,6 +123,7 @@ model ATHEROS F2 0x0002 F2 10/100 PHY model ATTANSIC L1 0x0001 L1 10/100/1000 PHY model ATTANSIC L2 0x0002 L2 10/100 PHY model ATTANSIC AR8021 0x0004 Atheros AR8021 10/100/1000 PHY +model ATTANSIC AR8035 0x0007 Atheros AR8035 10/100/1000 PHY /* Altima Communications PHYs */ /* Don't know the model for ACXXX */ @@ -178,6 +180,7 @@ model BROADCOM2 BCM5784 0x003a BCM5784 model BROADCOM2 BCM5709C 0x003c BCM5709 10/100/1000baseT PHY model BROADCOM2 BCM5761 0x003d BCM5761 10/100/1000baseT PHY model BROADCOM2 BCM5709S 0x003f BCM5709S 1000/2500baseSX PHY +model BROADCOM3 BCM57765 0x0024 BCM57765 1000BASE-T media interface model xxBROADCOM_ALT1 BCM5906 0x0004 BCM5906 10/100baseTX media interface /* Cicada Semiconductor PHYs (now owned by Vitesse?) */ @@ -186,6 +189,7 @@ model CICADA CS8204 0x0004 Cicada CS820 model CICADA VSC8211 0x000b Cicada VSC8211 10/100/1000TX PHY model CICADA CS8201A 0x0020 Cicada CS8201 10/100/1000TX PHY model CICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY +model xxCICADA VSC8221 0x0015 Vitesse VSC8221 10/100/1000BASE-T PHY model xxCICADA VSC8244 0x002c Vitesse VSC8244 Quad 10/100/1000BASE-T PHY model xxCICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY
CVS commit: [netbsd-6] src/sys/dev/usb
Module Name:src Committed By: riz Date: Wed Oct 24 03:46:00 UTC 2012 Modified Files: src/sys/dev/usb [netbsd-6]: usbdevs Log Message: Apply patch (requested by msaitoh in ticket #634): == sys/dev/usb/usbdevs 1.609,1.611-1.616,1.619,1.623-1.625, 1.628-1.630 Added vendor Terminus Technology. Add ADS InstantFM Music (RDX-155). Add USB keyboard found on Netwalker. Add vendorID and some products of Nintendo Co., Ltd Add USBConnect Mercury. Add the Apple IPod Shuffle (second generation) and the Apple IPod Touch (fourth generation). Add the Springer Design MP3 players/book reader products. This includes the original BookPOrt sold by APH. Added Buffalo WLI-UC-GNM2T. Add NTT DOCOMO L-02C entry. Add another sierra device. Add PLANEX GW-USH300N. Add two more FTDI USB-serial adapters. Added the device id for the Huawei EM770W 3G modem to u3g(4) Confirmed to work on a WeTab. Recognize apple bluetooth adapter in MacBook Air. == To generate a diff of this commit: cvs rdiff -u -r1.607.2.5 -r1.607.2.6 src/sys/dev/usb/usbdevs 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/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.607.2.5 src/sys/dev/usb/usbdevs:1.607.2.6 --- src/sys/dev/usb/usbdevs:1.607.2.5 Tue Oct 23 20:01:14 2012 +++ src/sys/dev/usb/usbdevs Wed Oct 24 03:45:59 2012 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.607.2.5 2012/10/23 20:01:14 riz Exp $ +$NetBSD: usbdevs,v 1.607.2.6 2012/10/24 03:45:59 riz Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -184,6 +184,7 @@ vendor HAUPPAUGE 0x0573 Hauppauge Comput vendor BAFO 0x0576 BAFO/Quality Computer Accessories vendor YEDATA 0x057b Y-E Data vendor AVM 0x057c AVM +vendor NINTENDO 0x057e Nintendo vendor QUICKSHOT 0x057f Quickshot vendor ROLAND 0x0582 Roland vendor ROCKFIRE 0x0583 Rockfire @@ -514,6 +515,7 @@ vendor LINKSYS3 0x1915 Linksys vendor MEINBERG 0x1938 Meinberg Funkuhren vendor QUALCOMMINC 0x19d2 Qualcomm, Incorporated vendor QUANTA 0x1a32 Quanta +vendor TERMINUS 0x1a40 Terminus Technology vendor WINCHIPHEAD2 0x1a86 QinHeng Electronics vendor MPMAN 0x1cae MPMan vendor 4GSYSTEMS 0x1c9e 4G Systems @@ -549,6 +551,7 @@ vendor SWEEX 0x5173 Sweex vendor ONSPEC2 0x55aa OnSpec Electronic Inc. vendor ZINWELL 0x5a57 Zinwell vendor SITECOM 0x6189 Sitecom +vendor SPRINGERDESIGN 0x6400 Springer Design, Inc. vendor ARKMICROCHIPS 0x6547 ArkMicroChips vendor 3COM2 0x6891 3Com vendor EDIMAX 0x7392 EDIMAX @@ -692,6 +695,7 @@ product ADMTEK PEGASUSII_3 0x8515 ADM851 /* ADS products */ product ADS UBS10BT 0x0008 UBS-10BT Ethernet product ADS UBS10BTX 0x0009 UBS-10BT Ethernet +product ADS RDX155 0xa155 InstantFM Music /* AEI products */ product AEI USBTOLAN 0x1701 AEI USB to Lan adapter @@ -800,12 +804,15 @@ product APPLE MAGICMOUSE 0x030d Magic Mo product APPLE BLUETOOTH_HIDMODE 0x1000 Bluetooth HCI (HID-proxy mode) product APPLE EXT_KBD_HUB 0x1003 Hub in Apple Extended USB Keyboard product APPLE SPEAKERS 0x1101 Speakers +product APPLE SHUFFLE2 0x1301 iPod Shuffle (2nd generation) product APPLE IPHONE 0x1290 iPhone product APPLE IPOD_TOUCH 0x1291 iPod Touch +product APPLE IPOD_TOUCH_4G 0x129e iPod Touch 4G product APPLE IPHONE_3G 0x1292 iPhone 3G product APPLE IPHONE_3GS 0x1294 iPhone 3GS product APPLE IPAD 0x129a Apple iPad product APPLE ETHERNET 0x1402 Apple USB to Ethernet +product APPLE BLUETOOTH_HOST_C 0x821f Bluetooth USB Host Controller /* ArkMicroChips products */ product ARKMICROCHIPS USBSERIAL 0x0232 USB-UART Controller @@ -1358,8 +1365,10 @@ product FREECOM DVD 0xfc01 Connector fo /* Future Technology Devices products */ product FTDI SERIAL_8U232AM 0x6001 8U232AM Serial converter +product FTDI SERIAL_232RL 0x6006 FT232RL Serial converter product FTDI SERIAL_2232C 0x6010 2232C USB dual FAST SERIAL ADAPTER product FTDI SERIAL_4232H 0x6011 2232H USB quad FAST SERIAL ADAPTER +product FTDI SERIAL_232H0x6014 C232HM USB Multipurpose UART product FTDI PS2KBDMS 0x8371 PS/2 Keyboard/Mouse product FTDI SERIAL_8U100AX 0x8372 8U100AX Serial converter product FTDI OPENRD_JTAGKEY 0x9e90 OpenRD JTAGKey FT2232D B @@ -1561,6 +1570,7 @@ product HTC ANDROID 0x0ffe Android /* Huawei Technologies products */ product HUAWEI MOBILE 0x1001 Huawei Mobile product HUAWEI E220 0x1003 Huawei E220 +product HUAWEI EM770W 0x1404 Huawei EM770W product HUAWEI E1750 0x140c Huawei E1750 product HUAWEI E1750INIT 0x1446 Huawei E1750 USB CD product HUAWEI K3765 0x1465 Huawei K3765 @@ -1888,6 +1898,7 @@ product MELCO WLIUCG300N 0x00e8 WLI-UC-G product MELCO WLIUCAG300N 0x012e
CVS commit: [netbsd-6] src/sys/dev/usb
Module Name:src Committed By: riz Date: Wed Oct 24 03:46:50 UTC 2012 Modified Files: src/sys/dev/usb [netbsd-6]: usbdevs.h usbdevs_data.h Log Message: Regen for ticket 634. To generate a diff of this commit: cvs rdiff -u -r1.600.2.5 -r1.600.2.6 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.601.2.5 -r1.601.2.6 src/sys/dev/usb/usbdevs_data.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/dev/usb/usbdevs.h diff -u src/sys/dev/usb/usbdevs.h:1.600.2.5 src/sys/dev/usb/usbdevs.h:1.600.2.6 --- src/sys/dev/usb/usbdevs.h:1.600.2.5 Tue Oct 23 20:01:41 2012 +++ src/sys/dev/usb/usbdevs.h Wed Oct 24 03:46:49 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: usbdevs.h,v 1.600.2.5 2012/10/23 20:01:41 riz Exp $ */ +/* $NetBSD: usbdevs.h,v 1.600.2.6 2012/10/24 03:46:49 riz Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -191,6 +191,7 @@ #define USB_VENDOR_BAFO 0x0576 /* BAFO/Quality Computer Accessories */ #define USB_VENDOR_YEDATA 0x057b /* Y-E Data */ #define USB_VENDOR_AVM 0x057c /* AVM */ +#define USB_VENDOR_NINTENDO 0x057e /* Nintendo */ #define USB_VENDOR_QUICKSHOT 0x057f /* Quickshot */ #define USB_VENDOR_ROLAND 0x0582 /* Roland */ #define USB_VENDOR_ROCKFIRE 0x0583 /* Rockfire */ @@ -521,6 +522,7 @@ #define USB_VENDOR_MEINBERG 0x1938 /* Meinberg Funkuhren */ #define USB_VENDOR_QUALCOMMINC 0x19d2 /* Qualcomm, Incorporated */ #define USB_VENDOR_QUANTA 0x1a32 /* Quanta */ +#define USB_VENDOR_TERMINUS 0x1a40 /* Terminus Technology */ #define USB_VENDOR_WINCHIPHEAD2 0x1a86 /* QinHeng Electronics */ #define USB_VENDOR_MPMAN 0x1cae /* MPMan */ #define USB_VENDOR_4GSYSTEMS 0x1c9e /* 4G Systems */ @@ -556,6 +558,7 @@ #define USB_VENDOR_ONSPEC2 0x55aa /* OnSpec Electronic Inc. */ #define USB_VENDOR_ZINWELL 0x5a57 /* Zinwell */ #define USB_VENDOR_SITECOM 0x6189 /* Sitecom */ +#define USB_VENDOR_SPRINGERDESIGN 0x6400 /* Springer Design, Inc. */ #define USB_VENDOR_ARKMICROCHIPS 0x6547 /* ArkMicroChips */ #define USB_VENDOR_3COM2 0x6891 /* 3Com */ #define USB_VENDOR_EDIMAX 0x7392 /* EDIMAX */ @@ -699,6 +702,7 @@ /* ADS products */ #define USB_PRODUCT_ADS_UBS10BT 0x0008 /* UBS-10BT Ethernet */ #define USB_PRODUCT_ADS_UBS10BTX 0x0009 /* UBS-10BT Ethernet */ +#define USB_PRODUCT_ADS_RDX155 0xa155 /* InstantFM Music */ /* AEI products */ #define USB_PRODUCT_AEI_USBTOLAN 0x1701 /* AEI USB to Lan adapter */ @@ -807,12 +811,15 @@ #define USB_PRODUCT_APPLE_BLUETOOTH_HIDMODE 0x1000 /* Bluetooth HCI (HID-proxy mode) */ #define USB_PRODUCT_APPLE_EXT_KBD_HUB 0x1003 /* Hub in Apple Extended USB Keyboard */ #define USB_PRODUCT_APPLE_SPEAKERS 0x1101 /* Speakers */ +#define USB_PRODUCT_APPLE_SHUFFLE2 0x1301 /* iPod Shuffle (2nd generation) */ #define USB_PRODUCT_APPLE_IPHONE 0x1290 /* iPhone */ #define USB_PRODUCT_APPLE_IPOD_TOUCH 0x1291 /* iPod Touch */ +#define USB_PRODUCT_APPLE_IPOD_TOUCH_4G 0x129e /* iPod Touch 4G */ #define USB_PRODUCT_APPLE_IPHONE_3G 0x1292 /* iPhone 3G */ #define USB_PRODUCT_APPLE_IPHONE_3GS 0x1294 /* iPhone 3GS */ #define USB_PRODUCT_APPLE_IPAD 0x129a /* Apple iPad */ #define USB_PRODUCT_APPLE_ETHERNET 0x1402 /* Apple USB to Ethernet */ +#define USB_PRODUCT_APPLE_BLUETOOTH_HOST_C 0x821f /* Bluetooth USB Host Controller */ /* ArkMicroChips products */ #define USB_PRODUCT_ARKMICROCHIPS_USBSERIAL 0x0232 /* USB-UART Controller */ @@ -1365,8 +1372,10 @@ /* Future Technology Devices products */ #define USB_PRODUCT_FTDI_SERIAL_8U232AM 0x6001 /* 8U232AM Serial converter */ +#define USB_PRODUCT_FTDI_SERIAL_232RL 0x6006 /* FT232RL Serial converter */ #define USB_PRODUCT_FTDI_SERIAL_2232C 0x6010 /* 2232C USB dual FAST SERIAL ADAPTER */ #define USB_PRODUCT_FTDI_SERIAL_4232H 0x6011 /* 2232H USB quad FAST SERIAL ADAPTER */ +#define USB_PRODUCT_FTDI_SERIAL_232H 0x6014 /* C232HM USB Multipurpose UART */ #define USB_PRODUCT_FTDI_PS2KBDMS 0x8371 /* PS/2 Keyboard/Mouse */ #define USB_PRODUCT_FTDI_SERIAL_8U100AX 0x8372 /* 8U100AX Serial converter */ #define USB_PRODUCT_FTDI_OPENRD_JTAGKEY 0x9e90 /* OpenRD JTAGKey FT2232D B */ @@ -1568,6 +1577,7 @@ /* Huawei Technologies products */ #define USB_PRODUCT_HUAWEI_MOBILE 0x1001 /* Huawei Mobile */ #define USB_PRODUCT_HUAWEI_E220 0x1003 /* Huawei E220 */ +#define USB_PRODUCT_HUAWEI_EM770W 0x1404 /* Huawei EM770W */ #define USB_PRODUCT_HUAWEI_E1750 0x140c /* Huawei E1750 */ #define USB_PRODUCT_HUAWEI_E1750INIT 0x1446 /* Huawei E1750 USB CD */ #define USB_PRODUCT_HUAWEI_K3765 0x1465 /* Huawei K3765 */ @@ -1895,6 +1905,7 @@ #define USB_PRODUCT_MELCO_WLIUCAG300N 0x012e /* WLI-UC-AG300N */ #define USB_PRODUCT_MELCO_WLIUCG 0x0137 /* WLI-UC-G */ #define USB_PRODUCT_MELCO_WLIUCGN 0x015d /* WLI-UC-GN */ +#define USB_PRODUCT_MELCO_WLIUCGNM2T 0x01ee /* WLI-UC-GNM2T */ /* Merlin products */ #define USB_PRODUCT_MERLIN_V620 0x1110 /* Merlin V620 */ @@ -2107,6
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Wed Oct 24 03:47:46 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 631-634. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-6.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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.11 src/doc/CHANGES-6.1:1.1.2.12 --- src/doc/CHANGES-6.1:1.1.2.11 Wed Oct 24 03:27:02 2012 +++ src/doc/CHANGES-6.1 Wed Oct 24 03:47:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.11 2012/10/24 03:27:02 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.12 2012/10/24 03:47:46 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -304,3 +304,32 @@ share/misc/bsd-family-tree 1.45 via pa Update the family tree to include the latest releases. [jnemeth, ticket #630] +sys/dev/pci/pcidevs 1.1103,1.1105,1.1109-1.1112,1.1114, +1.1119-1.1124, 1.1126-1.1128,1.1130-1.1136, +1.1138-1.1142 +sys/dev/pci/pcidevs.h regen +sys/dev/pci/pcidevs_data.h regen + + Synchronize pcidevs for all devices that don't rename an ID. + [msaitoh, ticket #631] + +usr.bin/netstat/if.c1.75 + + Line up total numbers again (for -b case and -X case). + [msaitoh, ticket #632] + +sys/dev/mii/miidevs1.106-1.109 +sys/dev/mii/miidevs.hregen +sys/dev/mii/miidevs_data.h regen + + Bring miidevs up-to-date. + [msaitoh, ticket #633] + +sys/dev/usb/usbdevs1.609,1.611-1.616,1.619, + 1.623-1.625,1.628-1.630 +sys/dev/usb/usbdevs.hregen +sys/dev/usb/usbdevs_data.h regen + + Bring usbdevs up-to-date. + [msaitoh, ticket #634] +
