CVS commit: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm
Module Name:src Committed By: skrll Date: Fri Sep 20 09:05:53 UTC 2013 Modified Files: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_core.c Log Message: Clean up semaphore initialisation. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.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/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c:1.4 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c:1.5 --- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c:1.4 Thu Sep 19 13:51:44 2013 +++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c Fri Sep 20 09:05:53 2013 @@ -384,7 +384,7 @@ remote_event_create(REMOTE_EVENT_T *even event->armed = 0; /* Don't clear the 'fired' flag because it may already have been set ** by the other side. */ - event->event->value = 0; + _sema_init(event->event, 0); } static inline void @@ -2377,10 +2377,6 @@ vchiq_init_state(VCHIQ_STATE_T *state, V _sema_init(&state->connect, 0); lmutex_init(&state->mutex); - _sema_init(&state->trigger_event, 0); - _sema_init(&state->recycle_event, 0); - _sema_init(&state->sync_trigger_event, 0); - _sema_init(&state->sync_release_event, 0); lmutex_init(&state->slot_mutex); lmutex_init(&state->recycle_mutex);
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Sep 20 10:51:30 UTC 2013 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv2867 Log Message: Import dhcpcd-6.1.0 with the following changes: * Fixed a segfault when configuring a static route in dhcpcd.conf * Merged IPv6 ND and RA codebases * Persistent configuration is now a default option in dhcpcd.conf * Store configured IPv4 addresses against the interface so we only add them if actually missing to avoid RTM_DELADDR/NEWADDR loops on some OS's * waitip now supports waiting for any, IPv4, IPv6 or both protocols * DHCPv6 addresses are added with a /128 prefix and should not attempt to associate with any existing prefix or make one up as per RFC 5942 * Fix initial carrier status * Fix requesting >1 DHCPv6 address Fixes PR bin/48140 Status: Vendor Tag: roy Release Tags: dhcpcd-6-1-0 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 C 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 N src/external/bsd/dhcpcd/dist/ipv6nd.c U src/external/bsd/dhcpcd/dist/dhcp6.c C src/external/bsd/dhcpcd/dist/dhcpcd.conf U 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 N src/external/bsd/dhcpcd/dist/dev.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 N src/external/bsd/dhcpcd/dist/ipv6nd.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: Fri Sep 20 10:56:32 UTC 2013
Modified Files:
src/external/bsd/dhcpcd/dist: dhcp.c dhcpcd.8.in dhcpcd.conf
dhcpcd.conf.5.in net.c
Removed Files:
src/external/bsd/dhcpcd/dist: ipv6ns.c ipv6ns.h ipv6rs.c ipv6rs.h
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/dhcpcd/dist/dhcpcd.8.in
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcpcd/dist/dhcpcd.conf
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/dhcpcd/dist/ipv6ns.c \
src/external/bsd/dhcpcd/dist/ipv6ns.h
cvs rdiff -u -r1.1.1.13 -r0 src/external/bsd/dhcpcd/dist/ipv6rs.c
cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/dhcpcd/dist/ipv6rs.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcpcd/dist/net.c
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.6 src/external/bsd/dhcpcd/dist/dhcp.c:1.7
--- src/external/bsd/dhcpcd/dist/dhcp.c:1.6 Mon Jul 29 20:39:28 2013
+++ src/external/bsd/dhcpcd/dist/dhcp.c Fri Sep 20 10:56:32 2013
@@ -1,5 +1,5 @@
#include
- __RCSID("$NetBSD: dhcp.c,v 1.6 2013/07/29 20:39:28 roy Exp $");
+ __RCSID("$NetBSD: dhcp.c,v 1.7 2013/09/20 10:56:32 roy Exp $");
/*
* dhcpcd - DHCP client daemon
@@ -1702,7 +1702,6 @@ dhcp_rebind(void *arg)
send_rebind(ifp);
}
-
void
dhcp_bind(void *arg)
{
@@ -1724,10 +1723,10 @@ dhcp_bind(void *arg)
state->offer = NULL;
get_lease(lease, state->new);
if (ifo->options & DHCPCD_STATIC) {
- syslog(LOG_INFO, "%s: using static address %s",
- iface->name, inet_ntoa(lease->addr));
+ syslog(LOG_INFO, "%s: using static address %s/%d",
+ iface->name, inet_ntoa(lease->addr),
+ inet_ntocidr(lease->net));
lease->leasetime = ~0U;
- lease->net.s_addr = ifo->req_mask.s_addr;
state->reason = "STATIC";
} else if (state->new->cookie != htonl(MAGIC_COOKIE)) {
syslog(LOG_INFO, "%s: using IPv4LL address %s",
@@ -1834,7 +1833,7 @@ dhcp_timeout(void *arg)
}
struct dhcp_message *
-dhcp_message_new(struct in_addr *addr, struct in_addr *mask)
+dhcp_message_new(const struct in_addr *addr, const struct in_addr *mask)
{
struct dhcp_message *dhcp;
uint8_t *p;
@@ -1854,60 +1853,65 @@ dhcp_message_new(struct in_addr *addr, s
return dhcp;
}
-static int
-handle_3rdparty(struct interface *ifp)
+static void
+dhcp_static(struct interface *ifp)
{
struct if_options *ifo;
struct dhcp_state *state;
- struct in_addr addr, net, dst;
+ state = D_STATE(ifp);
ifo = ifp->options;
- if (ifo->req_addr.s_addr != INADDR_ANY)
- return 0;
-
- if (ipv4_getaddress(ifp->name, &addr, &net, &dst) == 1)
- ipv4_handleifa(RTM_NEWADDR, ifp->name, &addr, &net, &dst);
- else {
+ if (ifo->req_addr.s_addr == INADDR_ANY) {
syslog(LOG_INFO,
- "%s: waiting for 3rd party to configure IP address",
+ "%s: waiting for 3rd party to "
+ "configure IP address",
ifp->name);
- state = D_STATE(ifp);
state->reason = "3RDPARTY";
script_runreason(ifp, state->reason);
- }
- return 1;
-}
-
-static void
-dhcp_static(struct interface *ifp)
-{
- struct if_options *ifo;
- struct dhcp_state *state;
-
- if (handle_3rdparty(ifp))
return;
- ifo = ifp->options;
- state = D_STATE(ifp);
+ }
state->offer = dhcp_message_new(&ifo->req_addr, &ifo->req_mask);
- eloop_timeout_delete(NULL, ifp);
- dhcp_bind(ifp);
+ if (state->offer) {
+ eloop_timeout_delete(NULL, ifp);
+ dhcp_bind(ifp);
+ }
}
void
dhcp_inform(struct interface *ifp)
{
struct dhcp_state *state;
-
- if (handle_3rdparty(ifp))
- return;
+ struct if_options *ifo;
+ struct ipv4_addr *ap;
state = D_STATE(ifp);
+ ifo = ifp->options;
if (options & DHCPCD_TEST) {
- state->addr.s_addr = ifp->options->req_addr.s_addr;
- state->net.s_addr = ifp->options->req_mask.s_addr;
+ state->addr.s_addr = ifo->req_addr.s_addr;
+ state->net.s_addr = ifo->req_mask.s_addr;
} else {
- ifp->options->options |= DHCPCD_STATIC;
- dhcp_static(ifp);
+ if (ifo->req_addr.s_addr == INADDR_ANY) {
+ state = D_STATE(ifp);
+ ap = ipv4_findaddr(ifp, NULL, NULL);
+ if (ap == NULL) {
+syslog(LOG_INFO,
+ "%s: waiting for 3rd party to "
+ "configure IP address",
+ ifp->name);
+state->reason = "3RDPARTY";
+script_runreason(ifp, state->reason);
+return;
+ }
+ state->offer =
+ dhcp_message_new(&ap->addr, &ap->net);
+ } else
+ state->offer =
+ dhcp_message_new(&ifo->req_addr, &ifo->req_mask);
+ if (state->offer) {
+ ifo->options |= DHCPCD_STATIC;
+ dhcp_bind(ifp);
+ ifo->options &= ~DHCPCD_STATIC;
+ }
}
state->state = DHS_INFORM;
@@ -2220,6 +2224,8 @@ dhcp_handle(struct interface *iface, str
if (!(ifo->options & DHCPCD_INFORM))
log_dhcp(LOG_DEBUG, "acknowledged", ifac
CVS commit: src/external/bsd/dhcpcd/sbin/dhcpcd
Module Name:src
Committed By: roy
Date: Fri Sep 20 10:58:16 UTC 2013
Modified Files:
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
Log Message:
Fix building dhcpcd-6.1.0
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.15 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.16
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.15 Fri Jun 21 21:09:34 2013
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Fri Sep 20 10:58:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/06/21 21:09:34 roy Exp $
+# $NetBSD: Makefile,v 1.16 2013/09/20 10:58:16 roy Exp $
#
PROG= dhcpcd
@@ -14,7 +14,7 @@ SRCS+= arp.c dhcp.c ipv4.c ipv4ll.c
.if (${USE_INET6} != "no")
CPPFLAGS+= -DINET6
-SRCS+= ipv6.c ipv6rs.c ipv6ns.c dhcp6.c
+SRCS+= ipv6.c ipv6nd.c dhcp6.c
.endif
DIST= ${NETBSDSRCDIR}/external/bsd/dhcpcd/dist
@@ -46,6 +46,7 @@ SERVICESTATUS= service_command $$1 stat
.for f in dhcpcd-run-hooks dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8
${f}: ${f}.in
${TOOL_SED} -e 's:@SYSCONFDIR@:/etc:g' -e 's:@DBDIR@:/var/db:g' \
+ -e 's:@LIBDIR@:/lib:g' \
-e 's:@HOOKDIR@:/libexec/dhcpcd-hooks:g' \
-e 's:@SCRIPT@:/libexec/dhcpcd-run-hooks:g' \
-e 's:@SERVICEEXISTS@:[ -x /etc/rc.d/$$1 ]:g' \
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri Sep 20 10:59:24 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Import dhcpcd-6.1.0 To generate a diff of this commit: cvs rdiff -u -r1.1053 -r1.1054 src/doc/3RDPARTY cvs rdiff -u -r1.1847 -r1.1848 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.1053 src/doc/3RDPARTY:1.1054 --- src/doc/3RDPARTY:1.1053 Wed Sep 4 19:51:37 2013 +++ src/doc/3RDPARTY Fri Sep 20 10:59:24 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1053 2013/09/04 19:51:37 tron Exp $ +# $NetBSD: 3RDPARTY,v 1.1054 2013/09/20 10:59:24 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.5 -Current Vers: 6.0.5 +Version: 6.1.0 +Current Vers: 6.1.0 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.1847 src/doc/CHANGES:1.1848 --- src/doc/CHANGES:1.1847 Sun Sep 8 16:04:21 2013 +++ src/doc/CHANGES Fri Sep 20 10:59:24 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1847 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1848 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -281,3 +281,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: less(1): Import version 458 [tron 20130804] mpl115a(4): Add driver for Freescale MPL115A2 I2C absolute pressure sensor. [rkujawa 20130908] + dhcpcd(8): Import dhcpcd-6.1.0 [roy 20130920]
CVS commit: src/sys/sys
Module Name:src
Committed By: wiz
Date: Fri Sep 20 12:20:02 UTC 2013
Modified Files:
src/sys/sys: sysctl.h
Log Message:
Fix typos in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.208 -r1.209 src/sys/sys/sysctl.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/sys/sysctl.h
diff -u src/sys/sys/sysctl.h:1.208 src/sys/sys/sysctl.h:1.209
--- src/sys/sys/sysctl.h:1.208 Thu Aug 1 01:16:34 2013
+++ src/sys/sys/sysctl.h Fri Sep 20 12:20:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.h,v 1.208 2013/08/01 01:16:34 matt Exp $ */
+/* $NetBSD: sysctl.h,v 1.209 2013/09/20 12:20:01 wiz Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -227,7 +227,7 @@ struct ctlname {
#define KERN_ROOT_DEVICE 30 /* string: root device */
#define KERN_MSGBUFSIZE 31 /* int: max # of chars in msg buffer */
#define KERN_FSYNC 32 /* int: file synchronization support */
-#define KERN_OLDSYSVMSG 33 /* old: SysV message queue suppoprt */
+#define KERN_OLDSYSVMSG 33 /* old: SysV message queue support */
#define KERN_OLDSYSVSEM 34 /* old: SysV semaphore support */
#define KERN_OLDSYSVSHM 35 /* old: SysV shared memory support */
#define KERN_OLDSHORTCORENAME 36 /* old, unimplemented */
@@ -240,7 +240,7 @@ struct ctlname {
#define KERN_MEMORY_PROTECTION 43 /* int: POSIX memory protections */
#define KERN_LOGIN_NAME_MAX 44 /* int: max length login name + NUL */
#define KERN_DEFCORENAME 45 /* old: sort core name format */
-#define KERN_LOGSIGEXIT 46 /* int: log signalled processes */
+#define KERN_LOGSIGEXIT 46 /* int: log signaled processes */
#define KERN_PROC2 47 /* struct: process entries */
#define KERN_PROC_ARGS 48 /* struct: process argv/env */
#define KERN_FSCALE 49 /* int: fixpt FSCALE */
@@ -599,7 +599,7 @@ struct kinfo_proc2 {
};
/*
- * Compat flags for kinfo_proc, kinfo_proc2. Not guarenteed to be stable.
+ * Compat flags for kinfo_proc, kinfo_proc2. Not guaranteed to be stable.
* Some of them used to be shared with LWP flags.
* XXXAD Trim to the minimum necessary...
*/
@@ -685,7 +685,7 @@ struct kinfo_lwp {
* KERN_SYSVIPC subtypes
*/
#define KERN_SYSVIPC_INFO 1 /* struct: number of valid kern ids */
-#define KERN_SYSVIPC_MSG 2 /* int: SysV message queue suppoprt */
+#define KERN_SYSVIPC_MSG 2 /* int: SysV message queue support */
#define KERN_SYSVIPC_SEM 3 /* int: SysV semaphore support */
#define KERN_SYSVIPC_SHM 4 /* int: SysV shared memory support */
#define KERN_SYSVIPC_SHMMAX 5 /* int: max shared memory segment size (bytes) */
@@ -700,7 +700,7 @@ struct kinfo_lwp {
/* KERN_SYSVIPC_OMSG_INFO 1 */
/* KERN_SYSVIPC_OSEM_INFO 2 */
/* KERN_SYSVIPC_OSHM_INFO 3 */
-#define KERN_SYSVIPC_MSG_INFO 4 /* msginfo and msqid_ds */
+#define KERN_SYSVIPC_MSG_INFO 4 /* msginfo and msgid_ds */
#define KERN_SYSVIPC_SEM_INFO 5 /* seminfo and semid_ds */
#define KERN_SYSVIPC_SHM_INFO 6 /* shminfo and shmid_ds */
@@ -1058,7 +1058,7 @@ struct sysctllog;
* variable. The loader prevents multiple use by issuing errors
* if a variable is initialized in more than one place. They are
* aggregated into an array in debug_sysctl(), so that it can
- * conveniently locate them when querried. If more debugging
+ * conveniently locate them when queried. If more debugging
* variables are added, they must also be declared here and also
* entered into the array.
*
CVS commit: [netbsd-6] src/sbin/raidctl
Module Name:src Committed By: riz Date: Fri Sep 20 14:13:21 UTC 2013 Modified Files: src/sbin/raidctl [netbsd-6]: raidctl.8 Log Message: Pull up following revision(s) (requested by tron in ticket #948): sbin/raidctl/raidctl.8: revision 1.65 Note that NetBSD/amd64 can boot off RAID volumes. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.63.4.1 src/sbin/raidctl/raidctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/raidctl/raidctl.8 diff -u src/sbin/raidctl/raidctl.8:1.63 src/sbin/raidctl/raidctl.8:1.63.4.1 --- src/sbin/raidctl/raidctl.8:1.63 Tue Aug 2 10:28:00 2011 +++ src/sbin/raidctl/raidctl.8 Fri Sep 20 14:13:21 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: raidctl.8,v 1.63 2011/08/02 10:28:00 wiz Exp $ +.\" $NetBSD: raidctl.8,v 1.63.4.1 2013/09/20 14:13:21 riz Exp $ .\" .\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -173,7 +173,7 @@ All components of the set must be of typ .Dv RAID in the disklabel. Note that only certain architectures -.Pq currently alpha, i386, pmax, sparc, sparc64, and vax +.Pq currently alpha, amd64, i386, pmax, sparc, sparc64, and vax support booting a kernel directly from a RAID set. .It Fl B Ar dev Initiate a copyback of reconstructed data from a spare disk to
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Fri Sep 20 14:13:48 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 948 To generate a diff of this commit: cvs rdiff -u -r1.1.2.44 -r1.1.2.45 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.44 src/doc/CHANGES-6.2:1.1.2.45 --- src/doc/CHANGES-6.2:1.1.2.44 Fri Sep 20 03:49:23 2013 +++ src/doc/CHANGES-6.2 Fri Sep 20 14:13:48 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.44 2013/09/20 03:49:23 riz Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.45 2013/09/20 14:13:48 riz Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -743,3 +743,8 @@ sys/dev/pci/piixpmreg.h1.6 Expose iic busses. (Needed for ticket #929) [fair, ticket #936] +sbin/raidctl/raidctl.81.65 + + Note that NetBSD/amd64 can boot off RAID volumes. + [tron, ticket #948] +
CVS commit: [netbsd-6-1] src/sbin/raidctl
Module Name:src Committed By: riz Date: Fri Sep 20 14:14:28 UTC 2013 Modified Files: src/sbin/raidctl [netbsd-6-1]: raidctl.8 Log Message: Pull up following revision(s) (requested by tron in ticket #948): sbin/raidctl/raidctl.8: revision 1.65 Note that NetBSD/amd64 can boot off RAID volumes. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.63.10.1 src/sbin/raidctl/raidctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/raidctl/raidctl.8 diff -u src/sbin/raidctl/raidctl.8:1.63 src/sbin/raidctl/raidctl.8:1.63.10.1 --- src/sbin/raidctl/raidctl.8:1.63 Tue Aug 2 10:28:00 2011 +++ src/sbin/raidctl/raidctl.8 Fri Sep 20 14:14:28 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: raidctl.8,v 1.63 2011/08/02 10:28:00 wiz Exp $ +.\" $NetBSD: raidctl.8,v 1.63.10.1 2013/09/20 14:14:28 riz Exp $ .\" .\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -173,7 +173,7 @@ All components of the set must be of typ .Dv RAID in the disklabel. Note that only certain architectures -.Pq currently alpha, i386, pmax, sparc, sparc64, and vax +.Pq currently alpha, amd64, i386, pmax, sparc, sparc64, and vax support booting a kernel directly from a RAID set. .It Fl B Ar dev Initiate a copyback of reconstructed data from a spare disk to
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: riz Date: Fri Sep 20 14:14:50 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.2 Log Message: Ticket 948 To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/doc/CHANGES-6.1.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.1.2 diff -u src/doc/CHANGES-6.1.2:1.1.2.9 src/doc/CHANGES-6.1.2:1.1.2.10 --- src/doc/CHANGES-6.1.2:1.1.2.9 Fri Sep 20 03:15:45 2013 +++ src/doc/CHANGES-6.1.2 Fri Sep 20 14:14:50 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.2,v 1.1.2.9 2013/09/20 03:15:45 riz Exp $ +# $NetBSD: CHANGES-6.1.2,v 1.1.2.10 2013/09/20 14:14:50 riz Exp $ A complete list of changes from the NetBSD 6.1.1 release to the NetBSD 6.1.2 release: @@ -90,3 +90,8 @@ etc/ssh/ssh_known_hosts1.8 Update project host keys. [spz, ticket #947] +sbin/raidctl/raidctl.81.65 + + Note that NetBSD/amd64 can boot off RAID volumes. + [tron, ticket #948] +
CVS commit: [netbsd-6-0] src/sbin/raidctl
Module Name:src Committed By: riz Date: Fri Sep 20 14:15:07 UTC 2013 Modified Files: src/sbin/raidctl [netbsd-6-0]: raidctl.8 Log Message: Pull up following revision(s) (requested by tron in ticket #948): sbin/raidctl/raidctl.8: revision 1.65 Note that NetBSD/amd64 can boot off RAID volumes. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.63.8.1 src/sbin/raidctl/raidctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/raidctl/raidctl.8 diff -u src/sbin/raidctl/raidctl.8:1.63 src/sbin/raidctl/raidctl.8:1.63.8.1 --- src/sbin/raidctl/raidctl.8:1.63 Tue Aug 2 10:28:00 2011 +++ src/sbin/raidctl/raidctl.8 Fri Sep 20 14:15:07 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: raidctl.8,v 1.63 2011/08/02 10:28:00 wiz Exp $ +.\" $NetBSD: raidctl.8,v 1.63.8.1 2013/09/20 14:15:07 riz Exp $ .\" .\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -173,7 +173,7 @@ All components of the set must be of typ .Dv RAID in the disklabel. Note that only certain architectures -.Pq currently alpha, i386, pmax, sparc, sparc64, and vax +.Pq currently alpha, amd64, i386, pmax, sparc, sparc64, and vax support booting a kernel directly from a RAID set. .It Fl B Ar dev Initiate a copyback of reconstructed data from a spare disk to
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Fri Sep 20 14:15:31 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.3 Log Message: Ticket 948 To generate a diff of this commit: cvs rdiff -u -r1.1.2.24 -r1.1.2.25 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.24 src/doc/CHANGES-6.0.3:1.1.2.25 --- src/doc/CHANGES-6.0.3:1.1.2.24 Fri Sep 20 03:15:14 2013 +++ src/doc/CHANGES-6.0.3 Fri Sep 20 14:15:31 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.3,v 1.1.2.24 2013/09/20 03:15:14 riz Exp $ +# $NetBSD: CHANGES-6.0.3,v 1.1.2.25 2013/09/20 14:15:31 riz Exp $ A complete list of changes from the NetBSD 6.0.2 release to the NetBSD 6.0.3 release: @@ -238,3 +238,8 @@ etc/ssh/ssh_known_hosts1.8 Update project host keys. [spz, ticket #947] +sbin/raidctl/raidctl.81.65 + + Note that NetBSD/amd64 can boot off RAID volumes. + [tron, ticket #948] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Fri Sep 20 14:18:09 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1879 To generate a diff of this commit: cvs rdiff -u -r1.1.2.30 -r1.1.2.31 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.30 src/doc/CHANGES-5.3:1.1.2.31 --- src/doc/CHANGES-5.3:1.1.2.30 Fri Sep 20 03:12:18 2013 +++ src/doc/CHANGES-5.3 Fri Sep 20 14:18:09 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.30 2013/09/20 03:12:18 riz Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.31 2013/09/20 14:18:09 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -571,3 +571,8 @@ etc/ssh/ssh_known_hosts1.7-1.8 Update for project hosts whose keys changed. [spz, ticket #1878] +sbin/raidctl/raidctl.81.65 + + Note that NetBSD/amd64 can boot off RAID volumes. + [tron, ticket #1879] +
CVS commit: [netbsd-5] src/sbin/raidctl
Module Name:src Committed By: riz Date: Fri Sep 20 14:17:49 UTC 2013 Modified Files: src/sbin/raidctl [netbsd-5]: raidctl.8 Log Message: Pull up following revision(s) (requested by tron in ticket #1879): sbin/raidctl/raidctl.8: revision 1.65 Note that NetBSD/amd64 can boot off RAID volumes. To generate a diff of this commit: cvs rdiff -u -r1.56.2.1 -r1.56.2.2 src/sbin/raidctl/raidctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/raidctl/raidctl.8 diff -u src/sbin/raidctl/raidctl.8:1.56.2.1 src/sbin/raidctl/raidctl.8:1.56.2.2 --- src/sbin/raidctl/raidctl.8:1.56.2.1 Thu Dec 10 22:59:16 2009 +++ src/sbin/raidctl/raidctl.8 Fri Sep 20 14:17:49 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: raidctl.8,v 1.56.2.1 2009/12/10 22:59:16 snj Exp $ +.\" $NetBSD: raidctl.8,v 1.56.2.2 2013/09/20 14:17:49 riz Exp $ .\" .\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -173,7 +173,7 @@ All components of the set must be of typ .Dv RAID in the disklabel. Note that only certain architectures -.Pq currently alpha, i386, pmax, sparc, sparc64, and vax +.Pq currently alpha, amd64, i386, pmax, sparc, sparc64, and vax support booting a kernel directly from a RAID set. .It Fl B Ar dev Initiate a copyback of reconstructed data from a spare disk to
CVS commit: [netbsd-5-2] src/sbin/raidctl
Module Name:src Committed By: riz Date: Fri Sep 20 14:18:45 UTC 2013 Modified Files: src/sbin/raidctl [netbsd-5-2]: raidctl.8 Log Message: Pull up following revision(s) (requested by tron in ticket #1879): sbin/raidctl/raidctl.8: revision 1.65 Note that NetBSD/amd64 can boot off RAID volumes. To generate a diff of this commit: cvs rdiff -u -r1.56.2.1 -r1.56.2.1.6.1 src/sbin/raidctl/raidctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/raidctl/raidctl.8 diff -u src/sbin/raidctl/raidctl.8:1.56.2.1 src/sbin/raidctl/raidctl.8:1.56.2.1.6.1 --- src/sbin/raidctl/raidctl.8:1.56.2.1 Thu Dec 10 22:59:16 2009 +++ src/sbin/raidctl/raidctl.8 Fri Sep 20 14:18:45 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: raidctl.8,v 1.56.2.1 2009/12/10 22:59:16 snj Exp $ +.\" $NetBSD: raidctl.8,v 1.56.2.1.6.1 2013/09/20 14:18:45 riz Exp $ .\" .\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -173,7 +173,7 @@ All components of the set must be of typ .Dv RAID in the disklabel. Note that only certain architectures -.Pq currently alpha, i386, pmax, sparc, sparc64, and vax +.Pq currently alpha, amd64, i386, pmax, sparc, sparc64, and vax support booting a kernel directly from a RAID set. .It Fl B Ar dev Initiate a copyback of reconstructed data from a spare disk to
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: riz Date: Fri Sep 20 14:20:09 UTC 2013 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.1 Log Message: Ticket 1879 To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 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.19 src/doc/CHANGES-5.2.1:1.1.2.20 --- src/doc/CHANGES-5.2.1:1.1.2.19 Fri Sep 20 03:11:08 2013 +++ src/doc/CHANGES-5.2.1 Fri Sep 20 14:20:09 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.1,v 1.1.2.19 2013/09/20 03:11:08 riz Exp $ +# $NetBSD: CHANGES-5.2.1,v 1.1.2.20 2013/09/20 14:20:09 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 release: @@ -260,3 +260,8 @@ etc/ssh/ssh_known_hosts1.7-1.8 Update for project hosts whose keys changed. [spz, ticket #1878] +sbin/raidctl/raidctl.81.65 + + Note that NetBSD/amd64 can boot off RAID volumes. + [tron, ticket #1879] +
CVS commit: [netbsd-5-1] src/sbin/raidctl
Module Name:src Committed By: riz Date: Fri Sep 20 14:20:28 UTC 2013 Modified Files: src/sbin/raidctl [netbsd-5-1]: raidctl.8 Log Message: Pull up following revision(s) (requested by tron in ticket #1879): sbin/raidctl/raidctl.8: revision 1.65 Note that NetBSD/amd64 can boot off RAID volumes. To generate a diff of this commit: cvs rdiff -u -r1.56.2.1 -r1.56.2.1.2.1 src/sbin/raidctl/raidctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/raidctl/raidctl.8 diff -u src/sbin/raidctl/raidctl.8:1.56.2.1 src/sbin/raidctl/raidctl.8:1.56.2.1.2.1 --- src/sbin/raidctl/raidctl.8:1.56.2.1 Thu Dec 10 22:59:16 2009 +++ src/sbin/raidctl/raidctl.8 Fri Sep 20 14:20:28 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: raidctl.8,v 1.56.2.1 2009/12/10 22:59:16 snj Exp $ +.\" $NetBSD: raidctl.8,v 1.56.2.1.2.1 2013/09/20 14:20:28 riz Exp $ .\" .\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -173,7 +173,7 @@ All components of the set must be of typ .Dv RAID in the disklabel. Note that only certain architectures -.Pq currently alpha, i386, pmax, sparc, sparc64, and vax +.Pq currently alpha, amd64, i386, pmax, sparc, sparc64, and vax support booting a kernel directly from a RAID set. .It Fl B Ar dev Initiate a copyback of reconstructed data from a spare disk to
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Fri Sep 20 14:20:47 UTC 2013 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Ticket 1879 To generate a diff of this commit: cvs rdiff -u -r1.1.2.50 -r1.1.2.51 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.50 src/doc/CHANGES-5.1.3:1.1.2.51 --- src/doc/CHANGES-5.1.3:1.1.2.50 Fri Sep 20 03:11:45 2013 +++ src/doc/CHANGES-5.1.3 Fri Sep 20 14:20:47 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.50 2013/09/20 03:11:45 riz Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.51 2013/09/20 14:20:47 riz Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2546,3 +2546,8 @@ etc/ssh/ssh_known_hosts1.7-1.8 Update for project hosts whose keys changed. [spz, ticket #1878] +sbin/raidctl/raidctl.81.65 + + Note that NetBSD/amd64 can boot off RAID volumes. + [tron, ticket #1879] +
CVS commit: src/share/mk
Module Name:src
Committed By: pooka
Date: Fri Sep 20 16:39:14 UTC 2013
Modified Files:
src/share/mk: bsd.ioconf.mk
Log Message:
Make it possible to specify a directory for the .ioconf file.
Still default to .CURDIR
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/mk/bsd.ioconf.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.ioconf.mk
diff -u src/share/mk/bsd.ioconf.mk:1.3 src/share/mk/bsd.ioconf.mk:1.4
--- src/share/mk/bsd.ioconf.mk:1.3 Thu Mar 25 20:37:36 2010
+++ src/share/mk/bsd.ioconf.mk Fri Sep 20 16:39:14 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.ioconf.mk,v 1.3 2010/03/25 20:37:36 pooka Exp $
+# $NetBSD: bsd.ioconf.mk,v 1.4 2013/09/20 16:39:14 pooka Exp $
#
.include
@@ -18,7 +18,7 @@
CONFIGDEP=${TOOL_CONFIG}
.endif
ioconf.c: ${IOCONF} ${CONFIGDEP}
- ${TOOL_CONFIG} -b ${.OBJDIR} -s ${S} ${.CURDIR}/${IOCONF}
+ ${TOOL_CONFIG} -b ${.OBJDIR} -s ${S} ${IOCONFDIR:U${.CURDIR}}/${IOCONF}
# config doesn't change the files if they're unchanged. however,
# here we want to satisfy our make dependency, so force a
# timestamp update
CVS commit: src/sys/rump/librump/rumpdev
Module Name:src
Committed By: pooka
Date: Fri Sep 20 16:49:00 UTC 2013
Modified Files:
src/sys/rump/librump/rumpdev: Makefile.rumpdev autoconf.c rump_dev.c
rump_dev_private.h
Added Files:
src/sys/rump/librump/rumpdev: MAINBUS.ioconf
Log Message:
use ioconf for mainbus
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpdev/MAINBUS.ioconf
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/librump/rumpdev/Makefile.rumpdev \
src/sys/rump/librump/rumpdev/autoconf.c
cvs rdiff -u -r1.23 -r1.24 src/sys/rump/librump/rumpdev/rump_dev.c
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/librump/rumpdev/rump_dev_private.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/rump/librump/rumpdev/Makefile.rumpdev
diff -u src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.7 src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.8
--- src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.7 Thu Sep 19 17:55:22 2013
+++ src/sys/rump/librump/rumpdev/Makefile.rumpdev Fri Sep 20 16:49:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpdev,v 1.7 2013/09/19 17:55:22 pooka Exp $
+# $NetBSD: Makefile.rumpdev,v 1.8 2013/09/20 16:49:00 pooka Exp $
#
LIB= rumpdev
@@ -6,6 +6,9 @@ LIB= rumpdev
.PATH: ${RUMPTOP}/librump/rumpdev\
${RUMPTOP}/../kern
+IOCONFDIR:= ${.PARSEDIR}
+IOCONF= MAINBUS.ioconf
+
SRCS= rump_dev.c autoconf.c
# sys/kern
Index: src/sys/rump/librump/rumpdev/autoconf.c
diff -u src/sys/rump/librump/rumpdev/autoconf.c:1.7 src/sys/rump/librump/rumpdev/autoconf.c:1.8
--- src/sys/rump/librump/rumpdev/autoconf.c:1.7 Sat Oct 27 17:18:40 2012
+++ src/sys/rump/librump/rumpdev/autoconf.c Fri Sep 20 16:49:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.7 2012/10/27 17:18:40 chs Exp $ */
+/* $NetBSD: autoconf.c,v 1.8 2013/09/20 16:49:00 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.7 2012/10/27 17:18:40 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.8 2013/09/20 16:49:00 pooka Exp $");
#include
#include
@@ -41,29 +41,21 @@ struct mainbus_softc {
};
/*
- * Initial lists. Should ingrate with config better.
+ * Initial lists as required by autoconf(9). The data from ioconf.c
+ * is patched in by rump_mainbus_init().
*/
const struct cfattachinit cfattachinit[] = {
{ NULL, NULL },
};
struct cfdata cfdata[] = {
- { "mainbus", "mainbus", 0, FSTATE_NOTFOUND, NULL, 0, NULL},
+ { NULL, NULL, 0, FSTATE_NOTFOUND, NULL, 0, NULL}, /* replaced by init */
{ NULL, NULL, 0, FSTATE_NOTFOUND, NULL, 0, NULL},
};
struct cfdriver * const cfdriver_list_initial[] = {
- NULL
+ NULL,
};
-static const struct cfiattrdata mainbuscf_iattrdata = {
- "mainbus", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata * const mainbus_attrs[] = {
- &mainbuscf_iattrdata,
- NULL
-};
-CFDRIVER_DECL(mainbus, DV_DULL, mainbus_attrs);
+#include "ioconf.c"
CFATTACH_DECL_NEW(mainbus, sizeof(struct mainbus_softc),
mainbus_match, mainbus_attach, NULL, NULL);
@@ -102,14 +94,14 @@ rump_pdev_finalize()
rump_pdev_add(NULL, 0);
}
-int
+static int
mainbus_match(device_t parent, cfdata_t match, void *aux)
{
return 1;
}
-void
+static void
mainbus_attach(device_t parent, device_t self, void *aux)
{
@@ -128,3 +120,21 @@ mainbus_search(device_t parent, cfdata_t
return 0;
}
+
+void
+rump_mainbus_init(void)
+{
+
+ /* replace cfdata[0] to a state expected by autoconf(9) */
+ memcpy(&cfdata[0], &cfdata_ioconf_mainbus[0], sizeof(cfdata[0]));
+}
+
+void
+rump_mainbus_attach(void)
+{
+ const struct cfattachinit *cfai = &cfattach_ioconf_mainbus[0];
+
+ config_cfdata_attach(cfdata, 0);
+ config_cfdriver_attach(cfdriver_ioconf_mainbus[0]);
+ config_cfattach_attach(cfai->cfai_name, cfai->cfai_list[0]);
+}
Index: src/sys/rump/librump/rumpdev/rump_dev.c
diff -u src/sys/rump/librump/rumpdev/rump_dev.c:1.23 src/sys/rump/librump/rumpdev/rump_dev.c:1.24
--- src/sys/rump/librump/rumpdev/rump_dev.c:1.23 Tue Sep 17 23:55:16 2013
+++ src/sys/rump/librump/rumpdev/rump_dev.c Fri Sep 20 16:49:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_dev.c,v 1.23 2013/09/17 23:55:16 pooka Exp $ */
+/* $NetBSD: rump_dev.c,v 1.24 2013/09/20 16:49:00 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rump_dev.c,v 1.23 2013/09/17 23:55:16 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_dev.c,v 1.24 2013/09/20 16:49:00 pooka Exp $");
#include
#include
@@ -48,6 +48,7 @@ RUMP_COMPONENT(RUMP__FACTION_DEV)
KERNEL_LOCK(1, curlwp);
+ rump_mainbus_init();
config_init_mi();
rump_component_init(RUMP_COMPONENT_DEV);
@@ -62,13 +63,7 @@ RUMP_COMPONENT(RUMP__FACTION_DEV)
*/
if (rump_component_count(RUMP_COMPONENT_DEV) > 0
|| rump_component_count(RUMP_COMPONENT_DEV_AFTERMAINBUS) > 0) {
-
CVS commit: src/share/examples/npf
Module Name:src
Committed By: spz
Date: Fri Sep 20 17:51:04 UTC 2013
Modified Files:
src/share/examples/npf: host-npf.conf l2tp_gw-npf.conf soho_gw-npf.conf
Log Message:
track syntax change in npf.conf regarding group
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/examples/npf/host-npf.conf \
src/share/examples/npf/soho_gw-npf.conf
cvs rdiff -u -r1.1 -r1.2 src/share/examples/npf/l2tp_gw-npf.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/npf/host-npf.conf
diff -u src/share/examples/npf/host-npf.conf:1.4 src/share/examples/npf/host-npf.conf:1.5
--- src/share/examples/npf/host-npf.conf:1.4 Sun Dec 9 22:12:26 2012
+++ src/share/examples/npf/host-npf.conf Fri Sep 20 17:51:04 2013
@@ -1,4 +1,4 @@
-# $NetBSD: host-npf.conf,v 1.4 2012/12/09 22:12:26 rmind Exp $
+# $NetBSD: host-npf.conf,v 1.5 2013/09/20 17:51:04 spz Exp $
#
# this is an example of NPF rules for a host (i.e., not routing) with
# two network interfaces, wired and wifi
@@ -31,7 +31,7 @@ procedure "log" {
log: npflog0
}
-group (name "wired", interface $wired_if) {
+group "wired" on $wired_if {
# not being picky about our own address here
pass in final family inet6 proto ipv6-icmp all
@@ -74,7 +74,7 @@ group (name "wired", interface $wired_if
}
-group (name "wifi", interface $wifi_if) {
+group "wifi" on $wifi_if {
# linklocal
pass in final family inet6 proto ipv6-icmp to fe80::/10
pass out final family inet6 proto ipv6-icmp from fe80::/10
@@ -116,7 +116,7 @@ group (name "wifi", interface $wifi_if)
pass stateful out final family inet from $wifi_v4
}
-group (default) {
+group default {
pass final on lo0 all
block all apply "log"
}
Index: src/share/examples/npf/soho_gw-npf.conf
diff -u src/share/examples/npf/soho_gw-npf.conf:1.4 src/share/examples/npf/soho_gw-npf.conf:1.5
--- src/share/examples/npf/soho_gw-npf.conf:1.4 Sun Dec 9 22:12:26 2012
+++ src/share/examples/npf/soho_gw-npf.conf Fri Sep 20 17:51:04 2013
@@ -1,4 +1,4 @@
-# $NetBSD: soho_gw-npf.conf,v 1.4 2012/12/09 22:12:26 rmind Exp $
+# $NetBSD: soho_gw-npf.conf,v 1.5 2013/09/20 17:51:04 spz Exp $
#
# SOHO border
#
@@ -34,7 +34,7 @@ procedure "log" {
log: npflog0
}
-group (name "external", interface $ext_if) {
+group "external" on $ext_if {
pass stateful out final all
block in final from <1>
@@ -49,13 +49,13 @@ group (name "external", interface $ext_i
pass stateful in final proto udp to $ext_addrs port 33434-33600
}
-group (name "internal", interface $int_if) {
+group "internal" on $int_if {
block in all
pass in final from <2>
pass out final all
}
-group (default) {
+group default {
pass final on lo0 all
block all
}
Index: src/share/examples/npf/l2tp_gw-npf.conf
diff -u src/share/examples/npf/l2tp_gw-npf.conf:1.1 src/share/examples/npf/l2tp_gw-npf.conf:1.2
--- src/share/examples/npf/l2tp_gw-npf.conf:1.1 Wed Jun 26 21:36:39 2013
+++ src/share/examples/npf/l2tp_gw-npf.conf Fri Sep 20 17:51:04 2013
@@ -19,7 +19,7 @@ procedure "log" {
log: npflog0
}
-group (name "external", interface $ext_if) {
+group "external" on $ext_if {
#
# Allow DHCP requests (even to reserved addresses).
#
@@ -127,13 +127,13 @@ group (name "external", interface $ext_i
block return-rst in final proto tcp flags S/SA all apply "log"
}
-group (name "internal", interface $int_if) {
+group "internal" on $int_if {
# Pass everything to internal networks,
# should be ok, because we are nat'ed.
pass final all
}
-group (default) {
+group default {
# Loopback interface should allows packets to traverse it.
pass final on lo0 all
# For one L2TP tunnel, needs interface pre-created, post-destroyed
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: christos Date: Fri Sep 20 19:07:29 UTC 2013 Modified Files: src/usr.sbin/zic: Makefile.inc Log Message: the code specifies package info now. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/zic/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/usr.sbin/zic/Makefile.inc diff -u src/usr.sbin/zic/Makefile.inc:1.1 src/usr.sbin/zic/Makefile.inc:1.2 --- src/usr.sbin/zic/Makefile.inc:1.1 Sat Mar 2 16:38:19 2013 +++ src/usr.sbin/zic/Makefile.inc Fri Sep 20 15:07:29 2013 @@ -1,2 +1,2 @@ -CPPFLAGS+=-DREPORT_BUGS_TO=\"gn...@netbsd.org\" -DPKGVERSION=\"tzcode-2013a\" +CPPFLAGS+=-DREPORT_BUGS_TO=\"gn...@netbsd.org\"
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Sep 20 19:09:06 UTC 2013 Modified Files: src/doc: 3RDPARTY Log Message: mention new tzcode, hi apb! To generate a diff of this commit: cvs rdiff -u -r1.1054 -r1.1055 src/doc/3RDPARTY 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.1054 src/doc/3RDPARTY:1.1055 --- src/doc/3RDPARTY:1.1054 Fri Sep 20 06:59:24 2013 +++ src/doc/3RDPARTY Fri Sep 20 15:09:06 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1054 2013/09/20 10:59:24 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1055 2013/09/20 19:09:06 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1250,8 +1250,8 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2013d / tzdata2013d -Current Vers: tzcode2013d / tzdata2013d +Version: tzcode2013e / tzdata2013d +Current Vers: tzcode2013e / tzdata2013e Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/
CVS commit: src/share/zoneinfo
Module Name:src Committed By: apb Date: Fri Sep 20 20:46:01 UTC 2013 Modified Files: src/share/zoneinfo: australasia Log Message: Merge the Fiji-related change from tzdata2013e. This is the only urgent change in tzdata2013e. This year Fiji will start DST on October 27, not October 20. (Thanks to David Wheeler for the heads-up.) For now, guess that Fiji will continue to spring forward the Sunday before the fourth Monday in October. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.32 src/share/zoneinfo/australasia:1.33 --- src/share/zoneinfo/australasia:1.32 Sun Jul 7 10:48:49 2013 +++ src/share/zoneinfo/australasia Fri Sep 20 20:46:01 2013 @@ -352,16 +352,25 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st # October 2012 and end at 3 am on Sunday 20th January 2013. # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155 -# -# From Paul Eggert (2012-08-31): -# For now, guess a pattern of the penultimate Sundays in October and January. + +# From the Fijian Government Media Center (2013-08-30) via David Wheeler: +# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am +# on Sunday 19th January, 2014 move clocks forward by one hour from 2am +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx +# +# From Paul Eggert (2013-09-09): +# For now, guess that Fiji springs forward the Sunday before the fourth +# Monday in October. This matches both recent practice and +# timeanddate.com's current spring-forward prediction. +# For the January 2014 transition we guessed right while timeanddate.com +# guessed wrong, so leave the fall-back prediction alone. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - -Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S +Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL]
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Fri Sep 20 19:13:39 UTC 2013
Modified Files:
src/sys/kern: uipc_mbuf.c
Log Message:
mark mbuf as free when we return it to the pool (Beverly Schwartz)
To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/kern/uipc_mbuf.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/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.151 src/sys/kern/uipc_mbuf.c:1.152
--- src/sys/kern/uipc_mbuf.c:1.151 Thu Jun 27 21:23:05 2013
+++ src/sys/kern/uipc_mbuf.c Fri Sep 20 15:13:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.151 2013/06/28 01:23:05 matt Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.152 2013/09/20 19:13:39 christos Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.151 2013/06/28 01:23:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.152 2013/09/20 19:13:39 christos Exp $");
#include "opt_mbuftrace.h"
#include "opt_nmbclusters.h"
@@ -1735,6 +1735,7 @@ m_ext_free(struct mbuf *m)
}
}
if (dofree) {
+ m->m_type = MT_FREE;
pool_cache_put(mb_cache, m);
}
}
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: wiz Date: Fri Sep 20 21:39:59 UTC 2013 Modified Files: src/external/bsd/dhcpcd/dist: dhcpcd.conf.5.in Log Message: Sort, fix Dt. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 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/dhcpcd.conf.5.in diff -u src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in:1.4 src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in:1.5 --- src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in:1.4 Fri Sep 20 10:56:32 2013 +++ src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in Fri Sep 20 21:39:59 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: dhcpcd.conf.5.in,v 1.4 2013/09/20 10:56:32 roy Exp $ +.\" $NetBSD: dhcpcd.conf.5.in,v 1.5 2013/09/20 21:39:59 wiz Exp $ .\" Copyright (c) 2006-2013 Roy Marples .\" All rights reserved .\" @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .Dd September 12, 2013 -.Dt DHCPCD.CONF 5 SMM +.Dt DHCPCD.CONF 5 .Os .Sh NAME .Nm dhcpcd.conf @@ -439,10 +439,10 @@ Use the last four bytes of the hardware of a randomly generated number. .El .Sh SEE ALSO -.Xr dhcpcd-run-hooks 8 , -.Xr dhcpcd 8 , +.Xr fnmatch 3 , .Xr if_nametoindex 3 , -.Xr fnmatch 3 +.Xr dhcpcd 8 , +.Xr dhcpcd-run-hooks 8 .Sh AUTHORS .An Roy Marples Aq Mt r...@marples.name .Sh BUGS
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: wiz Date: Fri Sep 20 21:40:56 UTC 2013 Modified Files: src/external/bsd/dhcpcd/dist: dhcpcd.8.in Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/external/bsd/dhcpcd/dist/dhcpcd.8.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/dhcpcd.8.in diff -u src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.22 src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.23 --- src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.22 Fri Sep 20 10:56:32 2013 +++ src/external/bsd/dhcpcd/dist/dhcpcd.8.in Fri Sep 20 21:40:56 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: dhcpcd.8.in,v 1.22 2013/09/20 10:56:32 roy Exp $ +.\" $NetBSD: dhcpcd.8.in,v 1.23 2013/09/20 21:40:56 wiz Exp $ .\" Copyright (c) 2006-2013 Roy Marples .\" All rights reserved .\" @@ -311,7 +311,7 @@ process running on the .Ar interface to release its lease and de-configure the .Ar interface . -If no +If no .Ar interface is specified then this applies to all interfaces. If no interfaces are left running, @@ -334,7 +334,7 @@ An extra 100 will be added for wireless Notifies .Nm to reload its configuration and rebind the specified -.Ar interface . +.Ar interface . If no interface is specified then this applies to all interfaces. If .Nm
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: wiz Date: Fri Sep 20 21:30:49 UTC 2013 Modified Files: src/usr.sbin/npf/npfctl: npfctl.8 Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/npf/npfctl/npfctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/npf/npfctl/npfctl.8 diff -u src/usr.sbin/npf/npfctl/npfctl.8:1.14 src/usr.sbin/npf/npfctl/npfctl.8:1.15 --- src/usr.sbin/npf/npfctl/npfctl.8:1.14 Thu Sep 19 12:05:11 2013 +++ src/usr.sbin/npf/npfctl/npfctl.8 Fri Sep 20 21:30:49 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: npfctl.8,v 1.14 2013/09/19 12:05:11 rmind Exp $ +.\" $NetBSD: npfctl.8,v 1.15 2013/09/20 21:30:49 wiz Exp $ .\" .\" Copyright (c) 2009-2013 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -99,7 +99,7 @@ Remove a rule from a dynamic ruleset spe .Ar name . This method uses SHA1 hash computed on a rule to identify it. Although very unlikely, it is subject to hash collisions. -For a fully reliable and more efficient method, it is recommended to use +For a fully reliable and more efficient method, it is recommended to use .Ic rem-id command. .It Ic rule Ar name Ic rem-id Aq id
CVS commit: src/sys/net
Module Name:src
Committed By: rmind
Date: Fri Sep 20 23:19:52 UTC 2013
Modified Files:
src/sys/net: bpfjit.c
Log Message:
bpfjit: replace malloc with kmem, KNF a little, add RCS ID.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/net/bpfjit.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/bpfjit.c
diff -u src/sys/net/bpfjit.c:1.2 src/sys/net/bpfjit.c:1.3
--- src/sys/net/bpfjit.c:1.2 Sat Nov 10 22:12:31 2012
+++ src/sys/net/bpfjit.c Fri Sep 20 23:19:52 2013
@@ -1,3 +1,5 @@
+/* $NetBSD: bpfjit.c,v 1.3 2013/09/20 23:19:52 rmind Exp $ */
+
/*-
* Copyright (c) 2011-2012 Alexander Nasonov.
* All rights reserved.
@@ -29,53 +31,41 @@
#include
#ifdef _KERNEL
-__KERNEL_RCSID(0, "$NetBSD: bpfjit.c,v 1.2 2012/11/10 22:12:31 alnsn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpfjit.c,v 1.3 2013/09/20 23:19:52 rmind Exp $");
#else
-__RCSID("$NetBSD: bpfjit.c,v 1.2 2012/11/10 22:12:31 alnsn Exp $");
+__RCSID("$NetBSD: bpfjit.c,v 1.3 2013/09/20 23:19:52 rmind Exp $");
#endif
-#include
+#include
+#include
#ifndef _KERNEL
+#include
#include
+#define BPFJIT_ALLOC(sz) malloc(sz)
+#define BPFJIT_FREE(p, sz) free(p)
#define BPFJIT_ASSERT(c) assert(c)
#else
+#include
+#define BPFJIT_ALLOC(sz) kmem_alloc(sz, KM_SLEEP)
+#define BPFJIT_FREE(p, sz) kmem_free(p, sz)
#define BPFJIT_ASSERT(c) KASSERT(c)
#endif
#ifndef _KERNEL
-#include
-#define BPFJIT_MALLOC(sz) malloc(sz)
-#define BPFJIT_FREE(p) free(p)
-#else
-#include
-#define BPFJIT_MALLOC(sz) kern_malloc(sz, M_WAITOK)
-#define BPFJIT_FREE(p) kern_free(p)
-#endif
-
-#ifndef _KERNEL
#include
+#include
#include
#include
#include
#else
-#include
-#include
-#include
#include
#include
#endif
-#include
-#include
-
+#include
#include
-#if !defined(_KERNEL) && defined(SLJIT_VERBOSE) && SLJIT_VERBOSE
-#include /* for stderr */
-#endif
-
-
#define BPFJIT_A SLJIT_TEMPORARY_REG1
#define BPFJIT_X SLJIT_TEMPORARY_EREG1
#define BPFJIT_TMP1 SLJIT_TEMPORARY_REG2
@@ -91,12 +81,10 @@ __RCSID("$NetBSD: bpfjit.c,v 1.2 2012/11
#define BPFJIT_INIT_X 0x1
#define BPFJIT_INIT_A 0x2
-
/*
* Node of bj_jumps list.
*/
-struct bpfjit_jump
-{
+struct bpfjit_jump {
struct sljit_jump *bj_jump;
SLIST_ENTRY(bpfjit_jump) bj_entries;
uint32_t bj_safe_length;
@@ -105,8 +93,7 @@ struct bpfjit_jump
/*
* Data for BPF_JMP instruction.
*/
-struct bpfjit_jump_data
-{
+struct bpfjit_jump_data {
/*
* These entries make up bj_jumps list:
* bj_jtf[0] - when coming from jt path,
@@ -119,8 +106,7 @@ struct bpfjit_jump_data
* Data for "read from packet" instructions.
* See also read_pkt_insn() function below.
*/
-struct bpfjit_read_pkt_data
-{
+struct bpfjit_read_pkt_data {
/*
* If positive, emit "if (buflen < bj_check_length) return 0".
* We assume that buflen is never equal to UINT32_MAX (otherwise,
@@ -132,8 +118,7 @@ struct bpfjit_read_pkt_data
/*
* Additional (optimization-related) data for bpf_insn.
*/
-struct bpfjit_insn_data
-{
+struct bpfjit_insn_data {
/* List of jumps to this insn. */
SLIST_HEAD(, bpfjit_jump) bj_jumps;
@@ -1223,7 +1208,7 @@ bpfjit_generate_code(struct bpf_insn *in
/* a list of jumps to out-of-bound return from a generated function */
struct sljit_jump **ret0;
- size_t ret0_size, ret0_maxsize;
+ size_t ret0_size = 0, ret0_maxsize = 0;
struct bpfjit_insn_data *insn_dat;
@@ -1258,7 +1243,7 @@ bpfjit_generate_code(struct bpf_insn *in
if (returns_maxsize == 0)
goto fail;
- insn_dat = BPFJIT_MALLOC(insn_count * sizeof(insn_dat[0]));
+ insn_dat = BPFJIT_ALLOC(insn_count * sizeof(insn_dat[0]));
if (insn_dat == NULL)
goto fail;
@@ -1268,13 +1253,13 @@ bpfjit_generate_code(struct bpf_insn *in
ret0_size = 0;
ret0_maxsize = get_ret0_size(insns, insn_dat, insn_count);
if (ret0_maxsize > 0) {
- ret0 = BPFJIT_MALLOC(ret0_maxsize * sizeof(ret0[0]));
+ ret0 = BPFJIT_ALLOC(ret0_maxsize * sizeof(ret0[0]));
if (ret0 == NULL)
goto fail;
}
returns_size = 0;
- returns = BPFJIT_MALLOC(returns_maxsize * sizeof(returns[0]));
+ returns = BPFJIT_ALLOC(returns_maxsize * sizeof(returns[0]));
if (returns == NULL)
goto fail;
@@ -1734,13 +1719,13 @@ fail:
sljit_free_compiler(compiler);
if (insn_dat != NULL)
- BPFJIT_FREE(insn_dat);
+ BPFJIT_FREE(insn_dat, insn_count * sizeof(insn_dat[0]));
if (returns != NULL)
- BPFJIT_FREE(returns);
+ BPFJIT_FREE(returns, returns_maxsize * sizeof(returns[0]));
if (ret0 != NULL)
- BPFJIT_FREE(ret0);
+ BPFJIT_FREE(ret0, ret0_maxsize * sizeof(ret0[0]));
return (bpfjit_function_t)rv;
}
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Sat Sep 21 02:56:13 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 949 To generate a diff of this commit: cvs rdiff -u -r1.1.2.45 -r1.1.2.46 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.45 src/doc/CHANGES-6.2:1.1.2.46 --- src/doc/CHANGES-6.2:1.1.2.45 Fri Sep 20 14:13:48 2013 +++ src/doc/CHANGES-6.2 Sat Sep 21 02:56:13 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.45 2013/09/20 14:13:48 riz Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.46 2013/09/21 02:56:13 riz Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -748,3 +748,9 @@ sbin/raidctl/raidctl.81.65 Note that NetBSD/amd64 can boot off RAID volumes. [tron, ticket #948] +share/zoneinfo/australasia 1.33 + + Merge the Fiji-related change from tzdata2013e. + This year Fiji will start DST on October 27, not October 20. + [apb, ticket #949] +
CVS commit: [netbsd-6] src/share/zoneinfo
Module Name:src Committed By: riz Date: Sat Sep 21 02:55:59 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-6]: australasia Log Message: Pull up following revision(s) (requested by apb in ticket #949): share/zoneinfo/australasia: revision 1.33 Merge the Fiji-related change from tzdata2013e. This is the only urgent change in tzdata2013e. This year Fiji will start DST on October 27, not October 20. (Thanks to David Wheeler for the heads-up.) For now, guess that Fiji will continue to spring forward the Sunday before the fourth Monday in October. To generate a diff of this commit: cvs rdiff -u -r1.23.4.9 -r1.23.4.10 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.23.4.9 src/share/zoneinfo/australasia:1.23.4.10 --- src/share/zoneinfo/australasia:1.23.4.9 Mon Jul 29 20:21:08 2013 +++ src/share/zoneinfo/australasia Sat Sep 21 02:55:59 2013 @@ -352,16 +352,25 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st # October 2012 and end at 3 am on Sunday 20th January 2013. # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155 -# -# From Paul Eggert (2012-08-31): -# For now, guess a pattern of the penultimate Sundays in October and January. + +# From the Fijian Government Media Center (2013-08-30) via David Wheeler: +# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am +# on Sunday 19th January, 2014 move clocks forward by one hour from 2am +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx +# +# From Paul Eggert (2013-09-09): +# For now, guess that Fiji springs forward the Sunday before the fourth +# Monday in October. This matches both recent practice and +# timeanddate.com's current spring-forward prediction. +# For the January 2014 transition we guessed right while timeanddate.com +# guessed wrong, so leave the fall-back prediction alone. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - -Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S +Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL]
CVS commit: [netbsd-6-0] src/share/zoneinfo
Module Name:src Committed By: riz Date: Sat Sep 21 02:56:24 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-6-0]: australasia Log Message: Pull up following revision(s) (requested by apb in ticket #949): share/zoneinfo/australasia: revision 1.33 Merge the Fiji-related change from tzdata2013e. This is the only urgent change in tzdata2013e. This year Fiji will start DST on October 27, not October 20. (Thanks to David Wheeler for the heads-up.) For now, guess that Fiji will continue to spring forward the Sunday before the fourth Monday in October. To generate a diff of this commit: cvs rdiff -u -r1.23.4.4.2.5 -r1.23.4.4.2.6 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.23.4.4.2.5 src/share/zoneinfo/australasia:1.23.4.4.2.6 --- src/share/zoneinfo/australasia:1.23.4.4.2.5 Mon Jul 29 20:21:35 2013 +++ src/share/zoneinfo/australasia Sat Sep 21 02:56:24 2013 @@ -352,16 +352,25 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st # October 2012 and end at 3 am on Sunday 20th January 2013. # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155 -# -# From Paul Eggert (2012-08-31): -# For now, guess a pattern of the penultimate Sundays in October and January. + +# From the Fijian Government Media Center (2013-08-30) via David Wheeler: +# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am +# on Sunday 19th January, 2014 move clocks forward by one hour from 2am +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx +# +# From Paul Eggert (2013-09-09): +# For now, guess that Fiji springs forward the Sunday before the fourth +# Monday in October. This matches both recent practice and +# timeanddate.com's current spring-forward prediction. +# For the January 2014 transition we guessed right while timeanddate.com +# guessed wrong, so leave the fall-back prediction alone. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - -Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S +Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL]
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Sat Sep 21 02:56:40 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.3 Log Message: ticket 949 To generate a diff of this commit: cvs rdiff -u -r1.1.2.25 -r1.1.2.26 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.25 src/doc/CHANGES-6.0.3:1.1.2.26 --- src/doc/CHANGES-6.0.3:1.1.2.25 Fri Sep 20 14:15:31 2013 +++ src/doc/CHANGES-6.0.3 Sat Sep 21 02:56:40 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.3,v 1.1.2.25 2013/09/20 14:15:31 riz Exp $ +# $NetBSD: CHANGES-6.0.3,v 1.1.2.26 2013/09/21 02:56:40 riz Exp $ A complete list of changes from the NetBSD 6.0.2 release to the NetBSD 6.0.3 release: @@ -243,3 +243,9 @@ sbin/raidctl/raidctl.81.65 Note that NetBSD/amd64 can boot off RAID volumes. [tron, ticket #948] +share/zoneinfo/australasia 1.33 + + Merge the Fiji-related change from tzdata2013e. + This year Fiji will start DST on October 27, not October 20. + [apb, ticket #949] +
CVS commit: [netbsd-6-1] src/share/zoneinfo
Module Name:src Committed By: riz Date: Sat Sep 21 02:56:49 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-6-1]: australasia Log Message: Pull up following revision(s) (requested by apb in ticket #949): share/zoneinfo/australasia: revision 1.33 Merge the Fiji-related change from tzdata2013e. This is the only urgent change in tzdata2013e. This year Fiji will start DST on October 27, not October 20. (Thanks to David Wheeler for the heads-up.) For now, guess that Fiji will continue to spring forward the Sunday before the fourth Monday in October. To generate a diff of this commit: cvs rdiff -u -r1.23.4.8.2.1 -r1.23.4.8.2.2 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.23.4.8.2.1 src/share/zoneinfo/australasia:1.23.4.8.2.2 --- src/share/zoneinfo/australasia:1.23.4.8.2.1 Mon Jul 29 20:21:57 2013 +++ src/share/zoneinfo/australasia Sat Sep 21 02:56:49 2013 @@ -352,16 +352,25 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st # October 2012 and end at 3 am on Sunday 20th January 2013. # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155 -# -# From Paul Eggert (2012-08-31): -# For now, guess a pattern of the penultimate Sundays in October and January. + +# From the Fijian Government Media Center (2013-08-30) via David Wheeler: +# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am +# on Sunday 19th January, 2014 move clocks forward by one hour from 2am +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx +# +# From Paul Eggert (2013-09-09): +# For now, guess that Fiji springs forward the Sunday before the fourth +# Monday in October. This matches both recent practice and +# timeanddate.com's current spring-forward prediction. +# For the January 2014 transition we guessed right while timeanddate.com +# guessed wrong, so leave the fall-back prediction alone. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - -Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S +Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL]
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: riz Date: Sat Sep 21 02:57:03 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.2 Log Message: Ticket 949 To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-6.1.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.1.2 diff -u src/doc/CHANGES-6.1.2:1.1.2.10 src/doc/CHANGES-6.1.2:1.1.2.11 --- src/doc/CHANGES-6.1.2:1.1.2.10 Fri Sep 20 14:14:50 2013 +++ src/doc/CHANGES-6.1.2 Sat Sep 21 02:57:03 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.2,v 1.1.2.10 2013/09/20 14:14:50 riz Exp $ +# $NetBSD: CHANGES-6.1.2,v 1.1.2.11 2013/09/21 02:57:03 riz Exp $ A complete list of changes from the NetBSD 6.1.1 release to the NetBSD 6.1.2 release: @@ -95,3 +95,9 @@ sbin/raidctl/raidctl.81.65 Note that NetBSD/amd64 can boot off RAID volumes. [tron, ticket #948] +share/zoneinfo/australasia 1.33 + + Merge the Fiji-related change from tzdata2013e. + This year Fiji will start DST on October 27, not October 20. + [apb, ticket #949] +
CVS commit: [netbsd-5] src/share/zoneinfo
Module Name:src Committed By: riz Date: Sat Sep 21 02:58:42 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-5]: australasia Log Message: Pull up following revision(s) (requested by apb in ticket #1880): share/zoneinfo/australasia: revision 1.33 Merge the Fiji-related change from tzdata2013e. This is the only urgent change in tzdata2013e. This year Fiji will start DST on October 27, not October 20. (Thanks to David Wheeler for the heads-up.) For now, guess that Fiji will continue to spring forward the Sunday before the fourth Monday in October. To generate a diff of this commit: cvs rdiff -u -r1.17.2.9 -r1.17.2.10 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.17.2.9 src/share/zoneinfo/australasia:1.17.2.10 --- src/share/zoneinfo/australasia:1.17.2.9 Sat Sep 7 17:17:35 2013 +++ src/share/zoneinfo/australasia Sat Sep 21 02:58:42 2013 @@ -352,16 +352,25 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st # October 2012 and end at 3 am on Sunday 20th January 2013. # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155 -# -# From Paul Eggert (2012-08-31): -# For now, guess a pattern of the penultimate Sundays in October and January. + +# From the Fijian Government Media Center (2013-08-30) via David Wheeler: +# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am +# on Sunday 19th January, 2014 move clocks forward by one hour from 2am +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx +# +# From Paul Eggert (2013-09-09): +# For now, guess that Fiji springs forward the Sunday before the fourth +# Monday in October. This matches both recent practice and +# timeanddate.com's current spring-forward prediction. +# For the January 2014 transition we guessed right while timeanddate.com +# guessed wrong, so leave the fall-back prediction alone. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - -Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S +Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL]
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sat Sep 21 02:58:59 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1880 To generate a diff of this commit: cvs rdiff -u -r1.1.2.31 -r1.1.2.32 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.31 src/doc/CHANGES-5.3:1.1.2.32 --- src/doc/CHANGES-5.3:1.1.2.31 Fri Sep 20 14:18:09 2013 +++ src/doc/CHANGES-5.3 Sat Sep 21 02:58:59 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.31 2013/09/20 14:18:09 riz Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.32 2013/09/21 02:58:59 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -576,3 +576,9 @@ sbin/raidctl/raidctl.81.65 Note that NetBSD/amd64 can boot off RAID volumes. [tron, ticket #1879] +share/zoneinfo/australasia 1.33 + + Merge the Fiji-related change from tzdata2013e. + This year Fiji will start DST on October 27, not October 20. + [apb, ticket #1880] +
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Sat Sep 21 02:59:29 UTC 2013 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: ticket 1880 To generate a diff of this commit: cvs rdiff -u -r1.1.2.51 -r1.1.2.52 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.51 src/doc/CHANGES-5.1.3:1.1.2.52 --- src/doc/CHANGES-5.1.3:1.1.2.51 Fri Sep 20 14:20:47 2013 +++ src/doc/CHANGES-5.1.3 Sat Sep 21 02:59:29 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.51 2013/09/20 14:20:47 riz Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.52 2013/09/21 02:59:29 riz Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2551,3 +2551,9 @@ sbin/raidctl/raidctl.81.65 Note that NetBSD/amd64 can boot off RAID volumes. [tron, ticket #1879] +share/zoneinfo/australasia 1.33 + + Merge the Fiji-related change from tzdata2013e. + This year Fiji will start DST on October 27, not October 20. + [apb, ticket #1880] +
CVS commit: [netbsd-5-2] src/share/zoneinfo
Module Name:src Committed By: riz Date: Sat Sep 21 02:59:40 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-5-2]: australasia Log Message: Pull up following revision(s) (requested by apb in ticket #1880): share/zoneinfo/australasia: revision 1.33 Merge the Fiji-related change from tzdata2013e. This is the only urgent change in tzdata2013e. This year Fiji will start DST on October 27, not October 20. (Thanks to David Wheeler for the heads-up.) For now, guess that Fiji will continue to spring forward the Sunday before the fourth Monday in October. To generate a diff of this commit: cvs rdiff -u -r1.17.2.6.2.3 -r1.17.2.6.2.4 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.17.2.6.2.3 src/share/zoneinfo/australasia:1.17.2.6.2.4 --- src/share/zoneinfo/australasia:1.17.2.6.2.3 Sat Sep 7 17:18:37 2013 +++ src/share/zoneinfo/australasia Sat Sep 21 02:59:40 2013 @@ -352,16 +352,25 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st # October 2012 and end at 3 am on Sunday 20th January 2013. # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155 -# -# From Paul Eggert (2012-08-31): -# For now, guess a pattern of the penultimate Sundays in October and January. + +# From the Fijian Government Media Center (2013-08-30) via David Wheeler: +# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am +# on Sunday 19th January, 2014 move clocks forward by one hour from 2am +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx +# +# From Paul Eggert (2013-09-09): +# For now, guess that Fiji springs forward the Sunday before the fourth +# Monday in October. This matches both recent practice and +# timeanddate.com's current spring-forward prediction. +# For the January 2014 transition we guessed right while timeanddate.com +# guessed wrong, so leave the fall-back prediction alone. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - -Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S +Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL]
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: riz Date: Sat Sep 21 02:59:52 UTC 2013 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.1 Log Message: TIcket 1880 To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 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.20 src/doc/CHANGES-5.2.1:1.1.2.21 --- src/doc/CHANGES-5.2.1:1.1.2.20 Fri Sep 20 14:20:09 2013 +++ src/doc/CHANGES-5.2.1 Sat Sep 21 02:59:52 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.1,v 1.1.2.20 2013/09/20 14:20:09 riz Exp $ +# $NetBSD: CHANGES-5.2.1,v 1.1.2.21 2013/09/21 02:59:52 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 release: @@ -265,3 +265,9 @@ sbin/raidctl/raidctl.81.65 Note that NetBSD/amd64 can boot off RAID volumes. [tron, ticket #1879] +share/zoneinfo/australasia 1.33 + + Merge the Fiji-related change from tzdata2013e. + This year Fiji will start DST on October 27, not October 20. + [apb, ticket #1880] +
CVS commit: [netbsd-5-1] src/share/zoneinfo
Module Name:src Committed By: riz Date: Sat Sep 21 02:59:10 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-5-1]: australasia Log Message: Pull up following revision(s) (requested by apb in ticket #1880): share/zoneinfo/australasia: revision 1.33 Merge the Fiji-related change from tzdata2013e. This is the only urgent change in tzdata2013e. This year Fiji will start DST on October 27, not October 20. (Thanks to David Wheeler for the heads-up.) For now, guess that Fiji will continue to spring forward the Sunday before the fourth Monday in October. To generate a diff of this commit: cvs rdiff -u -r1.17.10.9 -r1.17.10.10 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.17.10.9 src/share/zoneinfo/australasia:1.17.10.10 --- src/share/zoneinfo/australasia:1.17.10.9 Sat Sep 7 17:18:25 2013 +++ src/share/zoneinfo/australasia Sat Sep 21 02:59:10 2013 @@ -352,16 +352,25 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st # October 2012 and end at 3 am on Sunday 20th January 2013. # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155 -# -# From Paul Eggert (2012-08-31): -# For now, guess a pattern of the penultimate Sundays in October and January. + +# From the Fijian Government Media Center (2013-08-30) via David Wheeler: +# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am +# on Sunday 19th January, 2014 move clocks forward by one hour from 2am +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx +# +# From Paul Eggert (2013-09-09): +# For now, guess that Fiji springs forward the Sunday before the fourth +# Monday in October. This matches both recent practice and +# timeanddate.com's current spring-forward prediction. +# For the January 2014 transition we guessed right while timeanddate.com +# guessed wrong, so leave the fall-back prediction alone. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - -Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S +Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL]
CVS commit: src/sys/arch/hp300/hp300
Module Name:src Committed By: tsutsui Date: Sat Sep 21 06:24:43 UTC 2013 Modified Files: src/sys/arch/hp300/hp300: pmap_bootstrap.c Log Message: Fix a build error on a kernel config without 68040 machines. Reported by Andrew Gillham on port-hp300@: http://mail-index.NetBSD.org/port-hp300/2013/09/09/msg77.html (I removed defined(68060) since hp300 doesn't have it) Should be pulled up to netbsd-6. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/hp300/hp300/pmap_bootstrap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp300/hp300/pmap_bootstrap.c diff -u src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.57 src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.58 --- src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.57 Fri Feb 10 06:28:39 2012 +++ src/sys/arch/hp300/hp300/pmap_bootstrap.c Sat Sep 21 06:24:43 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.57 2012/02/10 06:28:39 mhitch Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.58 2013/09/21 06:24:43 tsutsui Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.57 2012/02/10 06:28:39 mhitch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.58 2013/09/21 06:24:43 tsutsui Exp $"); #include #include @@ -411,8 +411,10 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f */ RELOC(Sysseg, st_entry_t *) = (st_entry_t *)(kstpa - firstpa); RELOC(Sysseg_pa, paddr_t) = kstpa; +#if defined(M68040) if (RELOC(mmutype, int) == MMU_68040) RELOC(protostfree, u_int) = stfree; +#endif /* * Sysptmap: base of kernel page table map */
