CVS commit: [netbsd-7] src/sys/dev/usb

2015-02-09 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Feb  9 09:43:10 UTC 2015

Modified Files:
src/sys/dev/usb [netbsd-7]: hid.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #500):
sys/dev/usb/hid.c: revision 1.36
From FreeBSD via OpenBSD:
Global Item #3 should be Physical Minimum not Maximum according to the
HID spec.


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

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



CVS commit: [netbsd-7] src/sys/dev/usb

2015-02-09 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Feb  9 09:43:10 UTC 2015

Modified Files:
src/sys/dev/usb [netbsd-7]: hid.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #500):
sys/dev/usb/hid.c: revision 1.36
From FreeBSD via OpenBSD:
Global Item #3 should be Physical Minimum not Maximum according to the
HID spec.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.14.1 src/sys/dev/usb/hid.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/hid.c
diff -u src/sys/dev/usb/hid.c:1.35 src/sys/dev/usb/hid.c:1.35.14.1
--- src/sys/dev/usb/hid.c:1.35	Fri Feb 24 06:48:23 2012
+++ src/sys/dev/usb/hid.c	Mon Feb  9 09:43:09 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: hid.c,v 1.35 2012/02/24 06:48:23 mrg Exp $	*/
+/*	$NetBSD: hid.c,v 1.35.14.1 2015/02/09 09:43:09 martin Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hid.c,v 1.35 2012/02/24 06:48:23 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: hid.c,v 1.35.14.1 2015/02/09 09:43:09 martin Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -267,7 +267,7 @@ hid_get_item(struct hid_data *s, struct 
 c-logical_maximum = dval;
 break;
 			case 3:
-c-physical_maximum = dval;
+c-physical_minimum = dval;
 break;
 			case 4:
 c-physical_maximum = dval;



CVS commit: [netbsd-7] src/sys/kern

2015-02-09 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Feb  9 09:46:01 UTC 2015

Modified Files:
src/sys/kern [netbsd-7]: uipc_mbuf.c

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #501):
sys/kern/uipc_mbuf.c: revision 1.161
Correct m_len calculation for m_dup() with mbuf clusters.
Fixes kern/49650.


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.158.4.1 src/sys/kern/uipc_mbuf.c

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

Modified files:

Index: src/sys/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.158 src/sys/kern/uipc_mbuf.c:1.158.4.1
--- src/sys/kern/uipc_mbuf.c:1.158	Tue Feb 25 18:30:11 2014
+++ src/sys/kern/uipc_mbuf.c	Mon Feb  9 09:46:01 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_mbuf.c,v 1.158 2014/02/25 18:30:11 pooka Exp $	*/
+/*	$NetBSD: uipc_mbuf.c,v 1.158.4.1 2015/02/09 09:46:01 martin Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_mbuf.c,v 1.158 2014/02/25 18:30:11 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_mbuf.c,v 1.158.4.1 2015/02/09 09:46:01 martin Exp $);
 
 #include opt_mbuftrace.h
 #include opt_nmbclusters.h
@@ -777,8 +777,13 @@ m_copym0(struct mbuf *m, int off0, int l
 /*
  * we are unsure about the way m was allocated.
  * copy into multiple MCLBYTES cluster mbufs.
+ *
+ * recompute m_len, it is no longer valid if MCLGET()
+ * fails to allocate a cluster. Then we try to split
+ * the source into normal sized mbufs.
  */
 MCLGET(n, wait);
+n-m_len = 0;
 n-m_len = M_TRAILINGSPACE(n);
 n-m_len = m_copylen(len, n-m_len);
 n-m_len = min(n-m_len, m-m_len - off);



CVS commit: [netbsd-7] src/sys/kern

2015-02-09 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Feb  9 09:46:01 UTC 2015

Modified Files:
src/sys/kern [netbsd-7]: uipc_mbuf.c

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #501):
sys/kern/uipc_mbuf.c: revision 1.161
Correct m_len calculation for m_dup() with mbuf clusters.
Fixes kern/49650.


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.158.4.1 src/sys/kern/uipc_mbuf.c

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



CVS commit: [netbsd-7] src/doc

2015-02-09 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Feb  9 09:46:45 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.0

Log Message:
Tickets #500 and #501


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.198 -r1.1.2.199 src/doc/CHANGES-7.0

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

Modified files:

Index: src/doc/CHANGES-7.0
diff -u src/doc/CHANGES-7.0:1.1.2.198 src/doc/CHANGES-7.0:1.1.2.199
--- src/doc/CHANGES-7.0:1.1.2.198	Mon Feb  9 00:27:28 2015
+++ src/doc/CHANGES-7.0	Mon Feb  9 09:46:45 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.198 2015/02/09 00:27:28 snj Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.199 2015/02/09 09:46:45 martin Exp $
 
 A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
 until the 7.0 release:
@@ -15735,3 +15735,15 @@ share/mk/bsd.own.mkpatch
 	Switch powerpc64 and m68k to gcc 4.8.
 	[chs, ticket #499]
 
+sys/dev/usb/hid.c1.36
+
+	Global Item #3 should be Physical Minimum not Maximum according to
+	the HID spec.
+	[jmcneill, ticket #500]
+
+
+sys/kern/uipc_mbuf.c1.161
+
+	Correct m_len calculation for m_dup() with mbuf clusters.
+	[mlelstv, ticket #501]
+



CVS commit: [netbsd-7] src/doc

2015-02-09 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Feb  9 09:46:45 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.0

Log Message:
Tickets #500 and #501


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.198 -r1.1.2.199 src/doc/CHANGES-7.0

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



CVS commit: src

2015-02-09 Thread Ryo ONODERA
Module Name:src
Committed By:   ryoon
Date:   Mon Feb  9 16:27:30 UTC 2015

Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/freetype: Makefile freetype2.pc.in
src/external/mit/xorg/lib/freetype/freetype: Makefile

Log Message:
In recent freetype2 installation, ft2build.h should be located
under include/freetype2.

This change should fix non pkg-config build that uses freetype2,
for example, pkgsrc/lang/openjdk8.

netbsd-7 has also this problem.


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/freetype/freetype2.pc.in
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/lib/freetype/freetype/Makefile

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



CVS commit: src/external/mit/lua

2015-02-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Feb  9 16:44:53 UTC 2015

Modified Files:
src/external/mit/lua: Makefile

Log Message:
Packages always build lib first even if it is built as part of the first
pass in the library builds. If we want to change this, we should change it
everywhere.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/lua/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/mit/lua/Makefile
diff -u src/external/mit/lua/Makefile:1.3 src/external/mit/lua/Makefile:1.4
--- src/external/mit/lua/Makefile:1.3	Sun Oct 31 07:26:01 2010
+++ src/external/mit/lua/Makefile	Mon Feb  9 11:44:53 2015
@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.3 2010/10/31 11:26:01 mbalmer Exp $
+#	$NetBSD: Makefile,v 1.4 2015/02/09 16:44:53 christos Exp $
 
-SUBDIR+=	usr.bin
+SUBDIR+=	lib .WAIT usr.bin
 
 .include bsd.subdir.mk



CVS commit: src/external/mit/lua

2015-02-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Feb  9 16:44:53 UTC 2015

Modified Files:
src/external/mit/lua: Makefile

Log Message:
Packages always build lib first even if it is built as part of the first
pass in the library builds. If we want to change this, we should change it
everywhere.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/lua/Makefile

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



CVS commit: src

2015-02-09 Thread Ryo ONODERA
Module Name:src
Committed By:   ryoon
Date:   Mon Feb  9 16:27:30 UTC 2015

Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/freetype: Makefile freetype2.pc.in
src/external/mit/xorg/lib/freetype/freetype: Makefile

Log Message:
In recent freetype2 installation, ft2build.h should be located
under include/freetype2.

This change should fix non pkg-config build that uses freetype2,
for example, pkgsrc/lang/openjdk8.

netbsd-7 has also this problem.


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/freetype/freetype2.pc.in
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/lib/freetype/freetype/Makefile

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/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.155 src/distrib/sets/lists/xcomp/mi:1.156
--- src/distrib/sets/lists/xcomp/mi:1.155	Sat Jan 31 17:14:23 2015
+++ src/distrib/sets/lists/xcomp/mi	Mon Feb  9 16:27:29 2015
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.155 2015/01/31 17:14:23 roy Exp $
+#	 $NetBSD: mi,v 1.156 2015/02/09 16:27:29 ryoon Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -5745,6 +5745,7 @@
 ./usr/X11R7/include/freetype2/freetype/tttables.h	-unknown-	obsolete
 ./usr/X11R7/include/freetype2/freetype/tttags.h		-unknown-	obsolete
 ./usr/X11R7/include/freetype2/freetype/ttunpat.h	-unknown-	obsolete
+./usr/X11R7/include/freetype2/ft2build.h		-unknown-	xorg
 ./usr/X11R7/include/freetype2/ftadvanc.h		-unknown-	xorg
 ./usr/X11R7/include/freetype2/ftautoh.h			-unknown-	xorg
 ./usr/X11R7/include/freetype2/ftbbox.h			-unknown-	xorg
@@ -5788,7 +5789,7 @@
 ./usr/X11R7/include/freetype2/tttables.h		-unknown-	xorg
 ./usr/X11R7/include/freetype2/tttags.h			-unknown-	xorg
 ./usr/X11R7/include/freetype2/ttunpat.h			-unknown-	xorg
-./usr/X11R7/include/ft2build.h-unknown-	xorg
+./usr/X11R7/include/ft2build.hxcomp-obsolete	obsolete
 ./usr/X11R7/include/libdrm/drm.h			-unknown-	xorg
 ./usr/X11R7/include/libdrm/drm_fourcc.h			-unknown-	xorg
 ./usr/X11R7/include/libdrm/drm_mode.h			-unknown-	xorg

Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.13 src/external/mit/xorg/lib/freetype/Makefile:1.14
--- src/external/mit/xorg/lib/freetype/Makefile:1.13	Mon Jan 26 08:47:25 2015
+++ src/external/mit/xorg/lib/freetype/Makefile	Mon Feb  9 16:27:29 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2015/01/26 08:47:25 wiz Exp $
+#	$NetBSD: Makefile,v 1.14 2015/02/09 16:27:29 ryoon Exp $
 
 .include bsd.own.mk
 
@@ -77,10 +77,6 @@ SRCS+=	type42.c
 .PATH:	${FREETYPE}/src/winfonts
 SRCS+=	winfnt.c
 
-.PATH:	${FREETYPE}/include
-INCS=	ft2build.h
-INCSDIR=${X11INCDIR}
-
 CPPFLAGS+=	${X11FLAGS.THREADLIB}
 CPPFLAGS+=	-DFT_CONFIG_OPTION_SYSTEM_ZLIB \
 		-DFT_CONFIG_CONFIG_H=ftconfig.h \

Index: src/external/mit/xorg/lib/freetype/freetype2.pc.in
diff -u src/external/mit/xorg/lib/freetype/freetype2.pc.in:1.2 src/external/mit/xorg/lib/freetype/freetype2.pc.in:1.3
--- src/external/mit/xorg/lib/freetype/freetype2.pc.in:1.2	Thu Mar 20 08:57:48 2014
+++ src/external/mit/xorg/lib/freetype/freetype2.pc.in	Mon Feb  9 16:27:29 2015
@@ -1,11 +1,11 @@
 prefix=@prefix@
 exec_prefix=${prefix}
 libdir=${prefix}/lib
-includedir=${prefix}/include
+includedir=${prefix}/include/freetype2
 
 Name: FreeType 2
 Description: A free, high-quality, and portable font engine.
 Version: @VERSION@
 Requires:
 Libs: -L${libdir} -lfreetype -lz -lbz2
-Cflags: -I${includedir}/freetype2 -I${includedir}
+Cflags: -I${includedir}

Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.17 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.18
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.17	Thu Mar 20 22:23:30 2014
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile	Mon Feb  9 16:27:29 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2014/03/20 22:23:30 mrg Exp $
+#	$NetBSD: Makefile,v 1.18 2015/02/09 16:27:29 ryoon Exp $
 
 .include bsd.own.mk
 
@@ -15,7 +15,7 @@ INCS=	freetype.h ftadvanc.h ftbbox.h ftb
 	ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h \
 	ftsystem.h fttrigon.h fttypes.h ftwinfnt.h ftxf86.h \
 	t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h \
-	ftautoh.h ftcffdrv.h
+	ftautoh.h ftcffdrv.h ft2build.h
 
 SCRIPTS=	freetype-config
 



CVS commit: src/external/mit/lua/lib/liblua

2015-02-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Feb  9 16:47:17 UTC 2015

Modified Files:
src/external/mit/lua/lib/liblua: Makefile

Log Message:
- use CPPFLAGS instead of CFLAGS for things that the c-preprocessor handle.
- add LUA_C89_NUMBERS for long long and don't depend on _NETBSD_SOURCE
  for defining this.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/lib/liblua/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/mit/lua/lib/liblua/Makefile
diff -u src/external/mit/lua/lib/liblua/Makefile:1.6 src/external/mit/lua/lib/liblua/Makefile:1.7
--- src/external/mit/lua/lib/liblua/Makefile:1.6	Sat Jul 19 14:38:34 2014
+++ src/external/mit/lua/lib/liblua/Makefile	Mon Feb  9 11:47:17 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/07/19 18:38:34 lneto Exp $
+# $NetBSD: Makefile,v 1.7 2015/02/09 16:47:17 christos Exp $
 
 LIB=		lua
 LUA_CORE=	lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c \
@@ -14,10 +14,11 @@ SRCS=		${LUA_CORE} ${LUA_LIB}
 INCS=		lauxlib.h lua.h lua.hpp luaconf.h lualib.h
 INCSDIR=	/usr/include
 
-CFLAGS+=	-DLUA_USE_POSIX -DLUA_USE_DLOPEN
+CPPFLAGS+=	-DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_C89_NUMBERS
 CWARNFLAGS.clang+=	-Wno-empty-body
 
 LIBDPLIBS+=	m		${NETBSDSRCDIR}/lib/libm
+LINTFLAGS+=-V
 
 .PATH:		${NETBSDSRCDIR}/external/mit/lua/dist/src
 



CVS commit: src/external/mit/lua/lib/liblua

2015-02-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Feb  9 16:47:17 UTC 2015

Modified Files:
src/external/mit/lua/lib/liblua: Makefile

Log Message:
- use CPPFLAGS instead of CFLAGS for things that the c-preprocessor handle.
- add LUA_C89_NUMBERS for long long and don't depend on _NETBSD_SOURCE
  for defining this.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/lib/liblua/Makefile

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

2015-02-09 Thread Aymeric Vincent
Module Name:src
Committed By:   aymeric
Date:   Mon Feb  9 20:12:47 UTC 2015

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

Log Message:
clip xfer-actlen also in the !DIAGNOSTIC case


To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/sys/dev/usb/usbdi.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/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.162 src/sys/dev/usb/usbdi.c:1.163
--- src/sys/dev/usb/usbdi.c:1.162	Fri Sep 12 16:40:38 2014
+++ src/sys/dev/usb/usbdi.c	Mon Feb  9 20:12:47 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi.c,v 1.162 2014/09/12 16:40:38 skrll Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.163 2015/02/09 20:12:47 aymeric Exp $	*/
 
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usbdi.c,v 1.162 2014/09/12 16:40:38 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: usbdi.c,v 1.163 2015/02/09 20:12:47 aymeric Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_usb.h
@@ -849,13 +849,13 @@ usb_transfer_complete(usbd_xfer_handle x
 
 	if (!(xfer-flags  USBD_NO_COPY)  xfer-actlen != 0 
 	usbd_xfer_isread(xfer)) {
-#ifdef DIAGNOSTIC
 		if (xfer-actlen  xfer-length) {
+#ifdef DIAGNOSTIC
 			printf(%s: actlen (%d)  len (%d)\n, __func__,
 			   xfer-actlen, xfer-length);
+#endif
 			xfer-actlen = xfer-length;
 		}
-#endif
 		memcpy(xfer-buffer, KERNADDR(dmap, 0), xfer-actlen);
 	}
 



CVS commit: src/sys/dev/usb

2015-02-09 Thread Aymeric Vincent
Module Name:src
Committed By:   aymeric
Date:   Mon Feb  9 20:12:47 UTC 2015

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

Log Message:
clip xfer-actlen also in the !DIAGNOSTIC case


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

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



CVS commit: othersrc/usr.bin/tnftp

2015-02-09 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Mon Feb  9 08:00:23 UTC 2015

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
Fix --disable-ssl

Correct the variable manipulated by --enable-ssl so that --disable-ssl
functions correctly.
Patch from OBATA Akio oba...@netbsd.org.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 othersrc/usr.bin/tnftp/configure.ac

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



CVS commit: othersrc/usr.bin/tnftp

2015-02-09 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Mon Feb  9 08:00:23 UTC 2015

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
Fix --disable-ssl

Correct the variable manipulated by --enable-ssl so that --disable-ssl
functions correctly.
Patch from OBATA Akio oba...@netbsd.org.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 othersrc/usr.bin/tnftp/configure.ac

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

Modified files:

Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.29 othersrc/usr.bin/tnftp/configure.ac:1.30
--- othersrc/usr.bin/tnftp/configure.ac:1.29	Mon Nov  3 21:48:49 2014
+++ othersrc/usr.bin/tnftp/configure.ac	Mon Feb  9 08:00:23 2015
@@ -1,4 +1,4 @@
-#   $NetBSD: configure.ac,v 1.29 2014/11/03 21:48:49 lukem Exp $
+#   $NetBSD: configure.ac,v 1.30 2015/02/09 08:00:23 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -9,7 +9,7 @@ AC_COPYRIGHT([
 Copyright (c) 1999-2014 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.29 $])
+AC_REVISION([$Revision: 1.30 $])
 
 AS_SHELL_SANITIZE()
 
@@ -41,8 +41,8 @@ AC_ARG_ENABLE([ssl],
   [AS_HELP_STRING([--enable-ssl],
   [enable SSL support (requires --with-openssl)
[default=auto]])],
-  [opt_ssl=$enableval],
-  [opt_ssl=auto])
+  [with_ssl=$enableval],
+  [with_ssl=auto])
 AC_ARG_WITH([socks],
 [AS_HELP_STRING([--with-socks],
 [enable support for (Dante) SOCKS5 proxy



CVS commit: othersrc/usr.bin/tnftp

2015-02-09 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Mon Feb  9 08:03:12 UTC 2015

Modified Files:
othersrc/usr.bin/tnftp: configure

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 othersrc/usr.bin/tnftp/configure

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



CVS commit: othersrc/usr.bin/tnftp

2015-02-09 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Mon Feb  9 08:03:12 UTC 2015

Modified Files:
othersrc/usr.bin/tnftp: configure

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 othersrc/usr.bin/tnftp/configure

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

Modified files:

Index: othersrc/usr.bin/tnftp/configure
diff -u othersrc/usr.bin/tnftp/configure:1.44 othersrc/usr.bin/tnftp/configure:1.45
--- othersrc/usr.bin/tnftp/configure:1.44	Mon Nov  3 21:50:27 2014
+++ othersrc/usr.bin/tnftp/configure	Mon Feb  9 08:03:12 2015
@@ -3150,9 +3150,9 @@ fi
 
 # Check whether --enable-ssl was given.
 if test ${enable_ssl+set} = set; then :
-  enableval=$enable_ssl; opt_ssl=$enableval
+  enableval=$enable_ssl; with_ssl=$enableval
 else
-  opt_ssl=auto
+  with_ssl=auto
 fi
 
 



CVS commit: src/usr.sbin/crash

2015-02-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Feb  9 17:48:07 UTC 2015

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

Log Message:
Only define the extra flags for kern_timeout.c


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/crash/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/crash/Makefile
diff -u src/usr.sbin/crash/Makefile:1.28 src/usr.sbin/crash/Makefile:1.29
--- src/usr.sbin/crash/Makefile:1.28	Sun Feb  8 14:42:12 2015
+++ src/usr.sbin/crash/Makefile	Mon Feb  9 12:48:07 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2015/02/08 19:42:12 christos Exp $
+#	$NetBSD: Makefile,v 1.29 2015/02/09 17:48:07 christos Exp $
 
 PROG=		crash
 MAN=		crash.8
@@ -34,7 +34,7 @@ S=		${.CURDIR}/../../sys
 
 CPPFLAGS+=	-I${.CURDIR} -I${.OBJDIR} -I${S} -fno-strict-aliasing
 CPPFLAGS+=	-DDDB_VERBOSE_HELP -DDB_MAX_LINE=1000 -D_KMEMUSER
-CPPFLAGS+=	-UDB_MACHINE_COMMANDS -DCRASH -DDDB
+CPPFLAGS+=	-UDB_MACHINE_COMMANDS
 
 # ddb files from kernel
 .PATH:	$S/ddb
@@ -49,6 +49,7 @@ SRCS+=	db_disasm.c
 
 .PATH:  $S/kern
 SRCS+=	kern_timeout.c
+CPPFLAGS.kern_timeout.c += -DCRASH -DDDB
 
 CPPFLAGS+=	-I${S}/arch
 



CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2015-02-09 Thread Christos Zoulas
Module Name:xsrc
Committed By:   christos
Date:   Mon Feb  9 17:44:22 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h

Log Message:
remove superfluous casts.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h

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



CVS commit: src/usr.sbin/crash

2015-02-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Feb  9 17:48:07 UTC 2015

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

Log Message:
Only define the extra flags for kern_timeout.c


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/crash/Makefile

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



CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2015-02-09 Thread Christos Zoulas
Module Name:xsrc
Committed By:   christos
Date:   Mon Feb  9 17:44:22 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h

Log Message:
remove superfluous casts.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h

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

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.11 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.12
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.11	Wed Jan 15 19:45:03 2014
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h	Mon Feb  9 12:44:22 2015
@@ -950,42 +950,42 @@ static __inline__ void
 outb(unsigned short port, unsigned char value)
 {
 if(ioBase == MAP_FAILED) return;
-xf86WriteMmio8((void *)ioBase, port, value);
+xf86WriteMmio8(ioBase, port, value);
 }
 
 static __inline__ void
 outw(unsigned short port, unsigned short value)
 {
 if(ioBase == MAP_FAILED) return;
-xf86WriteMmio16Le((void *)ioBase, port, value);
+xf86WriteMmio16Le(ioBase, port, value);
 }
 
 static __inline__ void
 outl(unsigned short port, unsigned int value)
 {
 if(ioBase == MAP_FAILED) return;
-xf86WriteMmio32Le((void *)ioBase, port, value);
+xf86WriteMmio32Le(ioBase, port, value);
 }
 
 static __inline__ unsigned int
 inb(unsigned short port)
 {
 if(ioBase == MAP_FAILED) return 0;
-return xf86ReadMmio8((void *)ioBase, port);
+return xf86ReadMmio8(ioBase, port);
 }
 
 static __inline__ unsigned int
 inw(unsigned short port)
 {
 if(ioBase == MAP_FAILED) return 0;
-return xf86ReadMmio16Le((void *)ioBase, port);
+return xf86ReadMmio16Le(ioBase, port);
 }
 
 static __inline__ unsigned int
 inl(unsigned short port)
 {
 if(ioBase == MAP_FAILED) return 0;
-return xf86ReadMmio32Le((void *)ioBase, port);
+return xf86ReadMmio32Le(ioBase, port);
 }
 
 #elif defined(__arm__)  defined(__linux__)



CVS commit: src/usr.bin/xlint/lint1

2015-02-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Feb  9 18:17:34 UTC 2015

Modified Files:
src/usr.bin/xlint/lint1: tree.c

Log Message:
Treat complex numbers like other floating numbers. This caused a core-dump
when linting libm complex code and assumed the size of the type larger than
the array size of value bitmaps.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/usr.bin/xlint/lint1/tree.c

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



CVS commit: src/usr.bin/xlint/lint1

2015-02-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Feb  9 18:17:34 UTC 2015

Modified Files:
src/usr.bin/xlint/lint1: tree.c

Log Message:
Treat complex numbers like other floating numbers. This caused a core-dump
when linting libm complex code and assumed the size of the type larger than
the array size of value bitmaps.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/usr.bin/xlint/lint1/tree.c

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

Modified files:

Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.77 src/usr.bin/xlint/lint1/tree.c:1.78
--- src/usr.bin/xlint/lint1/tree.c:1.77	Thu Nov 20 16:17:18 2014
+++ src/usr.bin/xlint/lint1/tree.c	Mon Feb  9 13:17:34 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: tree.c,v 1.77 2014/11/20 21:17:18 christos Exp $	*/
+/*	$NetBSD: tree.c,v 1.78 2015/02/09 18:17:34 christos Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(lint)
-__RCSID($NetBSD: tree.c,v 1.77 2014/11/20 21:17:18 christos Exp $);
+__RCSID($NetBSD: tree.c,v 1.78 2015/02/09 18:17:34 christos Exp $);
 #endif
 
 #include stdlib.h
@@ -2002,9 +2002,18 @@ cvtcon(op_t op, int arg, type_t *tp, val
 		v-v_ansiu = 0;
 	}
 
-	if (nt != FLOAT  nt != DOUBLE  nt != LDOUBLE) {
+	switch (nt) {
+	case FLOAT:
+	case FCOMPLEX:
+	case DOUBLE:
+	case DCOMPLEX:
+	case LDOUBLE:
+	case LCOMPLEX:
+		break;
+	default:
 		sz = tp-t_isfield ? tp-t_flen : size(nt);
 		nv-v_quad = xsign(nv-v_quad, nt, sz);
+		break;
 	}
 
 	if (rchk  op != CVT) {



CVS commit: src/external/mit/lua/lib/liblua

2015-02-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Feb  9 20:41:01 UTC 2015

Modified Files:
src/external/mit/lua/lib/liblua: Makefile

Log Message:
remove LINTFLAGS


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/lib/liblua/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/mit/lua/lib/liblua/Makefile
diff -u src/external/mit/lua/lib/liblua/Makefile:1.7 src/external/mit/lua/lib/liblua/Makefile:1.8
--- src/external/mit/lua/lib/liblua/Makefile:1.7	Mon Feb  9 11:47:17 2015
+++ src/external/mit/lua/lib/liblua/Makefile	Mon Feb  9 15:41:01 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/02/09 16:47:17 christos Exp $
+# $NetBSD: Makefile,v 1.8 2015/02/09 20:41:01 christos Exp $
 
 LIB=		lua
 LUA_CORE=	lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c \
@@ -18,7 +18,6 @@ CPPFLAGS+=	-DLUA_USE_POSIX -DLUA_USE_DLO
 CWARNFLAGS.clang+=	-Wno-empty-body
 
 LIBDPLIBS+=	m		${NETBSDSRCDIR}/lib/libm
-LINTFLAGS+=-V
 
 .PATH:		${NETBSDSRCDIR}/external/mit/lua/dist/src
 



CVS commit: src/sys/kern

2015-02-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Feb  9 20:46:55 UTC 2015

Modified Files:
src/sys/kern: kern_timeout.c

Log Message:
don't compare user and kernel addresses


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/kern/kern_timeout.c

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



CVS commit: src/sys/kern

2015-02-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Feb  9 20:46:55 UTC 2015

Modified Files:
src/sys/kern: kern_timeout.c

Log Message:
don't compare user and kernel addresses


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/kern/kern_timeout.c

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

Modified files:

Index: src/sys/kern/kern_timeout.c
diff -u src/sys/kern/kern_timeout.c:1.49 src/sys/kern/kern_timeout.c:1.50
--- src/sys/kern/kern_timeout.c:1.49	Sun Feb  8 14:41:00 2015
+++ src/sys/kern/kern_timeout.c	Mon Feb  9 15:46:55 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_timeout.c,v 1.49 2015/02/08 19:41:00 christos Exp $	*/
+/*	$NetBSD: kern_timeout.c,v 1.50 2015/02/09 20:46:55 christos Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_timeout.c,v 1.49 2015/02/08 19:41:00 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_timeout.c,v 1.50 2015/02/09 20:46:55 christos Exp $);
 
 /*
  * Timeouts are kept in a hierarchical timing wheel.  The c_time is the
@@ -777,12 +777,11 @@ db_show_callout_bucket(struct callout_cp
 	cc = cci;
 
 	db_read_bytes((db_addr_t)bucket, sizeof(bi), (char *)bi);
-	bucket = bi;
 
-	if (CIRCQ_EMPTY(bucket))
+	if (CIRCQ_EMPTY(bi))
 		return;
 
-	for (c = CIRCQ_FIRST(bucket); /*nothing*/; c = CIRCQ_NEXT(c-c_list)) {
+	for (c = CIRCQ_FIRST(bi); /*nothing*/; c = CIRCQ_NEXT(c-c_list)) {
 		db_read_bytes((db_addr_t)c, sizeof(ci), (char *)ci);
 		c = ci;
 		db_find_sym_and_offset((db_addr_t)(intptr_t)c-c_func, name,



CVS commit: src/external/mit/lua/lib/liblua

2015-02-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Feb  9 20:41:01 UTC 2015

Modified Files:
src/external/mit/lua/lib/liblua: Makefile

Log Message:
remove LINTFLAGS


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/lib/liblua/Makefile

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



CVS commit: src/sys/arch/evbarm/ifpga

2015-02-09 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Feb  9 21:56:20 UTC 2015

Modified Files:
src/sys/arch/evbarm/ifpga: ifpga_intr.c

Log Message:
Name some interrupts


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/ifpga/ifpga_intr.c

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

Modified files:

Index: src/sys/arch/evbarm/ifpga/ifpga_intr.c
diff -u src/sys/arch/evbarm/ifpga/ifpga_intr.c:1.9 src/sys/arch/evbarm/ifpga/ifpga_intr.c:1.10
--- src/sys/arch/evbarm/ifpga/ifpga_intr.c:1.9	Mon Dec 20 00:25:31 2010
+++ src/sys/arch/evbarm/ifpga/ifpga_intr.c	Mon Feb  9 21:56:20 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ifpga_intr.c,v 1.9 2010/12/20 00:25:31 matt Exp $	*/
+/*	$NetBSD: ifpga_intr.c,v 1.10 2015/02/09 21:56:20 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -96,8 +96,8 @@ const char * const ifpga_irqnames[] = {
 	pci lb,	/* 20 */
 	autoPC,	/* 21 */
 	irq 22,	/* 22 */
-	irq 23,	/* 23 */
-	irq 24,	/* 24 */
+	mmc 0,	/* 23 */
+	mmc 1,	/* 24 */
 	irq 25,	/* 25 */
 	irq 26,	/* 26 */
 	irq 27,	/* 27 */



CVS commit: src/sys/arch/evbarm/ifpga

2015-02-09 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Feb  9 21:56:20 UTC 2015

Modified Files:
src/sys/arch/evbarm/ifpga: ifpga_intr.c

Log Message:
Name some interrupts


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/ifpga/ifpga_intr.c

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



CVS commit: src/doc

2015-02-09 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Mon Feb  9 21:59:30 UTC 2015

Modified Files:
src/doc: 3RDPARTY

Log Message:
postfix-3.0 is out


To generate a diff of this commit:
cvs rdiff -u -r1.1202 -r1.1203 src/doc/3RDPARTY

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



CVS commit: src/doc

2015-02-09 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Mon Feb  9 21:59:30 UTC 2015

Modified Files:
src/doc: 3RDPARTY

Log Message:
postfix-3.0 is out


To generate a diff of this commit:
cvs rdiff -u -r1.1202 -r1.1203 src/doc/3RDPARTY

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1202 src/doc/3RDPARTY:1.1203
--- src/doc/3RDPARTY:1.1202	Thu Feb  5 11:37:47 2015
+++ src/doc/3RDPARTY	Mon Feb  9 21:59:30 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1202 2015/02/05 11:37:47 pettai Exp $
+#	$NetBSD: 3RDPARTY,v 1.1203 2015/02/09 21:59:30 wiz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1116,7 +1116,7 @@ now to do a new import.
 
 Package:	Postfix
 Version:	2.11.3
-Current Vers:	2.11.3
+Current Vers:	3.0
 Maintainer:	Wietse Venema wie...@porcupine.org
 Archive Site:	ftp://postfix.cloud9.net/official/
 Home Page:	http://www.postfix.org/



CVS commit: src/lib/libc

2015-02-09 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Feb  9 22:44:34 UTC 2015

Modified Files:
src/lib/libc: Makefile
src/lib/libc/compat/arch/i386: Makefile.inc
src/lib/libc/compat/arch/x86_64: Makefile.inc

Log Message:
Include compat in rumprun libc

Not including non-renamed symbols in libc caused all kinds of configure
scripts to do the wrong thing when they just tested linkage without
including headers.  So, go for the least moving parts bandaid for now.


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/lib/libc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/arch/i386/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/arch/x86_64/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/Makefile
diff -u src/lib/libc/Makefile:1.167 src/lib/libc/Makefile:1.168
--- src/lib/libc/Makefile:1.167	Wed Dec 10 00:37:30 2014
+++ src/lib/libc/Makefile	Mon Feb  9 22:44:34 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.167 2014/12/10 00:37:30 pooka Exp $
+#	$NetBSD: Makefile,v 1.168 2015/02/09 22:44:34 pooka Exp $
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
 #
 # All library objects contain sccsid strings by default; they may be
@@ -41,7 +41,6 @@ assym.h: ${ARCHDIR}/genassym.cf
 	mv -f assym.h.tmp assym.h
 .endif
 
-.if ${RUMPRUN} != yes
 # The following controls how to build compatibility code for old NetBSD
 # binaries. If BUILD_LEGACY is yes, then we build a separate library; otherwise
 # we include the code in libc.
@@ -55,7 +54,6 @@ COMPATDIR=${.CURDIR}/compat
 # Marker for compat code that can't be easily isolated
 CPPFLAGS+=	-D__BUILD_LEGACY
 .endif
-.endif
 
 .include ${.CURDIR}/../../common/lib/libc/Makefile.inc
 .include ${.CURDIR}/atomic/Makefile.inc

Index: src/lib/libc/compat/arch/i386/Makefile.inc
diff -u src/lib/libc/compat/arch/i386/Makefile.inc:1.2 src/lib/libc/compat/arch/i386/Makefile.inc:1.3
--- src/lib/libc/compat/arch/i386/Makefile.inc:1.2	Sat Mar 11 23:04:03 2006
+++ src/lib/libc/compat/arch/i386/Makefile.inc	Mon Feb  9 22:44:34 2015
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile.inc,v 1.2 2006/03/11 23:04:03 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.3 2015/02/09 22:44:34 pooka Exp $
 
 .include ${COMPATARCHDIR}/gen/Makefile.inc
+.if ${RUMPRUN} != yes
 .include ${COMPATARCHDIR}/sys/Makefile.inc
+.endif

Index: src/lib/libc/compat/arch/x86_64/Makefile.inc
diff -u src/lib/libc/compat/arch/x86_64/Makefile.inc:1.4 src/lib/libc/compat/arch/x86_64/Makefile.inc:1.5
--- src/lib/libc/compat/arch/x86_64/Makefile.inc:1.4	Mon Jul  3 13:13:53 2006
+++ src/lib/libc/compat/arch/x86_64/Makefile.inc	Mon Feb  9 22:44:34 2015
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile.inc,v 1.4 2006/07/03 13:13:53 drochner Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2015/02/09 22:44:34 pooka Exp $
 
 .include ${COMPATARCHDIR}/gen/Makefile.inc
+.if ${RUMPRUN} != yes
 .include ${COMPATARCHDIR}/sys/Makefile.inc
+.endif



CVS commit: src/lib/libc

2015-02-09 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Feb  9 22:44:34 UTC 2015

Modified Files:
src/lib/libc: Makefile
src/lib/libc/compat/arch/i386: Makefile.inc
src/lib/libc/compat/arch/x86_64: Makefile.inc

Log Message:
Include compat in rumprun libc

Not including non-renamed symbols in libc caused all kinds of configure
scripts to do the wrong thing when they just tested linkage without
including headers.  So, go for the least moving parts bandaid for now.


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/lib/libc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/arch/i386/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/arch/x86_64/Makefile.inc

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



CVS commit: src/tests/lib/libm

2015-02-09 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Feb  9 19:39:48 UTC 2015

Modified Files:
src/tests/lib/libm: t_log.c

Log Message:
Remove expected failure and references to port-alpha/46301, now that
it is fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/lib/libm/t_log.c

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



CVS commit: src/tests/lib/libm

2015-02-09 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Feb  9 19:39:48 UTC 2015

Modified Files:
src/tests/lib/libm: t_log.c

Log Message:
Remove expected failure and references to port-alpha/46301, now that
it is fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/lib/libm/t_log.c

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

Modified files:

Index: src/tests/lib/libm/t_log.c
diff -u src/tests/lib/libm/t_log.c:1.12 src/tests/lib/libm/t_log.c:1.13
--- src/tests/lib/libm/t_log.c:1.12	Tue Nov  4 00:20:19 2014
+++ src/tests/lib/libm/t_log.c	Mon Feb  9 19:39:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: t_log.c,v 1.12 2014/11/04 00:20:19 justin Exp $ */
+/* $NetBSD: t_log.c,v 1.13 2015/02/09 19:39:48 martin Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__RCSID($NetBSD: t_log.c,v 1.12 2014/11/04 00:20:19 justin Exp $);
+__RCSID($NetBSD: t_log.c,v 1.13 2015/02/09 19:39:48 martin Exp $);
 
 #include atf-c.h
 
@@ -186,10 +186,6 @@ ATF_TC_BODY(log10f_inf_pos, tc)
 {
 	const float x = 1.0L / 0.0L;
 
-#if defined(__alpha__)
-	atf_tc_expect_fail(PR port-alpha/46301);
-#endif
-
 	ATF_CHECK(log10f(x) == x);
 }
 
@@ -562,10 +558,6 @@ ATF_TC_BODY(log2f_inf_pos, tc)
 {
 	const float x = 1.0L / 0.0L;
 
-#if defined(__alpha__)
-	atf_tc_expect_fail(PR port-alpha/46301);
-#endif
-
 	ATF_CHECK(log2f(x) == x);
 }
 
@@ -766,10 +758,6 @@ ATF_TC_BODY(logf_inf_pos, tc)
 {
 	const float x = 1.0L / 0.0L;
 
-#if defined(__alpha__)
-	atf_tc_expect_fail(PR port-alpha/46301);
-#endif
-
 	ATF_CHECK(logf(x) == x);
 }