CVS commit: src/sys/external/isc/atheros_hal/dist
Module Name:src Committed By: reinoud Date: Thu May 14 09:07:49 UTC 2009 Modified Files: src/sys/external/isc/atheros_hal/dist: ah_internal.h src/sys/external/isc/atheros_hal/dist/ar5210: ar5210.h src/sys/external/isc/atheros_hal/dist/ar5211: ar5211.h Log Message: Fix prototypes to match the functions. The prototypes had `int' specified for parameters or result where they should have been the corresponding enums. gcc won't bitch on them but conceptually they are different and could be stored in a different width. Compiling with pcc brought this to light. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/isc/atheros_hal/dist/ah_internal.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/isc/atheros_hal/dist/ar5210/ar5210.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/isc/atheros_hal/dist/ar5211/ar5211.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/external/isc/atheros_hal/dist/ah_internal.h diff -u src/sys/external/isc/atheros_hal/dist/ah_internal.h:1.2 src/sys/external/isc/atheros_hal/dist/ah_internal.h:1.3 --- src/sys/external/isc/atheros_hal/dist/ah_internal.h:1.2 Thu Dec 11 05:30:29 2008 +++ src/sys/external/isc/atheros_hal/dist/ah_internal.h Thu May 14 09:07:49 2009 @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah_internal.h,v 1.2 2008/12/11 05:30:29 alc Exp $ + * $Id: ah_internal.h,v 1.3 2009/05/14 09:07:49 reinoud Exp $ */ #ifndef _ATH_AH_INTERAL_H_ #define _ATH_AH_INTERAL_H_ @@ -516,7 +516,7 @@ * based on the current regulatory domain for the specified * channel. */ -extern u_int ath_hal_getnfcheckrequired(struct ath_hal *, HAL_CHANNEL *); +extern HAL_BOOL ath_hal_getnfcheckrequired(struct ath_hal *, HAL_CHANNEL *); /* * Map a public channel definition to the corresponding Index: src/sys/external/isc/atheros_hal/dist/ar5210/ar5210.h diff -u src/sys/external/isc/atheros_hal/dist/ar5210/ar5210.h:1.1.1.1 src/sys/external/isc/atheros_hal/dist/ar5210/ar5210.h:1.2 --- src/sys/external/isc/atheros_hal/dist/ar5210/ar5210.h:1.1.1.1 Thu Dec 11 04:46:27 2008 +++ src/sys/external/isc/atheros_hal/dist/ar5210/ar5210.h Thu May 14 09:07:49 2009 @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5210.h,v 1.1.1.1 2008/12/11 04:46:27 alc Exp $ + * $Id: ar5210.h,v 1.2 2009/05/14 09:07:49 reinoud Exp $ */ #ifndef _ATH_AR5210_H_ #define _ATH_AR5210_H_ @@ -254,7 +254,7 @@ extern HAL_BOOL ar5210SetKeyCacheEntryMac(struct ath_hal *, uint16_t, const uint8_t *); -extern HAL_BOOL ar5210SetPowerMode(struct ath_hal *, uint32_t powerRequest, +extern HAL_BOOL ar5210SetPowerMode(struct ath_hal *, HAL_POWER_MODE mode, int setChip); extern HAL_POWER_MODE ar5210GetPowerMode(struct ath_hal *); Index: src/sys/external/isc/atheros_hal/dist/ar5211/ar5211.h diff -u src/sys/external/isc/atheros_hal/dist/ar5211/ar5211.h:1.1.1.1 src/sys/external/isc/atheros_hal/dist/ar5211/ar5211.h:1.2 --- src/sys/external/isc/atheros_hal/dist/ar5211/ar5211.h:1.1.1.1 Thu Dec 11 04:46:31 2008 +++ src/sys/external/isc/atheros_hal/dist/ar5211/ar5211.h Thu May 14 09:07:49 2009 @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5211.h,v 1.1.1.1 2008/12/11 04:46:31 alc Exp $ + * $Id: ar5211.h,v 1.2 2009/05/14 09:07:49 reinoud Exp $ */ #ifndef _ATH_AR5211_H_ #define _ATH_AR5211_H_ @@ -284,7 +284,7 @@ extern HAL_BOOL ar5211SetKeyCacheEntryMac(struct ath_hal *, uint16_t, const uint8_t *); -extern HAL_BOOL ar5211SetPowerMode(struct ath_hal *, uint32_t powerRequest, +extern HAL_BOOL ar5211SetPowerMode(struct ath_hal *, HAL_POWER_MODE mode, int setChip); extern HAL_POWER_MODE ar5211GetPowerMode(struct ath_hal *);
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: wiz Date: Thu May 14 09:42:09 UTC 2009 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3 Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3 diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.7 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.8 --- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.7 Thu May 14 03:59:54 2009 +++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3 Thu May 14 09:42:09 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: libnetpgp.3,v 1.7 2009/05/14 03:59:54 agc Exp $ +.\ $NetBSD: libnetpgp.3,v 1.8 2009/05/14 09:42:09 wiz Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -180,7 +180,7 @@ .Fn netpgp_verify_file function. .Pp -Internally, an encrypted or signed file +Internally, an encrypted or signed file is made up of .Dq packets which hold information pertaining to the signature,
CVS commit: src/etc/rc.d
Module Name:src
Committed By: roy
Date: Thu May 14 15:33:36 UTC 2009
Modified Files:
src/etc/rc.d: network
Log Message:
Only start dhcpcd per interface if not running the full dhcpcd daemon.
Only stop dhcpcd pre interface if it's running for the interface.
Fixes PR bin/4030
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/etc/rc.d/network
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/network
diff -u src/etc/rc.d/network:1.57 src/etc/rc.d/network:1.58
--- src/etc/rc.d/network:1.57 Sat Oct 11 17:28:03 2008
+++ src/etc/rc.d/network Thu May 14 15:33:36 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: network,v 1.57 2008/10/11 17:28:03 christos Exp $
+# $NetBSD: network,v 1.58 2009/05/14 15:33:36 roy Exp $
#
# PROVIDE: network
@@ -36,7 +36,9 @@
# DHCP later, as we will probably get the
# hostname at that time.
#
- if ! checkyesno dhclient [ -z $(hostname) ]; then
+ if ! checkyesno dhclient ! checkyesno dhcpcd \
+ [ -z $(hostname) ]
+ then
warn \$hostname not set.
fi
fi
@@ -266,7 +268,10 @@
( eval ${args#*!} )
;;
dhcp)
- /sbin/dhcpcd -n ${dhcpcd_flags} $int
+ if ! checkyesno dhcpcd; then
+ /sbin/dhcpcd -n \
+ ${dhcpcd_flags} $int
+ fi
;;
*)
# Pass args to ifconfig. Note
@@ -442,7 +447,9 @@
eval args=\$ifconfig_$int
if [ -n $args ] || [ -f /etc/ifconfig.$int ]; then
echo -n $int
-/sbin/dhcpcd -k $int 2 /dev/null
+if [ -f /var/run/dhcpcd-$int.pid ]; then
+ /sbin/dhcpcd -k $int 2 /dev/null
+fi
/sbin/ifconfig $int down
if /sbin/ifconfig $int destroy 2/dev/null \
checkyesno ipfilter; then
@@ -462,5 +469,6 @@
load_rc_config $name
load_rc_config_var dhclient dhclient
+load_rc_config_var dhcpcd dhcpcd
load_rc_config_var ipfilter ipfilter
run_rc_command $1
CVS commit: src/sys/netbt
Module Name:src
Committed By: plunky
Date: Thu May 14 15:34:38 UTC 2009
Modified Files:
src/sys/netbt: hci.h
Log Message:
add const to unchanged argument
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/netbt/hci.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/netbt/hci.h
diff -u src/sys/netbt/hci.h:1.28 src/sys/netbt/hci.h:1.29
--- src/sys/netbt/hci.h:1.28 Mon Sep 8 23:36:55 2008
+++ src/sys/netbt/hci.h Thu May 14 15:34:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hci.h,v 1.28 2008/09/08 23:36:55 gmcgarry Exp $ */
+/* $NetBSD: hci.h,v 1.29 2009/05/14 15:34:38 plunky Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -54,7 +54,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: hci.h,v 1.28 2008/09/08 23:36:55 gmcgarry Exp $
+ * $Id: hci.h,v 1.29 2009/05/14 15:34:38 plunky Exp $
* $FreeBSD: src/sys/netgraph/bluetooth/include/ng_hci.h,v 1.6 2005/01/07 01:45:43 imp Exp $
*/
@@ -2263,7 +2263,7 @@
}
static __inline int
-hci_filter_test(uint8_t bit, struct hci_filter *filter)
+hci_filter_test(uint8_t bit, const struct hci_filter *filter)
{
uint8_t off = bit - 1;
CVS commit: src/sys/nfs
Module Name:src
Committed By: yamt
Date: Thu May 14 15:42:22 UTC 2009
Modified Files:
src/sys/nfs: nfs_subs.c
Log Message:
nfs_clearcommit: fix a race with vnode cleaning.
To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/sys/nfs/nfs_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/sys/nfs/nfs_subs.c
diff -u src/sys/nfs/nfs_subs.c:1.216 src/sys/nfs/nfs_subs.c:1.217
--- src/sys/nfs/nfs_subs.c:1.216 Sun Mar 15 17:20:10 2009
+++ src/sys/nfs/nfs_subs.c Thu May 14 15:42:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_subs.c,v 1.216 2009/03/15 17:20:10 cegger Exp $ */
+/* $NetBSD: nfs_subs.c,v 1.217 2009/05/14 15:42:22 yamt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_subs.c,v 1.216 2009/03/15 17:20:10 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_subs.c,v 1.217 2009/05/14 15:42:22 yamt Exp $);
#ifdef _KERNEL_OPT
#include fs_nfs.h
@@ -2192,16 +2192,20 @@
KASSERT(vp-v_mount == mp);
if (vp-v_type != VREG)
continue;
+ mutex_enter(vp-v_interlock);
+ if (vp-v_iflag (VI_XLOCK | VI_CLEAN)) {
+ mutex_exit(vp-v_interlock);
+ continue;
+ }
np = VTONFS(vp);
np-n_pushlo = np-n_pushhi = np-n_pushedlo =
np-n_pushedhi = 0;
np-n_commitflags =
~(NFS_COMMIT_PUSH_VALID | NFS_COMMIT_PUSHED_VALID);
- mutex_enter(vp-v_uobj.vmobjlock);
TAILQ_FOREACH(pg, vp-v_uobj.memq, listq.queue) {
pg-flags = ~PG_NEEDCOMMIT;
}
- mutex_exit(vp-v_uobj.vmobjlock);
+ mutex_exit(vp-v_interlock);
}
mutex_exit(mntvnode_lock);
mutex_enter(nmp-nm_lock);
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: sborrill
Date: Thu May 14 16:23:38 UTC 2009
Modified Files:
src/distrib/utils/sysinst: bsddisklabel.c defs.h disks.c mbr.c mbr.h
msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl savenewlabel.c
src/distrib/utils/sysinst/arch/i386: md.c
Log Message:
Support drives over 1TB in size (i.e. stop errors like drive is -654343MB in
size).
Error if drive is over 2TB in size (and thus over the disklabel limit).
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/distrib/utils/sysinst/bsddisklabel.c
cvs rdiff -u -r1.142 -r1.143 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.104 -r1.105 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.79 -r1.80 src/distrib/utils/sysinst/mbr.c
cvs rdiff -u -r1.22 -r1.23 src/distrib/utils/sysinst/mbr.h
cvs rdiff -u -r1.48 -r1.49 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.154 -r1.155 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.25 -r1.26 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.105 -r1.106 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.64 -r1.65 src/distrib/utils/sysinst/msg.mi.pl
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/sysinst/savenewlabel.c
cvs rdiff -u -r1.121 -r1.122 src/distrib/utils/sysinst/arch/i386/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/bsddisklabel.c
diff -u src/distrib/utils/sysinst/bsddisklabel.c:1.51 src/distrib/utils/sysinst/bsddisklabel.c:1.52
--- src/distrib/utils/sysinst/bsddisklabel.c:1.51 Tue Apr 7 10:45:04 2009
+++ src/distrib/utils/sysinst/bsddisklabel.c Thu May 14 16:23:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.51 2009/04/07 10:45:04 tsutsui Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.52 2009/05/14 16:23:38 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -90,7 +90,7 @@
#endif
int
-save_ptn(int ptn, int start, int size, int fstype, const char *mountpt)
+save_ptn(int ptn, daddr_t start, daddr_t size, int fstype, const char *mountpt)
{
static int maxptn;
partinfo *p;
@@ -151,7 +151,7 @@
struct ptn_info *pi = arg;
struct ptn_size *p;
int sm = MEG / sectorsize;
- int size;
+ daddr_t size;
char inc_free[12];
p = pi-ptn_sizes[opt];
@@ -161,11 +161,11 @@
}
size = p-size;
if (p == pi-pool_part)
- snprintf(inc_free, sizeof inc_free, (%u),
+ snprintf(inc_free, sizeof inc_free, (% PRIi64 ),
(size + pi-free_space) / sm);
else
inc_free[0] = 0;
- wprintw(m-mw, %6u%8s%10u%10u %c %s,
+ wprintw(m-mw, %6 PRIi64 %8s%10 PRIi64 %10 PRIi64 %c %s,
size / sm, inc_free, size / dlcylsize, size,
p == pi-pool_part ? '+' : ' ', p-mount);
}
@@ -195,11 +195,11 @@
if (pi-free_space = 0)
snprintf(pi-exit_msg, sizeof pi-exit_msg,
msg_string(MSG_fssizesok),
- pi-free_space / sizemult, multname, pi-free_parts);
+ (int)(pi-free_space / sizemult), multname, pi-free_parts);
else
snprintf(pi-exit_msg, sizeof pi-exit_msg,
msg_string(MSG_fssizesbad),
- -pi-free_space / sizemult, multname, -pi-free_space);
+ (int)(-pi-free_space / sizemult), multname, (uint) -pi-free_space);
set_menu_numopts(pi-menu_no, m - pi-ptn_menus);
}
@@ -212,7 +212,7 @@
char answer[10];
char dflt[10];
char *cp;
- int size, old_size;
+ daddr_t size, old_size;
int mult;
p = pi-ptn_sizes + m-cursel;
@@ -233,7 +233,7 @@
if (size == 0)
size = p-dflt_size;
size /= sizemult;
- snprintf(dflt, sizeof dflt, %d%s,
+ snprintf(dflt, sizeof dflt, % PRIi64 %s,
size, p == pi-pool_part ? + : );
for (;;) {
@@ -342,13 +342,13 @@
}
void
-get_ptn_sizes(int part_start, int sectors, int no_swap)
+get_ptn_sizes(daddr_t part_start, daddr_t sectors, int no_swap)
{
int i;
int maxpart = getmaxpartitions();
int sm;/* sectors in 1MB */
struct ptn_size *p;
- int size;
+ daddr_t size;
static struct ptn_info pi = { -1, {
#define PI_ROOT 0
@@ -534,9 +534,9 @@
int i;
int part;
int maxpart = getmaxpartitions();
- int partstart;
+ daddr_t partstart;
int part_raw, part_bsd;
- int ptend;
+ daddr_t ptend;
int no_swap = 0, valid_part = -1;
partinfo *p;
@@ -554,7 +554,7 @@
/* Ask for layout type -- standard or special */
msg_display(MSG_layout,
- ptsize / (MEG / sectorsize),
+ (int) (ptsize / (MEG / sectorsize)),
DEFROOTSIZE + DEFSWAPSIZE + DEFUSRSIZE,
DEFROOTSIZE + DEFSWAPSIZE + DEFUSRSIZE + XNEEDMB);
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.142 src/distrib/utils/sysinst/defs.h:1.143
--- src/distrib/utils/sysinst/defs.h:1.142 Tue Apr 7 10:45:04 2009
+++ src/distrib/utils/sysinst/defs.h Thu May 14 16:23:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.142 2009/04/07 10:45:04 tsutsui Exp $ */
+/* $NetBSD: defs.h,v 1.143 2009/05/14 16:23:38 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -198,14 +198,14 @@
struct ptn_size {
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Thu May 14 16:26:00 UTC 2009 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8745 Log Message: Import dhcpcd-5.0.4 Changes from dhcpcd-5.0.3 include * ServerID requirement in DHCP messages can be toggled in dhcpcd.conf * If MTU is requested, don't apply if less than 576 * Enforce a minimum lease time of 20 seconds Status: Vendor Tag: roy Release Tags: dhcpcd-5-0-4 U src/external/bsd/dhcpcd/dist/README U src/external/bsd/dhcpcd/dist/arp.c U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/bind.c U src/external/bsd/dhcpcd/dist/bind.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/bpf.c U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/configure.c U src/external/bsd/dhcpcd/dist/configure.h U src/external/bsd/dhcpcd/dist/control.c U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if-pref.c U src/external/bsd/dhcpcd/dist/if-pref.h U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/net.c U src/external/bsd/dhcpcd/dist/net.h U src/external/bsd/dhcpcd/dist/signals.c U src/external/bsd/dhcpcd/dist/signals.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu 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 No conflicts created by this import
CVS commit: src/doc
Module Name:src Committed By: roy Date: Thu May 14 16:28:05 UTC 2009 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Import dhcpcd-5.0.4 To generate a diff of this commit: cvs rdiff -u -r1.694 -r1.695 src/doc/3RDPARTY cvs rdiff -u -r1.1229 -r1.1230 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.694 src/doc/3RDPARTY:1.695 --- src/doc/3RDPARTY:1.694 Mon May 11 10:10:13 2009 +++ src/doc/3RDPARTY Thu May 14 16:28:05 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.694 2009/05/11 10:10:13 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.695 2009/05/14 16:28:05 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -258,8 +258,8 @@ top of the current tree. Package: dhcpcd -Version: 5.0.3 -Current Vers: 5.0.3 +Version: 5.0.4 +Current Vers: 5.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.1229 src/doc/CHANGES:1.1230 --- src/doc/CHANGES:1.1229 Tue May 12 22:07:02 2009 +++ src/doc/CHANGES Thu May 14 16:28:05 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1229 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1230 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -274,3 +274,5 @@ bluetooth: Update the Bluetooth service discovery API and merge it into libbluetooth, retiring the separate libsdp. [plunky 20090512] + dhcpcd(8): Import dhcpcd-5.0.4 [roy 20090514] +
CVS commit: src/lib/libbluetooth
Module Name:src
Committed By: plunky
Date: Thu May 14 19:12:45 UTC 2009
Modified Files:
src/lib/libbluetooth: sdp_compat.c sdp_put.c sdp_service.c
sdp_session.c sdp_set.c
Log Message:
fix some signed vs unsigned comparison issues
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libbluetooth/sdp_compat.c \
src/lib/libbluetooth/sdp_put.c src/lib/libbluetooth/sdp_service.c \
src/lib/libbluetooth/sdp_session.c src/lib/libbluetooth/sdp_set.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/libbluetooth/sdp_compat.c
diff -u src/lib/libbluetooth/sdp_compat.c:1.1 src/lib/libbluetooth/sdp_compat.c:1.2
--- src/lib/libbluetooth/sdp_compat.c:1.1 Tue May 12 10:05:06 2009
+++ src/lib/libbluetooth/sdp_compat.c Thu May 14 19:12:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp_compat.c,v 1.1 2009/05/12 10:05:06 plunky Exp $ */
+/* $NetBSD: sdp_compat.c,v 1.2 2009/05/14 19:12:45 plunky Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -77,7 +77,7 @@
#define SDP_COMPAT
#include sys/cdefs.h
-__RCSID($NetBSD: sdp_compat.c,v 1.1 2009/05/12 10:05:06 plunky Exp $);
+__RCSID($NetBSD: sdp_compat.c,v 1.2 2009/05/14 19:12:45 plunky Exp $);
#include errno.h
#include sdp.h
@@ -170,7 +170,7 @@
struct sdp_compat *sc = xss;
sdp_data_t seq, ssp, ail, rsp, value;
uint16_t attr;
- int i;
+ size_t i;
bool rv;
if (sc == NULL)
@@ -224,7 +224,7 @@
while (vlen 0 sdp_get_attr(seq, attr, value)) {
vp-attr = attr;
if (vp-value != NULL) {
-if (value.end - value.next vp-vlen) {
+if (value.end - value.next (ssize_t)vp-vlen) {
vp-flags = SDP_ATTR_TRUNCATED;
} else {
vp-flags = SDP_ATTR_OK;
Index: src/lib/libbluetooth/sdp_put.c
diff -u src/lib/libbluetooth/sdp_put.c:1.1 src/lib/libbluetooth/sdp_put.c:1.2
--- src/lib/libbluetooth/sdp_put.c:1.1 Tue May 12 10:05:06 2009
+++ src/lib/libbluetooth/sdp_put.c Thu May 14 19:12:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp_put.c,v 1.1 2009/05/12 10:05:06 plunky Exp $ */
+/* $NetBSD: sdp_put.c,v 1.2 2009/05/14 19:12:45 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: sdp_put.c,v 1.1 2009/05/12 10:05:06 plunky Exp $);
+__RCSID($NetBSD: sdp_put.c,v 1.2 2009/05/14 19:12:45 plunky Exp $);
#include bluetooth.h
#include limits.h
@@ -300,17 +300,17 @@
len -= 2;
}
- if (len UINT32_MAX)
+ if ((size_t)len UINT32_MAX)
return false;
- if (len UINT16_MAX) {
+ if ((size_t)len UINT16_MAX) {
if (p + 5 + len data-end)
return false;
p[0] = type | SDP_DATA_EXT32;
be32enc(p + 1, (uint32_t)len);
p += 5;
- } else if (len UINT8_MAX) {
+ } else if ((size_t)len UINT8_MAX) {
if (p + 3 + len data-end)
return false;
Index: src/lib/libbluetooth/sdp_service.c
diff -u src/lib/libbluetooth/sdp_service.c:1.1 src/lib/libbluetooth/sdp_service.c:1.2
--- src/lib/libbluetooth/sdp_service.c:1.1 Tue May 12 10:05:06 2009
+++ src/lib/libbluetooth/sdp_service.c Thu May 14 19:12:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp_service.c,v 1.1 2009/05/12 10:05:06 plunky Exp $ */
+/* $NetBSD: sdp_service.c,v 1.2 2009/05/14 19:12:45 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: sdp_service.c,v 1.1 2009/05/12 10:05:06 plunky Exp $);
+__RCSID($NetBSD: sdp_service.c,v 1.2 2009/05/14 19:12:45 plunky Exp $);
#include errno.h
#include limits.h
@@ -236,7 +236,7 @@
/*
* setup AttributeIDList
*/
- len = (ail == NULL ? sizeof(ail_default) : (ail-end - ail-next));
+ len = (ail == NULL ? (ssize_t)sizeof(ail_default) : (ail-end - ail-next));
if (len 0 || len UINT16_MAX) {
errno = EINVAL;
return false;
@@ -320,7 +320,7 @@
if (ss-cs[0] == 0) {
rsp-next = rbuf;
rsp-end = rbuf + rlen;
- if (sdp_data_size(rsp) != rlen
+ if (sdp_data_size(rsp) != (ssize_t)rlen
|| !sdp_data_valid(rsp)
|| !sdp_get_seq(rsp, rsp))
break;
@@ -372,7 +372,7 @@
/*
* setup AttributeIDList
*/
- len = (ail == NULL ? sizeof(ail_default) : (ail-end - ail-next));
+ len = (ail == NULL ? (ssize_t)sizeof(ail_default) : (ail-end - ail-next));
if (len 0 || len UINT16_MAX) {
errno = EINVAL;
return false;
@@ -456,7 +456,7 @@
if (ss-cs[0] == 0) {
rsp-next = rbuf;
rsp-end = rbuf + rlen;
- if (sdp_data_size(rsp) != rlen
+ if (sdp_data_size(rsp) != (ssize_t)rlen
|| !sdp_data_valid(rsp)
|| !sdp_get_seq(rsp, rsp))
break;
Index: src/lib/libbluetooth/sdp_session.c
diff -u src/lib/libbluetooth/sdp_session.c:1.1 src/lib/libbluetooth/sdp_session.c:1.2
--- src/lib/libbluetooth/sdp_session.c:1.1 Tue May 12 10:05:06 2009
+++ src/lib/libbluetooth/sdp_session.c Thu May 14 19:12:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp_session.c,v 1.1 2009/05/12 10:05:06 plunky Exp $ */
+/* $NetBSD:
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: pgoyette
Date: Thu May 14 20:16:10 UTC 2009
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Add a few more processor extended models for Intel Family 6
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.18 src/usr.sbin/cpuctl/arch/i386.c:1.19
--- src/usr.sbin/cpuctl/arch/i386.c:1.18 Wed May 13 22:25:51 2009
+++ src/usr.sbin/cpuctl/arch/i386.c Thu May 14 20:16:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.18 2009/05/13 22:25:51 pgoyette Exp $ */
+/* $NetBSD: i386.c,v 1.19 2009/05/14 20:16:10 pgoyette Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: i386.c,v 1.18 2009/05/13 22:25:51 pgoyette Exp $);
+__RCSID($NetBSD: i386.c,v 1.19 2009/05/14 20:16:10 pgoyette Exp $);
#endif /* not lint */
#include sys/types.h
@@ -248,8 +248,8 @@
{ /* Extended models 1x */
0x01, { NULL, NULL,
NULL, NULL,
- NULL, NULL,
- NULL, NULL,
+ NULL, EP80579 Integrated Processor,
+ Celeron (45nm), Core 2 Extreme,
NULL, NULL,
Core i7 (Nehalem), NULL,
Atom, XeonMP (Nehalem),
CVS commit: src/share/man/man9
Module Name:src Committed By: jnemeth Date: Thu May 14 21:27:55 UTC 2009 Modified Files: src/share/man/man9: pmf.9 Log Message: mention PMFE_AUDIO_VOLUME_UP To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man9/pmf.9 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/man9/pmf.9 diff -u src/share/man/man9/pmf.9:1.9 src/share/man/man9/pmf.9:1.10 --- src/share/man/man9/pmf.9:1.9 Sun May 10 12:46:41 2009 +++ src/share/man/man9/pmf.9 Thu May 14 21:27:55 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: pmf.9,v 1.9 2009/05/10 12:46:41 wiz Exp $ +.\ $NetBSD: pmf.9,v 1.10 2009/05/14 21:27:55 jnemeth Exp $ .\ .\ Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca .\ All rights reserved. @@ -30,7 +30,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 10, 2009 +.Dd May 14, 2009 .Dt PMF 9 .Os .Sh NAME @@ -125,6 +125,8 @@ .It .Dv PMFE_DISPLAY_BRIGHTNESS_DOWN .It +.Dv PMFE_AUDIO_VOLUME_UP +.It .Dv PMFE_AUDIO_VOLUME_DOWN .It .Dv PMFE_AUDIO_VOLUME_TOGGLE
CVS commit: src/share/man/man9
Module Name:src Committed By: dyoung Date: Thu May 14 23:05:21 UTC 2009 Modified Files: src/share/man/man9: pmf.9 Log Message: Improve pmf_device_register(9) and pmf_device_register1(9) descriptions. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man9/pmf.9 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/man9/pmf.9 diff -u src/share/man/man9/pmf.9:1.10 src/share/man/man9/pmf.9:1.11 --- src/share/man/man9/pmf.9:1.10 Thu May 14 21:27:55 2009 +++ src/share/man/man9/pmf.9 Thu May 14 23:05:21 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: pmf.9,v 1.10 2009/05/14 21:27:55 jnemeth Exp $ +.\ $NetBSD: pmf.9,v 1.11 2009/05/14 23:05:21 dyoung Exp $ .\ .\ Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca .\ All rights reserved. @@ -140,6 +140,16 @@ .Bl -tag -width compact .It Fn pmf_device_register dev suspend resume Register a device with the power management framework. +.Fa suspend +and +.Fa resume +are passed +.Fa dev +and they return +.Dv true +on success and +.Dv false +on failure. If either .Fa suspend or @@ -153,7 +163,25 @@ .Dv false if there was an error. .It Fn pmf_device_register1 dev suspend resume shutdown -Like pmf_device_register, but additionally registers a shutdown handler. +Like +.Fn pmf_device_register , +but additionally registers a shutdown handler. +During system shutdown, +.Fn pmf_system_shutdown +calls +.Fa shutdown +on +.Fa dev +with the +.Xr reboot 2 +.Dq howto +in the second argument. +.Fa shutdown +should return +.Dv true +on success and +.Dv false +on failure. .It Fn pmf_device_deregister dev Deregister a device with the power management framework. .It Fn pmf_device_suspend dev
CVS commit: src/sys/sys
Module Name:src Committed By: yamt Date: Thu May 14 23:12:14 UTC 2009 Modified Files: src/sys/sys: proc.h Log Message: update a comment. To generate a diff of this commit: cvs rdiff -u -r1.288 -r1.289 src/sys/sys/proc.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/proc.h diff -u src/sys/sys/proc.h:1.288 src/sys/sys/proc.h:1.289 --- src/sys/sys/proc.h:1.288 Sat Apr 25 15:06:32 2009 +++ src/sys/sys/proc.h Thu May 14 23:12:14 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: proc.h,v 1.288 2009/04/25 15:06:32 rmind Exp $ */ +/* $NetBSD: proc.h,v 1.289 2009/05/14 23:12:14 yamt Exp $ */ /*- * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -230,7 +230,7 @@ p_specdataref; /*subsystem proc-specific data */ int p_exitsig; /* l: signal to send to parent on exit */ - int p_flag; /* p: P_* flags */ + int p_flag; /* p: PK_* flags */ int p_sflag; /* p: PS_* flags */ int p_slflag; /* s, l: PSL_* flags */ int p_lflag; /* l: PL_* flags */
CVS commit: src/share/man/man9
Module Name:src Committed By: dyoung Date: Thu May 14 23:14:33 UTC 2009 Modified Files: src/share/man/man9: powerhook_establish.9 shutdownhook_establish.9 Log Message: Mention that these are deprecated APIs. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man9/powerhook_establish.9 cvs rdiff -u -r1.8 -r1.9 src/share/man/man9/shutdownhook_establish.9 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/man9/powerhook_establish.9 diff -u src/share/man/man9/powerhook_establish.9:1.9 src/share/man/man9/powerhook_establish.9:1.10 --- src/share/man/man9/powerhook_establish.9:1.9 Wed Apr 30 13:10:58 2008 +++ src/share/man/man9/powerhook_establish.9 Thu May 14 23:14:33 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: powerhook_establish.9,v 1.9 2008/04/30 13:10:58 martin Exp $ +.\ $NetBSD: powerhook_establish.9,v 1.10 2009/05/14 23:14:33 dyoung Exp $ .\ .\ Copyright (c) 1999 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd September 24, 2006 +.Dd May 14, 2009 .Dt POWERHOOK_ESTABLISH 9 .Os .Sh NAME @@ -41,6 +41,10 @@ .Ft void .Fn powerhook_disestablish void *cookie .Sh DESCRIPTION +.Em The +.Em Xr powerhook_establish 9 +.Em API is deprecated. +.Pp The .Fn powerhook_establish function adds Index: src/share/man/man9/shutdownhook_establish.9 diff -u src/share/man/man9/shutdownhook_establish.9:1.8 src/share/man/man9/shutdownhook_establish.9:1.9 --- src/share/man/man9/shutdownhook_establish.9:1.8 Fri Feb 14 15:20:22 2003 +++ src/share/man/man9/shutdownhook_establish.9 Thu May 14 23:14:33 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: shutdownhook_establish.9,v 1.8 2003/02/14 15:20:22 grant Exp $ +.\ $NetBSD: shutdownhook_establish.9,v 1.9 2009/05/14 23:14:33 dyoung Exp $ .\ .\ Copyright (c) 1994 Christopher G. Demetriou .\ All rights reserved. @@ -32,7 +32,7 @@ .\ .\ Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp .\ -.Dd November 13, 1995 +.Dd May 14, 2009 .Dt SHUTDOWNHOOK_ESTABLISH 9 .Os .Sh NAME @@ -45,6 +45,10 @@ .Ft void .Fn shutdownhook_disestablish void *cookie .Sh DESCRIPTION +.Em The +.Em Xr shutdownhook_establish 9 +.Em API is deprecated. +.Pp The .Fn shutdownhook_establish function adds
CVS commit: src/lib/libc/time
Module Name:src
Committed By: jakllsch
Date: Fri May 15 02:23:42 UTC 2009
Modified Files:
src/lib/libc/time: Makefile.inc
Log Message:
Update MLINKS to match the flist.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/time/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/lib/libc/time/Makefile.inc
diff -u src/lib/libc/time/Makefile.inc:1.12 src/lib/libc/time/Makefile.inc:1.13
--- src/lib/libc/time/Makefile.inc:1.12 Thu May 14 02:37:36 2009
+++ src/lib/libc/time/Makefile.inc Fri May 15 02:23:42 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2009/05/14 02:37:36 ginsbach Exp $
+# $NetBSD: Makefile.inc,v 1.13 2009/05/15 02:23:42 jakllsch Exp $
.PATH: ${.CURDIR}/time
@@ -17,6 +17,7 @@
ctime.3 localtime.3 \
ctime.3 localtime_r.3 \
ctime.3 mktime.3 \
+ getdate.3 getdate_err.3 \
offtime.3 timeoff.3 \
offtime.3 timegm.3 \
offtime.3 timelocal.3 \
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: ginsbach Date: Fri May 15 02:34:07 UTC 2009 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/misc: mi Log Message: Update set list for getdate(3) additions. To generate a diff of this commit: cvs rdiff -u -r1.1260 -r1.1261 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.158 -r1.159 src/distrib/sets/lists/misc/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1260 src/distrib/sets/lists/comp/mi:1.1261 --- src/distrib/sets/lists/comp/mi:1.1260 Thu May 14 02:37:36 2009 +++ src/distrib/sets/lists/comp/mi Fri May 15 02:34:07 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1260 2009/05/14 02:37:36 ginsbach Exp $ +# $NetBSD: mi,v 1.1261 2009/05/15 02:34:07 ginsbach Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -10983,6 +10983,8 @@ ./usr/share/man/html3/getcurx.html comp-c-htmlman html ./usr/share/man/html3/getcury.html comp-c-htmlman html ./usr/share/man/html3/getcwd.html comp-c-htmlman html +./usr/share/man/html3/getdate.html comp-c-htmlman html +./usr/share/man/html3/getdate_err.html comp-c-htmlman html ./usr/share/man/html3/getdevmajor.html comp-c-htmlman html ./usr/share/man/html3/getdirentries.html comp-c-htmlman html ./usr/share/man/html3/getdiskbyname.html comp-c-htmlman html Index: src/distrib/sets/lists/misc/mi diff -u src/distrib/sets/lists/misc/mi:1.158 src/distrib/sets/lists/misc/mi:1.159 --- src/distrib/sets/lists/misc/mi:1.158 Thu Oct 30 21:37:55 2008 +++ src/distrib/sets/lists/misc/mi Fri May 15 02:34:07 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.158 2008/10/30 21:37:55 mrg Exp $ +# $NetBSD: mi,v 1.159 2009/05/15 02:34:07 ginsbach Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -659,6 +659,9 @@ ./usr/share/examples/fstab/fstab.wd0.cobalt misc-fstab-examples share ./usr/share/examples/ftpd/ftpd.conf misc-netutil-examples share ./usr/share/examples/ftpd/ftpusers misc-netutil-examples share +./usr/share/examples/getdate/datemsk.template misc-sys-examples share +./usr/share/examples/getdate/posixmsk.example3 misc-sys-examples share +./usr/share/examples/getdate/posixmsk.example4 misc-sys-examples share ./usr/share/examples/hostapd/hostapd.conf misc-netutil-examples share ./usr/share/examples/ipf/BASIC.NAT misc-ipf-examples ipfilter,share ./usr/share/examples/ipf/BASIC_1.FW misc-ipf-examples ipfilter,share
