CVS commit: xsrc/external/mit/xfs/dist/os
Module Name:xsrc Committed By: mrg Date: Sat Jul 18 06:03:20 UTC 2015 Modified Files: xsrc/external/mit/xfs/dist/os: io.c Log Message: move Xpoll.h to ensure its FD_SETSIZE definition is used. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/xfs/dist/os/io.c 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/xfs/dist/os/io.c diff -u xsrc/external/mit/xfs/dist/os/io.c:1.1.1.5 xsrc/external/mit/xfs/dist/os/io.c:1.2 --- xsrc/external/mit/xfs/dist/os/io.c:1.1.1.5 Wed Feb 25 20:02:39 2015 +++ xsrc/external/mit/xfs/dist/os/io.c Sat Jul 18 06:03:20 2015 @@ -46,6 +46,8 @@ in this Software without prior written a * THIS SOFTWARE. */ +#include "X11/Xpoll.h" + #include "config.h" #include @@ -57,7 +59,6 @@ in this Software without prior written a #include #include "clientstr.h" -#include "X11/Xpoll.h" #include "osdep.h" #include "globals.h" #include "dispatch.h"
CVS commit: src/sbin/disklabel
Module Name:src
Committed By: htodd
Date: Sat Jul 18 06:00:46 UTC 2015
Modified Files:
src/sbin/disklabel: bswap.c
Log Message:
Fix build.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sbin/disklabel/bswap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/disklabel/bswap.c
diff -u src/sbin/disklabel/bswap.c:1.3 src/sbin/disklabel/bswap.c:1.4
--- src/sbin/disklabel/bswap.c:1.3 Fri Jul 17 20:30:21 2015
+++ src/sbin/disklabel/bswap.c Sat Jul 18 06:00:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bswap.c,v 1.3 2015/07/17 20:30:21 tsutsui Exp $ */
+/* $NetBSD: bswap.c,v 1.4 2015/07/18 06:00:46 htodd Exp $ */
/*-
* Copyright (c) 2009 Izumi Tsutsui. All rights reserved.
@@ -74,7 +74,7 @@
static void
bswaplabel(struct disklabel *nlp, const struct disklabel *olp)
{
- int i;
+ u_int i;
nlp->d_magic = bswap32(olp->d_magic);
nlp->d_type = bswap16(olp->d_type);
CVS commit: src/etc/etc.evbarm
Module Name:src Committed By: matt Date: Sat Jul 18 00:57:35 UTC 2015 Modified Files: src/etc/etc.evbarm: Makefile.inc Log Message: Build CUBOX-I kernels To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/etc/etc.evbarm/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/etc/etc.evbarm/Makefile.inc diff -u src/etc/etc.evbarm/Makefile.inc:1.77 src/etc/etc.evbarm/Makefile.inc:1.78 --- src/etc/etc.evbarm/Makefile.inc:1.77 Wed Jul 15 11:27:13 2015 +++ src/etc/etc.evbarm/Makefile.inc Sat Jul 18 00:57:35 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.77 2015/07/15 11:27:13 martin Exp $ +# $NetBSD: Makefile.inc,v 1.78 2015/07/18 00:57:35 matt Exp $ # # etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets # @@ -98,6 +98,8 @@ EVBARM_BOARDS.armv7+= CUBIEBOARD EVBARM_BOARDS.armv7hf+= CUBIEBOARD EVBARM_BOARDS.armv7+= CUBIETRUCK EVBARM_BOARDS.armv7hf+= CUBIETRUCK +EVBARM_BOARDS.armv7+= CUBOX-I +EVBARM_BOARDS.armv7hf+= CUBOX-I EVBARM_BOARDS.armv7+= HUMMINGBIRD_A31 EVBARM_BOARDS.armv7hf+= HUMMINGBIRD_A31 #EVBARM_BOARDS.armv7+= IGEPV2
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sat Jul 18 00:57:10 UTC 2015 Added Files: src/sys/arch/evbarm/conf: CUBOX-I_INSTALL Log Message: Add install kernel for cubox-i To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/CUBOX-I_INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/evbarm/conf/CUBOX-I_INSTALL diff -u /dev/null src/sys/arch/evbarm/conf/CUBOX-I_INSTALL:1.1 --- /dev/null Sat Jul 18 00:57:10 2015 +++ src/sys/arch/evbarm/conf/CUBOX-I_INSTALL Sat Jul 18 00:57:10 2015 @@ -0,0 +1,10 @@ +# $NetBSD: CUBOX-I_INSTALL,v 1.1 2015/07/18 00:57:10 matt Exp $ +# +# CUBOX-I_INSTALL -- CUBOX-I kernel with installation-sized +# ramdisk +# + +include "arch/evbarm/conf/CUBOX-I" +include "arch/evbarm/conf/INSTALL" + +options BOOTHOWTO=RB_SINGLE
CVS commit: [matt-nb5-mips64] src/sys/arch/evbarm/bcm53xx
Module Name:src
Committed By: matt
Date: Fri Jul 17 20:32:27 UTC 2015
Modified Files:
src/sys/arch/evbarm/bcm53xx [matt-nb5-mips64]: bcm53xx_machdep.c
Log Message:
Deal with > 1GB of memory.
To generate a diff of this commit:
cvs rdiff -u -r1.7.4.3 -r1.7.4.4 \
src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.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/bcm53xx/bcm53xx_machdep.c
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.7.4.3 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.7.4.4
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.7.4.3 Wed Mar 26 02:15:02 2014
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Fri Jul 17 20:32:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_machdep.c,v 1.7.4.3 2014/03/26 02:15:02 matt Exp $ */
+/* $NetBSD: bcm53xx_machdep.c,v 1.7.4.4 2015/07/17 20:32:27 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define IDM_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.7.4.3 2014/03/26 02:15:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.7.4.4 2015/07/17 20:32:27 matt Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_broadcom.h"
@@ -258,6 +258,20 @@ initarm(void *arg)
#endif
const bool bigmem_p = (memsize >> PGSHIFT) > bp_first256.bp_pages;
+#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+ const bool mapallmem_p = true;
+#ifndef PMAP_NEED_ALLOC_POOLPAGE
+ if (memsize > KERNEL_VM_BASE - KERNEL_BASE) {
+ printf("%s: dropping RAM size from %luMB to %uMB\n",
+ __func__, (unsigned long) (ram_size >> 20),
+ (KERNEL_VM_BASE - KERNEL_BASE) >> 20);
+ memsize = KERNEL_VM_BASE - KERNEL_BASE;
+ }
+#endif
+#else
+ const bool mapallmem_p = false;
+#endif
+ KASSERT((armreg_pfr1_read() & ARM_PFR1_SEC_MASK) != 0);
arm32_bootmem_init(KERN_VTOPHYS(KERNEL_BASE), memsize,
(paddr_t)KERNEL_BASE_phys);
@@ -273,7 +287,8 @@ initarm(void *arg)
* abtstack, undstack, kernelstack, msgbufphys will be set to point to
* the memory that was allocated for them.
*/
- arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0, devmap, true);
+ arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0, devmap,
+ mapallmem_p);
cpu_reset_address = bcm53xx_system_reset;
/* we've a specific device_register routine */
CVS commit: src/sbin/disklabel
Module Name:src
Committed By: tsutsui
Date: Fri Jul 17 20:30:21 UTC 2015
Modified Files:
src/sbin/disklabel: bswap.c
Log Message:
Fix botch in "make disklabel a MI tool" changes in rev 1.2.
After that chanage, "MAXPARTITIONS" constant is not for the target port.
If host's MAXPARTITIONS is larger than a value of the target label and
target endianness is different from the build host, bswaplabel() could
overwrite data beyond the disklabel and primary boot stored after
LABELSECTOR in images might be corrupted.
This fixes boot failure of sun2 liveimage built by
"build.sh -U -m sun2 release live-image"
on TME.
Should be pulled up to netbsd-7.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/disklabel/bswap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/disklabel/bswap.c
diff -u src/sbin/disklabel/bswap.c:1.2 src/sbin/disklabel/bswap.c:1.3
--- src/sbin/disklabel/bswap.c:1.2 Fri May 3 16:05:12 2013
+++ src/sbin/disklabel/bswap.c Fri Jul 17 20:30:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bswap.c,v 1.2 2013/05/03 16:05:12 matt Exp $ */
+/* $NetBSD: bswap.c,v 1.3 2015/07/17 20:30:21 tsutsui Exp $ */
/*-
* Copyright (c) 2009 Izumi Tsutsui. All rights reserved.
@@ -120,7 +120,7 @@ bswaplabel(struct disklabel *nlp, const
nlp->d_bbsize = bswap32(olp->d_bbsize);
nlp->d_sbsize = bswap32(olp->d_sbsize);
- for (i = 0; i < MAXPARTITIONS; i++) {
+ for (i = 0; i < maxpartitions; i++) {
nlp->d_partitions[i].p_size =
bswap32(olp->d_partitions[i].p_size);
nlp->d_partitions[i].p_offset =
CVS commit: src/sys/arch/evbarm/bcm53xx
Module Name:src
Committed By: matt
Date: Fri Jul 17 20:29:29 UTC 2015
Modified Files:
src/sys/arch/evbarm/bcm53xx: bcm53xx_machdep.c
Log Message:
Deal with more than 1GB of RAM.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.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/bcm53xx/bcm53xx_machdep.c
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.8 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.9
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.8 Sat Mar 29 14:02:46 2014
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Fri Jul 17 20:29:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_machdep.c,v 1.8 2014/03/29 14:02:46 matt Exp $ */
+/* $NetBSD: bcm53xx_machdep.c,v 1.9 2015/07/17 20:29:29 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define IDM_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.8 2014/03/29 14:02:46 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.9 2015/07/17 20:29:29 matt Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_broadcom.h"
@@ -250,6 +250,20 @@ initarm(void *arg)
#endif
const bool bigmem_p = (memsize >> 20) > 256;
+#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+ const bool mapallmem_p = true;
+#ifndef PMAP_NEED_ALLOC_POOLPAGE
+ if (memsize > KERNEL_VM_BASE - KERNEL_BASE) {
+ printf("%s: dropping RAM size from %luMB to %uMB\n",
+ __func__, (unsigned long) (ram_size >> 20),
+ (KERNEL_VM_BASE - KERNEL_BASE) >> 20);
+ memsize = KERNEL_VM_BASE - KERNEL_BASE;
+ }
+#endif
+#else
+ const bool mapallmem_p = false;
+#endif
+ KASSERT((armreg_pfr1_read() & ARM_PFR1_SEC_MASK) != 0);
arm32_bootmem_init(KERN_VTOPHYS(KERNEL_BASE), memsize,
(paddr_t)KERNEL_BASE_phys);
@@ -265,7 +279,8 @@ initarm(void *arg)
* abtstack, undstack, kernelstack, msgbufphys will be set to point to
* the memory that was allocated for them.
*/
- arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0, devmap, true);
+ arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0, devmap,
+ mapallmem_p);
cpu_reset_address = bcm53xx_system_reset;
/* we've a specific device_register routine */
CVS commit: src/sys/arch/zaurus/conf
Module Name:src Committed By: martin Date: Fri Jul 17 19:32:24 UTC 2015 Modified Files: src/sys/arch/zaurus/conf: INSTALL Log Message: Provide a bit more space for the ram disk image To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/zaurus/conf/INSTALL 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/zaurus/conf/INSTALL diff -u src/sys/arch/zaurus/conf/INSTALL:1.24 src/sys/arch/zaurus/conf/INSTALL:1.25 --- src/sys/arch/zaurus/conf/INSTALL:1.24 Sun Aug 17 21:17:44 2014 +++ src/sys/arch/zaurus/conf/INSTALL Fri Jul 17 19:32:24 2015 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.24 2014/08/17 21:17:44 joerg Exp $ +# $NetBSD: INSTALL,v 1.25 2015/07/17 19:32:24 martin Exp $ # # INSTALL config file (GENERIC with memory disk root) # @@ -9,7 +9,7 @@ include "arch/zaurus/conf/GENERIC" options MEMORY_DISK_HOOKS # enable root ramdisk options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk support -options MEMORY_DISK_ROOT_SIZE=4516 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=4710 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode # for reduce kernel size.
CVS commit: src/distrib/zaurus/ramdisk
Module Name:src
Committed By: martin
Date: Fri Jul 17 19:32:48 UTC 2015
Modified Files:
src/distrib/zaurus/ramdisk: Makefile
Log Message:
Bump ram disk image size slightly
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/zaurus/ramdisk/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/zaurus/ramdisk/Makefile
diff -u src/distrib/zaurus/ramdisk/Makefile:1.17 src/distrib/zaurus/ramdisk/Makefile:1.18
--- src/distrib/zaurus/ramdisk/Makefile:1.17 Mon Aug 4 20:20:39 2014
+++ src/distrib/zaurus/ramdisk/Makefile Fri Jul 17 19:32:48 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2014/08/04 20:20:39 martin Exp $
+# $NetBSD: Makefile,v 1.18 2015/07/17 19:32:48 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= ramdisk.fs
-IMAGESIZE= 2256k
+IMAGESIZE= 2350k
MAKEFS_FLAGS= -f 14
WARNS= 1
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Fri Jul 17 17:57:11 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xfs: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.serverlib
Log Message:
don't hard code FD_SETSIZE now that the code is fine.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/bin/xfs/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib
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/xorg/bin/xfs/Makefile
diff -u src/external/mit/xorg/bin/xfs/Makefile:1.11 src/external/mit/xorg/bin/xfs/Makefile:1.12
--- src/external/mit/xorg/bin/xfs/Makefile:1.11 Fri Jul 17 08:30:33 2015
+++ src/external/mit/xorg/bin/xfs/Makefile Fri Jul 17 17:57:11 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/07/17 08:30:33 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2015/07/17 17:57:11 mrg Exp $
.include
@@ -24,9 +24,6 @@ CPPFLAGS+= -I${XFSDIR}/include \
-I${XFSDIR}/../include \
-DHAVE_DAEMON
-# XXX
-CPPFLAGS+= -DFD_SETSIZE=512
-
CONN_DEFINES= ${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_SERVER \
-DTRANS_REOPEN -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT
Index: src/external/mit/xorg/server/xorg-server/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.6 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.7
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.6 Fri Jul 17 08:30:33 2015
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Fri Jul 17 17:57:11 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.6 2015/07/17 08:30:33 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.7 2015/07/17 17:57:11 mrg Exp $
NOLINT= 1
NOPROFILE= 1
@@ -17,9 +17,6 @@ X_BYTE_ORDER=0
CPPFLAGS+= ${X11FLAGS.SERVER}
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
-# XXX
-CPPFLAGS+= -DFD_SETSIZE=512
-
.if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
CPPFLAGS+= -D__GLX_ALIGN64
.endif
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Fri Jul 17 17:38:55 UTC 2015 Modified Files: xsrc/external/mit/xfs/dist/os: connection.c xsrc/external/mit/xorg-server/dist/os: WaitFor.c connection.c io.c Log Message: move X11/Xpoll.h include earlier than sys/select.h to avoid missing out on setting FD_SETSIZE early enough. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/xfs/dist/os/connection.c cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-server/dist/os/WaitFor.c \ xsrc/external/mit/xorg-server/dist/os/connection.c \ xsrc/external/mit/xorg-server/dist/os/io.c 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/xfs/dist/os/connection.c diff -u xsrc/external/mit/xfs/dist/os/connection.c:1.1.1.5 xsrc/external/mit/xfs/dist/os/connection.c:1.2 --- xsrc/external/mit/xfs/dist/os/connection.c:1.1.1.5 Wed Feb 25 20:02:39 2015 +++ xsrc/external/mit/xfs/dist/os/connection.c Fri Jul 17 17:38:55 2015 @@ -69,6 +69,7 @@ in this Software without prior written a #include "config.h" +#include "X11/Xpoll.h" #include #include #include @@ -84,7 +85,6 @@ in this Software without prior written a #include #include #include "clientstr.h" -#include "X11/Xpoll.h" #include "osdep.h" #include "globals.h" #include "osstruct.h" Index: xsrc/external/mit/xorg-server/dist/os/WaitFor.c diff -u xsrc/external/mit/xorg-server/dist/os/WaitFor.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/os/WaitFor.c:1.2 --- xsrc/external/mit/xorg-server/dist/os/WaitFor.c:1.1.1.4 Tue Aug 2 06:57:04 2011 +++ xsrc/external/mit/xorg-server/dist/os/WaitFor.c Fri Jul 17 17:38:55 2015 @@ -54,6 +54,8 @@ SOFTWARE. * */ +#include + #ifdef HAVE_DIX_CONFIG_H #include #endif @@ -68,7 +70,6 @@ SOFTWARE. #include "misc.h" #include "osdep.h" -#include #include "dixstruct.h" #include "opaque.h" #ifdef DPMSExtension Index: xsrc/external/mit/xorg-server/dist/os/connection.c diff -u xsrc/external/mit/xorg-server/dist/os/connection.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/os/connection.c:1.2 --- xsrc/external/mit/xorg-server/dist/os/connection.c:1.1.1.4 Tue Aug 2 06:57:04 2011 +++ xsrc/external/mit/xorg-server/dist/os/connection.c Fri Jul 17 17:38:55 2015 @@ -61,6 +61,8 @@ SOFTWARE. * */ +#include + #ifdef HAVE_DIX_CONFIG_H #include #endif @@ -106,7 +108,6 @@ SOFTWARE. #endif /* WIN32 */ #include "misc.h" /* for typedef of pointer */ #include "osdep.h" -#include #include "opaque.h" #include "dixstruct.h" #include "xace.h" Index: xsrc/external/mit/xorg-server/dist/os/io.c diff -u xsrc/external/mit/xorg-server/dist/os/io.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/os/io.c:1.2 --- xsrc/external/mit/xorg-server/dist/os/io.c:1.1.1.4 Sun Jul 24 01:29:16 2011 +++ xsrc/external/mit/xorg-server/dist/os/io.c Fri Jul 17 17:38:55 2015 @@ -53,6 +53,8 @@ SOFTWARE. * */ +#include + #ifdef HAVE_DIX_CONFIG_H #include #endif @@ -76,7 +78,6 @@ SOFTWARE. #include #include "os.h" #include "osdep.h" -#include #include "opaque.h" #include "dixstruct.h" #include "misc.h"
CVS commit: src/usr.sbin/ypserv/ypserv
Module Name:src
Committed By: christos
Date: Fri Jul 17 15:58:01 UTC 2015
Modified Files:
src/usr.sbin/ypserv/ypserv: ypserv_proc.c
Log Message:
PR/50057: Wolfgang Stukenbrock: yp-map transfer removes SECURE-flag
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/ypserv/ypserv/ypserv_proc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ypserv/ypserv/ypserv_proc.c
diff -u src/usr.sbin/ypserv/ypserv/ypserv_proc.c:1.16 src/usr.sbin/ypserv/ypserv/ypserv_proc.c:1.17
--- src/usr.sbin/ypserv/ypserv/ypserv_proc.c:1.16 Tue Aug 30 13:06:22 2011
+++ src/usr.sbin/ypserv/ypserv/ypserv_proc.c Fri Jul 17 11:58:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ypserv_proc.c,v 1.16 2011/08/30 17:06:22 plunky Exp $ */
+/* $NetBSD: ypserv_proc.c,v 1.17 2015/07/17 15:58:01 christos Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson
@@ -28,7 +28,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ypserv_proc.c,v 1.16 2011/08/30 17:06:22 plunky Exp $");
+__RCSID("$NetBSD: ypserv_proc.c,v 1.17 2015/07/17 15:58:01 christos Exp $");
#endif
#include
@@ -166,7 +166,7 @@ ypproc_match_2_svc(void *argp, struct sv
if (secure && securecheck(caller))
res.status = YP_YPERR;
else
- res = ypdb_get_record(k->domain, k->map, k->keydat, FALSE);
+ res = ypdb_get_record(k->domain, k->map, k->keydat, secure);
return ((void *)&res);
}
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri Jul 17 15:24:27 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: gcc-5.2 out. To generate a diff of this commit: cvs rdiff -u -r1.1236 -r1.1237 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.1236 src/doc/3RDPARTY:1.1237 --- src/doc/3RDPARTY:1.1236 Fri Jul 10 15:28:01 2015 +++ src/doc/3RDPARTY Fri Jul 17 15:24:27 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1236 2015/07/10 15:28:01 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1237 2015/07/17 15:24:27 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -421,7 +421,7 @@ There is a flex2netbsd script to help ne Package: gcc Version: 4.8.5 -Current Vers: 4.8.5/5.1 +Current Vers: 4.8.5/5.2 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/gcc/ Home Page: http://www.gnu.org/software/gcc/
CVS commit: src/external/bsd/ntp/dist/libntp
Module Name:src
Committed By: christos
Date: Fri Jul 17 15:17:07 UTC 2015
Modified Files:
src/external/bsd/ntp/dist/libntp: work_fork.c
Log Message:
PR/50048: Martin Husemann: Avoid reaping the child twice by setting c->pid = 0
after the wait.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/libntp/work_fork.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/libntp/work_fork.c
diff -u src/external/bsd/ntp/dist/libntp/work_fork.c:1.5 src/external/bsd/ntp/dist/libntp/work_fork.c:1.6
--- src/external/bsd/ntp/dist/libntp/work_fork.c:1.5 Fri Jul 10 10:20:32 2015
+++ src/external/bsd/ntp/dist/libntp/work_fork.c Fri Jul 17 11:17:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: work_fork.c,v 1.5 2015/07/10 14:20:32 christos Exp $ */
+/* $NetBSD: work_fork.c,v 1.6 2015/07/17 15:17:07 christos Exp $ */
/*
* work_fork.c - fork implementation for blocking worker child.
@@ -128,6 +128,7 @@ harvest_child_status(
if (waitpid(c->pid, NULL, 0) == c->pid)
TRACE(4, ("harvested child %d\n", c->pid));
else msyslog(LOG_ERR, "error waiting on child %d: %m", c->pid);
+ c->pid = 0;
}
}
@@ -164,7 +165,6 @@ cleanup_after_child(
close(c->resp_read_pipe);
c->resp_read_pipe = -1;
}
- c->pid = 0;
c->resp_read_ctx = NULL;
DEBUG_INSIST(-1 == c->req_read_pipe);
DEBUG_INSIST(-1 == c->resp_write_pipe);
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Fri Jul 17 08:30:33 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xfs: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.serverlib
Log Message:
define FD_SETSIZE=512, to match the new XFD_SETSIZE. something ends up
including before Xpoll.h, and the wrong FD_SETSIZE is
used in our fd_set macros, leading to fail.
XXX: ugh. fix me properly.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/bin/xfs/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib
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/xorg/bin/xfs/Makefile
diff -u src/external/mit/xorg/bin/xfs/Makefile:1.10 src/external/mit/xorg/bin/xfs/Makefile:1.11
--- src/external/mit/xorg/bin/xfs/Makefile:1.10 Sun Aug 24 18:27:16 2014
+++ src/external/mit/xorg/bin/xfs/Makefile Fri Jul 17 08:30:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/08/24 18:27:16 apb Exp $
+# $NetBSD: Makefile,v 1.11 2015/07/17 08:30:33 mrg Exp $
.include
@@ -24,6 +24,9 @@ CPPFLAGS+= -I${XFSDIR}/include \
-I${XFSDIR}/../include \
-DHAVE_DAEMON
+# XXX
+CPPFLAGS+= -DFD_SETSIZE=512
+
CONN_DEFINES= ${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_SERVER \
-DTRANS_REOPEN -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT
Index: src/external/mit/xorg/server/xorg-server/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.5 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.6
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.5 Mon Dec 8 06:33:26 2014
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Fri Jul 17 08:30:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.5 2014/12/08 06:33:26 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.6 2015/07/17 08:30:33 mrg Exp $
NOLINT= 1
NOPROFILE= 1
@@ -17,6 +17,9 @@ X_BYTE_ORDER=0
CPPFLAGS+= ${X11FLAGS.SERVER}
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
+# XXX
+CPPFLAGS+= -DFD_SETSIZE=512
+
.if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
CPPFLAGS+= -D__GLX_ALIGN64
.endif
CVS commit: src/external/mit/xorg/bin/iceauth
Module Name:src
Committed By: mrg
Date: Fri Jul 17 08:29:31 UTC 2015
Modified Files:
src/external/mit/xorg/bin/iceauth: Makefile
Log Message:
look for config.h now it is needed.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/iceauth/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/xorg/bin/iceauth/Makefile
diff -u src/external/mit/xorg/bin/iceauth/Makefile:1.2 src/external/mit/xorg/bin/iceauth/Makefile:1.3
--- src/external/mit/xorg/bin/iceauth/Makefile:1.2 Sat Jul 23 06:41:08 2011
+++ src/external/mit/xorg/bin/iceauth/Makefile Fri Jul 17 08:29:31 2015
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2011/07/23 06:41:08 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/17 08:29:31 mrg Exp $
.include
PROG= iceauth
SRCS= iceauth.c process.c
+CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
+
LDADD+= -lICE
DPADD+= ${LIBICE}
CVS commit: xsrc/external/mit/xproto/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 17 07:02:40 UTC 2015 Modified Files: xsrc/external/mit/xproto/dist: Xpoll.h.in Log Message: actually move ahead of all the necessary headers. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xproto/dist/Xpoll.h.in 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/xproto/dist/Xpoll.h.in diff -u xsrc/external/mit/xproto/dist/Xpoll.h.in:1.2 xsrc/external/mit/xproto/dist/Xpoll.h.in:1.3 --- xsrc/external/mit/xproto/dist/Xpoll.h.in:1.2 Fri Jul 17 06:57:38 2015 +++ xsrc/external/mit/xproto/dist/Xpoll.h.in Fri Jul 17 07:02:40 2015 @@ -54,14 +54,14 @@ from The Open Group. #ifndef USE_POLL -#include - #define XFD_SETSIZE 512 #ifndef FD_SETSIZE #define FD_SETSIZE XFD_SETSIZE #endif +#include + #include /* Get the FD_* macros. */ #include
