CVS commit: src/lib/libnpf

2013-11-08 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Fri Nov  8 13:17:45 UTC 2013

Modified Files:
src/lib/libnpf: npf.3

Log Message:
Mark up NULL with Dv.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libnpf/npf.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libnpf/npf.3
diff -u src/lib/libnpf/npf.3:1.10 src/lib/libnpf/npf.3:1.11
--- src/lib/libnpf/npf.3:1.10	Fri Nov  8 00:38:27 2013
+++ src/lib/libnpf/npf.3	Fri Nov  8 13:17:45 2013
@@ -1,4 +1,4 @@
-.\	$NetBSD: npf.3,v 1.10 2013/11/08 00:38:27 rmind Exp $
+.\	$NetBSD: npf.3,v 1.11 2013/11/08 13:17:45 wiz Exp $
 .\
 .\ Copyright (c) 2011-2013 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -145,7 +145,8 @@ Rule may match only if outgoing packet.
 Interface is specified by
 .Fa ifname ,
 which is a string.
-NULL indicates any interface.
+.Dv NULL
+indicates any interface.
 .\ ---
 .It Fn npf_rule_setcode rl type code len
 Assign compiled code for the rule specified by



CVS commit: src/sys/fs/tmpfs

2013-11-08 Thread Mindaugas Rasiukevicius
Module Name:src
Committed By:   rmind
Date:   Fri Nov  8 15:44:23 UTC 2013

Modified Files:
src/sys/fs/tmpfs: tmpfs.h tmpfs_rename.c tmpfs_subr.c tmpfs_vfsops.c
tmpfs_vnops.c

Log Message:
tmpfs: replace the broken tmpfs_dircookie() logic which uses the node
address truncated to 31 bits (required for 32-bit readdir compatibility,
e.g. linux32).  Instead, assign 2^31 range using the following logic:
- The first half of the 2^31 is assigned incrementally (the fast path).
- When exceeded, use the second half of 2^31, but manage with vmem(9).

It will require 2 billion files per-directory to trigger vmem(9) usage.
Also, while here, add some fixes for tmpfs_unmount().

Should fix PR/47739, PR/47480, PR/46088 and PR/41068.
Thanks to wiz@ for stress testing.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/fs/tmpfs/tmpfs.h
cvs rdiff -u -r1.4 -r1.5 src/sys/fs/tmpfs/tmpfs_rename.c
cvs rdiff -u -r1.82 -r1.83 src/sys/fs/tmpfs/tmpfs_subr.c
cvs rdiff -u -r1.52 -r1.53 src/sys/fs/tmpfs/tmpfs_vfsops.c
cvs rdiff -u -r1.105 -r1.106 src/sys/fs/tmpfs/tmpfs_vnops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/fs/tmpfs/tmpfs.h
diff -u src/sys/fs/tmpfs/tmpfs.h:1.45 src/sys/fs/tmpfs/tmpfs.h:1.46
--- src/sys/fs/tmpfs/tmpfs.h:1.45	Tue Sep 27 01:10:43 2011
+++ src/sys/fs/tmpfs/tmpfs.h	Fri Nov  8 15:44:23 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: tmpfs.h,v 1.45 2011/09/27 01:10:43 christos Exp $	*/
+/*	$NetBSD: tmpfs.h,v 1.46 2013/11/08 15:44:23 rmind Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -54,6 +54,9 @@ typedef struct tmpfs_dirent {
 	/* Pointer to the inode this entry refers to. */
 	struct tmpfs_node *		td_node;
 
+	/* Sequence number, see tmpfs_dir_getseq(). */
+	uint32_t			td_seq;
+
 	/* Name and its length. */
 	char *td_name;
 	uint16_t			td_namelen;
@@ -61,47 +64,10 @@ typedef struct tmpfs_dirent {
 
 TAILQ_HEAD(tmpfs_dir, tmpfs_dirent);
 
-#if defined(_KERNEL)
-
-#define TMPFS_MAXNAMLEN	255
-/* Validate maximum td_namelen length. */
-CTASSERT(TMPFS_MAXNAMLEN  UINT16_MAX);
-
-#define	TMPFS_DIRCOOKIE_DOT	0
-#define	TMPFS_DIRCOOKIE_DOTDOT	1
-#define	TMPFS_DIRCOOKIE_EOF	2
-
-/*
- * Each entry in a directory has a cookie that identifies it.  Cookies
- * supersede offsets within directories, as tmpfs has no offsets as such.
- *
- * The '.', '..' and the end of directory markers have fixed cookies,
- * which cannot collide with the cookies generated by other entries.
- *
- * The cookies for the other entries are generated based on the memory
- * address of their representative meta-data structure.
- *
- * XXX: Truncating directory cookies to 31 bits now - workaround for
- * problem with Linux compat, see PR/32034.
- */
-static inline off_t
-tmpfs_dircookie(tmpfs_dirent_t *de)
-{
-	off_t cookie;
-
-	cookie = ((off_t)(uintptr_t)de  1)  0x7FFF;
-	KASSERT(cookie != TMPFS_DIRCOOKIE_DOT);
-	KASSERT(cookie != TMPFS_DIRCOOKIE_DOTDOT);
-	KASSERT(cookie != TMPFS_DIRCOOKIE_EOF);
-
-	return cookie;
-}
-#endif
-
 /*
  * Internal representation of a tmpfs file system node -- inode.
  *
- * This structure is splitted in two parts: one holds attributes common
+ * This structure is split in two parts: one holds attributes common
  * to all file types and the other holds data that is only applicable to
  * a particular type.
  *
@@ -169,11 +135,14 @@ typedef struct tmpfs_node {
 			/* List of directory entries. */
 			struct tmpfs_dir	tn_dir;
 
+			/* Last given sequence number and their arena. */
+			uint32_t		tn_next_seq;
+			void *			tn_seq_arena;
+
 			/*
-			 * Number and pointer of the last directory entry
-			 * returned by the readdir(3) operation.
+			 * Pointer of the last directory entry returned
+			 * by the readdir(3) operation.
 			 */
-			off_t			tn_readdir_lastn;
 			struct tmpfs_dirent *	tn_readdir_lastp;
 		} tn_dir;
 
@@ -196,6 +165,24 @@ typedef struct tmpfs_node {
 
 LIST_HEAD(tmpfs_node_list, tmpfs_node);
 
+#define	TMPFS_MAXNAMLEN		255
+/* Validate maximum td_namelen length. */
+CTASSERT(TMPFS_MAXNAMLEN  UINT16_MAX);
+
+/*
+ * Reserved values for the virtual entries (the first must be 0) and EOF.
+ * The start/end of the incremental range, see tmpfs_dir_getseq().
+ */
+#define	TMPFS_DIRSEQ_DOT	0
+#define	TMPFS_DIRSEQ_DOTDOT	1
+#define	TMPFS_DIRSEQ_EOF	2
+
+#define	TMPFS_DIRSEQ_START	3		/* inclusive */
+#define	TMPFS_DIRSEQ_END	(1U  30)	/* exclusive */
+
+/* Mark to indicate that the number is not set. */
+#define	TMPFS_DIRSEQ_NONE	(1U  31)
+
 /* Status flags. */
 #define	TMPFS_NODE_ACCESSED	0x01
 #define	TMPFS_NODE_MODIFIED	0x02
@@ -270,15 +257,14 @@ int		tmpfs_vnode_get(struct mount *, tmp
 int		tmpfs_alloc_dirent(tmpfs_mount_t *, const char *, uint16_t,
 		tmpfs_dirent_t **);
 void		tmpfs_free_dirent(tmpfs_mount_t *, tmpfs_dirent_t *);
-void		tmpfs_dir_attach(vnode_t *, tmpfs_dirent_t *, tmpfs_node_t *);
-void		

CVS commit: src/sys/arch/sparc64

2013-11-08 Thread Takeshi Nakayama
Module Name:src
Committed By:   nakayama
Date:   Fri Nov  8 15:44:26 UTC 2013

Modified Files:
src/sys/arch/sparc64/dev: psycho.c
src/sys/arch/sparc64/sparc64: cpu.c

Log Message:
machine_model is now declared in machine/autoconf.h.


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/sparc64/sparc64/cpu.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/sparc64/dev/psycho.c
diff -u src/sys/arch/sparc64/dev/psycho.c:1.116 src/sys/arch/sparc64/dev/psycho.c:1.117
--- src/sys/arch/sparc64/dev/psycho.c:1.116	Tue Sep 24 18:23:07 2013
+++ src/sys/arch/sparc64/dev/psycho.c	Fri Nov  8 15:44:26 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: psycho.c,v 1.116 2013/09/24 18:23:07 jdc Exp $	*/
+/*	$NetBSD: psycho.c,v 1.117 2013/11/08 15:44:26 nakayama Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: psycho.c,v 1.116 2013/09/24 18:23:07 jdc Exp $);
+__KERNEL_RCSID(0, $NetBSD: psycho.c,v 1.117 2013/11/08 15:44:26 nakayama Exp $);
 
 #include opt_ddb.h
 
@@ -303,7 +303,6 @@ psycho_attach(device_t parent, device_t 
 	int psycho_br[2], n, i;
 	bus_space_handle_t pci_ctl;
 	char *model = prom_getpropstring(ma-ma_node, model);
-	extern char machine_model[];
 
 	aprint_normal(\n);
 

Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.104 src/sys/arch/sparc64/sparc64/cpu.c:1.105
--- src/sys/arch/sparc64/sparc64/cpu.c:1.104	Tue Aug 20 19:19:23 2013
+++ src/sys/arch/sparc64/sparc64/cpu.c	Fri Nov  8 15:44:26 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.104 2013/08/20 19:19:23 macallan Exp $ */
+/*	$NetBSD: cpu.c,v 1.105 2013/11/08 15:44:26 nakayama Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -52,7 +52,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.104 2013/08/20 19:19:23 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.105 2013/11/08 15:44:26 nakayama Exp $);
 
 #include opt_multiprocessor.h
 
@@ -92,7 +92,6 @@ static struct cpu_info *alloc_cpuinfo(u_
 char	machine[] = MACHINE;		/* from machine/param.h */
 char	machine_arch[] = MACHINE_ARCH;	/* from machine/param.h */
 char	cpu_model[100];			/* machine model (primary CPU) */
-extern char machine_model[];
 
 /* These are used in locore.s, and are maximums */
 int	dcache_line_size;



CVS commit: src/sys/dev/usb

2013-11-08 Thread Roy Marples
Module Name:src
Committed By:   roy
Date:   Fri Nov  8 17:46:35 UTC 2013

Modified Files:
src/sys/dev/usb: if_axe.c if_axereg.h

Log Message:
Add GPIO programming to support more PHY.

Most of the work done by skrll@ taken from FreeBSD,
but finished and tested by me using an AX88178 axe and a RTL8211 PHY.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/if_axereg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.65 src/sys/dev/usb/if_axe.c:1.66
--- src/sys/dev/usb/if_axe.c:1.65	Thu Sep 12 21:03:11 2013
+++ src/sys/dev/usb/if_axe.c	Fri Nov  8 17:46:35 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_axe.c,v 1.65 2013/09/12 21:03:11 martin Exp $	*/
+/*	$NetBSD: if_axe.c,v 1.66 2013/11/08 17:46:35 roy Exp $	*/
 /*	$OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
 
 /*
@@ -89,7 +89,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.65 2013/09/12 21:03:11 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.66 2013/11/08 17:46:35 roy Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_inet.h
@@ -195,7 +195,9 @@ static int	axe_ioctl(struct ifnet *, u_l
 static int	axe_init(struct ifnet *);
 static void	axe_stop(struct ifnet *, int);
 static void	axe_watchdog(struct ifnet *);
+static int	axe_miibus_readreg_locked(device_t, int, int);
 static int	axe_miibus_readreg(device_t, int, int);
+static void	axe_miibus_writereg_locked(device_t, int, int, int);
 static void	axe_miibus_writereg(device_t, int, int, int);
 static void	axe_miibus_statchg(struct ifnet *);
 static int	axe_cmd(struct axe_softc *, int, int, int, void *);
@@ -258,65 +260,68 @@ axe_cmd(struct axe_softc *sc, int cmd, i
 }
 
 static int
-axe_miibus_readreg(device_t dev, int phy, int reg)
+axe_miibus_readreg_locked(device_t dev, int phy, int reg)
 {
 	struct axe_softc *sc = device_private(dev);
 	usbd_status err;
 	uint16_t val;
 
-	if (sc-axe_dying) {
-		DPRINTF((axe: dying\n));
-		return 0;
+	axe_cmd(sc, AXE_CMD_MII_OPMODE_SW, 0, 0, NULL);
+	err = axe_cmd(sc, AXE_CMD_MII_READ_REG, reg, phy, (void *)val);
+	axe_cmd(sc, AXE_CMD_MII_OPMODE_HW, 0, 0, NULL);
+	if (err) {
+		aprint_error_dev(sc-axe_dev, read PHY failed\n);
+		return -1;
 	}
 
-	/*
-	 * The chip tells us the MII address of any supported
-	 * PHYs attached to the chip, so only read from those.
-	 *
-	 * But if the chip lies about its PHYs, read from any.
-	 */
-	val = 0;
+	val = le16toh(val);
+	if (sc-axe_flags  AX772  reg == MII_BMSR) {
+		/*
+		 * BMSR of AX88772 indicates it supports extended
+		 * capability but the extended status register is
+		 * reserverd for embedded ethernet PHY. So clear the
+		 * extended capability bit of BMSR.
+		 */
+		 val = ~BMSR_EXTCAP;
+	}
 
-	if ((phy == sc-axe_phyaddrs[0]) || (phy == sc-axe_phyaddrs[1]) ||
-	(sc-axe_flags  AXE_ANY_PHY)) {
-		axe_lock_mii(sc);
-		axe_cmd(sc, AXE_CMD_MII_OPMODE_SW, 0, 0, NULL);
-		err = axe_cmd(sc, AXE_CMD_MII_READ_REG, reg, phy, (void *)val);
-		axe_cmd(sc, AXE_CMD_MII_OPMODE_HW, 0, 0, NULL);
-		axe_unlock_mii(sc);
+	DPRINTF((axe_miibus_readreg: phy 0x%x reg 0x%x val 0x%x\n,
+	phy, reg, val));
 
-		if (err) {
-			aprint_error_dev(sc-axe_dev, read PHY failed\n);
-			return -1;
-		}
-		DPRINTF((axe_miibus_readreg: phy 0x%x reg 0x%x val 0x%x\n,
-		phy, reg, val));
+	return val;
+}
 
-		if (val  val != 0x)
-			sc-axe_phyaddrs[0] = phy;
-	} else {
-		DPRINTF((axe_miibus_readreg: ignore read from phy 0x%x\n,
-		phy));
-	}
-	return le16toh(val);
+static int
+axe_miibus_readreg(device_t dev, int phy, int reg)
+{
+	struct axe_softc *sc = device_private(dev);
+	int val;
+
+	if (sc-axe_dying)
+		return 0;
+
+	if (sc-axe_phyno != phy)
+		return 0;
+
+	axe_lock_mii(sc);
+	val = axe_miibus_readreg_locked(dev, phy, reg);
+	axe_unlock_mii(sc);
+
+	return val;
 }
 
 static void
-axe_miibus_writereg(device_t dev, int phy, int reg, int aval)
+axe_miibus_writereg_locked(device_t dev, int phy, int reg, int aval)
 {
 	struct axe_softc *sc = device_private(dev);
 	usbd_status err;
 	uint16_t val;
 
-	if (sc-axe_dying)
-		return;
-
 	val = htole16(aval);
-	axe_lock_mii(sc);
+
 	axe_cmd(sc, AXE_CMD_MII_OPMODE_SW, 0, 0, NULL);
 	err = axe_cmd(sc, AXE_CMD_MII_WRITE_REG, reg, phy, (void *)val);
 	axe_cmd(sc, AXE_CMD_MII_OPMODE_HW, 0, 0, NULL);
-	axe_unlock_mii(sc);
 
 	if (err) {
 		aprint_error_dev(sc-axe_dev, write PHY failed\n);
@@ -325,6 +330,22 @@ axe_miibus_writereg(device_t dev, int ph
 }
 
 static void
+axe_miibus_writereg(device_t dev, int phy, int reg, int aval)
+{
+	struct axe_softc *sc = device_private(dev);
+
+	if (sc-axe_dying)
+		return;
+
+	if (sc-axe_phyno != phy)
+		return;
+
+	axe_lock_mii(sc);
+	axe_miibus_writereg_locked(dev, phy, reg, aval);
+	axe_unlock_mii(sc);
+}
+
+static void
 axe_miibus_statchg(struct ifnet *ifp)
 {
 	struct axe_softc *sc 

CVS import: src/crypto/external/bsd/openssh/dist

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Nov  8 17:58:13 UTC 2013

Update of /cvsroot/src/crypto/external/bsd/openssh/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv3804

Log Message:
Import new openssh to address

Changes since OpenSSH 6.3
=

This release fixes a security bug:

 * sshd(8): fix a memory corruption problem triggered during rekeying
   when an AES-GCM cipher is selected. Full details of the vulnerability
   are available at: http://www.openssh.com/txt/gcmrekey.adv

Checksums:
==

 - SHA1 (openssh-6.4.tar.gz) = 4caf1a50eb3a3da821c16298c4aaa576fe24210c
 - SHA1 (openssh-6.4p1.tar.gz) = cf5fe0eb118d7e4f9296fbc5d6884965885fc55d

Reporting Bugs:
===

- Please read http://www.openssh.com/report.html
  Security bugs should be reported directly to open...@openssh.com

OpenSSH is brought to you by Markus Friedl, Niels Provos, Theo de Raadt,
Kevin Steves, Damien Miller, Darren Tucker, Jason McIntyre, Tim Rice and
Ben Lindstrom.


Status:

Vendor Tag: OPENSSH
Release Tags:   v64-20131107

U src/crypto/external/bsd/openssh/dist/LICENCE
U src/crypto/external/bsd/openssh/dist/PROTOCOL.agent
U src/crypto/external/bsd/openssh/dist/OVERVIEW
U src/crypto/external/bsd/openssh/dist/PROTOCOL
C src/crypto/external/bsd/openssh/dist/cipher-3des1.c
U src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys
U src/crypto/external/bsd/openssh/dist/PROTOCOL.krl
U src/crypto/external/bsd/openssh/dist/PROTOCOL.mux
U src/crypto/external/bsd/openssh/dist/README
C src/crypto/external/bsd/openssh/dist/addrmatch.c
U src/crypto/external/bsd/openssh/dist/atomicio.c
U src/crypto/external/bsd/openssh/dist/atomicio.h
U src/crypto/external/bsd/openssh/dist/auth-bsdauth.c
C src/crypto/external/bsd/openssh/dist/auth-chall.c
C src/crypto/external/bsd/openssh/dist/auth-krb5.c
C src/crypto/external/bsd/openssh/dist/auth-options.c
U src/crypto/external/bsd/openssh/dist/auth-options.h
U src/crypto/external/bsd/openssh/dist/auth-passwd.c
C src/crypto/external/bsd/openssh/dist/canohost.c
U src/crypto/external/bsd/openssh/dist/auth-rh-rsa.c
U src/crypto/external/bsd/openssh/dist/auth-rhosts.c
C src/crypto/external/bsd/openssh/dist/auth-rsa.c
C src/crypto/external/bsd/openssh/dist/auth.c
C src/crypto/external/bsd/openssh/dist/auth.h
C src/crypto/external/bsd/openssh/dist/auth1.c
C src/crypto/external/bsd/openssh/dist/auth2-chall.c
C src/crypto/external/bsd/openssh/dist/auth2-gss.c
C src/crypto/external/bsd/openssh/dist/auth2-hostbased.c
C src/crypto/external/bsd/openssh/dist/auth2-jpake.c
C src/crypto/external/bsd/openssh/dist/auth2-kbdint.c
U src/crypto/external/bsd/openssh/dist/auth2-none.c
C src/crypto/external/bsd/openssh/dist/auth2-passwd.c
C src/crypto/external/bsd/openssh/dist/auth2-pubkey.c
C src/crypto/external/bsd/openssh/dist/auth2.c
C src/crypto/external/bsd/openssh/dist/authfd.c
U src/crypto/external/bsd/openssh/dist/authfd.h
C src/crypto/external/bsd/openssh/dist/authfile.c
U src/crypto/external/bsd/openssh/dist/authfile.h
C src/crypto/external/bsd/openssh/dist/bufaux.c
C src/crypto/external/bsd/openssh/dist/bufbn.c
C src/crypto/external/bsd/openssh/dist/bufec.c
C src/crypto/external/bsd/openssh/dist/buffer.c
C src/crypto/external/bsd/openssh/dist/buffer.h
U src/crypto/external/bsd/openssh/dist/crc32.c
U src/crypto/external/bsd/openssh/dist/canohost.h
C src/crypto/external/bsd/openssh/dist/channels.c
C src/crypto/external/bsd/openssh/dist/channels.h
C src/crypto/external/bsd/openssh/dist/groupaccess.c
U src/crypto/external/bsd/openssh/dist/cipher-bf1.c
C src/crypto/external/bsd/openssh/dist/cipher.c
C src/crypto/external/bsd/openssh/dist/cipher.h
U src/crypto/external/bsd/openssh/dist/cleanup.c
C src/crypto/external/bsd/openssh/dist/clientloop.c
C src/crypto/external/bsd/openssh/dist/clientloop.h
C src/crypto/external/bsd/openssh/dist/compat.c
U src/crypto/external/bsd/openssh/dist/compat.h
U src/crypto/external/bsd/openssh/dist/compress.c
U src/crypto/external/bsd/openssh/dist/compress.h
U src/crypto/external/bsd/openssh/dist/crc32.h
U src/crypto/external/bsd/openssh/dist/deattack.c
U src/crypto/external/bsd/openssh/dist/deattack.h
C src/crypto/external/bsd/openssh/dist/dh.c
U src/crypto/external/bsd/openssh/dist/dh.h
U src/crypto/external/bsd/openssh/dist/dispatch.c
U src/crypto/external/bsd/openssh/dist/dispatch.h
C src/crypto/external/bsd/openssh/dist/dns.c
U src/crypto/external/bsd/openssh/dist/dns.h
U src/crypto/external/bsd/openssh/dist/fatal.c
C src/crypto/external/bsd/openssh/dist/monitor.c
U src/crypto/external/bsd/openssh/dist/match.h
U src/crypto/external/bsd/openssh/dist/groupaccess.h
C src/crypto/external/bsd/openssh/dist/jpake.c
C src/crypto/external/bsd/openssh/dist/gss-genr.c
C src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c
C src/crypto/external/bsd/openssh/dist/gss-serv.c
C src/crypto/external/bsd/openssh/dist/hostfile.c
C src/crypto/external/bsd/openssh/dist/hostfile.h
U src/crypto/external/bsd/openssh/dist/jpake.h
C 

CVS commit: src/sys/arch/x86/x86

2013-11-08 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Fri Nov  8 19:05:52 UTC 2013

Modified Files:
src/sys/arch/x86/x86: est.c

Log Message:
space - tab


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x86/x86/est.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/x86/x86/est.c
diff -u src/sys/arch/x86/x86/est.c:1.26 src/sys/arch/x86/x86/est.c:1.27
--- src/sys/arch/x86/x86/est.c:1.26	Fri Nov  8 01:41:45 2013
+++ src/sys/arch/x86/x86/est.c	Fri Nov  8 19:05:52 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: est.c,v 1.26 2013/11/08 01:41:45 christos Exp $	*/
+/*	$NetBSD: est.c,v 1.27 2013/11/08 19:05:52 msaitoh Exp $	*/
 /*
  * Copyright (c) 2003 Michael Eriksson.
  * All rights reserved.
@@ -76,7 +76,7 @@
  *   http://www.codemonkey.org.uk/projects/cpufreq/cpufreq-2.4.22-pre6-1.gz
  */
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: est.c,v 1.26 2013/11/08 01:41:45 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: est.c,v 1.27 2013/11/08 19:05:52 msaitoh Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -534,11 +534,11 @@ static const uint16_t pm90_n725d[] = {
 
 /* Intel Pentium M processor 730 1.6 GHz, 533 MHz FSB */
 static const uint16_t pm90_n730[] = {
-   ID16(1600, 1308, BUS133),
-   ID16(1333, 1260, BUS133),
-   ID16(1200, 1212, BUS133),
-   ID16(1067, 1180, BUS133),
-   ID16( 800,  988, BUS133),
+	ID16(1600, 1308, BUS133),
+	ID16(1333, 1260, BUS133),
+	ID16(1200, 1212, BUS133),
+	ID16(1067, 1180, BUS133),
+	ID16( 800,  988, BUS133),
 };
 
 /* Intel Pentium M processor 735 1.7 GHz, VID #A */
@@ -583,10 +583,10 @@ static const uint16_t pm90_n735d[] = {
 
 /* Intel Pentium M processor 740 1.73 GHz, 533 MHz FSB */
 static const uint16_t pm90_n740[] = {
-   ID16(1733, 1356, BUS133),
-   ID16(1333, 1212, BUS133),
-   ID16(1067, 1100, BUS133),
-   ID16( 800,  988, BUS133),
+	ID16(1733, 1356, BUS133),
+	ID16(1333, 1212, BUS133),
+	ID16(1067, 1100, BUS133),
+	ID16( 800,  988, BUS133),
 };
 
 /* Intel Pentium M processor 745 1.8 GHz, VID #A */



CVS commit: src/doc

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Nov  8 19:22:19 UTC 2013

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new OpenSSH


To generate a diff of this commit:
cvs rdiff -u -r1.1061 -r1.1062 src/doc/3RDPARTY
cvs rdiff -u -r1.1859 -r1.1860 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.1061 src/doc/3RDPARTY:1.1062
--- src/doc/3RDPARTY:1.1061	Sun Oct 27 05:22:20 2013
+++ src/doc/3RDPARTY	Fri Nov  8 14:22:19 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1061 2013/10/27 09:22:20 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1062 2013/11/08 19:22:19 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -902,8 +902,8 @@ Notes:
 Patch applied after OpenSSH import.
 
 Package:	OpenSSH
-Version:	6.2
-Current Vers:	6.2 / portable 6.2p1
+Version:	6.4
+Current Vers:	6.4 / portable 6.4p1
 Maintainer:	OpenSSH
 Archive Site:	http://www.openssh.com/ftp.html
 Home Page:	http://www.openssh.com/portable.html

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1859 src/doc/CHANGES:1.1860
--- src/doc/CHANGES:1.1859	Sun Oct 27 12:18:30 2013
+++ src/doc/CHANGES	Fri Nov  8 14:22:19 2013
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1859 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1860 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -301,3 +301,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 		Ported from OpenBSD. [nonaka 20131026]
 	x68k: Support upto 1008 MB extended memory that is found on the XM6i
 		emulator. [tsutsui 20131027]
+	OpenSSH: Imported 6.4 [christos 20131108]



CVS commit: src/distrib/sets/lists

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Nov  8 19:21:01 UTC 2013

Modified Files:
src/distrib/sets/lists/base: ad.arm ad.mips md.amd64 md.sparc64 shl.mi
src/distrib/sets/lists/debug: ad.arm ad.mips md.amd64 md.sparc64 shl.mi

Log Message:
bump libssh


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.216 -r1.217 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.203 -r1.204 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.677 -r1.678 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/debug/ad.arm
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/debug/ad.mips
cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/debug/md.sparc64
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/debug/shl.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/base/ad.arm
diff -u src/distrib/sets/lists/base/ad.arm:1.26 src/distrib/sets/lists/base/ad.arm:1.27
--- src/distrib/sets/lists/base/ad.arm:1.26	Fri Nov  1 21:15:44 2013
+++ src/distrib/sets/lists/base/ad.arm	Fri Nov  8 14:21:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.26 2013/11/02 01:15:44 christos Exp $
+# $NetBSD: ad.arm,v 1.27 2013/11/08 19:21:01 christos Exp $
 ./lib/oabi	base-compat-shlib	compat
 ./lib/oabi/npf	base-npf-shlib		compat
 ./lib/oabi/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -299,8 +299,8 @@
 ./usr/lib/oabi/libsqlite3.so.1.1		base-compat-shlib	compat,pic
 ./usr/lib/oabi/libss.so.6			base-compat-shlib	obsolete
 ./usr/lib/oabi/libss.so.6.0			base-compat-shlib	obsolete
-./usr/lib/oabi/libssh.so.21			base-compat-shlib	compat,pic,crypto
-./usr/lib/oabi/libssh.so.21.0			base-compat-shlib	compat,pic,crypto
+./usr/lib/oabi/libssh.so.22			base-compat-shlib	compat,pic,crypto
+./usr/lib/oabi/libssh.so.22.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/oabi/libssl.so.10			base-compat-shlib	compat,pic,crypto
 ./usr/lib/oabi/libssl.so.10.1			base-compat-shlib	compat,pic,crypto
 ./usr/lib/oabi/libstdc++.so.7			base-compat-shlib	compat,pic,cxx,gcccmds,libstdcxx

Index: src/distrib/sets/lists/base/ad.mips
diff -u src/distrib/sets/lists/base/ad.mips:1.21 src/distrib/sets/lists/base/ad.mips:1.22
--- src/distrib/sets/lists/base/ad.mips:1.21	Fri Nov  1 21:15:44 2013
+++ src/distrib/sets/lists/base/ad.mips	Fri Nov  8 14:21:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.21 2013/11/02 01:15:44 christos Exp $
+# $NetBSD: ad.mips,v 1.22 2013/11/08 19:21:01 christos Exp $
 ./lib/64	base-compat-shlib	compat,arch64
 ./lib/64/npf	base-npf-shlib		compat,arch64
 ./lib/64/npf/ext_log.sobase-npf-shlib		compat,pic,arch64
@@ -295,8 +295,8 @@
 ./usr/lib/64/libsqlite3.so.1.1			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libss.so.6base-compat-shlib	obsolete,arch64
 ./usr/lib/64/libss.so.6.0			base-compat-shlib	obsolete,arch64
-./usr/lib/64/libssh.so.21			base-compat-shlib	compat,pic,crypto,arch64
-./usr/lib/64/libssh.so.21.0			base-compat-shlib	compat,pic,crypto,arch64
+./usr/lib/64/libssh.so.22			base-compat-shlib	compat,pic,crypto,arch64
+./usr/lib/64/libssh.so.22.0			base-compat-shlib	compat,pic,crypto,arch64
 ./usr/lib/64/libssl.so.10			base-compat-shlib	compat,pic,crypto,arch64
 ./usr/lib/64/libssl.so.10.1			base-compat-shlib	compat,pic,crypto,arch64
 ./usr/lib/64/libstdc++.so.7			base-compat-shlib	compat,pic,cxx,gcccmds,libstdcxx,arch64
@@ -626,8 +626,8 @@
 ./usr/lib/o32/libsqlite3.so.1.1			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libss.so.6			base-compat-shlib	obsolete,arch64
 ./usr/lib/o32/libss.so.6.0			base-compat-shlib	obsolete,arch64
-./usr/lib/o32/libssh.so.21			base-compat-shlib	compat,pic,crypto,arch64
-./usr/lib/o32/libssh.so.21.0			base-compat-shlib	compat,pic,crypto,arch64
+./usr/lib/o32/libssh.so.22			base-compat-shlib	compat,pic,crypto,arch64
+./usr/lib/o32/libssh.so.22.0			base-compat-shlib	compat,pic,crypto,arch64
 ./usr/lib/o32/libssl.so.10			base-compat-shlib	compat,pic,crypto,arch64
 ./usr/lib/o32/libssl.so.10.1			base-compat-shlib	compat,pic,crypto,arch64
 ./usr/lib/o32/libstdc++.so.7			base-compat-shlib	compat,pic,cxx,gcccmds,libstdcxx,arch64

Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.216 src/distrib/sets/lists/base/md.amd64:1.217
--- src/distrib/sets/lists/base/md.amd64:1.216	Fri Nov  1 21:15:44 2013
+++ src/distrib/sets/lists/base/md.amd64	Fri Nov  8 14:21:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.216 2013/11/02 01:15:44 christos Exp $
+# $NetBSD: md.amd64,v 1.217 2013/11/08 19:21:01 christos Exp $
 ./dev/lms0	base-obsolete		obsolete
 ./dev/mms0	base-obsolete		obsolete
 ./lib/i386	base-compat-shlib		compat
@@ -289,8 +289,8 @@
 ./usr/lib/i386/libsl.so.5.0			

CVS commit: src/external/bsd/libevent/lib/libevent

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov  9 00:26:06 UTC 2013

Modified Files:
src/external/bsd/libevent/lib/libevent: Makefile

Log Message:
another gcc workaround


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libevent/lib/libevent/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/libevent/lib/libevent/Makefile
diff -u src/external/bsd/libevent/lib/libevent/Makefile:1.1 src/external/bsd/libevent/lib/libevent/Makefile:1.2
--- src/external/bsd/libevent/lib/libevent/Makefile:1.1	Thu Apr 11 12:59:16 2013
+++ src/external/bsd/libevent/lib/libevent/Makefile	Fri Nov  8 19:26:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/11 16:59:16 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/11/09 00:26:06 christos Exp $
 
 USE_SHLIBDIR=yes
 .include bsd.own.mk
@@ -28,4 +28,10 @@ poll.c \
 select.c \
 signal.c
 
+.if defined(HAVE_GCC)  ${HAVE_GCC} == 48
+.if ${MACHINE_ARCH} == sh3el
+COPTS.evdns.c=	-O0
+.endif
+.endif
+
 .include bsd.lib.mk



CVS commit: src/doc

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov  9 00:29:47 UTC 2013

Modified Files:
src/doc: HACKS

Log Message:
another 4.8.1 hack; make more specific and add more info


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/doc/HACKS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.137 src/doc/HACKS:1.138
--- src/doc/HACKS:1.137	Thu Nov  7 16:33:59 2013
+++ src/doc/HACKS	Fri Nov  8 19:29:47 2013
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.137 2013/11/07 21:33:59 christos Exp $
+# $NetBSD: HACKS,v 1.138 2013/11/09 00:29:47 christos Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -586,11 +586,13 @@ port	sh3
 		-fno-loop-optimize.
 	kcah
 
+port	sh3eb
 	hack	gcc4.8.1
 	cdate	Thu Nov  7 16:31:23 EST 2013
 	who	christos
 	file	src/sys/rump/net/lib/libnetbt/Makefile	: 1.2
 	desrc
+		for profiling
 		compile l2cap_signal.c with -O0 to avoid:
 		./netbt/l2cap_signal.c:36:
 		/p/netbsd/cvsroot/src/sys/rump/net/lib/libnetbt/../../../../\
@@ -600,6 +602,19 @@ port	sh3
 		  __asm volatile (swap.b %1,%0 : =r(rval) : r(x));
 	kcah
 
+port	sh3el
+	hack	gcc4.8.1
+	cdate	Fri Nov  8 19:27:01 EST 2013
+	who	christos
+	file	src/external/bsd/libevent/lib/libevent/Makefile	: 1.2
+	desrc
+		for profiling
+		compile evdns.c with -O0 to avoid:
+		./sh3/byte_swap.h:20:2: error: 'asm' operand requires \
+		impossible reload
+		  __asm volatile (swap.b %1,%0 : =r(rval) : r(x));
+	kcah
+
 port	m68000
 
 	hack	gcc4-m68000



CVS commit: src/usr.sbin/racoon

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov  9 00:33:48 UTC 2013

Modified Files:
src/usr.sbin/racoon: Makefile

Log Message:
more sh3 hacks.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/racoon/Makefile

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/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.26 src/usr.sbin/racoon/Makefile:1.27
--- src/usr.sbin/racoon/Makefile:1.26	Thu Jun 20 11:42:58 2013
+++ src/usr.sbin/racoon/Makefile	Fri Nov  8 19:33:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2013/06/20 15:42:58 christos Exp $
+# $NetBSD: Makefile,v 1.27 2013/11/09 00:33:48 christos Exp $
 
 WARNS?=	0	# XXX third-party program, many issues
 NOCLANGERROR=	# defined
@@ -72,4 +72,9 @@ prsa_tok.c: ${DIST}/src/racoon/prsa_tok.
 prsa_par.c: ${DIST}/src/racoon/prsa_par.y
 	${YACC} -pprsa -d -o ${.TARGET} ${.ALLSRC}
 
+.if defined(HAVE_GCC)  ${HAVE_GCC} == 48
+.if ${MACHINE_ARCH} == sh3el
+COPTS.ipsec_doi.c=	-O0
+.endif
+.endif
 .include bsd.prog.mk



CVS commit: src/doc

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov  9 00:35:00 UTC 2013

Modified Files:
src/doc: HACKS

Log Message:
and another


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/doc/HACKS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.138 src/doc/HACKS:1.139
--- src/doc/HACKS:1.138	Fri Nov  8 19:29:47 2013
+++ src/doc/HACKS	Fri Nov  8 19:35:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.138 2013/11/09 00:29:47 christos Exp $
+# $NetBSD: HACKS,v 1.139 2013/11/09 00:35:00 christos Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -614,6 +614,18 @@ port	sh3el
 		impossible reload
 		  __asm volatile (swap.b %1,%0 : =r(rval) : r(x));
 	kcah
+	
+	hack	gcc4.8.1
+	cdate	Fri Nov  8 19:34:48 EST 2013
+	who	christos
+	file	src/usr.sbin/racoon/Makefile	: 1.27
+	desrc
+		for profiling
+		compile ipsec_doi.c with -O0 to avoid:
+		./sh3/byte_swap.h:20:2: error: 'asm' operand requires \
+		impossible reload
+		  __asm volatile (swap.b %1,%0 : =r(rval) : r(x));
+	kcah
 
 port	m68000
 



CVS commit: src/sys/arch/sh3/sh3

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov  9 02:23:57 UTC 2013

Modified Files:
src/sys/arch/sh3/sh3: db_trace.c

Log Message:
remove unused code


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sh3/sh3/db_trace.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/sh3/sh3/db_trace.c
diff -u src/sys/arch/sh3/sh3/db_trace.c:1.24 src/sys/arch/sh3/sh3/db_trace.c:1.25
--- src/sys/arch/sh3/sh3/db_trace.c:1.24	Tue Aug  6 17:41:01 2013
+++ src/sys/arch/sh3/sh3/db_trace.c	Fri Nov  8 21:23:57 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_trace.c,v 1.24 2013/08/06 21:41:01 uwe Exp $	*/
+/*	$NetBSD: db_trace.c,v 1.25 2013/11/09 02:23:57 christos Exp $	*/
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_trace.c,v 1.24 2013/08/06 21:41:01 uwe Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_trace.c,v 1.25 2013/11/09 02:23:57 christos Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -82,7 +82,6 @@ db_stack_trace_print(db_expr_t addr, boo
 	struct trapframe *tf;
 	db_addr_t callpc, frame, lastframe;
 	uint32_t vbr;
-	bool kernel_only = true;
 	bool lwpid = false;
 	bool lwpaddr = false;
 	const char *cp;
@@ -96,8 +95,6 @@ db_stack_trace_print(db_expr_t addr, boo
 			lwpaddr = true;
 		else if (c == 't')
 			lwpid = true;
-		else if (c == 'u')
-			kernel_only = false;
 	}
 
 	if (lwpaddr  lwpid) {



CVS commit: src/sys/dev/hpc/apm

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov  9 02:44:52 UTC 2013

Modified Files:
src/sys/dev/hpc/apm: apmdev.c

Log Message:
fixed unused variable warning


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/hpc/apm/apmdev.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/hpc/apm/apmdev.c
diff -u src/sys/dev/hpc/apm/apmdev.c:1.27 src/sys/dev/hpc/apm/apmdev.c:1.28
--- src/sys/dev/hpc/apm/apmdev.c:1.27	Wed Oct  3 19:55:22 2012
+++ src/sys/dev/hpc/apm/apmdev.c	Fri Nov  8 21:44:52 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: apmdev.c,v 1.27 2012/10/03 23:55:22 christos Exp $ */
+/*	$NetBSD: apmdev.c,v 1.28 2013/11/09 02:44:52 christos Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: apmdev.c,v 1.27 2012/10/03 23:55:22 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: apmdev.c,v 1.28 2013/11/09 02:44:52 christos Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_apm.h
@@ -461,6 +461,8 @@ apm_event_handle(struct apm_softc *sc, u
 		if (error == 0 
 		(sc-sc_flags  (SCFLAG_OREAD|SCFLAG_OWRITE)) == 0)
 			apm_power_print(sc, pi);
+#else
+		__USE(error);
 #endif
 		apm_record_event(sc, event_code);
 		break;



CVS commit: src/sys/arch/hpcsh/dev

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov  9 02:54:11 UTC 2013

Modified Files:
src/sys/arch/hpcsh/dev: psh3lcd.c
src/sys/arch/hpcsh/dev/hd64461: hd64461_machdep.c hd64461pcmcia.c

Log Message:
fix unused variable warnings


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcsh/dev/psh3lcd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.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/hpcsh/dev/psh3lcd.c
diff -u src/sys/arch/hpcsh/dev/psh3lcd.c:1.6 src/sys/arch/hpcsh/dev/psh3lcd.c:1.7
--- src/sys/arch/hpcsh/dev/psh3lcd.c:1.6	Sun Feb 12 11:34:08 2012
+++ src/sys/arch/hpcsh/dev/psh3lcd.c	Fri Nov  8 21:54:11 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: psh3lcd.c,v 1.6 2012/02/12 16:34:08 matt Exp $	*/
+/*	$NetBSD: psh3lcd.c,v 1.7 2013/11/09 02:54:11 christos Exp $	*/
 /*
  * Copyright (c) 2005 KIYOHARA Takashi
  * All rights reserved.
@@ -249,13 +249,13 @@ static void
 psh3lcd_attach(device_t parent __unused, device_t self, void *aux __unused)
 {
 	struct psh3lcd_softc *sc = device_private(self);
-	uint8_t bcr0, bcr1, bcr2;
+	uint8_t bcr0;
 
 	sc-sc_dev = self;
 
 	bcr0 = _reg_read_1(PSH3LCD_BRIGHTNESS_REG0);
-	bcr1 = _reg_read_1(PSH3LCD_BRIGHTNESS_REG1);
-	bcr2 = _reg_read_1(PSH3LCD_BRIGHTNESS_REG2);
+	(void)_reg_read_1(PSH3LCD_BRIGHTNESS_REG1);
+	(void)_reg_read_1(PSH3LCD_BRIGHTNESS_REG2);
 	if (bcr0 == 0) {
 		sc-sc_set_brightness = psh3lcd_xx0_set_brightness;
 		sc-sc_brightness = psh3lcd_xx0_bcd_get();

Index: src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c
diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c:1.6 src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c:1.7
--- src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c:1.6	Tue Jul 19 11:30:52 2011
+++ src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c	Fri Nov  8 21:54:11 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64461_machdep.c,v 1.6 2011/07/19 15:30:52 dyoung Exp $	*/
+/*	$NetBSD: hd64461_machdep.c,v 1.7 2013/11/09 02:54:11 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hd64461_machdep.c,v 1.6 2011/07/19 15:30:52 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: hd64461_machdep.c,v 1.7 2013/11/09 02:54:11 christos Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -74,10 +74,10 @@ do {	\
 	r = ~HD64461_PCCSCR_VCC1;	\
 	hd64461_reg_write_1(scr, r);	\
 } while (/*CONSTCOND*/0)
-	bus_addr_t isr, gcr, scr;
+	bus_addr_t gcr, scr;
 	uint8_t r;
 	
-	isr = HD64461_PCCISR(ch);
+	(void)HD64461_PCCISR(ch);
 	gcr = HD64461_PCCGCR(ch);
 	scr = HD64461_PCCSCR(ch);
 

Index: src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.50 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.51
--- src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.50	Sun Oct 13 02:55:34 2013
+++ src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c	Fri Nov  8 21:54:11 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64461pcmcia.c,v 1.50 2013/10/13 06:55:34 riz Exp $	*/
+/*	$NetBSD: hd64461pcmcia.c,v 1.51 2013/11/09 02:54:11 christos Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hd64461pcmcia.c,v 1.50 2013/10/13 06:55:34 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: hd64461pcmcia.c,v 1.51 2013/11/09 02:54:11 christos Exp $);
 
 #include opt_hd64461pcmcia.h
 
@@ -251,7 +251,7 @@ hd64461pcmcia_attach(device_t parent, de
 {
 	struct hd64461_attach_args *ha = aux;
 	struct hd64461pcmcia_softc *sc;
-	int error;
+	int error __diagused;
 
 	sc = device_private(self);
 	sc-sc_dev = self;
@@ -893,11 +893,11 @@ hd64461pcmcia_power_on(enum controller_c
 {
 	uint8_t r;
 	uint16_t r16;
-	bus_addr_t scr, gcr, isr;
+	bus_addr_t gcr, isr;
 
 	isr = HD64461_PCCISR(channel);
 	gcr = HD64461_PCCGCR(channel);
-	scr = HD64461_PCCSCR(channel);
+	(void)HD64461_PCCSCR(channel);
 
 	/*
 	 * XXX to access attribute memory, this is required.



CVS commit: src/sys/dev/usb

2013-11-08 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Nov  9 07:52:22 UTC 2013

Modified Files:
src/sys/dev/usb: usb.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/sys/dev/usb/usb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.147 src/sys/dev/usb/usb.c:1.148
--- src/sys/dev/usb/usb.c:1.147	Thu Nov  7 06:54:48 2013
+++ src/sys/dev/usb/usb.c	Sat Nov  9 07:52:22 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb.c,v 1.147 2013/11/07 06:54:48 skrll Exp $	*/
+/*	$NetBSD: usb.c,v 1.148 2013/11/09 07:52:22 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.147 2013/11/07 06:54:48 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.148 2013/11/09 07:52:22 skrll Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_compat_netbsd.h
@@ -327,7 +327,7 @@ usb_create_event_thread(device_t self)
 {
 	struct usb_softc *sc = device_private(self);
 
-	if (kthread_create(PRI_NONE, KTHREAD_MPSAFE , NULL,
+	if (kthread_create(PRI_NONE, KTHREAD_MPSAFE, NULL,
 	usb_event_thread, sc, sc-sc_event_thread,
 	%s, device_xname(self))) {
 		printf(%s: unable to create event thread for\n,



CVS commit: src/lib/libnpf

2013-11-08 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Fri Nov  8 13:17:45 UTC 2013

Modified Files:
src/lib/libnpf: npf.3

Log Message:
Mark up NULL with Dv.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libnpf/npf.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/sparc64

2013-11-08 Thread Takeshi Nakayama
Module Name:src
Committed By:   nakayama
Date:   Fri Nov  8 15:44:26 UTC 2013

Modified Files:
src/sys/arch/sparc64/dev: psycho.c
src/sys/arch/sparc64/sparc64: cpu.c

Log Message:
machine_model is now declared in machine/autoconf.h.


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/sparc64/sparc64/cpu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/fs/tmpfs

2013-11-08 Thread Mindaugas Rasiukevicius
Module Name:src
Committed By:   rmind
Date:   Fri Nov  8 15:44:23 UTC 2013

Modified Files:
src/sys/fs/tmpfs: tmpfs.h tmpfs_rename.c tmpfs_subr.c tmpfs_vfsops.c
tmpfs_vnops.c

Log Message:
tmpfs: replace the broken tmpfs_dircookie() logic which uses the node
address truncated to 31 bits (required for 32-bit readdir compatibility,
e.g. linux32).  Instead, assign 2^31 range using the following logic:
- The first half of the 2^31 is assigned incrementally (the fast path).
- When exceeded, use the second half of 2^31, but manage with vmem(9).

It will require 2 billion files per-directory to trigger vmem(9) usage.
Also, while here, add some fixes for tmpfs_unmount().

Should fix PR/47739, PR/47480, PR/46088 and PR/41068.
Thanks to wiz@ for stress testing.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/fs/tmpfs/tmpfs.h
cvs rdiff -u -r1.4 -r1.5 src/sys/fs/tmpfs/tmpfs_rename.c
cvs rdiff -u -r1.82 -r1.83 src/sys/fs/tmpfs/tmpfs_subr.c
cvs rdiff -u -r1.52 -r1.53 src/sys/fs/tmpfs/tmpfs_vfsops.c
cvs rdiff -u -r1.105 -r1.106 src/sys/fs/tmpfs/tmpfs_vnops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS import: src/crypto/external/bsd/openssh/dist

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Nov  8 17:58:13 UTC 2013

Update of /cvsroot/src/crypto/external/bsd/openssh/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv3804

Log Message:
Import new openssh to address

Changes since OpenSSH 6.3
=

This release fixes a security bug:

 * sshd(8): fix a memory corruption problem triggered during rekeying
   when an AES-GCM cipher is selected. Full details of the vulnerability
   are available at: http://www.openssh.com/txt/gcmrekey.adv

Checksums:
==

 - SHA1 (openssh-6.4.tar.gz) = 4caf1a50eb3a3da821c16298c4aaa576fe24210c
 - SHA1 (openssh-6.4p1.tar.gz) = cf5fe0eb118d7e4f9296fbc5d6884965885fc55d

Reporting Bugs:
===

- Please read http://www.openssh.com/report.html
  Security bugs should be reported directly to open...@openssh.com

OpenSSH is brought to you by Markus Friedl, Niels Provos, Theo de Raadt,
Kevin Steves, Damien Miller, Darren Tucker, Jason McIntyre, Tim Rice and
Ben Lindstrom.


Status:

Vendor Tag: OPENSSH
Release Tags:   v64-20131107

U src/crypto/external/bsd/openssh/dist/LICENCE
U src/crypto/external/bsd/openssh/dist/PROTOCOL.agent
U src/crypto/external/bsd/openssh/dist/OVERVIEW
U src/crypto/external/bsd/openssh/dist/PROTOCOL
C src/crypto/external/bsd/openssh/dist/cipher-3des1.c
U src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys
U src/crypto/external/bsd/openssh/dist/PROTOCOL.krl
U src/crypto/external/bsd/openssh/dist/PROTOCOL.mux
U src/crypto/external/bsd/openssh/dist/README
C src/crypto/external/bsd/openssh/dist/addrmatch.c
U src/crypto/external/bsd/openssh/dist/atomicio.c
U src/crypto/external/bsd/openssh/dist/atomicio.h
U src/crypto/external/bsd/openssh/dist/auth-bsdauth.c
C src/crypto/external/bsd/openssh/dist/auth-chall.c
C src/crypto/external/bsd/openssh/dist/auth-krb5.c
C src/crypto/external/bsd/openssh/dist/auth-options.c
U src/crypto/external/bsd/openssh/dist/auth-options.h
U src/crypto/external/bsd/openssh/dist/auth-passwd.c
C src/crypto/external/bsd/openssh/dist/canohost.c
U src/crypto/external/bsd/openssh/dist/auth-rh-rsa.c
U src/crypto/external/bsd/openssh/dist/auth-rhosts.c
C src/crypto/external/bsd/openssh/dist/auth-rsa.c
C src/crypto/external/bsd/openssh/dist/auth.c
C src/crypto/external/bsd/openssh/dist/auth.h
C src/crypto/external/bsd/openssh/dist/auth1.c
C src/crypto/external/bsd/openssh/dist/auth2-chall.c
C src/crypto/external/bsd/openssh/dist/auth2-gss.c
C src/crypto/external/bsd/openssh/dist/auth2-hostbased.c
C src/crypto/external/bsd/openssh/dist/auth2-jpake.c
C src/crypto/external/bsd/openssh/dist/auth2-kbdint.c
U src/crypto/external/bsd/openssh/dist/auth2-none.c
C src/crypto/external/bsd/openssh/dist/auth2-passwd.c
C src/crypto/external/bsd/openssh/dist/auth2-pubkey.c
C src/crypto/external/bsd/openssh/dist/auth2.c
C src/crypto/external/bsd/openssh/dist/authfd.c
U src/crypto/external/bsd/openssh/dist/authfd.h
C src/crypto/external/bsd/openssh/dist/authfile.c
U src/crypto/external/bsd/openssh/dist/authfile.h
C src/crypto/external/bsd/openssh/dist/bufaux.c
C src/crypto/external/bsd/openssh/dist/bufbn.c
C src/crypto/external/bsd/openssh/dist/bufec.c
C src/crypto/external/bsd/openssh/dist/buffer.c
C src/crypto/external/bsd/openssh/dist/buffer.h
U src/crypto/external/bsd/openssh/dist/crc32.c
U src/crypto/external/bsd/openssh/dist/canohost.h
C src/crypto/external/bsd/openssh/dist/channels.c
C src/crypto/external/bsd/openssh/dist/channels.h
C src/crypto/external/bsd/openssh/dist/groupaccess.c
U src/crypto/external/bsd/openssh/dist/cipher-bf1.c
C src/crypto/external/bsd/openssh/dist/cipher.c
C src/crypto/external/bsd/openssh/dist/cipher.h
U src/crypto/external/bsd/openssh/dist/cleanup.c
C src/crypto/external/bsd/openssh/dist/clientloop.c
C src/crypto/external/bsd/openssh/dist/clientloop.h
C src/crypto/external/bsd/openssh/dist/compat.c
U src/crypto/external/bsd/openssh/dist/compat.h
U src/crypto/external/bsd/openssh/dist/compress.c
U src/crypto/external/bsd/openssh/dist/compress.h
U src/crypto/external/bsd/openssh/dist/crc32.h
U src/crypto/external/bsd/openssh/dist/deattack.c
U src/crypto/external/bsd/openssh/dist/deattack.h
C src/crypto/external/bsd/openssh/dist/dh.c
U src/crypto/external/bsd/openssh/dist/dh.h
U src/crypto/external/bsd/openssh/dist/dispatch.c
U src/crypto/external/bsd/openssh/dist/dispatch.h
C src/crypto/external/bsd/openssh/dist/dns.c
U src/crypto/external/bsd/openssh/dist/dns.h
U src/crypto/external/bsd/openssh/dist/fatal.c
C src/crypto/external/bsd/openssh/dist/monitor.c
U src/crypto/external/bsd/openssh/dist/match.h
U src/crypto/external/bsd/openssh/dist/groupaccess.h
C src/crypto/external/bsd/openssh/dist/jpake.c
C src/crypto/external/bsd/openssh/dist/gss-genr.c
C src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c
C src/crypto/external/bsd/openssh/dist/gss-serv.c
C src/crypto/external/bsd/openssh/dist/hostfile.c
C src/crypto/external/bsd/openssh/dist/hostfile.h
U src/crypto/external/bsd/openssh/dist/jpake.h
C 

CVS commit: src/sys/arch/x86/x86

2013-11-08 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Fri Nov  8 19:05:52 UTC 2013

Modified Files:
src/sys/arch/x86/x86: est.c

Log Message:
space - tab


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x86/x86/est.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/crypto/external/bsd/openssh

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Nov  8 19:18:25 UTC 2013

Modified Files:
src/crypto/external/bsd/openssh/dist: addrmatch.c auth-chall.c
auth-krb5.c auth-options.c auth-pam.c auth-rsa.c auth.c auth.h
auth1.c auth2-chall.c auth2-gss.c auth2-hostbased.c auth2-jpake.c
auth2-kbdint.c auth2-krb5.c auth2-passwd.c auth2-pubkey.c auth2.c
authfd.c authfile.c bufaux.c bufbn.c bufec.c buffer.c buffer.h
canohost.c channels.c channels.h cipher-3des1.c cipher-ctr-mt.c
cipher.c cipher.h clientloop.c clientloop.h compat.c dh.c dns.c
fmt_scaled.c fmt_scaled.h groupaccess.c gss-genr.c gss-serv-krb5.c
gss-serv.c hostfile.c hostfile.h jpake.c kex.c kex.h kexdhc.c
kexdhs.c kexecdh.c kexecdhc.c kexecdhs.c kexgexc.c kexgexs.c key.c
key.h krl.c log.c log.h mac.c mac.h match.c misc.c misc.h moduli.c
monitor.c monitor_mm.c monitor_wrap.c mux.c namespace.h packet.c
packet.h pathnames.h progressmeter.c readconf.c readconf.h
readpass.c roaming_client.c roaming_common.c rsa.c schnorr.c scp.1
scp.c servconf.c servconf.h serverloop.c session.c sftp-client.c
sftp-client.h sftp-common.c sftp-glob.c sftp-server.8 sftp-server.c
sftp.1 sftp.c ssh-add.c ssh-agent.c ssh-dss.c ssh-ecdsa.c
ssh-keygen.1 ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8
ssh-keysign.c ssh-pkcs11-client.c ssh-pkcs11-helper.8
ssh-pkcs11-helper.c ssh-pkcs11.c ssh-rsa.c ssh.1 ssh.c ssh_config
ssh_config.5 sshconnect.c sshconnect1.c sshconnect2.c sshd.8 sshd.c
sshd_config sshd_config.5 umac.c umac.h uuencode.c version.h
xmalloc.c xmalloc.h
src/crypto/external/bsd/openssh/lib: Makefile shlib_version
Removed Files:
src/crypto/external/bsd/openssh/dist: cipher-ctr.c

Log Message:
merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/addrmatch.c \
src/crypto/external/bsd/openssh/dist/auth2-gss.c \
src/crypto/external/bsd/openssh/dist/auth2-jpake.c \
src/crypto/external/bsd/openssh/dist/authfd.c \
src/crypto/external/bsd/openssh/dist/canohost.c \
src/crypto/external/bsd/openssh/dist/compat.c \
src/crypto/external/bsd/openssh/dist/dh.c \
src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c \
src/crypto/external/bsd/openssh/dist/kexdhs.c \
src/crypto/external/bsd/openssh/dist/kexgexs.c \
src/crypto/external/bsd/openssh/dist/log.h \
src/crypto/external/bsd/openssh/dist/misc.h \
src/crypto/external/bsd/openssh/dist/moduli.c \
src/crypto/external/bsd/openssh/dist/schnorr.c \
src/crypto/external/bsd/openssh/dist/sftp-glob.c \
src/crypto/external/bsd/openssh/dist/ssh-keysign.c \
src/crypto/external/bsd/openssh/dist/ssh_config
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/auth-chall.c \
src/crypto/external/bsd/openssh/dist/auth-pam.c \
src/crypto/external/bsd/openssh/dist/buffer.c \
src/crypto/external/bsd/openssh/dist/cipher-ctr-mt.c \
src/crypto/external/bsd/openssh/dist/kexdhc.c \
src/crypto/external/bsd/openssh/dist/kexgexc.c \
src/crypto/external/bsd/openssh/dist/monitor_mm.c \
src/crypto/external/bsd/openssh/dist/readpass.c \
src/crypto/external/bsd/openssh/dist/ssh-ecdsa.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8 \
src/crypto/external/bsd/openssh/dist/sshconnect1.c \
src/crypto/external/bsd/openssh/dist/umac.c \
src/crypto/external/bsd/openssh/dist/umac.h
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/auth-krb5.c \
src/crypto/external/bsd/openssh/dist/auth2-chall.c \
src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \
src/crypto/external/bsd/openssh/dist/bufaux.c \
src/crypto/external/bsd/openssh/dist/buffer.h \
src/crypto/external/bsd/openssh/dist/cipher-3des1.c \
src/crypto/external/bsd/openssh/dist/cipher.c \
src/crypto/external/bsd/openssh/dist/cipher.h \
src/crypto/external/bsd/openssh/dist/gss-genr.c \
src/crypto/external/bsd/openssh/dist/gss-serv.c \
src/crypto/external/bsd/openssh/dist/hostfile.c \
src/crypto/external/bsd/openssh/dist/hostfile.h \
src/crypto/external/bsd/openssh/dist/progressmeter.c \
src/crypto/external/bsd/openssh/dist/roaming_client.c \
src/crypto/external/bsd/openssh/dist/sftp-client.h \
src/crypto/external/bsd/openssh/dist/sftp-common.c \
src/crypto/external/bsd/openssh/dist/ssh-dss.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c \
src/crypto/external/bsd/openssh/dist/ssh-rsa.c \
src/crypto/external/bsd/openssh/dist/uuencode.c
cvs rdiff -u -r1.6 -r1.7 

CVS commit: src/distrib/sets/lists

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Nov  8 19:21:01 UTC 2013

Modified Files:
src/distrib/sets/lists/base: ad.arm ad.mips md.amd64 md.sparc64 shl.mi
src/distrib/sets/lists/debug: ad.arm ad.mips md.amd64 md.sparc64 shl.mi

Log Message:
bump libssh


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.216 -r1.217 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.203 -r1.204 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.677 -r1.678 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/debug/ad.arm
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/debug/ad.mips
cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/debug/md.sparc64
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/debug/shl.mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/doc

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Nov  8 19:22:19 UTC 2013

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new OpenSSH


To generate a diff of this commit:
cvs rdiff -u -r1.1061 -r1.1062 src/doc/3RDPARTY
cvs rdiff -u -r1.1859 -r1.1860 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/common/lib/libc/arch/arm/atomic

2013-11-08 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Fri Nov  8 22:42:52 UTC 2013

Modified Files:
src/common/lib/libc/arch/arm/atomic: Makefile.inc atomic_add_32.S
atomic_add_64.S atomic_and_32.S atomic_and_64.S atomic_cas_32.S
atomic_cas_64.S atomic_cas_8.S atomic_inc_32.S atomic_op_asm.h
atomic_or_32.S atomic_or_64.S atomic_swap.S atomic_swap_64.S
membar_ops.S
Added Files:
src/common/lib/libc/arch/arm/atomic: atomic_add_16.S atomic_add_8.S
atomic_and_16.S atomic_and_8.S atomic_cas_16.S atomic_nand_16.S
atomic_nand_32.S atomic_nand_64.S atomic_nand_8.S atomic_or_16.S
atomic_or_8.S atomic_sub_64.S atomic_swap_16.S atomic_xor_16.S
atomic_xor_32.S atomic_xor_64.S atomic_xor_8.S
sync_bool_compare_and_swap_1.S sync_bool_compare_and_swap_2.S
sync_bool_compare_and_swap_4.S sync_bool_compare_and_swap_8.S
sync_fetch_and_add_8.S sync_fetch_and_and_8.S
sync_fetch_and_nand_8.S sync_fetch_and_or_8.S
sync_fetch_and_sub_8.S sync_fetch_and_xor_8.S

Log Message:
Add support for the gcc __sync builtins.
Note that these need earmv6 or later to get the ldrex/strex instructions


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/common/lib/libc/arch/arm/atomic/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/common/lib/libc/arch/arm/atomic/atomic_add_16.S \
src/common/lib/libc/arch/arm/atomic/atomic_add_8.S \
src/common/lib/libc/arch/arm/atomic/atomic_and_16.S \
src/common/lib/libc/arch/arm/atomic/atomic_and_8.S \
src/common/lib/libc/arch/arm/atomic/atomic_cas_16.S \
src/common/lib/libc/arch/arm/atomic/atomic_nand_16.S \
src/common/lib/libc/arch/arm/atomic/atomic_nand_32.S \
src/common/lib/libc/arch/arm/atomic/atomic_nand_64.S \
src/common/lib/libc/arch/arm/atomic/atomic_nand_8.S \
src/common/lib/libc/arch/arm/atomic/atomic_or_16.S \
src/common/lib/libc/arch/arm/atomic/atomic_or_8.S \
src/common/lib/libc/arch/arm/atomic/atomic_sub_64.S \
src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S \
src/common/lib/libc/arch/arm/atomic/atomic_xor_16.S \
src/common/lib/libc/arch/arm/atomic/atomic_xor_32.S \
src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S \
src/common/lib/libc/arch/arm/atomic/atomic_xor_8.S \
src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S \
src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S \
src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S \
src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S
cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/arch/arm/atomic/atomic_add_32.S \
src/common/lib/libc/arch/arm/atomic/atomic_and_32.S \
src/common/lib/libc/arch/arm/atomic/atomic_cas_32.S \
src/common/lib/libc/arch/arm/atomic/atomic_cas_8.S \
src/common/lib/libc/arch/arm/atomic/atomic_or_32.S \
src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/arm/atomic/atomic_add_64.S
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/arm/atomic/atomic_and_64.S \
src/common/lib/libc/arch/arm/atomic/atomic_or_64.S \
src/common/lib/libc/arch/arm/atomic/atomic_swap.S
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S \
src/common/lib/libc/arch/arm/atomic/atomic_op_asm.h \
src/common/lib/libc/arch/arm/atomic/membar_ops.S
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/atomic/atomic_inc_32.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/libevent/lib/libevent

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov  9 00:26:06 UTC 2013

Modified Files:
src/external/bsd/libevent/lib/libevent: Makefile

Log Message:
another gcc workaround


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libevent/lib/libevent/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/doc

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov  9 00:29:47 UTC 2013

Modified Files:
src/doc: HACKS

Log Message:
another 4.8.1 hack; make more specific and add more info


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/doc/HACKS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/usr.sbin/racoon

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov  9 00:33:48 UTC 2013

Modified Files:
src/usr.sbin/racoon: Makefile

Log Message:
more sh3 hacks.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/racoon/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/doc

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov  9 00:35:00 UTC 2013

Modified Files:
src/doc: HACKS

Log Message:
and another


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/doc/HACKS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/hpc/apm

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov  9 02:44:52 UTC 2013

Modified Files:
src/sys/dev/hpc/apm: apmdev.c

Log Message:
fixed unused variable warning


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/hpc/apm/apmdev.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/hpcsh/dev

2013-11-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov  9 02:54:11 UTC 2013

Modified Files:
src/sys/arch/hpcsh/dev: psh3lcd.c
src/sys/arch/hpcsh/dev/hd64461: hd64461_machdep.c hd64461pcmcia.c

Log Message:
fix unused variable warnings


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcsh/dev/psh3lcd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/usb

2013-11-08 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Nov  9 07:52:22 UTC 2013

Modified Files:
src/sys/dev/usb: usb.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/sys/dev/usb/usb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.