CVS commit: [netbsd-6] src/sys/kern
Module Name:src Committed By: msaitoh Date: Mon Jul 29 06:00:35 UTC 2013 Modified Files: src/sys/kern [netbsd-6]: subr_disk_mbr.c Log Message: Pull up following revision(s) (requested by matt in ticket #910): sys/kern/subr_disk_mbr.c: revision 1.46 If the MBR is a protective MBR, don't bother looking at it. To generate a diff of this commit: cvs rdiff -u -r1.42.8.1 -r1.42.8.2 src/sys/kern/subr_disk_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/kern/subr_disk_mbr.c diff -u src/sys/kern/subr_disk_mbr.c:1.42.8.1 src/sys/kern/subr_disk_mbr.c:1.42.8.2 --- src/sys/kern/subr_disk_mbr.c:1.42.8.1 Sun Aug 12 19:02:33 2012 +++ src/sys/kern/subr_disk_mbr.c Mon Jul 29 06:00:35 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_disk_mbr.c,v 1.42.8.1 2012/08/12 19:02:33 martin Exp $ */ +/* $NetBSD: subr_disk_mbr.c,v 1.42.8.2 2013/07/29 06:00:35 msaitoh Exp $ */ /* * Copyright (c) 1982, 1986, 1988 Regents of the University of California. @@ -54,7 +54,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_disk_mbr.c,v 1.42.8.1 2012/08/12 19:02:33 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_disk_mbr.c,v 1.42.8.2 2013/07/29 06:00:35 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -160,6 +160,15 @@ scan_mbr(mbr_args_t *a, int (*actn)(mbr_ if (mbr-mbr_magic != htole16(MBR_MAGIC)) return SCAN_CONTINUE; + /* + * If this is a protective MBR, bail now. + */ + if (mbr-mbr_parts[0].mbrp_type == MBR_PTYPE_PMBR + mbr-mbr_parts[1].mbrp_type == MBR_PTYPE_UNUSED + mbr-mbr_parts[2].mbrp_type == MBR_PTYPE_UNUSED + mbr-mbr_parts[3].mbrp_type == MBR_PTYPE_UNUSED) + return SCAN_CONTINUE; + /* Copy data out of buffer so action can use bp */ memcpy(ptns, mbr-mbr_parts, sizeof ptns);
CVS commit: [netbsd-6] src/usr.bin/netstat
Module Name:src
Committed By: msaitoh
Date: Mon Jul 29 06:11:02 UTC 2013
Modified Files:
src/usr.bin/netstat [netbsd-6]: inet.c inet6.c main.c netstat.h
Log Message:
Pull up following revision(s) (requested by christos in ticket #912):
usr.bin/netstat/main.c: revision 1.86
usr.bin/netstat/netstat.h: revision 1.47
usr.bin/netstat/inet.c: revision 1.102
usr.bin/netstat/inet.c: revision 1.103
usr.bin/netstat/inet6.c: revision 1.61
usr.bin/netstat/inet6.c: revision 1.62
Don't use -P as a kmem printer, verify that the address points to a pcb first!
Not all pointers are 64bit - use uintptr_t instead of uint64_t.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.101.2.1 src/usr.bin/netstat/inet.c
cvs rdiff -u -r1.59 -r1.59.6.1 src/usr.bin/netstat/inet6.c
cvs rdiff -u -r1.81 -r1.81.4.1 src/usr.bin/netstat/main.c
cvs rdiff -u -r1.43 -r1.43.4.1 src/usr.bin/netstat/netstat.h
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/inet.c
diff -u src/usr.bin/netstat/inet.c:1.101 src/usr.bin/netstat/inet.c:1.101.2.1
--- src/usr.bin/netstat/inet.c:1.101 Sat Dec 24 20:18:35 2011
+++ src/usr.bin/netstat/inet.c Mon Jul 29 06:11:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: inet.c,v 1.101 2011/12/24 20:18:35 christos Exp $ */
+/* $NetBSD: inet.c,v 1.101.2.1 2013/07/29 06:11:02 msaitoh Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)inet.c 8.4 (Berkeley) 4/20/94;
#else
-__RCSID($NetBSD: inet.c,v 1.101 2011/12/24 20:18:35 christos Exp $);
+__RCSID($NetBSD: inet.c,v 1.101.2.1 2013/07/29 06:11:02 msaitoh Exp $);
#endif
#endif /* not lint */
@@ -226,96 +226,72 @@ print_vtw_v4(const vtw_t *vtw)
TCPS_TIME_WAIT, tcp, 0, vtw-expire);
}
-void
-protopr(u_long off, const char *name)
-{
- struct inpcbtable table;
- struct inpcb *head, *next, *prev;
- struct inpcb inpcb;
- struct tcpcb tcpcb;
- struct socket sockb;
- int istcp = strcmp(name, tcp) == 0;
- static int first = 1;
-
- compact = 0;
- if (Aflag) {
- if (!numeric_addr)
- width = 18;
- else {
- width = 21;
- compact = 1;
- }
- } else
- width = 22;
-
- if (use_sysctl) {
- struct kinfo_pcb *pcblist;
- int mib[8];
- size_t namelen = 0, size = 0, i;
- char *mibname = NULL;
-
- memset(mib, 0, sizeof(mib));
+struct kinfo_pcb *
+getpcblist_sysctl(const char *name, size_t *len) {
+ int mib[8];
+ size_t namelen = 0, size = 0;
+ char *mibname = NULL;
+ struct kinfo_pcb *pcblist;
- if (asprintf(mibname, net.inet.%s.pcblist, name) == -1)
- err(1, asprintf);
+ memset(mib, 0, sizeof(mib));
- /* get dynamic pcblist node */
- if (sysctlnametomib(mibname, mib, namelen) == -1)
- err(1, sysctlnametomib: %s, mibname);
+ if (asprintf(mibname, net.inet%s.%s.pcblist, name + 3, name) == -1)
+ err(1, asprintf);
- if (prog_sysctl(mib, __arraycount(mib),
- NULL, size, NULL, 0) == -1)
- err(1, sysctl (query));
+ /* get dynamic pcblist node */
+ if (sysctlnametomib(mibname, mib, namelen) == -1)
+ err(1, sysctlnametomib: %s, mibname);
- if ((pcblist = malloc(size)) == NULL)
- err(1, malloc);
- memset(pcblist, 0, size);
+ free(mibname);
- mib[6] = sizeof(*pcblist);
- mib[7] = size / sizeof(*pcblist);
+ if (prog_sysctl(mib, __arraycount(mib), NULL, size, NULL, 0) == -1)
+ err(1, sysctl (query));
- if (prog_sysctl(mib, __arraycount(mib),
- pcblist, size, NULL, 0) == -1)
- err(1, sysctl (copy));
+ if ((pcblist = malloc(size)) == NULL)
+ err(1, malloc);
+ memset(pcblist, 0, size);
- for (i = 0; i size / sizeof(*pcblist); i++) {
- struct sockaddr_in src, dst;
+ mib[6] = sizeof(*pcblist);
+ mib[7] = size / sizeof(*pcblist);
- memcpy(src, pcblist[i].ki_s, sizeof(src));
- memcpy(dst, pcblist[i].ki_d, sizeof(dst));
+ if (prog_sysctl(mib, __arraycount(mib), pcblist, size, NULL, 0) == -1)
+ err(1, sysctl (copy));
- if (!aflag
- inet_lnaof(dst.sin_addr) == INADDR_ANY)
-continue;
+ *len = size / sizeof(*pcblist);
+ return pcblist;
- if (first) {
-protoprhdr();
-first = 0;
- }
-
- protopr0((intptr_t) pcblist[i].ki_ppcbaddr,
- pcblist[i].ki_rcvq, pcblist[i].ki_sndq,
- src.sin_addr, src.sin_port,
- dst.sin_addr, dst.sin_port,
- pcblist[i].ki_tstate, name,
- pcblist[i].ki_pflags, NULL);
- }
+}
- free(pcblist);
- goto end;
+static struct kinfo_pcb *
+getpcblist_kmem(u_long off, const char *name, size_t *len) {
+ struct inpcbtable table;
+ struct inpcb *head, *next, *prev;
+ struct inpcb inpcb;
+ struct tcpcb tcpcb;
+ struct socket sockb;
+ int istcp = strcmp(name, tcp) == 0;
+ struct kinfo_pcb *pcblist;
+ size_t size = 100, i;
+ struct sockaddr_in sin;
+
+ if (off == 0) {
+ *len = 0;
+ return NULL;
}
- if (off == 0)
- return;
kread(off, (char *)table, sizeof table);
prev = head =
(struct inpcb *)((struct
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 06:13:32 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 908, 909, 910 and 912. To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-6.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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.18 src/doc/CHANGES-6.2:1.1.2.19 --- src/doc/CHANGES-6.2:1.1.2.18 Mon Jul 29 02:16:15 2013 +++ src/doc/CHANGES-6.2 Mon Jul 29 06:13:32 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.18 2013/07/29 02:16:15 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.19 2013/07/29 06:13:32 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -324,3 +324,42 @@ external/bsd/bind/dist/lib/dns/rdata/gen Fix for bind CVE-2013-4854. [spz, ticket #924] + +usr.sbin/pppd/pppd/sys-bsd.c 1.68 + + Add a set_queue_size to avoid more code duplication, and set the queue + size of all tty fd's, not just the ones that we create (the ones that + we get passed in too). Fixes my iPhone - xl2tpd - pppd VPN from + corrupting packets with MTU ~650. + [christos, ticket #908] + +sys/net/route.c 1.127 + + PR/44032: Proxy entries stopped working with pppd. The issue here is + that the route entry was added, but the RTF_LLINFO bit was not set, + making arp -a not showing the entry, but netstat -rn -f inet showing + it with the missing L bit. The order of resolution in ifa_ifwithroute() + is that if a destination address is found, then the interface chosen + for the route is that of the destination. This does not work for + link-level addresses since the ppp interface does not arp (uses + link_rtrequest, not arp_rtrequest), so the bit is never set. The easy + solution here is to check that the gateway is a link address, and use + the interface which we chose for the link address as opposed to the + interface that routes to the destination. This restores the previous + behavior, but is it correct? + [christos, ticket #909] + +sys/kern/subr_disk_mbr.c 1.46 + + If the MBR is a protective MBR, don't bother looking at it. + [matt, ticket #910] + +usr.bin/netstat/inet.c1.102-1.03 +usr.bin/netstat/inet6.c1.61-1.62 +usr.bin/netstat/main.c1.86 +usr.bin/netstat/netstat.h 1.47 + + Don't use -P as a kmem printer, verify that the address points to a + pcb first! + Not all pointers are 64bit - use uintptr_t instead of uint64_t. + [christos, ticket #912]
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 06:47:57 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket #910 fixes PR#47743. To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-6.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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.19 src/doc/CHANGES-6.2:1.1.2.20 --- src/doc/CHANGES-6.2:1.1.2.19 Mon Jul 29 06:13:32 2013 +++ src/doc/CHANGES-6.2 Mon Jul 29 06:47:57 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.19 2013/07/29 06:13:32 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.20 2013/07/29 06:47:57 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -352,6 +352,7 @@ sys/net/route.c 1.127 sys/kern/subr_disk_mbr.c 1.46 If the MBR is a protective MBR, don't bother looking at it. + Fixes PR#47743. [matt, ticket #910] usr.bin/netstat/inet.c1.102-1.03
CVS commit: [netbsd-6-1] src/usr.bin/netstat
Module Name:src
Committed By: msaitoh
Date: Mon Jul 29 07:06:37 UTC 2013
Modified Files:
src/usr.bin/netstat [netbsd-6-1]: inet.c inet6.c main.c netstat.h
Log Message:
Pull up following revision(s) (requested by christos in ticket #912):
usr.bin/netstat/main.c: revision 1.86
usr.bin/netstat/netstat.h: revision 1.47
usr.bin/netstat/inet.c: revision 1.102
usr.bin/netstat/inet.c: revision 1.103
usr.bin/netstat/inet6.c: revision 1.61
usr.bin/netstat/inet6.c: revision 1.62
Don't use -P as a kmem printer, verify that the address points to a pcb first!
Not all pointers are 64bit - use uintptr_t instead of uint64_t.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.101.14.1 src/usr.bin/netstat/inet.c
cvs rdiff -u -r1.59 -r1.59.16.1 src/usr.bin/netstat/inet6.c
cvs rdiff -u -r1.81 -r1.81.10.1 src/usr.bin/netstat/main.c
cvs rdiff -u -r1.43 -r1.43.10.1 src/usr.bin/netstat/netstat.h
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/inet.c
diff -u src/usr.bin/netstat/inet.c:1.101 src/usr.bin/netstat/inet.c:1.101.14.1
--- src/usr.bin/netstat/inet.c:1.101 Sat Dec 24 20:18:35 2011
+++ src/usr.bin/netstat/inet.c Mon Jul 29 07:06:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: inet.c,v 1.101 2011/12/24 20:18:35 christos Exp $ */
+/* $NetBSD: inet.c,v 1.101.14.1 2013/07/29 07:06:36 msaitoh Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)inet.c 8.4 (Berkeley) 4/20/94;
#else
-__RCSID($NetBSD: inet.c,v 1.101 2011/12/24 20:18:35 christos Exp $);
+__RCSID($NetBSD: inet.c,v 1.101.14.1 2013/07/29 07:06:36 msaitoh Exp $);
#endif
#endif /* not lint */
@@ -226,96 +226,72 @@ print_vtw_v4(const vtw_t *vtw)
TCPS_TIME_WAIT, tcp, 0, vtw-expire);
}
-void
-protopr(u_long off, const char *name)
-{
- struct inpcbtable table;
- struct inpcb *head, *next, *prev;
- struct inpcb inpcb;
- struct tcpcb tcpcb;
- struct socket sockb;
- int istcp = strcmp(name, tcp) == 0;
- static int first = 1;
-
- compact = 0;
- if (Aflag) {
- if (!numeric_addr)
- width = 18;
- else {
- width = 21;
- compact = 1;
- }
- } else
- width = 22;
-
- if (use_sysctl) {
- struct kinfo_pcb *pcblist;
- int mib[8];
- size_t namelen = 0, size = 0, i;
- char *mibname = NULL;
-
- memset(mib, 0, sizeof(mib));
+struct kinfo_pcb *
+getpcblist_sysctl(const char *name, size_t *len) {
+ int mib[8];
+ size_t namelen = 0, size = 0;
+ char *mibname = NULL;
+ struct kinfo_pcb *pcblist;
- if (asprintf(mibname, net.inet.%s.pcblist, name) == -1)
- err(1, asprintf);
+ memset(mib, 0, sizeof(mib));
- /* get dynamic pcblist node */
- if (sysctlnametomib(mibname, mib, namelen) == -1)
- err(1, sysctlnametomib: %s, mibname);
+ if (asprintf(mibname, net.inet%s.%s.pcblist, name + 3, name) == -1)
+ err(1, asprintf);
- if (prog_sysctl(mib, __arraycount(mib),
- NULL, size, NULL, 0) == -1)
- err(1, sysctl (query));
+ /* get dynamic pcblist node */
+ if (sysctlnametomib(mibname, mib, namelen) == -1)
+ err(1, sysctlnametomib: %s, mibname);
- if ((pcblist = malloc(size)) == NULL)
- err(1, malloc);
- memset(pcblist, 0, size);
+ free(mibname);
- mib[6] = sizeof(*pcblist);
- mib[7] = size / sizeof(*pcblist);
+ if (prog_sysctl(mib, __arraycount(mib), NULL, size, NULL, 0) == -1)
+ err(1, sysctl (query));
- if (prog_sysctl(mib, __arraycount(mib),
- pcblist, size, NULL, 0) == -1)
- err(1, sysctl (copy));
+ if ((pcblist = malloc(size)) == NULL)
+ err(1, malloc);
+ memset(pcblist, 0, size);
- for (i = 0; i size / sizeof(*pcblist); i++) {
- struct sockaddr_in src, dst;
+ mib[6] = sizeof(*pcblist);
+ mib[7] = size / sizeof(*pcblist);
- memcpy(src, pcblist[i].ki_s, sizeof(src));
- memcpy(dst, pcblist[i].ki_d, sizeof(dst));
+ if (prog_sysctl(mib, __arraycount(mib), pcblist, size, NULL, 0) == -1)
+ err(1, sysctl (copy));
- if (!aflag
- inet_lnaof(dst.sin_addr) == INADDR_ANY)
-continue;
+ *len = size / sizeof(*pcblist);
+ return pcblist;
- if (first) {
-protoprhdr();
-first = 0;
- }
-
- protopr0((intptr_t) pcblist[i].ki_ppcbaddr,
- pcblist[i].ki_rcvq, pcblist[i].ki_sndq,
- src.sin_addr, src.sin_port,
- dst.sin_addr, dst.sin_port,
- pcblist[i].ki_tstate, name,
- pcblist[i].ki_pflags, NULL);
- }
+}
- free(pcblist);
- goto end;
+static struct kinfo_pcb *
+getpcblist_kmem(u_long off, const char *name, size_t *len) {
+ struct inpcbtable table;
+ struct inpcb *head, *next, *prev;
+ struct inpcb inpcb;
+ struct tcpcb tcpcb;
+ struct socket sockb;
+ int istcp = strcmp(name, tcp) == 0;
+ struct kinfo_pcb *pcblist;
+ size_t size = 100, i;
+ struct sockaddr_in sin;
+
+ if (off == 0) {
+ *len = 0;
+ return NULL;
}
- if (off == 0)
- return;
kread(off, (char *)table, sizeof table);
prev = head =
(struct inpcb
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 07:07:23 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.1 Log Message: Ticket #912. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-6.1.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.1 diff -u src/doc/CHANGES-6.1.1:1.1.2.11 src/doc/CHANGES-6.1.1:1.1.2.12 --- src/doc/CHANGES-6.1.1:1.1.2.11 Mon Jul 29 02:17:32 2013 +++ src/doc/CHANGES-6.1.1 Mon Jul 29 07:07:23 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.1,v 1.1.2.11 2013/07/29 02:17:32 msaitoh Exp $ +# $NetBSD: CHANGES-6.1.1,v 1.1.2.12 2013/07/29 07:07:23 msaitoh Exp $ A complete list of changes from the NetBSD 6.1 release to the NetBSD 6.1.1 release: @@ -128,3 +128,13 @@ external/bsd/bind/dist/lib/dns/rdata/gen Fix for bind CVE-2013-4854. [spz, ticket #924] + +usr.bin/netstat/inet.c1.102-1.03 +usr.bin/netstat/inet6.c1.61-1.62 +usr.bin/netstat/main.c1.86 +usr.bin/netstat/netstat.h 1.47 + + Don't use -P as a kmem printer, verify that the address points to a + pcb first! + Not all pointers are 64bit - use uintptr_t instead of uint64_t. + [christos, ticket #912]
CVS commit: [netbsd-6-0] src/usr.bin/netstat
Module Name:src
Committed By: msaitoh
Date: Mon Jul 29 07:10:13 UTC 2013
Modified Files:
src/usr.bin/netstat [netbsd-6-0]: inet.c inet6.c main.c netstat.h
Log Message:
Pull up following revision(s) (requested by christos in ticket #912):
usr.bin/netstat/main.c: revision 1.86
usr.bin/netstat/netstat.h: revision 1.47
usr.bin/netstat/inet.c: revision 1.102
usr.bin/netstat/inet.c: revision 1.103
usr.bin/netstat/inet6.c: revision 1.61
usr.bin/netstat/inet6.c: revision 1.62
Don't use -P as a kmem printer, verify that the address points to a pcb first!
Not all pointers are 64bit - use uintptr_t instead of uint64_t.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.101.8.1 src/usr.bin/netstat/inet.c
cvs rdiff -u -r1.59 -r1.59.12.1 src/usr.bin/netstat/inet6.c
cvs rdiff -u -r1.81 -r1.81.8.1 src/usr.bin/netstat/main.c
cvs rdiff -u -r1.43 -r1.43.8.1 src/usr.bin/netstat/netstat.h
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/inet.c
diff -u src/usr.bin/netstat/inet.c:1.101 src/usr.bin/netstat/inet.c:1.101.8.1
--- src/usr.bin/netstat/inet.c:1.101 Sat Dec 24 20:18:35 2011
+++ src/usr.bin/netstat/inet.c Mon Jul 29 07:10:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: inet.c,v 1.101 2011/12/24 20:18:35 christos Exp $ */
+/* $NetBSD: inet.c,v 1.101.8.1 2013/07/29 07:10:13 msaitoh Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)inet.c 8.4 (Berkeley) 4/20/94;
#else
-__RCSID($NetBSD: inet.c,v 1.101 2011/12/24 20:18:35 christos Exp $);
+__RCSID($NetBSD: inet.c,v 1.101.8.1 2013/07/29 07:10:13 msaitoh Exp $);
#endif
#endif /* not lint */
@@ -226,96 +226,72 @@ print_vtw_v4(const vtw_t *vtw)
TCPS_TIME_WAIT, tcp, 0, vtw-expire);
}
-void
-protopr(u_long off, const char *name)
-{
- struct inpcbtable table;
- struct inpcb *head, *next, *prev;
- struct inpcb inpcb;
- struct tcpcb tcpcb;
- struct socket sockb;
- int istcp = strcmp(name, tcp) == 0;
- static int first = 1;
-
- compact = 0;
- if (Aflag) {
- if (!numeric_addr)
- width = 18;
- else {
- width = 21;
- compact = 1;
- }
- } else
- width = 22;
-
- if (use_sysctl) {
- struct kinfo_pcb *pcblist;
- int mib[8];
- size_t namelen = 0, size = 0, i;
- char *mibname = NULL;
-
- memset(mib, 0, sizeof(mib));
+struct kinfo_pcb *
+getpcblist_sysctl(const char *name, size_t *len) {
+ int mib[8];
+ size_t namelen = 0, size = 0;
+ char *mibname = NULL;
+ struct kinfo_pcb *pcblist;
- if (asprintf(mibname, net.inet.%s.pcblist, name) == -1)
- err(1, asprintf);
+ memset(mib, 0, sizeof(mib));
- /* get dynamic pcblist node */
- if (sysctlnametomib(mibname, mib, namelen) == -1)
- err(1, sysctlnametomib: %s, mibname);
+ if (asprintf(mibname, net.inet%s.%s.pcblist, name + 3, name) == -1)
+ err(1, asprintf);
- if (prog_sysctl(mib, __arraycount(mib),
- NULL, size, NULL, 0) == -1)
- err(1, sysctl (query));
+ /* get dynamic pcblist node */
+ if (sysctlnametomib(mibname, mib, namelen) == -1)
+ err(1, sysctlnametomib: %s, mibname);
- if ((pcblist = malloc(size)) == NULL)
- err(1, malloc);
- memset(pcblist, 0, size);
+ free(mibname);
- mib[6] = sizeof(*pcblist);
- mib[7] = size / sizeof(*pcblist);
+ if (prog_sysctl(mib, __arraycount(mib), NULL, size, NULL, 0) == -1)
+ err(1, sysctl (query));
- if (prog_sysctl(mib, __arraycount(mib),
- pcblist, size, NULL, 0) == -1)
- err(1, sysctl (copy));
+ if ((pcblist = malloc(size)) == NULL)
+ err(1, malloc);
+ memset(pcblist, 0, size);
- for (i = 0; i size / sizeof(*pcblist); i++) {
- struct sockaddr_in src, dst;
+ mib[6] = sizeof(*pcblist);
+ mib[7] = size / sizeof(*pcblist);
- memcpy(src, pcblist[i].ki_s, sizeof(src));
- memcpy(dst, pcblist[i].ki_d, sizeof(dst));
+ if (prog_sysctl(mib, __arraycount(mib), pcblist, size, NULL, 0) == -1)
+ err(1, sysctl (copy));
- if (!aflag
- inet_lnaof(dst.sin_addr) == INADDR_ANY)
-continue;
+ *len = size / sizeof(*pcblist);
+ return pcblist;
- if (first) {
-protoprhdr();
-first = 0;
- }
-
- protopr0((intptr_t) pcblist[i].ki_ppcbaddr,
- pcblist[i].ki_rcvq, pcblist[i].ki_sndq,
- src.sin_addr, src.sin_port,
- dst.sin_addr, dst.sin_port,
- pcblist[i].ki_tstate, name,
- pcblist[i].ki_pflags, NULL);
- }
+}
- free(pcblist);
- goto end;
+static struct kinfo_pcb *
+getpcblist_kmem(u_long off, const char *name, size_t *len) {
+ struct inpcbtable table;
+ struct inpcb *head, *next, *prev;
+ struct inpcb inpcb;
+ struct tcpcb tcpcb;
+ struct socket sockb;
+ int istcp = strcmp(name, tcp) == 0;
+ struct kinfo_pcb *pcblist;
+ size_t size = 100, i;
+ struct sockaddr_in sin;
+
+ if (off == 0) {
+ *len = 0;
+ return NULL;
}
- if (off == 0)
- return;
kread(off, (char *)table, sizeof table);
prev = head =
(struct inpcb *)((struct
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 07:10:33 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.3 Log Message: Ticket #912 To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-6.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-6.0.3 diff -u src/doc/CHANGES-6.0.3:1.1.2.11 src/doc/CHANGES-6.0.3:1.1.2.12 --- src/doc/CHANGES-6.0.3:1.1.2.11 Mon Jul 29 02:18:28 2013 +++ src/doc/CHANGES-6.0.3 Mon Jul 29 07:10:33 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.3,v 1.1.2.11 2013/07/29 02:18:28 msaitoh Exp $ +# $NetBSD: CHANGES-6.0.3,v 1.1.2.12 2013/07/29 07:10:33 msaitoh Exp $ A complete list of changes from the NetBSD 6.0.2 release to the NetBSD 6.0.3 release: @@ -128,3 +128,13 @@ external/bsd/bind/dist/lib/dns/rdata/gen Fix for bind CVE-2013-4854. [spz, ticket #924] + +usr.bin/netstat/inet.c1.102-1.03 +usr.bin/netstat/inet6.c1.61-1.62 +usr.bin/netstat/main.c1.86 +usr.bin/netstat/netstat.h 1.47 + + Don't use -P as a kmem printer, verify that the address points to a + pcb first! + Not all pointers are 64bit - use uintptr_t instead of uint64_t. + [christos, ticket #912]
CVS commit: [netbsd-6] src
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:11:53 UTC 2013 Modified Files: src/share/man/man4 [netbsd-6]: re.4 src/sys/dev/ic [netbsd-6]: rtl8169.c rtl81x9reg.h Log Message: Pull up following revision(s) (requested by khorben in ticket #913): sys/dev/ic/rtl8169.c: revision 1.137 sys/dev/ic/rtl81x9reg.h: revision 1.44 share/man/man4/re.4: revision 1.14 Added support for the Realtek 8168F variant in re(4). From FreeBSD; not tested on real hardware unfortunately. The manual page was adjusted as well. No objection from current-users@, commit it gdt@ To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.10.1 src/share/man/man4/re.4 cvs rdiff -u -r1.134.4.1 -r1.134.4.2 src/sys/dev/ic/rtl8169.c cvs rdiff -u -r1.42.4.1 -r1.42.4.2 src/sys/dev/ic/rtl81x9reg.h 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/re.4 diff -u src/share/man/man4/re.4:1.13 src/share/man/man4/re.4:1.13.10.1 --- src/share/man/man4/re.4:1.13 Fri Jan 15 19:24:49 2010 +++ src/share/man/man4/re.4 Mon Jul 29 08:11:53 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: re.4,v 1.13 2010/01/15 19:24:49 joerg Exp $ +.\ $NetBSD: re.4,v 1.13.10.1 2013/07/29 08:11:53 msaitoh Exp $ .\ .\ Copyright (c) 2003 .\ Bill Paul wp...@windriver.com. All rights reserved. @@ -32,12 +32,12 @@ .\ .\ $FreeBSD: src/share/man/man4/re.4,v 1.4 2004/03/04 06:42:46 sanpei Exp $ .\ -.Dd January 8, 2007 +.Dd April 6, 2013 .Dt RE 4 .Os .Sh NAME .Nm re -.Nd RealTek 8139C+/8169/8169S/8110S PCI Ethernet adapter driver +.Nd RealTek 8139C+/8169/8169S/8168/8110S/8111 PCI Ethernet adapter driver .Sh SYNOPSIS .Cd re* at pci? dev ? function ? .Cd re* at cardbus? function ? @@ -45,8 +45,8 @@ The .Nm driver provides support for various NICs based on the RealTek RTL8139C+, -RTL8169, RTL8169S, and RTL8110S PCI/Cardbus Ethernet controllers, including -the following: +RTL8169, RTL8169S, RTL8168, and RTL8110S PCI/Cardbus Ethernet controllers, +including the following: .Pp .Bl -bullet -compact .It @@ -73,7 +73,7 @@ Linksys EG1032 rev. 3 Gigabit Ethernet ( .Pp NICs based on the 8139C+ are capable of 10 and 100Mbps speeds over CAT5 cable. -NICs based on the 8169, 8169S, and 8110S are capable of 10, 100, and +NICs based on the 8169, 8169S, 8168, and 8110S are capable of 10, 100, and 1000Mbps operation. .Pp All NICs supported by the Index: src/sys/dev/ic/rtl8169.c diff -u src/sys/dev/ic/rtl8169.c:1.134.4.1 src/sys/dev/ic/rtl8169.c:1.134.4.2 --- src/sys/dev/ic/rtl8169.c:1.134.4.1 Mon Mar 5 20:31:49 2012 +++ src/sys/dev/ic/rtl8169.c Mon Jul 29 08:11:53 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rtl8169.c,v 1.134.4.1 2012/03/05 20:31:49 sborrill Exp $ */ +/* $NetBSD: rtl8169.c,v 1.134.4.2 2013/07/29 08:11:53 msaitoh Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -33,11 +33,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rtl8169.c,v 1.134.4.1 2012/03/05 20:31:49 sborrill Exp $); +__KERNEL_RCSID(0, $NetBSD: rtl8169.c,v 1.134.4.2 2013/07/29 08:11:53 msaitoh Exp $); /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */ /* - * RealTek 8139C+/8169/8169S/8110S PCI NIC driver + * RealTek 8139C+/8169/8169S/8168/8110S PCI NIC driver * * Written by Bill Paul wp...@windriver.com * Senior Networking Software Engineer @@ -47,8 +47,8 @@ __KERNEL_RCSID(0, $NetBSD: rtl8169.c,v /* * This driver is designed to support RealTek's next generation of * 10/100 and 10/100/1000 PCI ethernet controllers. There are currently - * four devices in this family: the RTL8139C+, the RTL8169, the RTL8169S - * and the RTL8110S. + * six devices in this family: the RTL8139C+, the RTL8169, the RTL8169S, + * RTL8110S, the RTL8168 and the RTL8111. * * The 8139C+ is a 10/100 ethernet chip. It is backwards compatible * with the older 8139 family, however it also supports a special @@ -607,6 +607,7 @@ re_attach(struct rtk_softc *sc) RTKQ_NOJUMBO; break; case RTK_HWREV_8168E_VL: + case RTK_HWREV_8168F: sc-sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD | RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_NOJUMBO; break; Index: src/sys/dev/ic/rtl81x9reg.h diff -u src/sys/dev/ic/rtl81x9reg.h:1.42.4.1 src/sys/dev/ic/rtl81x9reg.h:1.42.4.2 --- src/sys/dev/ic/rtl81x9reg.h:1.42.4.1 Mon Mar 5 20:31:49 2012 +++ src/sys/dev/ic/rtl81x9reg.h Mon Jul 29 08:11:53 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rtl81x9reg.h,v 1.42.4.1 2012/03/05 20:31:49 sborrill Exp $ */ +/* $NetBSD: rtl81x9reg.h,v 1.42.4.2 2013/07/29 08:11:53 msaitoh Exp $ */ /* * Copyright (c) 1997, 1998 @@ -164,6 +164,7 @@ #define RTK_HWREV_8168DP 0x2880 #define RTK_HWREV_8168E 0x2C00 #define RTK_HWREV_8168E_VL 0x2C80 +#define RTK_HWREV_8168F 0x4800 #define RTK_HWREV_8168_SPIN1 0x3000 #define RTK_HWREV_8100E 0x3080 #define RTK_HWREV_8101E 0x3400
CVS commit: [netbsd-6] src/usr.bin/mklocale
Module Name:src
Committed By: msaitoh
Date: Mon Jul 29 08:15:39 UTC 2013
Modified Files:
src/usr.bin/mklocale [netbsd-6]: mklocaledb.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #914):
usr.bin/mklocale/mklocaledb.c: revision 1.3
Swap order of _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES and
_CITRUS_LC_MONETARY_SYM_INT_P_SEP_BY_SPACE to match data files.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.12.1 src/usr.bin/mklocale/mklocaledb.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/mklocale/mklocaledb.c
diff -u src/usr.bin/mklocale/mklocaledb.c:1.2 src/usr.bin/mklocale/mklocaledb.c:1.2.12.1
--- src/usr.bin/mklocale/mklocaledb.c:1.2 Mon Jan 5 02:55:34 2009
+++ src/usr.bin/mklocale/mklocaledb.c Mon Jul 29 08:15:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mklocaledb.c,v 1.2 2009/01/05 02:55:34 dogcow Exp $ */
+/* $NetBSD: mklocaledb.c,v 1.2.12.1 2013/07/29 08:15:39 msaitoh Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -37,7 +37,7 @@
#include sys/cdefs.h
#if !defined(lint)
-__RCSID($NetBSD: mklocaledb.c,v 1.2 2009/01/05 02:55:34 dogcow Exp $);
+__RCSID($NetBSD: mklocaledb.c,v 1.2.12.1 2013/07/29 08:15:39 msaitoh Exp $);
#endif /* not lint */
#include assert.h
@@ -136,8 +136,8 @@ static const category_t lc_monetary = {
{ _CITRUS_LC_MONETARY_SYM_P_SIGN_POSN,save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_N_SIGN_POSN,save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_P_CS_PRECEDES, save_as_uint8},
- { _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES, save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_P_SEP_BY_SPACE, save_as_uint8},
+ { _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES, save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_N_SEP_BY_SPACE, save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_P_SIGN_POSN,save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_N_SIGN_POSN,save_as_uint8},
CVS commit: [netbsd-6] src/sys/miscfs/procfs
Module Name:src
Committed By: msaitoh
Date: Mon Jul 29 08:17:55 UTC 2013
Modified Files:
src/sys/miscfs/procfs [netbsd-6]: procfs_map.c
Log Message:
Pull up following revision(s) (requested by ryo in ticket #917):
sys/miscfs/procfs/procfs_map.c: revision 1.43
PR/48048: Add a missing vm_map_unlock_read() and uvmspace_free() to the ENOMEM
error case in procfs_domap()d
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/miscfs/procfs/procfs_map.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/miscfs/procfs/procfs_map.c
diff -u src/sys/miscfs/procfs/procfs_map.c:1.41 src/sys/miscfs/procfs/procfs_map.c:1.41.8.1
--- src/sys/miscfs/procfs/procfs_map.c:1.41 Sun Oct 16 12:26:16 2011
+++ src/sys/miscfs/procfs/procfs_map.c Mon Jul 29 08:17:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_map.c,v 1.41 2011/10/16 12:26:16 hannken Exp $ */
+/* $NetBSD: procfs_map.c,v 1.41.8.1 2013/07/29 08:17:55 msaitoh Exp $ */
/*
* Copyright (c) 1993
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: procfs_map.c,v 1.41 2011/10/16 12:26:16 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: procfs_map.c,v 1.41.8.1 2013/07/29 08:17:55 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -207,6 +207,8 @@ again:
bufsize = 1;
if (bufsize MAXBUFFERSIZE) {
error = ENOMEM;
+vm_map_unlock_read(map);
+uvmspace_free(vm);
goto out;
}
free(buffer, M_TEMP);
CVS commit: [netbsd-6-1] src/sys/miscfs/procfs
Module Name:src
Committed By: msaitoh
Date: Mon Jul 29 08:23:16 UTC 2013
Modified Files:
src/sys/miscfs/procfs [netbsd-6-1]: procfs_map.c
Log Message:
Pull up following revision(s) (requested by ryo in ticket #917):
sys/miscfs/procfs/procfs_map.c: revision 1.43
PR/48048: Add a missing vm_map_unlock_read() and uvmspace_free() to the ENOMEM
error case in procfs_domap()d
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.14.1 src/sys/miscfs/procfs/procfs_map.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/miscfs/procfs/procfs_map.c
diff -u src/sys/miscfs/procfs/procfs_map.c:1.41 src/sys/miscfs/procfs/procfs_map.c:1.41.14.1
--- src/sys/miscfs/procfs/procfs_map.c:1.41 Sun Oct 16 12:26:16 2011
+++ src/sys/miscfs/procfs/procfs_map.c Mon Jul 29 08:23:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_map.c,v 1.41 2011/10/16 12:26:16 hannken Exp $ */
+/* $NetBSD: procfs_map.c,v 1.41.14.1 2013/07/29 08:23:16 msaitoh Exp $ */
/*
* Copyright (c) 1993
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: procfs_map.c,v 1.41 2011/10/16 12:26:16 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: procfs_map.c,v 1.41.14.1 2013/07/29 08:23:16 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -207,6 +207,8 @@ again:
bufsize = 1;
if (bufsize MAXBUFFERSIZE) {
error = ENOMEM;
+vm_map_unlock_read(map);
+uvmspace_free(vm);
goto out;
}
free(buffer, M_TEMP);
CVS commit: [netbsd-6-0] src/sys/miscfs/procfs
Module Name:src
Committed By: msaitoh
Date: Mon Jul 29 08:24:09 UTC 2013
Modified Files:
src/sys/miscfs/procfs [netbsd-6-0]: procfs_map.c
Log Message:
Pull up following revision(s) (requested by ryo in ticket #917):
sys/miscfs/procfs/procfs_map.c: revision 1.43
PR/48048: Add a missing vm_map_unlock_read() and uvmspace_free() to the ENOMEM
error case in procfs_domap()d
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.12.1 src/sys/miscfs/procfs/procfs_map.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/miscfs/procfs/procfs_map.c
diff -u src/sys/miscfs/procfs/procfs_map.c:1.41 src/sys/miscfs/procfs/procfs_map.c:1.41.12.1
--- src/sys/miscfs/procfs/procfs_map.c:1.41 Sun Oct 16 12:26:16 2011
+++ src/sys/miscfs/procfs/procfs_map.c Mon Jul 29 08:24:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_map.c,v 1.41 2011/10/16 12:26:16 hannken Exp $ */
+/* $NetBSD: procfs_map.c,v 1.41.12.1 2013/07/29 08:24:09 msaitoh Exp $ */
/*
* Copyright (c) 1993
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: procfs_map.c,v 1.41 2011/10/16 12:26:16 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: procfs_map.c,v 1.41.12.1 2013/07/29 08:24:09 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -207,6 +207,8 @@ again:
bufsize = 1;
if (bufsize MAXBUFFERSIZE) {
error = ENOMEM;
+vm_map_unlock_read(map);
+uvmspace_free(vm);
goto out;
}
free(buffer, M_TEMP);
CVS commit: [netbsd-6] src/etc
Module Name:src
Committed By: msaitoh
Date: Mon Jul 29 08:29:35 UTC 2013
Modified Files:
src/etc [netbsd-6]: MAKEDEV.tmpl
Log Message:
Pull up following revision(s) (requested by martin in ticket #919):
etc/MAKEDEV.tmpl: revision 1.166
Add a makedisk_p12high, used by VAX now after unbumping MAXPARTITIONS from
16 down to 12. This fixes install issues on new setups.
To generate a diff of this commit:
cvs rdiff -u -r1.151.2.9 -r1.151.2.10 src/etc/MAKEDEV.tmpl
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.9 src/etc/MAKEDEV.tmpl:1.151.2.10
--- src/etc/MAKEDEV.tmpl:1.151.2.9 Wed Feb 13 01:36:06 2013
+++ src/etc/MAKEDEV.tmpl Mon Jul 29 08:29:35 2013
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.151.2.9 2013/02/13 01:36:06 riz Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.151.2.10 2013/07/29 08:29:35 msaitoh Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -2160,6 +2160,37 @@ makedisk_p8()
mkdev r${name}${unit}h c $chr $(($unit * 8 + 7)) 640 $g_operator
}
+makedisk_p12high()
+{
+ ho=524280 # offset for partition 9 to 11 (same as ...p16high)
+ name=$1; unit=$2; blk=$3; chr=$4
+
+ mkdev ${name}${unit}a b $blk $(($unit * 8 + 0)) 640 $g_operator
+ mkdev ${name}${unit}b b $blk $(($unit * 8 + 1)) 640 $g_operator
+ mkdev ${name}${unit}c b $blk $(($unit * 8 + 2)) 640 $g_operator
+ mkdev ${name}${unit}d b $blk $(($unit * 8 + 3)) 640 $g_operator
+ mkdev ${name}${unit}e b $blk $(($unit * 8 + 4)) 640 $g_operator
+ mkdev ${name}${unit}f b $blk $(($unit * 8 + 5)) 640 $g_operator
+ mkdev ${name}${unit}g b $blk $(($unit * 8 + 6)) 640 $g_operator
+ mkdev ${name}${unit}h b $blk $(($unit * 8 + 7)) 640 $g_operator
+ mkdev ${name}${unit}i b $blk $(($unit * 8 + $ho + 8)) 640 $g_operator
+ mkdev ${name}${unit}j b $blk $(($unit * 8 + $ho + 9)) 640 $g_operator
+ mkdev ${name}${unit}k b $blk $(($unit * 8 + $ho + 10)) 640 $g_operator
+ mkdev ${name}${unit}l b $blk $(($unit * 8 + $ho + 11)) 640 $g_operator
+ mkdev r${name}${unit}a c $chr $(($unit * 8 + 0)) 640 $g_operator
+ mkdev r${name}${unit}b c $chr $(($unit * 8 + 1)) 640 $g_operator
+ mkdev r${name}${unit}c c $chr $(($unit * 8 + 2)) 640 $g_operator
+ mkdev r${name}${unit}d c $chr $(($unit * 8 + 3)) 640 $g_operator
+ mkdev r${name}${unit}e c $chr $(($unit * 8 + 4)) 640 $g_operator
+ mkdev r${name}${unit}f c $chr $(($unit * 8 + 5)) 640 $g_operator
+ mkdev r${name}${unit}g c $chr $(($unit * 8 + 6)) 640 $g_operator
+ mkdev r${name}${unit}h c $chr $(($unit * 8 + 7)) 640 $g_operator
+ mkdev r${name}${unit}i c $chr $(($unit * 8 + $ho + 8)) 640 $g_operator
+ mkdev r${name}${unit}j c $chr $(($unit * 8 + $ho + 9)) 640 $g_operator
+ mkdev r${name}${unit}k c $chr $(($unit * 8 + $ho + 10)) 640 $g_operator
+ mkdev r${name}${unit}l c $chr $(($unit * 8 + $ho + 11)) 640 $g_operator
+}
+
makedisk_p16()
{
name=$1; unit=$2; blk=$3; chr=$4
CVS commit: [netbsd-6-1] src/etc
Module Name:src
Committed By: msaitoh
Date: Mon Jul 29 08:53:44 UTC 2013
Modified Files:
src/etc [netbsd-6-1]: MAKEDEV.tmpl
Log Message:
Pull up following revision(s) (requested by martin in ticket #919):
etc/MAKEDEV.tmpl: revision 1.166
Add a makedisk_p12high, used by VAX now after unbumping MAXPARTITIONS from
16 down to 12. This fixes install issues on new setups.
To generate a diff of this commit:
cvs rdiff -u -r1.151.2.9 -r1.151.2.9.2.1 src/etc/MAKEDEV.tmpl
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.9 src/etc/MAKEDEV.tmpl:1.151.2.9.2.1
--- src/etc/MAKEDEV.tmpl:1.151.2.9 Wed Feb 13 01:36:06 2013
+++ src/etc/MAKEDEV.tmpl Mon Jul 29 08:53:44 2013
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.151.2.9 2013/02/13 01:36:06 riz Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.151.2.9.2.1 2013/07/29 08:53:44 msaitoh Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -2160,6 +2160,37 @@ makedisk_p8()
mkdev r${name}${unit}h c $chr $(($unit * 8 + 7)) 640 $g_operator
}
+makedisk_p12high()
+{
+ ho=524280 # offset for partition 9 to 11 (same as ...p16high)
+ name=$1; unit=$2; blk=$3; chr=$4
+
+ mkdev ${name}${unit}a b $blk $(($unit * 8 + 0)) 640 $g_operator
+ mkdev ${name}${unit}b b $blk $(($unit * 8 + 1)) 640 $g_operator
+ mkdev ${name}${unit}c b $blk $(($unit * 8 + 2)) 640 $g_operator
+ mkdev ${name}${unit}d b $blk $(($unit * 8 + 3)) 640 $g_operator
+ mkdev ${name}${unit}e b $blk $(($unit * 8 + 4)) 640 $g_operator
+ mkdev ${name}${unit}f b $blk $(($unit * 8 + 5)) 640 $g_operator
+ mkdev ${name}${unit}g b $blk $(($unit * 8 + 6)) 640 $g_operator
+ mkdev ${name}${unit}h b $blk $(($unit * 8 + 7)) 640 $g_operator
+ mkdev ${name}${unit}i b $blk $(($unit * 8 + $ho + 8)) 640 $g_operator
+ mkdev ${name}${unit}j b $blk $(($unit * 8 + $ho + 9)) 640 $g_operator
+ mkdev ${name}${unit}k b $blk $(($unit * 8 + $ho + 10)) 640 $g_operator
+ mkdev ${name}${unit}l b $blk $(($unit * 8 + $ho + 11)) 640 $g_operator
+ mkdev r${name}${unit}a c $chr $(($unit * 8 + 0)) 640 $g_operator
+ mkdev r${name}${unit}b c $chr $(($unit * 8 + 1)) 640 $g_operator
+ mkdev r${name}${unit}c c $chr $(($unit * 8 + 2)) 640 $g_operator
+ mkdev r${name}${unit}d c $chr $(($unit * 8 + 3)) 640 $g_operator
+ mkdev r${name}${unit}e c $chr $(($unit * 8 + 4)) 640 $g_operator
+ mkdev r${name}${unit}f c $chr $(($unit * 8 + 5)) 640 $g_operator
+ mkdev r${name}${unit}g c $chr $(($unit * 8 + 6)) 640 $g_operator
+ mkdev r${name}${unit}h c $chr $(($unit * 8 + 7)) 640 $g_operator
+ mkdev r${name}${unit}i c $chr $(($unit * 8 + $ho + 8)) 640 $g_operator
+ mkdev r${name}${unit}j c $chr $(($unit * 8 + $ho + 9)) 640 $g_operator
+ mkdev r${name}${unit}k c $chr $(($unit * 8 + $ho + 10)) 640 $g_operator
+ mkdev r${name}${unit}l c $chr $(($unit * 8 + $ho + 11)) 640 $g_operator
+}
+
makedisk_p16()
{
name=$1; unit=$2; blk=$3; chr=$4
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:57:41 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.3 Log Message: Ticket 917. To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-6.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-6.0.3 diff -u src/doc/CHANGES-6.0.3:1.1.2.12 src/doc/CHANGES-6.0.3:1.1.2.13 --- src/doc/CHANGES-6.0.3:1.1.2.12 Mon Jul 29 07:10:33 2013 +++ src/doc/CHANGES-6.0.3 Mon Jul 29 08:57:41 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.3,v 1.1.2.12 2013/07/29 07:10:33 msaitoh Exp $ +# $NetBSD: CHANGES-6.0.3,v 1.1.2.13 2013/07/29 08:57:41 msaitoh Exp $ A complete list of changes from the NetBSD 6.0.2 release to the NetBSD 6.0.3 release: @@ -138,3 +138,9 @@ usr.bin/netstat/netstat.h 1.47 pcb first! Not all pointers are 64bit - use uintptr_t instead of uint64_t. [christos, ticket #912] + +sys/miscfs/procfs/procfs_map.c 1.43 + + Add a missing vm_map_unlock_read() and uvmspace_free() to the ENOMEM + error case in procfs_domap()d. Fixes PR#48048. + [ryo, ticket #917]
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:56:52 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 913, 914, 917 and 919. To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-6.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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.20 src/doc/CHANGES-6.2:1.1.2.21 --- src/doc/CHANGES-6.2:1.1.2.20 Mon Jul 29 06:47:57 2013 +++ src/doc/CHANGES-6.2 Mon Jul 29 08:56:52 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.20 2013/07/29 06:47:57 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.21 2013/07/29 08:56:52 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -364,3 +364,29 @@ usr.bin/netstat/netstat.h 1.47 pcb first! Not all pointers are 64bit - use uintptr_t instead of uint64_t. [christos, ticket #912] + +share/man/man4/re.41.14 +sys/dev/ic/rtl8169.c1.137 +sys/dev/ic/rtl81x9reg.h1.44 + + Added support for the Realtek 8168F variant in re(4). + The manual page was adjusted as well. + [khorben, ticket #913] + +usr.bin/mklocale/mklocaledb.c 1.3 + + Swap order of _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES and + _CITRUS_LC_MONETARY_SYM_INT_P_SEP_BY_SPACE to match data files. + [joerg, ticket #914] + +sys/miscfs/procfs/procfs_map.c 1.43 + + Add a missing vm_map_unlock_read() and uvmspace_free() to the ENOMEM + error case in procfs_domap()d. Fixes PR#48048. + [ryo, ticket #917] + +etc/MAKEDEV.tmpl1.166 + + Add a makedisk_p12high, used by VAX now after unbumping MAXPARTITIONS + from 16 down to 12. This fixes install issues on new setups. + [martin, ticket #919]
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:57:20 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.1 Log Message: Ticket 917 and 919. To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-6.1.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.1 diff -u src/doc/CHANGES-6.1.1:1.1.2.12 src/doc/CHANGES-6.1.1:1.1.2.13 --- src/doc/CHANGES-6.1.1:1.1.2.12 Mon Jul 29 07:07:23 2013 +++ src/doc/CHANGES-6.1.1 Mon Jul 29 08:57:19 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.1,v 1.1.2.12 2013/07/29 07:07:23 msaitoh Exp $ +# $NetBSD: CHANGES-6.1.1,v 1.1.2.13 2013/07/29 08:57:19 msaitoh Exp $ A complete list of changes from the NetBSD 6.1 release to the NetBSD 6.1.1 release: @@ -138,3 +138,15 @@ usr.bin/netstat/netstat.h 1.47 pcb first! Not all pointers are 64bit - use uintptr_t instead of uint64_t. [christos, ticket #912] + +sys/miscfs/procfs/procfs_map.c 1.43 + + Add a missing vm_map_unlock_read() and uvmspace_free() to the ENOMEM + error case in procfs_domap()d. Fixes PR#48048. + [ryo, ticket #917] + +etc/MAKEDEV.tmpl1.166 + + Add a makedisk_p12high, used by VAX now after unbumping MAXPARTITIONS + from 16 down to 12. This fixes install issues on new setups. + [martin, ticket #919]
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Mon Jul 29 10:13:21 UTC 2013
Modified Files:
src/lib/librumphijack: Makefile
Log Message:
Override ssp also in case where it doesn't come intrinsically
from the compiler.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/librumphijack/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/Makefile
diff -u src/lib/librumphijack/Makefile:1.11 src/lib/librumphijack/Makefile:1.12
--- src/lib/librumphijack/Makefile:1.11 Sat Jul 27 17:37:29 2013
+++ src/lib/librumphijack/Makefile Mon Jul 29 10:13:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/07/27 17:37:29 pooka Exp $
+# $NetBSD: Makefile,v 1.12 2013/07/29 10:13:21 pooka Exp $
#
LIB= rumphijack
@@ -11,7 +11,6 @@ MAN= rumphijack.3
SRCS= hijack.c hijackdlsym.c
CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT -I${.CURDIR}/../librumpuser
-CPPFLAGS+= -U_FORTIFY_SOURCE
WARNS?= 5
@@ -19,4 +18,8 @@ WARNS?= 5
# a stack frame
COPTS.hijackdlsym.c+= -O0
+.include bsd.sys.mk
+
+CPPFLAGS+= -U_FORTIFY_SOURCE
+
.include bsd.lib.mk
CVS commit: src/tests/lib/libc/db
Module Name:src
Committed By: skrll
Date: Mon Jul 29 10:43:15 UTC 2013
Modified Files:
src/tests/lib/libc/db: t_db.sh
Log Message:
Increase timeout. My hardware must be getting slower.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/db/t_db.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/db/t_db.sh
diff -u src/tests/lib/libc/db/t_db.sh:1.3 src/tests/lib/libc/db/t_db.sh:1.4
--- src/tests/lib/libc/db/t_db.sh:1.3 Sat Dec 10 17:50:19 2011
+++ src/tests/lib/libc/db/t_db.sh Mon Jul 29 10:43:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: t_db.sh,v 1.3 2011/12/10 17:50:19 skrll Exp $
+# $NetBSD: t_db.sh,v 1.4 2013/07/29 10:43:15 skrll Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -801,7 +801,7 @@ ffactor=$ffactor,nelem=25000,cachesize=6
atf_test_case bsize_ffactor
bsize_ffactor_head()
{
- atf_set timeout 360
+ atf_set timeout 480
atf_set descr Checks hash database with various \
bucketsizes and fill factors
}
CVS commit: src/lib/libc/sys
Module Name:src Committed By: njoly Date: Mon Jul 29 11:40:04 UTC 2013 Modified Files: src/lib/libc/sys: symlink.2 Log Message: Add symlinkat(2) specific errors. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/lib/libc/sys/symlink.2 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/sys/symlink.2 diff -u src/lib/libc/sys/symlink.2:1.25 src/lib/libc/sys/symlink.2:1.26 --- src/lib/libc/sys/symlink.2:1.25 Sun Jan 13 08:15:02 2013 +++ src/lib/libc/sys/symlink.2 Mon Jul 29 11:40:04 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: symlink.2,v 1.25 2013/01/13 08:15:02 dholland Exp $ +.\ $NetBSD: symlink.2,v 1.26 2013/07/29 11:40:04 njoly Exp $ .\ .\ Copyright (c) 1983, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)symlink.2 8.1 (Berkeley) 6/4/93 .\ -.Dd November 18, 2012 +.Dd July 29, 2013 .Dt SYMLINK 2 .Os .Sh NAME @@ -84,12 +84,12 @@ can be set to .Dv AT_FDCWD in order to specify the current directory. .Sh RETURN VALUES -Upon successful completion, a zero value is returned. -If an error occurs, the error code is stored in -.Va errno -and a \-1 value is returned. +.Rv -std symlink symlinkat .Sh ERRORS -The symbolic link succeeds unless: +.Fn symlink +and +.Fn symlinkat +will fail and no link will be created if: .Bl -tag -width Er .It Bq Er EACCES A component of the @@ -151,6 +151,24 @@ The file .Fa name2 would reside on a read-only file system. .El +.Pp +In addition, +.Fn symlinkat +will fail if: +.Bl -tag -width Er +.It Bq Er EBADF +.Fa name2 +does not specify an absolute path and +.Fa fd +is neither +.Dv AT_FDCWD +nor a valid file descriptor open for reading or searching. +.It Bq Er ENOTDIR +.Fa name2 +is not an absolute path and +.Fa fd +is a file descriptor associated with a non-directory file. +.El .Sh SEE ALSO .Xr ln 1 , .Xr link 2 ,
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Mon Jul 29 11:49:31 UTC 2013 Modified Files: src/lib/libc/sys: readlink.2 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libc/sys/readlink.2 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/sys/readlink.2 diff -u src/lib/libc/sys/readlink.2:1.31 src/lib/libc/sys/readlink.2:1.32 --- src/lib/libc/sys/readlink.2:1.31 Sun Jul 28 21:24:12 2013 +++ src/lib/libc/sys/readlink.2 Mon Jul 29 11:49:31 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: readlink.2,v 1.31 2013/07/28 21:24:12 njoly Exp $ +.\ $NetBSD: readlink.2,v 1.32 2013/07/29 11:49:31 wiz Exp $ .\ .\ Copyright (c) 1983, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)readlink.2 8.1 (Berkeley) 6/4/93 .\ -.Dd November 18, 2012 +.Dd July 28, 2013 .Dt READLINK 2 .Os .Sh NAME
CVS commit: src/tests/fs/ffs
Module Name:src
Committed By: skrll
Date: Mon Jul 29 13:15:24 UTC 2013
Modified Files:
src/tests/fs/ffs: ffs_common.sh
Log Message:
Slow hardware needs longer, especially for default_deny_user_big
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/ffs/ffs_common.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/ffs/ffs_common.sh
diff -u src/tests/fs/ffs/ffs_common.sh:1.1 src/tests/fs/ffs/ffs_common.sh:1.2
--- src/tests/fs/ffs/ffs_common.sh:1.1 Wed Jan 18 20:51:23 2012
+++ src/tests/fs/ffs/ffs_common.sh Mon Jul 29 13:15:24 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ffs_common.sh,v 1.1 2012/01/18 20:51:23 bouyer Exp $
+# $NetBSD: ffs_common.sh,v 1.2 2013/07/29 13:15:24 skrll Exp $
create_ffs()
{
@@ -72,7 +72,7 @@ test_case_root()
eval ${name}_head() { \
atf_set descr ${descr}
atf_set require.user root
- atf_set timeout 60
+ atf_set timeout 360
}
eval ${name}_body() { \
RUMP_SOCKETS_LIST=\${RUMP_SOCKET}; \
CVS commit: src/lib/libc/sys
Module Name:src Committed By: njoly Date: Mon Jul 29 14:34:59 UTC 2013 Modified Files: src/lib/libc/sys: utimes.2 Log Message: Add utimensat(2) specific errors. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/lib/libc/sys/utimes.2 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/sys/utimes.2 diff -u src/lib/libc/sys/utimes.2:1.37 src/lib/libc/sys/utimes.2:1.38 --- src/lib/libc/sys/utimes.2:1.37 Fri Mar 8 16:52:11 2013 +++ src/lib/libc/sys/utimes.2 Mon Jul 29 14:34:59 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: utimes.2,v 1.37 2013/03/08 16:52:11 christos Exp $ +.\ $NetBSD: utimes.2,v 1.38 2013/07/29 14:34:59 njoly Exp $ .\ .\ Copyright (c) 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)utimes.2 8.1 (Berkeley) 6/4/93 .\ -.Dd March 8, 2013 +.Dd July 19, 2013 .Dt UTIMES 2 .Os .Sh NAME @@ -167,10 +167,7 @@ to set the current time, or to to let the time unchanged (this allows changing access time but not modification time, and vice-versa). .Sh RETURN VALUES -Upon successful completion, a value of 0 is returned. -Otherwise, a value of \-1 is returned and -.Va errno -is set to indicate the error. +.Rv -std utimes lutimes futimes utimens lutimens futimens utimensat .Sh ERRORS .Fn utimes , .Fn lutimes , @@ -219,6 +216,24 @@ does not match the owner of the file and The file system containing the file is mounted read-only. .El .Pp +In addition, +.Fn utimensat +will fail if: +.Bl -tag -width Er +.It Bq Er EBADF +.Fa path +does not specify an absolute path and +.Fa fd +is neither +.Dv AT_FDCWD +nor a valid file descriptor open for reading or searching. +.It Bq Er ENOTDIR +.Fa path +is not an absolute path and +.Fa fd +is a file descriptor associated with a non-directory file. +.El +.Pp .Fn futimes and .Fn futimens
CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: dholland
Date: Mon Jul 29 16:39:37 UTC 2013
Modified Files:
src/sys/ufs/lfs: lfs_vnops.c ulfs_quota2.c
Log Message:
Revert previous; it is wrong.
To generate a diff of this commit:
cvs rdiff -u -r1.255 -r1.256 src/sys/ufs/lfs/lfs_vnops.c
cvs rdiff -u -r1.11 -r1.12 src/sys/ufs/lfs/ulfs_quota2.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/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.255 src/sys/ufs/lfs/lfs_vnops.c:1.256
--- src/sys/ufs/lfs/lfs_vnops.c:1.255 Sun Jul 28 04:24:44 2013
+++ src/sys/ufs/lfs/lfs_vnops.c Mon Jul 29 16:39:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.255 2013/07/28 04:24:44 pgoyette Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.256 2013/07/29 16:39:37 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lfs_vnops.c,v 1.255 2013/07/28 04:24:44 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: lfs_vnops.c,v 1.256 2013/07/29 16:39:37 dholland Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -620,6 +620,7 @@ lfs_mknod(void *v)
ip-i_flag |= IN_ACCESS | IN_CHANGE | IN_UPDATE;
if (vap-va_rdev != VNOVAL) {
struct ulfsmount *ump = ip-i_ump;
+ struct lfs *fs = ip-i_lfs;
/*
* Want to be able to use this to make badblock
* inodes, so don't truncate the dev number.
Index: src/sys/ufs/lfs/ulfs_quota2.c
diff -u src/sys/ufs/lfs/ulfs_quota2.c:1.11 src/sys/ufs/lfs/ulfs_quota2.c:1.12
--- src/sys/ufs/lfs/ulfs_quota2.c:1.11 Sun Jul 28 04:49:03 2013
+++ src/sys/ufs/lfs/ulfs_quota2.c Mon Jul 29 16:39:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota2.c,v 1.11 2013/07/28 04:49:03 pgoyette Exp $ */
+/* $NetBSD: ulfs_quota2.c,v 1.12 2013/07/29 16:39:37 dholland Exp $ */
/* from NetBSD: ufs_quota2.c,v 1.35 2012/09/27 07:47:56 bouyer Exp */
/* from NetBSD: ffs_quota2.c,v 1.4 2011/06/12 03:36:00 rmind Exp */
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ulfs_quota2.c,v 1.11 2013/07/28 04:49:03 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: ulfs_quota2.c,v 1.12 2013/07/29 16:39:37 dholland Exp $);
#include sys/buf.h
#include sys/param.h
@@ -305,6 +305,7 @@ quota2_q2ealloc(struct ulfsmount *ump, i
struct quota2_entry *q2e;
daddr_t offset;
u_long hash_mask;
+ struct lfs *fs = ump-um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
KASSERT(mutex_owned(dq-dq_interlock));
@@ -451,6 +452,7 @@ quota2_check(struct inode *ip, int vtype
struct dquot *dq;
uint64_t ncurblks;
struct ulfsmount *ump = ip-i_ump;
+ struct lfs *fs = ip-i_lfs;
struct mount *mp = ump-um_mountp;
const int needswap = ULFS_MPNEEDSWAP(fs);
int i;
@@ -588,6 +590,7 @@ lfsquota2_handle_cmd_put(struct ulfsmoun
struct quota2_header *q2h;
struct quota2_entry q2e, *q2ep;
struct buf *bp;
+ struct lfs *fs = ump-um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
/* make sure we can index by the fs-independent idtype */
@@ -792,6 +795,7 @@ quota2_fetch_q2e(struct ulfsmount *ump,
int error;
struct quota2_entry *q2ep;
struct buf *bp;
+ struct lfs *fs = ump-um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
error = lfs_dqget(NULLVP, qk-qk_id, ump, qk-qk_idtype, dq);
@@ -827,6 +831,7 @@ quota2_fetch_quotaval(struct ulfsmount *
int error;
struct quota2_entry *q2ep, q2e;
struct buf *bp;
+ struct lfs *fs = ump-um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
id_t id2;
@@ -865,6 +870,7 @@ lfsquota2_handle_cmd_get(struct ulfsmoun
struct quota2_header *q2h;
struct quota2_entry q2e;
struct buf *bp;
+ struct lfs *fs = ump-um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
id_t id2;
@@ -1119,6 +1125,7 @@ q2cursor_getkeys(struct ulfsmount *ump,
struct q2cursor_state *state,
int *hashsize_ret, struct quota2_entry *default_q2e_ret)
{
+ struct lfs *fs = ump-um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
struct buf *hbp;
struct quota2_header *q2h;
CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: dholland
Date: Mon Jul 29 16:40:46 UTC 2013
Modified Files:
src/sys/ufs/lfs: lfs_vnops.c ulfs_quota2.c
Log Message:
Fix build both with and without options LFS_EI.
To generate a diff of this commit:
cvs rdiff -u -r1.256 -r1.257 src/sys/ufs/lfs/lfs_vnops.c
cvs rdiff -u -r1.12 -r1.13 src/sys/ufs/lfs/ulfs_quota2.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/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.256 src/sys/ufs/lfs/lfs_vnops.c:1.257
--- src/sys/ufs/lfs/lfs_vnops.c:1.256 Mon Jul 29 16:39:37 2013
+++ src/sys/ufs/lfs/lfs_vnops.c Mon Jul 29 16:40:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.256 2013/07/29 16:39:37 dholland Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.257 2013/07/29 16:40:46 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lfs_vnops.c,v 1.256 2013/07/29 16:39:37 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: lfs_vnops.c,v 1.257 2013/07/29 16:40:46 dholland Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -621,6 +621,7 @@ lfs_mknod(void *v)
if (vap-va_rdev != VNOVAL) {
struct ulfsmount *ump = ip-i_ump;
struct lfs *fs = ip-i_lfs;
+ (void)fs; /* temporary: needed when LFS_EI is off */
/*
* Want to be able to use this to make badblock
* inodes, so don't truncate the dev number.
Index: src/sys/ufs/lfs/ulfs_quota2.c
diff -u src/sys/ufs/lfs/ulfs_quota2.c:1.12 src/sys/ufs/lfs/ulfs_quota2.c:1.13
--- src/sys/ufs/lfs/ulfs_quota2.c:1.12 Mon Jul 29 16:39:37 2013
+++ src/sys/ufs/lfs/ulfs_quota2.c Mon Jul 29 16:40:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota2.c,v 1.12 2013/07/29 16:39:37 dholland Exp $ */
+/* $NetBSD: ulfs_quota2.c,v 1.13 2013/07/29 16:40:46 dholland Exp $ */
/* from NetBSD: ufs_quota2.c,v 1.35 2012/09/27 07:47:56 bouyer Exp */
/* from NetBSD: ffs_quota2.c,v 1.4 2011/06/12 03:36:00 rmind Exp */
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ulfs_quota2.c,v 1.12 2013/07/29 16:39:37 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: ulfs_quota2.c,v 1.13 2013/07/29 16:40:46 dholland Exp $);
#include sys/buf.h
#include sys/param.h
@@ -308,6 +308,8 @@ quota2_q2ealloc(struct ulfsmount *ump, i
struct lfs *fs = ump-um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
+ (void)fs; /* temporary: needed when LFS_EI is off */
+
KASSERT(mutex_owned(dq-dq_interlock));
KASSERT(mutex_owned(lfs_dqlock));
error = getq2h(ump, type, hbp, q2h, B_MODIFY);
@@ -457,6 +459,8 @@ quota2_check(struct inode *ip, int vtype
const int needswap = ULFS_MPNEEDSWAP(fs);
int i;
+ (void)fs; /* temporary: needed when LFS_EI is off */
+
if ((error = getinoquota2(ip, change 0, change != 0, bp, q2e)) != 0)
return error;
if (change == 0) {
@@ -593,6 +597,8 @@ lfsquota2_handle_cmd_put(struct ulfsmoun
struct lfs *fs = ump-um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
+ (void)fs; /* temporary: needed when LFS_EI is off */
+
/* make sure we can index by the fs-independent idtype */
CTASSERT(QUOTA_IDTYPE_USER == ULFS_USRQUOTA);
CTASSERT(QUOTA_IDTYPE_GROUP == ULFS_GRPQUOTA);
@@ -798,6 +804,8 @@ quota2_fetch_q2e(struct ulfsmount *ump,
struct lfs *fs = ump-um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
+ (void)fs; /* temporary: needed when LFS_EI is off */
+
error = lfs_dqget(NULLVP, qk-qk_id, ump, qk-qk_idtype, dq);
if (error)
return error;
@@ -835,6 +843,8 @@ quota2_fetch_quotaval(struct ulfsmount *
const int needswap = ULFS_MPNEEDSWAP(fs);
id_t id2;
+ (void)fs; /* temporary: needed when LFS_EI is off */
+
error = lfs_dqget(NULLVP, qk-qk_id, ump, qk-qk_idtype, dq);
if (error)
return error;
@@ -874,6 +884,8 @@ lfsquota2_handle_cmd_get(struct ulfsmoun
const int needswap = ULFS_MPNEEDSWAP(fs);
id_t id2;
+ (void)fs; /* temporary: needed when LFS_EI is off */
+
/*
* Make sure the FS-independent codes match the internal ones,
* so we can use the passed-in objtype without having to
@@ -1134,6 +1146,8 @@ q2cursor_getkeys(struct ulfsmount *ump,
uint64_t offset;
int error;
+ (void)fs; /* temporary: needed when LFS_EI is off */
+
/*
* Read the header block.
*/
CVS commit: src/external/bsd
Module Name:src
Committed By: dholland
Date: Mon Jul 29 16:42:20 UTC 2013
Modified Files:
src/external/bsd/bind: Makefile.inc
src/external/bsd/dhcp: Makefile.inc
Log Message:
Fix MKKERBEROS=no build.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcp/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.14 src/external/bsd/bind/Makefile.inc:1.15
--- src/external/bsd/bind/Makefile.inc:1.14 Sat Jul 27 19:23:09 2013
+++ src/external/bsd/bind/Makefile.inc Mon Jul 29 16:42:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14 2013/07/27 19:23:09 christos Exp $
+# $NetBSD: Makefile.inc,v 1.15 2013/07/29 16:42:20 dholland Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -89,10 +89,17 @@ LIBDPLIBS+= pthread ${NETBSDSRCDIR
.endif
.if ${NAMED_USE_OPENSSL} == yes
-CPPFLAGS+=-DOPENSSL -DGSSAPI -DUSE_ISC_SPNEGO
+CPPFLAGS+=-DOPENSSL -DUSE_ISC_SPNEGO
+.if ${MKKERBEROS} != no
+CPPFLAGS+=-DGSSAPI
+.endif
+.if ${MKKERBEROS} != no
+LDADD+= -lgssapi -lkrb5
+DPADD+= ${LIBGSSAPI} ${LIBKRB5}
+.endif
.if !defined (LIB) || empty(LIB)
-LDADD+= -lgssapi -lkrb5 -lcrypto
-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBCRYPTO}
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
.else
.if exists(${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto)
LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
Index: src/external/bsd/dhcp/Makefile.inc
diff -u src/external/bsd/dhcp/Makefile.inc:1.5 src/external/bsd/dhcp/Makefile.inc:1.6
--- src/external/bsd/dhcp/Makefile.inc:1.5 Sat Jul 27 18:16:26 2013
+++ src/external/bsd/dhcp/Makefile.inc Mon Jul 29 16:42:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2013/07/27 18:16:26 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2013/07/29 16:42:20 dholland Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -40,8 +40,12 @@ LDADD+=-lpthread
LDADD+=-Wl,-Bdynamic
.endif
.if (${MKCRYPTO} != no)
-LDADD+= -lgssapi -lkrb5 -lcrypto -lipsec
-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBCRYPTO} ${LIBIPSEC}
+.if (${MKKERBEROS} != no)
+LDADD+= -lgssapi -lkrb5
+DPADD+= ${LIBGSSAPI} ${LIBKRB5}
+.endif
+LDADD+= -lcrypto -lipsec
+DPADD+= ${LIBCRYPTO} ${LIBIPSEC}
.endif
DPADD+= ${COBJDIR}/libdhcp.a
DPADD+= ${OMOBJDIR}/libomapi.a ${DSTOBJDIR}/libdst.a
CVS commit: src/bin/pax
Module Name:src
Committed By: christos
Date: Mon Jul 29 17:46:36 UTC 2013
Modified Files:
src/bin/pax: file_subs.c
Log Message:
PR/48095: NAKAJIMA Yoshihiro: remove casts from time_t to long
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/bin/pax/file_subs.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/file_subs.c
diff -u src/bin/pax/file_subs.c:1.62 src/bin/pax/file_subs.c:1.63
--- src/bin/pax/file_subs.c:1.62 Tue Apr 7 15:52:35 2009
+++ src/bin/pax/file_subs.c Mon Jul 29 13:46:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: file_subs.c,v 1.62 2009/04/07 19:52:35 perry Exp $ */
+/* $NetBSD: file_subs.c,v 1.63 2013/07/29 17:46:36 christos Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)file_subs.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: file_subs.c,v 1.62 2009/04/07 19:52:35 perry Exp $);
+__RCSID($NetBSD: file_subs.c,v 1.63 2013/07/29 17:46:36 christos Exp $);
#endif
#endif /* not lint */
@@ -791,9 +791,9 @@ set_ftime(char *fnm, time_t mtime, time_
struct timeval tv[2];
struct stat sb;
- tv[0].tv_sec = (long)atime;
+ tv[0].tv_sec = atime;
tv[0].tv_usec = 0;
- tv[1].tv_sec = (long)mtime;
+ tv[1].tv_sec = mtime;
tv[1].tv_usec = 0;
if (!frc (!patime || !pmtime)) {
/*
CVS commit: src/lib/libc/sys
Module Name:src Committed By: njoly Date: Mon Jul 29 18:37:16 UTC 2013 Modified Files: src/lib/libc/sys: open.2 Log Message: Add openat(2) specific errors. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/lib/libc/sys/open.2 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/sys/open.2 diff -u src/lib/libc/sys/open.2:1.55 src/lib/libc/sys/open.2:1.56 --- src/lib/libc/sys/open.2:1.55 Sun Jan 13 08:15:02 2013 +++ src/lib/libc/sys/open.2 Mon Jul 29 18:37:16 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: open.2,v 1.55 2013/01/13 08:15:02 dholland Exp $ +.\ $NetBSD: open.2,v 1.56 2013/07/29 18:37:16 njoly Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)open.2 8.2 (Berkeley) 11/16/93 .\ -.Dd November 18, 2012 +.Dd July 29, 2013 .Dt OPEN 2 .Os .Sh NAME @@ -288,6 +288,8 @@ returns the current system limit. .Sh RETURN VALUES If successful, .Fn open +and +.Fn openat returns a non-negative integer, termed a file descriptor. Otherwise, a value of \-1 is returned and .Va errno @@ -405,6 +407,24 @@ executed and the .Fn open call requests write access. .El +.Pp +In addition, +.Fn openat +will fail if: +.Bl -tag -width Er +.It Bq Er EBADF +.Fa path +does not specify an absolute path and +.Fa fd +is neither +.Dv AT_FDCWD +nor a valid file descriptor open for reading or searching. +.It Bq Er ENOTDIR +.Fa path +is not an absolute path and +.Fa fd +is a file descriptor associated with a non-directory file. +.El .Sh SEE ALSO .Xr chmod 2 , .Xr close 2 , @@ -418,7 +438,6 @@ call requests write access. .Xr mkdirat 2 , .Xr mkfifoat 2 , .Xr mknodat 2 , -.Xr openat 2 , .Xr read 2 , .Xr readlinkat 2 , .Xr symlinkat 2 ,
CVS commit: src/lib/libc/sys
Module Name:src Committed By: njoly Date: Mon Jul 29 19:18:37 UTC 2013 Modified Files: src/lib/libc/sys: chmod.2 Log Message: Add chmodat(2) specific errors. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/lib/libc/sys/chmod.2 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/sys/chmod.2 diff -u src/lib/libc/sys/chmod.2:1.45 src/lib/libc/sys/chmod.2:1.46 --- src/lib/libc/sys/chmod.2:1.45 Sun Jan 13 08:15:02 2013 +++ src/lib/libc/sys/chmod.2 Mon Jul 29 19:18:37 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: chmod.2,v 1.45 2013/01/13 08:15:02 dholland Exp $ +.\ $NetBSD: chmod.2,v 1.46 2013/07/29 19:18:37 njoly Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)chmod.2 8.1 (Berkeley) 6/4/93 .\ -.Dd November 18, 2012 +.Dd July 29, 2013 .Dt CHMOD 2 .Os .Sh NAME @@ -175,14 +175,12 @@ by protecting set-user-id (set-group-id) from remaining set-user-id (set-group-id) if they are modified, at the expense of a degree of compatibility. .Sh RETURN VALUES -Upon successful completion, a value of 0 is returned. -Otherwise, a value of \-1 is returned and -.Va errno -is set to indicate the error. +.Rv -std chmod lchmod fchmod fchmodat .Sh ERRORS -.Fn chmod -and +.Fn chmod , .Fn lchmod +and +.Fn fchmodat will fail and the file mode will be unchanged if: .Bl -tag -width Er .It Bq Er EACCES @@ -223,6 +221,24 @@ group access list. The named file resides on a read-only file system. .El .Pp +In addition, +.Fn fchmodat +will fail if: +.Bl -tag -width Er +.It Bq Er EBADF +.Fa path +does not specify an absolute path and +.Fa fd +is neither +.Dv AT_FDCWD +nor a valid file descriptor open for reading or searching. +.It Bq Er ENOTDIR +.Fa path +is not an absolute path and +.Fa fd +is a file descriptor associated with a non-directory file. +.El +.Pp .Fn fchmod will fail if: .Bl -tag -width Er
CVS commit: [netbsd-6-0] src
Module Name:src Committed By: jdc Date: Mon Jul 29 20:21:36 UTC 2013 Modified Files: src/doc [netbsd-6-0]: 3RDPARTY src/share/zoneinfo [netbsd-6-0]: africa asia australasia europe iso3166.tab southamerica zone.tab Log Message: Pull up revisions: src/doc/3RDPARTY revision 1.1040 src/share/zoneinfo/africa revision 1.1.1.35 src/share/zoneinfo/asia revision 1.1.1.60 src/share/zoneinfo/australasia revision 1.32 src/share/zoneinfo/europe revision 1.1.1.50 src/share/zoneinfo/iso3166.tab revision 1.1.1.21 src/share/zoneinfo/southamerica revision 1.1.1.55 src/share/zoneinfo/zone.tab revision 1.1.1.45 (requested by apb in ticket 915) Import tzdata2013d from ftp://ftp.iana.org/tz/releases/tzdata2013d.tar.gz Summary of changes from tzdata2013c to tzdata2013d: Changes affecting current and future time stamps: Morocco's midsummer transitions this year are July 7 and August 10, not July 9 and August 8. (Thanks to Andrew Paprocki.) Israel now falls back on the last Sunday of October. (Thanks to Ephraim Silverberg.) Changes affecting past time stamps: Specify Jerusalem's location more precisely; this changes the pre-1880 times by 2 s. Changing affecting metadata only: Fix typos in the entries for country codes BQ and SX. Changes affecting documentation and commentary: Deemphasize the significance of national borders. Update the zdump man page. Remove obsolete NOID comment (thanks to Denis Excoffier). Update several URLs and comments in the web pages. Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler). Update URL for CLDR Zone-Tzid table (thanks to Yoshito Umaoka). Merge tzdata2013d. tzcode2013d/tzdata2013d have been released. We have updated tzdata/ To generate a diff of this commit: cvs rdiff -u -r1.909.2.14.2.4 -r1.909.2.14.2.5 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.30.4.1.4.3 -r1.1.1.30.4.1.4.4 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.50.4.3.4.5 -r1.1.1.50.4.3.4.6 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.4.2.4 -r1.23.4.4.2.5 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.44.4.3.4.2 -r1.1.1.44.4.3.4.3 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.19.4.1 -r1.1.1.19.4.1.4.1 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.46.4.3.4.5 -r1.1.1.46.4.3.4.6 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.39.4.3.4.2 -r1.1.1.39.4.3.4.3 \ src/share/zoneinfo/zone.tab 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.2.4 src/doc/3RDPARTY:1.909.2.14.2.5 --- src/doc/3RDPARTY:1.909.2.14.2.4 Thu Mar 14 19:47:54 2013 +++ src/doc/3RDPARTY Mon Jul 29 20:21:35 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.909.2.14.2.4 2013/03/14 19:47:54 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.909.2.14.2.5 2013/07/29 20:21:35 jdc Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1144,7 +1144,7 @@ Added changes from a5 - a12 manually. Package: tz Version: tzcode2011i / tzdata2013b -Current Vers: tzcode2013b / tzdata2013b +Current Vers: tzcode2013d / tzdata2013d Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.30.4.1.4.3 src/share/zoneinfo/africa:1.1.1.30.4.1.4.4 --- src/share/zoneinfo/africa:1.1.1.30.4.1.4.3 Fri Mar 15 18:50:18 2013 +++ src/share/zoneinfo/africa Mon Jul 29 20:21:35 2013 @@ -852,12 +852,18 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # announced that year's Ramadan daylight-saving transitions would be # 2012-07-20 and 2012-08-20; see # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288. -# + +# From Andrew Paprocki (2013-07-02): +# Morocco announced that the year's Ramadan daylight-savings +# transitions would be 2013-07-07 and 2013-08-10; see: +# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 + +# From Paul Eggert (2013-07-03): # To estimate what the Moroccan government will do in future years, -# transition dates for 2013 through 2021 were determined by running +# transition dates for 2014 through 2021 were determined by running # the following program under GNU Emacs 24.3: # -# (let ((islamic-year 1434)) +# (let ((islamic-year 1435)) # (while ( islamic-year 1444) # (let ((a # (calendar-gregorian-from-absolute @@ -910,8 +916,8 @@ Rule Morocco 2012 2019 - Apr lastSun 2: Rule Morocco 2012 max - Sep lastSun 3:00 0 - Rule Morocco 2012 only - Jul 20 3:00 0 - Rule Morocco 2012 only - Aug 20 2:00 1:00 S -Rule Morocco 2013 only - Jul 9 3:00 0 - -Rule Morocco 2013 only - Aug 8 2:00 1:00 S +Rule Morocco 2013 only - Jul 7 3:00 0 - +Rule Morocco 2013 only - Aug 10 2:00 1:00 S Rule Morocco 2014 only - Jun 29 3:00 0 -
CVS commit: [netbsd-6-1] src
Module Name:src Committed By: jdc Date: Mon Jul 29 20:21:57 UTC 2013 Modified Files: src/doc [netbsd-6-1]: 3RDPARTY src/share/zoneinfo [netbsd-6-1]: africa asia australasia europe iso3166.tab southamerica zone.tab Log Message: Pull up revisions: src/doc/3RDPARTY revision 1.1040 src/share/zoneinfo/africa revision 1.1.1.35 src/share/zoneinfo/asia revision 1.1.1.60 src/share/zoneinfo/australasia revision 1.32 src/share/zoneinfo/europe revision 1.1.1.50 src/share/zoneinfo/iso3166.tab revision 1.1.1.21 src/share/zoneinfo/southamerica revision 1.1.1.55 src/share/zoneinfo/zone.tab revision 1.1.1.45 (requested by apb in ticket 915) Import tzdata2013d from ftp://ftp.iana.org/tz/releases/tzdata2013d.tar.gz Summary of changes from tzdata2013c to tzdata2013d: Changes affecting current and future time stamps: Morocco's midsummer transitions this year are July 7 and August 10, not July 9 and August 8. (Thanks to Andrew Paprocki.) Israel now falls back on the last Sunday of October. (Thanks to Ephraim Silverberg.) Changes affecting past time stamps: Specify Jerusalem's location more precisely; this changes the pre-1880 times by 2 s. Changing affecting metadata only: Fix typos in the entries for country codes BQ and SX. Changes affecting documentation and commentary: Deemphasize the significance of national borders. Update the zdump man page. Remove obsolete NOID comment (thanks to Denis Excoffier). Update several URLs and comments in the web pages. Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler). Update URL for CLDR Zone-Tzid table (thanks to Yoshito Umaoka). Merge tzdata2013d. tzcode2013d/tzdata2013d have been released. We have updated tzdata/ To generate a diff of this commit: cvs rdiff -u -r1.909.2.19 -r1.909.2.19.2.1 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.30.4.4 -r1.1.1.30.4.4.2.1 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.50.4.8 -r1.1.1.50.4.8.2.1 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.8 -r1.23.4.8.2.1 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.44.4.5 -r1.1.1.44.4.5.2.1 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.19.4.1 -r1.1.1.19.4.1.6.1 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.46.4.8 -r1.1.1.46.4.8.2.1 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.39.4.5 -r1.1.1.39.4.5.2.1 src/share/zoneinfo/zone.tab 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.19 src/doc/3RDPARTY:1.909.2.19.2.1 --- src/doc/3RDPARTY:1.909.2.19 Thu Mar 14 19:16:40 2013 +++ src/doc/3RDPARTY Mon Jul 29 20:21:57 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.909.2.19 2013/03/14 19:16:40 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.909.2.19.2.1 2013/07/29 20:21:57 jdc Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1144,7 +1144,7 @@ Added changes from a5 - a12 manually. Package: tz Version: tzcode2011i / tzdata2013b -Current Vers: tzcode2013b / tzdata2013b +Current Vers: tzcode2013d / tzdata2013d Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.30.4.4 src/share/zoneinfo/africa:1.1.1.30.4.4.2.1 --- src/share/zoneinfo/africa:1.1.1.30.4.4 Fri Mar 15 18:49:52 2013 +++ src/share/zoneinfo/africa Mon Jul 29 20:21:57 2013 @@ -852,12 +852,18 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # announced that year's Ramadan daylight-saving transitions would be # 2012-07-20 and 2012-08-20; see # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288. -# + +# From Andrew Paprocki (2013-07-02): +# Morocco announced that the year's Ramadan daylight-savings +# transitions would be 2013-07-07 and 2013-08-10; see: +# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 + +# From Paul Eggert (2013-07-03): # To estimate what the Moroccan government will do in future years, -# transition dates for 2013 through 2021 were determined by running +# transition dates for 2014 through 2021 were determined by running # the following program under GNU Emacs 24.3: # -# (let ((islamic-year 1434)) +# (let ((islamic-year 1435)) # (while ( islamic-year 1444) # (let ((a # (calendar-gregorian-from-absolute @@ -910,8 +916,8 @@ Rule Morocco 2012 2019 - Apr lastSun 2: Rule Morocco 2012 max - Sep lastSun 3:00 0 - Rule Morocco 2012 only - Jul 20 3:00 0 - Rule Morocco 2012 only - Aug 20 2:00 1:00 S -Rule Morocco 2013 only - Jul 9 3:00 0 - -Rule Morocco 2013 only - Aug 8 2:00 1:00 S +Rule Morocco 2013 only - Jul 7 3:00 0 - +Rule Morocco 2013 only - Aug 10 2:00 1:00 S Rule Morocco 2014 only - Jun 29 3:00 0 - Rule Morocco 2014 only - Jul 29 2:00 1:00 S Rule
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src
Committed By: jdc
Date: Mon Jul 29 20:24:04 UTC 2013
Modified Files:
src/sys/dev/pci [netbsd-6]: if_wm.c if_wmreg.h
Log Message:
Pull up revisions:
src/sys/dev/pci/if_wm.c revisions 1.259,1.260,1.261,1.262
src/sys/dev/pci/if_wmreg.h revision 1.54
(requested by msaitoh in ticket #918).
Fix MDIC write error bug for 82574 and 82583. For those chips, the semaphore
must be released after chip reset. Found and tested by Mark Davies.
Sync the wm_enable_mng_pass_thru() function with FreeBSD. Don't check
MANC_EN_MAC_ADDR_FILTER bit. Add 82574 and 82583 specific check. This
modification may change the setting of WM_F_HAS_MANAGE flag on some machines.
Sync the wm_release_manageablilty() fucntion with FreeBSD. Set MANC_ARP_EN.
This change enables HW ARP function when entering suspend.
When the chip is 82580(ER) or I350, set WM_F_ASF_FIRMWARE_PRES flag and
check for the WM_F_ARC_SUBSYS_VALID flag. Same as FreeBSD.
Move the location of wm_check_mng_mode() and wm_get_wakeup() in wm_attach().
Those functions access EEPROM, so they have to call after identifying EEPROM
access type. This modification may change the behavior of BMC(IPMI).
Fix yet another NVM bank detect problem in wm(4). Use bank 0 if the detect
function failed. It's the same as FreeBSD. Observed and tested with Asus P8P67
Deluxe motherboard and tested by jnemeth.
To generate a diff of this commit:
cvs rdiff -u -r1.227.2.9 -r1.227.2.10 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.46.2.4 -r1.46.2.5 src/sys/dev/pci/if_wmreg.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/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.227.2.9 src/sys/dev/pci/if_wm.c:1.227.2.10
--- src/sys/dev/pci/if_wm.c:1.227.2.9 Sun Jul 14 20:39:13 2013
+++ src/sys/dev/pci/if_wm.c Mon Jul 29 20:24:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.227.2.9 2013/07/14 20:39:13 riz Exp $ */
+/* $NetBSD: if_wm.c,v 1.227.2.10 2013/07/29 20:24:04 jdc Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.227.2.9 2013/07/14 20:39:13 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.227.2.10 2013/07/29 20:24:04 jdc Exp $);
#include sys/param.h
#include sys/systm.h
@@ -570,6 +570,8 @@ static int wm_get_swfw_semaphore(struct
static void wm_put_swfw_semaphore(struct wm_softc *, uint16_t);
static int wm_get_swfwhw_semaphore(struct wm_softc *);
static void wm_put_swfwhw_semaphore(struct wm_softc *);
+static int wm_get_hw_semaphore_82573(struct wm_softc *);
+static void wm_put_hw_semaphore_82573(struct wm_softc *);
static int wm_read_eeprom_ich8(struct wm_softc *, int, int, uint16_t *);
static int32_t wm_ich8_cycle_init(struct wm_softc *);
@@ -1242,8 +1244,6 @@ wm_attach(device_t parent, device_t self
return;
}
- wm_get_wakeup(sc);
-
/*
* In addition, i82544 and later support I/O mapped indirect
* register access. It is not desirable (nor supported in
@@ -1538,26 +1538,6 @@ wm_attach(device_t parent, device_t self
*/
wm_reset(sc);
- switch (sc-sc_type) {
- case WM_T_82571:
- case WM_T_82572:
- case WM_T_82573:
- case WM_T_82574:
- case WM_T_82583:
- case WM_T_80003:
- case WM_T_ICH8:
- case WM_T_ICH9:
- case WM_T_ICH10:
- case WM_T_PCH:
- case WM_T_PCH2:
- case WM_T_PCH_LPT:
- if (wm_check_mng_mode(sc) != 0)
- wm_get_hw_control(sc);
- break;
- default:
- break;
- }
-
/*
* Get some information about the EEPROM.
*/
@@ -1694,6 +1674,28 @@ wm_attach(device_t parent, device_t self
sc-sc_ee_addrbits, eetype);
}
+ switch (sc-sc_type) {
+ case WM_T_82571:
+ case WM_T_82572:
+ case WM_T_82573:
+ case WM_T_82574:
+ case WM_T_82583:
+ case WM_T_80003:
+ case WM_T_ICH8:
+ case WM_T_ICH9:
+ case WM_T_ICH10:
+ case WM_T_PCH:
+ case WM_T_PCH2:
+ case WM_T_PCH_LPT:
+ if (wm_check_mng_mode(sc) != 0) {
+ printf (get hw control (1)\n);
+ wm_get_hw_control(sc);
+ }
+ break;
+ default:
+ break;
+ }
+ wm_get_wakeup(sc);
/*
* Read the Ethernet address from the EEPROM, if not first found
* in device properties.
@@ -4018,7 +4020,6 @@ wm_reset(struct wm_softc *sc)
{
int phy_reset = 0;
uint32_t reg, mask;
- int i;
/*
* Allocate on-chip memory according to the MTU size.
@@ -4118,19 +4119,7 @@ wm_reset(struct wm_softc *sc)
case WM_T_82573:
case WM_T_82574:
case WM_T_82583:
- i = 0;
- reg = CSR_READ(sc, WMREG_EXTCNFCTR)
- | EXTCNFCTR_MDIO_SW_OWNERSHIP;
- do {
- CSR_WRITE(sc, WMREG_EXTCNFCTR,
- reg | EXTCNFCTR_MDIO_SW_OWNERSHIP);
- reg = CSR_READ(sc, WMREG_EXTCNFCTR);
- if ((reg EXTCNFCTR_MDIO_SW_OWNERSHIP) != 0)
-break;
- reg |= EXTCNFCTR_MDIO_SW_OWNERSHIP;
- delay(2*1000);
- i++;
- } while (i WM_MDIO_OWNERSHIP_TIMEOUT);
+ wm_get_hw_semaphore_82573(sc);
break;
default:
break;
@@ -4231,6 +4220,16 @@ wm_reset(struct wm_softc *sc)
break;
CVS commit: [netbsd-6] src/sys/common/pmap/tlb
Module Name:src
Committed By: jdc
Date: Mon Jul 29 20:26:32 UTC 2013
Modified Files:
src/sys/common/pmap/tlb [netbsd-6]: pmap_tlb.c
Log Message:
Add missing )). This patch fixes PR#46371.
src/sys/common/pmap/tlb/pmap_tlb.c patch
(requested by msaitoh in ticket 920)
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/common/pmap/tlb/pmap_tlb.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/common/pmap/tlb/pmap_tlb.c
diff -u src/sys/common/pmap/tlb/pmap_tlb.c:1.11 src/sys/common/pmap/tlb/pmap_tlb.c:1.11.8.1
--- src/sys/common/pmap/tlb/pmap_tlb.c:1.11 Tue Sep 27 01:02:37 2011
+++ src/sys/common/pmap/tlb/pmap_tlb.c Mon Jul 29 20:26:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_tlb.c,v 1.11 2011/09/27 01:02:37 jym Exp $ */
+/* $NetBSD: pmap_tlb.c,v 1.11.8.1 2013/07/29 20:26:32 jdc Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_tlb.c,v 1.11 2011/09/27 01:02:37 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_tlb.c,v 1.11.8.1 2013/07/29 20:26:32 jdc Exp $);
/*
* Manages address spaces in a TLB.
@@ -608,7 +608,7 @@ pmap_tlb_shootdown_bystanders(pmap_t pm)
ipi_sent = true;
continue;
}
- if (!CPUSET_EMPTY_P(CPUSET_SUBSET(pm-pm_active, ti-ti_cpu_mask) {
+ if (!CPUSET_EMPTY_P(CPUSET_SUBSET(pm-pm_active, ti-ti_cpu_mask))) {
/*
* If this pmap has an ASID assigned but it's not
* currently running, nuke its ASID. Next time the
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: jdc Date: Mon Jul 29 20:27:41 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.1 Log Message: Ticket 915. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-6.1.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.1 diff -u src/doc/CHANGES-6.1.1:1.1.2.13 src/doc/CHANGES-6.1.1:1.1.2.14 --- src/doc/CHANGES-6.1.1:1.1.2.13 Mon Jul 29 08:57:19 2013 +++ src/doc/CHANGES-6.1.1 Mon Jul 29 20:27:41 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.1,v 1.1.2.13 2013/07/29 08:57:19 msaitoh Exp $ +# $NetBSD: CHANGES-6.1.1,v 1.1.2.14 2013/07/29 20:27:41 jdc Exp $ A complete list of changes from the NetBSD 6.1 release to the NetBSD 6.1.1 release: @@ -150,3 +150,16 @@ etc/MAKEDEV.tmpl1.166 Add a makedisk_p12high, used by VAX now after unbumping MAXPARTITIONS from 16 down to 12. This fixes install issues on new setups. [martin, ticket #919] + +src/doc/3RDPARTY1.1040 via patch +src/share/zoneinfo/africa 1.1.1.35 via patch +src/share/zoneinfo/asia1.1.1.60 via patch +src/share/zoneinfo/australasia 1.32 via patch +src/share/zoneinfo/europe 1.1.1.50 via patch +src/share/zoneinfo/iso3166.tab 1.1.1.21 via patch +src/share/zoneinfo/southamerica 1.1.1.55 via patch +src/share/zoneinfo/zone.tab 1.1.1.45 via patch + + Import tzdata2013d. + Changes for Morocco, Israel, Antarctica, metadata and documentation. + [apb, ticket #915]
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: jdc Date: Mon Jul 29 20:27:21 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.3 Log Message: Ticket 915. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-6.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-6.0.3 diff -u src/doc/CHANGES-6.0.3:1.1.2.13 src/doc/CHANGES-6.0.3:1.1.2.14 --- src/doc/CHANGES-6.0.3:1.1.2.13 Mon Jul 29 08:57:41 2013 +++ src/doc/CHANGES-6.0.3 Mon Jul 29 20:27:21 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.3,v 1.1.2.13 2013/07/29 08:57:41 msaitoh Exp $ +# $NetBSD: CHANGES-6.0.3,v 1.1.2.14 2013/07/29 20:27:21 jdc Exp $ A complete list of changes from the NetBSD 6.0.2 release to the NetBSD 6.0.3 release: @@ -144,3 +144,16 @@ sys/miscfs/procfs/procfs_map.c 1.43 Add a missing vm_map_unlock_read() and uvmspace_free() to the ENOMEM error case in procfs_domap()d. Fixes PR#48048. [ryo, ticket #917] + +src/doc/3RDPARTY1.1040 via patch +src/share/zoneinfo/africa 1.1.1.35 via patch +src/share/zoneinfo/asia1.1.1.60 via patch +src/share/zoneinfo/australasia 1.32 via patch +src/share/zoneinfo/europe 1.1.1.50 via patch +src/share/zoneinfo/iso3166.tab 1.1.1.21 via patch +src/share/zoneinfo/southamerica 1.1.1.55 via patch +src/share/zoneinfo/zone.tab 1.1.1.45 via patch + + Import tzdata2013d. + Changes for Morocco, Israel, Antarctica, metadata and documentation. + [apb, ticket #915]
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: jdc Date: Mon Jul 29 20:27:08 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Tickets 915, 918, 920. To generate a diff of this commit: cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-6.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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.21 src/doc/CHANGES-6.2:1.1.2.22 --- src/doc/CHANGES-6.2:1.1.2.21 Mon Jul 29 08:56:52 2013 +++ src/doc/CHANGES-6.2 Mon Jul 29 20:27:07 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.21 2013/07/29 08:56:52 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.22 2013/07/29 20:27:07 jdc Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -390,3 +390,33 @@ etc/MAKEDEV.tmpl1.166 Add a makedisk_p12high, used by VAX now after unbumping MAXPARTITIONS from 16 down to 12. This fixes install issues on new setups. [martin, ticket #919] + +src/doc/3RDPARTY1.1040 via patch +src/share/zoneinfo/africa 1.1.1.35 via patch +src/share/zoneinfo/asia1.1.1.60 via patch +src/share/zoneinfo/australasia 1.32 via patch +src/share/zoneinfo/europe 1.1.1.50 via patch +src/share/zoneinfo/iso3166.tab 1.1.1.21 via patch +src/share/zoneinfo/southamerica 1.1.1.55 via patch +src/share/zoneinfo/zone.tab 1.1.1.45 via patch + + Import tzdata2013d. + Changes for Morocco, Israel, Antarctica, metadata and documentation. + [apb, ticket #915] + +sys/dev/pci/if_wm.c1.259,1.260,1.261,1.262 +sys/dev/pci/if_wmreg.h1.54 + + Various fixes to wm(4): + Fix MDIC write error bug for 82574 and 82583 + Sync the wm_enable_mng_pass_thru() function with FreeBSD + Sync the wm_release_manageablilty() fucntion with FreeBSD + For 82580(ER) or I350, set flags as per FreeBSD + Move EEPROM-related calls to after identifying the EEPPROM + Fix another NVM bank detect problem + [msaitoh, ticket #918] + +sys/common/pmap/tlb/pmap_tlb.c patch + + Add missing )). This patch fixes PR#46371. + [msaitoh, ticket #920]
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Mon Jul 29 20:35:33 UTC 2013 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22699 Log Message: Import dhcpcd-6.0.4 with the following changes: * hostname is not stamped on anymore if already set * hostname will be set to a FQDN when possible as per RFC4702 section 3.1 * a domain is derived from the FQDN if no domain option is set * add new hostname_short command to send a short hostname for DDNS * hostname_fqdn is now documented, along with a new server setting and the potential problems associated with it * the FQDN option is no longer sent by default for DHCPv4 messages Status: Vendor Tag: roy Release Tags: dhcpcd-6-0-4 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c U src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/if-pref.c U src/external/bsd/dhcpcd/dist/net.c U src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/bpf.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/platform-bsd.c U src/external/bsd/dhcpcd/dist/arp.c C src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c U src/external/bsd/dhcpcd/dist/ipv6rs.c U src/external/bsd/dhcpcd/dist/ipv6ns.c U src/external/bsd/dhcpcd/dist/dhcp6.c C src/external/bsd/dhcpcd/dist/dhcpcd.conf C src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in C src/external/bsd/dhcpcd/dist/dhcpcd.8.in C src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if-pref.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6ns.h U src/external/bsd/dhcpcd/dist/ipv6rs.h U src/external/bsd/dhcpcd/dist/net.h U src/external/bsd/dhcpcd/dist/platform.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 5 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src
Committed By: roy
Date: Mon Jul 29 20:39:29 UTC 2013
Modified Files:
src/external/bsd/dhcpcd/dist: dhcp.c dhcpcd-run-hooks.8.in dhcpcd.8.in
dhcpcd.conf dhcpcd.conf.5.in
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/dhcpcd/dist/dhcpcd.8.in
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/dhcpcd.conf
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/dhcp.c:1.5 src/external/bsd/dhcpcd/dist/dhcp.c:1.6
--- src/external/bsd/dhcpcd/dist/dhcp.c:1.5 Fri Jun 21 19:40:20 2013
+++ src/external/bsd/dhcpcd/dist/dhcp.c Mon Jul 29 20:39:28 2013
@@ -1,5 +1,5 @@
#include sys/cdefs.h
- __RCSID($NetBSD: dhcp.c,v 1.5 2013/06/21 19:40:20 roy Exp $);
+ __RCSID($NetBSD: dhcp.c,v 1.6 2013/07/29 20:39:28 roy Exp $);
/*
* dhcpcd - DHCP client daemon
@@ -187,7 +187,7 @@ const struct dhcp_opt dhcp_opts[] = {
{ 76, IPV4A, streettalk_directory_assistance_server },
{ 77, STRING, user_class },
{ 80, FLAG | NOREQ, rapid_commit },
- { 81, STRING | RFC3397, fqdn_name },
+ { 81, STRING | RFC3397, fqdn },
{ 85, IPV4A, nds_servers },
{ 86, STRING, nds_tree_name },
{ 87, STRING, nds_context },
@@ -848,7 +848,6 @@ make_message(struct dhcp_message **messa
uint32_t ul;
uint16_t sz;
size_t len;
- const char *hp;
const struct dhcp_opt *opt;
const struct if_options *ifo = iface-options;
const struct dhcp_state *state = D_CSTATE(iface);
@@ -989,25 +988,11 @@ make_message(struct dhcp_message **messa
}
}
- /* Regardless of RFC2132, we should always send a hostname
- * upto the first dot (the short hostname) as otherwise
- * confuses some DHCP servers when updating DNS.
- * The FQDN option should be used if a FQDN is required. */
if (ifo-hostname[0] == '\0')
- hostname = get_hostname();
+ hostname = get_hostname(ifo-options
+ DHCPCD_HOSTNAME_SHORT ? 1 : 0);
else
hostname = ifo-hostname;
- if (ifo-options DHCPCD_HOSTNAME hostname) {
- *p++ = DHO_HOSTNAME;
- hp = strchr(hostname, '.');
- if (hp)
-len = hp - hostname;
- else
-len = strlen(hostname);
- *p++ = len;
- memcpy(p, hostname, len);
- p += len;
- }
if (ifo-fqdn != FQDN_DISABLE) {
/* IETF DHC-FQDN option (81), RFC4702 */
*p++ = DHO_FQDN;
@@ -1034,6 +1019,12 @@ make_message(struct dhcp_message **messa
*lp += ul;
p += ul;
}
+ } else if (ifo-options DHCPCD_HOSTNAME hostname) {
+ *p++ = DHO_HOSTNAME;
+ len = strlen(hostname);
+ *p++ = len;
+ memcpy(p, hostname, len);
+ p += len;
}
/* vendor is already encoded correctly, so just add it */
Index: src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in:1.4 src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in:1.5
--- src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in:1.4 Sat Jul 20 21:40:04 2013
+++ src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in Mon Jul 29 20:39:28 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: dhcpcd-run-hooks.8.in,v 1.4 2013/07/20 21:40:04 wiz Exp $
+.\ $NetBSD: dhcpcd-run-hooks.8.in,v 1.5 2013/07/29 20:39:28 roy Exp $
.\ Copyright (c) 2006-2013 Roy Marples
.\ All rights reserved
.\
Index: src/external/bsd/dhcpcd/dist/dhcpcd.8.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.20 src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.21
--- src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.20 Sat Jul 20 21:40:04 2013
+++ src/external/bsd/dhcpcd/dist/dhcpcd.8.in Mon Jul 29 20:39:28 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: dhcpcd.8.in,v 1.20 2013/07/20 21:40:04 wiz Exp $
+.\ $NetBSD: dhcpcd.8.in,v 1.21 2013/07/29 20:39:28 roy Exp $
.\ Copyright (c) 2006-2013 Roy Marples
.\ All rights reserved
.\
Index: src/external/bsd/dhcpcd/dist/dhcpcd.conf
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.conf:1.6 src/external/bsd/dhcpcd/dist/dhcpcd.conf:1.7
--- src/external/bsd/dhcpcd/dist/dhcpcd.conf:1.6 Fri Jun 21 19:40:20 2013
+++ src/external/bsd/dhcpcd/dist/dhcpcd.conf Mon Jul 29 20:39:28 2013
@@ -1,17 +1,11 @@
-# $NetBSD: dhcpcd.conf,v 1.6 2013/06/21 19:40:20 roy Exp $
+# $NetBSD: dhcpcd.conf,v 1.7 2013/07/29 20:39:28 roy Exp $
# A sample configuration for dhcpcd.
# See dhcpcd.conf(5) for details.
-# Inform the DHCPv4 server of our hostname for DDNS.
-# This has been superceded by the FQDN option below, but is included
-# by default for servers which do not understand it.
+# Inform the DHCP server of our hostname for DDNS.
hostname
-# Inform the DHCP server of our hostname for DDNS
-# and/or query for what it should be.
-fqdn
-
# Use the hardware address of the interface for the Client
CVS commit: src/doc
Module Name:src Committed By: roy Date: Mon Jul 29 20:40:33 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Import dhcpcd-6.0.4 To generate a diff of this commit: cvs rdiff -u -r1.1046 -r1.1047 src/doc/3RDPARTY cvs rdiff -u -r1.1837 -r1.1838 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.1046 src/doc/3RDPARTY:1.1047 --- src/doc/3RDPARTY:1.1046 Sat Jul 27 19:25:23 2013 +++ src/doc/3RDPARTY Mon Jul 29 20:40:33 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1046 2013/07/27 19:25:23 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1047 2013/07/29 20:40:33 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -299,8 +299,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 6.0.3 -Current Vers: 6.0.3 +Version: 6.0.4 +Current Vers: 6.0.4 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1837 src/doc/CHANGES:1.1838 --- src/doc/CHANGES:1.1837 Sun Jul 28 11:46:24 2013 +++ src/doc/CHANGES Mon Jul 29 20:40:33 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1837 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1838 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -264,3 +264,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: named to terminate iwn(4): Add support for Centrino Wireless-N 1030 and Centrino Advanced-N 6230 [prlw1 20130728] + dhcpcd(8): Import dhcpcd-6.0.4 [roy 20130729]
CVS commit: src/lib
Module Name:src
Committed By: joerg
Date: Mon Jul 29 21:02:58 UTC 2013
Modified Files:
src/lib: Makefile
Log Message:
libbind now depends on heimdal, so push it after the third barrier.
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.203 src/lib/Makefile:1.204
--- src/lib/Makefile:1.203 Sun Apr 28 04:05:41 2013
+++ src/lib/Makefile Mon Jul 29 21:02:58 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.203 2013/04/28 04:05:41 joerg Exp $
+# $NetBSD: Makefile,v 1.204 2013/07/29 21:02:58 joerg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include bsd.own.mk
@@ -182,7 +182,6 @@ SUBDIR+= ../crypto/external/bsd/netpgp/l
.endif
SUBDIR+= ../external/bsd/libevent/lib # depends on libcrypto
-SUBDIR+= ../external/bsd/bind/lib # depends on libcrypto
SUBDIR+= ../external/bsd/fetch/lib # depends on libssl
.if (${MKLDAP} != no)
@@ -192,6 +191,8 @@ SUBDIR+= ../external/bsd/openldap/lib #
# 3rd library dependency barrier
SUBDIR+= .WAIT
+SUBDIR+= ../external/bsd/bind/lib # depends on heimdal, libcrypto
+
.if (${MKRUMP} != no)
SUBDIR+= librumpdev # depends on librump
SUBDIR+= librumpnet # depends on librump
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Tue Jul 30 01:57:31 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Modify ticket 909. To generate a diff of this commit: cvs rdiff -u -r1.1.2.22 -r1.1.2.23 src/doc/CHANGES-6.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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.22 src/doc/CHANGES-6.2:1.1.2.23 --- src/doc/CHANGES-6.2:1.1.2.22 Mon Jul 29 20:27:07 2013 +++ src/doc/CHANGES-6.2 Tue Jul 30 01:57:31 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.22 2013/07/29 20:27:07 jdc Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.23 2013/07/30 01:57:31 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -335,18 +335,7 @@ usr.sbin/pppd/pppd/sys-bsd.c 1.68 sys/net/route.c 1.127 - PR/44032: Proxy entries stopped working with pppd. The issue here is - that the route entry was added, but the RTF_LLINFO bit was not set, - making arp -a not showing the entry, but netstat -rn -f inet showing - it with the missing L bit. The order of resolution in ifa_ifwithroute() - is that if a destination address is found, then the interface chosen - for the route is that of the destination. This does not work for - link-level addresses since the ppp interface does not arp (uses - link_rtrequest, not arp_rtrequest), so the bit is never set. The easy - solution here is to check that the gateway is a link address, and use - the interface which we chose for the link address as opposed to the - interface that routes to the destination. This restores the previous - behavior, but is it correct? + Fix creation of arp entries for pppd's proxarp option. Fixes PR#44032. [christos, ticket #909] sys/kern/subr_disk_mbr.c 1.46
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Tue Jul 30 02:02:28 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Modify ticket 918. To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/doc/CHANGES-6.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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.23 src/doc/CHANGES-6.2:1.1.2.24 --- src/doc/CHANGES-6.2:1.1.2.23 Tue Jul 30 01:57:31 2013 +++ src/doc/CHANGES-6.2 Tue Jul 30 02:02:28 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.23 2013/07/30 01:57:31 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.24 2013/07/30 02:02:28 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -393,16 +393,14 @@ src/share/zoneinfo/zone.tab 1.1.1.45 v Changes for Morocco, Israel, Antarctica, metadata and documentation. [apb, ticket #915] -sys/dev/pci/if_wm.c1.259,1.260,1.261,1.262 +sys/dev/pci/if_wm.c1.259-1.262 sys/dev/pci/if_wmreg.h1.54 Various fixes to wm(4): - Fix MDIC write error bug for 82574 and 82583 - Sync the wm_enable_mng_pass_thru() function with FreeBSD - Sync the wm_release_manageablilty() fucntion with FreeBSD - For 82580(ER) or I350, set flags as per FreeBSD - Move EEPROM-related calls to after identifying the EEPPROM - Fix another NVM bank detect problem + Fix MDIC write error bug for 82574 and 82583. + Sync some functions with FreeBSD to make IPMI/ASF stable. + Move EEPROM-related calls to after identifying the EEPPROM. + Fix another NVM bank detect problem. [msaitoh, ticket #918] sys/common/pmap/tlb/pmap_tlb.c patch
CVS commit: [netbsd-5] src/usr.bin/netstat
Module Name:src
Committed By: msaitoh
Date: Tue Jul 30 02:22:15 UTC 2013
Modified Files:
src/usr.bin/netstat [netbsd-5]: inet.c inet6.c main.c netstat.h
Log Message:
Pull up following revision(s) (requested by christos in ticket #1868):
usr.bin/netstat/main.c: revision 1.86
usr.bin/netstat/netstat.h: revision 1.47
usr.bin/netstat/inet.c: revision 1.102
usr.bin/netstat/inet.c: revision 1.103
usr.bin/netstat/inet6.c: revision 1.61
usr.bin/netstat/inet6.c: revision 1.62
Don't use -P as a kmem printer, verify that the address points to a pcb first!
Not all pointers are 64bit - use uintptr_t instead of uint64_t.
To generate a diff of this commit:
cvs rdiff -u -r1.88.6.1 -r1.88.6.2 src/usr.bin/netstat/inet.c
cvs rdiff -u -r1.50.6.1 -r1.50.6.2 src/usr.bin/netstat/inet6.c
cvs rdiff -u -r1.70 -r1.70.4.1 src/usr.bin/netstat/main.c
cvs rdiff -u -r1.36 -r1.36.8.1 src/usr.bin/netstat/netstat.h
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/inet.c
diff -u src/usr.bin/netstat/inet.c:1.88.6.1 src/usr.bin/netstat/inet.c:1.88.6.2
--- src/usr.bin/netstat/inet.c:1.88.6.1 Thu Mar 26 17:14:41 2009
+++ src/usr.bin/netstat/inet.c Tue Jul 30 02:22:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: inet.c,v 1.88.6.1 2009/03/26 17:14:41 snj Exp $ */
+/* $NetBSD: inet.c,v 1.88.6.2 2013/07/30 02:22:14 msaitoh Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)inet.c 8.4 (Berkeley) 4/20/94;
#else
-__RCSID($NetBSD: inet.c,v 1.88.6.1 2009/03/26 17:14:41 snj Exp $);
+__RCSID($NetBSD: inet.c,v 1.88.6.2 2013/07/30 02:22:14 msaitoh Exp $);
#endif
#endif /* not lint */
@@ -159,122 +159,155 @@ protopr0(intptr_t ppcb, u_long rcv_sb_cc
putchar('\n');
}
+struct kinfo_pcb *
+getpcblist_sysctl(const char *name, size_t *len) {
+int mib[8];
+size_t namelen = 0, size = 0;
+char *mibname = NULL;
+struct kinfo_pcb *pcblist;
+
+memset(mib, 0, sizeof(mib));
+
+if (asprintf(mibname, net.inet%s.%s.pcblist, name + 3, name) == -1)
+err(1, asprintf);
+
+/* get dynamic pcblist node */
+if (sysctlnametomib(mibname, mib, namelen) == -1)
+err(1, sysctlnametomib: %s, mibname);
+
+free(mibname);
+
+if (sysctl(mib, __arraycount(mib), NULL, size, NULL, 0) == -1)
+err(1, sysctl (query));
+
+if ((pcblist = malloc(size)) == NULL)
+err(1, malloc);
+memset(pcblist, 0, size);
+
+mib[6] = sizeof(*pcblist);
+mib[7] = size / sizeof(*pcblist);
+
+if (sysctl(mib, __arraycount(mib), pcblist, size, NULL, 0) == -1)
+err(1, sysctl (copy));
+
+*len = size / sizeof(*pcblist);
+return pcblist;
+
+}
+
+static struct kinfo_pcb *
+getpcblist_kmem(u_long off, const char *name, size_t *len) {
+struct inpcbtable table;
+struct inpcb *head, *next, *prev;
+struct inpcb inpcb;
+struct tcpcb tcpcb;
+struct socket sockb;
+int istcp = strcmp(name, tcp) == 0;
+struct kinfo_pcb *pcblist;
+size_t size = 100, i;
+struct sockaddr_in sin;
+
+if (off == 0) {
+*len = 0;
+return NULL;
+}
+
+kread(off, (char *)table, sizeof table);
+prev = head =
+(struct inpcb *)((struct inpcbtable *)off)-inpt_queue.cqh_first;
+next = (struct inpcb *)table.inpt_queue.cqh_first;
+
+if ((pcblist = malloc(size)) == NULL)
+err(1, malloc);
+
+i = 0;
+while (next != head) {
+kread((u_long)next, (char *)inpcb, sizeof inpcb);
+if ((struct inpcb *)inpcb.inp_queue.cqe_prev != prev) {
+warnx(bad pcb);
+break;
+}
+prev = next;
+next = (struct inpcb *)inpcb.inp_queue.cqe_next;
+
+if (inpcb.inp_af != AF_INET)
+continue;
+
+kread((u_long)inpcb.inp_socket, (char *)sockb, sizeof(sockb));
+if (istcp) {
+kread((u_long)inpcb.inp_ppcb,
+(char *)tcpcb, sizeof (tcpcb));
+}
+pcblist[i].ki_ppcbaddr =
+istcp ? (uintptr_t) inpcb.inp_ppcb : (uintptr_t) prev;
+pcblist[i].ki_rcvq = (uint64_t)sockb.so_rcv.sb_cc;
+pcblist[i].ki_sndq = (uint64_t)sockb.so_snd.sb_cc;
+
+sin.sin_addr = inpcb.inp_laddr;
+sin.sin_port = inpcb.inp_lport;
+memcpy(pcblist[i].ki_s, sin, sizeof(sin));
+sin.sin_addr = inpcb.inp_faddr;
+sin.sin_port = inpcb.inp_fport;
+
CVS commit: [netbsd-5-2] src/usr.bin/netstat
Module Name:src
Committed By: msaitoh
Date: Tue Jul 30 02:24:19 UTC 2013
Modified Files:
src/usr.bin/netstat [netbsd-5-2]: inet.c inet6.c main.c netstat.h
Log Message:
Pull up following revision(s) (requested by christos in ticket #1868):
usr.bin/netstat/main.c: revision 1.86
usr.bin/netstat/netstat.h: revision 1.47
usr.bin/netstat/inet.c: revision 1.102
usr.bin/netstat/inet.c: revision 1.103
usr.bin/netstat/inet6.c: revision 1.61
usr.bin/netstat/inet6.c: revision 1.62
Don't use -P as a kmem printer, verify that the address points to a pcb first!
Not all pointers are 64bit - use uintptr_t instead of uint64_t.
To generate a diff of this commit:
cvs rdiff -u -r1.88.6.1 -r1.88.6.1.10.1 src/usr.bin/netstat/inet.c
cvs rdiff -u -r1.50.6.1 -r1.50.6.1.10.1 src/usr.bin/netstat/inet6.c
cvs rdiff -u -r1.70 -r1.70.2.1 src/usr.bin/netstat/main.c
cvs rdiff -u -r1.36 -r1.36.6.1 src/usr.bin/netstat/netstat.h
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/inet.c
diff -u src/usr.bin/netstat/inet.c:1.88.6.1 src/usr.bin/netstat/inet.c:1.88.6.1.10.1
--- src/usr.bin/netstat/inet.c:1.88.6.1 Thu Mar 26 17:14:41 2009
+++ src/usr.bin/netstat/inet.c Tue Jul 30 02:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: inet.c,v 1.88.6.1 2009/03/26 17:14:41 snj Exp $ */
+/* $NetBSD: inet.c,v 1.88.6.1.10.1 2013/07/30 02:24:19 msaitoh Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)inet.c 8.4 (Berkeley) 4/20/94;
#else
-__RCSID($NetBSD: inet.c,v 1.88.6.1 2009/03/26 17:14:41 snj Exp $);
+__RCSID($NetBSD: inet.c,v 1.88.6.1.10.1 2013/07/30 02:24:19 msaitoh Exp $);
#endif
#endif /* not lint */
@@ -159,122 +159,155 @@ protopr0(intptr_t ppcb, u_long rcv_sb_cc
putchar('\n');
}
+struct kinfo_pcb *
+getpcblist_sysctl(const char *name, size_t *len) {
+int mib[8];
+size_t namelen = 0, size = 0;
+char *mibname = NULL;
+struct kinfo_pcb *pcblist;
+
+memset(mib, 0, sizeof(mib));
+
+if (asprintf(mibname, net.inet%s.%s.pcblist, name + 3, name) == -1)
+err(1, asprintf);
+
+/* get dynamic pcblist node */
+if (sysctlnametomib(mibname, mib, namelen) == -1)
+err(1, sysctlnametomib: %s, mibname);
+
+free(mibname);
+
+if (sysctl(mib, __arraycount(mib), NULL, size, NULL, 0) == -1)
+err(1, sysctl (query));
+
+if ((pcblist = malloc(size)) == NULL)
+err(1, malloc);
+memset(pcblist, 0, size);
+
+mib[6] = sizeof(*pcblist);
+mib[7] = size / sizeof(*pcblist);
+
+if (sysctl(mib, __arraycount(mib), pcblist, size, NULL, 0) == -1)
+err(1, sysctl (copy));
+
+*len = size / sizeof(*pcblist);
+return pcblist;
+
+}
+
+static struct kinfo_pcb *
+getpcblist_kmem(u_long off, const char *name, size_t *len) {
+struct inpcbtable table;
+struct inpcb *head, *next, *prev;
+struct inpcb inpcb;
+struct tcpcb tcpcb;
+struct socket sockb;
+int istcp = strcmp(name, tcp) == 0;
+struct kinfo_pcb *pcblist;
+size_t size = 100, i;
+struct sockaddr_in sin;
+
+if (off == 0) {
+*len = 0;
+return NULL;
+}
+
+kread(off, (char *)table, sizeof table);
+prev = head =
+(struct inpcb *)((struct inpcbtable *)off)-inpt_queue.cqh_first;
+next = (struct inpcb *)table.inpt_queue.cqh_first;
+
+if ((pcblist = malloc(size)) == NULL)
+err(1, malloc);
+
+i = 0;
+while (next != head) {
+kread((u_long)next, (char *)inpcb, sizeof inpcb);
+if ((struct inpcb *)inpcb.inp_queue.cqe_prev != prev) {
+warnx(bad pcb);
+break;
+}
+prev = next;
+next = (struct inpcb *)inpcb.inp_queue.cqe_next;
+
+if (inpcb.inp_af != AF_INET)
+continue;
+
+kread((u_long)inpcb.inp_socket, (char *)sockb, sizeof(sockb));
+if (istcp) {
+kread((u_long)inpcb.inp_ppcb,
+(char *)tcpcb, sizeof (tcpcb));
+}
+pcblist[i].ki_ppcbaddr =
+istcp ? (uintptr_t) inpcb.inp_ppcb : (uintptr_t) prev;
+pcblist[i].ki_rcvq = (uint64_t)sockb.so_rcv.sb_cc;
+pcblist[i].ki_sndq = (uint64_t)sockb.so_snd.sb_cc;
+
+sin.sin_addr = inpcb.inp_laddr;
+sin.sin_port = inpcb.inp_lport;
+memcpy(pcblist[i].ki_s, sin, sizeof(sin));
+sin.sin_addr = inpcb.inp_faddr;
+sin.sin_port = inpcb.inp_fport;
+
CVS commit: [netbsd-5-1] src/usr.bin/netstat
Module Name:src
Committed By: msaitoh
Date: Tue Jul 30 02:26:10 UTC 2013
Modified Files:
src/usr.bin/netstat [netbsd-5-1]: inet.c inet6.c main.c netstat.h
Log Message:
Pull up following revision(s) (requested by christos in ticket #1868):
usr.bin/netstat/main.c: revision 1.86
usr.bin/netstat/netstat.h: revision 1.47
usr.bin/netstat/inet.c: revision 1.102
usr.bin/netstat/inet.c: revision 1.103
usr.bin/netstat/inet6.c: revision 1.61
usr.bin/netstat/inet6.c: revision 1.62
Don't use -P as a kmem printer, verify that the address points to a pcb first!
Not all pointers are 64bit - use uintptr_t instead of uint64_t.
To generate a diff of this commit:
cvs rdiff -u -r1.88.6.1 -r1.88.6.1.6.1 src/usr.bin/netstat/inet.c
cvs rdiff -u -r1.50.6.1 -r1.50.6.1.6.1 src/usr.bin/netstat/inet6.c
cvs rdiff -u -r1.70 -r1.70.12.1 src/usr.bin/netstat/main.c
cvs rdiff -u -r1.36 -r1.36.16.1 src/usr.bin/netstat/netstat.h
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/inet.c
diff -u src/usr.bin/netstat/inet.c:1.88.6.1 src/usr.bin/netstat/inet.c:1.88.6.1.6.1
--- src/usr.bin/netstat/inet.c:1.88.6.1 Thu Mar 26 17:14:41 2009
+++ src/usr.bin/netstat/inet.c Tue Jul 30 02:26:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: inet.c,v 1.88.6.1 2009/03/26 17:14:41 snj Exp $ */
+/* $NetBSD: inet.c,v 1.88.6.1.6.1 2013/07/30 02:26:10 msaitoh Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)inet.c 8.4 (Berkeley) 4/20/94;
#else
-__RCSID($NetBSD: inet.c,v 1.88.6.1 2009/03/26 17:14:41 snj Exp $);
+__RCSID($NetBSD: inet.c,v 1.88.6.1.6.1 2013/07/30 02:26:10 msaitoh Exp $);
#endif
#endif /* not lint */
@@ -159,122 +159,155 @@ protopr0(intptr_t ppcb, u_long rcv_sb_cc
putchar('\n');
}
+struct kinfo_pcb *
+getpcblist_sysctl(const char *name, size_t *len) {
+int mib[8];
+size_t namelen = 0, size = 0;
+char *mibname = NULL;
+struct kinfo_pcb *pcblist;
+
+memset(mib, 0, sizeof(mib));
+
+if (asprintf(mibname, net.inet%s.%s.pcblist, name + 3, name) == -1)
+err(1, asprintf);
+
+/* get dynamic pcblist node */
+if (sysctlnametomib(mibname, mib, namelen) == -1)
+err(1, sysctlnametomib: %s, mibname);
+
+free(mibname);
+
+if (sysctl(mib, __arraycount(mib), NULL, size, NULL, 0) == -1)
+err(1, sysctl (query));
+
+if ((pcblist = malloc(size)) == NULL)
+err(1, malloc);
+memset(pcblist, 0, size);
+
+mib[6] = sizeof(*pcblist);
+mib[7] = size / sizeof(*pcblist);
+
+if (sysctl(mib, __arraycount(mib), pcblist, size, NULL, 0) == -1)
+err(1, sysctl (copy));
+
+*len = size / sizeof(*pcblist);
+return pcblist;
+
+}
+
+static struct kinfo_pcb *
+getpcblist_kmem(u_long off, const char *name, size_t *len) {
+struct inpcbtable table;
+struct inpcb *head, *next, *prev;
+struct inpcb inpcb;
+struct tcpcb tcpcb;
+struct socket sockb;
+int istcp = strcmp(name, tcp) == 0;
+struct kinfo_pcb *pcblist;
+size_t size = 100, i;
+struct sockaddr_in sin;
+
+if (off == 0) {
+*len = 0;
+return NULL;
+}
+
+kread(off, (char *)table, sizeof table);
+prev = head =
+(struct inpcb *)((struct inpcbtable *)off)-inpt_queue.cqh_first;
+next = (struct inpcb *)table.inpt_queue.cqh_first;
+
+if ((pcblist = malloc(size)) == NULL)
+err(1, malloc);
+
+i = 0;
+while (next != head) {
+kread((u_long)next, (char *)inpcb, sizeof inpcb);
+if ((struct inpcb *)inpcb.inp_queue.cqe_prev != prev) {
+warnx(bad pcb);
+break;
+}
+prev = next;
+next = (struct inpcb *)inpcb.inp_queue.cqe_next;
+
+if (inpcb.inp_af != AF_INET)
+continue;
+
+kread((u_long)inpcb.inp_socket, (char *)sockb, sizeof(sockb));
+if (istcp) {
+kread((u_long)inpcb.inp_ppcb,
+(char *)tcpcb, sizeof (tcpcb));
+}
+pcblist[i].ki_ppcbaddr =
+istcp ? (uintptr_t) inpcb.inp_ppcb : (uintptr_t) prev;
+pcblist[i].ki_rcvq = (uint64_t)sockb.so_rcv.sb_cc;
+pcblist[i].ki_sndq = (uint64_t)sockb.so_snd.sb_cc;
+
+sin.sin_addr = inpcb.inp_laddr;
+sin.sin_port = inpcb.inp_lport;
+memcpy(pcblist[i].ki_s, sin, sizeof(sin));
+sin.sin_addr = inpcb.inp_faddr;
+sin.sin_port = inpcb.inp_fport;
+
CVS commit: [netbsd-5] src/usr.bin/mklocale
Module Name:src
Committed By: msaitoh
Date: Tue Jul 30 02:28:20 UTC 2013
Modified Files:
src/usr.bin/mklocale [netbsd-5]: mklocaledb.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #1869):
usr.bin/mklocale/mklocaledb.c: revision 1.3
Swap order of _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES and
_CITRUS_LC_MONETARY_SYM_INT_P_SEP_BY_SPACE to match data files.
To generate a diff of this commit:
cvs rdiff -u -r1.2.2.3 -r1.2.2.4 src/usr.bin/mklocale/mklocaledb.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/mklocale/mklocaledb.c
diff -u src/usr.bin/mklocale/mklocaledb.c:1.2.2.3 src/usr.bin/mklocale/mklocaledb.c:1.2.2.4
--- src/usr.bin/mklocale/mklocaledb.c:1.2.2.3 Thu Jan 15 03:57:38 2009
+++ src/usr.bin/mklocale/mklocaledb.c Tue Jul 30 02:28:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mklocaledb.c,v 1.2.2.3 2009/01/15 03:57:38 snj Exp $ */
+/* $NetBSD: mklocaledb.c,v 1.2.2.4 2013/07/30 02:28:20 msaitoh Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -37,7 +37,7 @@
#include sys/cdefs.h
#if !defined(lint)
-__RCSID($NetBSD: mklocaledb.c,v 1.2.2.3 2009/01/15 03:57:38 snj Exp $);
+__RCSID($NetBSD: mklocaledb.c,v 1.2.2.4 2013/07/30 02:28:20 msaitoh Exp $);
#endif /* not lint */
#include assert.h
@@ -136,8 +136,8 @@ static const category_t lc_monetary = {
{ _CITRUS_LC_MONETARY_SYM_P_SIGN_POSN,save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_N_SIGN_POSN,save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_P_CS_PRECEDES, save_as_uint8},
- { _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES, save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_P_SEP_BY_SPACE, save_as_uint8},
+ { _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES, save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_N_SEP_BY_SPACE, save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_P_SIGN_POSN,save_as_uint8},
{ _CITRUS_LC_MONETARY_SYM_INT_N_SIGN_POSN,save_as_uint8},
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Tue Jul 30 02:29:49 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1868 and 1869. To generate a diff of this commit: cvs rdiff -u -r1.1.2.22 -r1.1.2.23 src/doc/CHANGES-5.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.3 diff -u src/doc/CHANGES-5.3:1.1.2.22 src/doc/CHANGES-5.3:1.1.2.23 --- src/doc/CHANGES-5.3:1.1.2.22 Mon Jul 29 02:20:07 2013 +++ src/doc/CHANGES-5.3 Tue Jul 30 02:29:49 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.22 2013/07/29 02:20:07 msaitoh Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.23 2013/07/30 02:29:49 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -445,3 +445,19 @@ external/bsd/bind/dist/lib/dns/rdata/gen Fix for bind CVE-2013-4854. [spz, ticket #1871] + +usr.bin/netstat/inet.c1.102-1.03 +usr.bin/netstat/inet6.c1.61-1.62 +usr.bin/netstat/main.c1.86 +usr.bin/netstat/netstat.h 1.47 + + Don't use -P as a kmem printer, verify that the address points to a + pcb first! + Not all pointers are 64bit - use uintptr_t instead of uint64_t. + [christos, ticket #1868] + +usr.bin/mklocale/mklocaledb.c 1.3 + + Swap order of _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES and + _CITRUS_LC_MONETARY_SYM_INT_P_SEP_BY_SPACE to match data files. + [joerg, ticket #1869]
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: msaitoh Date: Tue Jul 30 02:30:34 UTC 2013 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Ticket 1868. To generate a diff of this commit: cvs rdiff -u -r1.1.2.43 -r1.1.2.44 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.43 src/doc/CHANGES-5.1.3:1.1.2.44 --- src/doc/CHANGES-5.1.3:1.1.2.43 Mon Jul 29 02:22:18 2013 +++ src/doc/CHANGES-5.1.3 Tue Jul 30 02:30:34 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.43 2013/07/29 02:22:18 msaitoh Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.44 2013/07/30 02:30:34 msaitoh Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2470,3 +2470,13 @@ external/bsd/bind/dist/lib/dns/rdata/gen Fix for bind CVE-2013-4854. [spz, ticket #1871] + +usr.bin/netstat/inet.c1.102-1.03 +usr.bin/netstat/inet6.c1.61-1.62 +usr.bin/netstat/main.c1.86 +usr.bin/netstat/netstat.h 1.47 + + Don't use -P as a kmem printer, verify that the address points to a + pcb first! + Not all pointers are 64bit - use uintptr_t instead of uint64_t. + [christos, ticket #1868]
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: msaitoh Date: Tue Jul 30 02:30:13 UTC 2013 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.1 Log Message: Ticket 1868. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-5.2.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2.1 diff -u src/doc/CHANGES-5.2.1:1.1.2.11 src/doc/CHANGES-5.2.1:1.1.2.12 --- src/doc/CHANGES-5.2.1:1.1.2.11 Mon Jul 29 02:21:30 2013 +++ src/doc/CHANGES-5.2.1 Tue Jul 30 02:30:13 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.1,v 1.1.2.11 2013/07/29 02:21:30 msaitoh Exp $ +# $NetBSD: CHANGES-5.2.1,v 1.1.2.12 2013/07/30 02:30:13 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 release: @@ -184,3 +184,13 @@ external/bsd/bind/dist/lib/dns/rdata/gen Fix for bind CVE-2013-4854. [spz, ticket #1871] + +usr.bin/netstat/inet.c1.102-1.03 +usr.bin/netstat/inet6.c1.61-1.62 +usr.bin/netstat/main.c1.86 +usr.bin/netstat/netstat.h 1.47 + + Don't use -P as a kmem printer, verify that the address points to a + pcb first! + Not all pointers are 64bit - use uintptr_t instead of uint64_t. + [christos, ticket #1868]
CVS commit: [netbsd-6] src/sys/net
Module Name:src
Committed By: msaitoh
Date: Tue Jul 30 03:05:39 UTC 2013
Modified Files:
src/sys/net [netbsd-6]: if_mpls.c
Log Message:
Pull up following revision(s) (requested by kefren in ticket #921):
sys/net/if_mpls.c: revision 1.9
stop abusing kmem during softint context to prevent panic
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/net/if_mpls.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_mpls.c
diff -u src/sys/net/if_mpls.c:1.8 src/sys/net/if_mpls.c:1.8.8.1
--- src/sys/net/if_mpls.c:1.8 Sun Jul 3 18:46:12 2011
+++ src/sys/net/if_mpls.c Tue Jul 30 03:05:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mpls.c,v 1.8 2011/07/03 18:46:12 kefren Exp $ */
+/* $NetBSD: if_mpls.c,v 1.8.8.1 2013/07/30 03:05:39 msaitoh Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_mpls.c,v 1.8 2011/07/03 18:46:12 kefren Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_mpls.c,v 1.8.8.1 2013/07/30 03:05:39 msaitoh Exp $);
#include opt_inet.h
#include opt_mpls.h
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, $NetBSD: if_mpls.c,v
#include sys/param.h
#include sys/errno.h
-#include sys/kmem.h
#include sys/malloc.h
#include sys/mbuf.h
#include sys/sysctl.h
@@ -518,25 +517,21 @@ mpls_unlabel_inet(struct mbuf *m)
static struct mbuf *
mpls_label_inet(struct mbuf *m, union mpls_shim *ms, uint offset)
{
- struct ip *iphdr;
+ struct ip iphdr;
if (mpls_mapttl_inet || mpls_mapprec_inet) {
if ((m-m_len sizeof(struct ip))
(m = m_pullup(m, offset + sizeof(struct ip))) == 0)
return NULL; /* XXX */
- iphdr = kmem_alloc(sizeof(struct ip), KM_NOSLEEP);
- if (iphdr == NULL)
- return NULL;
- m_copydata(m, offset, sizeof(struct ip), iphdr);
+ m_copydata(m, offset, sizeof(struct ip), iphdr);
/* Map TTL */
if (mpls_mapttl_inet)
- ms-shim.ttl = iphdr-ip_ttl;
+ ms-shim.ttl = iphdr.ip_ttl;
/* Copy IP precedence to EXP */
if (mpls_mapprec_inet)
- ms-shim.exp = ((u_int8_t)iphdr-ip_tos) 5;
- kmem_free (iphdr, sizeof(struct ip));
+ ms-shim.exp = ((u_int8_t)iphdr.ip_tos) 5;
}
if ((m = mpls_prepend_shim(m, ms)) == NULL)
@@ -592,23 +587,19 @@ mpls_unlabel_inet6(struct mbuf *m)
static struct mbuf *
mpls_label_inet6(struct mbuf *m, union mpls_shim *ms, uint offset)
{
- struct ip6_hdr *ip6h;
+ struct ip6_hdr ip6h;
if (mpls_mapttl_inet6 || mpls_mapclass_inet6) {
if (m-m_len sizeof(struct ip6_hdr)
(m = m_pullup(m, offset + sizeof(struct ip6_hdr))) == 0)
return NULL;
- ip6h = kmem_alloc(sizeof(struct ip6_hdr), KM_NOSLEEP);
- if (ip6h == NULL)
- return NULL;
- m_copydata(m, offset, sizeof(struct ip6_hdr), ip6h);
+ m_copydata(m, offset, sizeof(struct ip6_hdr), ip6h);
if (mpls_mapttl_inet6)
- ms-shim.ttl = ip6h-ip6_hlim;
+ ms-shim.ttl = ip6h.ip6_hlim;
if (mpls_mapclass_inet6)
- ms-shim.exp = ip6h-ip6_vfc 1 5;
- kmem_free(ip6h, sizeof(struct ip6_hdr));
+ ms-shim.exp = ip6h.ip6_vfc 1 5;
}
if ((m = mpls_prepend_shim(m, ms)) == NULL)
CVS commit: [netbsd-6-1] src/sys/net
Module Name:src
Committed By: msaitoh
Date: Tue Jul 30 03:06:42 UTC 2013
Modified Files:
src/sys/net [netbsd-6-1]: if_mpls.c
Log Message:
Pull up following revision(s) (requested by kefren in ticket #921):
sys/net/if_mpls.c: revision 1.9
stop abusing kmem during softint context to prevent panic
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.22.1 src/sys/net/if_mpls.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_mpls.c
diff -u src/sys/net/if_mpls.c:1.8 src/sys/net/if_mpls.c:1.8.22.1
--- src/sys/net/if_mpls.c:1.8 Sun Jul 3 18:46:12 2011
+++ src/sys/net/if_mpls.c Tue Jul 30 03:06:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mpls.c,v 1.8 2011/07/03 18:46:12 kefren Exp $ */
+/* $NetBSD: if_mpls.c,v 1.8.22.1 2013/07/30 03:06:42 msaitoh Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_mpls.c,v 1.8 2011/07/03 18:46:12 kefren Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_mpls.c,v 1.8.22.1 2013/07/30 03:06:42 msaitoh Exp $);
#include opt_inet.h
#include opt_mpls.h
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, $NetBSD: if_mpls.c,v
#include sys/param.h
#include sys/errno.h
-#include sys/kmem.h
#include sys/malloc.h
#include sys/mbuf.h
#include sys/sysctl.h
@@ -518,25 +517,21 @@ mpls_unlabel_inet(struct mbuf *m)
static struct mbuf *
mpls_label_inet(struct mbuf *m, union mpls_shim *ms, uint offset)
{
- struct ip *iphdr;
+ struct ip iphdr;
if (mpls_mapttl_inet || mpls_mapprec_inet) {
if ((m-m_len sizeof(struct ip))
(m = m_pullup(m, offset + sizeof(struct ip))) == 0)
return NULL; /* XXX */
- iphdr = kmem_alloc(sizeof(struct ip), KM_NOSLEEP);
- if (iphdr == NULL)
- return NULL;
- m_copydata(m, offset, sizeof(struct ip), iphdr);
+ m_copydata(m, offset, sizeof(struct ip), iphdr);
/* Map TTL */
if (mpls_mapttl_inet)
- ms-shim.ttl = iphdr-ip_ttl;
+ ms-shim.ttl = iphdr.ip_ttl;
/* Copy IP precedence to EXP */
if (mpls_mapprec_inet)
- ms-shim.exp = ((u_int8_t)iphdr-ip_tos) 5;
- kmem_free (iphdr, sizeof(struct ip));
+ ms-shim.exp = ((u_int8_t)iphdr.ip_tos) 5;
}
if ((m = mpls_prepend_shim(m, ms)) == NULL)
@@ -592,23 +587,19 @@ mpls_unlabel_inet6(struct mbuf *m)
static struct mbuf *
mpls_label_inet6(struct mbuf *m, union mpls_shim *ms, uint offset)
{
- struct ip6_hdr *ip6h;
+ struct ip6_hdr ip6h;
if (mpls_mapttl_inet6 || mpls_mapclass_inet6) {
if (m-m_len sizeof(struct ip6_hdr)
(m = m_pullup(m, offset + sizeof(struct ip6_hdr))) == 0)
return NULL;
- ip6h = kmem_alloc(sizeof(struct ip6_hdr), KM_NOSLEEP);
- if (ip6h == NULL)
- return NULL;
- m_copydata(m, offset, sizeof(struct ip6_hdr), ip6h);
+ m_copydata(m, offset, sizeof(struct ip6_hdr), ip6h);
if (mpls_mapttl_inet6)
- ms-shim.ttl = ip6h-ip6_hlim;
+ ms-shim.ttl = ip6h.ip6_hlim;
if (mpls_mapclass_inet6)
- ms-shim.exp = ip6h-ip6_vfc 1 5;
- kmem_free(ip6h, sizeof(struct ip6_hdr));
+ ms-shim.exp = ip6h.ip6_vfc 1 5;
}
if ((m = mpls_prepend_shim(m, ms)) == NULL)
CVS commit: [netbsd-6-0] src/sys/net
Module Name:src
Committed By: msaitoh
Date: Tue Jul 30 03:07:50 UTC 2013
Modified Files:
src/sys/net [netbsd-6-0]: if_mpls.c
Log Message:
Pull up following revision(s) (requested by kefren in ticket #921):
sys/net/if_mpls.c: revision 1.9
stop abusing kmem during softint context to prevent panic
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.14.1 src/sys/net/if_mpls.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_mpls.c
diff -u src/sys/net/if_mpls.c:1.8 src/sys/net/if_mpls.c:1.8.14.1
--- src/sys/net/if_mpls.c:1.8 Sun Jul 3 18:46:12 2011
+++ src/sys/net/if_mpls.c Tue Jul 30 03:07:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mpls.c,v 1.8 2011/07/03 18:46:12 kefren Exp $ */
+/* $NetBSD: if_mpls.c,v 1.8.14.1 2013/07/30 03:07:50 msaitoh Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_mpls.c,v 1.8 2011/07/03 18:46:12 kefren Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_mpls.c,v 1.8.14.1 2013/07/30 03:07:50 msaitoh Exp $);
#include opt_inet.h
#include opt_mpls.h
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, $NetBSD: if_mpls.c,v
#include sys/param.h
#include sys/errno.h
-#include sys/kmem.h
#include sys/malloc.h
#include sys/mbuf.h
#include sys/sysctl.h
@@ -518,25 +517,21 @@ mpls_unlabel_inet(struct mbuf *m)
static struct mbuf *
mpls_label_inet(struct mbuf *m, union mpls_shim *ms, uint offset)
{
- struct ip *iphdr;
+ struct ip iphdr;
if (mpls_mapttl_inet || mpls_mapprec_inet) {
if ((m-m_len sizeof(struct ip))
(m = m_pullup(m, offset + sizeof(struct ip))) == 0)
return NULL; /* XXX */
- iphdr = kmem_alloc(sizeof(struct ip), KM_NOSLEEP);
- if (iphdr == NULL)
- return NULL;
- m_copydata(m, offset, sizeof(struct ip), iphdr);
+ m_copydata(m, offset, sizeof(struct ip), iphdr);
/* Map TTL */
if (mpls_mapttl_inet)
- ms-shim.ttl = iphdr-ip_ttl;
+ ms-shim.ttl = iphdr.ip_ttl;
/* Copy IP precedence to EXP */
if (mpls_mapprec_inet)
- ms-shim.exp = ((u_int8_t)iphdr-ip_tos) 5;
- kmem_free (iphdr, sizeof(struct ip));
+ ms-shim.exp = ((u_int8_t)iphdr.ip_tos) 5;
}
if ((m = mpls_prepend_shim(m, ms)) == NULL)
@@ -592,23 +587,19 @@ mpls_unlabel_inet6(struct mbuf *m)
static struct mbuf *
mpls_label_inet6(struct mbuf *m, union mpls_shim *ms, uint offset)
{
- struct ip6_hdr *ip6h;
+ struct ip6_hdr ip6h;
if (mpls_mapttl_inet6 || mpls_mapclass_inet6) {
if (m-m_len sizeof(struct ip6_hdr)
(m = m_pullup(m, offset + sizeof(struct ip6_hdr))) == 0)
return NULL;
- ip6h = kmem_alloc(sizeof(struct ip6_hdr), KM_NOSLEEP);
- if (ip6h == NULL)
- return NULL;
- m_copydata(m, offset, sizeof(struct ip6_hdr), ip6h);
+ m_copydata(m, offset, sizeof(struct ip6_hdr), ip6h);
if (mpls_mapttl_inet6)
- ms-shim.ttl = ip6h-ip6_hlim;
+ ms-shim.ttl = ip6h.ip6_hlim;
if (mpls_mapclass_inet6)
- ms-shim.exp = ip6h-ip6_vfc 1 5;
- kmem_free(ip6h, sizeof(struct ip6_hdr));
+ ms-shim.exp = ip6h.ip6_vfc 1 5;
}
if ((m = mpls_prepend_shim(m, ms)) == NULL)
CVS commit: [netbsd-6] src
Module Name:src
Committed By: msaitoh
Date: Tue Jul 30 04:00:20 UTC 2013
Modified Files:
src/lib/libc/sys [netbsd-6]: msgrcv.2 msgsnd.2
src/tests/lib/libc/sys [netbsd-6]: t_msgrcv.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #922):
tests/lib/libc/sys/t_msgrcv.c 1.3
lib/libc/sys/msgrcv.2 1.21-1.22
lib/libc/sys/msgsnd.2 1.19-1.20
Fix msgsz confusion.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.10.1 src/lib/libc/sys/msgrcv.2
cvs rdiff -u -r1.18 -r1.18.8.1 src/lib/libc/sys/msgsnd.2
cvs rdiff -u -r1.2 -r1.2.2.1 src/tests/lib/libc/sys/t_msgrcv.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/sys/msgrcv.2
diff -u src/lib/libc/sys/msgrcv.2:1.19 src/lib/libc/sys/msgrcv.2:1.19.10.1
--- src/lib/libc/sys/msgrcv.2:1.19 Wed Jan 28 08:57:02 2009
+++ src/lib/libc/sys/msgrcv.2 Tue Jul 30 04:00:20 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: msgrcv.2,v 1.19 2009/01/28 08:57:02 wiz Exp $
+.\ $NetBSD: msgrcv.2,v 1.19.10.1 2013/07/30 04:00:20 msaitoh Exp $
.\
.\ Copyright (c) 1995 Frank van der Linden
.\ All rights reserved.
@@ -29,7 +29,7 @@
.\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd January 26, 2009
+.Dd July 24, 2013
.Dt MSGRCV 2
.Os
.Sh NAME
@@ -90,8 +90,10 @@ less than or equal to the absolute value
will be received.
.El
.Pp
+The argument
.Fa msgsz
-specifies the maximum length of the requested message.
+specifies the size in bytes of
+.Va mtext .
If the received message has a length greater than
.Fa msgsz
it will be silently truncated if the
Index: src/lib/libc/sys/msgsnd.2
diff -u src/lib/libc/sys/msgsnd.2:1.18 src/lib/libc/sys/msgsnd.2:1.18.8.1
--- src/lib/libc/sys/msgsnd.2:1.18 Fri Apr 30 04:06:20 2010
+++ src/lib/libc/sys/msgsnd.2 Tue Jul 30 04:00:20 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: msgsnd.2,v 1.18 2010/04/30 04:06:20 jruoho Exp $
+.\ $NetBSD: msgsnd.2,v 1.18.8.1 2013/07/30 04:00:20 msaitoh Exp $
.\
.\ Copyright (c) 1995 Frank van der Linden
.\ All rights reserved.
@@ -29,7 +29,7 @@
.\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd April 30, 2010
+.Dd July 24, 2013
.Dt MSGSND 2
.Os
.Sh NAME
@@ -69,7 +69,9 @@ be used for selecting messages (see
.Xr msgrcv 2 ) .
The
.Va mtext
-field is an array of bytes, with size up to the system limit
+field is an array of bytes of length
+.Fa msgsz ,
+with size up to the system limit
.Dv MSGMAX .
.Pp
If the number of bytes already on the message queue plus
Index: src/tests/lib/libc/sys/t_msgrcv.c
diff -u src/tests/lib/libc/sys/t_msgrcv.c:1.2 src/tests/lib/libc/sys/t_msgrcv.c:1.2.2.1
--- src/tests/lib/libc/sys/t_msgrcv.c:1.2 Fri Nov 11 05:06:01 2011
+++ src/tests/lib/libc/sys/t_msgrcv.c Tue Jul 30 04:00:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_msgrcv.c,v 1.2 2011/11/11 05:06:01 jruoho Exp $ */
+/* $NetBSD: t_msgrcv.c,v 1.2.2.1 2013/07/30 04:00:20 msaitoh Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_msgrcv.c,v 1.2 2011/11/11 05:06:01 jruoho Exp $);
+__RCSID($NetBSD: t_msgrcv.c,v 1.2.2.1 2013/07/30 04:00:20 msaitoh Exp $);
#include sys/msg.h
#include sys/stat.h
@@ -51,10 +51,11 @@ __RCSID($NetBSD: t_msgrcv.c,v 1.2 2011/
#define MSG_MTYPE_1 0x41
#define MSG_MTYPE_2 0x42
#define MSG_MTYPE_3 0x43
+#define MSG_LEN 3
struct msg {
long mtype;
- char buf[3];
+ char buf[MSG_LEN];
};
static void clean(void);
@@ -83,8 +84,8 @@ ATF_TC_BODY(msgrcv_basic, tc)
id = msgget(MSG_KEY, IPC_CREAT | 0600);
ATF_REQUIRE(id != -1);
- (void)msgsnd(id, msg1, sizeof(struct msg), IPC_NOWAIT);
- (void)msgrcv(id, msg2, sizeof(struct msg), MSG_MTYPE_1, IPC_NOWAIT);
+ (void)msgsnd(id, msg1, MSG_LEN, IPC_NOWAIT);
+ (void)msgrcv(id, msg2, MSG_LEN, MSG_MTYPE_1, IPC_NOWAIT);
ATF_CHECK(msg1.buf[0] == msg2.buf[0]);
ATF_CHECK(msg1.buf[1] == msg2.buf[1]);
@@ -118,7 +119,7 @@ ATF_TC_BODY(msgrcv_block, tc)
if (pid == 0) {
- if (msgrcv(id, msg, sizeof(struct msg), MSG_MTYPE_1, 0) 0)
+ if (msgrcv(id, msg, MSG_LEN, MSG_MTYPE_1, 0) 0)
_exit(EXIT_FAILURE);
_exit(EXIT_SUCCESS);
@@ -129,7 +130,7 @@ ATF_TC_BODY(msgrcv_block, tc)
* and hence kill(2) should fail with ESRCH.
*/
(void)sleep(1);
- (void)msgsnd(id, msg, sizeof(struct msg), IPC_NOWAIT);
+ (void)msgsnd(id, msg, MSG_LEN, IPC_NOWAIT);
(void)sleep(1);
(void)kill(pid, SIGKILL);
(void)wait(sta);
@@ -162,31 +163,31 @@ ATF_TC_BODY(msgrcv_err, tc)
errno = 0;
ATF_REQUIRE_ERRNO(ENOMSG, msgrcv(id, msg,
- sizeof(struct msg), MSG_MTYPE_1, IPC_NOWAIT) == -1);
+ MSG_LEN, MSG_MTYPE_1, IPC_NOWAIT) == -1);
- ATF_REQUIRE(msgsnd(id, msg,
CVS commit: [netbsd-6] src/lib/libperfuse
Module Name:src
Committed By: msaitoh
Date: Tue Jul 30 04:05:32 UTC 2013
Modified Files:
src/lib/libperfuse [netbsd-6]: ops.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #923):
lib/libperfuse/ops.c: revision 1.61
lib/libperfuse/ops.c: revision 1.62
One more explicit error log, and two bug fixes
1) with recent FUSE, when lookup returns a null ino, it means ENOENT
2) odd corner case that caused a bug on dd if=test of=test conv=notrunc
This caused the file to be open first ro, then rw. A logic bug in
perfuse_node_open caused it to skip the second operation, whereas
it should open for writing, and store the write FH without touching
the read FH.
Catch open without FREAD|FWRITE (it should not happen)
To generate a diff of this commit:
cvs rdiff -u -r1.50.2.6 -r1.50.2.7 src/lib/libperfuse/ops.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/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.50.2.6 src/lib/libperfuse/ops.c:1.50.2.7
--- src/lib/libperfuse/ops.c:1.50.2.6 Sun Aug 12 13:13:20 2012
+++ src/lib/libperfuse/ops.c Tue Jul 30 04:05:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.50.2.6 2012/08/12 13:13:20 martin Exp $ */
+/* $NetBSD: ops.c,v 1.50.2.7 2013/07/30 04:05:32 msaitoh Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -1359,10 +1359,33 @@ perfuse_node_open(struct puffs_usermount
* Do not open twice, and do not reopen for reading
* if we already have write handle.
*/
- if (((mode FREAD) (pnd-pnd_flags PND_RFH)) ||
- ((mode FREAD) (pnd-pnd_flags PND_WFH)) ||
- ((mode FWRITE) (pnd-pnd_flags PND_WFH)))
+ switch (mode (FREAD|FWRITE)) {
+ case FREAD:
+ if (pnd-pnd_flags (PND_RFH|PND_WFH))
+ goto out;
+ break;
+ case FWRITE:
+ if (pnd-pnd_flags PND_WFH)
+ goto out;
+ break;
+ case FREAD|FWRITE:
+ if (pnd-pnd_flags PND_WFH)
+ goto out;
+
+ /*
+ * Corner case: if already open for reading (PND_RFH)
+ * and re-opening FREAD|FWRITE, we need to reopen,
+ * but only for writing. Note the change on mode
+ * will only affect perfuse_new_fh()
+ */
+ if (pnd-pnd_flags PND_RFH)
+ mode = ~FREAD;
+ break;
+ default:
+ DWARNX(open without either FREAD nor FWRITE);
+ error = EPERM;
goto out;
+ }
/*
* Queue open on a node so that we do not open
@@ -2713,8 +2736,8 @@ perfuse_node_reclaim(struct puffs_usermo
#ifdef PERFUSE_DEBUG
if ((pnd-pnd_flags PND_OPEN) ||
!TAILQ_EMPTY(pnd-pnd_pcq))
- DERRX(EX_SOFTWARE, %s: opc = %p: still open,
- __func__, opc);
+ DERRX(EX_SOFTWARE, %s: opc = %p \%s\: still open,
+ __func__, opc, pnd-pnd_name);
if ((pnd-pnd_flags PND_BUSY) ||
!TAILQ_EMPTY(pnd-pnd_pcq))
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Tue Jul 30 04:08:45 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.1 Log Message: Ticket #921. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-6.1.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.1 diff -u src/doc/CHANGES-6.1.1:1.1.2.14 src/doc/CHANGES-6.1.1:1.1.2.15 --- src/doc/CHANGES-6.1.1:1.1.2.14 Mon Jul 29 20:27:41 2013 +++ src/doc/CHANGES-6.1.1 Tue Jul 30 04:08:45 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.1,v 1.1.2.14 2013/07/29 20:27:41 jdc Exp $ +# $NetBSD: CHANGES-6.1.1,v 1.1.2.15 2013/07/30 04:08:45 msaitoh Exp $ A complete list of changes from the NetBSD 6.1 release to the NetBSD 6.1.1 release: @@ -163,3 +163,8 @@ src/share/zoneinfo/zone.tab 1.1.1.45 v Import tzdata2013d. Changes for Morocco, Israel, Antarctica, metadata and documentation. [apb, ticket #915] + +sys/net/if_mpls.c1.9 + + Stop abusing kmem during softint context to prevent panic. + [kefren, ticket #921]
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: msaitoh Date: Tue Jul 30 04:09:45 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.3 Log Message: Ticket 921. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-6.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-6.0.3 diff -u src/doc/CHANGES-6.0.3:1.1.2.14 src/doc/CHANGES-6.0.3:1.1.2.15 --- src/doc/CHANGES-6.0.3:1.1.2.14 Mon Jul 29 20:27:21 2013 +++ src/doc/CHANGES-6.0.3 Tue Jul 30 04:09:45 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.3,v 1.1.2.14 2013/07/29 20:27:21 jdc Exp $ +# $NetBSD: CHANGES-6.0.3,v 1.1.2.15 2013/07/30 04:09:45 msaitoh Exp $ A complete list of changes from the NetBSD 6.0.2 release to the NetBSD 6.0.3 release: @@ -157,3 +157,8 @@ src/share/zoneinfo/zone.tab 1.1.1.45 v Import tzdata2013d. Changes for Morocco, Israel, Antarctica, metadata and documentation. [apb, ticket #915] + +sys/net/if_mpls.c1.9 + + Stop abusing kmem during softint context to prevent panic. + [kefren, ticket #921]
CVS commit: [netbsd-6] src/sys/kern
Module Name:src Committed By: msaitoh Date: Mon Jul 29 06:00:35 UTC 2013 Modified Files: src/sys/kern [netbsd-6]: subr_disk_mbr.c Log Message: Pull up following revision(s) (requested by matt in ticket #910): sys/kern/subr_disk_mbr.c: revision 1.46 If the MBR is a protective MBR, don't bother looking at it. To generate a diff of this commit: cvs rdiff -u -r1.42.8.1 -r1.42.8.2 src/sys/kern/subr_disk_mbr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/usr.bin/netstat
Module Name:src Committed By: msaitoh Date: Mon Jul 29 06:11:02 UTC 2013 Modified Files: src/usr.bin/netstat [netbsd-6]: inet.c inet6.c main.c netstat.h Log Message: Pull up following revision(s) (requested by christos in ticket #912): usr.bin/netstat/main.c: revision 1.86 usr.bin/netstat/netstat.h: revision 1.47 usr.bin/netstat/inet.c: revision 1.102 usr.bin/netstat/inet.c: revision 1.103 usr.bin/netstat/inet6.c: revision 1.61 usr.bin/netstat/inet6.c: revision 1.62 Don't use -P as a kmem printer, verify that the address points to a pcb first! Not all pointers are 64bit - use uintptr_t instead of uint64_t. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.101.2.1 src/usr.bin/netstat/inet.c cvs rdiff -u -r1.59 -r1.59.6.1 src/usr.bin/netstat/inet6.c cvs rdiff -u -r1.81 -r1.81.4.1 src/usr.bin/netstat/main.c cvs rdiff -u -r1.43 -r1.43.4.1 src/usr.bin/netstat/netstat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 06:13:32 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 908, 909, 910 and 912. To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 06:47:57 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket #910 fixes PR#47743. To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-1] src/usr.bin/netstat
Module Name:src Committed By: msaitoh Date: Mon Jul 29 07:06:37 UTC 2013 Modified Files: src/usr.bin/netstat [netbsd-6-1]: inet.c inet6.c main.c netstat.h Log Message: Pull up following revision(s) (requested by christos in ticket #912): usr.bin/netstat/main.c: revision 1.86 usr.bin/netstat/netstat.h: revision 1.47 usr.bin/netstat/inet.c: revision 1.102 usr.bin/netstat/inet.c: revision 1.103 usr.bin/netstat/inet6.c: revision 1.61 usr.bin/netstat/inet6.c: revision 1.62 Don't use -P as a kmem printer, verify that the address points to a pcb first! Not all pointers are 64bit - use uintptr_t instead of uint64_t. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.101.14.1 src/usr.bin/netstat/inet.c cvs rdiff -u -r1.59 -r1.59.16.1 src/usr.bin/netstat/inet6.c cvs rdiff -u -r1.81 -r1.81.10.1 src/usr.bin/netstat/main.c cvs rdiff -u -r1.43 -r1.43.10.1 src/usr.bin/netstat/netstat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 07:07:23 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.1 Log Message: Ticket #912. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-6.1.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/usr.bin/netstat
Module Name:src Committed By: msaitoh Date: Mon Jul 29 07:10:13 UTC 2013 Modified Files: src/usr.bin/netstat [netbsd-6-0]: inet.c inet6.c main.c netstat.h Log Message: Pull up following revision(s) (requested by christos in ticket #912): usr.bin/netstat/main.c: revision 1.86 usr.bin/netstat/netstat.h: revision 1.47 usr.bin/netstat/inet.c: revision 1.102 usr.bin/netstat/inet.c: revision 1.103 usr.bin/netstat/inet6.c: revision 1.61 usr.bin/netstat/inet6.c: revision 1.62 Don't use -P as a kmem printer, verify that the address points to a pcb first! Not all pointers are 64bit - use uintptr_t instead of uint64_t. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.101.8.1 src/usr.bin/netstat/inet.c cvs rdiff -u -r1.59 -r1.59.12.1 src/usr.bin/netstat/inet6.c cvs rdiff -u -r1.81 -r1.81.8.1 src/usr.bin/netstat/main.c cvs rdiff -u -r1.43 -r1.43.8.1 src/usr.bin/netstat/netstat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 07:10:33 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.3 Log Message: Ticket #912 To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-6.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:11:53 UTC 2013 Modified Files: src/share/man/man4 [netbsd-6]: re.4 src/sys/dev/ic [netbsd-6]: rtl8169.c rtl81x9reg.h Log Message: Pull up following revision(s) (requested by khorben in ticket #913): sys/dev/ic/rtl8169.c: revision 1.137 sys/dev/ic/rtl81x9reg.h: revision 1.44 share/man/man4/re.4: revision 1.14 Added support for the Realtek 8168F variant in re(4). From FreeBSD; not tested on real hardware unfortunately. The manual page was adjusted as well. No objection from current-users@, commit it gdt@ To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.10.1 src/share/man/man4/re.4 cvs rdiff -u -r1.134.4.1 -r1.134.4.2 src/sys/dev/ic/rtl8169.c cvs rdiff -u -r1.42.4.1 -r1.42.4.2 src/sys/dev/ic/rtl81x9reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/usr.bin/mklocale
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:15:39 UTC 2013 Modified Files: src/usr.bin/mklocale [netbsd-6]: mklocaledb.c Log Message: Pull up following revision(s) (requested by joerg in ticket #914): usr.bin/mklocale/mklocaledb.c: revision 1.3 Swap order of _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES and _CITRUS_LC_MONETARY_SYM_INT_P_SEP_BY_SPACE to match data files. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.12.1 src/usr.bin/mklocale/mklocaledb.c 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/miscfs/procfs
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:17:55 UTC 2013 Modified Files: src/sys/miscfs/procfs [netbsd-6]: procfs_map.c Log Message: Pull up following revision(s) (requested by ryo in ticket #917): sys/miscfs/procfs/procfs_map.c: revision 1.43 PR/48048: Add a missing vm_map_unlock_read() and uvmspace_free() to the ENOMEM error case in procfs_domap()d To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/miscfs/procfs/procfs_map.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-1] src/sys/miscfs/procfs
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:23:16 UTC 2013 Modified Files: src/sys/miscfs/procfs [netbsd-6-1]: procfs_map.c Log Message: Pull up following revision(s) (requested by ryo in ticket #917): sys/miscfs/procfs/procfs_map.c: revision 1.43 PR/48048: Add a missing vm_map_unlock_read() and uvmspace_free() to the ENOMEM error case in procfs_domap()d To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.41.14.1 src/sys/miscfs/procfs/procfs_map.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/sys/miscfs/procfs
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:24:09 UTC 2013 Modified Files: src/sys/miscfs/procfs [netbsd-6-0]: procfs_map.c Log Message: Pull up following revision(s) (requested by ryo in ticket #917): sys/miscfs/procfs/procfs_map.c: revision 1.43 PR/48048: Add a missing vm_map_unlock_read() and uvmspace_free() to the ENOMEM error case in procfs_domap()d To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.41.12.1 src/sys/miscfs/procfs/procfs_map.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:29:35 UTC 2013 Modified Files: src/etc [netbsd-6]: MAKEDEV.tmpl Log Message: Pull up following revision(s) (requested by martin in ticket #919): etc/MAKEDEV.tmpl: revision 1.166 Add a makedisk_p12high, used by VAX now after unbumping MAXPARTITIONS from 16 down to 12. This fixes install issues on new setups. To generate a diff of this commit: cvs rdiff -u -r1.151.2.9 -r1.151.2.10 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-1] src/etc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:53:44 UTC 2013 Modified Files: src/etc [netbsd-6-1]: MAKEDEV.tmpl Log Message: Pull up following revision(s) (requested by martin in ticket #919): etc/MAKEDEV.tmpl: revision 1.166 Add a makedisk_p12high, used by VAX now after unbumping MAXPARTITIONS from 16 down to 12. This fixes install issues on new setups. To generate a diff of this commit: cvs rdiff -u -r1.151.2.9 -r1.151.2.9.2.1 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:56:52 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 913, 914, 917 and 919. To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:57:20 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.1 Log Message: Ticket 917 and 919. To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-6.1.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 29 08:57:41 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.3 Log Message: Ticket 917. To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-6.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumphijack
Module Name:src Committed By: pooka Date: Mon Jul 29 10:13:21 UTC 2013 Modified Files: src/lib/librumphijack: Makefile Log Message: Override ssp also in case where it doesn't come intrinsically from the compiler. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/librumphijack/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/db
Module Name:src Committed By: skrll Date: Mon Jul 29 10:43:15 UTC 2013 Modified Files: src/tests/lib/libc/db: t_db.sh Log Message: Increase timeout. My hardware must be getting slower. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/db/t_db.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: njoly Date: Mon Jul 29 11:40:04 UTC 2013 Modified Files: src/lib/libc/sys: symlink.2 Log Message: Add symlinkat(2) specific errors. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/lib/libc/sys/symlink.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Mon Jul 29 11:49:31 UTC 2013 Modified Files: src/lib/libc/sys: readlink.2 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libc/sys/readlink.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/fs/ffs
Module Name:src Committed By: skrll Date: Mon Jul 29 13:15:24 UTC 2013 Modified Files: src/tests/fs/ffs: ffs_common.sh Log Message: Slow hardware needs longer, especially for default_deny_user_big To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/fs/ffs/ffs_common.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: njoly Date: Mon Jul 29 14:34:59 UTC 2013 Modified Files: src/lib/libc/sys: utimes.2 Log Message: Add utimensat(2) specific errors. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/lib/libc/sys/utimes.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/lfs
Module Name:src Committed By: dholland Date: Mon Jul 29 16:39:37 UTC 2013 Modified Files: src/sys/ufs/lfs: lfs_vnops.c ulfs_quota2.c Log Message: Revert previous; it is wrong. To generate a diff of this commit: cvs rdiff -u -r1.255 -r1.256 src/sys/ufs/lfs/lfs_vnops.c cvs rdiff -u -r1.11 -r1.12 src/sys/ufs/lfs/ulfs_quota2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/lfs
Module Name:src Committed By: dholland Date: Mon Jul 29 16:40:46 UTC 2013 Modified Files: src/sys/ufs/lfs: lfs_vnops.c ulfs_quota2.c Log Message: Fix build both with and without options LFS_EI. To generate a diff of this commit: cvs rdiff -u -r1.256 -r1.257 src/sys/ufs/lfs/lfs_vnops.c cvs rdiff -u -r1.12 -r1.13 src/sys/ufs/lfs/ulfs_quota2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd
Module Name:src Committed By: dholland Date: Mon Jul 29 16:42:20 UTC 2013 Modified Files: src/external/bsd/bind: Makefile.inc src/external/bsd/dhcp: Makefile.inc Log Message: Fix MKKERBEROS=no build. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/Makefile.inc cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcp/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/pax
Module Name:src Committed By: christos Date: Mon Jul 29 17:46:36 UTC 2013 Modified Files: src/bin/pax: file_subs.c Log Message: PR/48095: NAKAJIMA Yoshihiro: remove casts from time_t to long To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/bin/pax/file_subs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: njoly Date: Mon Jul 29 18:37:16 UTC 2013 Modified Files: src/lib/libc/sys: open.2 Log Message: Add openat(2) specific errors. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/lib/libc/sys/open.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: njoly Date: Mon Jul 29 19:18:37 UTC 2013 Modified Files: src/lib/libc/sys: chmod.2 Log Message: Add chmodat(2) specific errors. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/lib/libc/sys/chmod.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src
Module Name:src Committed By: jdc Date: Mon Jul 29 20:21:08 UTC 2013 Modified Files: src/doc [netbsd-6]: 3RDPARTY src/share/zoneinfo [netbsd-6]: africa asia australasia europe iso3166.tab southamerica zone.tab Log Message: Pull up revisions: src/doc/3RDPARTY revision 1.1040 src/share/zoneinfo/africa revision 1.1.1.35 src/share/zoneinfo/asia revision 1.1.1.60 src/share/zoneinfo/australasia revision 1.32 src/share/zoneinfo/europe revision 1.1.1.50 src/share/zoneinfo/iso3166.tab revision 1.1.1.21 src/share/zoneinfo/southamerica revision 1.1.1.55 src/share/zoneinfo/zone.tab revision 1.1.1.45 (requested by apb in ticket 915) Import tzdata2013d from ftp://ftp.iana.org/tz/releases/tzdata2013d.tar.gz Summary of changes from tzdata2013c to tzdata2013d: Changes affecting current and future time stamps: Morocco's midsummer transitions this year are July 7 and August 10, not July 9 and August 8. (Thanks to Andrew Paprocki.) Israel now falls back on the last Sunday of October. (Thanks to Ephraim Silverberg.) Changes affecting past time stamps: Specify Jerusalem's location more precisely; this changes the pre-1880 times by 2 s. Changing affecting metadata only: Fix typos in the entries for country codes BQ and SX. Changes affecting documentation and commentary: Deemphasize the significance of national borders. Update the zdump man page. Remove obsolete NOID comment (thanks to Denis Excoffier). Update several URLs and comments in the web pages. Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler). Update URL for CLDR Zone-Tzid table (thanks to Yoshito Umaoka). Merge tzdata2013d. tzcode2013d/tzdata2013d have been released. We have updated tzdata/ To generate a diff of this commit: cvs rdiff -u -r1.909.2.19 -r1.909.2.20 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.30.4.4 -r1.1.1.30.4.5 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.50.4.8 -r1.1.1.50.4.9 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.8 -r1.23.4.9 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.44.4.5 -r1.1.1.44.4.6 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.19.4.1 -r1.1.1.19.4.2 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.46.4.8 -r1.1.1.46.4.9 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.39.4.5 -r1.1.1.39.4.6 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src
Module Name:src Committed By: jdc Date: Mon Jul 29 20:21:36 UTC 2013 Modified Files: src/doc [netbsd-6-0]: 3RDPARTY src/share/zoneinfo [netbsd-6-0]: africa asia australasia europe iso3166.tab southamerica zone.tab Log Message: Pull up revisions: src/doc/3RDPARTY revision 1.1040 src/share/zoneinfo/africa revision 1.1.1.35 src/share/zoneinfo/asia revision 1.1.1.60 src/share/zoneinfo/australasia revision 1.32 src/share/zoneinfo/europe revision 1.1.1.50 src/share/zoneinfo/iso3166.tab revision 1.1.1.21 src/share/zoneinfo/southamerica revision 1.1.1.55 src/share/zoneinfo/zone.tab revision 1.1.1.45 (requested by apb in ticket 915) Import tzdata2013d from ftp://ftp.iana.org/tz/releases/tzdata2013d.tar.gz Summary of changes from tzdata2013c to tzdata2013d: Changes affecting current and future time stamps: Morocco's midsummer transitions this year are July 7 and August 10, not July 9 and August 8. (Thanks to Andrew Paprocki.) Israel now falls back on the last Sunday of October. (Thanks to Ephraim Silverberg.) Changes affecting past time stamps: Specify Jerusalem's location more precisely; this changes the pre-1880 times by 2 s. Changing affecting metadata only: Fix typos in the entries for country codes BQ and SX. Changes affecting documentation and commentary: Deemphasize the significance of national borders. Update the zdump man page. Remove obsolete NOID comment (thanks to Denis Excoffier). Update several URLs and comments in the web pages. Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler). Update URL for CLDR Zone-Tzid table (thanks to Yoshito Umaoka). Merge tzdata2013d. tzcode2013d/tzdata2013d have been released. We have updated tzdata/ To generate a diff of this commit: cvs rdiff -u -r1.909.2.14.2.4 -r1.909.2.14.2.5 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.30.4.1.4.3 -r1.1.1.30.4.1.4.4 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.50.4.3.4.5 -r1.1.1.50.4.3.4.6 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.4.2.4 -r1.23.4.4.2.5 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.44.4.3.4.2 -r1.1.1.44.4.3.4.3 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.19.4.1 -r1.1.1.19.4.1.4.1 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.46.4.3.4.5 -r1.1.1.46.4.3.4.6 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.39.4.3.4.2 -r1.1.1.39.4.3.4.3 \ src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-1] src
Module Name:src Committed By: jdc Date: Mon Jul 29 20:21:57 UTC 2013 Modified Files: src/doc [netbsd-6-1]: 3RDPARTY src/share/zoneinfo [netbsd-6-1]: africa asia australasia europe iso3166.tab southamerica zone.tab Log Message: Pull up revisions: src/doc/3RDPARTY revision 1.1040 src/share/zoneinfo/africa revision 1.1.1.35 src/share/zoneinfo/asia revision 1.1.1.60 src/share/zoneinfo/australasia revision 1.32 src/share/zoneinfo/europe revision 1.1.1.50 src/share/zoneinfo/iso3166.tab revision 1.1.1.21 src/share/zoneinfo/southamerica revision 1.1.1.55 src/share/zoneinfo/zone.tab revision 1.1.1.45 (requested by apb in ticket 915) Import tzdata2013d from ftp://ftp.iana.org/tz/releases/tzdata2013d.tar.gz Summary of changes from tzdata2013c to tzdata2013d: Changes affecting current and future time stamps: Morocco's midsummer transitions this year are July 7 and August 10, not July 9 and August 8. (Thanks to Andrew Paprocki.) Israel now falls back on the last Sunday of October. (Thanks to Ephraim Silverberg.) Changes affecting past time stamps: Specify Jerusalem's location more precisely; this changes the pre-1880 times by 2 s. Changing affecting metadata only: Fix typos in the entries for country codes BQ and SX. Changes affecting documentation and commentary: Deemphasize the significance of national borders. Update the zdump man page. Remove obsolete NOID comment (thanks to Denis Excoffier). Update several URLs and comments in the web pages. Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler). Update URL for CLDR Zone-Tzid table (thanks to Yoshito Umaoka). Merge tzdata2013d. tzcode2013d/tzdata2013d have been released. We have updated tzdata/ To generate a diff of this commit: cvs rdiff -u -r1.909.2.19 -r1.909.2.19.2.1 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.30.4.4 -r1.1.1.30.4.4.2.1 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.50.4.8 -r1.1.1.50.4.8.2.1 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.8 -r1.23.4.8.2.1 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.44.4.5 -r1.1.1.44.4.5.2.1 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.19.4.1 -r1.1.1.19.4.1.6.1 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.46.4.8 -r1.1.1.46.4.8.2.1 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.39.4.5 -r1.1.1.39.4.5.2.1 src/share/zoneinfo/zone.tab 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/dev/pci
Module Name:src Committed By: jdc Date: Mon Jul 29 20:24:04 UTC 2013 Modified Files: src/sys/dev/pci [netbsd-6]: if_wm.c if_wmreg.h Log Message: Pull up revisions: src/sys/dev/pci/if_wm.c revisions 1.259,1.260,1.261,1.262 src/sys/dev/pci/if_wmreg.h revision 1.54 (requested by msaitoh in ticket #918). Fix MDIC write error bug for 82574 and 82583. For those chips, the semaphore must be released after chip reset. Found and tested by Mark Davies. Sync the wm_enable_mng_pass_thru() function with FreeBSD. Don't check MANC_EN_MAC_ADDR_FILTER bit. Add 82574 and 82583 specific check. This modification may change the setting of WM_F_HAS_MANAGE flag on some machines. Sync the wm_release_manageablilty() fucntion with FreeBSD. Set MANC_ARP_EN. This change enables HW ARP function when entering suspend. When the chip is 82580(ER) or I350, set WM_F_ASF_FIRMWARE_PRES flag and check for the WM_F_ARC_SUBSYS_VALID flag. Same as FreeBSD. Move the location of wm_check_mng_mode() and wm_get_wakeup() in wm_attach(). Those functions access EEPROM, so they have to call after identifying EEPROM access type. This modification may change the behavior of BMC(IPMI). Fix yet another NVM bank detect problem in wm(4). Use bank 0 if the detect function failed. It's the same as FreeBSD. Observed and tested with Asus P8P67 Deluxe motherboard and tested by jnemeth. To generate a diff of this commit: cvs rdiff -u -r1.227.2.9 -r1.227.2.10 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.46.2.4 -r1.46.2.5 src/sys/dev/pci/if_wmreg.h 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/common/pmap/tlb
Module Name:src Committed By: jdc Date: Mon Jul 29 20:26:32 UTC 2013 Modified Files: src/sys/common/pmap/tlb [netbsd-6]: pmap_tlb.c Log Message: Add missing )). This patch fixes PR#46371. src/sys/common/pmap/tlb/pmap_tlb.c patch (requested by msaitoh in ticket 920) To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/common/pmap/tlb/pmap_tlb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: jdc Date: Mon Jul 29 20:27:08 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Tickets 915, 918, 920. To generate a diff of this commit: cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: jdc Date: Mon Jul 29 20:27:21 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.3 Log Message: Ticket 915. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-6.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: jdc Date: Mon Jul 29 20:27:41 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.1 Log Message: Ticket 915. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-6.1.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Mon Jul 29 20:35:33 UTC 2013 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22699 Log Message: Import dhcpcd-6.0.4 with the following changes: * hostname is not stamped on anymore if already set * hostname will be set to a FQDN when possible as per RFC4702 section 3.1 * a domain is derived from the FQDN if no domain option is set * add new hostname_short command to send a short hostname for DDNS * hostname_fqdn is now documented, along with a new server setting and the potential problems associated with it * the FQDN option is no longer sent by default for DHCPv4 messages Status: Vendor Tag: roy Release Tags: dhcpcd-6-0-4 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c U src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/if-pref.c U src/external/bsd/dhcpcd/dist/net.c U src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/bpf.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/platform-bsd.c U src/external/bsd/dhcpcd/dist/arp.c C src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c U src/external/bsd/dhcpcd/dist/ipv6rs.c U src/external/bsd/dhcpcd/dist/ipv6ns.c U src/external/bsd/dhcpcd/dist/dhcp6.c C src/external/bsd/dhcpcd/dist/dhcpcd.conf C src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in C src/external/bsd/dhcpcd/dist/dhcpcd.8.in C src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if-pref.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6ns.h U src/external/bsd/dhcpcd/dist/ipv6rs.h U src/external/bsd/dhcpcd/dist/net.h U src/external/bsd/dhcpcd/dist/platform.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 5 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Mon Jul 29 20:39:29 UTC 2013 Modified Files: src/external/bsd/dhcpcd/dist: dhcp.c dhcpcd-run-hooks.8.in dhcpcd.8.in dhcpcd.conf dhcpcd.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcpcd/dist/dhcp.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in cvs rdiff -u -r1.20 -r1.21 src/external/bsd/dhcpcd/dist/dhcpcd.8.in cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/dhcpcd.conf cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: roy Date: Mon Jul 29 20:40:33 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Import dhcpcd-6.0.4 To generate a diff of this commit: cvs rdiff -u -r1.1046 -r1.1047 src/doc/3RDPARTY cvs rdiff -u -r1.1837 -r1.1838 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib
Module Name:src Committed By: joerg Date: Mon Jul 29 21:02:58 UTC 2013 Modified Files: src/lib: Makefile Log Message: libbind now depends on heimdal, so push it after the third barrier. To generate a diff of this commit: cvs rdiff -u -r1.203 -r1.204 src/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Tue Jul 30 01:57:31 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Modify ticket 909. To generate a diff of this commit: cvs rdiff -u -r1.1.2.22 -r1.1.2.23 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
