CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3
Module Name:src Committed By: mrg Date: Wed May 28 07:03:27 UTC 2014 Modified Files: src/external/gpl3/gcc/dist/libstdc++-v3: configure.ac Log Message: apply patch from skrll@: allow netbsd host=target to configure GLIBCXX_IS_NATIVE. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/gpl3/gcc/dist/libstdc++-v3/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libstdc++-v3/configure.ac diff -u src/external/gpl3/gcc/dist/libstdc++-v3/configure.ac:1.1.1.2 src/external/gpl3/gcc/dist/libstdc++-v3/configure.ac:1.2 --- src/external/gpl3/gcc/dist/libstdc++-v3/configure.ac:1.1.1.2 Sat Mar 1 08:41:19 2014 +++ src/external/gpl3/gcc/dist/libstdc++-v3/configure.ac Wed May 28 07:03:27 2014 @@ -38,6 +38,9 @@ if test $build != $host; then # We are being configured with some form of cross compiler. GLIBCXX_IS_NATIVE=false case $host,$target in + *-*-netbsd*,*-*-netbsd*) +GLIBCXX_IS_NATIVE=true +;; # Darwin crosses can use the host system's libraries and headers, # because of the fat library support. Of course, it must be the # same version of Darwin on both sides. Allow the user to
CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3
Module Name:src Committed By: mrg Date: Wed May 28 07:03:36 UTC 2014 Modified Files: src/external/gpl3/gcc/dist/libstdc++-v3: configure Log Message: apply patch from skrll@: allow netbsd host=target to configure GLIBCXX_IS_NATIVE. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/dist/libstdc++-v3/configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libstdc++-v3/configure diff -u src/external/gpl3/gcc/dist/libstdc++-v3/configure:1.5 src/external/gpl3/gcc/dist/libstdc++-v3/configure:1.6 --- src/external/gpl3/gcc/dist/libstdc++-v3/configure:1.5 Tue May 27 09:18:55 2014 +++ src/external/gpl3/gcc/dist/libstdc++-v3/configure Wed May 28 07:03:36 2014 @@ -3038,6 +3038,9 @@ if test $build != $host; then # We are being configured with some form of cross compiler. GLIBCXX_IS_NATIVE=false case $host,$target in + *-*-netbsd*,*-*-netbsd*) +GLIBCXX_IS_NATIVE=true +;; # Darwin crosses can use the host system's libraries and headers, # because of the fat library support. Of course, it must be the # same version of Darwin on both sides. Allow the user to
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Wed May 28 07:32:22 UTC 2014
Modified Files:
src/tools/gcc: Makefile
Log Message:
two fixes skrll@ pointed out:
- pass --enable-libstdcxx-threads to enable a bunch of tests and thus
get the right answers
- MKNATIVE_CONFIG_TARGET_LIBS needs to do libgcc before libstdc++-v3,
for the GCC 4.8 case.
with these we now get the right threading options in the headers.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.67 src/tools/gcc/Makefile:1.68
--- src/tools/gcc/Makefile:1.67 Tue May 27 09:19:30 2014
+++ src/tools/gcc/Makefile Wed May 28 07:32:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2014/05/27 09:19:30 skrll Exp $
+# $NetBSD: Makefile,v 1.68 2014/05/28 07:32:22 mrg Exp $
.include bsd.own.mk
@@ -41,7 +41,8 @@ COMMON_CONFIGURE_ARGS= --target=${MACHIN
--with-bugurl=http://www.NetBSD.org/Misc/send-pr.html \
--with-pkgversion=NetBSD nb1 20140527 \
--with-system-zlib \
- --enable-__cxa_atexit
+ --enable-__cxa_atexit \
+ --enable-libstdcxx-threads
.if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})
COMMON_CONFIGURE_ARGS+= --with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}
.endif
@@ -85,23 +86,23 @@ BUILD_MAKE=${TOOL_GMAKE}
# mknative-gcc specific stuff
#
-MKNATIVE_CONFIG_TARGET_LIBS= \
- configure-target-libstdc++-v3 \
- configure-target-libobjc
+MKNATIVE_CONFIG_TARGET_LIBS=
.if ${HAVE_GCC} == 48
-MKNATIVE_CONFIG_TARGET_LIBS += configure-target-libgcc
+MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgcc
+MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
MKNATIVE_TARGET= gcc48
-MKNATIVE_CONFIG_TARGET_LIBS+= \
- configure-target-libgomp
.elif ${HAVE_GCC} == 45
+MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
MKNATIVE_TARGET= gcc45
-MKNATIVE_CONFIG_TARGET_LIBS+= \
- configure-target-libgomp
.else
MKNATIVE_TARGET= gcc4
.endif
+MKNATIVE_CONFIG_TARGET_LIBS+= \
+ configure-target-libstdc++-v3 \
+ configure-target-libobjc
+
BINENV= /usr/bin/env -i
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed May 28 09:06:24 UTC 2014 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Intel X540-AT2. To generate a diff of this commit: cvs rdiff -u -r1.1189 -r1.1190 src/sys/dev/pci/pcidevs 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/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1189 src/sys/dev/pci/pcidevs:1.1190 --- src/sys/dev/pci/pcidevs:1.1189 Sun May 25 16:17:41 2014 +++ src/sys/dev/pci/pcidevs Wed May 28 09:06:24 2014 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1189 2014/05/25 16:17:41 njoly Exp $ +$NetBSD: pcidevs,v 1.1190 2014/05/28 09:06:24 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2824,6 +2824,7 @@ product INTEL I350_SERDES 0x1523 I350 G product INTEL I350_SGMII 0x1524 I350 Gigabit Connection product INTEL 82801J_D_BM_V 0x1525 82567V LAN Controller product INTEL 82580_QUAD_FIBER 0x1527 82580 quad-1000BaseX Ethernet +product INTEL X540_AT2 0x1528 X540-AT2 10Gbase-T Ethernet product INTEL I210_T1 0x1533 I210-T1 Ethernet Server Adapter product INTEL I210_COPPER_OEM1 0x1534 I210 Ethernet (COPPER OEM) product INTEL I210_COPPER_IT 0x1535 I210 Ethernet (COPPER IT)
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Wed May 28 09:49:55 UTC 2014 Modified Files: src/sys/dev/mii: miivar.h Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/dev/mii/miivar.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/mii/miivar.h diff -u src/sys/dev/mii/miivar.h:1.61 src/sys/dev/mii/miivar.h:1.62 --- src/sys/dev/mii/miivar.h:1.61 Fri Mar 15 06:18:13 2013 +++ src/sys/dev/mii/miivar.h Wed May 28 09:49:55 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: miivar.h,v 1.61 2013/03/15 06:18:13 msaitoh Exp $ */ +/* $NetBSD: miivar.h,v 1.62 2014/05/28 09:49:55 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ #include dev/mii/mii_verbose.h /* - * Media Independent Interface datat structure definitions. + * Media Independent Interface data structure definitions. */ struct ifnet;
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Wed May 28 09:38:46 UTC 2014 Modified Files: src/distrib/sets/lists/comp: ad.powerpc Log Message: add new htmintrin.h and htmxlintrin.h files for GCC 4.8.3. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/comp/ad.powerpc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/ad.powerpc diff -u src/distrib/sets/lists/comp/ad.powerpc:1.67 src/distrib/sets/lists/comp/ad.powerpc:1.68 --- src/distrib/sets/lists/comp/ad.powerpc:1.67 Thu May 15 16:32:28 2014 +++ src/distrib/sets/lists/comp/ad.powerpc Wed May 28 09:38:46 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.powerpc,v 1.67 2014/05/15 16:32:28 apb Exp $ +# $NetBSD: ad.powerpc,v 1.68 2014/05/28 09:38:46 mrg Exp $ ./usr/bin/elf2aoutcomp-sysutil-bin ./usr/bin/psim comp-debug-bin gdb ./usr/include/altivec.hcomp-obsolete obsolete @@ -24,6 +24,8 @@ ./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 ./usr/include/gcc-4.5/vec_types.h comp-c-include gcccmds,gcc=45 ./usr/include/gcc-4.8/altivec.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-4.8/htmintrin.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-4.8/htmxlintrin.h comp-c-include gcccmds,gcc=48 ./usr/include/gcc-4.8/paired.h comp-c-include gcccmds,gcc=48 ./usr/include/gcc-4.8/ppc-asm.h comp-c-include gcccmds,gcc=48 ./usr/include/gcc-4.8/ppu_intrinsics.h comp-c-include gcccmds,gcc=48
CVS commit: src/external/bsd/openldap/dist
Module Name:src Committed By: tron Date: Wed May 28 10:12:43 UTC 2014 Modified Files: src/external/bsd/openldap/dist/build: mkversion src/external/bsd/openldap/dist/clients/tools: common.c src/external/bsd/openldap/dist/include: Makefile.in ldap_queue.h portable.hin src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c tls_o.c src/external/bsd/openldap/dist/libraries/liblutil: detach.c md5.c passwd.c Removed Files: src/external/bsd/openldap/dist/contrib/ldapc++: LICENSE src/external/bsd/openldap/dist/contrib/slapd-modules/acl: README src/external/bsd/openldap/dist/doc/guide: COPYRIGHT LICENSE src/external/bsd/openldap/dist/libraries/libldap_r: thr_lwp.c src/external/bsd/openldap/dist/libraries/liblutil: fetch.c ldif.c Log Message: Resolve conflicts from last import. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/dist/build/mkversion cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/openldap/dist/clients/tools/common.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/openldap/dist/contrib/ldapc++/LICENSE cvs rdiff -u -r1.1.1.3 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/acl/README cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/openldap/dist/doc/guide/COPYRIGHT cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/openldap/dist/doc/guide/LICENSE cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/dist/include/Makefile.in \ src/external/bsd/openldap/dist/include/portable.hin cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/dist/include/ldap_queue.h cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/openldap/dist/libraries/libldap/os-ip.c cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/openldap/dist/libraries/libldap/os-local.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/openldap/dist/libraries/libldap/tls_o.c cvs rdiff -u -r1.1.1.3 -r0 \ src/external/bsd/openldap/dist/libraries/libldap_r/thr_lwp.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/openldap/dist/libraries/liblutil/detach.c \ src/external/bsd/openldap/dist/libraries/liblutil/md5.c cvs rdiff -u -r1.1.1.3 -r0 \ src/external/bsd/openldap/dist/libraries/liblutil/fetch.c \ src/external/bsd/openldap/dist/libraries/liblutil/ldif.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/openldap/dist/libraries/liblutil/passwd.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/openldap/dist/build/mkversion diff -u src/external/bsd/openldap/dist/build/mkversion:1.4 src/external/bsd/openldap/dist/build/mkversion:1.5 --- src/external/bsd/openldap/dist/build/mkversion:1.4 Sun Dec 12 15:46:27 2010 +++ src/external/bsd/openldap/dist/build/mkversion Wed May 28 10:12:43 2014 @@ -1,9 +1,9 @@ #! /bin/sh # Create a version.c file -# OpenLDAP: pkg/ldap/build/mkversion,v 1.14.2.5 2010/04/13 20:22:21 kurt Exp +# $OpenLDAP$ ## This work is part of OpenLDAP Software http://www.openldap.org/. ## -## Copyright 1998-2010 The OpenLDAP Foundation. +## Copyright 1998-2014 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -54,7 +54,7 @@ APPLICATION=$1 cat __EOF__ /* This work is part of OpenLDAP Software http://www.openldap.org/. * - * Copyright 1998-2010 The OpenLDAP Foundation. + * Copyright 1998-2014 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -67,7 +67,7 @@ cat __EOF__ */ static const char copyright[] = -Copyright 1998-2010 The OpenLDAP Foundation. All rights reserved.\n +Copyright 1998-2014 The OpenLDAP Foundation. All rights reserved.\n COPYING RESTRICTIONS APPLY\n; $static $const char $SYMBOL[] = Index: src/external/bsd/openldap/dist/clients/tools/common.c diff -u src/external/bsd/openldap/dist/clients/tools/common.c:1.3 src/external/bsd/openldap/dist/clients/tools/common.c:1.4 --- src/external/bsd/openldap/dist/clients/tools/common.c:1.3 Sun Dec 12 15:46:28 2010 +++ src/external/bsd/openldap/dist/clients/tools/common.c Wed May 28 10:12:43 2014 @@ -1,10 +1,10 @@ -/* $NetBSD: common.c,v 1.3 2010/12/12 15:46:28 adam Exp $ */ +/* $NetBSD: common.c,v 1.4 2014/05/28 10:12:43 tron Exp $ */ /* common.c - common routines for the ldap client tools */ -/* OpenLDAP: pkg/ldap/clients/tools/common.c,v 1.78.2.31 2010/04/15 22:16:49 quanah Exp */ +/* $OpenLDAP$ */ /* This work is part of OpenLDAP Software http://www.openldap.org/. * - * Copyright 1998-2010 The OpenLDAP Foundation. + * Copyright 1998-2014 The OpenLDAP Foundation. * Portions Copyright 2003 Kurt D. Zeilenga. * Portions Copyright 2003 IBM Corporation. * All rights reserved. @@ -68,6 +68,7 @@ int nocanon = 0; int referrals = 0; int verbose = 0; int ldif = 0; +ber_len_t ldif_wrap = LDIF_LINE_WIDTH; char *prog =
CVS commit: src/external/bsd/openldap/dist/libraries/librewrite
Module Name:src
Committed By: tron
Date: Wed May 28 10:14:13 UTC 2014
Modified Files:
src/external/bsd/openldap/dist/libraries/librewrite: session.c
Log Message:
Apply patch to fix CVE-2013-4449. This shouldn't be necessary as we don't
build the server or its plug-ins. But it is better to be safe in case
this changes.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/openldap/dist/libraries/librewrite/session.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/openldap/dist/libraries/librewrite/session.c
diff -u src/external/bsd/openldap/dist/libraries/librewrite/session.c:1.1.1.4 src/external/bsd/openldap/dist/libraries/librewrite/session.c:1.2
--- src/external/bsd/openldap/dist/libraries/librewrite/session.c:1.1.1.4 Wed May 28 09:58:45 2014
+++ src/external/bsd/openldap/dist/libraries/librewrite/session.c Wed May 28 10:14:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: session.c,v 1.1.1.4 2014/05/28 09:58:45 tron Exp $ */
+/* $NetBSD: session.c,v 1.2 2014/05/28 10:14:13 tron Exp $ */
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software http://www.openldap.org/.
@@ -163,6 +163,7 @@ rewrite_session_find(
#ifdef USE_REWRITE_LDAP_PVT_THREADS
if ( session ) {
ldap_pvt_thread_mutex_lock( session-ls_mutex );
+ session-ls_count++;
}
ldap_pvt_thread_rdwr_runlock( info-li_cookies_mutex );
#endif /* USE_REWRITE_LDAP_PVT_THREADS */
@@ -180,6 +181,7 @@ rewrite_session_return(
)
{
assert( session != NULL );
+ session-ls_count--;
ldap_pvt_thread_mutex_unlock( session-ls_mutex );
}
CVS commit: src/sys/miscfs/genfs
Module Name:src
Committed By: hannken
Date: Wed May 28 10:51:20 UTC 2014
Modified Files:
src/sys/miscfs/genfs: layer.h
Log Message:
Change field layerm_tag to correct type enum vtagtype.
CID 1216449: Mixing enum types
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/miscfs/genfs/layer.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/miscfs/genfs/layer.h
diff -u src/sys/miscfs/genfs/layer.h:1.15 src/sys/miscfs/genfs/layer.h:1.16
--- src/sys/miscfs/genfs/layer.h:1.15 Sun May 25 13:51:25 2014
+++ src/sys/miscfs/genfs/layer.h Wed May 28 10:51:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: layer.h,v 1.15 2014/05/25 13:51:25 hannken Exp $ */
+/* $NetBSD: layer.h,v 1.16 2014/05/28 10:51:20 hannken Exp $ */
/*
* Copyright (c) 1999 National Aeronautics Space Administration
@@ -83,7 +83,7 @@ struct layer_mount {
struct vnode *layerm_rootvp; /* Ref to root layer_node */
u_int layerm_flags; /* mount point layer flags */
u_int layerm_size; /* size of fs's struct node */
- enum vtype layerm_tag; /* vtag of our vnodes */
+ enum vtagtype layerm_tag; /* vtag of our vnodes */
int/* bypass routine for this mount */
(*layerm_bypass)(void *);
int (**layerm_vnodeop_p) /* ops for our nodes */
CVS commit: src/distrib/utils/sysinst/arch/vax
Module Name:src
Committed By: martin
Date: Wed May 28 11:16:03 UTC 2014
Modified Files:
src/distrib/utils/sysinst/arch/vax: md.c
Log Message:
Enable swap during sysinst as early as possible
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/distrib/utils/sysinst/arch/vax/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/vax/md.c
diff -u src/distrib/utils/sysinst/arch/vax/md.c:1.40 src/distrib/utils/sysinst/arch/vax/md.c:1.41
--- src/distrib/utils/sysinst/arch/vax/md.c:1.40 Sat Feb 15 19:45:43 2014
+++ src/distrib/utils/sysinst/arch/vax/md.c Wed May 28 11:16:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.40 2014/02/15 19:45:43 tsutsui Exp $ */
+/* $NetBSD: md.c,v 1.41 2014/05/28 11:16:03 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -143,6 +143,9 @@ md_pre_disklabel(void)
int
md_post_disklabel(void)
{
+ if (get_ramsize() = 32)
+ set_swap(diskdev, bsdlabel);
+
return 0;
}
@@ -179,6 +182,9 @@ md_cleanup_install(void)
int
md_pre_update(void)
{
+ if (get_ramsize() = 32)
+ set_swap(diskdev, NULL);
+
return 1;
}
CVS commit: src/external/bsd/openldap
Module Name:src
Committed By: tron
Date: Wed May 28 11:32:20 UTC 2014
Modified Files:
src/external/bsd/openldap: openldap.mk
src/external/bsd/openldap/bin: Makefile.inc
src/external/bsd/openldap/lib/liblber: shlib_version
src/external/bsd/openldap/lib/libldap: Makefile Makefile.libldap
shlib_version
src/external/bsd/openldap/lib/libldap_r: Makefile shlib_version
src/external/bsd/openldap/lib/liblutil: Makefile
Log Message:
Update for building OpenLDAP 2.4.39.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/openldap.mk
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/bin/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/liblber/shlib_version
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/lib/libldap/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/lib/libldap/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/libldap_r/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/lib/libldap_r/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/liblutil/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/openldap/openldap.mk
diff -u src/external/bsd/openldap/openldap.mk:1.5 src/external/bsd/openldap/openldap.mk:1.6
--- src/external/bsd/openldap/openldap.mk:1.5 Sun Dec 12 16:10:42 2010
+++ src/external/bsd/openldap/openldap.mk Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: openldap.mk,v 1.5 2010/12/12 16:10:42 adam Exp $
+# $NetBSD: openldap.mk,v 1.6 2014/05/28 11:32:19 tron Exp $
.include bsd.own.mk
@@ -16,7 +16,7 @@ LDAP_RUNDIR= /var/openldap
CPPFLAGS+= -I${LDAP_SRCDIR}/include
CPPFLAGS+= -I${LDAP_DISTDIR}/include
-.for _LIB in lutil # XXX lber ldap ldap_r lunicode rewrite
+.for _LIB in lutil ldap # XXX lber ldap_r lunicode rewrite
.if !defined(LDAPOBJDIR.${_LIB})
LDAPOBJDIR.${_LIB}!= cd ${LDAP_SRCDIR}/lib/lib${_LIB} ${PRINTOBJDIR}
.MAKEOVERRIDES+= LDAPOBJDIR.${_LIB}
Index: src/external/bsd/openldap/bin/Makefile.inc
diff -u src/external/bsd/openldap/bin/Makefile.inc:1.4 src/external/bsd/openldap/bin/Makefile.inc:1.5
--- src/external/bsd/openldap/bin/Makefile.inc:1.4 Wed Sep 11 23:04:10 2013
+++ src/external/bsd/openldap/bin/Makefile.inc Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2013/09/11 23:04:10 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2014/05/28 11:32:19 tron Exp $
.include ../openldap.mk
@@ -24,7 +24,7 @@ version.c: ../openldap.mk
LDADD+= -L${LDAPOBJDIR.lutil} -llutil
DPADD+= ${LDAPLIB.lutil}
-LDADD+= -lldap
+LDADD+= -L${LDAPOBJDIR.ldap} -lldap
DPADD+= ${LIBLDAP}
LDADD+= -llber
DPADD+= ${LIBLBER}
Index: src/external/bsd/openldap/lib/liblber/shlib_version
diff -u src/external/bsd/openldap/lib/liblber/shlib_version:1.4 src/external/bsd/openldap/lib/liblber/shlib_version:1.5
--- src/external/bsd/openldap/lib/liblber/shlib_version:1.4 Sun Dec 12 16:19:54 2010
+++ src/external/bsd/openldap/lib/liblber/shlib_version Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.4 2010/12/12 16:19:54 adam Exp $
+# $NetBSD: shlib_version,v 1.5 2014/05/28 11:32:19 tron Exp $
#
major=3
-minor=2
+minor=3
Index: src/external/bsd/openldap/lib/libldap/Makefile
diff -u src/external/bsd/openldap/lib/libldap/Makefile:1.3 src/external/bsd/openldap/lib/libldap/Makefile:1.4
--- src/external/bsd/openldap/lib/libldap/Makefile:1.3 Thu May 26 12:56:26 2011
+++ src/external/bsd/openldap/lib/libldap/Makefile Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/05/26 12:56:26 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2014/05/28 11:32:19 tron Exp $
USE_FORT?= yes
@@ -11,7 +11,7 @@ LIB= ldap
.PATH: ${LDAP_SRCDIR}/man
MAN= ldap.3 ldap_abandon.3 ldap_add.3 ldap_bind.3 ldap_compare.3 \
- ldap_delete.3 ldap_error.3 ldap_first_attribute.3 \
+ ldap_delete.3 ldap_dup.3 ldap_error.3 ldap_first_attribute.3 \
ldap_first_entry.3 ldap_first_message.3 \
ldap_first_reference.3 ldap_get_dn.3 ldap_get_values.3 \
ldap_modify.3 ldap_modrdn.3 ldap_open.3 \
Index: src/external/bsd/openldap/lib/libldap/Makefile.libldap
diff -u src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.6 src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.7
--- src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.6 Mon Mar 8 05:18:17 2010
+++ src/external/bsd/openldap/lib/libldap/Makefile.libldap Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libldap,v 1.6 2010/03/08 05:18:17 lukem Exp $
+# $NetBSD: Makefile.libldap,v 1.7 2014/05/28 11:32:19 tron Exp $
.include ../../openldap.mk
@@ -15,7 +15,7 @@ SRCS+= bind.c open.c result.c error.c c
init.c options.c print.c string.c util-int.c schema.c \
charray.c os-local.c dnssrv.c utf-8.c
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: tron Date: Wed May 28 11:32:51 UTC 2014 Modified Files: src/distrib/sets/lists/base: ad.arm ad.mips ad.powerpc md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: ad.arm ad.mips ad.powerpc md.amd64 md.sparc64 shl.mi Log Message: Update for OpenLDAP 2.4.39. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.233 -r1.234 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.220 -r1.221 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.702 -r1.703 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1893 -r1.1894 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.62 -r1.63 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.43 src/distrib/sets/lists/base/ad.arm:1.44 --- src/distrib/sets/lists/base/ad.arm:1.43 Sun May 18 10:36:34 2014 +++ src/distrib/sets/lists/base/ad.arm Wed May 28 11:32:50 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.43 2014/05/18 10:36:34 nat Exp $ +# $NetBSD: ad.arm,v 1.44 2014/05/28 11:32:50 tron 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 @@ -186,11 +186,11 @@ ./usr/lib/oabi/libkvm.so.6 base-compat-shlib compat,pic ./usr/lib/oabi/libkvm.so.6.0 base-compat-shlib compat,pic ./usr/lib/oabi/liblber.so.3 base-compat-shlib compat,pic,ldap -./usr/lib/oabi/liblber.so.3.2 base-compat-shlib compat,pic,ldap +./usr/lib/oabi/liblber.so.3.3 base-compat-shlib compat,pic,ldap ./usr/lib/oabi/libldap.so.4 base-compat-shlib compat,pic,ldap -./usr/lib/oabi/libldap.so.4.2 base-compat-shlib compat,pic,ldap +./usr/lib/oabi/libldap.so.4.3 base-compat-shlib compat,pic,ldap ./usr/lib/oabi/libldap_r.so.4 base-compat-shlib compat,pic,ldap -./usr/lib/oabi/libldap_r.so.4.2 base-compat-shlib compat,pic,ldap +./usr/lib/oabi/libldap_r.so.4.3 base-compat-shlib compat,pic,ldap ./usr/lib/oabi/liblua.so.1 base-compat-shlib compat,pic ./usr/lib/oabi/liblua.so.1.0 base-compat-shlib compat,pic ./usr/lib/oabi/liblutok.so.1 base-obsolete obsolete Index: src/distrib/sets/lists/base/ad.mips diff -u src/distrib/sets/lists/base/ad.mips:1.39 src/distrib/sets/lists/base/ad.mips:1.40 --- src/distrib/sets/lists/base/ad.mips:1.39 Sun May 18 10:36:34 2014 +++ src/distrib/sets/lists/base/ad.mips Wed May 28 11:32:50 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.39 2014/05/18 10:36:34 nat Exp $ +# $NetBSD: ad.mips,v 1.40 2014/05/28 11:32:50 tron 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 @@ -186,11 +186,11 @@ ./usr/lib/64/libkvm.so.6 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libkvm.so.6.0 base-compat-shlib compat,pic,arch64 ./usr/lib/64/liblber.so.3 base-compat-shlib compat,pic,ldap,arch64 -./usr/lib/64/liblber.so.3.2 base-compat-shlib compat,pic,ldap,arch64 +./usr/lib/64/liblber.so.3.3 base-compat-shlib compat,pic,ldap,arch64 ./usr/lib/64/libldap.so.4 base-compat-shlib compat,pic,ldap,arch64 -./usr/lib/64/libldap.so.4.2 base-compat-shlib compat,pic,ldap,arch64 +./usr/lib/64/libldap.so.4.3 base-compat-shlib compat,pic,ldap,arch64 ./usr/lib/64/libldap_r.so.4 base-compat-shlib compat,pic,ldap,arch64 -./usr/lib/64/libldap_r.so.4.2 base-compat-shlib compat,pic,ldap,arch64 +./usr/lib/64/libldap_r.so.4.3 base-compat-shlib compat,pic,ldap,arch64 ./usr/lib/64/liblua.so.1 base-compat-shlib compat,pic,arch64 ./usr/lib/64/liblua.so.1.0 base-compat-shlib compat,pic,arch64 ./usr/lib/64/liblutok.so.1 base-obsolete obsolete @@ -520,11 +520,11 @@ ./usr/lib/o32/libkvm.so.6 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libkvm.so.6.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/liblber.so.3 base-compat-shlib compat,pic,ldap,arch64 -./usr/lib/o32/liblber.so.3.2 base-compat-shlib compat,pic,ldap,arch64 +./usr/lib/o32/liblber.so.3.3 base-compat-shlib compat,pic,ldap,arch64 ./usr/lib/o32/libldap.so.4 base-compat-shlib compat,pic,ldap,arch64 -./usr/lib/o32/libldap.so.4.2 base-compat-shlib compat,pic,ldap,arch64 +./usr/lib/o32/libldap.so.4.3 base-compat-shlib compat,pic,ldap,arch64
CVS commit: src/doc
Module Name:src Committed By: tron Date: Wed May 28 11:35:50 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: OpenLDAP 2.4.39 was imported. To generate a diff of this commit: cvs rdiff -u -r1.1114 -r1.1115 src/doc/3RDPARTY cvs rdiff -u -r1.1927 -r1.1928 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.1114 src/doc/3RDPARTY:1.1115 --- src/doc/3RDPARTY:1.1114 Tue May 27 09:24:56 2014 +++ src/doc/3RDPARTY Wed May 28 11:35:50 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1114 2014/05/27 09:24:56 skrll Exp $ +# $NetBSD: 3RDPARTY,v 1.1115 2014/05/28 11:35:50 tron Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -880,8 +880,8 @@ Notes: We have lots of local fixes. Package: OpenLDAP -Version: 2.4.23 -Current Vers: 2.4.38 +Version: 2.4.39 +Current Vers: 2.4.39 Maintainer: OpenLDAP Foundation Archive Site: http://www.openldap.org/ Home Page: http://www.openldap.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1927 src/doc/CHANGES:1.1928 --- src/doc/CHANGES:1.1927 Tue May 27 09:23:10 2014 +++ src/doc/CHANGES Wed May 28 11:35:50 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1927 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1928 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -422,3 +422,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: envsys(4): Add %rH (relative Humidity) to sensor framework. [kardel 20140518] gcc(1): Import version 4.8.3. [skrll 20140527] + openldap: Import 2.4.39 [tron 20140528]
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: skrll Date: Wed May 28 12:06:24 UTC 2014 Removed Files: src/sys/arch/mips/include: bus_dma.h Log Message: Remove unused file. To generate a diff of this commit: cvs rdiff -u -r1.10 -r0 src/sys/arch/mips/include/bus_dma.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed May 28 13:59:06 UTC 2014 Modified Files: src/sys/dev/pci: pcidevs Log Message: - Add some Intel devices (Sandy Bridge, 6702PXH, X38 and Pineview) - Add ITE IT8213 To generate a diff of this commit: cvs rdiff -u -r1.1190 -r1.1191 src/sys/dev/pci/pcidevs 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/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1190 src/sys/dev/pci/pcidevs:1.1191 --- src/sys/dev/pci/pcidevs:1.1190 Wed May 28 09:06:24 2014 +++ src/sys/dev/pci/pcidevs Wed May 28 13:59:06 2014 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1190 2014/05/28 09:06:24 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1191 2014/05/28 13:59:06 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2538,7 +2538,10 @@ product INTEL WIFI_LINK_1030_2 0x008b Ce product INTEL WIFI_LINK_6230_1 0x0090 Centrino Advanced-N 6230 product INTEL WIFI_LINK_6230_2 0x0091 Centrino Advanced-N 6230 product INTEL SANDYBRIDGE_HB 0x0100 Sandy Bridge Host Bridge +product INTEL SANDYBRIDGE_PCIE 0x0101 Sandy Bridge PCIe Root port product INTEL SANDYBRIDGE_IGD 0x0102 Sandy Bridge Integrated Graphics Device +product INTEL SANDYBRIDGE_PCIE_1 0x0105 Sandy Bridge PCIe Root port +product INTEL SANDYBRIDGE_PCIE_2 0x0109 Sandy Bridge PCIe Root port product INTEL SANDYBRIDGE_IGD_1 0x0112 Sandy Bridge Integrated Graphics Device product INTEL SANDYBRIDGE_IGD_2 0x0122 Sandy Bridge Integrated Graphics Device product INTEL SANDYBRIDGE_M_HB 0x0104 Sandy Bridge Host Bridge @@ -2562,8 +2565,10 @@ product INTEL IVYBRIDGE_M_IGD_1 0x0166 I product INTEL IVYBRIDGE_S_IGD_1 0x016a Ivy Bridge Integrated Graphics Device product INTEL 80312 0x030d 80312 I/O Companion Chip product INTEL 80321 0x0319 80321 I/O Processor +product INTEL 6700PXH_IOXAPIC 0x0326 6700PXH IOxAPIC product INTEL 6700PXH_PCIE0 0x0329 6700PXH PCI Express-to-PCI Bridge #0 product INTEL 6700PXH_PCIE1 0x032a 6700PXH PCI Express-to-PCI Bridge #1 +product INTEL 6702PXH_PCIX 0x032c 6702PXH PCI Express-to-PCIX product INTEL 80331 0x0335 Lindsay I/O Processor PCI-X Bridge product INTEL 41210A 0x0340 Serial to Parallel PCI Bridge A product INTEL 41210B 0x0341 Serial to Parallel PCI Bridge B @@ -3316,6 +3321,7 @@ product INTEL 82Q33_EXP 0x29d1 82Q35 P product INTEL 82Q33_IGD 0x29d2 82Q35 Integrated Graphics Device product INTEL 82Q33_IGD_1 0x29d3 82Q35 Integrated Graphics Device product INTEL 82Q33_KT 0x29d7 82Q33 KT +product INTEL 82X38_HB 0x29e0 82X38 Host Bridge product INTEL 82X38_KT 0x29e7 82X38 KT product INTEL 3200_KT 0x29f7 3200 KT product INTEL 82965PM_HB 0x2a00 82965PM Host Bridge @@ -3679,6 +3685,7 @@ product INTEL CORE4G_M_S_GSPI_0 0x9c65 C product INTEL CORE4G_M_S_GSPI_1 0x9c66 Core 4G (mobile) Serial I/O GSPI product INTEL PINEVIEW_HB 0xa000 Pineview Host Bridge product INTEL PINEVIEW_IGD 0xa001 Pineview Integrated Graphics Device +product INTEL PINEVIEW_IGD_1 0xa002 Pineview Integrated Graphics Device product INTEL PINEVIEW_M_HB 0xa010 Pineview Host Bridge product INTEL PINEVIEW_M_IGD 0xa011 Pineview Integrated Graphics Device product INTEL 21152 0xb152 S21152BB PCI-PCI Bridge @@ -3715,6 +3722,7 @@ product IODATA GVBCTV5DL 0xd012 GV-BCTV5 product ITE IT8152 0x8152 IT8152 Host Bridge product ITE IT8211 0x8211 IT8211 IDE Controller product ITE IT8212 0x8212 IT8212 IDE Controller +product ITE IT8213 0x8213 IT8213 IDE Controller product ITE IT 0x PCI-ISA Bridge product ITE IT8892 0x8892 PCIe-PCI Bridge
CVS commit: src/external/bsd/wpa/dist/src/drivers
Module Name:src
Committed By: christos
Date: Wed May 28 14:36:41 UTC 2014
Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c
Log Message:
CID 272959: NULL deref
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/wpa/dist/src/drivers/driver_bsd.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/wpa/dist/src/drivers/driver_bsd.c
diff -u src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.7 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.8
--- src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.7 Thu Jan 2 21:08:17 2014
+++ src/external/bsd/wpa/dist/src/drivers/driver_bsd.c Wed May 28 10:36:41 2014
@@ -853,12 +853,13 @@ bsd_init(struct hostapd_data *hapd, stru
return drv;
bad:
- if (drv-sock_xmit != NULL)
- l2_packet_deinit(drv-sock_xmit);
- if (drv-sock = 0)
- close(drv-sock);
- if (drv != NULL)
+ if (drv != NULL) {
+ if (drv-sock_xmit != NULL)
+ l2_packet_deinit(drv-sock_xmit);
+ if (drv-sock = 0)
+ close(drv-sock);
os_free(drv);
+ }
return NULL;
}
CVS commit: src/lib/libc/net
Module Name:src Committed By: christos Date: Wed May 28 14:39:02 UTC 2014 Modified Files: src/lib/libc/net: rcmd.c Log Message: CID 975111: Ignore return value from initgroups(). If we failed, then the failure would be that we could not open the .rhosts file so we fail closed. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/lib/libc/net/rcmd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/net/rcmd.c diff -u src/lib/libc/net/rcmd.c:1.68 src/lib/libc/net/rcmd.c:1.69 --- src/lib/libc/net/rcmd.c:1.68 Sat Jul 14 11:06:26 2012 +++ src/lib/libc/net/rcmd.c Wed May 28 10:39:02 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rcmd.c,v 1.68 2012/07/14 15:06:26 darrenr Exp $ */ +/* $NetBSD: rcmd.c,v 1.69 2014/05/28 14:39:02 christos Exp $ */ /* * Copyright (c) 1983, 1993, 1994 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = @(#)rcmd.c 8.3 (Berkeley) 3/26/94; #else -__RCSID($NetBSD: rcmd.c,v 1.68 2012/07/14 15:06:26 darrenr Exp $); +__RCSID($NetBSD: rcmd.c,v 1.69 2014/05/28 14:39:02 christos Exp $); #endif #endif /* LIBC_SCCS and not lint */ @@ -698,7 +698,7 @@ iruserok_sa(const void *raddr, int rlen, uid = geteuid(); gid = getegid(); (void)setegid(pwd-pw_gid); - initgroups(pwd-pw_name, pwd-pw_gid); + (void)initgroups(pwd-pw_name, pwd-pw_gid); (void)seteuid(pwd-pw_uid); hostf = fopen(pbuf, r);
CVS commit: src/lib/libc/rpc
Module Name:src
Committed By: christos
Date: Wed May 28 14:41:48 UTC 2014
Modified Files:
src/lib/libc/rpc: clnt_generic.c
Log Message:
CID 975112: Ignore bindresvport() return. This is can only succeed for root
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/rpc/clnt_generic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/rpc/clnt_generic.c
diff -u src/lib/libc/rpc/clnt_generic.c:1.31 src/lib/libc/rpc/clnt_generic.c:1.32
--- src/lib/libc/rpc/clnt_generic.c:1.31 Tue May 7 17:08:45 2013
+++ src/lib/libc/rpc/clnt_generic.c Wed May 28 10:41:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: clnt_generic.c,v 1.31 2013/05/07 21:08:45 christos Exp $ */
+/* $NetBSD: clnt_generic.c,v 1.32 2014/05/28 14:41:47 christos Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = @(#)clnt_generic.c 1.32 89/03/16 Copyr 1988 Sun Micro;
#else
-__RCSID($NetBSD: clnt_generic.c,v 1.31 2013/05/07 21:08:45 christos Exp $);
+__RCSID($NetBSD: clnt_generic.c,v 1.32 2014/05/28 14:41:47 christos Exp $);
#endif
#endif
@@ -321,7 +321,7 @@ clnt_tli_create(
if (!__rpc_fd2sockinfo(fd, si))
goto err;
- bindresvport(fd, NULL);
+ (void)bindresvport(fd, NULL);
} else {
if (!__rpc_fd2sockinfo(fd, si))
goto err;
CVS commit: src/lib/libc/rpc
Module Name:src Committed By: christos Date: Wed May 28 14:45:20 UTC 2014 Modified Files: src/lib/libc/rpc: clnt_generic.c Log Message: CID 975113: Ignore __rpc_setnodelay error, it is not fatal To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/lib/libc/rpc/clnt_generic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/rpc/clnt_generic.c diff -u src/lib/libc/rpc/clnt_generic.c:1.32 src/lib/libc/rpc/clnt_generic.c:1.33 --- src/lib/libc/rpc/clnt_generic.c:1.32 Wed May 28 10:41:47 2014 +++ src/lib/libc/rpc/clnt_generic.c Wed May 28 10:45:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: clnt_generic.c,v 1.32 2014/05/28 14:41:47 christos Exp $ */ +/* $NetBSD: clnt_generic.c,v 1.33 2014/05/28 14:45:19 christos Exp $ */ /* * Copyright (c) 2010, Oracle America, Inc. @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = @(#)clnt_generic.c 1.32 89/03/16 Copyr 1988 Sun Micro; #else -__RCSID($NetBSD: clnt_generic.c,v 1.32 2014/05/28 14:41:47 christos Exp $); +__RCSID($NetBSD: clnt_generic.c,v 1.33 2014/05/28 14:45:19 christos Exp $); #endif #endif @@ -343,7 +343,7 @@ clnt_tli_create( cl = clnt_vc_create(fd, svcaddr, prog, vers, sendsz, recvsz); if (!nconf || !cl) break; - __rpc_setnodelay(fd, si); + (void)__rpc_setnodelay(fd, si); break; case NC_TPI_CLTS: cl = clnt_dg_create(fd, svcaddr, prog, vers, sendsz, recvsz);
CVS commit: src/lib/libc/rpc
Module Name:src
Committed By: christos
Date: Wed May 28 14:45:57 UTC 2014
Modified Files:
src/lib/libc/rpc: rpc_soc.c
Log Message:
CID 97511{4,5}: Ignore bindresvport return. It only works for root.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/rpc/rpc_soc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/rpc/rpc_soc.c
diff -u src/lib/libc/rpc/rpc_soc.c:1.18 src/lib/libc/rpc/rpc_soc.c:1.19
--- src/lib/libc/rpc/rpc_soc.c:1.18 Mon Mar 11 16:19:29 2013
+++ src/lib/libc/rpc/rpc_soc.c Wed May 28 10:45:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_soc.c,v 1.18 2013/03/11 20:19:29 tron Exp $ */
+/* $NetBSD: rpc_soc.c,v 1.19 2014/05/28 14:45:57 christos Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -45,7 +45,7 @@
#if 0
static char sccsid[] = @(#)rpc_soc.c 1.41 89/05/02 Copyr 1988 Sun Micro;
#else
-__RCSID($NetBSD: rpc_soc.c,v 1.18 2013/03/11 20:19:29 tron Exp $);
+__RCSID($NetBSD: rpc_soc.c,v 1.19 2014/05/28 14:45:57 christos Exp $);
#endif
#endif
@@ -156,7 +156,7 @@ clnt_com_create(struct sockaddr_in *radd
bindaddr.maxlen = bindaddr.len = sizeof (struct sockaddr_in);
bindaddr.buf = raddr;
- bindresvport(fd, NULL);
+ (void)bindresvport(fd, NULL);
cl = clnt_tli_create(fd, nconf, bindaddr, prog, vers,
sendsz, recvsz);
if (cl) {
@@ -254,7 +254,7 @@ svc_com_create(int fd, u_int sendsize, u
memset(sccsin, 0, sizeof sccsin);
sccsin.sin_family = AF_INET;
- bindresvport(fd, sccsin);
+ (void)bindresvport(fd, sccsin);
listen(fd, SOMAXCONN);
svc = svc_tli_create(fd, nconf, NULL, sendsize, recvsize);
(void) freenetconfigent(nconf);
CVS commit: src/lib/libc/rpc
Module Name:src
Committed By: christos
Date: Wed May 28 14:49:28 UTC 2014
Modified Files:
src/lib/libc/rpc: svc_generic.c
Log Message:
CID 975117: check listen(2) return .
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/rpc/svc_generic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/rpc/svc_generic.c
diff -u src/lib/libc/rpc/svc_generic.c:1.15 src/lib/libc/rpc/svc_generic.c:1.16
--- src/lib/libc/rpc/svc_generic.c:1.15 Mon Mar 11 16:19:29 2013
+++ src/lib/libc/rpc/svc_generic.c Wed May 28 10:49:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: svc_generic.c,v 1.15 2013/03/11 20:19:29 tron Exp $ */
+/* $NetBSD: svc_generic.c,v 1.16 2014/05/28 14:49:28 christos Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro;
#else
-__RCSID($NetBSD: svc_generic.c,v 1.15 2013/03/11 20:19:29 tron Exp $);
+__RCSID($NetBSD: svc_generic.c,v 1.16 2014/05/28 14:49:28 christos Exp $);
#endif
#endif
@@ -251,7 +251,11 @@ svc_tli_create(
goto freedata;
}
}
- listen(fd, SOMAXCONN);
+ if (listen(fd, SOMAXCONN) == -1) {
+warnx(%s: could not listen at anonymous port,
+__func__);
+goto freedata;
+ }
} else {
if (bind(fd,
(struct sockaddr *)bindaddr-addr.buf,
@@ -260,9 +264,12 @@ svc_tli_create(
__func__);
goto freedata;
}
- listen(fd, (int)bindaddr-qlen);
+ if (listen(fd, (int)bindaddr-qlen) == -1) {
+warnx(%s: could not listen at requested
+address, __func__);
+goto freedata;
+ }
}
-
}
/*
* call transport specific function.
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Wed May 28 14:55:16 UTC 2014
Modified Files:
src/sys/sys: socket.h
Log Message:
CID 976378: Avoid incorrect computation with ngrps == 0
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/sys/socket.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/socket.h
diff -u src/sys/sys/socket.h:1.109 src/sys/sys/socket.h:1.110
--- src/sys/sys/socket.h:1.109 Thu Apr 17 12:14:22 2014
+++ src/sys/sys/socket.h Wed May 28 10:55:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.h,v 1.109 2014/04/17 16:14:22 christos Exp $ */
+/* $NetBSD: socket.h,v 1.110 2014/05/28 14:55:16 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -341,7 +341,8 @@ struct sockcred {
* Compute size of a sockcred structure with groups.
*/
#define SOCKCREDSIZE(ngrps) \
- (sizeof(struct sockcred) + (sizeof(gid_t) * ((ngrps) - 1)))
+ (sizeof(struct sockcred) + (sizeof(gid_t) * \
+ ((ngrps) ? ((ngrps) - 1) : 0)))
#endif /* _NETBSD_SOURCE */
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: riastradh
Date: Wed May 28 15:34:32 UTC 2014
Modified Files:
src/sys/dev/pci: agp_i810.c
Log Message:
Cosmetics: long lines, needless variables, PCI parameter verbiage.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/pci/agp_i810.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/pci/agp_i810.c
diff -u src/sys/dev/pci/agp_i810.c:1.82 src/sys/dev/pci/agp_i810.c:1.83
--- src/sys/dev/pci/agp_i810.c:1.82 Wed May 28 03:17:42 2014
+++ src/sys/dev/pci/agp_i810.c Wed May 28 15:34:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_i810.c,v 1.82 2014/05/28 03:17:42 riastradh Exp $ */
+/* $NetBSD: agp_i810.c,v 1.83 2014/05/28 15:34:32 riastradh Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.82 2014/05/28 03:17:42 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.83 2014/05/28 15:34:32 riastradh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -302,7 +302,8 @@ agp_i810_attach(device_t parent, device_
return agp_intel_attach(parent, self, aux);
}
#endif
- aprint_error(: can't find internal VGA device config space\n);
+ aprint_error(: can't find internal VGA
+ config space\n);
error = ENOENT;
goto fail1;
}
@@ -441,7 +442,8 @@ agp_i810_attach(device_t parent, device_
error = bus_space_map(isc-bst, mmadr, isc-size, mmadr_flags,
isc-bsh);
if (error) {
- aprint_error_dev(self, can't map MMIO registers: %d\n, error);
+ aprint_error_dev(self, can't map MMIO registers: %d\n,
+ error);
error = ENXIO;
goto fail1;
}
@@ -481,8 +483,8 @@ agp_i810_attach(device_t parent, device_
case CHIP_G4X:
error = agp_i810_setup_chipset_flush_page(sc);
if (error) {
- aprint_error_dev(self, can't set up chipset flush page: %d\n,
- error);
+ aprint_error_dev(self,
+ can't set up chipset flush page: %d\n, error);
goto fail3;
}
break;
@@ -550,7 +552,9 @@ static int
agp_i810_setup_chipset_flush_page(struct agp_softc *sc)
{
struct agp_i810_softc *const isc = sc-as_chipc;
- pcireg_t reg, lo, hi;
+ const pci_chipset_tag_t pc = isc-as_pc;
+ const pcitag_t tag = isc-as_tag;
+ pcireg_t lo, hi;
bus_addr_t addr, minaddr, maxaddr;
int error;
@@ -562,13 +566,12 @@ agp_i810_setup_chipset_flush_page(struct
/* Read the PCI config register: 4-byte on gen3, 8-byte on gen=4. */
if (isc-chiptype == CHIP_I915) {
- reg = pci_conf_read(sc-as_pc, sc-as_tag, AGP_I915_IFPADDR);
- addr = reg;
+ addr = pci_conf_read(pc, tag, AGP_I915_IFPADDR);
minaddr = PAGE_SIZE; /* XXX PCIBIOS_MIN_MEM? */
maxaddr = UINT32_MAX;
} else {
- hi = pci_conf_read(sc-as_pc, sc-as_tag, AGP_I965_IFPADDR+4);
- lo = pci_conf_read(sc-as_pc, sc-as_tag, AGP_I965_IFPADDR);
+ hi = pci_conf_read(pc, tag, AGP_I965_IFPADDR+4);
+ lo = pci_conf_read(pc, tag, AGP_I965_IFPADDR);
/*
* Convert to uint64_t, rather than bus_addr_t which
* may be 32-bit, to avoid undefined behaviour with a
@@ -608,15 +611,12 @@ agp_i810_setup_chipset_flush_page(struct
/* Write it into the PCI config register. */
addr = isc-flush_addr | 1;
if (isc-chiptype == CHIP_I915) {
- pci_conf_write(sc-as_pc, sc-as_tag, AGP_I915_IFPADDR,
- addr);
+ pci_conf_write(pc, tag, AGP_I915_IFPADDR, addr);
} else {
- pci_conf_write(sc-as_pc, sc-as_tag,
- AGP_I965_IFPADDR + 4,
- __SHIFTOUT(addr, __BITS(63, 32)));
- pci_conf_write(sc-as_pc, sc-as_tag,
- AGP_I965_IFPADDR,
- __SHIFTOUT(addr, __BITS(31, 0)));
+ hi = __SHIFTOUT(addr, __BITS(63, 32));
+ lo = __SHIFTOUT(addr, __BITS(31, 0))
+ pci_conf_write(pc, tag, AGP_I965_IFPADDR+4, hi);
+ pci_conf_write(pc, tag, AGP_I965_IFPADDR, lo);
}
}
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Wed May 28 15:44:02 UTC 2014 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_gem_gtt.c Log Message: Fix bogus GTT total size calculation. Omit gtt_bsh for `agp' gtt. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c diff -u src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c:1.12 src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c:1.13 --- src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c:1.12 Fri May 23 23:02:47 2014 +++ src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c Wed May 28 15:44:02 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_gem_gtt.c,v 1.12 2014/05/23 23:02:47 riastradh Exp $ */ +/* $NetBSD: i915_gem_gtt.c,v 1.13 2014/05/28 15:44:02 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: i915_gem_gtt.c,v 1.12 2014/05/23 23:02:47 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: i915_gem_gtt.c,v 1.13 2014/05/28 15:44:02 riastradh Exp $); #include sys/types.h #include sys/param.h @@ -405,9 +405,7 @@ agp_gtt_init(struct drm_device *dev) gtt-gma_bus_addr = agp_i810_sc-as_apaddr; gtt-gtt_mappable_entries = (agp_i810_sc-as_apsize AGP_PAGE_SHIFT); gtt-stolen_size = (isc-stolen AGP_PAGE_SHIFT); - gtt-gtt_total_entries = - (gtt-gtt_mappable_entries + (gtt-stolen_size AGP_PAGE_SHIFT)); - gtt-gtt_bsh = isc-gtt_bsh; + gtt-gtt_total_entries = isc-gtt_size/4; product = PCI_PRODUCT(dev-pdev-pd_pa.pa_id); if (((product == PCI_PRODUCT_INTEL_IRONLAKE_M_HB) ||
CVS commit: src/doc
Module Name:src Committed By: apb Date: Wed May 28 16:05:04 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: tzcode2014d/tzdata2014d has been released. There's no need to updata tzdata this time, because it's identical to the previous version. To generate a diff of this commit: cvs rdiff -u -r1.1115 -r1.1116 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.1115 src/doc/3RDPARTY:1.1116 --- src/doc/3RDPARTY:1.1115 Wed May 28 11:35:50 2014 +++ src/doc/3RDPARTY Wed May 28 16:05:04 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1115 2014/05/28 11:35:50 tron Exp $ +# $NetBSD: 3RDPARTY,v 1.1116 2014/05/28 16:05:04 apb Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1272,7 +1272,7 @@ Added changes from a5 - a12 manually. Package: tz Version: tzcode2014c / tzdata2014c -Current Vers: tzcode2014c / tzdata2014c +Current Vers: tzcode2014d / tzdata2014d Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: riastradh
Date: Wed May 28 16:07:58 UTC 2014
Modified Files:
src/sys/dev/pci: agp_i810.c
Log Message:
Cosmetic changes require testing too...oops.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/pci/agp_i810.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/pci/agp_i810.c
diff -u src/sys/dev/pci/agp_i810.c:1.83 src/sys/dev/pci/agp_i810.c:1.84
--- src/sys/dev/pci/agp_i810.c:1.83 Wed May 28 15:34:32 2014
+++ src/sys/dev/pci/agp_i810.c Wed May 28 16:07:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_i810.c,v 1.83 2014/05/28 15:34:32 riastradh Exp $ */
+/* $NetBSD: agp_i810.c,v 1.84 2014/05/28 16:07:58 riastradh Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.83 2014/05/28 15:34:32 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.84 2014/05/28 16:07:58 riastradh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -552,8 +552,8 @@ static int
agp_i810_setup_chipset_flush_page(struct agp_softc *sc)
{
struct agp_i810_softc *const isc = sc-as_chipc;
- const pci_chipset_tag_t pc = isc-as_pc;
- const pcitag_t tag = isc-as_tag;
+ const pci_chipset_tag_t pc = sc-as_pc;
+ const pcitag_t tag = sc-as_tag;
pcireg_t lo, hi;
bus_addr_t addr, minaddr, maxaddr;
int error;
@@ -614,7 +614,7 @@ agp_i810_setup_chipset_flush_page(struct
pci_conf_write(pc, tag, AGP_I915_IFPADDR, addr);
} else {
hi = __SHIFTOUT(addr, __BITS(63, 32));
- lo = __SHIFTOUT(addr, __BITS(31, 0))
+ lo = __SHIFTOUT(addr, __BITS(31, 0));
pci_conf_write(pc, tag, AGP_I965_IFPADDR+4, hi);
pci_conf_write(pc, tag, AGP_I965_IFPADDR, lo);
}
CVS commit: src/sys/external/bsd/drm2/include/drm
Module Name:src
Committed By: riastradh
Date: Wed May 28 16:13:02 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/drm: intel-gtt.h
Log Message:
Explain the fields of struct intel_gtt for future reference.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/drm/intel-gtt.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/drm/intel-gtt.h
diff -u src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.2 src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.3
--- src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.2 Tue Mar 18 18:20:43 2014
+++ src/sys/external/bsd/drm2/include/drm/intel-gtt.h Wed May 28 16:13:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: intel-gtt.h,v 1.2 2014/03/18 18:20:43 riastradh Exp $ */
+/* $NetBSD: intel-gtt.h,v 1.3 2014/05/28 16:13:02 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -41,13 +41,47 @@
#include drm/drm_agp_netbsd.h
struct intel_gtt {
+ /*
+ * GMADR, graphics memory address, a.k.a. the `aperture'.
+ * Access to bus addresses in the region starting here are
+ * remapped to physical system memory addresses programmed into
+ * the GTT (or GPU-local memory, for i810 chipsets, depending
+ * on the GTT entries). This corresponds to a prefix of the
+ * GPU's virtual address space. The virtual address space may
+ * be larger: in that case, there will be more GTT entries than
+ * pages in the aperture.
+ */
paddr_t gma_bus_addr;
+
+ /*
+ * Number of bytes of system memory stolen by the graphics
+ * device for frame buffer memory (but not for the GTT). These
+ * pages in memory -- if you know where they are -- can't be
+ * used by the CPU, but they can be programmed into the GTT for
+ * access from the GPU.
+ */
unsigned int stolen_size;
+
+ /*
+ * Total number of GTT entries, including entries for the GPU's
+ * virtual address space beyond the aperture.
+ */
unsigned int gtt_total_entries;
+
+ /*
+ * Number of GTT entries for pages that we can actually map
+ * into the aperture.
+ */
unsigned int gtt_mappable_entries;
+
+ /* Scratch page for unbound GTT entries. */
bus_dma_segment_t gtt_scratch_seg;
bus_dmamap_t gtt_scratch_map;
+
+ /* Bus space handle for the GTT itself. */
bus_space_handle_t gtt_bsh;
+
+ /* IOMMU-related quirk for certain chipsets. */
bool do_idle_maps;
};
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3
Module Name:src
Committed By: mrg
Date: Wed May 28 16:41:06 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
Log Message:
add -pthread to compiler/linker flags. fixes 1/3 of the link issues.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/lib/libstdc++-v3/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/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.11 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.12
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.11 Fri May 16 09:36:51 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Wed May 28 16:41:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/05/16 09:36:51 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2014/05/28 16:41:06 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -12,6 +12,9 @@ LDADD= -lgcc_s
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
+COPTS+= -pthread
+LDFLAGS+= -pthread
+
UNSUPPORTED_COMPILER.clang= # defined
CWARNFLAGS.clang+= -Wno-logical-op-parentheses \
-Wno-deprecated-writable-strings -Wno-parentheses
CVS commit: src/external/gpl3/gcc/lib/libsupc++
Module Name:src
Committed By: mrg
Date: Wed May 28 17:09:18 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libsupc++: Makefile Makefile.common
Log Message:
move the -std=gnu++0x code from Makefile to Makefile.common.
fixes the remaining 2/3 link issues.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/libsupc++/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/lib/libsupc++/Makefile.common
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile:1.8 src/external/gpl3/gcc/lib/libsupc++/Makefile:1.9
--- src/external/gpl3/gcc/lib/libsupc++/Makefile:1.8 Thu May 15 14:37:08 2014
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile Wed May 28 17:09:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/05/15 14:37:08 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2014/05/28 17:09:18 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -40,10 +40,6 @@ DPSRCS+= ${_dst}
.endif
.endif
-.for f in eh_ptr eh_throw guard atexit_thread nested_exception
-COPTS.${f}.cc+= -std=gnu++0x
-.endfor
-
.include bsd.lib.mk
.PATH: ${DIST}/libstdc++-v3/src \
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile.common
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.6 src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.7
--- src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.6 Sat Mar 1 10:00:48 2014
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile.common Wed May 28 17:09:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2014/03/01 10:00:48 mrg Exp $
+# $NetBSD: Makefile.common,v 1.7 2014/05/28 17:09:18 mrg Exp $
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
GNUHOSTDIST= ${DIST}
@@ -23,3 +23,7 @@ CPPFLAGS+= -I${.CURDIR}/../libstdc++-v3/
CPPFLAGS+= -DHAVE_STDLIB_H -DHAVE_STRING_H
CPPFLAGS.cp-demangle.c=-DIN_GLIBCPP_V3
+
+.for f in eh_ptr eh_throw guard atexit_thread nested_exception
+COPTS.${f}.cc+= -std=gnu++0x
+.endfor
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Wed May 28 19:13:27 UTC 2014 Modified Files: src/lib/libc/time: Makefile NEWS tz-link.htm zic.8 zic.c Log Message: welcome to 2014d; zic big bang fixes: some programs did not handle large negative time_t values well (gnome) To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/lib/libc/time/Makefile cvs rdiff -u -r1.2 -r1.3 src/lib/libc/time/NEWS cvs rdiff -u -r1.14 -r1.15 src/lib/libc/time/tz-link.htm cvs rdiff -u -r1.21 -r1.22 src/lib/libc/time/zic.8 cvs rdiff -u -r1.45 -r1.46 src/lib/libc/time/zic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/time/Makefile diff -u src/lib/libc/time/Makefile:1.18 src/lib/libc/time/Makefile:1.19 --- src/lib/libc/time/Makefile:1.18 Tue May 13 12:33:56 2014 +++ src/lib/libc/time/Makefile Wed May 28 15:13:27 2014 @@ -6,7 +6,7 @@ PACKAGE= tzcode # Version numbers of the code and data distributions. -VERSION= 2014c +VERSION= 2014d # Email address for bug reports. BUGEMAIL= t...@iana.org @@ -100,6 +100,7 @@ YEARISTYPE= ./yearistype LDLIBS= # Add the following to the end of the CFLAGS= line as needed. +# -DBIG_BANG=-999LL if the Big Bang occurred at time -999 (see zic.c) # -DHAVE_ADJTIME=0 if `adjtime' does not exist (SVR0?) # -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS) # -DHAVE_GETTEXT=1 if `gettext' works (GNU, Linux, Solaris); also see LDLIBS Index: src/lib/libc/time/NEWS diff -u src/lib/libc/time/NEWS:1.2 src/lib/libc/time/NEWS:1.3 --- src/lib/libc/time/NEWS:1.2 Tue May 13 12:33:56 2014 +++ src/lib/libc/time/NEWS Wed May 28 15:13:27 2014 @@ -1,11 +1,27 @@ News for the tz database +Release 2014d - 2014-05-27 21:34:40 -0700 + + Changes affecting code + +zic no longer generates files containing time stamps before the Big Bang. +This works around GNOME bug 730332 +https://bugzilla.gnome.org/show_bug.cgi?id=730332. +(Thanks to Leonardo Chiquitto for reporting the bug, and to +Arthur David Olson and James Cloos for suggesting improvements to the fix.) + + Changes affecting documentation + +tz-link.htm now mentions GNOME. + + Release 2014c - 2014-05-13 07:44:13 -0700 Changes affecting near-future time stamps -Egypt observes DST starting May 15. (Thanks to Ahmad El-Dardiry.) +Egypt observes DST starting 2014-05-15 at 24:00. +(Thanks to Ahmad El-Dardiry and Gunther Vermier.) Details have not been announced, except that DST will not be observed during Ramadan. Guess that DST will stop during the same Ramadan dates as Morocco, and that Egypt's future spring and fall transitions will be the Index: src/lib/libc/time/tz-link.htm diff -u src/lib/libc/time/tz-link.htm:1.14 src/lib/libc/time/tz-link.htm:1.15 --- src/lib/libc/time/tz-link.htm:1.14 Tue May 13 12:33:56 2014 +++ src/lib/libc/time/tz-link.htm Wed May 28 15:13:27 2014 @@ -8,7 +8,7 @@ meta http-equiv=Content-type content='text/html; charset=US-ASCII' meta name=DC.Creator content=Eggert, Paul meta name=DC.Contributor content=Olson, Arthur David -meta name=DC.Date content=2014-03-10 +meta name=DC.Date content=2014-05-27 meta name=DC.Description content=Sources of information about time zones and daylight saving time meta name=DC.Identifier @@ -315,6 +315,10 @@ This library is freely available under t abbrGNU/abbr Lesser General Public License (abbr title=Lesser General Public LicenseLGPL/abbr)/a, and is widely used in abbrGNU/abbr/Linux systems./li +lia href=http://www.gnome.org/;GNOME/a's Glib has +a codeabbrtz/abbr/code binary file reader written in C that +creates a codeGTimeZone/code object representing sets of UTC offsets. +It is freely available under the abbrLGPL/abbr./li lia href=http://bmsi.com/java/#TZ;ZoneInfo.java/a is a codeabbrtz/abbr/code binary file reader written in Java. It is freely available under the abbrLGPL/abbr./li Index: src/lib/libc/time/zic.8 diff -u src/lib/libc/time/zic.8:1.21 src/lib/libc/time/zic.8:1.22 --- src/lib/libc/time/zic.8:1.21 Fri Sep 20 15:06:54 2013 +++ src/lib/libc/time/zic.8 Wed May 28 15:13:27 2014 @@ -1,5 +1,5 @@ -.\ $NetBSD: zic.8,v 1.21 2013/09/20 19:06:54 christos Exp $ -.Dd September 20, 2013 +.\ $NetBSD: zic.8,v 1.22 2014/05/28 19:13:27 christos Exp $ +.Dd May 28, 2014 .Dt ZIC 8 .Os .Sh NAME @@ -438,6 +438,11 @@ produces a single transition to daylight To get separate transitions use multiple zone continuation lines specifying transition instants using universal time. +.Pp +Time stamps well before the Big Bang are silently omitted from the output. +This works around bugs in software that mishandles large negative time stamps. +Call it sour grapes, but pre-Big-Bang time stamps are physically suspect anyway. +The pre-Big-Bang cutoff time is approximate and may change in future versions. .Sh FILES .Pa /usr/share/zoneinfo - standard directory
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed May 28 19:14:17 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: tzcode 2014d To generate a diff of this commit: cvs rdiff -u -r1.1116 -r1.1117 src/doc/3RDPARTY cvs rdiff -u -r1.1928 -r1.1929 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.1116 src/doc/3RDPARTY:1.1117 --- src/doc/3RDPARTY:1.1116 Wed May 28 12:05:04 2014 +++ src/doc/3RDPARTY Wed May 28 15:14:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1116 2014/05/28 16:05:04 apb Exp $ +# $NetBSD: 3RDPARTY,v 1.1117 2014/05/28 19:14:17 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1271,7 +1271,7 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2014c / tzdata2014c +Version: tzcode2014d / tzdata2014c Current Vers: tzcode2014d / tzdata2014d Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1928 src/doc/CHANGES:1.1929 --- src/doc/CHANGES:1.1928 Wed May 28 07:35:50 2014 +++ src/doc/CHANGES Wed May 28 15:14:17 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1928 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1929 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -423,3 +423,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: [kardel 20140518] gcc(1): Import version 4.8.3. [skrll 20140527] openldap: Import 2.4.39 [tron 20140528] + libc: Update to tzcode2014d. [christos 20140528]
CVS commit: src/sys/netinet
Module Name:src
Committed By: christos
Date: Wed May 28 19:19:33 UTC 2014
Modified Files:
src/sys/netinet: ip_input.c
Log Message:
CID 12164{49,51}: Remove bogus ifp == NULL checks; if ifp was really NULL,
we would have been dead a few lines before the tests.
To generate a diff of this commit:
cvs rdiff -u -r1.314 -r1.315 src/sys/netinet/ip_input.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/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.314 src/sys/netinet/ip_input.c:1.315
--- src/sys/netinet/ip_input.c:1.314 Fri May 23 19:38:48 2014
+++ src/sys/netinet/ip_input.c Wed May 28 15:19:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.314 2014/05/23 23:38:48 rmind Exp $ */
+/* $NetBSD: ip_input.c,v 1.315 2014/05/28 19:19:33 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_input.c,v 1.314 2014/05/23 23:38:48 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_input.c,v 1.315 2014/05/28 19:19:33 christos Exp $);
#include opt_inet.h
#include opt_compat_netbsd.h
@@ -587,7 +587,7 @@ ip_input(struct mbuf *m)
* we get finer grain control.
*/
checkif = ip_checkinterface (ipforwarding == 0)
- ifp (ifp-if_flags IFF_LOOPBACK) == 0;
+ (ifp-if_flags IFF_LOOPBACK) == 0;
/*
* Check our list of addresses, to see if the packet is for us.
@@ -609,7 +609,7 @@ ip_input(struct mbuf *m)
}
if (ia != NULL)
goto ours;
- if (ifp ifp-if_flags IFF_BROADCAST) {
+ if (ifp-if_flags IFF_BROADCAST) {
IFADDR_FOREACH(ifa, ifp) {
if (ifa-ifa_addr-sa_family != AF_INET)
continue;
CVS commit: src/sys/rump
Module Name:src
Committed By: justin
Date: Wed May 28 20:57:23 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: emul.c
src/sys/rump/librump/rumpvfs: rumpfs.c
src/sys/rump/net/lib/libshmif: if_shmem.c
Log Message:
Add missing __diagused in rump code
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.127 -r1.128 src/sys/rump/librump/rumpvfs/rumpfs.c
cvs rdiff -u -r1.60 -r1.61 src/sys/rump/net/lib/libshmif/if_shmem.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/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.165 src/sys/rump/librump/rumpkern/emul.c:1.166
--- src/sys/rump/librump/rumpkern/emul.c:1.165 Fri Apr 25 19:56:01 2014
+++ src/sys/rump/librump/rumpkern/emul.c Wed May 28 20:57:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.165 2014/04/25 19:56:01 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.166 2014/05/28 20:57:22 justin Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.165 2014/04/25 19:56:01 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.166 2014/05/28 20:57:22 justin Exp $);
#include sys/param.h
#include sys/null.h
@@ -157,7 +157,7 @@ int
kpause(const char *wmesg, bool intr, int timeo, kmutex_t *mtx)
{
extern int hz;
- int rv;
+ int rv __diagused;
uint64_t sec, nsec;
if (mtx)
Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.127 src/sys/rump/librump/rumpvfs/rumpfs.c:1.128
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.127 Fri Apr 25 13:10:42 2014
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Wed May 28 20:57:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.127 2014/04/25 13:10:42 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.128 2014/05/28 20:57:22 justin Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.127 2014/04/25 13:10:42 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.128 2014/05/28 20:57:22 justin Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -428,7 +428,7 @@ etfsremove(const char *key)
{
struct etfs *et;
size_t keylen;
- int rv;
+ int rv __diagused;
if (key[0] != '/') {
return EINVAL;
Index: src/sys/rump/net/lib/libshmif/if_shmem.c
diff -u src/sys/rump/net/lib/libshmif/if_shmem.c:1.60 src/sys/rump/net/lib/libshmif/if_shmem.c:1.61
--- src/sys/rump/net/lib/libshmif/if_shmem.c:1.60 Thu Mar 20 20:42:08 2014
+++ src/sys/rump/net/lib/libshmif/if_shmem.c Wed May 28 20:57:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_shmem.c,v 1.60 2014/03/20 20:42:08 christos Exp $ */
+/* $NetBSD: if_shmem.c,v 1.61 2014/05/28 20:57:22 justin Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_shmem.c,v 1.60 2014/03/20 20:42:08 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_shmem.c,v 1.61 2014/05/28 20:57:22 justin Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -145,7 +145,7 @@ shmif_lockbus(struct shmif_mem *busmem)
static void
shmif_unlockbus(struct shmif_mem *busmem)
{
- unsigned int old;
+ unsigned int old __diagused;
membar_exit();
old = atomic_swap_32(busmem-shm_lock, LOCK_UNLOCKED);
@@ -345,7 +345,7 @@ rump_shmif_create(const char *path, int
static int
shmif_clone(struct if_clone *ifc, int unit)
{
- int rc;
+ int rc __diagused;
vmem_addr_t unit2;
/*
CVS commit: src/doc
Module Name:src Committed By: abs Date: Wed May 28 21:51:18 UTC 2014 Modified Files: src/doc: HACKS Log Message: Add a hack entry for lib/libcurses/Makefile workaround for lib/48827 To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 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.150 src/doc/HACKS:1.151 --- src/doc/HACKS:1.150 Sat May 24 07:42:45 2014 +++ src/doc/HACKS Wed May 28 21:51:18 2014 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.150 2014/05/24 07:42:45 martin Exp $ +# $NetBSD: HACKS,v 1.151 2014/05/28 21:51:18 abs Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -604,6 +604,16 @@ port vax internal compiler error: in change_address_1, at emit-rtl.c:2019 kcah + hack gcc -fno-guess-branch-probability + cdate 28 May 2014 + mdate 28 May 2014 + who abs + file lib/libcurses/Makefile : 1.69 + descr sysinst crashes under vax gcc 4.1 after selecting +partition sizes due to curses bug +pr lib/48827 + kcah + port arm hack gcc-unsigned-compare
