CVS commit: xsrc/external/mit/xf86-video-sis/include
Module Name:xsrc Committed By: mrg Date: Wed Jun 10 06:41:24 UTC 2009 Modified Files: xsrc/external/mit/xf86-video-sis/include: config.h Log Message: update this for xf86-video-sis 0.10.1 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xf86-video-sis/include/config.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/xf86-video-sis/include/config.h diff -u xsrc/external/mit/xf86-video-sis/include/config.h:1.1 xsrc/external/mit/xf86-video-sis/include/config.h:1.2 --- xsrc/external/mit/xf86-video-sis/include/config.h:1.1 Mon Sep 1 05:35:20 2008 +++ xsrc/external/mit/xf86-video-sis/include/config.h Wed Jun 10 06:41:24 2009 @@ -43,15 +43,14 @@ #define PACKAGE_NAME xf86-video-sis /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-video-sis 0.10.0 +#define PACKAGE_STRING xf86-video-sis 0.10.1 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-video-sis /* Define to the version of this package. */ -#define PACKAGE_VERSION 0.10.0 +#define PACKAGE_VERSION 0.10.1 -#if 0 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 0 @@ -59,14 +58,13 @@ #define PACKAGE_VERSION_MINOR 10 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 0 -#endif +#define PACKAGE_VERSION_PATCHLEVEL 1 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 0.10.0 +#define VERSION 0.10.1 /* Enable DRI driver support */ #define XF86DRI 1
CVS commit: xsrc/external/mit/xf86-video-siliconmotion/dist
Module Name:xsrc Committed By: mrg Date: Wed Jun 10 06:41:40 UTC 2009 Update of /cvsroot/xsrc/external/mit/xf86-video-siliconmotion/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11588 Log Message: initial import of xf86-video-siliconmotion-1.7.1 Status: Vendor Tag: xorg Release Tags: xf86-video-siliconmotion-1-7-1 U xsrc/external/mit/xf86-video-siliconmotion/dist/Release.txt U xsrc/external/mit/xf86-video-siliconmotion/dist/depcomp U xsrc/external/mit/xf86-video-siliconmotion/dist/aclocal.m4 U xsrc/external/mit/xf86-video-siliconmotion/dist/README U xsrc/external/mit/xf86-video-siliconmotion/dist/ltmain.sh U xsrc/external/mit/xf86-video-siliconmotion/dist/configure U xsrc/external/mit/xf86-video-siliconmotion/dist/configure.ac U xsrc/external/mit/xf86-video-siliconmotion/dist/config.guess U xsrc/external/mit/xf86-video-siliconmotion/dist/install-sh U xsrc/external/mit/xf86-video-siliconmotion/dist/config.sub U xsrc/external/mit/xf86-video-siliconmotion/dist/missing U xsrc/external/mit/xf86-video-siliconmotion/dist/Makefile.am U xsrc/external/mit/xf86-video-siliconmotion/dist/Makefile.in U xsrc/external/mit/xf86-video-siliconmotion/dist/config.h.in U xsrc/external/mit/xf86-video-siliconmotion/dist/CALLMAP U xsrc/external/mit/xf86-video-siliconmotion/dist/ChangeLog U xsrc/external/mit/xf86-video-siliconmotion/dist/COPYING U xsrc/external/mit/xf86-video-siliconmotion/dist/man/siliconmotion.man U xsrc/external/mit/xf86-video-siliconmotion/dist/man/Makefile.am U xsrc/external/mit/xf86-video-siliconmotion/dist/man/Makefile.in N xsrc/external/mit/xf86-video-siliconmotion/dist/src/smilynx_crtc.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/regsmi.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h N xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi501_crtc.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c N xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_crtc.c N xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_crtc.h N xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_501.c N xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_501.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_dac.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_i2c.c N xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi501_output.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_exa.c N xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_xaa.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_accel.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/Makefile.am U xsrc/external/mit/xf86-video-siliconmotion/dist/src/Makefile.in N xsrc/external/mit/xf86-video-siliconmotion/dist/src/smilynx.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_video.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_video.h N xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_pcirename.h N xsrc/external/mit/xf86-video-siliconmotion/dist/src/smilynx_output.c N xsrc/external/mit/xf86-video-siliconmotion/dist/src/smilynx_hw.c No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-vesa/dist
Module Name:xsrc Committed By: mrg Date: Wed Jun 10 06:41:46 UTC 2009 Update of /cvsroot/xsrc/external/mit/xf86-video-vesa/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19132 Log Message: initial import of xf86-video-vesa-2.2.0 Status: Vendor Tag: xorg Release Tags: xf86-video-vesa-2-2-0 U xsrc/external/mit/xf86-video-vesa/dist/missing U xsrc/external/mit/xf86-video-vesa/dist/Makefile.in U xsrc/external/mit/xf86-video-vesa/dist/COPYING U xsrc/external/mit/xf86-video-vesa/dist/ChangeLog U xsrc/external/mit/xf86-video-vesa/dist/configure.ac U xsrc/external/mit/xf86-video-vesa/dist/Makefile.am U xsrc/external/mit/xf86-video-vesa/dist/config.guess N xsrc/external/mit/xf86-video-vesa/dist/README U xsrc/external/mit/xf86-video-vesa/dist/config.h.in U xsrc/external/mit/xf86-video-vesa/dist/install-sh U xsrc/external/mit/xf86-video-vesa/dist/aclocal.m4 U xsrc/external/mit/xf86-video-vesa/dist/ltmain.sh U xsrc/external/mit/xf86-video-vesa/dist/configure U xsrc/external/mit/xf86-video-vesa/dist/depcomp U xsrc/external/mit/xf86-video-vesa/dist/config.sub U xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.in U xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.am U xsrc/external/mit/xf86-video-vesa/dist/src/vesa.h U xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c U xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.in U xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.am U xsrc/external/mit/xf86-video-vesa/dist/man/vesa.man No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-siliconmotion/dist/src
Module Name:xsrc Committed By: mrg Date: Wed Jun 10 06:45:54 UTC 2009 Removed Files: xsrc/external/mit/xf86-video-siliconmotion/dist/src: smi_dga.c smi_hwcurs.c smi_shadow.c Log Message: merge xf86-video-siliconmotion 1.7.1. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_dga.c \ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_hwcurs.c \ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_shadow.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion
Module Name:src
Committed By: mrg
Date: Wed Jun 10 06:46:34 UTC 2009
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion: Makefile
Log Message:
merge xf86-video-siliconmotion 1.7.1.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.2 Sun Aug 3 07:32:04 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile Wed Jun 10 06:46:34 2009
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2008/08/03 07:32:04 rtr Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/10 06:46:34 mrg Exp $
DRIVER= xf86-video-siliconmotion
DRIVER_NAME= siliconmotion_drv
-SRCS= smi_accel.c smi_xaa.c smi_exa.c smi_dac.c smi_dga.c
-SRCS+= smi_driver.c smi_hwcurs.c smi_i2c.c smi_shadow.c
-SRCS+= smi_video.c
+SRCS= smi_accel.c smi_xaa.c smi_exa.c smi_dac.c
+SRCS+= smi_driver.c smi_i2c.c smi_video.c
MAN= siliconmotion.4
+CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/../include -DHAVE_CONFIG_H
+
.include ../Makefile.xf86-driver
CVS commit: xsrc/external/mit/xf86-video-vesa/dist
Module Name:xsrc Committed By: mrg Date: Wed Jun 10 07:30:01 UTC 2009 Modified Files: xsrc/external/mit/xf86-video-vesa/dist: COPYING Makefile.in aclocal.m4 config.guess config.h.in config.sub configure configure.ac depcomp install-sh ltmain.sh missing xsrc/external/mit/xf86-video-vesa/dist/man: Makefile.am Makefile.in vesa.man xsrc/external/mit/xf86-video-vesa/dist/src: Makefile.in vesa.c vesa.h Removed Files: xsrc/external/mit/xf86-video-vesa/dist: README Log Message: revert to xf86-video-vesa 1.3.0. 2.2.0 has dependancies on a newer xorg-server. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/external/mit/xf86-video-vesa/dist/COPYING \ xsrc/external/mit/xf86-video-vesa/dist/Makefile.in \ xsrc/external/mit/xf86-video-vesa/dist/aclocal.m4 \ xsrc/external/mit/xf86-video-vesa/dist/config.guess \ xsrc/external/mit/xf86-video-vesa/dist/config.h.in \ xsrc/external/mit/xf86-video-vesa/dist/config.sub \ xsrc/external/mit/xf86-video-vesa/dist/configure \ xsrc/external/mit/xf86-video-vesa/dist/configure.ac \ xsrc/external/mit/xf86-video-vesa/dist/depcomp \ xsrc/external/mit/xf86-video-vesa/dist/install-sh \ xsrc/external/mit/xf86-video-vesa/dist/ltmain.sh \ xsrc/external/mit/xf86-video-vesa/dist/missing cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-vesa/dist/README cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.am \ xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.in \ xsrc/external/mit/xf86-video-vesa/dist/man/vesa.man cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.in \ xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c \ xsrc/external/mit/xf86-video-vesa/dist/src/vesa.h 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
CVS commit: xsrc/external/mit/xf86-input-void/dist
Module Name:xsrc Committed By: mrg Date: Wed Jun 10 07:31:13 UTC 2009 Update of /cvsroot/xsrc/external/mit/xf86-input-void/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6920 Log Message: initial import of xf86-input-void-1.2.0 Status: Vendor Tag: xorg Release Tags: xf86-input-void-1-2-0 U xsrc/external/mit/xf86-input-void/dist/COPYING U xsrc/external/mit/xf86-input-void/dist/autogen.sh U xsrc/external/mit/xf86-input-void/dist/config.guess U xsrc/external/mit/xf86-input-void/dist/aclocal.m4 U xsrc/external/mit/xf86-input-void/dist/Makefile.am N xsrc/external/mit/xf86-input-void/dist/README U xsrc/external/mit/xf86-input-void/dist/missing U xsrc/external/mit/xf86-input-void/dist/depcomp U xsrc/external/mit/xf86-input-void/dist/ltmain.sh U xsrc/external/mit/xf86-input-void/dist/config.h.in U xsrc/external/mit/xf86-input-void/dist/configure.ac U xsrc/external/mit/xf86-input-void/dist/Makefile.in U xsrc/external/mit/xf86-input-void/dist/config.sub U xsrc/external/mit/xf86-input-void/dist/ChangeLog U xsrc/external/mit/xf86-input-void/dist/configure U xsrc/external/mit/xf86-input-void/dist/install-sh U xsrc/external/mit/xf86-input-void/dist/man/Makefile.am U xsrc/external/mit/xf86-input-void/dist/man/void.man U xsrc/external/mit/xf86-input-void/dist/man/Makefile.in U xsrc/external/mit/xf86-input-void/dist/src/Makefile.am U xsrc/external/mit/xf86-input-void/dist/src/void.c U xsrc/external/mit/xf86-input-void/dist/src/Makefile.in No conflicts created by this import
CVS commit: xsrc/external/mit/libXfont/dist
Module Name:xsrc Committed By: mrg Date: Wed Jun 10 07:39:43 UTC 2009 Removed Files: xsrc/external/mit/libXfont/dist: autogen.sh xsrc/external/mit/libXfont/dist/include/X11/fonts: fontmod.h xsrc/external/mit/libXfont/dist/src/Speedo: Makefile.am Makefile.in adobe-iso.h bics-iso.h bics-unicode.c bics-unicode.h do_char.c do_trns.c keys.h out_bl2d.c out_blk.c out_outl.c out_scrn.c out_util.c reset.c set_spcs.c set_trns.c spdo_prv.h speedo.h spencode.c sperr.c spfile.c spfont.c spfuncs.c spglyph.c spinfo.c spint.h useropt.h xsrc/external/mit/libXfont/dist/src/Type1: Makefile.am Makefile.in arith.c arith.h blues.h cluts.h curves.c curves.h digit.h fontfcn.c fontfcn.h fonts.h hdigit.h hints.c hints.h lines.c lines.h objects.c objects.h paths.c paths.h pictures.h regions.c regions.h scanfont.c spaces.c spaces.h strokes.h t1funcs.c t1hdigit.h t1imager.h t1info.c t1intf.h t1io.c t1malloc.c t1snap.c t1stdio.h t1unicode.c t1unicode.h token.c token.h tokst.h trig.h type1.c util.c util.h xsrc/external/mit/libXfont/dist/src/fontcache: Makefile.am Makefile.in fcqueue.h fontcache.c fontcache.h xsrc/external/mit/libXfont/dist/src/fontfile: ffcheck.c printerfont.c xsrc/external/mit/libXfont/dist/src/stubs: fontmod.c xpstubs.c Log Message: merge libXfont 1.4.0 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXfont/dist/autogen.sh cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/libXfont/dist/include/X11/fonts/fontmod.h cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/libXfont/dist/src/Speedo/Makefile.am \ xsrc/external/mit/libXfont/dist/src/Speedo/Makefile.in \ xsrc/external/mit/libXfont/dist/src/Speedo/adobe-iso.h \ xsrc/external/mit/libXfont/dist/src/Speedo/bics-iso.h \ xsrc/external/mit/libXfont/dist/src/Speedo/bics-unicode.c \ xsrc/external/mit/libXfont/dist/src/Speedo/bics-unicode.h \ xsrc/external/mit/libXfont/dist/src/Speedo/keys.h \ xsrc/external/mit/libXfont/dist/src/Speedo/spdo_prv.h \ xsrc/external/mit/libXfont/dist/src/Speedo/speedo.h \ xsrc/external/mit/libXfont/dist/src/Speedo/spencode.c \ xsrc/external/mit/libXfont/dist/src/Speedo/sperr.c \ xsrc/external/mit/libXfont/dist/src/Speedo/spfile.c \ xsrc/external/mit/libXfont/dist/src/Speedo/spfont.c \ xsrc/external/mit/libXfont/dist/src/Speedo/spfuncs.c \ xsrc/external/mit/libXfont/dist/src/Speedo/spglyph.c \ xsrc/external/mit/libXfont/dist/src/Speedo/spinfo.c \ xsrc/external/mit/libXfont/dist/src/Speedo/spint.h \ xsrc/external/mit/libXfont/dist/src/Speedo/useropt.h cvs rdiff -u -r1.2 -r0 xsrc/external/mit/libXfont/dist/src/Speedo/do_char.c \ xsrc/external/mit/libXfont/dist/src/Speedo/do_trns.c \ xsrc/external/mit/libXfont/dist/src/Speedo/out_bl2d.c \ xsrc/external/mit/libXfont/dist/src/Speedo/out_blk.c \ xsrc/external/mit/libXfont/dist/src/Speedo/out_outl.c \ xsrc/external/mit/libXfont/dist/src/Speedo/out_scrn.c \ xsrc/external/mit/libXfont/dist/src/Speedo/reset.c \ xsrc/external/mit/libXfont/dist/src/Speedo/set_spcs.c \ xsrc/external/mit/libXfont/dist/src/Speedo/set_trns.c cvs rdiff -u -r1.3 -r0 xsrc/external/mit/libXfont/dist/src/Speedo/out_util.c cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/libXfont/dist/src/Type1/Makefile.am \ xsrc/external/mit/libXfont/dist/src/Type1/Makefile.in \ xsrc/external/mit/libXfont/dist/src/Type1/arith.c \ xsrc/external/mit/libXfont/dist/src/Type1/arith.h \ xsrc/external/mit/libXfont/dist/src/Type1/blues.h \ xsrc/external/mit/libXfont/dist/src/Type1/cluts.h \ xsrc/external/mit/libXfont/dist/src/Type1/curves.c \ xsrc/external/mit/libXfont/dist/src/Type1/curves.h \ xsrc/external/mit/libXfont/dist/src/Type1/digit.h \ xsrc/external/mit/libXfont/dist/src/Type1/fontfcn.c \ xsrc/external/mit/libXfont/dist/src/Type1/fontfcn.h \ xsrc/external/mit/libXfont/dist/src/Type1/fonts.h \ xsrc/external/mit/libXfont/dist/src/Type1/hdigit.h \ xsrc/external/mit/libXfont/dist/src/Type1/hints.c \ xsrc/external/mit/libXfont/dist/src/Type1/hints.h \ xsrc/external/mit/libXfont/dist/src/Type1/lines.c \ xsrc/external/mit/libXfont/dist/src/Type1/lines.h \ xsrc/external/mit/libXfont/dist/src/Type1/objects.c \ xsrc/external/mit/libXfont/dist/src/Type1/objects.h \ xsrc/external/mit/libXfont/dist/src/Type1/paths.c \ xsrc/external/mit/libXfont/dist/src/Type1/paths.h \ xsrc/external/mit/libXfont/dist/src/Type1/pictures.h \ xsrc/external/mit/libXfont/dist/src/Type1/regions.c \ xsrc/external/mit/libXfont/dist/src/Type1/regions.h \ xsrc/external/mit/libXfont/dist/src/Type1/scanfont.c \ xsrc/external/mit/libXfont/dist/src/Type1/spaces.c \ xsrc/external/mit/libXfont/dist/src/Type1/spaces.h \
CVS commit: xsrc/external/mit/xf86-video-siliconmotion/include
Module Name:xsrc Committed By: mrg Date: Wed Jun 10 08:30:03 UTC 2009 Added Files: xsrc/external/mit/xf86-video-siliconmotion/include: config.h Log Message: add the config.h for xf86-video-siliconmotion To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ xsrc/external/mit/xf86-video-siliconmotion/include/config.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/xf86-video-siliconmotion/include/config.h diff -u /dev/null xsrc/external/mit/xf86-video-siliconmotion/include/config.h:1.1 --- /dev/null Wed Jun 10 08:30:03 2009 +++ xsrc/external/mit/xf86-video-siliconmotion/include/config.h Wed Jun 10 08:30:03 2009 @@ -0,0 +1,70 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +#include xorg-server.h + +/* Define to 1 if you have the dlfcn.h header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the inttypes.h header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the memory.h header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the stdint.h header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the stdlib.h header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the strings.h header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the string.h header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the sys/stat.h header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the sys/types.h header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the unistd.h header file. */ +#define HAVE_UNISTD_H 1 + +/* X server has new mode code */ +/* #undef HAVE_XMODES */ + +/* Name of package */ +#define PACKAGE xf86-video-siliconmotion + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT https://bugs.freedesktop.org/enter_bug.cgi?product=xorg; + +/* Define to the full name of this package. */ +#define PACKAGE_NAME xf86-video-siliconmotion + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING xf86-video-siliconmotion 1.7.1 + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME xf86-video-siliconmotion + +/* Define to the version of this package. */ +#define PACKAGE_VERSION 1.7.1 + +/* Major version of this package */ +#define PACKAGE_VERSION_MAJOR 1 + +/* Minor version of this package */ +#define PACKAGE_VERSION_MINOR 7 + +/* Patch version of this package */ +#define PACKAGE_VERSION_PATCHLEVEL 1 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION 1.7.1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Wed Jun 10 08:31:56 UTC 2009 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h Log Message: turn on BUILTIN_FONTS, as it is required with libXfont 1.4.0. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/include/dix-config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/include/dix-config.h diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.5 xsrc/external/mit/xorg-server/include/dix-config.h:1.6 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.5 Thu Aug 28 07:31:50 2008 +++ xsrc/external/mit/xorg-server/include/dix-config.h Wed Jun 10 08:31:56 2009 @@ -491,7 +491,7 @@ /* #undef CONFIG_HAL */ /* Use only built-in fonts */ -/* #undef BUILTIN_FONTS */ +#define BUILTIN_FONTS 1 /* Avoid using font servers */ /* #undef NOFONTSERVERACCESS */
CVS commit: xsrc/external/mit/xrandr/dist
Module Name:xsrc Committed By: mrg Date: Wed Jun 10 08:39:00 UTC 2009 Update of /cvsroot/xsrc/external/mit/xrandr/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24126 Log Message: initial import of xrandr-1.3.0 Status: Vendor Tag: xorg Release Tags: xrandr-1-3-0 U xsrc/external/mit/xrandr/dist/xrandr_test.pl U xsrc/external/mit/xrandr/dist/Makefile.in U xsrc/external/mit/xrandr/dist/ChangeLog U xsrc/external/mit/xrandr/dist/configure.ac N xsrc/external/mit/xrandr/dist/keystone.5c U xsrc/external/mit/xrandr/dist/missing U xsrc/external/mit/xrandr/dist/Makefile.am U xsrc/external/mit/xrandr/dist/config.guess U xsrc/external/mit/xrandr/dist/README U xsrc/external/mit/xrandr/dist/COPYING U xsrc/external/mit/xrandr/dist/config.h.in U xsrc/external/mit/xrandr/dist/install-sh U xsrc/external/mit/xrandr/dist/aclocal.m4 U xsrc/external/mit/xrandr/dist/AUTHORS U xsrc/external/mit/xrandr/dist/xrandr.man U xsrc/external/mit/xrandr/dist/INSTALL U xsrc/external/mit/xrandr/dist/xrandr.c U xsrc/external/mit/xrandr/dist/configure U xsrc/external/mit/xrandr/dist/depcomp U xsrc/external/mit/xrandr/dist/config.sub U xsrc/external/mit/xrandr/dist/NEWS No conflicts created by this import
CVS commit: xsrc/external/mit/xrandr/dist
Module Name:xsrc Committed By: mrg Date: Wed Jun 10 08:40:11 UTC 2009 Removed Files: xsrc/external/mit/xrandr/dist: autogen.sh Log Message: merge xrandr 1.3.0 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xrandr/dist/autogen.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-vmmouse
Module Name:src
Committed By: mrg
Date: Wed Jun 10 08:56:33 UTC 2009
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-vmmouse: Makefile
Log Message:
look in the new 'shared' subdir.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.1 Sun Aug 3 06:30:09 2008
+++ src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile Wed Jun 10 08:56:33 2009
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2008/08/03 06:30:09 rtr Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/10 08:56:33 mrg Exp $
DRIVER= xf86-input-vmmouse
DRIVER_NAME= vmmouse_drv
SRCS= vmmouse.c vmmouse_client.c vmmouse_proto.c
MAN= vmmouse.4
+CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/shared
.include ../Makefile.xf86-driver
+.PATH: ${X11SRCDIR.${DRIVER}}/shared
CVS commit: xsrc/external/mit/xf86-video-ati/include
Module Name:xsrc Committed By: mrg Date: Wed Jun 10 09:23:35 UTC 2009 Modified Files: xsrc/external/mit/xf86-video-ati/include: config.h Log Message: update this from xf86-video-ati 6.12.2. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xf86-video-ati/include/config.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/xf86-video-ati/include/config.h diff -u xsrc/external/mit/xf86-video-ati/include/config.h:1.1 xsrc/external/mit/xf86-video-ati/include/config.h:1.2 --- xsrc/external/mit/xf86-video-ati/include/config.h:1.1 Thu Aug 28 07:23:06 2008 +++ xsrc/external/mit/xf86-video-ati/include/config.h Wed Jun 10 09:23:35 2009 @@ -4,7 +4,7 @@ #include xorg-server.h /* Use Damage extension */ -/* #undef DAMAGE */ +#define DAMAGE 1 /* Use linux pragma pack */ /* #undef FGL_LINUX */ @@ -67,22 +67,22 @@ #define PACKAGE_NAME xf86-video-ati /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-video-ati 6.9.0 +#define PACKAGE_STRING xf86-video-ati 6.12.2 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-video-ati /* Define to the version of this package. */ -#define PACKAGE_VERSION 6.9.0 +#define PACKAGE_VERSION 6.12.2 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 6 /* Minor version of this package */ -#define PACKAGE_VERSION_MINOR 9 +#define PACKAGE_VERSION_MINOR 12 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 0 +#define PACKAGE_VERSION_PATCHLEVEL 2 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -97,7 +97,7 @@ #define USE_XAA 1 /* Version number of package */ -#define VERSION 6.9.0 +#define VERSION 6.12.2 /* Enable DRI driver support */ #define XF86DRI 1
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: he
Date: Wed Jun 10 11:41:44 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: vm.c
Log Message:
Add a dummy uvm_readahead() function, to fix build issues after it
recently got added to the kernel.
OK'ed by pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/rump/librump/rumpkern/vm.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/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.57 src/sys/rump/librump/rumpkern/vm.c:1.58
--- src/sys/rump/librump/rumpkern/vm.c:1.57 Wed Jun 3 16:06:10 2009
+++ src/sys/rump/librump/rumpkern/vm.c Wed Jun 10 11:41:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.57 2009/06/03 16:06:10 pooka Exp $ */
+/* $NetBSD: vm.c,v 1.58 2009/06/10 11:41:43 he Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.57 2009/06/03 16:06:10 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.58 2009/06/10 11:41:43 he Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -58,6 +58,7 @@
#include uvm/uvm.h
#include uvm/uvm_ddb.h
#include uvm/uvm_prot.h
+#include uvm/uvm_readahead.h
#include rump_private.h
@@ -449,6 +450,14 @@
/* nada for now */
}
+int
+uvm_readahead(struct uvm_object *uobj, off_t off, off_t size)
+{
+
+ /* nada for now */
+ return 0;
+}
+
/*
* Kmem
*/
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src
Committed By: pooka
Date: Wed Jun 10 12:12:23 UTC 2009
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
Support VOP_MKNOD. This is so that components which need device
nodes (e.g. raidframe) can create them.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/rump/librump/rumpvfs/rumpfs.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/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.18 src/sys/rump/librump/rumpvfs/rumpfs.c:1.19
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.18 Tue Jun 9 14:20:42 2009
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Wed Jun 10 12:12:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.18 2009/06/09 14:20:42 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.19 2009/06/10 12:12:23 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.18 2009/06/09 14:20:42 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.19 2009/06/10 12:12:23 pooka Exp $);
#include sys/param.h
#include sys/mount.h
@@ -56,9 +56,11 @@
static int rump_vop_lookup(void *);
static int rump_vop_getattr(void *);
static int rump_vop_mkdir(void *);
+static int rump_vop_mknod(void *);
static int rump_vop_inactive(void *);
static int rump_vop_reclaim(void *);
static int rump_vop_success(void *);
+static int rump_vop_spec(void *);
int (**fifo_vnodeop_p)(void *);
const struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
@@ -74,6 +76,8 @@
{ vop_lookup_desc, rump_vop_lookup },
{ vop_getattr_desc, rump_vop_getattr },
{ vop_mkdir_desc, rump_vop_mkdir },
+ { vop_mknod_desc, rump_vop_mknod },
+ { vop_access_desc, rump_vop_success },
{ vop_putpages_desc, genfs_null_putpages },
{ vop_fsync_desc, rump_vop_success },
{ vop_lock_desc, genfs_lock },
@@ -84,8 +88,18 @@
};
const struct vnodeopv_desc rump_vnodeop_opv_desc =
{ rump_vnodeop_p, rump_vnodeop_entries };
+
+int (**rump_specop_p)(void *);
+const struct vnodeopv_entry_desc rump_specop_entries[] = {
+ { vop_default_desc, rump_vop_spec },
+ { NULL, NULL }
+};
+const struct vnodeopv_desc rump_specop_opv_desc =
+ { rump_specop_p, rump_specop_entries };
+
const struct vnodeopv_desc * const rump_opv_descs[] = {
rump_vnodeop_opv_desc,
+ rump_specop_opv_desc,
NULL
};
@@ -109,7 +123,7 @@
};
static struct rumpfs_node *
-makeprivate(enum vtype vt)
+makeprivate(enum vtype vt, dev_t rdev, voff_t size)
{
struct rumpfs_node *rn;
struct vattr *va;
@@ -130,7 +144,7 @@
va-va_gid = 0;
va-va_fsid =
va-va_fileid = atomic_inc_uint_nv(lastino);
- va-va_size = 512;
+ va-va_size = size;
va-va_blocksize = 512;
va-va_atime = ts;
va-va_mtime = ts;
@@ -138,7 +152,7 @@
va-va_birthtime = ts;
va-va_gen = 0;
va-va_flags = 0;
- va-va_rdev = -1;
+ va-va_rdev = rdev;
va-va_bytes = 512;
va-va_filerev = 0;
va-va_vaflags = 0;
@@ -147,7 +161,8 @@
}
static int
-rump_makevnode(const char *path, size_t size, enum vtype vt, struct vnode **vpp)
+rump_makevnode(const char *path, voff_t size, enum vtype vt, dev_t rdev,
+ struct vnode **vpp, bool regrumpblk)
{
struct vnode *vp;
struct rumpfs_node *rn;
@@ -156,7 +171,7 @@
if (vt == VREG || vt == VCHR || vt == VBLK) {
vt = VBLK;
- vpops = spec_vnodeop_p;
+ vpops = rump_specop_p;
} else {
vpops = rump_vnodeop_p;
}
@@ -171,16 +186,19 @@
vp-v_type = vt;
if (vp-v_type == VBLK) {
- rv = rumpblk_register(path);
- if (rv == -1)
- panic(rump_makevnode: lazy bum);
- spec_node_init(vp, makedev(RUMPBLK, rv));
- }
- if (vt != VBLK) {
- rn = makeprivate(vp-v_type);
- rn-rn_vp = vp;
- vp-v_data = rn;
+ if (regrumpblk) {
+ rv = rumpblk_register(path);
+ if (rv == -1)
+panic(rump_makevnode: lazy bum);
+ rdev = makedev(RUMPBLK, rv);
+ spec_node_init(vp, rdev);
+ } else {
+ spec_node_init(vp, rdev);
+ }
}
+ rn = makeprivate(vp-v_type, rdev, size);
+ rn-rn_vp = vp;
+ vp-v_data = rn;
vn_lock(vp, LK_RETRY | LK_EXCLUSIVE);
*vpp = vp;
@@ -241,7 +259,8 @@
vt = VBAD;
break;
}
- error = rump_makevnode(cnp-cn_pnbuf, fsize, vt, vpp);
+ error = rump_makevnode(cnp-cn_pnbuf, fsize, vt, -1,
+ vpp, true);
if (error)
return error;
cnp-cn_consume = strlen(cnp-cn_nameptr
@@ -266,7 +285,6 @@
return EJUSTRETURN;
}
KASSERT(rd);
- KASSERT(rd-rd_node-rn_va.va_type == VDIR);
retry:
mutex_enter(reclock);
@@ -277,7 +295,8 @@
goto retry;
*vpp = vp;
} else {
- rv = rump_makevnode(cnp-cn_nameptr, DEV_BSIZE, VDIR, vpp);
+ rv = rump_makevnode(cnp-cn_nameptr, DEV_BSIZE, VDIR, -1,
+ vpp, false);
if (rv)
return rv;
}
@@ -315,7 +334,8 @@
struct rumpfs_dent *rdent;
int rv = 0;
- if ((rv = rump_makevnode(cnp-cn_nameptr, DEV_BSIZE, VDIR, vpp)) != 0)
+ if ((rv = rump_makevnode(cnp-cn_nameptr, DEV_BSIZE, VDIR, -1,
+
CVS commit: src/compat/external/lib
Module Name:src
Committed By: christos
Date: Wed Jun 10 12:48:06 UTC 2009
Modified Files:
src/compat/external/lib: Makefile
Log Message:
Revert my change again. Now I see what was wrong... My CVS files were corrupted.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/compat/external/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/external/lib/Makefile
diff -u src/compat/external/lib/Makefile:1.7 src/compat/external/lib/Makefile:1.8
--- src/compat/external/lib/Makefile:1.7 Tue Jun 9 21:11:50 2009
+++ src/compat/external/lib/Makefile Wed Jun 10 08:48:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/06/10 01:11:50 christos Exp $
+# $NetBSD: Makefile,v 1.8 2009/06/10 12:48:06 christos Exp $
#
# This Makefile exists to provide a single point to build
@@ -8,9 +8,17 @@
.include bsd.own.mk
+.if (${MKATF} != no)
+SUBDIR+= ../bsd/atf/lib
+.endif
+
.if (${MKCRYPTO} != no)
-SUBDIR+= ../bsd/netpgp/lib
-SUBDIR+= ../bsd/openssh/lib
+.if (${MKLDAP} != no)
+SUBDIR+= ../bsd/openldap/lib
.endif
+.endif
+
+SUBDIR+= ../bsd/bind/lib
+SUBDIR+= ../bsd/file/lib
.include bsd.subdir.mk
CVS commit: src/sys/dev/raidframe
Module Name:src
Committed By: pooka
Date: Wed Jun 10 14:17:14 UTC 2009
Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c
Log Message:
Attempt bailout if config_attach_pseudo() fails. Otherwise, a few
moments later, we'll take a fatal plunge because sc_dev is null.
To generate a diff of this commit:
cvs rdiff -u -r1.264 -r1.265 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.264 src/sys/dev/raidframe/rf_netbsdkintf.c:1.265
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.264 Sat Jun 6 08:10:06 2009
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Wed Jun 10 14:17:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.264 2009/06/06 08:10:06 haad Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.265 2009/06/10 14:17:13 pooka Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -139,7 +139,7 @@
***/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.264 2009/06/06 08:10:06 haad Exp $);
+__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.265 2009/06/10 14:17:13 pooka Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -1872,6 +1872,9 @@
if (rs-sc_dev==NULL) {
printf(raid%d: config_attach_pseudo failed\n,
raidPtr-raidid);
+ rs-sc_flags = ~RAIDF_INITED;
+ free(cf, M_RAIDFRAME);
+ return;
}
/* disk_attach actually creates space for the CPU disklabel, among
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src
Committed By: agc
Date: Wed Jun 10 16:01:37 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c misc.c
Log Message:
Get rid of an unusual architectural construct:
The original code had dynamic arrays indexed by unsigned indices,
except for the array of keys, which was indexed by a signed integer,
and initialised to -1. Subsequently, when a new id was created, the
index was pre-incremented, and later on, in a different call, the
userid (a different packet) was assigned to the current index. This
has implications for growing the array, for signed comparison checks,
and just general cleanliness.
This change overhauls the construct: don't special case anything,
just address the array from 0, use unsigned indices same as everything
else, and complain if we get a user id for which we haven't received a
public or secret key.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.17 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.18
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.17 Wed Jun 10 00:38:09 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c Wed Jun 10 16:01:37 2009
@@ -57,7 +57,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: keyring.c,v 1.17 2009/06/10 00:38:09 agc Exp $);
+__RCSID($NetBSD: keyring.c,v 1.18 2009/06/10 16:01:37 agc Exp $);
#endif
#ifdef HAVE_FCNTL_H
@@ -763,7 +763,7 @@
{
unsigned n;
- for (n = 1; keyring n keyring-keyc + 1; n++) {
+ for (n = 0; keyring n keyring-keyc; n++) {
if (__ops_get_debug_level(__FILE__)) {
int i;
@@ -858,8 +858,8 @@
return NULL;
}
len = strlen(name);
- n = 1;
- for (keyp = keyring-keys[n]; n keyring-keyc + 1; ++n, keyp++) {
+ n = 0;
+ for (keyp = keyring-keys[n]; n keyring-keyc; ++n, keyp++) {
for (i = 0, uidp = keyp-uids; i keyp-uidc; i++, uidp++) {
if (__ops_get_debug_level(__FILE__)) {
(void) fprintf(io-outs,
@@ -889,8 +889,8 @@
return kp;
}
/* match on full name */
- keyp = keyring-keys[1];
- for (n = 1; n keyring-keyc + 1; ++n, keyp++) {
+ keyp = keyring-keys;
+ for (n = 0; n keyring-keyc; ++n, keyp++) {
uidp = keyp-uids;
for (i = 0 ; i keyp-uidc; i++, uidp++) {
if (__ops_get_debug_level(__FILE__)) {
@@ -908,8 +908,8 @@
}
}
/* match on em...@address */
- keyp = keyring-keys[1];
- for (n = 1; n keyring-keyc + 1; ++n, keyp++) {
+ keyp = keyring-keys;
+ for (n = 0; n keyring-keyc; ++n, keyp++) {
for (i = 0, uidp = keyp-uids; i keyp-uidc; i++, uidp++) {
/*
* look for the rightmost '', in case there is one
@@ -951,14 +951,14 @@
__ops_key_t *key;
unsigned n;
- (void) fprintf(io-outs, %d keys\n, keyring-keyc);
- for (n = 0, key = keyring-keys[n+1]; n keyring-keyc; ++n, ++key) {
+ (void) fprintf(io-res, %d keys\n, keyring-keyc);
+ for (n = 0, key = keyring-keys; n keyring-keyc; ++n, ++key) {
if (__ops_is_key_secret(key)) {
- __ops_print_seckeydata(key);
+ __ops_print_seckeydata(io, key);
} else {
__ops_print_pubkeydata(io, key);
}
- (void) fputc('\n', io-outs);
+ (void) fputc('\n', io-res);
}
return 1;
}
Index: src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.18 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.19
--- src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.18 Wed Jun 10 00:38:09 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/misc.c Wed Jun 10 16:01:37 2009
@@ -57,7 +57,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: misc.c,v 1.18 2009/06/10 00:38:09 agc Exp $);
+__RCSID($NetBSD: misc.c,v 1.19 2009/06/10 16:01:37 agc Exp $);
#endif
#include sys/types.h
@@ -114,20 +114,19 @@
accumulate = __ops_callback_arg(cbinfo);
keyring = accumulate-keyring;
- key = (keyring-keyc 0) ? keyring-keys[keyring-keyc] : NULL;
-
switch (pkt-tag) {
case OPS_PTAG_CT_PUBLIC_KEY:
case OPS_PTAG_CT_SECRET_KEY:
case OPS_PTAG_CT_ENCRYPTED_SECRET_KEY:
if (__ops_get_debug_level(__FILE__)) {
- (void) fprintf(stderr, New key - tag %d\n, pkt-tag);
+ (void) fprintf(stderr, Creating key %d - tag %d\n,
+keyring-keyc + 1, pkt-tag);
}
EXPAND_ARRAY(keyring, key);
pubkey = (pkt-tag == OPS_PTAG_CT_PUBLIC_KEY) ?
content-pubkey :
content-seckey.pubkey;
- key = keyring-keys[++keyring-keyc];
+ key = keyring-keys[keyring-keyc++];
(void) memset(key, 0x0, sizeof(*key));
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src
Committed By: agc
Date: Wed Jun 10 16:36:23 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: keyring.h netpgp.c
packet-print.c types.h
Log Message:
Add a separate res output stream for results, and print results to it.
This is settable from userlevel by using
netpgp_setvar(..., results, filename)
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h
cvs rdiff -u -r1.22 -r1.23 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
cvs rdiff -u -r1.17 -r1.18 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/dist/src/lib/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h:1.14 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h:1.15
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h:1.14 Wed Jun 10 00:38:09 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h Wed Jun 10 16:36:23 2009
@@ -110,7 +110,7 @@
void __ops_print_pubkeydata(__ops_io_t *, const __ops_key_t *);
void __ops_print_pubkey(const __ops_pubkey_t *);
-void __ops_print_seckeydata(const __ops_key_t *);
+void __ops_print_seckeydata(__ops_io_t *, const __ops_key_t *);
int __ops_list_packets(__ops_io_t *,
char *,
unsigned,
Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.22 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.23
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.22 Wed Jun 10 00:38:09 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Wed Jun 10 16:36:23 2009
@@ -34,7 +34,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: netpgp.c,v 1.22 2009/06/10 00:38:09 agc Exp $);
+__RCSID($NetBSD: netpgp.c,v 1.23 2009/06/10 16:36:23 agc Exp $);
#endif
#include sys/types.h
@@ -228,6 +228,7 @@
char *userid;
char *stream;
char *passfd;
+ char *results;
int coredumps;
#ifdef HAVE_SYS_RESOURCE_H
@@ -296,6 +297,13 @@
passfd);
return 0;
}
+ if ((results = netpgp_getvar(netpgp, results)) == NULL) {
+ io-res = io-errs;
+ } else if ((io-res = fopen(results, w)) == NULL) {
+ (void) fprintf(io-errs, Can't open results %s for writing\n,
+ results);
+ return 0;
+ }
return 1;
}
Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.17 src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.18
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.17 Tue Jun 9 00:51:02 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c Wed Jun 10 16:36:23 2009
@@ -58,7 +58,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: packet-print.c,v 1.17 2009/06/09 00:51:02 agc Exp $);
+__RCSID($NetBSD: packet-print.c,v 1.18 2009/06/10 16:36:23 agc Exp $);
#endif
#include string.h
@@ -380,18 +380,18 @@
{
unsigned inti;
- (void) fprintf(io-errs, pub %d/%s ,
- numkeybits(key-key.pubkey),
- __ops_show_pka(key-key.pubkey.alg));
- hexdump(io-errs, key-key_id, OPS_KEY_ID_SIZE, );
- (void) fprintf(io-errs, );
- ptime(io-errs, key-key.pubkey.birthtime);
- (void) fprintf(io-errs, \nKey fingerprint: );
- hexdump(io-errs, key-fingerprint.fingerprint, OPS_FINGERPRINT_SIZE,
+ (void) fprintf(io-res, pub %d/%s ,
+ numkeybits(key-key.pubkey),
+ __ops_show_pka(key-key.pubkey.alg));
+ hexdump(io-res, key-key_id, OPS_KEY_ID_SIZE, );
+ (void) fprintf(io-res, );
+ ptime(io-res, key-key.pubkey.birthtime);
+ (void) fprintf(io-res, \nKey fingerprint: );
+ hexdump(io-res, key-fingerprint.fingerprint, OPS_FINGERPRINT_SIZE,
);
- (void) fprintf(io-errs, \n);
+ (void) fprintf(io-res, \n);
for (i = 0; i key-uidc; i++) {
- (void) fprintf(io-errs, uid %s\n,
+ (void) fprintf(io-res, uid %s\n,
key-uids[i].userid);
}
}
@@ -450,27 +450,26 @@
*/
void
-__ops_print_seckeydata(const __ops_key_t *key)
+__ops_print_seckeydata(__ops_io_t *io, const __ops_key_t *key)
{
- printf(sec );
- __ops_show_pka(key-key.pubkey.alg);
- printf( );
-
- hexdump(stdout, key-key_id, OPS_KEY_ID_SIZE, );
- printf( );
-
- ptime(stdout, key-key.pubkey.birthtime);
- printf( );
-
+ (void) fprintf(io-res, sec );
+ __ops_show_pka(key-key.pubkey.alg); /* XXX - redirect to io */
+ (void) fprintf(io-res, );
+ hexdump(io-res, key-key_id, OPS_KEY_ID_SIZE, );
+ (void) fprintf(io-res, );
+ ptime(io-res, key-key.pubkey.birthtime);
+ (void) fprintf(io-res, );
if (key-uidc == 1) {
/* print on same line as other
CVS commit: src/crypto/external/bsd/netpgp/dist/src
Module Name:src
Committed By: agc
Date: Wed Jun 10 16:37:42 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.c
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.c
Log Message:
Update userland programs to be able to use the results file
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.2 Wed Jun 10 00:38:09 2009
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c Wed Jun 10 16:37:41 2009
@@ -85,6 +85,7 @@
DETACHED,
HASH_ALG,
OUTPUT,
+ RESULTS,
VERBOSE,
COREDUMPS,
PASSWDFD,
@@ -130,6 +131,7 @@
{verbose, no_argument, NULL, VERBOSE},
{pass-fd, required_argument, NULL, PASSWDFD},
{output, required_argument, NULL, OUTPUT},
+ {results, required_argument, NULL, RESULTS},
{ NULL, 0, NULL, 0},
};
@@ -343,6 +345,14 @@
}
p.output = strdup(optarg);
break;
+ case RESULTS:
+ if (optarg == NULL) {
+(void) fprintf(stderr,
+No output filename argument provided\n);
+exit(EXIT_ERROR);
+ }
+ netpgp_setvar(netpgp, results, optarg);
+ break;
case OPS_DEBUG:
netpgp_set_debug(optarg);
break;
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.1 Wed Jun 10 00:38:10 2009
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c Wed Jun 10 16:37:42 2009
@@ -79,6 +79,7 @@
VERBOSE,
COREDUMPS,
PASSWDFD,
+ RESULTS,
/* debug */
OPS_DEBUG
@@ -107,6 +108,7 @@
{numbits, required_argument, NULL, NUMBITS},
{verbose, no_argument, NULL, VERBOSE},
{pass-fd, required_argument, NULL, PASSWDFD},
+ {results, required_argument, NULL, RESULTS},
{ NULL, 0, NULL, 0},
};
@@ -292,6 +294,14 @@
}
netpgp_setvar(netpgp, pass-fd, optarg);
break;
+ case RESULTS:
+ if (optarg == NULL) {
+(void) fprintf(stderr,
+No output filename argument provided\n);
+exit(EXIT_ERROR);
+ }
+ netpgp_setvar(netpgp, results, optarg);
+ break;
case OPS_DEBUG:
netpgp_set_debug(optarg);
break;
CVS commit: [netbsd-5] src/share/man/man8
Module Name:src Committed By: bouyer Date: Wed Jun 10 17:17:38 UTC 2009 Modified Files: src/share/man/man8 [netbsd-5]: afterboot.8 Log Message: Pull up following revision(s) (requested by snj in ticket #804): share/man/man8/afterboot.8: revision 1.40 Make some updates (most notably syncing the Postfix section with reality) inspired by PR misc/39168. To generate a diff of this commit: cvs rdiff -u -r1.38.2.1 -r1.38.2.2 src/share/man/man8/afterboot.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man8/afterboot.8 diff -u src/share/man/man8/afterboot.8:1.38.2.1 src/share/man/man8/afterboot.8:1.38.2.2 --- src/share/man/man8/afterboot.8:1.38.2.1 Sun May 10 20:50:05 2009 +++ src/share/man/man8/afterboot.8 Wed Jun 10 17:17:38 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: afterboot.8,v 1.38.2.1 2009/05/10 20:50:05 snj Exp $ +.\ $NetBSD: afterboot.8,v 1.38.2.2 2009/06/10 17:17:38 bouyer Exp $ .\ $OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $ .\ .\ Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu @@ -59,7 +59,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd October 20, 2008 +.Dd May 18, 2009 .Dt AFTERBOOT 8 .Os .Sh NAME @@ -193,7 +193,9 @@ or edit the .Pa /etc/myname file to have it stick around for the next reboot. -Note that hostname is supposed include a domainname, and that this should +Note that +.Dq Va hostname +is supposed include a domainname, and that this should not be confused with YP (NIS) .Xr domainname 1 . If you are using @@ -686,23 +688,24 @@ Check .Pa /etc/mail/aliases and update appropriately if you want e-mail to be routed -to non-local address or to different users. +to non-local addresses or to different users. .Pp Run .Xr newaliases 1 after changes. .Ss Postfix .Nx -comes also with Postfix in the base system. -You may wish to set it up in favor of sendmail. -Take a look to +uses Postfix as its MTA. +Postfix is started by default, but its initial configuration does not +cause it to listen on the network for incoming connections. +To configure Postfix, see .Pa /etc/postfix/main.cf -and enable the daemon in -.Pa /etc/rc.conf -using postfix=yes. -It is very important to configure +and +.Pa /etc/postfix/master.cf . +If you wish to use a different MTA (e.g., sendmail), install your MTA of +choice and edit .Pa /etc/mailer.conf -to point to Postfix binaries. +to point to the proper binaries. .Ss DHCP server If this is a DHCP @@ -964,7 +967,8 @@ Should any problems appear when running the test suite, please let the .Nx developers know by sending a message to the appropriate mailing list or -by sending a problem report. For more details see: +by sending a problem report. +For more details see: .Bl -bullet -offset indent .It .Pa http://www.netbsd.org/mailinglists/ @@ -994,8 +998,6 @@ .Xr exports 5 , .Xr fstab 5 , .Xr group 5 , -.Xr krb.conf 5 , -.Xr krb.realms 5 , .Xr mailer.conf 5 , .Xr passwd 5 , .Xr rc.conf 5 ,
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Wed Jun 10 17:19:08 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 802-804 To generate a diff of this commit: cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-5.1 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 diff -u src/doc/CHANGES-5.1:1.1.2.28 src/doc/CHANGES-5.1:1.1.2.29 --- src/doc/CHANGES-5.1:1.1.2.28 Tue Jun 9 18:07:57 2009 +++ src/doc/CHANGES-5.1 Wed Jun 10 17:19:08 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.28 2009/06/09 18:07:57 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.29 2009/06/10 17:19:08 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -964,3 +964,15 @@ cpu_lwp_fork, the latter does a lot more work. [martin, ticket #801] +sys/arch/sh3/sh3/locore_subr.S 1.52 + + Fix logic error in copyinstr() when deciding whether to return EFAULT + or ENAMETOOLONG. + [uwe, ticket #802] + +sbin/newfs/newfs.c1.103 + + Issue a better error message if attempting to create a file system + on a block device. Inspired by PR kern/41127. + [snj, ticket #803] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Wed Jun 10 19:20:28 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.1 Log Message: Ticket 802 To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-5.0.1 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.0.1 diff -u src/doc/CHANGES-5.0.1:1.1.2.20 src/doc/CHANGES-5.0.1:1.1.2.21 --- src/doc/CHANGES-5.0.1:1.1.2.20 Wed Jun 10 17:18:51 2009 +++ src/doc/CHANGES-5.0.1 Wed Jun 10 19:20:28 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.1,v 1.1.2.20 2009/06/10 17:18:51 bouyer Exp $ +# $NetBSD: CHANGES-5.0.1,v 1.1.2.21 2009/06/10 19:20:28 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.0.1 release: @@ -388,3 +388,9 @@ with reality). inspired by PR misc/39168. [snj, ticket #804] +sys/arch/sh3/sh3/locore_subr.S 1.52 + + Fix logic error in copyinstr() when deciding whether to return EFAULT + or ENAMETOOLONG. + [uwe, ticket #802] +
CVS commit: [netbsd-4] src/sys/arch/sh3/sh3
Module Name:src Committed By: bouyer Date: Wed Jun 10 19:23:36 UTC 2009 Modified Files: src/sys/arch/sh3/sh3 [netbsd-4]: locore_subr.S Log Message: Pull up following revision(s) (requested by uwe in ticket #1323): sys/arch/sh3/sh3/locore_subr.S: revision 1.52 Fix logic error in copyinstr() when deciding whether to return EFAULT or ENAMETOOLONG. From OpenBSD revision 1.9 by miod@ To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.30.2.1 src/sys/arch/sh3/sh3/locore_subr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sh3/sh3/locore_subr.S diff -u src/sys/arch/sh3/sh3/locore_subr.S:1.30 src/sys/arch/sh3/sh3/locore_subr.S:1.30.2.1 --- src/sys/arch/sh3/sh3/locore_subr.S:1.30 Thu Nov 16 23:12:23 2006 +++ src/sys/arch/sh3/sh3/locore_subr.S Wed Jun 10 19:23:36 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: locore_subr.S,v 1.30 2006/11/16 23:12:23 uwe Exp $ */ +/* $NetBSD: locore_subr.S,v 1.30.2.1 2009/06/10 19:23:36 bouyer Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ #include sh3/mmu_sh3.h #include sh3/mmu_sh4.h -__KERNEL_RCSID(0, $NetBSD: locore_subr.S,v 1.30 2006/11/16 23:12:23 uwe Exp $) +__KERNEL_RCSID(0, $NetBSD: locore_subr.S,v 1.30.2.1 2009/06/10 19:23:36 bouyer Exp $) /* @@ -760,7 +760,7 @@ cmp/eq #-1, r0 bf 1b mov.l .L_copyinstr_VM_MAXUSER_ADDRESS, r1 - cmp/hs r1, r5 + cmp/hs r1, r4 bt 3f mov #ENAMETOOLONG, r3
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Wed Jun 10 19:24:06 UTC 2009 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: ticket 1323 To generate a diff of this commit: cvs rdiff -u -r1.1.2.153 -r1.1.2.154 src/doc/CHANGES-4.1 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-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.153 src/doc/CHANGES-4.1:1.1.2.154 --- src/doc/CHANGES-4.1:1.1.2.153 Sun Jun 7 11:59:38 2009 +++ src/doc/CHANGES-4.1 Wed Jun 10 19:24:05 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.153 2009/06/07 11:59:38 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.154 2009/06/10 19:24:05 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -3440,3 +3440,9 @@ PR/39445, fix wrong charsets priority for CP932. [tnozaki, ticket #1194] +sys/arch/sh3/sh3/locore_subr.S 1.52 + + Fix logic error in copyinstr() when deciding whether to return EFAULT + or ENAMETOOLONG. + [uwe, ticket #1323] +
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Wed Jun 10 19:24:35 UTC 2009 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket 1323 To generate a diff of this commit: cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-4.0.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-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.33 src/doc/CHANGES-4.0.2:1.1.2.34 --- src/doc/CHANGES-4.0.2:1.1.2.33 Fri Jun 5 18:12:51 2009 +++ src/doc/CHANGES-4.0.2 Wed Jun 10 19:24:35 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.33 2009/06/05 18:12:51 snj Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.34 2009/06/10 19:24:35 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -611,3 +611,9 @@ with the associated build infrastructure as of 20090529 from HEAD. [joerg, ticket #1322] +sys/arch/sh3/sh3/locore_subr.S 1.52 + + Fix logic error in copyinstr() when deciding whether to return EFAULT + or ENAMETOOLONG. + [uwe, ticket #1323] +
CVS commit: src/sys/rump/librump
Module Name:src
Committed By: pooka
Date: Wed Jun 10 20:50:51 UTC 2009
Modified Files:
src/sys/rump/librump/rumpnet: Makefile.rumpnet
src/sys/rump/librump/rumpvfs: Makefile.rumpvfs
Log Message:
libkern is fully included in rumpkern, no need for cherry-picking
modules elsewhere.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpnet/Makefile.rumpnet
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
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/rumpnet/Makefile.rumpnet
diff -u src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.4 src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.5
--- src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.4 Fri Jan 23 19:34:37 2009
+++ src/sys/rump/librump/rumpnet/Makefile.rumpnet Wed Jun 10 20:50:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpnet,v 1.4 2009/01/23 19:34:37 pooka Exp $
+# $NetBSD: Makefile.rumpnet,v 1.5 2009/06/10 20:50:51 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -6,7 +6,7 @@
LIB= rumpnet
.PATH: ${RUMPTOP}/librump/rumpnet\
- ${RUMPTOP}/../kern ${RUMPTOP}/../lib/libkern \
+ ${RUMPTOP}/../kern \
${RUMPTOP}/../net \
${RUMPTOP}/../compat/common
@@ -19,9 +19,6 @@
# radix trie support
SRCS+= radix.c
-# src/lib/libkern
-SRCS+= intoa.c
-
# compat
SRCS+= rtsock_50.c
Index: src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
diff -u src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.8 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.9
--- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.8 Tue Jun 9 14:20:42 2009
+++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Wed Jun 10 20:50:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpvfs,v 1.8 2009/06/09 14:20:42 pooka Exp $
+# $NetBSD: Makefile.rumpvfs,v 1.9 2009/06/10 20:50:51 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -6,7 +6,7 @@
LIB= rumpvfs
.PATH: ${RUMPTOP}/librump/rumpvfs\
- ${RUMPTOP}/../kern ${RUMPTOP}/../lib/libkern \
+ ${RUMPTOP}/../kern \
${RUMPTOP}/../miscfs/genfs ${RUMPTOP}/../miscfs/syncfs \
${RUMPTOP}/../miscfs/specfs ${RUMPTOP}/../miscfs/deadfs \
${RUMPTOP}/../compat/common
CVS commit: src/sys/rump/librump/rumpnet
Module Name:src
Committed By: pooka
Date: Wed Jun 10 20:54:55 UTC 2009
Modified Files:
src/sys/rump/librump/rumpnet: Makefile.rumpnet
Log Message:
MAXUSERS comes from Makefile.rump
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpnet/Makefile.rumpnet
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/rumpnet/Makefile.rumpnet
diff -u src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.5 src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.6
--- src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.5 Wed Jun 10 20:50:51 2009
+++ src/sys/rump/librump/rumpnet/Makefile.rumpnet Wed Jun 10 20:54:55 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpnet,v 1.5 2009/06/10 20:50:51 pooka Exp $
+# $NetBSD: Makefile.rumpnet,v 1.6 2009/06/10 20:54:55 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -27,7 +27,6 @@
SHLIB_MINOR=0
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpnet/opt
-CPPFLAGS+= -DMAXUSERS=32
.include bsd.lib.mk
.include bsd.klinks.mk
CVS commit: src/sys/kern
Module Name:src Committed By: yamt Date: Wed Jun 10 22:23:15 UTC 2009 Modified Files: src/sys/kern: vfs_lockf.c Log Message: lf_split: cv_destroy a condvar before clobbering it. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/kern/vfs_lockf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/vfs_lockf.c diff -u src/sys/kern/vfs_lockf.c:1.69 src/sys/kern/vfs_lockf.c:1.70 --- src/sys/kern/vfs_lockf.c:1.69 Sat Oct 11 13:40:57 2008 +++ src/sys/kern/vfs_lockf.c Wed Jun 10 22:23:15 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_lockf.c,v 1.69 2008/10/11 13:40:57 pooka Exp $ */ +/* $NetBSD: vfs_lockf.c,v 1.70 2009/06/10 22:23:15 yamt Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_lockf.c,v 1.69 2008/10/11 13:40:57 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_lockf.c,v 1.70 2009/06/10 22:23:15 yamt Exp $); #include sys/param.h #include sys/systm.h @@ -383,6 +383,7 @@ */ splitlock = *sparelock; *sparelock = NULL; + cv_destroy(splitlock-lf_cv); memcpy(splitlock, lock1, sizeof(*splitlock)); cv_init(splitlock-lf_cv, lockstr);
CVS commit: src/sys/kern
Module Name:src
Committed By: yamt
Date: Wed Jun 10 22:34:35 UTC 2009
Modified Files:
src/sys/kern: vfs_lockf.c
Log Message:
don't make F_GETLK or the common case of F_UNLCK fail for per-user limit.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/kern/vfs_lockf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_lockf.c
diff -u src/sys/kern/vfs_lockf.c:1.70 src/sys/kern/vfs_lockf.c:1.71
--- src/sys/kern/vfs_lockf.c:1.70 Wed Jun 10 22:23:15 2009
+++ src/sys/kern/vfs_lockf.c Wed Jun 10 22:34:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lockf.c,v 1.70 2009/06/10 22:23:15 yamt Exp $ */
+/* $NetBSD: vfs_lockf.c,v 1.71 2009/06/10 22:34:35 yamt Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_lockf.c,v 1.70 2009/06/10 22:23:15 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_lockf.c,v 1.71 2009/06/10 22:34:35 yamt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -190,11 +190,12 @@
* 0 - always allocate. 1 - cutoff at limit. 2 - cutoff at double limit.
*/
static struct lockf *
-lf_alloc(uid_t uid, int allowfail)
+lf_alloc(int allowfail)
{
struct uidinfo *uip;
struct lockf *lock;
u_long lcnt;
+ const uid_t uid = kauth_cred_geteuid(kauth_cred_get());
uip = uid_find(uid);
lcnt = atomic_inc_ulong_nv(uip-ui_lockcnt);
@@ -807,7 +808,6 @@
int
lf_advlock(struct vop_advlock_args *ap, struct lockf **head, off_t size)
{
- struct lwp *l = curlwp;
struct flock *fl = ap-a_fl;
struct lockf *lock = NULL;
struct lockf *sparelock;
@@ -852,7 +852,7 @@
/*
* Byte-range lock might need one more lock.
*/
- sparelock = lf_alloc(kauth_cred_geteuid(l-l_cred), 0);
+ sparelock = lf_alloc(0);
if (sparelock == NULL) {
error = ENOMEM;
goto quit;
@@ -869,8 +869,28 @@
return EINVAL;
}
- lock = lf_alloc(kauth_cred_geteuid(l-l_cred),
- ap-a_op != F_UNLCK ? 1 : 2);
+ if (fl-l_len == 0)
+ end = -1;
+ else
+ end = start + fl-l_len - 1;
+
+ switch (ap-a_op) {
+ case F_SETLK:
+ lock = lf_alloc(1);
+ break;
+ case F_UNLCK:
+ if (start == 0 || end == -1) {
+ /* never split */
+ lock = lf_alloc(0);
+ } else {
+ /* might split */
+ lock = lf_alloc(2);
+ }
+ break;
+ case F_GETLK:
+ lock = lf_alloc(0);
+ break;
+ }
if (lock == NULL) {
error = ENOMEM;
goto quit;
@@ -889,10 +909,6 @@
}
}
- if (fl-l_len == 0)
- end = -1;
- else
- end = start + fl-l_len - 1;
/*
* Create the lockf structure.
*/
CVS commit: src/sys/kern
Module Name:src
Committed By: yamt
Date: Wed Jun 10 23:48:10 UTC 2009
Modified Files:
src/sys/kern: sys_descrip.c
Log Message:
do_posix_fadvise:
- deactivate pages on POSIX_FADV_DONTNEED.
- more sanity checks. fix a panic in genfs_getpages
introduced by the previous (rev.1.15).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/kern/sys_descrip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_descrip.c
diff -u src/sys/kern/sys_descrip.c:1.15 src/sys/kern/sys_descrip.c:1.16
--- src/sys/kern/sys_descrip.c:1.15 Wed Jun 10 01:56:34 2009
+++ src/sys/kern/sys_descrip.c Wed Jun 10 23:48:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_descrip.c,v 1.15 2009/06/10 01:56:34 yamt Exp $ */
+/* $NetBSD: sys_descrip.c,v 1.16 2009/06/10 23:48:10 yamt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_descrip.c,v 1.15 2009/06/10 01:56:34 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_descrip.c,v 1.16 2009/06/10 23:48:10 yamt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -616,11 +616,19 @@
{
file_t *fp;
vnode_t *vp;
+ off_t endoffset;
int error;
CTASSERT(POSIX_FADV_NORMAL == UVM_ADV_NORMAL);
CTASSERT(POSIX_FADV_RANDOM == UVM_ADV_RANDOM);
CTASSERT(POSIX_FADV_SEQUENTIAL == UVM_ADV_SEQUENTIAL);
+ if (len == 0) {
+ endoffset = INT64_MAX;
+ } else if (INT64_MAX - offset = len) {
+ endoffset = offset + len;
+ } else {
+ return EINVAL;
+ }
if ((fp = fd_getfile(fd)) == NULL) {
return EBADF;
}
@@ -635,6 +643,17 @@
}
switch (advice) {
+ case POSIX_FADV_WILLNEED:
+ case POSIX_FADV_DONTNEED:
+ vp = fp-f_data;
+ if (vp-v_type != VREG vp-v_type != VBLK) {
+ fd_putfile(fd);
+ return 0;
+ }
+ break;
+ }
+
+ switch (advice) {
case POSIX_FADV_NORMAL:
case POSIX_FADV_RANDOM:
case POSIX_FADV_SEQUENTIAL:
@@ -651,11 +670,16 @@
case POSIX_FADV_WILLNEED:
vp = fp-f_data;
- error = uvm_readahead(vp-v_uobj, offset,
- len != 0 ? len : INT64_MAX - offset);
+ error = uvm_readahead(vp-v_uobj, offset, endoffset - offset);
break;
case POSIX_FADV_DONTNEED:
+ vp = fp-f_data;
+ mutex_enter(vp-v_interlock);
+ error = VOP_PUTPAGES(vp, round_page(offset),
+ trunc_page(endoffset), PGO_DEACTIVATE | PGO_CLEANIT);
+ break;
+
case POSIX_FADV_NOREUSE:
/* Not implemented yet. */
error = 0;
CVS commit: xsrc/external/mit/MesaDemos/dist
Module Name:xsrc Committed By: mrg Date: Thu Jun 11 00:49:28 UTC 2009 Update of /cvsroot/xsrc/external/mit/MesaDemos/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6377 Log Message: initial import of MesaDemos-7.4.2 Status: Vendor Tag: xorg Release Tags: MesaDemos-7-4-2 U xsrc/external/mit/MesaDemos/dist/progs/beos/GLInfo.cpp U xsrc/external/mit/MesaDemos/dist/progs/beos/demo.cpp U xsrc/external/mit/MesaDemos/dist/progs/beos/sample.cpp U xsrc/external/mit/MesaDemos/dist/progs/beos/Makefile U xsrc/external/mit/MesaDemos/dist/progs/images/girl2.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/arch.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/bw.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/reflect.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/girl.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/tree3.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/s128.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/tile.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/wrs_logo.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/tree2.rgba U xsrc/external/mit/MesaDemos/dist/progs/demos/Makefile.cygnus U xsrc/external/mit/MesaDemos/dist/progs/demos/Makefile N xsrc/external/mit/MesaDemos/dist/progs/demos/fbo_firecube.c U xsrc/external/mit/MesaDemos/dist/progs/demos/Makefile.win U xsrc/external/mit/MesaDemos/dist/progs/demos/descrip.mms U xsrc/external/mit/MesaDemos/dist/progs/demos/arbfplight.c U xsrc/external/mit/MesaDemos/dist/progs/demos/arbfslight.c U xsrc/external/mit/MesaDemos/dist/progs/demos/arbocclude.c U xsrc/external/mit/MesaDemos/dist/progs/demos/bounce.c U xsrc/external/mit/MesaDemos/dist/progs/demos/clearspd.c N xsrc/external/mit/MesaDemos/dist/progs/demos/copypix.c U xsrc/external/mit/MesaDemos/dist/progs/demos/cubemap.c U xsrc/external/mit/MesaDemos/dist/progs/demos/drawpix.c U xsrc/external/mit/MesaDemos/dist/progs/demos/engine.c U xsrc/external/mit/MesaDemos/dist/progs/demos/extfuncs.h U xsrc/external/mit/MesaDemos/dist/progs/demos/fogcoord.c U xsrc/external/mit/MesaDemos/dist/progs/demos/fire.c U xsrc/external/mit/MesaDemos/dist/progs/demos/fplight.c U xsrc/external/mit/MesaDemos/dist/progs/demos/fslight.c U xsrc/external/mit/MesaDemos/dist/progs/demos/gamma.c U xsrc/external/mit/MesaDemos/dist/progs/demos/gearbox.c U xsrc/external/mit/MesaDemos/dist/progs/demos/gears.c U xsrc/external/mit/MesaDemos/dist/progs/demos/geartrain.c U xsrc/external/mit/MesaDemos/dist/progs/demos/glinfo.c U xsrc/external/mit/MesaDemos/dist/progs/demos/gloss.c U xsrc/external/mit/MesaDemos/dist/progs/demos/glslnoise.c U xsrc/external/mit/MesaDemos/dist/progs/demos/gltestperf.c U xsrc/external/mit/MesaDemos/dist/progs/demos/glutfx.c U xsrc/external/mit/MesaDemos/dist/progs/demos/ipers.c U xsrc/external/mit/MesaDemos/dist/progs/demos/isosurf.c U xsrc/external/mit/MesaDemos/dist/progs/demos/lodbias.c U xsrc/external/mit/MesaDemos/dist/progs/demos/morph3d.c U xsrc/external/mit/MesaDemos/dist/progs/demos/multiarb.c U xsrc/external/mit/MesaDemos/dist/progs/demos/occlude.c U xsrc/external/mit/MesaDemos/dist/progs/demos/paltex.c U xsrc/external/mit/MesaDemos/dist/progs/demos/particles.h U xsrc/external/mit/MesaDemos/dist/progs/demos/pointblast.c U xsrc/external/mit/MesaDemos/dist/progs/demos/ray.c U xsrc/external/mit/MesaDemos/dist/progs/demos/readpix.c U xsrc/external/mit/MesaDemos/dist/progs/demos/readtex.c U xsrc/external/mit/MesaDemos/dist/progs/demos/readtex.h U xsrc/external/mit/MesaDemos/dist/progs/demos/reflect.c U xsrc/external/mit/MesaDemos/dist/progs/demos/renormal.c U xsrc/external/mit/MesaDemos/dist/progs/demos/shadowtex.c U xsrc/external/mit/MesaDemos/dist/progs/demos/showbuffer.c U xsrc/external/mit/MesaDemos/dist/progs/demos/showbuffer.h U xsrc/external/mit/MesaDemos/dist/progs/demos/singlebuffer.c U xsrc/external/mit/MesaDemos/dist/progs/demos/spectex.c U xsrc/external/mit/MesaDemos/dist/progs/demos/spriteblast.c U xsrc/external/mit/MesaDemos/dist/progs/demos/stex3d.c U xsrc/external/mit/MesaDemos/dist/progs/demos/streaming_rect.c U xsrc/external/mit/MesaDemos/dist/progs/demos/teapot.c U xsrc/external/mit/MesaDemos/dist/progs/demos/terrain.c U xsrc/external/mit/MesaDemos/dist/progs/demos/tessdemo.c U xsrc/external/mit/MesaDemos/dist/progs/demos/texcyl.c U xsrc/external/mit/MesaDemos/dist/progs/demos/texdown.c U xsrc/external/mit/MesaDemos/dist/progs/demos/texenv.c U xsrc/external/mit/MesaDemos/dist/progs/demos/texobj.c U xsrc/external/mit/MesaDemos/dist/progs/demos/trackball.c U xsrc/external/mit/MesaDemos/dist/progs/demos/trackball.h U xsrc/external/mit/MesaDemos/dist/progs/demos/trispd.c U xsrc/external/mit/MesaDemos/dist/progs/demos/tunnel2.c U xsrc/external/mit/MesaDemos/dist/progs/demos/tunnel.c U xsrc/external/mit/MesaDemos/dist/progs/demos/tunneldat.h U xsrc/external/mit/MesaDemos/dist/progs/demos/vao_demo.c U xsrc/external/mit/MesaDemos/dist/progs/demos/winpos.c U xsrc/external/mit/MesaDemos/dist/progs/demos/particles.cxx U
CVS commit: xsrc/external/mit/MesaGLUT/dist
Module Name:xsrc Committed By: mrg Date: Thu Jun 11 00:49:53 UTC 2009 Update of /cvsroot/xsrc/external/mit/MesaGLUT/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17239 Log Message: initial import of MesaGLUT-7.4.2 Status: Vendor Tag: xorg Release Tags: MesaGLUT-7-4-2 U xsrc/external/mit/MesaGLUT/dist/include/GL/glutf90.h U xsrc/external/mit/MesaGLUT/dist/include/GL/glut.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/Makefile.cygnus U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/Makefile U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/capturexfont.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/Makefile.mgw U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/Makefile.sgi U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/Makefile.win U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/depend U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut.pc.in U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/fxglut.def U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut.def U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/descrip.mms U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/mms_depend U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_bitmap.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_8x13.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_9x15.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_bwidth.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glutbitmap.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_fullscrn.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_cindex.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_cmap.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_cursor.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_dials.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_dstr.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_event.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_ext.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_fcb.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/win32_winproc.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_gamemode.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_get.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_glxext.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_hel10.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_hel12.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_hel18.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_init.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_input.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glutint.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_joy.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_key.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_keyctrl.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_keyup.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_menu2.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_menu.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_mesa.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_modifier.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/win32_glx.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_mroman.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_overlay.c N xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_ppm.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_roman.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_shapes.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_space.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_stroke.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glutstroke.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_swap.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_swidth.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_tablet.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_teapot.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_tr10.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_tr24.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_util.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_vidresize.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_warp.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glutwin32.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_win.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_winmisc.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/layerutil.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/layerutil.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/stroke.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/win32_glx.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/win32_menu.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/win32_util.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/win32_x11.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/win32_x11.h U xsrc/external/mit/MesaGLUT/dist/src/glut/beos/glut_bitmap.c U xsrc/external/mit/MesaGLUT/dist/src/glut/beos/beos_x11.h U xsrc/external/mit/MesaGLUT/dist/src/glut/beos/glut_8x13.c U
CVS commit: xsrc/external/mit/MesaLib/dist
Module Name:xsrc Committed By: mrg Date: Thu Jun 11 01:03:01 UTC 2009 Modified Files: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/mach64: mach64_context.h xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200: r200_tcl.c xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis: sis_context.h Removed Files: xsrc/external/mit/MesaLib/dist/configs: darwin-static darwin-static-x86ppc xsrc/external/mit/MesaLib/dist/docs: MESA_packed_depth_stencil.spec MESA_program_debug.spec MESA_sprite_point.spec MESA_trace.spec memory.html xsrc/external/mit/MesaLib/dist/include: GLView.h xsrc/external/mit/MesaLib/dist/include/GL: amesa.h fxmesa.h uglglutshapes.h uglmesa.h xmesa.h xmesa_x.h xmesa_xf86.h xsrc/external/mit/MesaLib/dist/src/glx/x11: dri_glx.h glx_texture_compression.c indirect_dispatch.c indirect_dispatch.h indirect_dispatch_swap.c indirect_reqsize.c indirect_reqsize.h indirect_size_get.c indirect_size_get.h indirect_table.c indirect_va_private.h xsrc/external/mit/MesaLib/dist/src/mesa/drivers/common: sources xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/common: dri_bufmgr.c dri_bufmgr.h dri_bufpool.h dri_drmpool.c xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/glcore: Makefile glcore_driver.c xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915: i915_texprog.c intel_batchbuffer.c intel_batchbuffer.h intel_context.c intel_context.h intel_ioctl.c intel_ioctl.h intel_pixel.c intel_reg.h intel_rotate.c intel_rotate.h intel_screen.c intel_screen.h intel_span.c intel_span.h intel_tex.c intel_tex.h intel_texmem.c xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/server: i830_common.h i830_dri.h intel.h intel_dri.c xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex: Makefile i830_context.c i830_context.h i830_metaops.c i830_reg.h i830_state.c i830_tex.c i830_texblend.c i830_texstate.c i830_vtbl.c i915_context.c i915_context.h i915_debug.c i915_fragprog.c i915_metaops.c i915_program.c i915_program.h i915_reg.h i915_state.c i915_tex.c i915_tex_layout.c i915_texstate.c i915_vtbl.c intel_batchbuffer.c intel_batchbuffer.h intel_batchpool.c intel_blit.c intel_blit.h intel_buffer_objects.c intel_buffer_objects.h intel_buffers.c intel_buffers.h intel_context.c intel_context.h intel_depthstencil.c intel_depthstencil.h intel_fbo.c intel_fbo.h intel_ioctl.c intel_ioctl.h intel_mipmap_tree.c intel_mipmap_tree.h intel_pixel.c intel_pixel.h intel_pixel_bitmap.c intel_pixel_copy.c intel_pixel_draw.c intel_pixel_read.c intel_reg.h intel_regions.c intel_regions.h intel_render.c intel_rotate.c intel_rotate.h intel_screen.c intel_screen.h intel_span.c intel_span.h intel_state.c intel_structs.h intel_tex.c intel_tex.h intel_tex_copy.c intel_tex_format.c intel_tex_image.c intel_tex_subimage.c intel_tex_validate.c intel_tris.c intel_tris.h xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/server: i830_common.h i830_dri.h intel.h intel_dri.c xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965: brw_aub.c brw_aub.h brw_aub_playback.c brw_exec_generic.c brw_hal.c brw_hal.h brw_metaops.c brw_state_pool.c brw_vs_tnl.c bufmgr.h bufmgr_fake.c intel_batchbuffer.c intel_batchbuffer.h intel_blit.c intel_blit.h intel_buffer_objects.c intel_buffer_objects.h intel_buffers.c intel_context.c intel_context.h intel_ioctl.c intel_ioctl.h intel_mipmap_tree.c intel_mipmap_tree.h intel_pixel_bitmap.c intel_pixel_copy.c intel_reg.h intel_regions.c intel_regions.h intel_screen.c intel_screen.h intel_span.c intel_span.h intel_tex.c intel_tex.h intel_tex_validate.c xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/server: i830_common.h i830_dri.h intel.h intel_dri.c xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau: Makefile nouveau_bufferobj.c nouveau_bufferobj.h nouveau_buffers.c nouveau_buffers.h nouveau_card.c nouveau_card.h nouveau_card_list.h nouveau_context.c nouveau_context.h nouveau_ctrlreg.h nouveau_dri.h nouveau_driver.c nouveau_driver.h nouveau_fifo.c nouveau_fifo.h nouveau_lock.c nouveau_lock.h nouveau_msg.h nouveau_object.c nouveau_object.h nouveau_query.c nouveau_query.h nouveau_reg.h nouveau_screen.c nouveau_screen.h nouveau_shader.c nouveau_shader.h nouveau_shader_0.c
CVS commit: xsrc/external/mit/MesaDemos/dist/progs
Module Name:xsrc Committed By: mrg Date: Thu Jun 11 01:04:31 UTC 2009 Removed Files: xsrc/external/mit/MesaDemos/dist/progs/glsl: CH06-brick.frag.txt CH06-brick.vert.txt CH11-bumpmap.frag.txt CH11-bumpmap.vert.txt CH11-toyball.frag.txt CH11-toyball.vert.txt CH18-mandel.frag.txt CH18-mandel.vert.txt cubemap.frag.txt reflect.vert.txt shadowtex.frag.txt simple.vert.txt xsrc/external/mit/MesaDemos/dist/progs/osdemos: readtex.c Log Message: merge MesaDemos 7.4.2 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/MesaDemos/dist/progs/glsl/CH06-brick.frag.txt \ xsrc/external/mit/MesaDemos/dist/progs/glsl/CH06-brick.vert.txt \ xsrc/external/mit/MesaDemos/dist/progs/glsl/CH11-bumpmap.frag.txt \ xsrc/external/mit/MesaDemos/dist/progs/glsl/CH11-bumpmap.vert.txt \ xsrc/external/mit/MesaDemos/dist/progs/glsl/CH11-toyball.frag.txt \ xsrc/external/mit/MesaDemos/dist/progs/glsl/CH11-toyball.vert.txt \ xsrc/external/mit/MesaDemos/dist/progs/glsl/CH18-mandel.frag.txt \ xsrc/external/mit/MesaDemos/dist/progs/glsl/CH18-mandel.vert.txt \ xsrc/external/mit/MesaDemos/dist/progs/glsl/cubemap.frag.txt \ xsrc/external/mit/MesaDemos/dist/progs/glsl/reflect.vert.txt \ xsrc/external/mit/MesaDemos/dist/progs/glsl/shadowtex.frag.txt \ xsrc/external/mit/MesaDemos/dist/progs/glsl/simple.vert.txt cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/MesaDemos/dist/progs/osdemos/readtex.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: mrg
Date: Thu Jun 11 01:47:09 UTC 2009
Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: 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/radeon: Makefile
src/external/mit/xorg/lib/dri/tdfx: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libOSMesa: libmesa.mk
Log Message:
build fixes for Mesa 7.4.2.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri/i965/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/r128/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri/r200/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/r300/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri/radeon/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/tdfx/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libOSMesa/libmesa.mk
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/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.2 src/external/mit/xorg/lib/dri/i915/Makefile:1.3
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.2 Sun Sep 21 14:08:45 2008
+++ src/external/mit/xorg/lib/dri/i915/Makefile Thu Jun 11 01:47:08 2009
@@ -1,13 +1,59 @@
-# $NetBSD: Makefile,v 1.2 2008/09/21 14:08:45 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/11 01:47:08 mrg Exp $
MODULE= i915
-SRCS= i915_context.c i915_debug.c i915_fragprog.c i915_metaops.c \
- i915_program.c i915_state.c i915_tex.c i915_texprog.c i915_texstate.c \
- i915_vtbl.c i830_context.c i830_metaops.c i830_state.c \
- i830_texblend.c i830_tex.c i830_texstate.c i830_vtbl.c \
- intel_batchbuffer.c intel_context.c intel_ioctl.c intel_pixel.c \
- intel_render.c intel_rotate.c intel_screen.c intel_span.c \
- intel_state.c intel_tex.c intel_texmem.c intel_tris.c
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/i965 \
+ -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel \
+ -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel/server
+
+DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel
+SRCS= \
+ i830_context.c \
+ i830_metaops.c \
+ i830_state.c \
+ i830_texblend.c \
+ i830_tex.c \
+ i830_texstate.c \
+ i830_vtbl.c \
+ intel_render.c \
+ intel_regions.c \
+ intel_buffer_objects.c \
+ intel_batchbuffer.c \
+ intel_clear.c \
+ intel_mipmap_tree.c \
+ i915_tex_layout.c \
+ intel_tex_layout.c \
+ intel_tex_image.c \
+ intel_tex_subimage.c \
+ intel_tex_copy.c \
+ intel_tex_validate.c \
+ intel_tex_format.c \
+ intel_tex.c \
+ intel_pixel.c \
+ intel_pixel_bitmap.c \
+ intel_pixel_copy.c \
+ intel_pixel_draw.c \
+ intel_pixel_read.c \
+ intel_buffers.c \
+ intel_blit.c \
+ intel_swapbuffers.c \
+ i915_tex.c \
+ i915_texstate.c \
+ i915_context.c \
+ i915_debug.c \
+ i915_debug_fp.c \
+ i915_fragprog.c \
+ i915_metaops.c \
+ i915_program.c \
+ i915_state.c \
+ i915_vtbl.c \
+ intel_context.c \
+ intel_decode.c \
+ intel_screen.c \
+ intel_span.c \
+ intel_state.c \
+ intel_tris.c \
+ intel_fbo.c \
+ intel_depthstencil.c
.include ${.CURDIR}/../dri.mk
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.3 src/external/mit/xorg/lib/dri/i965/Makefile:1.4
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.3 Fri Sep 26 07:15:53 2008
+++ src/external/mit/xorg/lib/dri/i965/Makefile Thu Jun 11 01:47:08 2009
@@ -1,28 +1,92 @@
-# $NetBSD: Makefile,v 1.3 2008/09/26 07:15:53 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/11 01:47:08 mrg Exp $
MODULE= i965
CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/i965 \
- -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel
+ -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel \
+ -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel/server
-DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel
-SRCS= brw_aub.c brw_aub_playback.c brw_cc.c brw_clip.c brw_clip_line.c \
- brw_clip_point.c brw_clip_state.c brw_clip_tri.c brw_clip_unfilled.c \
- brw_clip_util.c brw_context.c brw_curbe.c brw_draw.c \
- brw_draw_upload.c brw_eu.c brw_eu_debug.c brw_eu_emit.c brw_eu_util.c \
- brw_fallback.c brw_gs.c brw_gs_emit.c brw_gs_state.c brw_hal.c \
- brw_metaops.c brw_misc_state.c brw_program.c brw_sf.c brw_sf_emit.c \
- brw_sf_state.c brw_state_batch.c brw_state_cache.c brw_state_pool.c \
- brw_state_upload.c brw_tex.c brw_tex_layout.c brw_urb.c brw_util.c \
- brw_vs.c brw_vs_constval.c brw_vs_emit.c brw_vs_state.c brw_vs_tnl.c \
- brw_vtbl.c brw_wm.c brw_wm_debug.c brw_wm_emit.c brw_wm_fp.c \
-
CVS commit: src/external/mit/xorg/bin/xrandr
Module Name:src
Committed By: mrg
Date: Thu Jun 11 01:47:52 UTC 2009
Modified Files:
src/external/mit/xorg/bin/xrandr: Makefile
Log Message:
this needs -lm now.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xrandr/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xrandr/Makefile
diff -u src/external/mit/xorg/bin/xrandr/Makefile:1.1.1.1 src/external/mit/xorg/bin/xrandr/Makefile:1.2
--- src/external/mit/xorg/bin/xrandr/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xrandr/Makefile Thu Jun 11 01:47:51 2009
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/11 01:47:51 mrg Exp $
.include bsd.own.mk
PROG= xrandr
-LDADD+= -lXrandr -lXrender -lXext -lX11
-DPADD+= ${LIBXRANDR} ${LIBXRENDER} ${LIBXEXT} ${LIBX11}
+LDADD+= -lXrandr -lXrender -lXext -lX11 -lm
+DPADD+= ${LIBXRANDR} ${LIBXRENDER} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}}
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Thu Jun 11 01:49:23 UTC 2009 Added Files: src/external/mit/xorg/lib/xkeyboard-config: Makefile Makefile.xkbdata src/external/mit/xorg/lib/xkeyboard-config/compat: Makefile src/external/mit/xorg/lib/xkeyboard-config/geometry: Makefile src/external/mit/xorg/lib/xkeyboard-config/geometry/digital_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/geometry/sgi_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/keycodes: Makefile src/external/mit/xorg/lib/xkeyboard-config/keycodes/digital_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/keycodes/sgi_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/keymap: Makefile src/external/mit/xorg/lib/xkeyboard-config/keymap/digital_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/keymap/sgi_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/keymap/sun_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/rules: Makefile src/external/mit/xorg/lib/xkeyboard-config/semantics: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/digital_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/fujitsu_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/hp_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/nec_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/sgi_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/sony_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/xfree68_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/torture: Makefile src/external/mit/xorg/lib/xkeyboard-config/types: Makefile Log Message: reachover build for xkeyboard-config To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xkeyboard-config/Makefile \ src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/geometry/digital_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/geometry/sgi_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/keycodes/digital_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/keycodes/sgi_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/keymap/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/keymap/digital_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/keymap/sgi_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/keymap/sun_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/semantics/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/digital_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/fujitsu_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/hp_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/nec_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/sgi_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/sony_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/xfree68_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/torture/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/types/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile diff -u /dev/null
CVS commit: src/external/mit/xorg/lib/libpciaccess
Module Name:src
Committed By: mrg
Date: Thu Jun 11 01:52:04 UTC 2009
Added Files:
src/external/mit/xorg/lib/libpciaccess: Makefile shlib_version
Log Message:
reachover build for libpciaccess.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libpciaccess/Makefile \
src/external/mit/xorg/lib/libpciaccess/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/lib/libpciaccess/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libpciaccess/Makefile:1.1
--- /dev/null Thu Jun 11 01:52:04 2009
+++ src/external/mit/xorg/lib/libpciaccess/Makefile Thu Jun 11 01:52:03 2009
@@ -0,0 +1,44 @@
+# $NetBSD: Makefile,v 1.1 2009/06/11 01:52:03 mrg Exp $
+
+.include bsd.own.mk
+
+LIB= pciaccess
+.PATH: ${X11SRCDIR.${LIB}}/src
+.PATH: ${X11SRCDIR.${LIB}}/include
+
+SRCS= common_bridge.c \
+ common_iterator.c \
+ common_init.c \
+ common_interface.c \
+ common_capability.c \
+ common_device_name.c \
+ common_map.c \
+ netbsd_pci.c
+
+CPPFLAGS+= ${X11FLAGS} -I${X11SRCDIR.${LIB}}/include \
+ -DHAVE_MMTR -DHAVE_ZLIB \
+ -DHAVE_STRING_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H \
+ -DPCIIDS_PATH=\${X11ROOTDIR}/share/pciids\
+
+COPTS.common_init.c= -Wno-error
+
+INCS= pciaccess.h
+INCSDIR=${X11INCDIR}
+
+PKGDIST= ${LIB}
+
+LDADD+= -lpci
+DPADD+= ${LIBPCI}
+
+.if ${MACHINE_ARCH} == i386
+LDADD+= -li386
+DPADD+= ${LIBI386}
+.endif
+
+.if ${MACHINE_ARCH} == x86_64
+LDADD+= -lx86_64
+DPADD+= ${LIBX86_64}
+.endif
+
+.include bsd.x11.mk
+.include bsd.lib.mk
Index: src/external/mit/xorg/lib/libpciaccess/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libpciaccess/shlib_version:1.1
--- /dev/null Thu Jun 11 01:52:04 2009
+++ src/external/mit/xorg/lib/libpciaccess/shlib_version Thu Jun 11 01:52:03 2009
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2009/06/11 01:52:03 mrg Exp $
+#
+major=0
+minor=0
CVS commit: src/crypto/external/bsd/netpgp/dist/tests
Module Name:src Committed By: lukem Date: Thu Jun 11 02:28:51 UTC 2009 Modified Files: src/crypto/external/bsd/netpgp/dist/tests: atlocal.in cat.at crypt.at detached.at testsuite.at verify.at Log Message: Use AT_TESTED Modify the PATH to the build dir instead of hardcoding NETPGP* vars. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/tests/atlocal.in cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/tests/cat.at cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/tests/crypt.at \ src/crypto/external/bsd/netpgp/dist/tests/detached.at cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/netpgp/dist/tests/testsuite.at cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/dist/tests/verify.at Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/tests/atlocal.in diff -u src/crypto/external/bsd/netpgp/dist/tests/atlocal.in:1.4 src/crypto/external/bsd/netpgp/dist/tests/atlocal.in:1.5 --- src/crypto/external/bsd/netpgp/dist/tests/atlocal.in:1.4 Tue Jun 9 00:51:04 2009 +++ src/crypto/external/bsd/netpgp/dist/tests/atlocal.in Thu Jun 11 02:28:50 2009 @@ -1,12 +1,10 @@ -# $NetBSD: atlocal.in,v 1.4 2009/06/09 00:51:04 agc Exp $ +# $NetBSD: atlocal.in,v 1.5 2009/06/11 02:28:50 lukem Exp $ topsrcd...@abs_top_srcdir@ export TOPSRCDIR -netp...@abs_top_builddir@/src/netpgp/netpgp -export NETPGP -netpgpveri...@abs_top_builddir@/src/netpgpverify/netpgpverify -export NETPGPVERIFY +pa...@abs_top_builddir@/src/netpgp:@abs_top_builddir@/src/netpgpverify:$PATH +export PATH testhomed...@abs_builddir@/homedir testpublick...@abs_srcdir@/key-public.asc Index: src/crypto/external/bsd/netpgp/dist/tests/cat.at diff -u src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.2 src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.3 --- src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.2 Thu May 28 00:28:38 2009 +++ src/crypto/external/bsd/netpgp/dist/tests/cat.at Thu Jun 11 02:28:50 2009 @@ -1,19 +1,19 @@ -# $NetBSD: cat.at,v 1.2 2009/05/28 00:28:38 lukem Exp $ +# $NetBSD: cat.at,v 1.3 2009/06/11 02:28:50 lukem Exp $ AT_SETUP([attached signature and verification]) AT_CHECK([cp $abs_top_builddir/libtool file3], [0], [ignore], [ignore]) # Make signature -AT_CHECK([$NETPGP --homedir $testhomedir --sign file3], +AT_CHECK([netpgp --homedir $testhomedir --sign file3], [0], [ignore], [ignore]) # Verify sig file -AT_CHECK([$NETPGP --homedir $testhomedir --cat --output=file3.copy file3.gpg], +AT_CHECK([netpgp --homedir $testhomedir --cat --output=file3.copy file3.gpg], [0], [ignore], [ignore], [ignore], [diff file3.copy file3]) # Verify sig to stdout -AT_CHECK([$NETPGP --homedir $testhomedir --cat file3.gpg], +AT_CHECK([netpgp --homedir $testhomedir --cat file3.gpg], [0], [ignore], [ignore], [ignore], [diff stdout file3]) # XXXTODO: deliberately corrupt file3.gpg and attempt to verify Index: src/crypto/external/bsd/netpgp/dist/tests/crypt.at diff -u src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.3 src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.4 --- src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.3 Thu May 28 00:29:06 2009 +++ src/crypto/external/bsd/netpgp/dist/tests/crypt.at Thu Jun 11 02:28:50 2009 @@ -1,4 +1,4 @@ -# $NetBSD: crypt.at,v 1.3 2009/05/28 00:29:06 lukem Exp $ +# $NetBSD: crypt.at,v 1.4 2009/06/11 02:28:50 lukem Exp $ AT_SETUP([encryption and decryption]) @@ -6,20 +6,20 @@ # Sign the file # XXX: this prompts for a passphrase when the userid doesn't have one -AT_CHECK([$NETPGP --homedir $testhomedir --encrypt file1], +AT_CHECK([netpgp --homedir $testhomedir --encrypt file1], [0], [ignore], [ignore]) # Decrypt the encrypted file -AT_CHECK([$NETPGP --homedir $testhomedir --decrypt file1.gpg], +AT_CHECK([netpgp --homedir $testhomedir --decrypt file1.gpg], [0], [ignore], [ignore]) # Decrypt and send to a different file -AT_CHECK([$NETPGP --homedir $testhomedir --decrypt --output=file1.copy file1.gpg], +AT_CHECK([netpgp --homedir $testhomedir --decrypt --output=file1.copy file1.gpg], [0], [ignore], [ignore], [ignore], [diff file1.copy file1]) # deliberately corrupt file1.gpg and attempt to decrypt #sed -e 's|1|2|' file1.gpg file2.gpg -#AT_CHECK([$NETPGP --homedir $testhomedir --decrypt file2.gpg], +#AT_CHECK([netpgp --homedir $testhomedir --decrypt file2.gpg], #[0], [ignore], #[netpgp: default key set to C7AB5F325F918728 #/usr/src/crypto/external/bsd/netpgp-hack/lib/../dist/src/lib/reader.c:1614: Unknown, Bad hash in MDC packet Index: src/crypto/external/bsd/netpgp/dist/tests/detached.at diff -u src/crypto/external/bsd/netpgp/dist/tests/detached.at:1.3 src/crypto/external/bsd/netpgp/dist/tests/detached.at:1.4 --- src/crypto/external/bsd/netpgp/dist/tests/detached.at:1.3 Thu May 28 00:29:06 2009 +++
CVS commit: src/crypto/external/bsd/netpgp/dist/tests
Module Name:src
Committed By: lukem
Date: Thu Jun 11 02:36:38 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/tests: cat.at crypt.at detached.at
verify.at
Log Message:
(ab)use --pass-fd to avoid the passphrase prompt
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/tests/cat.at
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/tests/crypt.at \
src/crypto/external/bsd/netpgp/dist/tests/detached.at
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/netpgp/dist/tests/verify.at
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/tests/cat.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.3 src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.4
--- src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.3 Thu Jun 11 02:28:50 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/cat.at Thu Jun 11 02:36:38 2009
@@ -1,11 +1,11 @@
-# $NetBSD: cat.at,v 1.3 2009/06/11 02:28:50 lukem Exp $
+# $NetBSD: cat.at,v 1.4 2009/06/11 02:36:38 lukem Exp $
AT_SETUP([attached signature and verification])
AT_CHECK([cp $abs_top_builddir/libtool file3], [0], [ignore], [ignore])
# Make signature
-AT_CHECK([netpgp --homedir $testhomedir --sign file3],
+AT_CHECK([echo '' | netpgp --pass-fd 0 --homedir $testhomedir --sign file3],
[0], [ignore], [ignore])
# Verify sig file
Index: src/crypto/external/bsd/netpgp/dist/tests/crypt.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.4 src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.5
--- src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.4 Thu Jun 11 02:28:50 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/crypt.at Thu Jun 11 02:36:38 2009
@@ -1,11 +1,10 @@
-# $NetBSD: crypt.at,v 1.4 2009/06/11 02:28:50 lukem Exp $
+# $NetBSD: crypt.at,v 1.5 2009/06/11 02:36:38 lukem Exp $
AT_SETUP([encryption and decryption])
AT_CHECK([cp ${TOPSRCDIR}/configure file1], [0], [ignore], [ignore])
# Sign the file
-# XXX: this prompts for a passphrase when the userid doesn't have one
AT_CHECK([netpgp --homedir $testhomedir --encrypt file1],
[0], [ignore], [ignore])
Index: src/crypto/external/bsd/netpgp/dist/tests/detached.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/detached.at:1.4 src/crypto/external/bsd/netpgp/dist/tests/detached.at:1.5
--- src/crypto/external/bsd/netpgp/dist/tests/detached.at:1.4 Thu Jun 11 02:28:50 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/detached.at Thu Jun 11 02:36:38 2009
@@ -1,11 +1,11 @@
-# $NetBSD: detached.at,v 1.4 2009/06/11 02:28:50 lukem Exp $
+# $NetBSD: detached.at,v 1.5 2009/06/11 02:36:38 lukem Exp $
AT_SETUP([detached signature and verification])
AT_CHECK([cp ${TOPSRCDIR}/configure file2], [0], [ignore], [ignore])
# Detached signature
-AT_CHECK([netpgp --homedir $testhomedir --sign --detached file2],
+AT_CHECK([echo '' | netpgp --pass-fd 0 --homedir $testhomedir --sign --detached file2],
[0], [ignore], [ignore])
# Verify detached sig file
Index: src/crypto/external/bsd/netpgp/dist/tests/verify.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.7 src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.8
--- src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.7 Thu Jun 11 02:28:50 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/verify.at Thu Jun 11 02:36:38 2009
@@ -1,12 +1,11 @@
-# $NetBSD: verify.at,v 1.7 2009/06/11 02:28:50 lukem Exp $
+# $NetBSD: verify.at,v 1.8 2009/06/11 02:36:38 lukem Exp $
AT_SETUP([simple signature and verification])
AT_CHECK([cp ${TOPSRCDIR}/configure file1], [0], [ignore], [ignore])
# Sign the file
-# XXX: this prompts for a passphrase when the userid doesn't have one
-AT_CHECK([netpgp --homedir $testhomedir --sign file1],
+AT_CHECK([echo '' | netpgp --pass-fd 0 --homedir $testhomedir --sign file1],
[0], [ignore], [ignore])
# Verify the signed file
CVS commit: src/crypto/external/bsd/netpgp/dist/tests
Module Name:src Committed By: lukem Date: Thu Jun 11 02:48:20 UTC 2009 Modified Files: src/crypto/external/bsd/netpgp/dist/tests: cat.at crypt.at Log Message: Run the diff of expected output in a separate AT_CHECK instead of using the 'run-if-pass' section; this correctly detects failure. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/tests/cat.at cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/netpgp/dist/tests/crypt.at Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/tests/cat.at diff -u src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.4 src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.5 --- src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.4 Thu Jun 11 02:36:38 2009 +++ src/crypto/external/bsd/netpgp/dist/tests/cat.at Thu Jun 11 02:48:20 2009 @@ -1,4 +1,4 @@ -# $NetBSD: cat.at,v 1.4 2009/06/11 02:36:38 lukem Exp $ +# $NetBSD: cat.at,v 1.5 2009/06/11 02:48:20 lukem Exp $ AT_SETUP([attached signature and verification]) @@ -10,11 +10,13 @@ # Verify sig file AT_CHECK([netpgp --homedir $testhomedir --cat --output=file3.copy file3.gpg], -[0], [ignore], [ignore], [ignore], [diff file3.copy file3]) +[0], [ignore], [ignore]) +AT_CHECK([diff file3 file3.copy]) # Verify sig to stdout AT_CHECK([netpgp --homedir $testhomedir --cat file3.gpg], -[0], [ignore], [ignore], [ignore], [diff stdout file3]) +[0], [stdout], [ignore]) +AT_CHECK([diff file3 stdout]) # XXXTODO: deliberately corrupt file3.gpg and attempt to verify Index: src/crypto/external/bsd/netpgp/dist/tests/crypt.at diff -u src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.5 src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.6 --- src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.5 Thu Jun 11 02:36:38 2009 +++ src/crypto/external/bsd/netpgp/dist/tests/crypt.at Thu Jun 11 02:48:20 2009 @@ -1,4 +1,4 @@ -# $NetBSD: crypt.at,v 1.5 2009/06/11 02:36:38 lukem Exp $ +# $NetBSD: crypt.at,v 1.6 2009/06/11 02:48:20 lukem Exp $ AT_SETUP([encryption and decryption]) @@ -14,7 +14,8 @@ # Decrypt and send to a different file AT_CHECK([netpgp --homedir $testhomedir --decrypt --output=file1.copy file1.gpg], -[0], [ignore], [ignore], [ignore], [diff file1.copy file1]) +[0], [ignore], [ignore]) +AT_CHECK([diff file1 file1.copy]) # deliberately corrupt file1.gpg and attempt to decrypt #sed -e 's|1|2|' file1.gpg file2.gpg
CVS commit: xsrc/external/mit/pixman/dist/pixman
Module Name:xsrc Committed By: mrg Date: Thu Jun 11 04:24:00 UTC 2009 Removed Files: xsrc/external/mit/pixman/dist/pixman: pixman-compose-accessors.c pixman-compose.c pixman-mmx.h pixman-source.c pixman-sse2.h pixman-transformed-accessors.c pixman-transformed.c pixman-vmx.h Log Message: merge pixman 0.15.10 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/pixman/dist/pixman/pixman-compose-accessors.c \ xsrc/external/mit/pixman/dist/pixman/pixman-mmx.h \ xsrc/external/mit/pixman/dist/pixman/pixman-sse2.h \ xsrc/external/mit/pixman/dist/pixman/pixman-transformed-accessors.c \ xsrc/external/mit/pixman/dist/pixman/pixman-vmx.h cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/pixman/dist/pixman/pixman-compose.c \ xsrc/external/mit/pixman/dist/pixman/pixman-source.c \ xsrc/external/mit/pixman/dist/pixman/pixman-transformed.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Thu Jun 11 04:56:54 UTC 2009 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xorg-config.h xorg-server.h Removed Files: xsrc/external/mit/xorg-server/include: xgl-config.h Log Message: update these with xorg-server 1.6.1.901 versions. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.1 -r0 xsrc/external/mit/xorg-server/include/xgl-config.h cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/include/xorg-config.h cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/include/xorg-server.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/include/dix-config.h diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.6 xsrc/external/mit/xorg-server/include/dix-config.h:1.7 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.6 Wed Jun 10 08:31:56 2009 +++ xsrc/external/mit/xorg-server/include/dix-config.h Thu Jun 11 04:56:54 2009 @@ -8,10 +8,10 @@ #define BIGREQS 1 /* Builder address */ -/* #define BUILDERADDR x...@lists.freedesktop.org */ +#define BUILDERADDR x...@lists.freedesktop.org /* Operating System Name */ -/* #define OSNAME NetBSD 4.99.67 amd64 */ +/* #define OSNAME NetBSD 5.0 amd64 */ /* Operating System Vendor */ /* #define OSVENDOR */ @@ -24,32 +24,18 @@ #define COMPILEDDEFAULTFONTPATH /usr/local/lib/X11/fonts/misc/,/usr/local/lib/X11/fonts/TTF/,/usr/local/lib/X11/fonts/OTF,/usr/local/lib/X11/fonts/Type1/,/usr/local/lib/X11/fonts/100dpi/,/usr/local/lib/X11/fonts/75dpi/ #endif +/* Miscellaneous server configuration files path */ +#define SERVER_MISC_CONFIG_PATH /usr/local/lib/xorg + /* Support Composite Extension */ #define COMPOSITE 1 -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - /* Support Damage extension */ #define DAMAGE 1 /* Build for darwin with Quartz support */ /* #undef DARWIN_WITH_QUARTZ */ -/* Use OsVendorInit */ -#define DDXOSINIT 1 - -/* Use GetTimeInMillis */ -/* #undef DDXTIME */ - -/* Use OsVendorFatalError */ -/* #undef DDXOSFATALERROR */ - /* Use OsVendorVErrorF */ /* #undef DDXOSVERRORF */ @@ -60,7 +46,7 @@ #define DPMSExtension 1 /* Build GLX extension */ -/* #undef GLXEXT */ +#define GLXEXT 1 /* Build GLX DRI loader */ /* #undef GLX_DRI */ @@ -68,9 +54,6 @@ /* Path to DRI drivers */ #define DRI_DRIVER_PATH /usr/local/lib/dri -/* Include handhelds.org h3600 touchscreen driver */ -/* #undef H3600_TS */ - /* Support XDM-AUTH*-1 */ #define HASXDMAUTH 1 @@ -92,16 +75,15 @@ /* Support SHM */ #define HAS_SHM 1 -/* Define to 1 if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define to 1 if you have alloca.h and it should be used (not on Ultrix). - */ -/* #undef HAVE_ALLOCA_H */ +/* Have the 'strlcpy' function */ +#define HAS_STRLCPY 1 /* Define to 1 if you have the asm/mtrr.h header file. */ /* #undef HAVE_ASM_MTRR_H */ +/* Has backtrace support */ +/* #undef HAVE_BACKTRACE */ + /* Define to 1 if you have the byteswap.h header file. */ /* #undef HAVE_BYTESWAP_H */ @@ -121,6 +103,9 @@ /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ /* #undef HAVE_DOPRNT */ +/* Have execinfo.h */ +/* #undef HAVE_EXECINFO_H */ + /* Define to 1 if you have the fcntl.h header file. */ #define HAVE_FCNTL_H 1 @@ -130,20 +115,20 @@ /* Define to 1 if you have the `getisax' function. */ /* #undef HAVE_GETISAX */ -/* Define to 1 if you have the `getopt' function. */ -#define HAVE_GETOPT 1 - -/* Define to 1 if you have the `getopt_long' function. */ -#define HAVE_GETOPT_LONG 1 - /* Define to 1 if you have the `getuid' function. */ #define HAVE_GETUID 1 +/* Define to 1 if you have the `getzoneid' function. */ +/* #undef HAVE_GETZONEID */ + /* Define to 1 if you have the inttypes.h header file. */ #define HAVE_INTTYPES_H 1 -/* Define to 1 if you have version 2.2 (or newer) of the drm library */ -#define HAVE_LIBDRM_2_2 1 +/* Have Quartz */ +/* #undef XQUARTZ */ + +/* Build a standalone xpbproxy */ +/* #undef STANDALONE_XPBPROXY */ /* Define to 1 if you have the `m' library (-lm). */ #define HAVE_LIBM 1 @@ -160,18 +145,6 @@ /* Define to 1 if you have the linux/fb.h header file. */ /* #undef HAVE_LINUX_FB_H */ -/* Define to 1 if you have the linux/h3600_ts.h header file. */ -/* #undef HAVE_LINUX_H3600_TS_H */ - -/* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 - -/* Define to 1 if you have the memory.h header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `memset' function. */ -#define HAVE_MEMSET 1 - /*
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Thu Jun 11 05:09:53 UTC 2009 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h Log Message: avoid HAL and dbus To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/include/dix-config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/include/dix-config.h diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.7 xsrc/external/mit/xorg-server/include/dix-config.h:1.8 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.7 Thu Jun 11 04:56:54 2009 +++ xsrc/external/mit/xorg-server/include/dix-config.h Thu Jun 11 05:09:53 2009 @@ -392,16 +392,16 @@ #define BSD44SOCKETS 1 /* Support D-Bus */ -#define HAVE_DBUS 1 +/* #define HAVE_DBUS 1 */ /* Use D-Bus for input hotplug */ -#define CONFIG_NEED_DBUS 1 +/* #define CONFIG_NEED_DBUS 1 */ /* Support the D-Bus hotplug API */ /* #undef CONFIG_DBUS_API */ /* Support HAL for hotplug */ -#define CONFIG_HAL 1 +/* #define CONFIG_HAL 1 */ /* Use only built-in fonts */ /* #undef BUILTIN_FONTS */
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: mrg Date: Thu Jun 11 05:11:14 UTC 2009 Modified Files: src/external/mit/xorg/lib/pixman: Makefile shlib_version Log Message: update reach over build for pixman 0.15.10. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/pixman/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/pixman/shlib_version 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/pixman/Makefile diff -u src/external/mit/xorg/lib/pixman/Makefile:1.7 src/external/mit/xorg/lib/pixman/Makefile:1.8 --- src/external/mit/xorg/lib/pixman/Makefile:1.7 Thu Nov 6 22:28:26 2008 +++ src/external/mit/xorg/lib/pixman/Makefile Thu Jun 11 05:11:14 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2008/11/06 22:28:26 veego Exp $ +# $NetBSD: Makefile,v 1.8 2009/06/11 05:11:14 mrg Exp $ NOLINT= 1 # defined @@ -11,11 +11,15 @@ SRCS= pixman-access.c pixman-region16.c pixman-access-accessors.c \ pixman-region32.c pixman-image.c pixman-combine32.c \ - pixman-combine64.c pixman-compose.c pixman-compose-accessors.c \ - pixman-pict.c pixman-source.c pixman-transformed.c pixman-utils.c \ - pixman-transformed-accessors.c pixman-edge.c \ + pixman-combine64.c \ + pixman-pict.c pixman-utils.c \ + pixman-edge.c \ pixman-edge-accessors.c pixman-trap.c pixman-compute-region.c \ - pixman-timer.c + pixman-general.c pixman-fast-path.c pixman-solid-fill.c \ + pixman-conical-gradient.c pixman-linear-gradient.c \ + pixman-radial-gradient.c pixman-bits-image.c \ + pixman-timer.c pixman-matrix.c pixman-cpu.c \ + pixman-gradient-walker.c pixman-implementation.c # XXX Index: src/external/mit/xorg/lib/pixman/shlib_version diff -u src/external/mit/xorg/lib/pixman/shlib_version:1.3 src/external/mit/xorg/lib/pixman/shlib_version:1.4 --- src/external/mit/xorg/lib/pixman/shlib_version:1.3 Sun Jan 11 03:10:13 2009 +++ src/external/mit/xorg/lib/pixman/shlib_version Thu Jun 11 05:11:14 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.3 2009/01/11 03:10:13 christos Exp $ +# $NetBSD: shlib_version,v 1.4 2009/06/11 05:11:14 mrg Exp $ # -major=1 +major=2 minor=0
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: mrg
Date: Thu Jun 11 05:15:06 UTC 2009
Modified Files:
src/external/mit/xorg/lib: Makefile
Log Message:
build libpciaccess on x86.
exchange xkeyboard-config for xkbdata.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.14 src/external/mit/xorg/lib/Makefile:1.15
--- src/external/mit/xorg/lib/Makefile:1.14 Tue Jun 9 05:02:13 2009
+++ src/external/mit/xorg/lib/Makefile Thu Jun 11 05:15:06 2009
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2009/06/09 05:02:13 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2009/06/11 05:15:06 mrg Exp $
# build libraries for xorg
SUBDIR= expat libfontenc freetype libFS libICE libOSMesa \
libXau libXdmcp libdrm
.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
-SUBDIR+=libdrm_intel
+SUBDIR+=libdrm_intel libpciaccess
.endif
-SUBDIR+=pixman xkbdata \
+SUBDIR+=pixman xkeyboard-config \
.WAIT \
dri fontconfig libSM libX11 \
.WAIT \
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Thu Jun 11 05:34:22 UTC 2009
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
update XORG_VERSION_CURRENT.
update the pkgconfig sed script to handle newer pixman.
XXX: should make the pkgconfig sed script barf it it ends up leaving
XXX: behind something that looks like @.*@, i think.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.73 src/share/mk/bsd.x11.mk:1.74
--- src/share/mk/bsd.x11.mk:1.73 Wed Jun 10 08:28:20 2009
+++ src/share/mk/bsd.x11.mk Thu Jun 11 05:34:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.73 2009/06/10 08:28:20 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.74 2009/06/11 05:34:22 mrg Exp $
.include bsd.init.mk
@@ -130,7 +130,7 @@
-DXLOCALELIBDIR=\${X11LIBDIR}/locale\
# XXX oh yeah, fix me later
-XORG_VERSION_CURRENT=(((1) * 1000) + ((4) * 10) + ((2) * 1000) + 0)
+XORG_VERSION_CURRENT=(((1) * 1000) + ((6) * 10) + ((1) * 1000) + 901)
.endif
PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
@@ -279,6 +279,8 @@
s,@sdkdir@,\\$$\{includedir\}/xorg,; \
s,@PIXMAN_CFLAGS@,,; \
s,@LIB_DIR@,/lib,; \
+ s,@INSTALL_LIB_DIR@,\\$$\{prefix\}/lib,; \
+ s,@INSTALL_INC_DIR@,\\$$\{prefix\}/include,; \
s,@XKBPROTO_REQUIRES@,kbproto,; \
s,@FREETYPE_REQUIRES@,freetype2,; \
s,@EXPAT_LIBS@,-lexpat,; \
@@ -288,6 +290,9 @@
s,@X11_EXTRA_DEPS@,,; \
s,@XTHREAD_CFLAGS@,-D_REENTRANT,; \
s,@XTHREADLIB@,-lpthread,; \
+ s,@GL_PC_REQ_PRIV@,x11 xext,; \
+ s,@GL_PC_LIB_PRIV@,-lm -lpthread,; \
+ s,@GL_PC_CFLAGS@,,; \
s,@fchown_define@,-DHAS_FCHOWN,; \
s,@sticky_bit_define@,-DHAS_STICKY_DIR_BIT, \
-e '/^Libs:/ s%-L\([^ ]*\)%-Wl,-R\1 %g' \
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: mrg Date: Thu Jun 11 05:40:18 UTC 2009 Modified Files: src/distrib/sets/lists/base: mi Log Message: add the new subdirs used by xkeyboard-config. To generate a diff of this commit: cvs rdiff -u -r1.814 -r1.815 src/distrib/sets/lists/base/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/mi diff -u src/distrib/sets/lists/base/mi:1.814 src/distrib/sets/lists/base/mi:1.815 --- src/distrib/sets/lists/base/mi:1.814 Wed Jun 10 02:20:13 2009 +++ src/distrib/sets/lists/base/mi Thu Jun 11 05:40:18 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.814 2009/06/10 02:20:13 mrg Exp $ +# $NetBSD: mi,v 1.815 2009/06/11 05:40:18 mrg Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -596,30 +596,47 @@ ./usr/X11R7/lib/X11/xkb/compat base-x11-root ./usr/X11R7/lib/X11/xkb/compiled base-x11-root ./usr/X11R7/lib/X11/xkb/geometry base-x11-root -./usr/X11R7/lib/X11/xkb/geometry/digital base-x11-root -./usr/X11R7/lib/X11/xkb/geometry/ibm base-x11-root -./usr/X11R7/lib/X11/xkb/geometry/sgi base-x11-root +./usr/X11R7/lib/X11/xkb/geometry/digital -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/geometry/digital_vndr base-x11-root +./usr/X11R7/lib/X11/xkb/geometry/ibm -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/geometry/ibm_vndr base-x11-root +./usr/X11R7/lib/X11/xkb/geometry/sgi -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr base-x11-root ./usr/X11R7/lib/X11/xkb/keycodes base-x11-root -./usr/X11R7/lib/X11/xkb/keycodes/digital base-x11-root -./usr/X11R7/lib/X11/xkb/keycodes/sgi base-x11-root +./usr/X11R7/lib/X11/xkb/keycodes/digital -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr base-x11-root +./usr/X11R7/lib/X11/xkb/keycodes/sgi -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/keycodes/sgi_vndr base-x11-root ./usr/X11R7/lib/X11/xkb/keymap base-x11-root -./usr/X11R7/lib/X11/xkb/keymap/digital base-x11-root -./usr/X11R7/lib/X11/xkb/keymap/sgi base-x11-root -./usr/X11R7/lib/X11/xkb/keymap/sun base-x11-root +./usr/X11R7/lib/X11/xkb/keymap/digital -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/keymap/digital_vndr base-x11-root +./usr/X11R7/lib/X11/xkb/keymap/sgi -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr base-x11-root +./usr/X11R7/lib/X11/xkb/keymap/sun -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/keymap/sun_vndr base-x11-root ./usr/X11R7/lib/X11/xkb/rules base-x11-root ./usr/X11R7/lib/X11/xkb/semantics base-x11-root ./usr/X11R7/lib/X11/xkb/symbols base-x11-root -./usr/X11R7/lib/X11/xkb/symbols/digital base-x11-root -./usr/X11R7/lib/X11/xkb/symbols/fujitsu base-x11-root -./usr/X11R7/lib/X11/xkb/symbols/hp base-x11-root -./usr/X11R7/lib/X11/xkb/symbols/macintosh base-x11-root -./usr/X11R7/lib/X11/xkb/symbols/nec base-x11-root -./usr/X11R7/lib/X11/xkb/symbols/pc base-x11-root -./usr/X11R7/lib/X11/xkb/symbols/sgi base-x11-root -./usr/X11R7/lib/X11/xkb/symbols/sharp base-x11-root -./usr/X11R7/lib/X11/xkb/symbols/sony base-x11-root -./usr/X11R7/lib/X11/xkb/symbols/sun base-x11-root -./usr/X11R7/lib/X11/xkb/symbols/xfree68 base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/digital -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/symbols/digital_vndr base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/fujitsu -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/symbols/fujitsu_vndr base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/hp -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/symbols/hp_vndr base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/macintosh -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/nec -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/symbols/nec_vndr base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/pc -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/symbols/sgi -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/symbols/sgi_vndr base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/sharp -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/symbols/sony -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/symbols/sony_vndr base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/sun -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/xfree68 -obsolete- obsolete +./usr/X11R7/lib/X11/xkb/symbols/xfree68_vndr base-x11-root ./usr/X11R7/lib/X11/xkb/torture base-x11-root ./usr/X11R7/lib/X11/xkb/types base-x11-root ./usr/X11R7/lib/modulesbase-x11-root
CVS commit: src/etc/mtree
Module Name:src Committed By: mrg Date: Thu Jun 11 05:40:56 UTC 2009 Modified Files: src/etc/mtree: NetBSD.dist Log Message: add the new subdirs used by xkeyboard-config. To generate a diff of this commit: cvs rdiff -u -r1.404 -r1.405 src/etc/mtree/NetBSD.dist Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist diff -u src/etc/mtree/NetBSD.dist:1.404 src/etc/mtree/NetBSD.dist:1.405 --- src/etc/mtree/NetBSD.dist:1.404 Wed Jun 10 02:20:13 2009 +++ src/etc/mtree/NetBSD.dist Thu Jun 11 05:40:56 2009 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist,v 1.404 2009/06/10 02:20:13 mrg Exp $ +# $NetBSD: NetBSD.dist,v 1.405 2009/06/11 05:40:56 mrg Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -362,30 +362,27 @@ ./usr/X11R7/lib/X11/xkb/compat ./usr/X11R7/lib/X11/xkb/compiled ./usr/X11R7/lib/X11/xkb/geometry -./usr/X11R7/lib/X11/xkb/geometry/digital -./usr/X11R7/lib/X11/xkb/geometry/ibm -./usr/X11R7/lib/X11/xkb/geometry/sgi +./usr/X11R7/lib/X11/xkb/geometry/digital_vndr +./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr ./usr/X11R7/lib/X11/xkb/keycodes -./usr/X11R7/lib/X11/xkb/keycodes/digital -./usr/X11R7/lib/X11/xkb/keycodes/sgi +./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr +./usr/X11R7/lib/X11/xkb/keycodes/sgi_vndr ./usr/X11R7/lib/X11/xkb/keymap -./usr/X11R7/lib/X11/xkb/keymap/digital -./usr/X11R7/lib/X11/xkb/keymap/sgi -./usr/X11R7/lib/X11/xkb/keymap/sun +./usr/X11R7/lib/X11/xkb/keymap/digital_vndr +./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr +./usr/X11R7/lib/X11/xkb/keymap/sun_vndr ./usr/X11R7/lib/X11/xkb/rules ./usr/X11R7/lib/X11/xkb/semantics ./usr/X11R7/lib/X11/xkb/symbols -./usr/X11R7/lib/X11/xkb/symbols/digital -./usr/X11R7/lib/X11/xkb/symbols/fujitsu -./usr/X11R7/lib/X11/xkb/symbols/hp -./usr/X11R7/lib/X11/xkb/symbols/macintosh -./usr/X11R7/lib/X11/xkb/symbols/nec -./usr/X11R7/lib/X11/xkb/symbols/pc -./usr/X11R7/lib/X11/xkb/symbols/sgi -./usr/X11R7/lib/X11/xkb/symbols/sharp -./usr/X11R7/lib/X11/xkb/symbols/sony -./usr/X11R7/lib/X11/xkb/symbols/sun -./usr/X11R7/lib/X11/xkb/symbols/xfree68 +./usr/X11R7/lib/X11/xkb/symbols/digital_vndr +./usr/X11R7/lib/X11/xkb/symbols/fujitsu_vndr +./usr/X11R7/lib/X11/xkb/symbols/hp_vndr +./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr +./usr/X11R7/lib/X11/xkb/symbols/nec_vndr +./usr/X11R7/lib/X11/xkb/symbols/sgi_vndr +./usr/X11R7/lib/X11/xkb/symbols/sony_vndr +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr +./usr/X11R7/lib/X11/xkb/symbols/xfree68_vndr ./usr/X11R7/lib/X11/xkb/torture ./usr/X11R7/lib/X11/xkb/types ./usr/X11R7/lib/modules
CVS commit: src/external/mit/xorg
Module Name:src Committed By: mrg Date: Thu Jun 11 05:43:19 UTC 2009 Modified Files: src/external/mit/xorg: TODO src/external/mit/xorg/server/xorg-server: Makefile Makefile.Xserver src/external/mit/xorg/server/xorg-server/GL/GLcore: Makefile.GLcore src/external/mit/xorg/server/xorg-server/Xext: Makefile.Xextbuiltin Makefile.Xextmodule src/external/mit/xorg/server/xorg-server/Xi: Makefile src/external/mit/xorg/server/xorg-server/composite: Makefile src/external/mit/xorg/server/xorg-server/dbe: Makefile.dbe src/external/mit/xorg/server/xorg-server/dix: Makefile src/external/mit/xorg/server/xorg-server/doc: Makefile src/external/mit/xorg/server/xorg-server/exa: Makefile.exa src/external/mit/xorg/server/xorg-server/fb: Makefile.fb src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile Makefile.dixmod src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/doc: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dri: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dummy: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/int10: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/utils: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile src/external/mit/xorg/server/xorg-server/include: Makefile src/external/mit/xorg/server/xorg-server/os: Makefile src/external/mit/xorg/server/xorg-server/randr: Makefile src/external/mit/xorg/server/xorg-server/render: Makefile src/external/mit/xorg/server/xorg-server/xkb: Makefile Added Files: src/external/mit/xorg/server/xorg-server/glx: Makefile Makefile.glx Log Message: upgrade the build framework for xorg-server 1.6. this doesn't quite work yet. Xvfb and Xnest attempt to link but have missing symbols. Xorg doesn't build all its components yet. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/TODO cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/server/xorg-server/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/xorg-server/Makefile.Xserver cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/server/xorg-server/Xi/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server/composite/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/xorg-server/dix/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server/doc/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server/exa/Makefile.exa cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/server/xorg-server/glx/Makefile \ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile cvs rdiff -u -r1.25 -r1.26 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile cvs rdiff -u -r1.2 -r1.3 \
