CVS commit: src/usr.sbin/makefs/msdos
Module Name:src Committed By: maxv Date: Wed Jul 9 06:04:16 UTC 2014 Modified Files: src/usr.sbin/makefs/msdos: msdosfs_vfsops.c Log Message: What a terrible use-after-free To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/makefs/msdos/msdosfs_vfsops.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/makefs/msdos/msdosfs_vfsops.c diff -u src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.7 src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.8 --- src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.7 Wed Jan 30 19:19:19 2013 +++ src/usr.sbin/makefs/msdos/msdosfs_vfsops.c Wed Jul 9 06:04:16 2014 @@ -50,7 +50,7 @@ #endif #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.7 2013/01/30 19:19:19 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.8 2014/07/09 06:04:16 maxv Exp $); #include sys/param.h @@ -407,7 +407,7 @@ error_exit: free(pmp); } errno = error; - return pmp; + return NULL; } int
CVS commit: src/sys
Module Name:src Committed By: maxv Date: Wed Jul 9 08:43:54 UTC 2014 Modified Files: src/sys/fs/cd9660: cd9660_vfsops.c src/sys/fs/msdosfs: msdosfs_vfsops.c src/sys/ufs/ext2fs: ext2fs_vfsops.c Log Message: Remove ROOTNAME (unused). To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sys/fs/cd9660/cd9660_vfsops.c cvs rdiff -u -r1.110 -r1.111 src/sys/fs/msdosfs/msdosfs_vfsops.c cvs rdiff -u -r1.182 -r1.183 src/sys/ufs/ext2fs/ext2fs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/cd9660/cd9660_vfsops.c diff -u src/sys/fs/cd9660/cd9660_vfsops.c:1.88 src/sys/fs/cd9660/cd9660_vfsops.c:1.89 --- src/sys/fs/cd9660/cd9660_vfsops.c:1.88 Sun Jun 22 09:47:40 2014 +++ src/sys/fs/cd9660/cd9660_vfsops.c Wed Jul 9 08:43:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_vfsops.c,v 1.88 2014/06/22 09:47:40 hannken Exp $ */ +/* $NetBSD: cd9660_vfsops.c,v 1.89 2014/07/09 08:43:54 maxv Exp $ */ /*- * Copyright (c) 1994 @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cd9660_vfsops.c,v 1.88 2014/06/22 09:47:40 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: cd9660_vfsops.c,v 1.89 2014/07/09 08:43:54 maxv Exp $); #if defined(_KERNEL_OPT) #include opt_compat_netbsd.h @@ -127,8 +127,6 @@ static const struct genfs_ops cd9660_gen * * Name is updated by mount(8) after booting. */ -#define ROOTNAME root_device - static int iso_makemp(struct iso_mnt *isomp, struct buf *bp, int *ea_len); static int iso_mountfs(struct vnode *devvp, struct mount *mp, struct lwp *l, struct iso_args *argp); Index: src/sys/fs/msdosfs/msdosfs_vfsops.c diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.110 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.111 --- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.110 Tue Jul 8 19:34:47 2014 +++ src/sys/fs/msdosfs/msdosfs_vfsops.c Wed Jul 9 08:43:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: msdosfs_vfsops.c,v 1.110 2014/07/08 19:34:47 maxv Exp $ */ +/* $NetBSD: msdosfs_vfsops.c,v 1.111 2014/07/09 08:43:54 maxv Exp $ */ /*- * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank. @@ -48,7 +48,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.110 2014/07/08 19:34:47 maxv Exp $); +__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.111 2014/07/09 08:43:54 maxv Exp $); #if defined(_KERNEL_OPT) #include opt_compat_netbsd.h @@ -107,8 +107,6 @@ MALLOC_JUSTDEFINE(M_MSDOSFSMNT, MSDOSFS MALLOC_JUSTDEFINE(M_MSDOSFSFAT, MSDOSFS FAT, MSDOS FS FAT table); MALLOC_JUSTDEFINE(M_MSDOSFSTMP, MSDOSFS temp, MSDOS FS temp. structures); -#define ROOTNAME root_device - static struct sysctllog *msdosfs_sysctl_log; extern const struct vnodeopv_desc msdosfs_vnodeop_opv_desc; Index: src/sys/ufs/ext2fs/ext2fs_vfsops.c diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.182 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.183 --- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.182 Sat May 24 16:34:04 2014 +++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Wed Jul 9 08:43:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ext2fs_vfsops.c,v 1.182 2014/05/24 16:34:04 christos Exp $ */ +/* $NetBSD: ext2fs_vfsops.c,v 1.183 2014/07/09 08:43:54 maxv Exp $ */ /* * Copyright (c) 1989, 1991, 1993, 1994 @@ -60,7 +60,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.182 2014/05/24 16:34:04 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.183 2014/07/09 08:43:54 maxv Exp $); #if defined(_KERNEL_OPT) #include opt_compat_netbsd.h @@ -248,7 +248,6 @@ ext2fs_done(void) * * Name is updated by mount(8) after booting. */ -#define ROOTNAME root_device int ext2fs_mountroot(void)
CVS commit: src/sys/fs/msdosfs
Module Name:src
Committed By: maxv
Date: Wed Jul 9 09:00:18 UTC 2014
Modified Files:
src/sys/fs/msdosfs: msdosfs_vfsops.c
Log Message:
Minor changes:
- malloc()+memset() - malloc(|M_ZERO)
- rename 'vers' to 'FSVers'
- declare 'ExtFlags' instead of calling getushort() two times
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/fs/msdosfs/msdosfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/msdosfs/msdosfs_vfsops.c
diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.111 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.112
--- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.111 Wed Jul 9 08:43:54 2014
+++ src/sys/fs/msdosfs/msdosfs_vfsops.c Wed Jul 9 09:00:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.111 2014/07/09 08:43:54 maxv Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,v 1.112 2014/07/09 09:00:18 maxv Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.111 2014/07/09 08:43:54 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.112 2014/07/09 09:00:18 maxv Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -524,8 +524,7 @@ msdosfs_mountfs(struct vnode *devvp, str
}
}
- pmp = malloc(sizeof *pmp, M_MSDOSFSMNT, M_WAITOK);
- memset(pmp, 0, sizeof *pmp);
+ pmp = malloc(sizeof(*pmp), M_MSDOSFSMNT, M_WAITOK|M_ZERO);
pmp-pm_mountp = mp;
/*
@@ -576,15 +575,16 @@ msdosfs_mountfs(struct vnode *devvp, str
}
if (pmp-pm_RootDirEnts == 0) {
- unsigned short vers = getushort(b710-bpbFSVers);
+ unsigned short FSVers = getushort(b710-bpbFSVers);
+ unsigned short ExtFlags = getushort(b710-bpbExtFlags);
/*
* Some say that bsBootSectSig[23] must be zero, but
* Windows does not require this and some digital cameras
* do not set these to zero. Therefore, do not insist.
*/
- if (pmp-pm_Sectors || pmp-pm_FATsecs || vers) {
- DPRINTF((sectors %d fatsecs %lu vers %d\n,
- pmp-pm_Sectors, pmp-pm_FATsecs, vers));
+ if (pmp-pm_Sectors || pmp-pm_FATsecs || FSVers) {
+ DPRINTF((Sectors %d FATsecs %lu FSVers %d\n,
+ pmp-pm_Sectors, pmp-pm_FATsecs, FSVers));
error = EINVAL;
goto error_exit;
}
@@ -593,20 +593,18 @@ msdosfs_mountfs(struct vnode *devvp, str
pmp-pm_fatdiv = 1;
pmp-pm_FATsecs = getulong(b710-bpbBigFATsecs);
- /* mirrorring is enabled if the FATMIRROR bit is not set */
- if ((getushort(b710-bpbExtFlags) FATMIRROR) == 0)
+ /* Mirroring is enabled if the FATMIRROR bit is not set. */
+ if ((ExtFlags FATMIRROR) == 0)
pmp-pm_flags |= MSDOSFS_FATMIRROR;
else
- pmp-pm_curfat = getushort(b710-bpbExtFlags) FATNUM;
+ pmp-pm_curfat = ExtFlags FATNUM;
} else
pmp-pm_flags |= MSDOSFS_FATMIRROR;
if (argp-flags MSDOSFSMNT_GEMDOSFS) {
if (FAT32(pmp)) {
+ /* GEMDOS doesn't know FAT32. */
DPRINTF((FAT32 for GEMDOS\n));
- /*
- * GEMDOS doesn't know FAT32.
- */
error = EINVAL;
goto error_exit;
}
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jul 9 09:51:22 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.5 Log Message: Ticket 1095. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-6.1.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.5 diff -u src/doc/CHANGES-6.1.5:1.1.2.13 src/doc/CHANGES-6.1.5:1.1.2.14 --- src/doc/CHANGES-6.1.5:1.1.2.13 Mon Jun 30 12:18:40 2014 +++ src/doc/CHANGES-6.1.5 Wed Jul 9 09:51:22 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.5,v 1.1.2.13 2014/06/30 12:18:40 msaitoh Exp $ +# $NetBSD: CHANGES-6.1.5,v 1.1.2.14 2014/07/09 09:51:22 msaitoh Exp $ A complete list of changes from the NetBSD 6.1.4 release to the NetBSD 6.1.5 release: @@ -629,3 +629,27 @@ sys/compat/netbsd32/netbsd32_event.c 1. Allocate directly KQ_NEVENTS bytes. Otherwise a user can panic the system. [maxv, ticket #1090] + +libexec/httpd/CHANGES1.12-1.18 +libexec/httpd/Makefile1.13-1.22 +libexec/httpd/Makefile.boot 1.6 +libexec/httpd/auth-bozo.c 1.11-1.13 +libexec/httpd/bozohttpd.8 1.33-1.46 +libexec/httpd/bozohttpd.c 1.31-1.54 +libexec/httpd/bozohttpd.h 1.21-1.32 +libexec/httpd/cgi-bozo.c 1.21-1.25 +libexec/httpd/content-bozo.c 1.8-1.10 +libexec/httpd/daemon-bozo.c 1.16-1.16 +libexec/httpd/dir-index-bozo.c 1.15-1.19 +libexec/httpd/lua-bozo.c 1.1-1.9 +libexec/httpd/main.c1.6-1.7 +libexec/httpd/netbsd_queue.h 1.1 +libexec/httpd/printenv.lua 1.1-1.2 +libexec/httpd/ssl-bozo.c 1.14-1.16 +libexec/httpd/tilde-luzah-bozo.c 1.10 +libexec/httpd/libbozohttpd/Makefile 1.2 +libexec/httpd/libbozohttpd/libbozohttpd.3 1.2-1.3 +libexec/httpd/small/Makefile 1.2 + + Update bozohttpd from 2018 to 20140708. + [mrg, ticket #1095]
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jul 9 09:50:24 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 1095. To generate a diff of this commit: cvs rdiff -u -r1.1.2.121 -r1.1.2.122 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.121 src/doc/CHANGES-6.2:1.1.2.122 --- src/doc/CHANGES-6.2:1.1.2.121 Mon Jun 30 12:18:15 2014 +++ src/doc/CHANGES-6.2 Wed Jul 9 09:50:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.121 2014/06/30 12:18:15 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.122 2014/07/09 09:50:24 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -2928,3 +2928,27 @@ sys/compat/netbsd32/netbsd32_event.c 1. Allocate directly KQ_NEVENTS bytes. Otherwise a user can panic the system. [maxv, ticket #1090] + +libexec/httpd/CHANGES1.12-1.18 +libexec/httpd/Makefile1.13-1.22 +libexec/httpd/Makefile.boot 1.6 +libexec/httpd/auth-bozo.c 1.11-1.13 +libexec/httpd/bozohttpd.8 1.33-1.46 +libexec/httpd/bozohttpd.c 1.31-1.54 +libexec/httpd/bozohttpd.h 1.21-1.32 +libexec/httpd/cgi-bozo.c 1.21-1.25 +libexec/httpd/content-bozo.c 1.8-1.10 +libexec/httpd/daemon-bozo.c 1.16-1.16 +libexec/httpd/dir-index-bozo.c 1.15-1.19 +libexec/httpd/lua-bozo.c 1.1-1.9 +libexec/httpd/main.c1.6-1.7 +libexec/httpd/netbsd_queue.h 1.1 +libexec/httpd/printenv.lua 1.1-1.2 +libexec/httpd/ssl-bozo.c 1.14-1.16 +libexec/httpd/tilde-luzah-bozo.c 1.10 +libexec/httpd/libbozohttpd/Makefile 1.2 +libexec/httpd/libbozohttpd/libbozohttpd.3 1.2-1.3 +libexec/httpd/small/Makefile 1.2 + + Update bozohttpd from 2018 to 20140708. + [mrg, ticket #1095]
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jul 9 09:51:48 UTC 2014 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.6 Log Message: Ticket 1095. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-6.0.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.6 diff -u src/doc/CHANGES-6.0.6:1.1.2.13 src/doc/CHANGES-6.0.6:1.1.2.14 --- src/doc/CHANGES-6.0.6:1.1.2.13 Mon Jun 30 12:19:01 2014 +++ src/doc/CHANGES-6.0.6 Wed Jul 9 09:51:48 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.6,v 1.1.2.13 2014/06/30 12:19:01 msaitoh Exp $ +# $NetBSD: CHANGES-6.0.6,v 1.1.2.14 2014/07/09 09:51:48 msaitoh Exp $ A complete list of changes from the NetBSD 6.0.5 release to the NetBSD 6.0.6 release: @@ -629,3 +629,27 @@ sys/compat/netbsd32/netbsd32_event.c 1. Allocate directly KQ_NEVENTS bytes. Otherwise a user can panic the system. [maxv, ticket #1090] + +libexec/httpd/CHANGES1.12-1.18 +libexec/httpd/Makefile1.13-1.22 +libexec/httpd/Makefile.boot 1.6 +libexec/httpd/auth-bozo.c 1.11-1.13 +libexec/httpd/bozohttpd.8 1.33-1.46 +libexec/httpd/bozohttpd.c 1.31-1.54 +libexec/httpd/bozohttpd.h 1.21-1.32 +libexec/httpd/cgi-bozo.c 1.21-1.25 +libexec/httpd/content-bozo.c 1.8-1.10 +libexec/httpd/daemon-bozo.c 1.16-1.16 +libexec/httpd/dir-index-bozo.c 1.15-1.19 +libexec/httpd/lua-bozo.c 1.1-1.9 +libexec/httpd/main.c1.6-1.7 +libexec/httpd/netbsd_queue.h 1.1 +libexec/httpd/printenv.lua 1.1-1.2 +libexec/httpd/ssl-bozo.c 1.14-1.16 +libexec/httpd/tilde-luzah-bozo.c 1.10 +libexec/httpd/libbozohttpd/Makefile 1.2 +libexec/httpd/libbozohttpd/libbozohttpd.3 1.2-1.3 +libexec/httpd/small/Makefile 1.2 + + Update bozohttpd from 2018 to 20140708. + [mrg, ticket #1095]
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: martin Date: Wed Jul 9 11:45:46 UTC 2014 Modified Files: src/distrib/sets/lists/debug: ad.powerpc md.evbmips md.sparc64 Log Message: Add libirs_g.a to more compat lib directories To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug/md.evbmips cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/debug/md.sparc64 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/debug/ad.powerpc diff -u src/distrib/sets/lists/debug/ad.powerpc:1.11 src/distrib/sets/lists/debug/ad.powerpc:1.12 --- src/distrib/sets/lists/debug/ad.powerpc:1.11 Wed Jun 18 17:50:15 2014 +++ src/distrib/sets/lists/debug/ad.powerpc Wed Jul 9 11:45:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.powerpc,v 1.11 2014/06/18 17:50:15 christos Exp $ +# $NetBSD: ad.powerpc,v 1.12 2014/07/09 11:45:45 martin Exp $ ./usr/lib/powerpc/libamu_g.a comp-c-debuglib compat,arch64,debuglib ./usr/lib/powerpc/libarchive_g.a comp-c-debuglib compat,arch64,debuglib ./usr/lib/powerpc/libasn1_g.a comp-c-debuglib compat,arch64,debuglib,kerberos @@ -43,6 +43,7 @@ ./usr/lib/powerpc/libhx509_g.a comp-c-debuglib compat,arch64,debuglib,kerberos ./usr/lib/powerpc/libintl_g.a comp-c-debuglib compat,arch64,debuglib ./usr/lib/powerpc/libipsec_g.a comp-c-debuglib compat,arch64,debuglib +./usr/lib/powerpc/libirs_g.a comp-c-debuglib compat,arch64,debuglib ./usr/lib/powerpc/libisc_g.a comp-c-debuglib compat,arch64,debuglib ./usr/lib/powerpc/libisccc_g.a comp-c-debuglib compat,arch64,debuglib ./usr/lib/powerpc/libisccfg_g.a comp-c-debuglib compat,arch64,debuglib Index: src/distrib/sets/lists/debug/md.evbmips diff -u src/distrib/sets/lists/debug/md.evbmips:1.3 src/distrib/sets/lists/debug/md.evbmips:1.4 --- src/distrib/sets/lists/debug/md.evbmips:1.3 Fri Jan 24 01:09:59 2014 +++ src/distrib/sets/lists/debug/md.evbmips Wed Jul 9 11:45:45 2014 @@ -1,4 +1,4 @@ -#$NetBSD: md.evbmips,v 1.3 2014/01/24 01:09:59 christos Exp $ +#$NetBSD: md.evbmips,v 1.4 2014/07/09 11:45:45 martin Exp $ ./usr/lib/64/i18n/libBIG5_g.a comp-c-debuglib compat,debuglib,arch64 ./usr/lib/64/i18n/libDECHanyu_g.a comp-c-debuglib compat,debuglib,arch64 ./usr/lib/64/i18n/libEUCTW_g.a comp-c-debuglib compat,debuglib,arch64 @@ -63,6 +63,7 @@ ./usr/lib/64/libiberty_g.a comp-c-debuglib compat,debuglib,arch64 ./usr/lib/64/libintl_g.a comp-c-debuglib compat,debuglib,arch64 ./usr/lib/64/libipsec_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libirs_g.a comp-c-debuglib compat,debuglib,arch64 ./usr/lib/64/libisc_g.a comp-c-debuglib compat,debuglib,arch64 ./usr/lib/64/libisccc_g.a comp-c-debuglib compat,debuglib,arch64 ./usr/lib/64/libisccfg_g.a comp-c-debuglib compat,debuglib,arch64 @@ -202,6 +203,7 @@ ./usr/lib/o32/libiberty_g.a comp-c-debuglib compat,debuglib,arch64 ./usr/lib/o32/libintl_g.a comp-c-debuglib compat,debuglib,arch64 ./usr/lib/o32/libipsec_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/o32/libirs_g.a comp-c-debuglib compat,debuglib,arch64 ./usr/lib/o32/libisc_g.a comp-c-debuglib compat,debuglib,arch64 ./usr/lib/o32/libisccc_g.a comp-c-debuglib compat,debuglib,arch64 ./usr/lib/o32/libisccfg_g.a comp-c-debuglib compat,debuglib,arch64 Index: src/distrib/sets/lists/debug/md.sparc64 diff -u src/distrib/sets/lists/debug/md.sparc64:1.54 src/distrib/sets/lists/debug/md.sparc64:1.55 --- src/distrib/sets/lists/debug/md.sparc64:1.54 Wed Jun 18 17:50:15 2014 +++ src/distrib/sets/lists/debug/md.sparc64 Wed Jul 9 11:45:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.54 2014/06/18 17:50:15 christos Exp $ +# $NetBSD: md.sparc64,v 1.55 2014/07/09 11:45:45 martin Exp $ ./usr/lib/sparc/i18n/libBIG5_g.a comp-obsolete obsolete ./usr/lib/sparc/i18n/libDECHanyu_g.a comp-obsolete obsolete ./usr/lib/sparc/i18n/libEUCTW_g.a comp-obsolete obsolete @@ -73,6 +73,7 @@ ./usr/lib/sparc/libiberty_g.a comp-obsolete obsolete ./usr/lib/sparc/libintl_g.a comp-c-debuglib compat,debuglib ./usr/lib/sparc/libipsec_g.a comp-c-debuglib compat,debuglib +./usr/lib/sparc/libirs_g.a comp-c-debuglib compat,debuglib ./usr/lib/sparc/libisc_g.a comp-c-debuglib compat,debuglib ./usr/lib/sparc/libisccc_g.a comp-c-debuglib compat,debuglib ./usr/lib/sparc/libisccfg_g.a comp-c-debuglib compat,debuglib
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Wed Jul 9 12:14:47 UTC 2014
Modified Files:
src/sys/rump: listsrcdirs
Log Message:
split sys further into sys and posix, per comments from justin
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/rump/listsrcdirs
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/listsrcdirs
diff -u src/sys/rump/listsrcdirs:1.15 src/sys/rump/listsrcdirs:1.16
--- src/sys/rump/listsrcdirs:1.15 Tue Jul 8 14:30:21 2014
+++ src/sys/rump/listsrcdirs Wed Jul 9 12:14:47 2014
@@ -1,32 +1,52 @@
#!/bin/sh
#
-# $NetBSD: listsrcdirs,v 1.15 2014/07/08 14:30:21 pooka Exp $
+# $NetBSD: listsrcdirs,v 1.16 2014/07/09 12:14:47 pooka Exp $
#
#
-# This script echoes the NetBSD source directories required to build rump
-# kernels with TOOLS_BUILDRUMP=yes (used for example by buildrump.sh).
+# This script echoes the NetBSD source directories useful for
+# rump kernels.
# Feed the output to whichever method you use to obtain NetBSD sources, e.g.
#
# ./listsrcdirs | xargs cvs -d anon...@anoncvs.netbsd.org:/cvsroot -z3 co -P
#
+# Note: after making changes, test that sh listsrcdirs all | sort | uniq -d
+# returns an empty set.
+#
# default echomode (for compat)
-em=sys
+em='sys posix'
+
+# everything we support
+all='sys posix usr'
# mini-getopt (so that we don't have to with getopt vs. getopts
-unset cvsmode
+cvsmode=false
if [ ${1} = -c ]; then
cvsmode=true
shift
fi
-[ ! -z ${1} ] em=$1
-# both is undocumented, can be used for checking dupes:
-# sh listsrcdirs both | sort | uniq -d
-if [ ${em} != sys -a ${em} != usr -a ${em} != both ]; then
- echo 'mode must be sys or usr'
+
+[ ! -z ${*} ] em=${*}
+[ $em = all ] em=${all}
+for x in ${em}; do
+ for y in ${all}; do
+ [ $x = $y ] continue 2
+ done
+ echo invalid specifier $x
exit 1
-fi
+done
+
+iswanted ()
+{
+
+ for x in ${em}; do
+ if [ $x = $1 ]; then
+ return 0
+ fi
+ done
+ return 1
+}
lsrc ()
{
@@ -34,30 +54,35 @@ lsrc ()
what=$1
pfx=$2
shift 2
- if [ ${em} = both -o ${what} = ${em} ]; then
- for arg in $* ; do echo src${pfx}${arg} ; done
- fi
+
+ iswanted ${what} for arg in $* ; do echo src${pfx}${arg} ; done
}
ARCHS=amd64 i386 x86 arm evbarm sparc sparc64 powerpc evbppc mips evbmips
ARCHS_EXTRA=arm/arm32 Makefile
-# sources necessary for building rump kernel components
+# sources necessary for building rump kernel components. This list
+# depends on TOOLS_BUILDRUMP=yes.
lsrc sys / build.sh Makefile Makefile.inc
lsrc sys / tools common include share/mk
lsrc sys /etc/ Makefile.params master.passwd group
-lsrc sys /lib/lib c util rump
-lsrc sys /lib/librump user client hijack dev net vfs
+lsrc sys /lib/lib c util
lsrc sys /external/bsd/ flex mdocml byacc
lsrc sys /external/cddl/ osnet
lsrc sys /external/historical/ nawk
lsrc sys /bin/ cat
lsrc sys /usr.bin/ make xinstall config mktemp sed tsort
lsrc sys /usr.bin/ lorder join cksum m4 mkdep Makefile.inc
-lsrc sys /usr.bin/ rpcgen rump_server rump_allserver rump_wmd
-lsrc sys /usr.bin/ stat shmif_dumpbus
+lsrc sys /usr.bin/ rpcgen rump_wmd
+lsrc sys /usr.bin/ stat
lsrc sys /usr.sbin/ mtree
+# sources hosted in the NetBSD tree that are required/useful
+# when targeting POSIX-y platforms
+lsrc posix /lib/lib rump rumpdev rumpnet rumpvfs
+lsrc posix /lib/lib rumpuser rumpclient rumphijack
+lsrc posix /usr.bin/ rump_server rump_allserver shmif_dumpbus
+
# assorted userspace sources, mostly for configuration diagnostics
lsrc usr /lib/lib crypt ipsec m npf pci prop
lsrc usr /lib/lib pthread rmt y z
@@ -84,8 +109,8 @@ lsrc usr /crypto/external/bsd/ openssl
# If -c is given, use CVS syntax to exclude large subdirectories
# of sys. Otherwise just do it wholesale.
-if ${cvsmode:-false}; then
- [ ${em} = sys ] echo \!src/sys/arch src/sys
+if ${cvsmode}; then
+ iswanted sys echo \!src/sys/arch src/sys
# pick a few useful archs, namely those mentioned in buildrump.sh
for arch in ${ARCHS}; do
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Wed Jul 9 12:20:32 UTC 2014 Modified Files: src/sys/rump: listsrcdirs Log Message: Make the file system utility list consistent between fsck, mount and newfs. For now, include ext2, ffs and msdosfs (and as a special case, mount_tmpfs). To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/rump/listsrcdirs 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/listsrcdirs diff -u src/sys/rump/listsrcdirs:1.16 src/sys/rump/listsrcdirs:1.17 --- src/sys/rump/listsrcdirs:1.16 Wed Jul 9 12:14:47 2014 +++ src/sys/rump/listsrcdirs Wed Jul 9 12:20:32 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: listsrcdirs,v 1.16 2014/07/09 12:14:47 pooka Exp $ +# $NetBSD: listsrcdirs,v 1.17 2014/07/09 12:20:32 pooka Exp $ # # @@ -90,16 +90,16 @@ lsrc usr /libexec/ ld.elf_so lsrc usr /bin/ chmod cp dd df ed ln ls mkdir mv pax lsrc usr /bin/ rm rmdir lsrc usr /sbin/ cgdconfig chown -lsrc usr /sbin/ disklabel dump fsck fsck_ext2fs fsck_ffs -lsrc usr /sbin/ fsck_lfs fsck_msdos fsck_v7fs +lsrc usr /sbin/ disklabel dump +lsrc usr /sbin/ fsck fsck_ext2fs fsck_ffs fsck_msdos lsrc usr /sbin/ ifconfig mknod -lsrc usr /sbin/ modstat mount mount_ffs mount_tmpfs newfs -lsrc usr /sbin/ newfs_v7fs newfs_msdos newfs_ext2fs -lsrc usr /sbin/ newfs_lfs newfs_sysvbfs newfs_udf +lsrc usr /sbin/ modstat mount +lsrc usr /sbin/ mount_ext2fs mount_ffs mount_msdos mount_tmpfs +lsrc usr /sbin/ newfs newfs_ext2fs newfs_msdos lsrc usr /sbin/ ping ping6 raidctl reboot lsrc usr /sbin/ rndctl route setkey sysctl umount lsrc usr /usr.bin/ kdump ktrace -lsrc usr /usr.sbin/ arp dumpfs makefs ndp npf pcictl vnconfig +lsrc usr /usr.sbin/ arp dumpfs ndp npf pcictl vnconfig lsrc usr /usr.sbin/ wlanctl lsrc usr /external/bsd/ libpcap tcpdump wpa lsrc usr /crypto/ Makefile.openssl
CVS commit: src/tests/net/bpfjit
Module Name:src
Committed By: alnsn
Date: Wed Jul 9 13:49:49 UTC 2014
Added Files:
src/tests/net/bpfjit: t_cop.c t_extmem.c
Log Message:
Add t_cop and t_extmem kernel bpfjit tests.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tests/net/bpfjit/t_cop.c \
src/tests/net/bpfjit/t_extmem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/tests/net/bpfjit/t_cop.c
diff -u /dev/null src/tests/net/bpfjit/t_cop.c:1.1
--- /dev/null Wed Jul 9 13:49:49 2014
+++ src/tests/net/bpfjit/t_cop.c Wed Jul 9 13:49:49 2014
@@ -0,0 +1,664 @@
+/* $NetBSD: t_cop.c,v 1.1 2014/07/09 13:49:49 alnsn Exp $ */
+
+/*-
+ * Copyright (c) 2014 Alexander Nasonov.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in
+ *the documentation and/or other materials provided with the
+ *distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__RCSID($NetBSD: t_cop.c,v 1.1 2014/07/09 13:49:49 alnsn Exp $);
+
+#include stdint.h
+#include string.h
+
+#define __BPF_PRIVATE
+#include net/bpf.h
+#include net/bpfjit.h
+
+#include ../../net/bpf/h_bpf.h
+
+/* XXX: atf-c.h has collisions with mbuf */
+#undef m_type
+#undef m_data
+#include atf-c.h
+
+#include ../../h_macros.h
+
+static uint32_t retA(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+static uint32_t retBL(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+static uint32_t retWL(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+static uint32_t retNF(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+static uint32_t setARG(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+
+static const bpf_copfunc_t copfuncs[] = {
+ retA,
+ retBL,
+ retWL,
+ retNF,
+ setARG
+};
+
+static const bpf_ctx_t ctx = {
+ .copfuncs = copfuncs,
+ .nfuncs = sizeof(copfuncs) / sizeof(copfuncs[0]),
+ .extwords = 0
+};
+
+static uint32_t
+retA(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+
+ return A;
+}
+
+static uint32_t
+retBL(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+
+ return args-buflen;
+}
+
+static uint32_t
+retWL(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+
+ return args-wirelen;
+}
+
+static uint32_t
+retNF(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+
+ return bc-nfuncs;
+}
+
+/*
+ * COP function with a side effect.
+ */
+static uint32_t
+setARG(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+ bool *arg = (bool *)args-arg;
+ bool old = *arg;
+
+ *arg = true;
+ return old;
+}
+
+ATF_TC(bpfjit_cop_no_ctx);
+ATF_TC_HEAD(bpfjit_cop_no_ctx, tc)
+{
+ atf_tc_set_md_var(tc, descr, Test that bpf program with BPF_COP
+ instruction isn't valid without a context);
+}
+
+ATF_TC_BODY(bpfjit_cop_no_ctx, tc)
+{
+ static struct bpf_insn insns[] = {
+ BPF_STMT(BPF_MISC+BPF_COP, 0),
+ BPF_STMT(BPF_RET+BPF_K, 7)
+ };
+
+ bpfjit_func_t code;
+
+ size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+ RZ(rump_init());
+
+ ATF_CHECK(!prog_validate(insns, insn_count));
+
+ rump_schedule();
+ code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+ rump_unschedule();
+ ATF_CHECK(code == NULL);
+}
+
+ATF_TC(bpfjit_cop_ret_A);
+ATF_TC_HEAD(bpfjit_cop_ret_A, tc)
+{
+ atf_tc_set_md_var(tc, descr, Test coprocessor function
+ that returns a content of the A register);
+}
+
+ATF_TC_BODY(bpfjit_cop_ret_A, tc)
+{
+ static struct bpf_insn insns[] = {
+ BPF_STMT(BPF_LD+BPF_IMM, 13),
+ BPF_STMT(BPF_MISC+BPF_COP, 0), // retA
+ BPF_STMT(BPF_RET+BPF_A, 0)
+ };
+
+ bpfjit_func_t code;
+ uint8_t pkt[1] = { 0 };
+ bpf_args_t args = {
+ .pkt = pkt,
+ .buflen = sizeof(pkt),
+ .wirelen = sizeof(pkt),
+ };
+
+ size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+ RZ(rump_init());
+
+ rump_schedule();
+ code =
CVS commit: src
Module Name:src
Committed By: alnsn
Date: Wed Jul 9 13:50:48 UTC 2014
Modified Files:
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/tests/net/bpfjit: Makefile
Log Message:
Add t_cop and t_extmem kernel bpfjit tests to the build.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.578 -r1.579 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.3 -r1.4 src/tests/net/bpfjit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.70 src/distrib/sets/lists/debug/mi:1.71
--- src/distrib/sets/lists/debug/mi:1.70 Tue Jul 8 21:47:21 2014
+++ src/distrib/sets/lists/debug/mi Wed Jul 9 13:50:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.70 2014/07/08 21:47:21 alnsn Exp $
+# $NetBSD: mi,v 1.71 2014/07/09 13:50:48 alnsn Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib
@@ -2131,6 +2131,8 @@
./usr/libdata/debug/usr/tests/net/bpf/t_mbuf.debug tests-net-debug debug,atf,rump
./usr/libdata/debug/usr/tests/net/bpfilter/t_bpfilter.debug tests-net-debug debug,atf,rump
./usr/libdata/debug/usr/tests/net/bpfjit/t_bpfjit.debug tests-net-debug debug,atf,sljit,rump
+./usr/libdata/debug/usr/tests/net/bpfjit/t_cop.debug tests-net-debug debug,atf,sljit,rump
+./usr/libdata/debug/usr/tests/net/bpfjit/t_extmem.debug tests-net-debug debug,atf,sljit,rump
./usr/libdata/debug/usr/tests/net/bpfjit/t_mbuf.debug tests-net-debug debug,atf,sljit,rump
./usr/libdata/debug/usr/tests/net/carp/t_basic.debug tests-net-debug debug,atf,rump
./usr/libdata/debug/usr/tests/net/fdpass/fdpass32.debug tests-net-debug debug,atf
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.578 src/distrib/sets/lists/tests/mi:1.579
--- src/distrib/sets/lists/tests/mi:1.578 Tue Jul 8 21:47:21 2014
+++ src/distrib/sets/lists/tests/mi Wed Jul 9 13:50:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.578 2014/07/08 21:47:21 alnsn Exp $
+# $NetBSD: mi,v 1.579 2014/07/09 13:50:48 alnsn Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -3090,6 +3090,8 @@
./usr/tests/net/bpfjit/Atffile tests-net-tests atf,sljit,rump
./usr/tests/net/bpfjit/Kyuafile tests-net-tests atf,sljit,rump,kyua
./usr/tests/net/bpfjit/t_bpfjit tests-net-tests atf,sljit,rump
+./usr/tests/net/bpfjit/t_cop tests-net-tests atf,sljit,rump
+./usr/tests/net/bpfjit/t_extmem tests-net-tests atf,sljit,rump
./usr/tests/net/bpfjit/t_mbuf tests-net-tests atf,sljit,rump
./usr/tests/net/carptests-net-tests
./usr/tests/net/carp/Atffile tests-net-tests atf,rump
Index: src/tests/net/bpfjit/Makefile
diff -u src/tests/net/bpfjit/Makefile:1.3 src/tests/net/bpfjit/Makefile:1.4
--- src/tests/net/bpfjit/Makefile:1.3 Tue Jul 8 21:47:22 2014
+++ src/tests/net/bpfjit/Makefile Wed Jul 9 13:50:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/07/08 21:47:22 alnsn Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/09 13:50:48 alnsn Exp $
#
.include bsd.own.mk
@@ -6,6 +6,8 @@
TESTSDIR= ${TESTSBASE}/net/bpfjit
TESTS_C= t_bpfjit
+TESTS_C+= t_cop
+TESTS_C+= t_extmem
TESTS_C+= t_mbuf
LDADD+= -lrumpnet_bpfjit -lrumpkern_sljit
CVS commit: xsrc/external/mit/libdrm/dist
Module Name:xsrc
Committed By: riastradh
Date: Wed Jul 9 14:12:39 UTC 2014
Modified Files:
xsrc/external/mit/libdrm/dist: xf86atomic.h
Log Message:
Fix libdrm's atomic_dec_and_test on NetBSD (and Solaris, while here).
_nv means new value, not old value! This may help to fix various
instability in userland graphics, now that we aren't freeing stuff
with a reference count of 1 any more.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libdrm/dist/xf86atomic.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/xf86atomic.h
diff -u xsrc/external/mit/libdrm/dist/xf86atomic.h:1.3 xsrc/external/mit/libdrm/dist/xf86atomic.h:1.4
--- xsrc/external/mit/libdrm/dist/xf86atomic.h:1.3 Sat Aug 14 10:19:31 2010
+++ xsrc/external/mit/libdrm/dist/xf86atomic.h Wed Jul 9 14:12:39 2014
@@ -85,7 +85,7 @@ typedef struct { uint_t atomic; } atomic
# define atomic_read(x) (int) ((x)-atomic)
# define atomic_set(x, val) ((x)-atomic = (uint_t)(val))
# define atomic_inc(x) (atomic_inc_uint ((x)-atomic))
-# define atomic_dec_and_test(x) (atomic_dec_uint_nv((x)-atomic) == 1)
+# define atomic_dec_and_test(x) (atomic_dec_uint_nv((x)-atomic) == 0)
# define atomic_add(x, v) (atomic_add_int((x)-atomic, (v)))
# define atomic_dec(x, v) (atomic_add_int((x)-atomic, -(v)))
# define atomic_cmpxchg(x, oldv, newv) atomic_cas_uint ((x)-atomic, oldv, newv)
@@ -102,7 +102,7 @@ typedef struct { int atomic; } atomic_t;
# define atomic_read(x) (int) ((x)-atomic)
# define atomic_set(x, val) ((x)-atomic = (val))
# define atomic_inc(x) (atomic_inc_uint ((x)-atomic))
-# define atomic_dec_and_test(x) (atomic_dec_uint_nv((x)-atomic) == 1)
+# define atomic_dec_and_test(x) (atomic_dec_uint_nv((x)-atomic) == 0)
# define atomic_add(x, v) (atomic_add_int((x)-atomic, (v)))
# define atomic_dec(x, v) (atomic_add_int((x)-atomic, -(v)))
# define atomic_cmpxchg(x, oldv, newv) atomic_cas_uint ((x)-atomic, oldv, newv)
CVS commit: src/sys
Module Name:src
Committed By: rtr
Date: Wed Jul 9 14:41:43 UTC 2014
Modified Files:
src/sys/kern: uipc_socket.c uipc_usrreq.c
src/sys/net: if_mpls.c raw_usrreq.c rtsock.c
src/sys/netatalk: ddp_usrreq.c
src/sys/netbt: hci_socket.c l2cap_socket.c rfcomm_socket.c sco_socket.c
src/sys/netinet: raw_ip.c tcp_usrreq.c udp_usrreq.c
src/sys/netinet6: raw_ip6.c udp6_usrreq.c
src/sys/netipsec: keysock.c
src/sys/netmpls: mpls_proto.c
src/sys/netnatm: natm.c
src/sys/rump/net/lib/libsockin: sockin.c
src/sys/sys: protosw.h
Log Message:
* split PRU_ACCEPT function out of pr_generic() usrreq switches and put
into a separate function xxx_accept(struct socket *, struct mbuf *)
note: future cleanup will take place to remove struct mbuf parameter
type and replace it with a more appropriate type.
patch reviewed by rmind
To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.158 -r1.159 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.14 -r1.15 src/sys/net/if_mpls.c
cvs rdiff -u -r1.42 -r1.43 src/sys/net/raw_usrreq.c
cvs rdiff -u -r1.154 -r1.155 src/sys/net/rtsock.c
cvs rdiff -u -r1.52 -r1.53 src/sys/netatalk/ddp_usrreq.c
cvs rdiff -u -r1.31 -r1.32 src/sys/netbt/hci_socket.c
cvs rdiff -u -r1.22 -r1.23 src/sys/netbt/l2cap_socket.c
cvs rdiff -u -r1.23 -r1.24 src/sys/netbt/rfcomm_socket.c
cvs rdiff -u -r1.24 -r1.25 src/sys/netbt/sco_socket.c
cvs rdiff -u -r1.132 -r1.133 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.185 -r1.186 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.207 -r1.208 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.126 -r1.127 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.106 -r1.107 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.34 -r1.35 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.14 -r1.15 src/sys/netmpls/mpls_proto.c
cvs rdiff -u -r1.36 -r1.37 src/sys/netnatm/natm.c
cvs rdiff -u -r1.47 -r1.48 src/sys/rump/net/lib/libsockin/sockin.c
cvs rdiff -u -r1.51 -r1.52 src/sys/sys/protosw.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/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.224 src/sys/kern/uipc_socket.c:1.225
--- src/sys/kern/uipc_socket.c:1.224 Mon May 19 02:51:24 2014
+++ src/sys/kern/uipc_socket.c Wed Jul 9 14:41:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.224 2014/05/19 02:51:24 rmind Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.225 2014/07/09 14:41:42 rtr Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_socket.c,v 1.224 2014/05/19 02:51:24 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_socket.c,v 1.225 2014/07/09 14:41:42 rtr Exp $);
#include opt_compat_netbsd.h
#include opt_sock_counters.h
@@ -802,8 +802,7 @@ soaccept(struct socket *so, struct mbuf
so-so_state = ~SS_NOFDREF;
if ((so-so_state SS_ISDISCONNECTED) == 0 ||
(so-so_proto-pr_flags PR_ABRTACPTDIS) == 0)
- error = (*so-so_proto-pr_usrreqs-pr_generic)(so,
- PRU_ACCEPT, NULL, nam, NULL, NULL);
+ error = (*so-so_proto-pr_usrreqs-pr_accept)(so, nam);
else
error = ECONNABORTED;
Index: src/sys/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.158 src/sys/kern/uipc_usrreq.c:1.159
--- src/sys/kern/uipc_usrreq.c:1.158 Wed Jul 9 04:54:03 2014
+++ src/sys/kern/uipc_usrreq.c Wed Jul 9 14:41:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.158 2014/07/09 04:54:03 rtr Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.159 2014/07/09 14:41:42 rtr Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_usrreq.c,v 1.158 2014/07/09 04:54:03 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_usrreq.c,v 1.159 2014/07/09 14:41:42 rtr Exp $);
#include sys/param.h
#include sys/systm.h
@@ -376,6 +376,7 @@ unp_usrreq(struct socket *so, int req, s
KASSERT(req != PRU_ATTACH);
KASSERT(req != PRU_DETACH);
+ KASSERT(req != PRU_ACCEPT);
KASSERT(req != PRU_CONTROL);
KASSERT(req != PRU_SENSE);
KASSERT(req != PRU_PEERADDR);
@@ -419,56 +420,6 @@ unp_usrreq(struct socket *so, int req, s
unp_disconnect(unp);
break;
- case PRU_ACCEPT:
- KASSERT(so-so_lock == uipc_lock);
- /*
- * Mark the initiating STREAM socket as connected *ONLY*
- * after it's been accepted. This prevents a client from
- * overrunning a server and receiving ECONNREFUSED.
- */
- if (unp-unp_conn == NULL) {
- /*
- * This will use the empty socket and will not
- * allocate.
- */
- unp_setaddr(so, nam, true);
- break;
- }
- so2 = unp-unp_conn-unp_socket;
- if (so2-so_state SS_ISCONNECTING) {
- KASSERT(solocked2(so, so-so_head));
- KASSERT(solocked2(so2, so-so_head));
- soisconnected(so2);
- }
- /*
- * If the connection is fully
CVS commit: src/sys/rump/net/lib/libsockin
Module Name:src
Committed By: rtr
Date: Wed Jul 9 15:37:55 UTC 2014
Modified Files:
src/sys/rump/net/lib/libsockin: sockin.c
Log Message:
fix name clash i introduced when adding sockin_accept() pru by renaming
the rump sockin_accept(struct socket *) to sockin_waccept(struct socket *)
not a very creative name the 'w' indicates worker and was chosen to
prefix the word accept to make it not pattern match with _accept. if
someone prefers a different name then please feel free to change it.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/rump/net/lib/libsockin/sockin.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/net/lib/libsockin/sockin.c
diff -u src/sys/rump/net/lib/libsockin/sockin.c:1.48 src/sys/rump/net/lib/libsockin/sockin.c:1.49
--- src/sys/rump/net/lib/libsockin/sockin.c:1.48 Wed Jul 9 14:41:43 2014
+++ src/sys/rump/net/lib/libsockin/sockin.c Wed Jul 9 15:37:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sockin.c,v 1.48 2014/07/09 14:41:43 rtr Exp $ */
+/* $NetBSD: sockin.c,v 1.49 2014/07/09 15:37:55 rtr Exp $ */
/*
* Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sockin.c,v 1.48 2014/07/09 14:41:43 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: sockin.c,v 1.49 2014/07/09 15:37:55 rtr Exp $);
#include sys/param.h
#include sys/condvar.h
@@ -284,7 +284,7 @@ sockin_process(struct socket *so)
}
static void
-sockin_accept(struct socket *so)
+sockin_waccept(struct socket *so)
{
struct socket *nso;
struct sockaddr_in6 sin;
@@ -363,7 +363,7 @@ sockinworker(void *arg)
so = su_iter-su_so;
mutex_exit(su_mtx);
if(so-so_optionsSO_ACCEPTCONN)
- sockin_accept(so);
+ sockin_waccept(so);
else
sockin_process(so);
mutex_enter(su_mtx);
CVS commit: src/tests/net/bpfjit
Module Name:src Committed By: alnsn Date: Wed Jul 9 15:56:12 UTC 2014 Modified Files: src/tests/net/bpfjit: t_cop.c Log Message: Fix copy/paste error: s/rump_unschedule/rump_schedule/. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/net/bpfjit/t_cop.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/bpfjit/t_cop.c diff -u src/tests/net/bpfjit/t_cop.c:1.1 src/tests/net/bpfjit/t_cop.c:1.2 --- src/tests/net/bpfjit/t_cop.c:1.1 Wed Jul 9 13:49:49 2014 +++ src/tests/net/bpfjit/t_cop.c Wed Jul 9 15:56:12 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: t_cop.c,v 1.1 2014/07/09 13:49:49 alnsn Exp $ */ +/* $NetBSD: t_cop.c,v 1.2 2014/07/09 15:56:12 alnsn Exp $ */ /*- * Copyright (c) 2014 Alexander Nasonov. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: t_cop.c,v 1.1 2014/07/09 13:49:49 alnsn Exp $); +__RCSID($NetBSD: t_cop.c,v 1.2 2014/07/09 15:56:12 alnsn Exp $); #include stdint.h #include string.h @@ -467,7 +467,7 @@ ATF_TC_BODY(bpfjit_copx_ret_buflen, tc) ATF_CHECK(code(ctx, args) == sizeof(pkt)); - rump_unschedule(); + rump_schedule(); rumpns_bpfjit_free_code(code); rump_unschedule(); }
CVS commit: src/lib/libc/sys
Module Name:src Committed By: christos Date: Wed Jul 9 16:06:47 UTC 2014 Modified Files: src/lib/libc/sys: kill.2 Log Message: mention sig == 0 To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/lib/libc/sys/kill.2 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/sys/kill.2 diff -u src/lib/libc/sys/kill.2:1.21 src/lib/libc/sys/kill.2:1.22 --- src/lib/libc/sys/kill.2:1.21 Sun Jul 13 11:16:26 2008 +++ src/lib/libc/sys/kill.2 Wed Jul 9 12:06:47 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: kill.2,v 1.21 2008/07/13 15:16:26 dholland Exp $ +.\ $NetBSD: kill.2,v 1.22 2014/07/09 16:06:47 christos Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)kill.2 8.3 (Berkeley) 4/19/94 .\ -.Dd April 19, 1994 +.Dd July 9, 2014 .Dt KILL 2 .Os .Sh NAME @@ -94,6 +94,14 @@ the signal is sent to all processes whos is equal to the absolute value of the process number. This is a variant of .Xr killpg 3 . +.Pp +If +.Fa sig +is equal to +.Dv 0 , +then no signal is sent to the process ID or process group ID, but error +checking is performed. +This can be used to check if the process ID or process group ID exist. .Sh RETURN VALUES Upon successful completion, a value of 0 is returned. Otherwise, a value of \-1 is returned and
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jul 9 16:11:45 UTC 2014 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.3 Log Message: Ticket #1913. To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-5.2.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2.3 diff -u src/doc/CHANGES-5.2.3:1.1.2.10 src/doc/CHANGES-5.2.3:1.1.2.11 --- src/doc/CHANGES-5.2.3:1.1.2.10 Mon Jun 30 10:58:42 2014 +++ src/doc/CHANGES-5.2.3 Wed Jul 9 16:11:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.3,v 1.1.2.10 2014/06/30 10:58:42 msaitoh Exp $ +# $NetBSD: CHANGES-5.2.3,v 1.1.2.11 2014/07/09 16:11:45 msaitoh Exp $ A complete list of changes from the NetBSD 5.2.2 release to the NetBSD 5.2.3 release: @@ -125,3 +125,62 @@ sys/compat/freebsd/freebsd_sched.c 1.20 Avoid NULL dereference and fix sched param conversion. Pointed out by Maxime Villard. [maxv, ticket #1909] + +libexec/httpd/CHANGES1.3-1.18 +libexec/httpd/Makefile1.8-1.22 via patch +libexec/httpd/Makefile.boot 1.3-1.6 +libexec/httpd/auth-bozo.c 1.5-1.13 +libexec/httpd/bozohttpd.8 1.6-1.46 +libexec/httpd/bozohttpd.c 1.8,1.12-1.54 +libexec/httpd/bozohttpd.h 1.8-1.32 +libexec/httpd/cgi-bozo.c 1.11-1.25 +libexec/httpd/content-bozo.c 1.4-1.10 +libexec/httpd/daemon-bozo.c 1.5-1.16 +libexec/httpd/dir-index-bozo.c 1.6-1.19 +libexec/httpd/ssl-bozo.c 1.5-1.16 +libexec/httpd/tilde-luzah-bozo.c 1.5-1.10 +libexec/httpd/lua-bozo.c 1.1-1.9 +libexec/httpd/main.c1.1-1.7 +libexec/httpd/netbsd_queue.h 1.1 +libexec/httpd/printenv.lua 1.1-1.2 +libexec/httpd/debug/Makefile 1.1 +libexec/httpd/libbozohttpd/Makefile 1.2 +libexec/httpd/libbozohttpd/libbozohttpd.3 1.3 +libexec/httpd/libbozohttpd/shlib_version 1.1 +libexec/httpd/lua/Makefile 1.1 +libexec/httpd/lua/bozo.lua 1.1 +libexec/httpd/lua/glue.c 1.1 +libexec/httpd/lua/optparse.lua 1.1 +libexec/httpd/lua/shlib_version 1.1 +libexec/httpd/small/Makefile 1.1-1.2 +libexec/httpd/testsuite/Makefile 1.4 +libexec/httpd/testsuite/html_cmp 1.4 +libexec/httpd/testsuite/t1.in 1.3 +libexec/httpd/testsuite/t1.out 1.3 +libexec/httpd/testsuite/t10.in 1.1 +libexec/httpd/testsuite/t10.out 1.1 +libexec/httpd/testsuite/t2.in 1.3 +libexec/httpd/testsuite/t2.out 1.3 +libexec/httpd/testsuite/t3.in 1.3 +libexec/httpd/testsuite/t3.out 1.3 +libexec/httpd/testsuite/t4.in 1.3 +libexec/httpd/testsuite/t4.out 1.3 +libexec/httpd/testsuite/t5.in 1.3 +libexec/httpd/testsuite/t5.out 1.3 +libexec/httpd/testsuite/t6.in 1.3 +libexec/httpd/testsuite/t6.out 1.3 +libexec/httpd/testsuite/t7.in 1.3 +libexec/httpd/testsuite/t7.out 1.3 +libexec/httpd/testsuite/t8.in 1.3 +libexec/httpd/testsuite/t8.out 1.3 +libexec/httpd/testsuite/t9.in 1.3 +libexec/httpd/testsuite/t9.out 1.3 +libexec/httpd/testsuite/test-bigfile 1.1 +libexec/httpd/testsuite/data/bigfile 1.1 +libexec/httpd/testsuite/data/bigfile.partial4000 1.1 +libexec/httpd/testsuite/data/bigfile.partial8000 1.1 +libexec/httpd/testsuite/data/file 1.3 +libexec/httpd/testsuite/data/index.html 1.3 + + Update bozohttpd from 20080303+patches to 20140708. + [mrg, ticket #1913]
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jul 9 16:12:11 UTC 2014 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.5 Log Message: Ticket 1913. To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-5.1.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.5 diff -u src/doc/CHANGES-5.1.5:1.1.2.10 src/doc/CHANGES-5.1.5:1.1.2.11 --- src/doc/CHANGES-5.1.5:1.1.2.10 Mon Jun 30 11:00:06 2014 +++ src/doc/CHANGES-5.1.5 Wed Jul 9 16:12:11 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.5,v 1.1.2.10 2014/06/30 11:00:06 msaitoh Exp $ +# $NetBSD: CHANGES-5.1.5,v 1.1.2.11 2014/07/09 16:12:11 msaitoh Exp $ A complete list of changes from the NetBSD 5.1.4 release to the NetBSD 5.1.5 release: @@ -125,3 +125,62 @@ sys/compat/freebsd/freebsd_sched.c 1.20 Avoid NULL dereference and fix sched param conversion. Pointed out by Maxime Villard. [maxv, ticket #1909] + +libexec/httpd/CHANGES1.3-1.18 +libexec/httpd/Makefile1.8-1.22 via patch +libexec/httpd/Makefile.boot 1.3-1.6 +libexec/httpd/auth-bozo.c 1.5-1.13 +libexec/httpd/bozohttpd.8 1.6-1.46 +libexec/httpd/bozohttpd.c 1.8,1.12-1.54 +libexec/httpd/bozohttpd.h 1.8-1.32 +libexec/httpd/cgi-bozo.c 1.11-1.25 +libexec/httpd/content-bozo.c 1.4-1.10 +libexec/httpd/daemon-bozo.c 1.5-1.16 +libexec/httpd/dir-index-bozo.c 1.6-1.19 +libexec/httpd/ssl-bozo.c 1.5-1.16 +libexec/httpd/tilde-luzah-bozo.c 1.5-1.10 +libexec/httpd/lua-bozo.c 1.1-1.9 +libexec/httpd/main.c1.1-1.7 +libexec/httpd/netbsd_queue.h 1.1 +libexec/httpd/printenv.lua 1.1-1.2 +libexec/httpd/debug/Makefile 1.1 +libexec/httpd/libbozohttpd/Makefile 1.2 +libexec/httpd/libbozohttpd/libbozohttpd.3 1.3 +libexec/httpd/libbozohttpd/shlib_version 1.1 +libexec/httpd/lua/Makefile 1.1 +libexec/httpd/lua/bozo.lua 1.1 +libexec/httpd/lua/glue.c 1.1 +libexec/httpd/lua/optparse.lua 1.1 +libexec/httpd/lua/shlib_version 1.1 +libexec/httpd/small/Makefile 1.1-1.2 +libexec/httpd/testsuite/Makefile 1.4 +libexec/httpd/testsuite/html_cmp 1.4 +libexec/httpd/testsuite/t1.in 1.3 +libexec/httpd/testsuite/t1.out 1.3 +libexec/httpd/testsuite/t10.in 1.1 +libexec/httpd/testsuite/t10.out 1.1 +libexec/httpd/testsuite/t2.in 1.3 +libexec/httpd/testsuite/t2.out 1.3 +libexec/httpd/testsuite/t3.in 1.3 +libexec/httpd/testsuite/t3.out 1.3 +libexec/httpd/testsuite/t4.in 1.3 +libexec/httpd/testsuite/t4.out 1.3 +libexec/httpd/testsuite/t5.in 1.3 +libexec/httpd/testsuite/t5.out 1.3 +libexec/httpd/testsuite/t6.in 1.3 +libexec/httpd/testsuite/t6.out 1.3 +libexec/httpd/testsuite/t7.in 1.3 +libexec/httpd/testsuite/t7.out 1.3 +libexec/httpd/testsuite/t8.in 1.3 +libexec/httpd/testsuite/t8.out 1.3 +libexec/httpd/testsuite/t9.in 1.3 +libexec/httpd/testsuite/t9.out 1.3 +libexec/httpd/testsuite/test-bigfile 1.1 +libexec/httpd/testsuite/data/bigfile 1.1 +libexec/httpd/testsuite/data/bigfile.partial4000 1.1 +libexec/httpd/testsuite/data/bigfile.partial8000 1.1 +libexec/httpd/testsuite/data/file 1.3 +libexec/httpd/testsuite/data/index.html 1.3 + + Update bozohttpd from 20080303+patches to 20140708. + [mrg, ticket #1913]
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jul 9 16:11:23 UTC 2014 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1913. To generate a diff of this commit: cvs rdiff -u -r1.1.2.62 -r1.1.2.63 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.62 src/doc/CHANGES-5.3:1.1.2.63 --- src/doc/CHANGES-5.3:1.1.2.62 Mon Jun 30 10:54:37 2014 +++ src/doc/CHANGES-5.3 Wed Jul 9 16:11:23 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.62 2014/06/30 10:54:37 msaitoh Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.63 2014/07/09 16:11:23 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -860,3 +860,62 @@ sys/compat/freebsd/freebsd_sched.c 1.20 Avoid NULL dereference and fix sched param conversion. Pointed out by Maxime Villard. [maxv, ticket #1909] + +libexec/httpd/CHANGES1.3-1.18 +libexec/httpd/Makefile1.8-1.22 via patch +libexec/httpd/Makefile.boot 1.3-1.6 +libexec/httpd/auth-bozo.c 1.5-1.13 +libexec/httpd/bozohttpd.8 1.6-1.46 +libexec/httpd/bozohttpd.c 1.8,1.12-1.54 +libexec/httpd/bozohttpd.h 1.8-1.32 +libexec/httpd/cgi-bozo.c 1.11-1.25 +libexec/httpd/content-bozo.c 1.4-1.10 +libexec/httpd/daemon-bozo.c 1.5-1.16 +libexec/httpd/dir-index-bozo.c 1.6-1.19 +libexec/httpd/ssl-bozo.c 1.5-1.16 +libexec/httpd/tilde-luzah-bozo.c 1.5-1.10 +libexec/httpd/lua-bozo.c 1.1-1.9 +libexec/httpd/main.c1.1-1.7 +libexec/httpd/netbsd_queue.h 1.1 +libexec/httpd/printenv.lua 1.1-1.2 +libexec/httpd/debug/Makefile 1.1 +libexec/httpd/libbozohttpd/Makefile 1.2 +libexec/httpd/libbozohttpd/libbozohttpd.3 1.3 +libexec/httpd/libbozohttpd/shlib_version 1.1 +libexec/httpd/lua/Makefile 1.1 +libexec/httpd/lua/bozo.lua 1.1 +libexec/httpd/lua/glue.c 1.1 +libexec/httpd/lua/optparse.lua 1.1 +libexec/httpd/lua/shlib_version 1.1 +libexec/httpd/small/Makefile 1.1-1.2 +libexec/httpd/testsuite/Makefile 1.4 +libexec/httpd/testsuite/html_cmp 1.4 +libexec/httpd/testsuite/t1.in 1.3 +libexec/httpd/testsuite/t1.out 1.3 +libexec/httpd/testsuite/t10.in 1.1 +libexec/httpd/testsuite/t10.out 1.1 +libexec/httpd/testsuite/t2.in 1.3 +libexec/httpd/testsuite/t2.out 1.3 +libexec/httpd/testsuite/t3.in 1.3 +libexec/httpd/testsuite/t3.out 1.3 +libexec/httpd/testsuite/t4.in 1.3 +libexec/httpd/testsuite/t4.out 1.3 +libexec/httpd/testsuite/t5.in 1.3 +libexec/httpd/testsuite/t5.out 1.3 +libexec/httpd/testsuite/t6.in 1.3 +libexec/httpd/testsuite/t6.out 1.3 +libexec/httpd/testsuite/t7.in 1.3 +libexec/httpd/testsuite/t7.out 1.3 +libexec/httpd/testsuite/t8.in 1.3 +libexec/httpd/testsuite/t8.out 1.3 +libexec/httpd/testsuite/t9.in 1.3 +libexec/httpd/testsuite/t9.out 1.3 +libexec/httpd/testsuite/test-bigfile 1.1 +libexec/httpd/testsuite/data/bigfile 1.1 +libexec/httpd/testsuite/data/bigfile.partial4000 1.1 +libexec/httpd/testsuite/data/bigfile.partial8000 1.1 +libexec/httpd/testsuite/data/file 1.3 +libexec/httpd/testsuite/data/index.html 1.3 + + Update bozohttpd from 20080303+patches to 20140708. + [mrg, ticket #1913]
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Jul 9 16:30:11 UTC 2014 Modified Files: src/sys/dev/pci: if_bnx.c Log Message: Call bnx_print_adapter_info() before mii_attach() to not to split bnx's dmesg into two parts by brgphy's dmesg. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/if_bnx.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/if_bnx.c diff -u src/sys/dev/pci/if_bnx.c:1.56 src/sys/dev/pci/if_bnx.c:1.57 --- src/sys/dev/pci/if_bnx.c:1.56 Tue Jul 1 17:11:35 2014 +++ src/sys/dev/pci/if_bnx.c Wed Jul 9 16:30:11 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bnx.c,v 1.56 2014/07/01 17:11:35 msaitoh Exp $ */ +/* $NetBSD: if_bnx.c,v 1.57 2014/07/09 16:30:11 msaitoh Exp $ */ /* $OpenBSD: if_bnx.c,v 1.85 2009/11/09 14:32:41 dlg Exp $ */ /*- @@ -35,7 +35,7 @@ #if 0 __FBSDID($FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $); #endif -__KERNEL_RCSID(0, $NetBSD: if_bnx.c,v 1.56 2014/07/01 17:11:35 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: if_bnx.c,v 1.57 2014/07/09 16:30:11 msaitoh Exp $); /* * The following controllers are supported by this driver: @@ -828,6 +828,9 @@ bnx_attach(device_t parent, device_t sel prop_dictionary_set_uint32(dict, shared_hwcfg,sc-bnx_shared_hw_cfg); prop_dictionary_set_uint32(dict, port_hwcfg, sc-bnx_port_hw_cfg); + /* Print some useful adapter info */ + bnx_print_adapter_info(sc); + if (sc-bnx_phy_flags BNX_PHY_SERDES_FLAG) mii_flags |= MIIF_HAVEFIBER; mii_attach(self, sc-bnx_mii, 0x, @@ -852,8 +855,6 @@ bnx_attach(device_t parent, device_t sel else aprint_error_dev(self, couldn't establish power handler\n); - /* Finally, print some useful adapter info */ - bnx_print_adapter_info(sc); /* Print some important debugging info. */ DBRUN(BNX_INFO, bnx_dump_driver_state(sc));
CVS commit: xsrc/external/mit/MesaLib/dist/src/mesa/swrast
Module Name:xsrc
Committed By: riastradh
Date: Wed Jul 9 20:00:57 UTC 2014
Modified Files:
xsrc/external/mit/MesaLib/dist/src/mesa/swrast: s_span.c
Log Message:
Need a void * cast here too.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/swrast/s_span.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/MesaLib/dist/src/mesa/swrast/s_span.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/swrast/s_span.c:1.1.1.5 xsrc/external/mit/MesaLib/dist/src/mesa/swrast/s_span.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/swrast/s_span.c:1.1.1.5 Wed Jul 9 19:38:43 2014
+++ xsrc/external/mit/MesaLib/dist/src/mesa/swrast/s_span.c Wed Jul 9 20:00:57 2014
@@ -1239,7 +1239,7 @@ _swrast_write_rgba_span( struct gl_conte
}
else {
if (rb-DataType == GL_UNSIGNED_BYTE) {
- span-array-rgba = span-array-rgba8;
+ span-array-rgba = (void *) span-array-rgba8;
}
else if (rb-DataType == GL_UNSIGNED_SHORT) {
span-array-rgba = (void *) span-array-rgba16;
CVS commit: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel
Module Name:xsrc Committed By: riastradh Date: Wed Jul 9 20:04:12 UTC 2014 Modified Files: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel: intel_batchbuffer.h Log Message: Declare intel_emit_depth_stall_flushes in intel_batchbuffer.h. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_batchbuffer.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_batchbuffer.h diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_batchbuffer.h:1.1.1.4 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_batchbuffer.h:1.2 --- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_batchbuffer.h:1.1.1.4 Wed Jul 9 19:38:49 2014 +++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_batchbuffer.h Wed Jul 9 20:04:12 2014 @@ -126,6 +126,7 @@ intel_batchbuffer_advance(struct intel_c } void intel_batchbuffer_cached_advance(struct intel_context *intel); +void intel_emit_depth_stall_flushes(struct intel_context *intel); /* Here are the crusty old macros, to be removed: */
CVS commit: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri
Module Name:xsrc Committed By: riastradh Date: Wed Jul 9 20:08:57 UTC 2014 Modified Files: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200: radeon_span.c xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r300: radeon_span.c xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r600: radeon_span.c xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon: radeon_span.c Log Message: Define CPU_TO_LE16/LE16_TO_CPU consistently in main/compiler.h. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/radeon_span.c cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r300/radeon_span.c cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r600/radeon_span.c cvs rdiff -u -r1.1.1.5 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_span.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/MesaLib/dist/src/mesa/drivers/dri/r200/radeon_span.c diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/radeon_span.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/radeon_span.c:1.2 --- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/radeon_span.c:1.1.1.1 Wed Jul 9 19:38:51 2014 +++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/radeon_span.c Wed Jul 9 20:08:56 2014 @@ -50,17 +50,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE #define DBG 0 -#if defined(BYTE_ORDER) defined(BIG_ENDIAN) BYTE_ORDER == BIG_ENDIAN -#if defined(__linux__) -#include byteswap.h -#define CPU_TO_LE16( x ) bswap_16( x ) -#define LE16_TO_CPU( x ) bswap_16( x ) -#endif /* __linux__ */ -#else -#define CPU_TO_LE16( x ) ( x ) -#define LE16_TO_CPU( x ) ( x ) -#endif - static void radeonSetSpanFunctions(struct radeon_renderbuffer *rrb); Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r300/radeon_span.c diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r300/radeon_span.c:1.3 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r300/radeon_span.c:1.4 --- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r300/radeon_span.c:1.3 Wed Jul 9 19:46:48 2014 +++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r300/radeon_span.c Wed Jul 9 20:08:57 2014 @@ -50,17 +50,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE #define DBG 0 -#if defined(BYTE_ORDER) defined(BIG_ENDIAN) BYTE_ORDER == BIG_ENDIAN -#if defined(__linux__) -#include byteswap.h -#define CPU_TO_LE16( x ) bswap_16( x ) -#define LE16_TO_CPU( x ) bswap_16( x ) -#endif /* __linux__ */ -#else -#define CPU_TO_LE16( x ) ( x ) -#define LE16_TO_CPU( x ) ( x ) -#endif - static void radeonSetSpanFunctions(struct radeon_renderbuffer *rrb); Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r600/radeon_span.c diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r600/radeon_span.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r600/radeon_span.c:1.2 --- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r600/radeon_span.c:1.1.1.1 Wed Jul 9 19:38:54 2014 +++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r600/radeon_span.c Wed Jul 9 20:08:57 2014 @@ -50,17 +50,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE #define DBG 0 -#if defined(BYTE_ORDER) defined(BIG_ENDIAN) BYTE_ORDER == BIG_ENDIAN -#if defined(__linux__) -#include byteswap.h -#define CPU_TO_LE16( x ) bswap_16( x ) -#define LE16_TO_CPU( x ) bswap_16( x ) -#endif /* __linux__ */ -#else -#define CPU_TO_LE16( x ) ( x ) -#define LE16_TO_CPU( x ) ( x ) -#endif - static void radeonSetSpanFunctions(struct radeon_renderbuffer *rrb); Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_span.c diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_span.c:1.1.1.5 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_span.c:1.2 --- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_span.c:1.1.1.5 Wed Jul 9 19:38:55 2014 +++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_span.c Wed Jul 9 20:08:57 2014 @@ -50,17 +50,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE #define DBG 0 -#if defined(BYTE_ORDER) defined(BIG_ENDIAN) BYTE_ORDER == BIG_ENDIAN -#if defined(__linux__) -#include byteswap.h -#define CPU_TO_LE16( x ) bswap_16( x ) -#define LE16_TO_CPU( x ) bswap_16( x ) -#endif /* __linux__ */ -#else -#define CPU_TO_LE16( x ) ( x ) -#define LE16_TO_CPU( x ) ( x ) -#endif - static void radeonSetSpanFunctions(struct radeon_renderbuffer *rrb);
CVS commit: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri
Module Name:xsrc
Committed By: riastradh
Date: Wed Jul 9 20:05:37 UTC 2014
Modified Files:
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200: r200_tcl.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon:
radeon_tcl.c
Log Message:
Cast pointers to uintptr_t, not random integer types.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_tcl.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/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c:1.6 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c:1.7
--- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c:1.6 Wed Jul 9 19:46:48 2014
+++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c Wed Jul 9 20:05:37 2014
@@ -219,8 +219,8 @@ static void r200EmitPrim( struct gl_cont
#ifdef MESA_BIG_ENDIAN
/* We could do without (most of) this ugliness if dest was always 32 bit word aligned... */
#define EMIT_ELT(dest, offset, x) do { \
-int off = offset + ( ( (GLuint)dest 0x2 ) 1 ); \
-GLushort *des = (GLushort *)( (unsigned long)dest ~0x2 );\
+int off = offset + ( ( (uintptr_t)dest 0x2 ) 1 ); \
+GLushort *des = (GLushort *)( (uintptr_t)dest ~0x2 );\
(des)[ off + 1 - 2 * ( off 1 ) ] = (GLushort)(x); \
(void)rmesa; } while (0)
#else
Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_tcl.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_tcl.c:1.1.1.5 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_tcl.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_tcl.c:1.1.1.5 Wed Jul 9 19:38:55 2014
+++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_tcl.c Wed Jul 9 20:05:37 2014
@@ -207,8 +207,8 @@ static void radeonEmitPrim( struct gl_co
#ifdef MESA_BIG_ENDIAN
/* We could do without (most of) this ugliness if dest was always 32 bit word aligned... */
#define EMIT_ELT(dest, offset, x) do {\
- int off = offset + ( ( (GLuint)dest 0x2 ) 1 ); \
- GLushort *des = (GLushort *)( (GLuint)dest ~0x2 ); \
+ int off = offset + ( ( (uintptr_t)dest 0x2 ) 1 ); \
+ GLushort *des = (GLushort *)( (uintptr_t)dest ~0x2 ); \
(des)[ off + 1 - 2 * ( off 1 ) ] = (GLushort)(x); \
(void)rmesa; } while (0)
#else
CVS commit: xsrc/external/mit/MesaLib/dist/src/mesa/main
Module Name:xsrc Committed By: riastradh Date: Wed Jul 9 19:50:00 UTC 2014 Added Files: xsrc/external/mit/MesaLib/dist/src/mesa/main: git_sha1.h Log Message: Add stub git_sha1.h. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ xsrc/external/mit/MesaLib/dist/src/mesa/main/git_sha1.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/mit/MesaLib/dist/src/mesa/main/git_sha1.h diff -u /dev/null xsrc/external/mit/MesaLib/dist/src/mesa/main/git_sha1.h:1.1 --- /dev/null Wed Jul 9 19:50:00 2014 +++ xsrc/external/mit/MesaLib/dist/src/mesa/main/git_sha1.h Wed Jul 9 19:50:00 2014 @@ -0,0 +1 @@ +/* We are using a release version, not a Git snapshot. */
CVS commit: xsrc/external/mit/MesaLib/dist/src/mesa/main
Module Name:xsrc
Committed By: riastradh
Date: Wed Jul 9 20:11:14 UTC 2014
Modified Files:
xsrc/external/mit/MesaLib/dist/src/mesa/main: mipmap.c
Log Message:
Fix types and omit needless casts in mesa/main/mipmap.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/main/mipmap.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/MesaLib/dist/src/mesa/main/mipmap.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/main/mipmap.c:1.1.1.5 xsrc/external/mit/MesaLib/dist/src/mesa/main/mipmap.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/main/mipmap.c:1.1.1.5 Wed Jul 9 19:38:39 2014
+++ xsrc/external/mit/MesaLib/dist/src/mesa/main/mipmap.c Wed Jul 9 20:11:14 2014
@@ -1976,7 +1976,7 @@ generate_mipmap_compressed(struct gl_con
GLuint row;
GLint components;
GLuint temp_src_stride, temp_dst_stride; /* in bytes */
- GLchan *temp_src = NULL, *temp_dst = NULL;
+ GLubyte *temp_src = NULL, *temp_dst = NULL;
/* Choose the format we will do _mesa_generate_mipmap_level() in,
* and uncompress the firstImage into a temporary of that format.
@@ -2010,7 +2010,7 @@ generate_mipmap_compressed(struct gl_con
/* allocate storage for uncompressed GL_RGB or GL_RGBA images */
temp_src_stride = _mesa_format_row_stride(temp_format, srcImage-Width);
/* 20 extra bytes, just be safe when calling last FetchTexel */
- temp_src = (GLubyte *) malloc(temp_src_stride * srcImage-Height + 20);
+ temp_src = malloc(temp_src_stride * srcImage-Height + 20);
if (!temp_src) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, generate mipmaps);
return;
@@ -2053,7 +2053,7 @@ generate_mipmap_compressed(struct gl_con
temp_dst_stride = _mesa_format_row_stride(temp_format, dstWidth);
if (!temp_dst) {
- temp_dst = (GLubyte *) malloc(temp_dst_stride * dstHeight);
+ temp_dst = malloc(temp_dst_stride * dstHeight);
if (!temp_dst) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, generate mipmaps);
break;
@@ -2087,7 +2087,7 @@ generate_mipmap_compressed(struct gl_con
/* swap src and dest pointers */
{
- GLchan *temp = temp_src;
+ GLubyte *temp = temp_src;
temp_src = temp_dst;
temp_dst = temp;
@@ -2095,7 +2095,7 @@ generate_mipmap_compressed(struct gl_con
}
} /* loop over mipmap levels */
- free((void *) temp_src);
+ free(temp_src);
free(temp_dst);
}
CVS commit: xsrc/external/mit/MesaLib/dist/src/mesa/main
Module Name:xsrc Committed By: riastradh Date: Wed Jul 9 20:12:30 UTC 2014 Modified Files: xsrc/external/mit/MesaLib/dist/src/mesa/main: compiler.h Log Message: Define CPU_TO_LE16/LE16_TO_CPU consistently in main/compiler.h. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/mesa/main/compiler.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/MesaLib/dist/src/mesa/main/compiler.h diff -u xsrc/external/mit/MesaLib/dist/src/mesa/main/compiler.h:1.1.1.3 xsrc/external/mit/MesaLib/dist/src/mesa/main/compiler.h:1.2 --- xsrc/external/mit/MesaLib/dist/src/mesa/main/compiler.h:1.1.1.3 Wed Jul 9 19:38:37 2014 +++ xsrc/external/mit/MesaLib/dist/src/mesa/main/compiler.h Wed Jul 9 20:12:30 2014 @@ -266,13 +266,16 @@ static INLINE GLuint CPU_TO_LE32(GLuint #else /*__linux__ */ #include sys/endian.h #define CPU_TO_LE32( x ) bswap32( x ) +#define CPU_TO_LE16( x ) bswap16( x ) #endif /*__linux__*/ #define MESA_BIG_ENDIAN 1 #else #define CPU_TO_LE32( x ) ( x ) +#define CPU_TO_LE16( x ) ( x ) #define MESA_LITTLE_ENDIAN 1 #endif #define LE32_TO_CPU( x ) CPU_TO_LE32( x ) +#define LE16_TO_CPU( x ) CPU_TO_LE16( x )
CVS commit: xsrc/external/mit/MesaLib/dist/src
Module Name:xsrc
Committed By: riastradh
Date: Wed Jul 9 20:14:17 UTC 2014
Modified Files:
xsrc/external/mit/MesaLib/dist/src/glsl: ralloc.c
xsrc/external/mit/MesaLib/dist/src/mesa/main: context.c
Log Message:
Use __attribute__((__destructor__)), not atexit, in shared objects.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/MesaLib/dist/src/glsl/ralloc.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/main/context.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/MesaLib/dist/src/glsl/ralloc.c
diff -u xsrc/external/mit/MesaLib/dist/src/glsl/ralloc.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/glsl/ralloc.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/glsl/ralloc.c:1.1.1.1 Wed Jul 9 19:38:35 2014
+++ xsrc/external/mit/MesaLib/dist/src/glsl/ralloc.c Wed Jul 9 20:14:16 2014
@@ -272,7 +272,7 @@ ralloc_parent(const void *ptr)
static void *autofree_context = NULL;
-static void
+static void __attribute__((__destructor__))
autofree(void)
{
ralloc_free(autofree_context);
@@ -283,7 +283,6 @@ ralloc_autofree_context(void)
{
if (unlikely(autofree_context == NULL)) {
autofree_context = ralloc_context(NULL);
- atexit(autofree);
}
return autofree_context;
}
Index: xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c:1.1.1.6 xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c:1.1.1.6 Wed Jul 9 19:38:38 2014
+++ xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c Wed Jul 9 20:14:17 2014
@@ -383,10 +383,10 @@ _glthread_DECLARE_STATIC_MUTEX(OneTimeLo
*
* \sa _math_init().
*/
+static GLbitfield api_init_mask = 0x0;
static void
one_time_init( struct gl_context *ctx )
{
- static GLbitfield api_init_mask = 0x0;
_glthread_LOCK_MUTEX(OneTimeLock);
@@ -441,14 +441,16 @@ one_time_init( struct gl_context *ctx )
_glthread_UNLOCK_MUTEX(OneTimeLock);
- /* Hopefully atexit() is widely available. If not, we may need some
-* #ifdef tests here.
-*/
- atexit(_mesa_destroy_shader_compiler);
-
dummy_enum_func();
}
+static void __attribute__((__destructor__))
+one_time_fini(void)
+{
+ if (api_init_mask)
+_mesa_destroy_shader_compiler();
+}
+
/**
* Initialize fields of gl_current_attrib (aka ctx-Current.*)
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: riastradh
Date: Wed Jul 9 20:22:56 UTC 2014
Modified Files:
src/external/mit/xorg/lib/dri: dri.mk
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
src/external/mit/xorg/lib/dri/libmesa: Makefile
src/external/mit/xorg/lib/dri/r128: Makefile
src/external/mit/xorg/lib/dri/r200: Makefile
src/external/mit/xorg/lib/dri/r300: Makefile
src/external/mit/xorg/lib/dri/r600: Makefile
src/external/mit/xorg/lib/dri/radeon: Makefile
src/external/mit/xorg/lib/dri/s3v: Makefile
src/external/mit/xorg/lib/dri/swrast: Makefile
src/external/mit/xorg/lib/dri/tdfx: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libOSMesa: Makefile libmesa.mk
src/external/mit/xorg/lib/libdrm_radeon: Makefile
src/external/mit/xorg/tools: Makefile
src/external/mit/xorg/tools/glsl: Makefile.glslsrcs
Log Message:
Update reachover makefiles for MesaLib 7.11.2.
With the new GL shader compiler, glsl-compile is no longer needed as
a tool, but the shader compiler is now duplicated in several
libraries, so (XXX) external/mit/xorg/tools/glsl should be turned
into a proper library that libGL and libmesa can link against.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/dri/dri.mk
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/dri/i965/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/dri/libmesa/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri/r128/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/dri/r200/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/dri/r300/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri/r600/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/dri/radeon/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri/s3v/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/dri/swrast/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri/tdfx/Makefile
cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libOSMesa/Makefile \
src/external/mit/xorg/lib/libOSMesa/libmesa.mk
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libdrm_radeon/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/tools/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/tools/glsl/Makefile.glslsrcs
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/lib/dri/dri.mk
diff -u src/external/mit/xorg/lib/dri/dri.mk:1.12 src/external/mit/xorg/lib/dri/dri.mk:1.13
--- src/external/mit/xorg/lib/dri/dri.mk:1.12 Sat Mar 10 20:52:30 2012
+++ src/external/mit/xorg/lib/dri/dri.mk Wed Jul 9 20:22:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.12 2012/03/10 20:52:30 tron Exp $
+# $NetBSD: dri.mk,v 1.13 2014/07/09 20:22:55 riastradh Exp $
# XXX DRI_LIB_DEPS
@@ -8,15 +8,15 @@ LIBISMODULE= yes
SHLIB_MAJOR= 0
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/main \
- -I${X11SRCDIR.MesaLib}/src/mesa/glapi \
- -I${X11SRCDIR.MesaLib}/src/mesa/shader \
- -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
- -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/${MODULE}/server \
- -I${X11SRCDIR.MesaLib}/src/mesa \
- -I${X11SRCDIR.MesaLib}/include \
- -I${DESTDIR}${X11INCDIR}/libdrm \
- -I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+= \
+ -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
+ -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/${MODULE}/server \
+ -I${X11SRCDIR.MesaLib}/include \
+ -I${X11SRCDIR.MesaLib}/src/mapi \
+ -I${X11SRCDIR.MesaLib}/src/mesa \
+ -I${X11SRCDIR.MesaLib}/src/egl/main \
+ -I${X11SRCDIR.MesaLib}/src/egl/drivers/dri \
+ -I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 \
-DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING \
@@ -30,10 +30,9 @@ CPPFLAGS+= -Wno-stack-protector
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
${X11SRCDIR.MesaLib}/src/mesa/drivers/common
.if (${MODULE} == swrast)
-SRCS+= driverfuncs.c utils.c
+SRCS+= drisw_util.c driverfuncs.c utils.c
.else
SRCS+= dri_util.c drirenderbuffer.c driverfuncs.c texmem.c
-SRCS+= dri_metaops.c
SRCS+= utils.c vblank.c xmlconfig.c
.endif
Index: src/external/mit/xorg/lib/dri/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.11 src/external/mit/xorg/lib/dri/i915/Makefile:1.12
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.11 Thu Aug 11 23:15:36 2011
+++ src/external/mit/xorg/lib/dri/i915/Makefile Wed Jul 9 20:22:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/08/11 23:15:36 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2014/07/09 20:22:55 riastradh Exp $
MODULE= i915
@@ -19,6 +19,7 @@ SRCS= \
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/sna
Module Name:xsrc
Committed By: riastradh
Date: Wed Jul 9 22:07:02 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_dri.c
Log Message:
Revert stop-gap in 1.2 now that Mesa is updated.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.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/xf86-video-intel/dist/src/sna/sna_dri.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c:1.2 Tue Jul 1 15:16:07 2014
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c Wed Jul 9 22:07:02 2014
@@ -2287,11 +2287,8 @@ static const char *dri_driver_name(struc
return has_i830_dri() ? i830 : i915;
else if (sna-kgem.gen 040)
return i915;
- /* XXX No Ivy Bridge yet in our version of Mesa. */
- else if (sna-kgem.gen 070)
- return i965;
else
- return NULL;
+ return i965;
}
return s;
@@ -2324,11 +2321,6 @@ bool sna_dri_open(struct sna *sna, Scree
memset(info, '\0', sizeof(info));
info.fd = sna-kgem.fd;
info.driverName = dri_driver_name(sna);
- if (info.driverName == NULL) {
- xf86DrvMsg(sna-scrn-scrnIndex, X_WARNING,
- no DRI2 on NetBSD for this device yet);
- return false;
- }
info.deviceName = intel_get_device_name(sna-scrn);
DBG((%s: loading dri driver '%s' [gen=%d] for device '%s'\n,
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: justin
Date: Wed Jul 9 23:41:40 UTC 2014
Modified Files:
src/lib/librumpuser: Makefile rumpuser.c
Added Files:
src/lib/librumpuser: rumpuser_file.c rumpuser_mem.c
Log Message:
Split out file and memory access in librumpuser
This allows alternate implementations to reuse these parts, and the file
parts will at the next hypercall revision be moved to their own driver.
Discussed with pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/librumpuser/Makefile
cvs rdiff -u -r1.59 -r1.60 src/lib/librumpuser/rumpuser.c
cvs rdiff -u -r0 -r1.1 src/lib/librumpuser/rumpuser_file.c \
src/lib/librumpuser/rumpuser_mem.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/librumpuser/Makefile
diff -u src/lib/librumpuser/Makefile:1.18 src/lib/librumpuser/Makefile:1.19
--- src/lib/librumpuser/Makefile:1.18 Tue Jun 17 08:42:35 2014
+++ src/lib/librumpuser/Makefile Wed Jul 9 23:41:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/06/17 08:42:35 alnsn Exp $
+# $NetBSD: Makefile,v 1.19 2014/07/09 23:41:40 justin Exp $
#
.include bsd.own.mk
@@ -20,6 +20,7 @@ CPPFLAGS+= -DLIBRUMPUSER
SRCS= rumpuser.c
SRCS+= rumpuser_pth.c
SRCS+= rumpuser_component.c rumpuser_bio.c
+SRCS+= rumpuser_file.c rumpuser_mem.c
SRCS+= rumpuser_errtrans.c rumpuser_sigtrans.c
Index: src/lib/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.59 src/lib/librumpuser/rumpuser.c:1.60
--- src/lib/librumpuser/rumpuser.c:1.59 Wed Apr 2 13:54:42 2014
+++ src/lib/librumpuser/rumpuser.c Wed Jul 9 23:41:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.59 2014/04/02 13:54:42 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.60 2014/07/09 23:41:40 justin Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -28,34 +28,16 @@
#include rumpuser_port.h
#if !defined(lint)
-__RCSID($NetBSD: rumpuser.c,v 1.59 2014/04/02 13:54:42 pooka Exp $);
+__RCSID($NetBSD: rumpuser.c,v 1.60 2014/07/09 23:41:40 justin Exp $);
#endif /* !lint */
-#include sys/ioctl.h
-#include sys/mman.h
-#include sys/uio.h
#include sys/stat.h
#include sys/time.h
-
-#ifdef __NetBSD__
-#include sys/disk.h
-#include sys/disklabel.h
-#include sys/dkio.h
-#endif
-
-#if defined(__NetBSD__) || defined(__FreeBSD__) || \
-defined(__DragonFly__) || defined(__APPLE__)
-#define __BSD__
-#endif
-
-#if defined(__BSD__)
-#include sys/sysctl.h
-#endif
+#include sys/types.h
#include assert.h
#include errno.h
#include fcntl.h
-#include netdb.h
#include signal.h
#include stdarg.h
#include stdint.h
@@ -103,342 +85,6 @@ rumpuser_init(int version, const struct
}
int
-rumpuser_getfileinfo(const char *path, uint64_t *sizep, int *ftp)
-{
- struct stat sb;
- uint64_t size = 0;
- int needsdev = 0, rv = 0, ft = 0;
- int fd = -1;
-
- if (stat(path, sb) == -1) {
- rv = errno;
- goto out;
- }
-
- switch (sb.st_mode S_IFMT) {
- case S_IFDIR:
- ft = RUMPUSER_FT_DIR;
- break;
- case S_IFREG:
- ft = RUMPUSER_FT_REG;
- break;
- case S_IFBLK:
- ft = RUMPUSER_FT_BLK;
- needsdev = 1;
- break;
- case S_IFCHR:
- ft = RUMPUSER_FT_CHR;
- needsdev = 1;
- break;
- default:
- ft = RUMPUSER_FT_OTHER;
- break;
- }
-
- if (!needsdev) {
- size = sb.st_size;
- } else if (sizep) {
- /*
- * Welcome to the jungle. Of course querying the kernel
- * for a device partition size is supposed to be far from
- * trivial. On NetBSD we use ioctl. On $other platform
- * we have a problem. We try the lseek trick and just
- * fail if that fails. Platform specific code can later
- * be written here if appropriate.
- *
- * On NetBSD we hope and pray that for block devices nobody
- * else is holding them open, because otherwise the kernel
- * will not permit us to open it. Thankfully, this is
- * usually called only in bootstrap and then we can
- * forget about it.
- */
-#ifndef __NetBSD__
- off_t off;
-
- fd = open(path, O_RDONLY);
- if (fd == -1) {
- rv = errno;
- goto out;
- }
-
- off = lseek(fd, 0, SEEK_END);
- if (off != 0) {
- size = off;
- goto out;
- }
- fprintf(stderr, error: device size query not implemented on
- this platform\n);
- rv = EOPNOTSUPP;
- goto out;
-#else
- struct disklabel lab;
- struct partition *parta;
- struct dkwedge_info dkw;
-
- fd = open(path, O_RDONLY);
- if (fd == -1) {
- rv = errno;
- goto out;
- }
-
- if (ioctl(fd, DIOCGDINFO, lab) == 0) {
- parta = lab.d_partitions[DISKPART(sb.st_rdev)];
- size = (uint64_t)lab.d_secsize * parta-p_size;
- goto out;
- }
-
- if (ioctl(fd, DIOCGWEDGEINFO, dkw) == 0) {
- /*
- * XXX: should use DIOCGDISKINFO to query
- * sector size, but that requires proplib,
- * so just don't bother for now. it's nice
- * that something as difficult as figuring out
- * a partition's size has been made so easy.
- */
- size = dkw.dkw_size
CVS commit: xsrc/external/mit/MesaLib/dist/src/glsl
Module Name:xsrc Committed By: riastradh Date: Thu Jul 10 01:14:23 UTC 2014 Added Files: xsrc/external/mit/MesaLib/dist/src/glsl: builtin_function.cpp Log Message: Add pre-generated builtin_function.cpp. Normally this is created by the Mesa build process by running a Python program, but we don't have that vice^Wluxury here, so we'll make do with a pre-generated version. This file is going away in a later Mesa version anyway... To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ xsrc/external/mit/MesaLib/dist/src/glsl/builtin_function.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
