CVS commit: xsrc/external/mit/xorg-server/dist/glx
Module Name:xsrc
Committed By: mrg
Date: Tue Aug 2 07:13:20 UTC 2011
Modified Files:
xsrc/external/mit/xorg-server/dist/glx: glxcmds.c glxdrawable.h
glxext.c
Log Message:
revert the change below, to help merge 1.10.3. there's a new version of
this coming up shortly:
http://mail-index.netbsd.org/source-changes/2011/03/18/msg020067.html
Log Message:
Pull up fix from https://bugs.freedesktop.org/show_bug.cgi?id=28181 to
prevent random segfaults of the X server when using composite with the
ati driver.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h \
xsrc/external/mit/xorg-server/dist/glx/glxext.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
diff -u xsrc/external/mit/xorg-server/dist/glx/glxcmds.c:1.3 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c:1.4
--- xsrc/external/mit/xorg-server/dist/glx/glxcmds.c:1.3 Sun Jul 24 01:33:36 2011
+++ xsrc/external/mit/xorg-server/dist/glx/glxcmds.c Tue Aug 2 07:13:20 2011
@@ -530,7 +530,6 @@
*error = BadAlloc;
return NULL;
}
-pGlxDraw-refcnt++;
return pGlxDraw;
}
@@ -1101,10 +1100,8 @@
drawable-pDraw = pDraw;
drawable-type = type;
drawable-drawId = drawId;
-drawable-otherId = 0;
drawable-config = config;
drawable-eventMask = 0;
-drawable-refcnt = 0;
return GL_TRUE;
}
@@ -1134,18 +1131,14 @@
pGlxDraw-destroy (pGlxDraw);
return BadAlloc;
}
-pGlxDraw-refcnt++;
-if (drawableId != glxDrawableId) {
- /* Add the glx drawable under the XID of the underlying X drawable
- * too. That way we'll get a callback in DrawableGone and can
- * clean up properly when the drawable is destroyed. */
- if (!AddResource(drawableId, __glXDrawableRes, pGlxDraw)) {
- pGlxDraw-destroy (pGlxDraw);
- return BadAlloc;
- }
- pGlxDraw-refcnt++;
- pGlxDraw-otherId = drawableId;
+/* Add the glx drawable under the XID of the underlying X drawable
+ * too. That way we'll get a callback in DrawableGone and can
+ * clean up properly when the drawable is destroyed. */
+if (drawableId != glxDrawableId
+ !AddResource(pDraw-id, __glXDrawableRes, pGlxDraw)) {
+ pGlxDraw-destroy (pGlxDraw);
+ return BadAlloc;
}
return Success;
Index: xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h
diff -u xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h:1.2 xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h:1.3
--- xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h:1.2 Fri Mar 18 09:51:00 2011
+++ xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h Tue Aug 2 07:13:20 2011
@@ -51,11 +51,8 @@
void (*waitX)(__GLXdrawable *);
void (*waitGL)(__GLXdrawable *);
-int refcnt; /* number of resources handles referencing this */
-
DrawablePtr pDraw;
XID drawId;
-XID otherId; /* for glx1.3 we need to track the original Drawable as well */
/*
** Either GLX_DRAWABLE_PIXMAP, GLX_DRAWABLE_WINDOW or
Index: xsrc/external/mit/xorg-server/dist/glx/glxext.c
diff -u xsrc/external/mit/xorg-server/dist/glx/glxext.c:1.2 xsrc/external/mit/xorg-server/dist/glx/glxext.c:1.3
--- xsrc/external/mit/xorg-server/dist/glx/glxext.c:1.2 Fri Mar 18 09:51:00 2011
+++ xsrc/external/mit/xorg-server/dist/glx/glxext.c Tue Aug 2 07:13:20 2011
@@ -130,18 +130,13 @@
* constructors, we added it as a glx drawable resource under both
* its glx drawable ID and it X drawable ID. Remove the other
* resource now so we don't a callback for freed memory. */
-if (glxPriv-otherId) {
- XID other = glxPriv-otherId;
- glxPriv-otherId = 0;
- if (xid == other)
- FreeResourceByType(glxPriv-drawId, __glXDrawableRes, TRUE);
- else
- FreeResourceByType(other, __glXDrawableRes, TRUE);
+if (glxPriv-drawId != glxPriv-pDraw-id) {
+ if (xid == glxPriv-drawId)
+ FreeResourceByType(glxPriv-pDraw-id, __glXDrawableRes, TRUE);
+ else
+ FreeResourceByType(glxPriv-drawId, __glXDrawableRes, TRUE);
}
-if (--glxPriv-refcnt)
- return True;
-
for (c = glxAllContexts; c; c = next) {
next = c-next;
if (c-isCurrent (c-drawPriv == glxPriv || c-readPriv == glxPriv)) {
CVS commit: xsrc/external/mit/xorg-server/dist/glx
Module Name:xsrc
Committed By: mrg
Date: Tue Aug 2 07:16:37 UTC 2011
Modified Files:
xsrc/external/mit/xorg-server/dist/glx: glxcmds.c glxdrawable.h
glxext.c
Log Message:
re-apply the fix for https://bugs.freedesktop.org/show_bug.cgi?id=28181,
from the comment #40 from this bug.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/glx/glxext.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
diff -u xsrc/external/mit/xorg-server/dist/glx/glxcmds.c:1.5 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c:1.6
--- xsrc/external/mit/xorg-server/dist/glx/glxcmds.c:1.5 Tue Aug 2 07:15:02 2011
+++ xsrc/external/mit/xorg-server/dist/glx/glxcmds.c Tue Aug 2 07:16:36 2011
@@ -1095,6 +1095,7 @@
drawable-pDraw = pDraw;
drawable-type = type;
drawable-drawId = drawId;
+drawable-otherId = 0;
drawable-config = config;
drawable-eventMask = 0;
@@ -1131,10 +1132,13 @@
* Windows aren't refcounted, so track both the X and the GLX window
* so we get called regardless of destruction order.
*/
-if (drawableId != glxDrawableId type == GLX_DRAWABLE_WINDOW
- !AddResource(pDraw-id, __glXDrawableRes, pGlxDraw)) {
- pGlxDraw-destroy (pGlxDraw);
- return BadAlloc;
+if (drawableId != glxDrawableId
+(type == GLX_DRAWABLE_WINDOW || type == GLX_DRAWABLE_PIXMAP)) {
+if (!AddResource(drawableId, __glXDrawableRes, pGlxDraw)) {
+ pGlxDraw-destroy (pGlxDraw);
+ return BadAlloc;
+ }
+ pGlxDraw-otherId = drawableId;
}
return Success;
Index: xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h
diff -u xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h:1.3 xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h:1.4
--- xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h:1.3 Tue Aug 2 07:13:20 2011
+++ xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h Tue Aug 2 07:16:36 2011
@@ -53,6 +53,7 @@
DrawablePtr pDraw;
XID drawId;
+XID otherId; /* for glx1.3 we need to track the original Drawable as well */
/*
** Either GLX_DRAWABLE_PIXMAP, GLX_DRAWABLE_WINDOW or
Index: xsrc/external/mit/xorg-server/dist/glx/glxext.c
diff -u xsrc/external/mit/xorg-server/dist/glx/glxext.c:1.4 xsrc/external/mit/xorg-server/dist/glx/glxext.c:1.5
--- xsrc/external/mit/xorg-server/dist/glx/glxext.c:1.4 Tue Aug 2 07:15:02 2011
+++ xsrc/external/mit/xorg-server/dist/glx/glxext.c Tue Aug 2 07:16:37 2011
@@ -124,13 +124,15 @@
{
__GLXcontext *c, *next;
-if (glxPriv-type == GLX_DRAWABLE_WINDOW) {
+if (glxPriv-type == GLX_DRAWABLE_WINDOW || glxPriv-type == GLX_DRAWABLE_PIXMAP) {
/* If this was created by glXCreateWindow, free the matching resource */
-if (glxPriv-drawId != glxPriv-pDraw-id) {
-if (xid == glxPriv-drawId)
-FreeResourceByType(glxPriv-pDraw-id, __glXDrawableRes, TRUE);
-else
+if (glxPriv-otherId) {
+XID other = glxPriv-otherId;
+glxPriv-otherId = 0;
+if (xid == other)
FreeResourceByType(glxPriv-drawId, __glXDrawableRes, TRUE);
+else
+FreeResourceByType(other, __glXDrawableRes, TRUE);
}
/* otherwise this window was implicitly created by MakeCurrent */
}
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src
Committed By: agc
Date: Tue Aug 2 07:16:56 UTC 2011
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c
Log Message:
plug some memory leaks in error paths
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.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/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.93 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.94
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.93 Tue Aug 2 05:36:45 2011
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Tue Aug 2 07:16:56 2011
@@ -34,7 +34,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: netpgp.c,v 1.93 2011/08/02 05:36:45 agc Exp $);
+__RCSID($NetBSD: netpgp.c,v 1.94 2011/08/02 07:16:56 agc Exp $);
#endif
#include sys/types.h
@@ -314,10 +314,13 @@
filename = f;
}
if ((secring = calloc(1, sizeof(*secring))) == NULL) {
+ free(pubring);
(void) fprintf(stderr, readsshkeys: bad alloc\n);
return 0;
}
if (!pgp_ssh2_readkeys(netpgp-io, pubring, secring, NULL, filename, hashtype)) {
+ free(pubring);
+ free(secring);
(void) fprintf(stderr, readsshkeys: can't read sec %s\n, filename);
return 0;
}
@@ -1911,9 +1914,12 @@
size_t cc;
char f[MAXPATHLEN];
+ keyring = NULL;
+ io = NULL;
+ cc = 0;
if ((io = calloc(1, sizeof(pgp_io_t))) == NULL) {
(void) fprintf(stderr, netpgp_save_sshpub: bad alloc 1\n);
- return 0;
+ goto done;
}
io-outs = stdout;
io-errs = stderr;
@@ -1923,23 +1929,23 @@
savepubkey(s, f, sizeof(f));
if ((keyring = calloc(1, sizeof(*keyring))) == NULL) {
(void) fprintf(stderr, netpgp_save_sshpub: bad alloc 2\n);
- return 0;
+ goto done;
}
if (!pgp_keyring_fileread(netpgp-pubring = keyring, 1, f)) {
(void) fprintf(stderr, can't import key\n);
- return 0;
+ goto done;
}
/* get rsa key */
k = 0;
key = pgp_getnextkeybyname(netpgp-io, netpgp-pubring, userid, k);
if (key == NULL) {
(void) fprintf(stderr, no key found for '%s'\n, userid);
- return 0;
+ goto done;
}
if (key-key.pubkey.alg != PGP_PKA_RSA) {
/* we're not interested in supporting DSA either :-) */
(void) fprintf(stderr, key not RSA '%s'\n, userid);
- return 0;
+ goto done;
}
/* XXX - check trust sigs */
/* XXX - check expiry */
@@ -1950,7 +1956,12 @@
cc = formatstring((char *)out, (const uint8_t *)ssh-rsa, 7);
cc += formatbignum((char *)out[cc], key-key.pubkey.key.rsa.e);
cc += formatbignum((char *)out[cc], key-key.pubkey.key.rsa.n);
- free(io);
- free(keyring);
+done:
+ if (io) {
+ free(io);
+ }
+ if (keyring) {
+ free(keyring);
+ }
return (int)cc;
}
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys
Module Name:src
Committed By: agc
Date: Tue Aug 2 07:18:13 UTC 2011
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.c
Log Message:
default the format for recovering key data to be human, rather than hard
coding it in the embedded calls.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 \
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/netpgpkeys/netpgpkeys.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.23 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.24
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.23 Fri Nov 5 03:30:52 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c Tue Aug 2 07:18:13 2011
@@ -95,6 +95,7 @@
RESULTS,
SSHKEYFILE,
CIPHER,
+ FORMAT,
/* debug */
OPS_DEBUG
@@ -107,7 +108,7 @@
/* key-management commands */
{list-keys, no_argument, NULL, LIST_KEYS},
{list-sigs, no_argument, NULL, LIST_SIGS},
- {find-key, no_argument, NULL, FIND_KEY},
+ {find-key, optional_argument, NULL, FIND_KEY},
{export, no_argument, NULL, EXPORT_KEY},
{export-key, no_argument, NULL, EXPORT_KEY},
{import, no_argument, NULL, IMPORT_KEY},
@@ -125,6 +126,7 @@
{coredumps, no_argument, NULL, COREDUMPS},
{keyring, required_argument, NULL, KEYRING},
{userid, required_argument, NULL, USERID},
+ {format, required_argument, NULL, FORMAT},
{hash-alg, required_argument, NULL, HASH_ALG},
{hash, required_argument, NULL, HASH_ALG},
{algorithm, required_argument, NULL, HASH_ALG},
@@ -174,7 +176,8 @@
return 0;
}
} else {
- if (netpgp_match_keys_json(netpgp, json, f, human, psigs) == 0) {
+ if (netpgp_match_keys_json(netpgp, json, f,
+netpgp_getvar(netpgp, format), psigs) == 0) {
return 0;
}
}
@@ -195,9 +198,14 @@
case LIST_SIGS:
return match_keys(netpgp, stdout, f, (p-cmd == LIST_SIGS));
case FIND_KEY:
- return netpgp_find_key(netpgp, netpgp_getvar(netpgp, userid));
+ if ((key = f) == NULL) {
+ key = netpgp_getvar(netpgp, userid);
+ }
+ return netpgp_find_key(netpgp, key);
case EXPORT_KEY:
- key = netpgp_export_key(netpgp, netpgp_getvar(netpgp, userid));
+ if ((key = f) == NULL) {
+ key = netpgp_getvar(netpgp, userid);
+ }
if (key) {
printf(%s, key);
return 1;
@@ -209,7 +217,7 @@
case GENERATE_KEY:
return netpgp_generate_key(netpgp, f, p-numbits);
case GET_KEY:
- key = netpgp_get_key(netpgp, f, human);
+ key = netpgp_get_key(netpgp, f, netpgp_getvar(netpgp, format));
if (key) {
printf(%s, key);
return 1;
@@ -318,6 +326,9 @@
netpgp_setvar(netpgp, ssh keys, 1);
netpgp_setvar(netpgp, sshkeyfile, arg);
break;
+ case FORMAT:
+ netpgp_setvar(netpgp, format, arg);
+ break;
case CIPHER:
netpgp_setvar(netpgp, cipher, arg);
break;
@@ -389,6 +400,7 @@
netpgp_setvar(netpgp, sshkeydir, /etc/ssh);
netpgp_setvar(netpgp, res, stdout);
netpgp_setvar(netpgp, hash, DEFAULT_HASH_ALG);
+ netpgp_setvar(netpgp, format, human);
optindex = 0;
while ((ch = getopt_long(argc, argv, S:Vglo:s, options, optindex)) != -1) {
if (ch = LIST_KEYS) {
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Tue Aug 2 07:22:05 UTC 2011 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h version-config.h xf86Build.h xorg-config.h xorg-server.h Log Message: updates for xorg-server 1.10.3. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xorg-server/include/version-config.h cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/include/xf86Build.h cvs rdiff -u -r1.11 -r1.12 \ xsrc/external/mit/xorg-server/include/xorg-config.h cvs rdiff -u -r1.8 -r1.9 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.16 xsrc/external/mit/xorg-server/include/dix-config.h:1.17 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.16 Sun Jul 24 01:41:27 2011 +++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Aug 2 07:22:05 2011 @@ -244,6 +244,9 @@ /* Define to 1 if you have the `vprintf' function. */ #define HAVE_VPRINTF 1 +/* Define to 1 if you have the `vasprintf' function. */ +#define HAVE_VASPRINTF 1 + /* Support IPv6 for TCP connections */ #define IPv6 1 @@ -441,6 +444,9 @@ /* Define to 1 if you have the `ffs' function. */ #define HAVE_FFS 1 +/* If the compiler supports a TLS storage class define it to that here */ +/* #undef TLS */ + /* Correctly set _XSERVER64 for OSX fat binaries */ #ifdef __APPLE__ #include dix-config-apple-verbatim.h Index: xsrc/external/mit/xorg-server/include/version-config.h diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.2 xsrc/external/mit/xorg-server/include/version-config.h:1.3 --- xsrc/external/mit/xorg-server/include/version-config.h:1.2 Sun Jul 24 01:41:27 2011 +++ xsrc/external/mit/xorg-server/include/version-config.h Tue Aug 2 07:22:05 2011 @@ -5,13 +5,13 @@ #define VERSION_CONFIG_H /* Vendor man version */ -#define VENDOR_MAN_VERSION Version 1.9.5 +#define VENDOR_MAN_VERSION Version 1.10.3 /* Vendor name */ /* #define VENDOR_NAME The X.Org Foundation */ /* Vendor release */ -#define VENDOR_RELEASE (((1) * 1000) + ((9) * 10) + ((5) * 1000) + 0) +#define VENDOR_RELEASE (((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0) #endif /* VERSION_CONFIG_H */ Index: xsrc/external/mit/xorg-server/include/xf86Build.h diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.5 xsrc/external/mit/xorg-server/include/xf86Build.h:1.6 --- xsrc/external/mit/xorg-server/include/xf86Build.h:1.5 Sun Jul 24 01:41:27 2011 +++ xsrc/external/mit/xorg-server/include/xf86Build.h Tue Aug 2 07:22:05 2011 @@ -1,2 +1,2 @@ -#define BUILD_DATE 20110723 -#define BUILD_TIME 1013305 +#define BUILD_DATE 20110801 +#define BUILD_TIME 1010100 Index: xsrc/external/mit/xorg-server/include/xorg-config.h diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.11 xsrc/external/mit/xorg-server/include/xorg-config.h:1.12 --- xsrc/external/mit/xorg-server/include/xorg-config.h:1.11 Sun Jul 24 01:41:27 2011 +++ xsrc/external/mit/xorg-server/include/xorg-config.h Tue Aug 2 07:22:05 2011 @@ -17,7 +17,7 @@ #define XORGSERVER 1 /* Current X.Org version. */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((9) * 10) + ((5) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0) /* Name of X server. */ #define __XSERVERNAME__ Xorg Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.8 xsrc/external/mit/xorg-server/include/xorg-server.h:1.9 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.8 Sun Jul 24 01:41:27 2011 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Tue Aug 2 07:22:05 2011 @@ -158,11 +158,6 @@ /* Name of X server */ #define __XSERVERNAME__ Xorg -#if defined(_LP64) -/* Define to 1 if unsigned long is 64 bits. */ -#define _XSERVER64 1 -#endif - /* Building vgahw module */ #define WITH_VGAHW 1 @@ -190,4 +185,8 @@ /* X Access Control Extension */ #define XACE 1 +#ifdef _LP64 +#define _XSERVER64 1 +#endif + #endif /* _XORG_SERVER_H_ */
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: mrg
Date: Tue Aug 2 07:41:02 UTC 2011
Modified Files:
src/external/mit/xorg/server/xorg-server/doc: Makefile
src/external/mit/xorg/server/xorg-server/glx: Makefile.glx
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/doc: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/exa: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf: 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/miext: Makefile
Added Files:
src/external/mit/xorg/server/xorg-server/miext/sync: Makefile
Makefile.sync
Log Message:
build updates and fixes for xorg-server 1.10.3.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/doc/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/exa/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/include/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/miext/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/miext/sync/Makefile \
src/external/mit/xorg/server/xorg-server/miext/sync/Makefile.sync
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/xorg-server/doc/Makefile
diff -u src/external/mit/xorg/server/xorg-server/doc/Makefile:1.3 src/external/mit/xorg/server/xorg-server/doc/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/doc/Makefile:1.3 Thu Jun 11 05:43:16 2009
+++ src/external/mit/xorg/server/xorg-server/doc/Makefile Tue Aug 2 07:41:00 2011
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2009/06/11 05:43:16 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/02 07:41:00 mrg Exp $
.include bsd.own.mk
.include ../dix/Makefile.common
.PATH: ${X11SRCDIR.xorg-server}/doc
+.PATH: ${X11SRCDIR.xorg-server}/doc/man
MAN= Xserver.1
X11EXTRAMANDEFS+= -e 's%__default_font_path__%${X11DEFAULTFONTPATH:ts,:S/,/, /g}%g'
Index: src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.8 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.9
--- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.8 Sat Jan 15 13:54:53 2011
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Tue Aug 2 07:41:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.glx,v 1.8 2011/01/15 13:54:53 jmcneill Exp $
+# $NetBSD: Makefile.glx,v 1.9 2011/08/02 07:41:01 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -11,6 +11,7 @@
indirect_size_get.c \
indirect_table.c \
glapi.c \
+glapi_gentable.c \
glthread.c \
glxdri.c \
extension_string.c \
Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.9 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.9 Sat May 22 05:45:01 2010
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Tue Aug 2 07:41:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/05/22 05:45:01 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2011/08/02 07:41:01 mrg Exp $
.include bsd.own.mk
@@ -7,6 +7,7 @@
PROG= Xvfb
.PATH: ${X11SRCDIR.xorg-server}/hw/vfb
+.PATH: ${X11SRCDIR.xorg-server}/hw/vfb/man
.PATH: ${X11SRCDIR.xorg-server}/Xext
.PATH: ${X11SRCDIR.xorg-server}/Xi
.PATH: ${X11SRCDIR.xorg-server}/mi
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.1 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.1 Mon Mar 28
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Tue Aug 2 07:44:39 UTC 2011
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
updates for xorg-server 1.10.3
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 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.100 src/share/mk/bsd.x11.mk:1.101
--- src/share/mk/bsd.x11.mk:1.100 Sun Jul 24 01:40:40 2011
+++ src/share/mk/bsd.x11.mk Tue Aug 2 07:44:39 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.100 2011/07/24 01:40:40 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.101 2011/08/02 07:44:39 mrg Exp $
.include bsd.init.mk
@@ -130,13 +130,13 @@
.if ${X11FLAVOUR} == Xorg
XVENDORNAMESHORT= 'X.Org'
XVENDORNAME= 'The X.Org Foundation'
-XORG_RELEASE= 'Release 1.9.2'
+XORG_RELEASE= 'Release 1.10.3'
__XKBDEFRULES__= 'xorg'
XLOCALE.DEFINES= -DXLOCALEDIR=\${X11LIBDIR}/locale\ \
-DXLOCALELIBDIR=\${X11LIBDIR}/locale\
# XXX oh yeah, fix me later
-XORG_VERSION_CURRENT=(((1) * 1000) + ((9) * 10) + ((5) * 1000) + 0)
+XORG_VERSION_CURRENT=(((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0)
.endif
PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
CVS commit: src
Module Name:src
Committed By: mrg
Date: Tue Aug 2 07:56:34 UTC 2011
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/server/xorg-server/include: Makefile
Log Message:
remove bstore*.h, add Xprintf.h and inpututils.h
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/include/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.129 src/distrib/sets/lists/xcomp/mi:1.130
--- src/distrib/sets/lists/xcomp/mi:1.129 Sun Jul 24 15:11:38 2011
+++ src/distrib/sets/lists/xcomp/mi Tue Aug 2 07:56:33 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.129 2011/07/24 15:11:38 mrg Exp $
+# $NetBSD: mi,v 1.130 2011/08/02 07:56:33 mrg Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -5845,11 +5845,12 @@
./usr/X11R7/include/xorg/IBM.h-unknown- xorg
./usr/X11R7/include/xorg/TI.h-unknown- xorg
./usr/X11R7/include/xorg/XIstubs.h -unknown- xorg
+./usr/X11R7/include/xorg/Xprintf.h -unknown- xorg
./usr/X11R7/include/xorg/afb.h-unknown- obsolete
./usr/X11R7/include/xorg/assyntax.h -unknown- obsolete
./usr/X11R7/include/xorg/atKeynames.h -unknown- obsolete
-./usr/X11R7/include/xorg/bstore.h -unknown- xorg
-./usr/X11R7/include/xorg/bstorestr.h -unknown- xorg
+./usr/X11R7/include/xorg/bstore.h -unknown- obsolete
+./usr/X11R7/include/xorg/bstorestr.h -unknown- obsolete
./usr/X11R7/include/xorg/bt829.h -unknown- xorg
./usr/X11R7/include/xorg/callback.h -unknown- xorg
./usr/X11R7/include/xorg/cfb.h-unknown- obsolete
@@ -5907,6 +5908,7 @@
./usr/X11R7/include/xorg/i2c_def.h -unknown- xorg
./usr/X11R7/include/xorg/input.h -unknown- xorg
./usr/X11R7/include/xorg/inputstr.h -unknown- xorg
+./usr/X11R7/include/xorg/inpututils.h -unknown- xorg
./usr/X11R7/include/xorg/list.h-unknown- xorg
./usr/X11R7/include/xorg/mfb.h-unknown- obsolete
./usr/X11R7/include/xorg/mfbmap.h -unknown- obsolete
Index: src/external/mit/xorg/server/xorg-server/include/Makefile
diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.9 src/external/mit/xorg/server/xorg-server/include/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/include/Makefile:1.9 Tue Aug 2 07:41:01 2011
+++ src/external/mit/xorg/server/xorg-server/include/Makefile Tue Aug 2 07:56:33 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/08/02 07:41:01 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2011/08/02 07:56:33 mrg Exp $
.include bsd.own.mk
@@ -21,7 +21,7 @@
.PATH: ${XORGSRC}/../include
INCSDIR=${X11INCDIR}/xorg
-INCS= BT.h IBM.h TI.h XIstubs.h \
+INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.h \
bt829.h \
callback.h closestr.h closure.h colormap.h \
colormapst.h compiler.h cursor.h cursorstr.h damage.h damagestr.h \
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Tue Aug 2 08:13:48 UTC 2011 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xorg-server.h Log Message: finish updating these for xorg-server 1.10.3 To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.9 -r1.10 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.17 xsrc/external/mit/xorg-server/include/dix-config.h:1.18 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.17 Tue Aug 2 07:22:05 2011 +++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Aug 2 08:13:48 2011 @@ -349,7 +349,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((9) * 10) + ((5) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0) /* Xorg release date */ #define XORG_DATE 2010-10-30 @@ -394,7 +394,9 @@ /* #undef ROOTLESS */ /* Define to 1 if unsigned long is 64 bits. */ +#ifdef _LP64 #define _XSERVER64 1 +#endif /* System is BSD-like */ #define CSRG_BASED 1 Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.9 xsrc/external/mit/xorg-server/include/xorg-server.h:1.10 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.9 Tue Aug 2 07:22:05 2011 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Tue Aug 2 08:13:48 2011 @@ -120,7 +120,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((9) * 10) + ((5) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: mrg
Date: Tue Aug 2 09:11:39 UTC 2011
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
src/external/mit/xorg/server/xorg-server/Xext: Makefile.Xext
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/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: 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/xnest: Makefile
src/external/mit/xorg/server/xorg-server/mi: 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
Log Message:
various updates for xorg-server 1.10.3.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.32 -r1.33 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/server/xorg-server/mi/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/randr/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/render/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/xorg-server/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.11 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.12
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.11 Fri Sep 25 06:04:30 2009
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Tue Aug 2 09:11:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.11 2009/09/25 06:04:30 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.12 2011/08/02 09:11:37 mrg Exp $
.for _SL in \
mi \
@@ -15,6 +15,7 @@
miext/damage \
miext/shadow \
miext/cw \
+ miext/sync \
Xi \
xkb \
xkbstubs \
Index: src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
diff -u src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext:1.10 src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext:1.11
--- src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext:1.10 Tue Nov 23 08:22:29 2010
+++ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext Tue Aug 2 09:11:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xext,v 1.10 2010/11/23 08:22:29 mrg Exp $
+# $NetBSD: Makefile.Xext,v 1.11 2011/08/02 09:11:37 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/Xext
@@ -8,6 +8,10 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/Xi
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/xfixes
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/miext/sync
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/composite
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/damageext
CPPFLAGS+= -DHAVE_DIX_CONFIG_H
COPTS.panoramiX.c+= -Wno-error
Index: src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
diff -u src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.7 src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.8
--- src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.7 Sat May 22 02:40:40 2010
+++ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb Tue Aug 2 09:11:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.fb,v 1.7 2010/05/22 02:40:40 mrg Exp $
+# $NetBSD: Makefile.fb,v 1.8 2011/08/02 09:11:37 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/fb
SRCS.fb= fb24_32.c fballpriv.c fbarc.c fbbits.c fbblt.c \
@@ -11,10 +11,7 @@
CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX} -DHAVE_DIX_CONFIG_H
-CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
-
CVS commit: xsrc/external/mit/xf86-input-ws/dist
Module Name:xsrc Committed By: mrg Date: Tue Aug 2 09:28:22 UTC 2011 Update of /cvsroot/xsrc/external/mit/xf86-input-ws/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27389 Log Message: initial import of xf86-input-ws from openbsd-current xenocara, with xorg 1.10 input fixes. Status: Vendor Tag: OPENBSD Release Tags: OPENBSD_20110801 N xsrc/external/mit/xf86-input-ws/dist/COPYING U xsrc/external/mit/xf86-input-ws/dist/Makefile.in N xsrc/external/mit/xf86-input-ws/dist/README U xsrc/external/mit/xf86-input-ws/dist/aclocal.m4 U xsrc/external/mit/xf86-input-ws/dist/autogen.sh U xsrc/external/mit/xf86-input-ws/dist/config.guess U xsrc/external/mit/xf86-input-ws/dist/config.h.in U xsrc/external/mit/xf86-input-ws/dist/config.sub U xsrc/external/mit/xf86-input-ws/dist/configure U xsrc/external/mit/xf86-input-ws/dist/configure.ac U xsrc/external/mit/xf86-input-ws/dist/depcomp U xsrc/external/mit/xf86-input-ws/dist/install-sh U xsrc/external/mit/xf86-input-ws/dist/ltmain.sh U xsrc/external/mit/xf86-input-ws/dist/missing U xsrc/external/mit/xf86-input-ws/dist/Makefile.am U xsrc/external/mit/xf86-input-ws/dist/man/Makefile.am U xsrc/external/mit/xf86-input-ws/dist/man/Makefile.in C xsrc/external/mit/xf86-input-ws/dist/man/ws.man U xsrc/external/mit/xf86-input-ws/dist/include/Makefile.am U xsrc/external/mit/xf86-input-ws/dist/include/Makefile.in U xsrc/external/mit/xf86-input-ws/dist/include/ws-properties.h U xsrc/external/mit/xf86-input-ws/dist/src/Makefile.am U xsrc/external/mit/xf86-input-ws/dist/src/Makefile.in U xsrc/external/mit/xf86-input-ws/dist/src/emumb.c C xsrc/external/mit/xf86-input-ws/dist/src/ws.c U xsrc/external/mit/xf86-input-ws/dist/src/ws.h 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jOPENBSD:yesterday -jOPENBSD xsrc/external/mit/xf86-input-ws/dist
CVS commit: xsrc/external/mit/xf86-input-ws/dist
Module Name:xsrc Committed By: mrg Date: Tue Aug 2 09:30:15 UTC 2011 Modified Files: xsrc/external/mit/xf86-input-ws/dist/man: ws.man xsrc/external/mit/xf86-input-ws/dist/src: ws.c Removed Files: xsrc/external/mit/xf86-input-ws/dist: Makefile.bsd-wrapper Log Message: merge xf86-input-ws 1.3.0 from openbsd-current. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-input-ws/dist/Makefile.bsd-wrapper cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-input-ws/dist/man/ws.man cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-input-ws/dist/src/ws.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-input-ws/dist/man/ws.man diff -u xsrc/external/mit/xf86-input-ws/dist/man/ws.man:1.2 xsrc/external/mit/xf86-input-ws/dist/man/ws.man:1.3 --- xsrc/external/mit/xf86-input-ws/dist/man/ws.man:1.2 Wed Jun 2 12:56:24 2010 +++ xsrc/external/mit/xf86-input-ws/dist/man/ws.man Tue Aug 2 09:30:15 2011 @@ -1,6 +1,6 @@ -.\ $OpenBSD: ws.man,v 1.5 2009/11/26 16:42:52 matthieu Exp $ +.\ $OpenBSD: ws.man,v 1.8 2011/07/16 17:50:41 matthieu Exp $ .\ -.\ Copyright (c) 2005,2009 Matthieu Herrb +.\ Copyright (c) 2005,2009,2011 Matthieu Herrb .\ .\ Permission to use, copy, modify, and distribute this software for any .\ purpose with or without fee is hereby granted, provided that the above @@ -17,8 +17,8 @@ .\ shorthand for double quote that works everywhere. .ds q \N'34' .TH WS __drivermansuffix__ __vendorversion__ -.SH NAME -WS \- wscons pointer input driver for *BSD +.SH NAME +WS \- wscons pointer input driver for __xservername__ on *BSD .SH SYNOPSIS .nf .B Section \*qInputDevice\*q @@ -46,13 +46,12 @@ touchscreen,...) driven by the wscons console driver on OpenBSD. .SH SUPPORTED HARDWARE -This driver supports zts(4), the touchscreen of Zaurus machines, and -uts(4), USB touchscreens. +This driver supports zts(4), the touchscreen of Zaurus machines, +uts(4), USB touchscreens and ums(4), generic USB mouse devices. .SH CONFIGURATION DETAILS -Please refer to xorg.conf(__filemansuffix__) for general configuration +Please refer to __xconfigfile__(__filemansuffix__) for general configuration details and for options that can be used with all input drivers. This section only covers configuration details specific to this driver. -.PP .TP 4 .BI Option \*qButtons\*q \*q integer \*q Specifies the number of mouse buttons. @@ -92,8 +91,8 @@ .TP 4 .BI Option \*qRaw\*q \*q boolean \*q This option selects the raw (uncalibrated) mode for tablet devices. -It defaults to True. -When using raw mode, if no coordinate space is specified by the +It defaults to True. +When using raw mode, if no coordinate space is specified by the above options, the coordinate space will be read from the kernel calibration data. .TP 4 @@ -130,7 +129,7 @@ driver. .TP 7 .BI WS Pointer Middle Button Emulation -1 boolean value (8 bit, 0 or 1) +1 boolean value (8 bit, 0 or 1) .TP 7 .BI WS Pointer Middle Button Timeout 1 16-bit positive value (unit: milliseconds) @@ -138,7 +137,7 @@ .BI WS Pointer Axis Calibration 4 32 bits values, in the order min-x, max-x, min-y, max-y. This property is present only for devices with absolute coordinates (ie -tablets and touchscreens). +tablets and touchscreens). .TP 7 .BI WS Pointer Axes Swap 1 boolean value (8 bits, 0 or 1). 1 swaps x/y axes. This property @@ -146,4 +145,5 @@ tablets and touchscreens). .SH SEE ALSO -Xorg(1), xinput(1), xorg.conf(__filemansuffix__), uts(4), zts(4), sysctl(8), xtsscale(8), ztsscale(8). +__xservername__(1), xinput(1), __xconfigfile__(__filemansuffix__), +ums(4), uts(4), zts(4), sysctl(8), xtsscale(8), ztsscale(8). Index: xsrc/external/mit/xf86-input-ws/dist/src/ws.c diff -u xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.3 xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.4 --- xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.3 Fri Dec 11 16:04:30 2009 +++ xsrc/external/mit/xf86-input-ws/dist/src/ws.c Tue Aug 2 09:30:15 2011 @@ -1,5 +1,5 @@ /* - * Copyright © 2005-2009 Matthieu Herrb + * Copyright © 2005-2009,2011 Matthieu Herrb * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -13,7 +13,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $OpenBSD: ws.c,v 1.28 2009/12/10 22:32:02 matthieu Exp $ */ +/* $OpenBSD: ws.c,v 1.33 2011/07/16 17:51:30 matthieu Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -25,8 +25,8 @@ #include sys/time.h #include dev/wscons/wsconsio.h +#include xorg-server.h #include xf86.h - #include xf86_OSproc.h #include X11/extensions/XI.h #include X11/extensions/XIproto.h @@ -38,22 +38,18 @@ #include ws.h -#ifdef HAVE_PROPERTIES #include
CVS commit: xsrc/external/mit/xf86-input-ws/dist/src
Module Name:xsrc
Committed By: mrg
Date: Tue Aug 2 09:33:33 UTC 2011
Modified Files:
xsrc/external/mit/xf86-input-ws/dist/src: emumb.c ws.c
Log Message:
port to netbsd wscons
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/external/mit/xf86-input-ws/dist/src/emumb.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-input-ws/dist/src/ws.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-ws/dist/src/emumb.c
diff -u xsrc/external/mit/xf86-input-ws/dist/src/emumb.c:1.1.1.2 xsrc/external/mit/xf86-input-ws/dist/src/emumb.c:1.2
--- xsrc/external/mit/xf86-input-ws/dist/src/emumb.c:1.1.1.2 Tue Aug 2 09:28:21 2011
+++ xsrc/external/mit/xf86-input-ws/dist/src/emumb.c Tue Aug 2 09:33:33 2011
@@ -36,6 +36,9 @@
#include config.h
#endif
+#include sys/types.h
+#include sys/time.h
+
#include xorg-server.h
#include X11/Xatom.h
#include xf86.h
Index: xsrc/external/mit/xf86-input-ws/dist/src/ws.c
diff -u xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.4 xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.5
--- xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.4 Tue Aug 2 09:30:15 2011
+++ xsrc/external/mit/xf86-input-ws/dist/src/ws.c Tue Aug 2 09:33:33 2011
@@ -892,17 +892,23 @@
priv-coords.maxx = priv-max_x;
priv-coords.miny = priv-min_y;
priv-coords.maxy = priv-max_y;
+#if 0
priv-coords.swapxy = priv-swap_axes;
+#endif
/* Update the kernel calibration table */
coords.minx = priv-min_x;
coords.maxx = priv-max_x;
coords.miny = priv-min_y;
coords.maxy = priv-max_y;
+#if 0
coords.swapxy = priv-swap_axes;
+#endif
coords.samplelen = priv-raw;
+#if 0
coords.resx = priv-coords.resx;
coords.resy = priv-coords.resy;
+#endif
if (ioctl(pInfo-fd, WSMOUSEIO_SCALIBCOORDS, coords) != 0) {
xf86Msg(X_ERROR, SCALIBCOORDS failed %s\n,
strerror(errno));
CVS commit: xsrc/external/mit/xf86-input-ws/include
Module Name:xsrc Committed By: mrg Date: Tue Aug 2 09:35:52 UTC 2011 Modified Files: xsrc/external/mit/xf86-input-ws/include: config.h Log Message: update for xf86-input-ws 1.3.0 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xf86-input-ws/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-input-ws/include/config.h diff -u xsrc/external/mit/xf86-input-ws/include/config.h:1.1.1.1 xsrc/external/mit/xf86-input-ws/include/config.h:1.2 --- xsrc/external/mit/xf86-input-ws/include/config.h:1.1.1.1 Fri Nov 27 14:17:11 2009 +++ xsrc/external/mit/xf86-input-ws/include/config.h Tue Aug 2 09:35:52 2011 @@ -43,28 +43,28 @@ #define PACKAGE_NAME xf86-input-ws /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-input-ws 1.2.9 +#define PACKAGE_STRING xf86-input-ws 1.3.0 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-input-ws /* Define to the version of this package. */ -#define PACKAGE_VERSION 1.2.9 +#define PACKAGE_VERSION 1.3.0 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 /* Minor version of this package */ -#define PACKAGE_VERSION_MINOR 2 +#define PACKAGE_VERSION_MINOR 3 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 9 +#define PACKAGE_VERSION_PATCHLEVEL 0 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 1.2.9 +#define VERSION 1.3.0 /* Enable XInput support */ #define XINPUT 1
CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/loader
Module Name:xsrc Committed By: mrg Date: Tue Aug 2 09:36:17 UTC 2011 Modified Files: xsrc/external/mit/xorg-server/dist/hw/xfree86/loader: loader.c Log Message: include dix-config.h since this depends up on symbols defined there To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/loader/loader.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/loader/loader.c diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/loader/loader.c:1.1.1.5 xsrc/external/mit/xorg-server/dist/hw/xfree86/loader/loader.c:1.2 --- xsrc/external/mit/xorg-server/dist/hw/xfree86/loader/loader.c:1.1.1.5 Tue Aug 2 06:56:56 2011 +++ xsrc/external/mit/xorg-server/dist/hw/xfree86/loader/loader.c Tue Aug 2 09:36:17 2011 @@ -50,6 +50,10 @@ #include xorg-config.h #endif +/*#ifdef HAVE_DIX_CONFIG_H*/ +#include dix-config.h +/*#endif*/ + #include errno.h #include stdio.h #include stdlib.h
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Tue Aug 2 09:37:08 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-apm/dist/src: apm_video.c
xsrc/external/mit/xf86-video-openchrome/dist/src: via_video.c
Log Message:
disable ReputImage API call -- these drivers use an older version
of this call that no longer matches the caller.
XXX: most drivers simply removed the call like this change does,
but not all.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-apm/dist/src/apm_video.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-apm/dist/src/apm_video.c
diff -u xsrc/external/mit/xf86-video-apm/dist/src/apm_video.c:1.1.1.2 xsrc/external/mit/xf86-video-apm/dist/src/apm_video.c:1.2
--- xsrc/external/mit/xf86-video-apm/dist/src/apm_video.c:1.1.1.2 Wed Jun 10 00:46:17 2009
+++ xsrc/external/mit/xf86-video-apm/dist/src/apm_video.c Tue Aug 2 09:37:08 2011
@@ -336,7 +336,7 @@
adapt-GetPortAttribute = ApmGetPortAttribute;
adapt-QueryBestSize = ApmQueryBestSize;
adapt-PutImage = A(PutImage);
-adapt-ReputImage = A(ReputImage);
+adapt-ReputImage = NULL;
adapt-QueryImageAttributes = ApmQueryImageAttributes;
pPriv-brightness = 0;
Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c:1.2 xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c:1.3
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c:1.2 Sun May 15 23:16:15 2011
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c Tue Aug 2 09:37:08 2011
@@ -765,6 +765,7 @@
}
+#if 0
/*
* This one gets called, for example, on panning.
*/
@@ -824,6 +825,7 @@
viaXvError(pScrn, pPriv, xve_none);
return Success;
}
+#endif
static unsigned
viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
@@ -885,7 +887,7 @@
viaAdaptPtr[i]-GetPortAttribute = viaGetPortAttribute;
viaAdaptPtr[i]-SetPortAttribute = viaSetPortAttribute;
viaAdaptPtr[i]-PutImage = viaPutImage;
-viaAdaptPtr[i]-ReputImage = viaReputImage;
+viaAdaptPtr[i]-ReputImage = NULL;
viaAdaptPtr[i]-QueryImageAttributes = viaQueryImageAttributes;
for (j = 0; j numPorts; ++j) {
viaPortPriv[j].dmaBounceBuffer = NULL;
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Aug 2 10:04:07 UTC 2011 Modified Files: src/share/man/man4: pckbd.4 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/pckbd.4 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/man4/pckbd.4 diff -u src/share/man/man4/pckbd.4:1.20 src/share/man/man4/pckbd.4:1.21 --- src/share/man/man4/pckbd.4:1.20 Fri Jul 22 19:06:23 2011 +++ src/share/man/man4/pckbd.4 Tue Aug 2 10:04:07 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: pckbd.4,v 1.20 2011/07/22 19:06:23 christos Exp $ +.\ $NetBSD: pckbd.4,v 1.21 2011/08/02 10:04:07 wiz Exp $ .\ .\ Copyright (c) 1999 .\ Matthias Drochner. All rights reserved. @@ -38,9 +38,9 @@ .Sh DESCRIPTION This driver supports PC/AT keyboards within the .Xr wscons 4 -console framework. It doesn't provide direct device -driver entry points but makes its functions available via -the internal +console framework. +It doesn't provide direct device driver entry points but makes its +functions available via the internal .Xr wskbd 4 interface. .Pp @@ -103,7 +103,8 @@ mappings can be used in the .Li KB_NODEAD ( .Dq .nodead ) -variant. This switches off the +variant. +This switches off the .Dq dead accents . .Pp The @@ -121,13 +122,15 @@ The .Li KB_METAESC ( .Dq .metaesc ) -option can be applied to any layout. If set, keys pressed together -with the ALT modifier are prefixed by an ESC character. (Standard -behaviour is to add 128 to the ASCII value.) +option can be applied to any layout. +If set, keys pressed together +with the ALT modifier are prefixed by an ESC character. +(Standard behaviour is to add 128 to the ASCII value.) .Pp Because PC keyboard hardware doesn't contain a beeper, requests for .Dq keyboard beeps -cannot be handled directly. On alpha and i386 a helper device attached +cannot be handled directly. +On alpha and i386 a helper device attached to the .Xr pcppi 4 driver allows the use of the standard ISA speaker for this purpose.
CVS commit: src/lib/libm/man
Module Name:src Committed By: wiz Date: Tue Aug 2 10:08:24 UTC 2011 Modified Files: src/lib/libm/man: ieee.3 Log Message: Fix typo in function name. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/lib/libm/man/ieee.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/man/ieee.3 diff -u src/lib/libm/man/ieee.3:1.26 src/lib/libm/man/ieee.3:1.27 --- src/lib/libm/man/ieee.3:1.26 Thu Jul 28 21:10:30 2011 +++ src/lib/libm/man/ieee.3 Tue Aug 2 10:08:24 2011 @@ -26,7 +26,7 @@ .\ SUCH DAMAGE. .\ .\ from: @(#)ieee.3 6.4 (Berkeley) 5/6/91 -.\ $NetBSD: ieee.3,v 1.26 2011/07/28 21:10:30 joerg Exp $ +.\ $NetBSD: ieee.3,v 1.27 2011/08/02 10:08:24 wiz Exp $ .\ .Dd July 28, 2011 .Dt IEEE 3 @@ -51,7 +51,7 @@ .Ft float .Fn scalbnf float x int n .Ft long double -.Fn scalbnf long double x int n +.Fn scalbnl long double x int n .Sh DESCRIPTION These functions are required or recommended by .St -ieee754 .
CVS commit: src/lib/libm/man
Module Name:src Committed By: wiz Date: Tue Aug 2 10:15:03 UTC 2011 Modified Files: src/lib/libm/man: ilogb.3 Log Message: Add serial comma. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libm/man/ilogb.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/man/ilogb.3 diff -u src/lib/libm/man/ilogb.3:1.2 src/lib/libm/man/ilogb.3:1.3 --- src/lib/libm/man/ilogb.3:1.2 Thu Jul 28 22:32:29 2011 +++ src/lib/libm/man/ilogb.3 Tue Aug 2 10:15:03 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: ilogb.3,v 1.2 2011/07/28 22:32:29 joerg Exp $ +.\ $NetBSD: ilogb.3,v 1.3 2011/08/02 10:15:03 wiz Exp $ .\ .\ Copyright (c) 2011 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -45,7 +45,7 @@ .Sh DESCRIPTION The .Fn ilogb , -.Fn ilogbf +.Fn ilogbf , and .Fn ilogbl functions return the exponent of the non-zero real floating-point number
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Tue Aug 2 10:17:36 UTC 2011 Modified Files: src/share/man/man9: pserialize.9 Log Message: Whitespace nits. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/pserialize.9 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/man9/pserialize.9 diff -u src/share/man/man9/pserialize.9:1.1 src/share/man/man9/pserialize.9:1.2 --- src/share/man/man9/pserialize.9:1.1 Sat Jul 30 18:19:05 2011 +++ src/share/man/man9/pserialize.9 Tue Aug 2 10:17:35 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: pserialize.9,v 1.1 2011/07/30 18:19:05 rmind Exp $ +.\ $NetBSD: pserialize.9,v 1.2 2011/08/02 10:17:35 wiz Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -100,9 +100,9 @@ .Xr rwlock 9 .Rs .%A Hennessy, et al. -.%T Passive serialization in a multitasking environment +.%T Passive serialization in a multitasking environment .%I US Patent and Trademark Office -.%D February 28, 1989 +.%D February 28, 1989 .%N US Patent 4809168 .Re .Sh HISTORY
CVS commit: src/sbin/disklabel
Module Name:src Committed By: wiz Date: Tue Aug 2 10:21:12 UTC 2011 Modified Files: src/sbin/disklabel: disklabel.8 Log Message: Sort sections. Remove comma in enumeration of two items. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sbin/disklabel/disklabel.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/disklabel/disklabel.8 diff -u src/sbin/disklabel/disklabel.8:1.63 src/sbin/disklabel/disklabel.8:1.64 --- src/sbin/disklabel/disklabel.8:1.63 Mon Jul 25 16:31:05 2011 +++ src/sbin/disklabel/disklabel.8 Tue Aug 2 10:21:12 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: disklabel.8,v 1.63 2011/07/25 16:31:05 christos Exp $ +.\ $NetBSD: disklabel.8,v 1.64 2011/08/02 10:21:12 wiz Exp $ .\ .\ Copyright (c) 1987, 1988, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -209,6 +209,10 @@ could update the bootstrap code on some architectures. This functionality has been subsumed by .Xr installboot 8 . +.Sh FILES +.Bl -tag -width /etc/disktab -compact +.It Pa /etc/disktab +.El .Sh EXIT STATUS The exit status of .Nm @@ -228,10 +232,6 @@ One or more warnings occured while reading the disklabel. Subtract 100 to get the number of warnings detected. .El -.Sh FILES -.Bl -tag -width /etc/disktab -compact -.It Pa /etc/disktab -.El .Sh EXAMPLES .Dl Ic disklabel sd0 .Pp @@ -303,7 +303,7 @@ .Nm structure stored on disk cannot support partitions/disks greater than 2TB. Please use -.Xr gpt 8 , +.Xr gpt 8 and .Xr dkctl 8 to manage partitions and disks larger than 2TB.
CVS commit: src/share/man/man4/man4.x86
Module Name:src Committed By: wiz Date: Tue Aug 2 10:23:33 UTC 2011 Modified Files: src/share/man/man4/man4.x86: balloon.4 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/man4.x86/balloon.4 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/man4/man4.x86/balloon.4 diff -u src/share/man/man4/man4.x86/balloon.4:1.7 src/share/man/man4/man4.x86/balloon.4:1.8 --- src/share/man/man4/man4.x86/balloon.4:1.7 Sat Jul 30 09:39:20 2011 +++ src/share/man/man4/man4.x86/balloon.4 Tue Aug 2 10:23:33 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: balloon.4,v 1.7 2011/07/30 09:39:20 jym Exp $ +.\ $NetBSD: balloon.4,v 1.8 2011/08/02 10:23:33 wiz Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 20, 2011 +.Dd July 30, 2011 .Dt BALLOON 4 xen .Os .Sh NAME
CVS commit: src/sbin/raidctl
Module Name:src Committed By: wiz Date: Tue Aug 2 10:28:00 UTC 2011 Modified Files: src/sbin/raidctl: raidctl.8 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sbin/raidctl/raidctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/raidctl/raidctl.8 diff -u src/sbin/raidctl/raidctl.8:1.62 src/sbin/raidctl/raidctl.8:1.63 --- src/sbin/raidctl/raidctl.8:1.62 Thu Jul 28 18:25:22 2011 +++ src/sbin/raidctl/raidctl.8 Tue Aug 2 10:28:00 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: raidctl.8,v 1.62 2011/07/28 18:25:22 buhrow Exp $ +.\ $NetBSD: raidctl.8,v 1.63 2011/08/02 10:28:00 wiz Exp $ .\ .\ Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1600,8 +1600,9 @@ .Pp When replacing a failed component of a RAID set, it is a good idea to zero out the first 64 blocks of the new component to insure the -RAIDframe driver doesn't erroneously detect a component label in the -new component. This is particularly true on +RAIDframe driver doesn't erroneously detect a component label in the +new component. +This is particularly true on .Em RAID 1 sets because there is at most one correct component label in a failed RAID
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: pgoyette
Date: Tue Aug 2 14:06:15 UTC 2011
Modified Files:
src/sys/dev/i2c: dbcool.c dbcool_var.h
Log Message:
When detaching the device, tear down its sysctl tree.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/i2c/dbcool.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/i2c/dbcool_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.32 src/sys/dev/i2c/dbcool.c:1.33
--- src/sys/dev/i2c/dbcool.c:1.32 Mon Aug 1 22:42:57 2011
+++ src/sys/dev/i2c/dbcool.c Tue Aug 2 14:06:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.32 2011/08/01 22:42:57 macallan Exp $ */
+/* $NetBSD: dbcool.c,v 1.33 2011/08/02 14:06:15 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dbcool.c,v 1.32 2011/08/01 22:42:57 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: dbcool.c,v 1.33 2011/08/02 14:06:15 pgoyette Exp $);
#include sys/param.h
#include sys/systm.h
@@ -98,6 +98,7 @@
sysmon_envsys_lim_t *, uint32_t *);
/* SYSCTL Helpers */
+SYSCTL_SETUP_PROTO(sysctl_dbcoolsetup);
static int sysctl_dbcool_temp(SYSCTLFN_PROTO);
static int sysctl_adm1030_temp(SYSCTLFN_PROTO);
static int sysctl_adm1030_trange(SYSCTLFN_PROTO);
@@ -784,6 +785,12 @@
aprint_normal_dev(self, %s dBCool(tm) Controller
(rev 0x%04x)\n, sc-sc_dc.dc_chip-name, ver);
+ sc-sc_sysctl_log = NULL;
+
+#ifdef _MODULE
+ sysctl_dbcoolsetup(sc-sc_sysctl_log);
+#endif
+
dbcool_setup(self);
if (!pmf_device_register(self, dbcool_pmf_suspend, dbcool_pmf_resume))
@@ -798,6 +805,9 @@
pmf_device_deregister(self);
sysmon_envsys_unregister(sc-sc_sme);
+
+ sysctl_teardown(sc-sc_sysctl_log);
+
sc-sc_sme = NULL;
return 0;
}
@@ -1104,7 +1114,7 @@
SYSCTL_SETUP(sysctl_dbcoolsetup, sysctl dBCool subtree setup)
{
- sysctl_createv(NULL, 0, NULL, NULL,
+ sysctl_createv(clog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_NODE, hw, NULL,
NULL, 0, NULL, 0,
@@ -1504,7 +1514,7 @@
/* Determine Vcc for this chip */
sc-sc_supply_voltage = dbcool_supply_voltage(sc);
- ret = sysctl_createv(NULL, 0, NULL, me,
+ ret = sysctl_createv(sc-sc_sysctl_log, 0, NULL, me,
CTLFLAG_READWRITE,
CTLTYPE_NODE, device_xname(self), NULL,
NULL, 0, NULL, 0,
@@ -1531,7 +1541,7 @@
dbcool_setup_controllers(sc);
#ifdef DBCOOL_DEBUG
- ret = sysctl_createv(NULL, 0, NULL,
+ ret = sysctl_createv(sc-sc_sysctl_log, 0, NULL,
(const struct sysctlnode **)node,
CTLFLAG_READWRITE, CTLTYPE_INT, reg_select, NULL,
sysctl_dbcool_reg_select,
@@ -1540,7 +1550,7 @@
if (node != NULL)
node-sysctl_data = sc;
- ret = sysctl_createv(NULL, 0, NULL,
+ ret = sysctl_createv(sc-sc_sysctl_log, 0, NULL,
(const struct sysctlnode **)node,
CTLFLAG_READWRITE, CTLTYPE_INT, reg_access, NULL,
sysctl_dbcool_reg_access,
@@ -1704,7 +1714,8 @@
/* create sysctl node for the sensor if not one already there */
if (sc-sc_sysctl_num[j] == -1) {
- ret = sysctl_createv(NULL, 0, NULL, me2, CTLFLAG_READWRITE,
+ ret = sysctl_createv(sc-sc_sysctl_log, 0, NULL, me2,
+ CTLFLAG_READWRITE,
CTLTYPE_NODE, sc-sc_sensor[j].desc, NULL,
NULL, 0, NULL, 0,
CTL_HW, sc-sc_root_sysctl_num, CTL_CREATE,
@@ -1722,9 +1733,7 @@
rw_flag = CTLFLAG_READONLY | CTLFLAG_OWNDESC;
else
rw_flag = CTLFLAG_READWRITE | CTLFLAG_OWNDESC;
-
- ret = sysctl_createv(NULL, 0, NULL,
- node, rw_flag,
+ ret = sysctl_createv(sc-sc_sysctl_log, 0, NULL, node, rw_flag,
CTLTYPE_INT, name,
SYSCTL_DESCR(dbc_sysctl_table[sysctl_index].desc),
dbc_sysctl_table[sysctl_index].helper,
@@ -1748,7 +1757,7 @@
for (i = 0; chip-power[i].desc != NULL; i++) {
snprintf(name, sizeof(name), fan_ctl_%d, i);
- ret = sysctl_createv(NULL, 0, NULL, me2,
+ ret = sysctl_createv(sc-sc_sysctl_log, 0, NULL, me2,
CTLFLAG_READWRITE | CTLFLAG_OWNDESC,
CTLTYPE_NODE, name, NULL,
NULL, 0, NULL, 0,
@@ -1766,7 +1775,7 @@
rw_flag = CTLFLAG_READONLY | CTLFLAG_OWNDESC;
else
rw_flag = CTLFLAG_READWRITE | CTLFLAG_OWNDESC;
- ret = sysctl_createv(NULL, 0, NULL,
+ ret = sysctl_createv(sc-sc_sysctl_log, 0, NULL,
node, rw_flag,
(j == DBC_PWM_BEHAVIOR)?
CTLTYPE_STRING:CTLTYPE_INT,
Index: src/sys/dev/i2c/dbcool_var.h
diff -u src/sys/dev/i2c/dbcool_var.h:1.13 src/sys/dev/i2c/dbcool_var.h:1.14
--- src/sys/dev/i2c/dbcool_var.h:1.13 Fri Mar 11 17:12:43 2011
+++ src/sys/dev/i2c/dbcool_var.h Tue Aug 2 14:06:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool_var.h,v 1.13 2011/03/11 17:12:43 pgoyette Exp $ */
+/* $NetBSD: dbcool_var.h,v 1.14 2011/08/02 14:06:15 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#endif
CVS commit: src
Module Name:src
Committed By: manu
Date: Tue Aug 2 14:53:38 UTC 2011
Modified Files:
src/lib/libperfuse: ops.c
src/usr.sbin/perfused: msg.c
Log Message:
Fix creds passed to FUSE when requests are done on behalf of the kernel.
We previously sent uid/gid set to -1, we now set it to 0.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/lib/libperfuse/ops.c
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/perfused/msg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.35 src/lib/libperfuse/ops.c:1.36
--- src/lib/libperfuse/ops.c:1.35 Tue Jul 19 07:29:39 2011
+++ src/lib/libperfuse/ops.c Tue Aug 2 14:53:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.35 2011/07/19 07:29:39 manu Exp $ */
+/* $NetBSD: ops.c,v 1.36 2011/08/02 14:53:38 manu Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -53,7 +53,7 @@
static int node_lookup_dir_nodot(struct puffs_usermount *,
puffs_cookie_t, char *, size_t, struct puffs_node **);
static int node_lookup_common(struct puffs_usermount *, puffs_cookie_t,
-const char*, struct puffs_node **);
+const char *, const struct puffs_cred *, struct puffs_node **);
static int node_mk_common(struct puffs_usermount *, puffs_cookie_t,
struct puffs_newinfo *, const struct puffs_cn *pcn, perfuse_msg_t *);
static int node_mk_common_final(struct puffs_usermount *, puffs_cookie_t,
@@ -137,6 +137,11 @@
/*
* release_flags may be set to FUSE_RELEASE_FLUSH
* to flush locks. lock_owner must be set in that case
+ *
+ * ps_new_msg() is called with NULL creds, which will
+ * be interpreted as FUSE superuser. We come here from the
+ * inactive method, which provides no creds, but obviously
+ * runs with kernel privilege.
*/
pm = ps-ps_new_msg(pu, opc, op, sizeof(*fri), NULL);
fri = GET_INPAYLOAD(ps, pm, fuse_release_in);
@@ -240,8 +245,20 @@
tdir = PERFUSE_NODE_DATA(targ)-pnd_parent;
- if ((error = puffs_cred_getuid(pcr, uid)) != 0)
- return error;
+ /*
+ * This covers the case where the kernel requests a DELETE
+ * or RENAME on its own, and where puffs_cred_getuid would
+ * return -1. While such a situation should not happen,
+ * we allow it here.
+ *
+ * This also allows root to tamper with other users' files
+ * that have the sticky bit.
+ */
+ if (puffs_cred_isjuggernaut(pcr))
+ return 0;
+
+ if (puffs_cred_getuid(pcr, uid) != 0)
+ DERRX(EX_SOFTWARE, puffs_cred_getuid fails in %s, __func__);
sticky = puffs_pn_getvap(tdir)-va_mode S_ISTXT;
owner = puffs_pn_getvap(targ)-va_uid == uid;
@@ -330,7 +347,7 @@
(void)snprintf(path, namelen, %s/%s,
perfuse_node_path((puffs_cookie_t)dpn), name);
- error = node_lookup_common(pu, opc, path, pnp);
+ error = node_lookup_common(pu, opc, path, NULL, pnp);
free(path);
@@ -338,10 +355,11 @@
}
static int
-node_lookup_common(pu, opc, path, pnp)
+node_lookup_common(pu, opc, path, pcr, pnp)
struct puffs_usermount *pu;
puffs_cookie_t opc;
const char *path;
+ const struct puffs_cred *pcr;
struct puffs_node **pnp;
{
struct perfuse_state *ps;
@@ -385,7 +403,7 @@
len = strlen(path) + 1;
- pm = ps-ps_new_msg(pu, opc, FUSE_LOOKUP, len, NULL);
+ pm = ps-ps_new_msg(pu, opc, FUSE_LOOKUP, len, pcr);
(void)strlcpy(_GET_INPAYLOAD(ps, pm, char *), path, len);
if ((error = xchg_msg(pu, opc, pm, sizeof(*feo), wait_reply)) != 0)
@@ -491,13 +509,16 @@
ps = puffs_getspecific(pu);
/*
- * Set owner and group
+ * Set owner and group. The kernel cannot create a file
+ * on its own (puffs_cred_getuid would return -1), right?
*/
- (void)puffs_cred_getuid(pcn-pcn_cred, pn-pn_va.va_uid);
- (void)puffs_cred_getgid(pcn-pcn_cred, pn-pn_va.va_gid);
+ if (puffs_cred_getuid(pcn-pcn_cred, pn-pn_va.va_uid) != 0)
+ DERRX(EX_SOFTWARE, puffs_cred_getuid fails in %s, __func__);
+ if (puffs_cred_getgid(pcn-pcn_cred, pn-pn_va.va_gid) != 0)
+ DERRX(EX_SOFTWARE, puffs_cred_getgid fails in %s, __func__);
pm = ps-ps_new_msg(pu, (puffs_cookie_t)pn,
- FUSE_SETATTR, sizeof(*fsi), NULL);
+ FUSE_SETATTR, sizeof(*fsi), pcn-pcn_cred);
fsi = GET_INPAYLOAD(ps, pm, fuse_setattr_in);
fsi-uid = pn-pn_va.va_uid;
fsi-gid = pn-pn_va.va_gid;
@@ -818,6 +839,9 @@
* FUSE_EXPORT_SUPPORT | FUSE_BIG_WRITES | FUSE_DONT_MASK
*
* Linux also sets max_readahead at 32 pages (128 kB)
+ *
+ * ps_new_msg() is called with NULL creds, which will
+ * be interpreted as FUSE superuser.
*/
pm = ps-ps_new_msg(pu, 0, FUSE_INIT, sizeof(*fii), NULL);
fii = GET_INPAYLOAD(ps, pm, fuse_init_in);
@@ -849,8 +873,12 @@
int error;
ps = puffs_getspecific(pu);
-
opc = (puffs_cookie_t)puffs_getroot(pu);
+
+ /*
+ * ps_new_msg() is called with NULL creds, which will
+ * be interpreted as FUSE superuser.
+ */
pm = ps-ps_new_msg(pu, opc, FUSE_DESTROY, 0,
CVS commit: src/external/gpl3/binutils/dist
Module Name:src
Committed By: matt
Date: Tue Aug 2 16:11:17 UTC 2011
Modified Files:
src/external/gpl3/binutils/dist/gas/config: tc-mips.c
src/external/gpl3/binutils/dist/include/opcode: mips.h
Log Message:
Pull in change to support -m[no-]fix-loongson2f-{nop,jump}
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/gas/config/tc-mips.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/dist/include/opcode/mips.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/gas/config/tc-mips.c
diff -u src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.3 src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.4
--- src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.3 Thu Apr 14 07:49:48 2011
+++ src/external/gpl3/binutils/dist/gas/config/tc-mips.c Tue Aug 2 16:11:16 2011
@@ -1,6 +1,7 @@
/* tc-mips.c -- assemble code for a MIPS chip.
Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Free Software Foundation, Inc.
Contributed by the OSF and Ralph Campbell.
Written by Keith Knowles and Ralph Campbell, working independently.
Modified for ECOFF and R4000 support by Ian Lance Taylor of Cygnus
@@ -737,7 +738,8 @@
/* Classifies the kind of instructions we're interested in when
implementing -mfix-vr4120. */
-enum fix_vr4120_class {
+enum fix_vr4120_class
+{
FIX_VR4120_MACC,
FIX_VR4120_DMACC,
FIX_VR4120_MULT,
@@ -747,6 +749,15 @@
NUM_FIX_VR4120_CLASSES
};
+/* ...likewise -mfix-loongson2f-jump. */
+static bfd_boolean mips_fix_loongson2f_jump;
+
+/* ...likewise -mfix-loongson2f-nop. */
+static bfd_boolean mips_fix_loongson2f_nop;
+
+/* True if -mfix-loongson2f-nop or -mfix-loongson2f-jump passed. */
+static bfd_boolean mips_fix_loongson2f;
+
/* Given two FIX_VR4120_* values X and Y, bit Y of element X is set if
there must be at least one other instruction between an instruction
of type X and an instruction of type Y. */
@@ -1031,8 +1042,9 @@
enum mips_regclass { MIPS_GR_REG, MIPS_FP_REG, MIPS16_REG };
static void append_insn
- (struct mips_cl_insn *ip, expressionS *p, bfd_reloc_code_real_type *r);
+ (struct mips_cl_insn *, expressionS *, bfd_reloc_code_real_type *);
static void mips_no_prev_insn (void);
+static void macro_build (expressionS *, const char *, const char *, ...);
static void mips16_macro_build
(expressionS *, const char *, const char *, va_list);
static void load_register (int, expressionS *, int);
@@ -1901,6 +1913,8 @@
if (nop_insn.insn_mo == NULL strcmp (name, nop) == 0)
{
create_insn (nop_insn, mips_opcodes + i);
+ if (mips_fix_loongson2f_nop)
+ nop_insn.insn_opcode = LOONGSON2F_NOP_INSN;
nop_insn.fixed_p = 1;
}
}
@@ -2694,6 +2708,54 @@
return nops;
}
+/* Fix NOP issue: Replace nops by or at,at,zero. */
+
+static void
+fix_loongson2f_nop (struct mips_cl_insn * ip)
+{
+ if (strcmp (ip-insn_mo-name, nop) == 0)
+ip-insn_opcode = LOONGSON2F_NOP_INSN;
+}
+
+/* Fix Jump Issue: Eliminate instruction fetch from outside 256M region
+ jr target pc = 'h__cfff_. */
+
+static void
+fix_loongson2f_jump (struct mips_cl_insn * ip)
+{
+ if (strcmp (ip-insn_mo-name, j) == 0
+ || strcmp (ip-insn_mo-name, jr) == 0
+ || strcmp (ip-insn_mo-name, jalr) == 0)
+{
+ int sreg;
+ expressionS ep;
+
+ if (! mips_opts.at)
+return;
+
+ sreg = EXTRACT_OPERAND (RS, *ip);
+ if (sreg == ZERO || sreg == KT0 || sreg == KT1 || sreg == ATREG)
+return;
+
+ ep.X_op = O_constant;
+ ep.X_add_number = 0xcfff;
+ macro_build (ep, lui, t,u, ATREG, BFD_RELOC_HI16);
+ ep.X_add_number = 0x;
+ macro_build (ep, ori, t,r,i, ATREG, ATREG, BFD_RELOC_LO16);
+ macro_build (NULL, and, d,v,t, sreg, sreg, ATREG);
+}
+}
+
+static void
+fix_loongson2f (struct mips_cl_insn * ip)
+{
+ if (mips_fix_loongson2f_nop)
+fix_loongson2f_nop (ip);
+
+ if (mips_fix_loongson2f_jump)
+fix_loongson2f_jump (ip);
+}
+
/* Output an instruction. IP is the instruction information.
ADDRESS_EXPR is an operand of the instruction to be used with
RELOC_TYPE. */
@@ -2707,6 +2769,9 @@
bfd_boolean relaxed_branch = FALSE;
segment_info_type *si = seg_info (now_seg);
+ if (mips_fix_loongson2f)
+fix_loongson2f (ip);
+
/* Mark instruction labels in mips16 mode. */
mips16_mark_labels ();
@@ -11207,6 +11272,7 @@
#define OPTION_MNO_7000_HILO_FIX (OPTION_FIX_BASE + 1)
{no-fix-7000, no_argument, NULL, OPTION_MNO_7000_HILO_FIX},
{mno-fix7000, no_argument, NULL, OPTION_MNO_7000_HILO_FIX},
+
#define OPTION_FIX_VR4120 (OPTION_FIX_BASE + 2)
#define OPTION_NO_FIX_VR4120
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Tue Aug 2 16:12:44 UTC 2011 Modified Files: src/sys/arch/evbmips/conf: std.gdium Log Message: Pass -mfix-loongson2f-jump -mfix-loongson2f-nop to assembler to workaround loongson2f j[la]r issues. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/conf/std.gdium 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/evbmips/conf/std.gdium diff -u src/sys/arch/evbmips/conf/std.gdium:1.4 src/sys/arch/evbmips/conf/std.gdium:1.5 --- src/sys/arch/evbmips/conf/std.gdium:1.4 Wed Oct 21 21:11:59 2009 +++ src/sys/arch/evbmips/conf/std.gdium Tue Aug 2 16:12:44 2011 @@ -1,4 +1,4 @@ -# $NetBSD: std.gdium,v 1.4 2009/10/21 21:11:59 rmind Exp $ +# $NetBSD: std.gdium,v 1.5 2011/08/02 16:12:44 matt Exp $ machine evbmips mips include conf/std # MI standard options @@ -15,6 +15,8 @@ options EXEC_ELF32 # exec ELF32 binaries options EXEC_SCRIPT # exec #! scripts +makeoptions AFLAGS+=-Wa,-mfix-loongson2f-jump -Wa,-mfix-loongson2f-nop +makeoptions CFLAGS+=-Wa,-mfix-loongson2f-jump -Wa,-mfix-loongson2f-nop makeoptions DEFTEXTADDR=0x8020 makeoptions BOARDTYPE=gdium
CVS commit: src/sys
Module Name:src Committed By: christos Date: Tue Aug 2 16:44:01 UTC 2011 Modified Files: src/sys/kern: exec_elf.c src/sys/sys: exec_elf.h Log Message: Add SuSE note To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/kern/exec_elf.c cvs rdiff -u -r1.115 -r1.116 src/sys/sys/exec_elf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/exec_elf.c diff -u src/sys/kern/exec_elf.c:1.30 src/sys/kern/exec_elf.c:1.31 --- src/sys/kern/exec_elf.c:1.30 Tue Jul 19 15:45:36 2011 +++ src/sys/kern/exec_elf.c Tue Aug 2 12:44:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: exec_elf.c,v 1.30 2011/07/19 19:45:36 christos Exp $ */ +/* $NetBSD: exec_elf.c,v 1.31 2011/08/02 16:44:01 christos Exp $ */ /*- * Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.30 2011/07/19 19:45:36 christos Exp $); +__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.31 2011/08/02 16:44:01 christos Exp $); #ifdef _KERNEL_OPT #include opt_pax.h @@ -913,6 +913,9 @@ sizeof(epp-ep_pax_flags)); break; + case ELF_NOTE_TYPE_SUSE_TAG: + break; + default: #ifdef DIAGNOSTIC printf(%s: unknown note type %d\n, epp-ep_kname, Index: src/sys/sys/exec_elf.h diff -u src/sys/sys/exec_elf.h:1.115 src/sys/sys/exec_elf.h:1.116 --- src/sys/sys/exec_elf.h:1.115 Tue Jul 19 15:46:42 2011 +++ src/sys/sys/exec_elf.h Tue Aug 2 12:44:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: exec_elf.h,v 1.115 2011/07/19 19:46:42 christos Exp $ */ +/* $NetBSD: exec_elf.h,v 1.116 2011/08/02 16:44:01 christos Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -795,6 +795,25 @@ */ #define ELF_NOTE_TYPE_GNU_BUILD_ID 3 +/* SuSE-specific note type: version + * name: SuSE\0\0\0\0 + * namesz: 8 + * desc: + * word[0] = VVTTMMmm + * + * V = version of following data + * T = product type: [box, sles, nld, whatever] + * M = product major version + * m = product minor version + * descsz: 8 + */ +#define ELF_NOTE_TYPE_SUSE_TAG 0x45537553 /* SuSE in LE */ +/* NetBSD-specific note name and description sizes */ +#define ELF_NOTE_SUSE_NAMESZ 8 +#define ELF_NOTE_SUSE_DESCSZ 8 +/* NetBSD-specific note name */ +#define ELF_NOTE_SUSE_NAME SuSE\0\0\0\0 + /* NetBSD-specific note type: Emulation name. * name: NetBSD\0\0 * namesz: 8
CVS commit: src/sbin/modstat
Module Name:src
Committed By: mbalmer
Date: Tue Aug 2 16:46:45 UTC 2011
Modified Files:
src/sbin/modstat: main.c modstat.8
Log Message:
Accept both 'modstat -n name' as well as 'modstat name' to display information
about a single module.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sbin/modstat/main.c
cvs rdiff -u -r1.8 -r1.9 src/sbin/modstat/modstat.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/modstat/main.c
diff -u src/sbin/modstat/main.c:1.13 src/sbin/modstat/main.c:1.14
--- src/sbin/modstat/main.c:1.13 Fri Jun 3 16:35:35 2011
+++ src/sbin/modstat/main.c Tue Aug 2 16:46:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.13 2011/06/03 16:35:35 pgoyette Exp $ */
+/* $NetBSD: main.c,v 1.14 2011/08/02 16:46:45 mbalmer Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: main.c,v 1.13 2011/06/03 16:35:35 pgoyette Exp $);
+__RCSID($NetBSD: main.c,v 1.14 2011/08/02 16:46:45 mbalmer Exp $);
#endif /* !lint */
#include sys/module.h
@@ -88,7 +88,9 @@
argc -= optind;
argv += optind;
- if (argc != 0)
+ if (argc == 1 name == NULL)
+ name = argv[0];
+ else if (argc != 0)
usage();
if (prog_init prog_init() == -1)
@@ -155,7 +157,7 @@
usage(void)
{
- (void)fprintf(stderr, Usage: %s [-n name]\n, getprogname());
+ (void)fprintf(stderr, Usage: %s [-n] [name]\n, getprogname());
exit(EXIT_FAILURE);
}
Index: src/sbin/modstat/modstat.8
diff -u src/sbin/modstat/modstat.8:1.8 src/sbin/modstat/modstat.8:1.9
--- src/sbin/modstat/modstat.8:1.8 Tue Dec 14 16:23:59 2010
+++ src/sbin/modstat/modstat.8 Tue Aug 2 16:46:45 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: modstat.8,v 1.8 2010/12/14 16:23:59 jruoho Exp $
+.\ $NetBSD: modstat.8,v 1.9 2011/08/02 16:46:45 mbalmer Exp $
.\
.\ Copyright (c) 1993 Christopher G. Demetriou
.\ All rights reserved.
@@ -32,7 +32,7 @@
.\
.\ Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp
.\
-.Dd December 14, 2010
+.Dd August 2, 2011
.Dt MODSTAT 8
.Os
.Sh NAME
@@ -40,17 +40,20 @@
.Nd display status of loaded kernel modules
.Sh SYNOPSIS
.Nm
-.Op Fl n Ar name
+.Op Fl n
+.Op Ar name
.Sh DESCRIPTION
The
.Nm
-utility displays the status of any kernel modules
-present in the kernel.
+utility displays the status of any kernel modules present in the kernel.
.Pp
The options are as follows:
.Bl -tag -width indent
.It Fl n Ar name
Display the status of only the module with this name.
+Please note that
+.Fl n
+is optional.
.El
.Pp
In addition to listing the currently loaded modules' name,
CVS commit: src/lib/libperfuse
Module Name:src
Committed By: manu
Date: Tue Aug 2 16:57:17 UTC 2011
Modified Files:
src/lib/libperfuse: ops.c
Log Message:
Do not reject reads on directory, it raises a useless EBADFD while the
thing can just fail silently.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/lib/libperfuse/ops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.36 src/lib/libperfuse/ops.c:1.37
--- src/lib/libperfuse/ops.c:1.36 Tue Aug 2 14:53:38 2011
+++ src/lib/libperfuse/ops.c Tue Aug 2 16:57:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.36 2011/08/02 14:53:38 manu Exp $ */
+/* $NetBSD: ops.c,v 1.37 2011/08/02 16:57:16 manu Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -2791,9 +2791,6 @@
pnd = PERFUSE_NODE_DATA(opc);
pm = NULL;
- if (puffs_pn_getvap((struct puffs_node *)opc)-va_type == VDIR)
- return EBADF;
-
do {
size_t max_read;
CVS commit: src/external/bsd/llvm
Module Name:src
Committed By: joerg
Date: Tue Aug 2 17:12:40 UTC 2011
Modified Files:
src/external/bsd/llvm: Makefile.inc
src/external/bsd/llvm/lib/libLLVMAnalysis: Makefile
src/external/bsd/llvm/lib/libLLVMCodeGen: Makefile
src/external/bsd/llvm/lib/libLLVMMC: Makefile
src/external/bsd/llvm/lib/libLLVMMCParser: Makefile
src/external/bsd/llvm/lib/libLLVMPowerPCCodeGen: Makefile
src/external/bsd/llvm/lib/libLLVMPowerPCMCTargetDesc: Makefile
src/external/bsd/llvm/lib/libLLVMSupport: Makefile
src/external/bsd/llvm/lib/libLLVMX86CodeGen: Makefile
src/external/bsd/llvm/lib/libLLVMX86MCTargetDesc: Makefile
src/external/bsd/llvm/lib/libclangSema: Makefile
src/external/bsd/llvm/lib/libclangStaticAnalyzerCore: Makefile
Log Message:
Update LLVM/Clang snapshot to r136592. This brings support for
.code32/.code64 on x86.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/lib/libLLVMMC/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/lib/libLLVMMCParser/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/llvm/lib/libLLVMPowerPCCodeGen/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/llvm/lib/libLLVMPowerPCMCTargetDesc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/lib/libLLVMSupport/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/llvm/lib/libLLVMX86MCTargetDesc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/lib/libclangSema/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.18 src/external/bsd/llvm/Makefile.inc:1.19
--- src/external/bsd/llvm/Makefile.inc:1.18 Mon Jul 25 16:32:43 2011
+++ src/external/bsd/llvm/Makefile.inc Tue Aug 2 17:12:38 2011
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.18 2011/07/25 16:32:43 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.19 2011/08/02 17:12:38 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
.include bsd.own.mk
-LLVM_REVISION= 135906
-CLANG_REVISION= 135906
+LLVM_REVISION= 136592
+CLANG_REVISION= 136592
LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
Index: src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.4 src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.5
--- src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.4 Mon Jul 4 16:10:39 2011
+++ src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile Tue Aug 2 17:12:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/07/04 16:10:39 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/02 17:12:38 joerg Exp $
LIB= LLVMAnalysis
@@ -13,7 +13,7 @@
AliasSetTracker.cpp \
Analysis.cpp \
BasicAliasAnalysis.cpp \
- BlockFrequency.cpp \
+ BlockFrequencyInfo.cpp \
BranchProbabilityInfo.cpp \
CFGPrinter.cpp \
CaptureTracking.cpp \
Index: src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.5 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.6
--- src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.5 Sun Jul 17 20:07:58 2011
+++ src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile Tue Aug 2 17:12:39 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/07/17 20:07:58 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2011/08/02 17:12:39 joerg Exp $
LIB= LLVMCodeGen
@@ -41,7 +41,7 @@
LowerSubregs.cpp \
MachineBasicBlock.cpp \
MachineBranchProbabilityInfo.cpp \
- MachineBlockFrequency.cpp \
+ MachineBlockFrequencyInfo.cpp \
MachineCSE.cpp \
MachineDominators.cpp \
MachineFunction.cpp \
Index: src/external/bsd/llvm/lib/libLLVMMC/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMMC/Makefile:1.5 src/external/bsd/llvm/lib/libLLVMMC/Makefile:1.6
--- src/external/bsd/llvm/lib/libLLVMMC/Makefile:1.5 Mon Jul 25 16:32:43 2011
+++ src/external/bsd/llvm/lib/libLLVMMC/Makefile Tue Aug 2 17:12:39 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/07/25 16:32:43 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2011/08/02 17:12:39 joerg Exp $
LIB= LLVMMC
@@ -7,6 +7,7 @@
.PATH: ${LLVM_SRCDIR}/lib/MC
SRCS+= ELFObjectWriter.cpp \
+ MCAsmBackend.cpp \
MCAsmInfo.cpp \
MCAsmInfoCOFF.cpp \
MCAsmInfoDarwin.cpp \
@@ -39,14 +40,13 @@
MCStreamer.cpp \
MCSubtargetInfo.cpp \
MCSymbol.cpp \
+ MCTargetAsmLexer.cpp \
MCValue.cpp \
MCWin64EH.cpp \
MachObjectWriter.cpp \
WinCOFFStreamer.cpp \
WinCOFFObjectWriter.cpp \
-
CVS commit: src/lib/libedit
Module Name:src
Committed By: joerg
Date: Tue Aug 2 17:22:02 UTC 2011
Modified Files:
src/lib/libedit: Makefile
Log Message:
Only use -Wconversion if GCC is actually the active compiler.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/lib/libedit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/Makefile
diff -u src/lib/libedit/Makefile:1.47 src/lib/libedit/Makefile:1.48
--- src/lib/libedit/Makefile:1.47 Sat Jul 30 10:07:27 2011
+++ src/lib/libedit/Makefile Tue Aug 2 17:22:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2011/07/30 10:07:27 tron Exp $
+# $NetBSD: Makefile,v 1.48 2011/08/02 17:22:02 joerg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
USE_SHLIBDIR= yes
@@ -12,8 +12,8 @@
.include bsd.own.mk
COPTS+= -Wunused-parameter
-.if !defined(HAVE_GCC) || ${HAVE_GCC} != 45
-COPTS+= -Wconversion
+.if defined(HAVE_GCC) ${HAVE_GCC} != 45
+CWARNFLAGS.gcc+= -Wconversion
.endif
OSRCS= chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \
CVS commit: src/sys
Module Name:src
Committed By: joerg
Date: Tue Aug 2 17:22:51 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
src/sys/modules/compat_linux32: Makefile
src/sys/modules/compat_netbsd32: Makefile
Log Message:
Remove a number of now unnecessary -no-integrated-as cases.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/compat_linux32/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/compat_netbsd32/Makefile
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/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.37 src/sys/arch/amd64/conf/Makefile.amd64:1.38
--- src/sys/arch/amd64/conf/Makefile.amd64:1.37 Fri Jun 10 03:18:27 2011
+++ src/sys/arch/amd64/conf/Makefile.amd64 Tue Aug 2 17:22:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.37 2011/06/10 03:18:27 joerg Exp $
+# $NetBSD: Makefile.amd64,v 1.38 2011/08/02 17:22:51 joerg Exp $
# Makefile for NetBSD
#
@@ -65,8 +65,6 @@
AFLAGS.locore.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
AFLAGS.mptramp.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.linux32_sigcode.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.netbsd32_sigcode.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
AFLAGS.spl.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
CWARNFLAGS.ah_regdomain.c= ${${ACTIVE_CC} == clang:?-Wno-error:}
Index: src/sys/modules/compat_linux32/Makefile
diff -u src/sys/modules/compat_linux32/Makefile:1.6 src/sys/modules/compat_linux32/Makefile:1.7
--- src/sys/modules/compat_linux32/Makefile:1.6 Fri May 20 13:11:40 2011
+++ src/sys/modules/compat_linux32/Makefile Tue Aug 2 17:22:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/05/20 13:11:40 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2011/08/02 17:22:51 joerg Exp $
.include ../Makefile.inc
.include ../Makefile.assym
@@ -8,8 +8,6 @@
CPPFLAGS+= -DSYSVSHM -DSYSVSEM -DSYSVMSG -DCOMPAT_LINUX
CPPFLAGS+= -DCOMPAT_LINUX32 -DCOMPAT_NETBSD32
-COPTS.linux32_sigcode.S+= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-
.PATH: ${S}/compat/linux32/common
SRCS+= linux32_dirent.c linux32_exec.c linux32_exec_elf32.c linux32_fcntl.c
SRCS+= linux32_ioctl.c linux32_misc.c linux32_mman.c
Index: src/sys/modules/compat_netbsd32/Makefile
diff -u src/sys/modules/compat_netbsd32/Makefile:1.6 src/sys/modules/compat_netbsd32/Makefile:1.7
--- src/sys/modules/compat_netbsd32/Makefile:1.6 Fri May 20 13:08:07 2011
+++ src/sys/modules/compat_netbsd32/Makefile Tue Aug 2 17:22:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/05/20 13:08:07 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2011/08/02 17:22:51 joerg Exp $
.include ../Makefile.inc
.include ../Makefile.assym
@@ -9,8 +9,6 @@
CPPFLAGS+= -DEXEC_ELF32 -DEXEC_ELF64 -DEXEC_AOUT
CPPFLAGS+= -DP1003_1B_SEMAPHORE -DCOREDUMP -DKERN_SA
-COPTS.netbsd32_sigcode.S+= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-
.PATH: ${S}/compat/netbsd32
SRCS+= netbsd32_compat_09.c netbsd32_compat_10.c
SRCS+= netbsd32_compat_12.c netbsd32_compat_13.c
CVS commit: src/sys/modules/spdmem
Module Name:src Committed By: pgoyette Date: Tue Aug 2 18:51:35 UTC 2011 Modified Files: src/sys/modules/spdmem: spdmem.ioconf Log Message: Allow unit numbers to float, rather than tying to specific i2c address To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/spdmem/spdmem.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/spdmem/spdmem.ioconf diff -u src/sys/modules/spdmem/spdmem.ioconf:1.1 src/sys/modules/spdmem/spdmem.ioconf:1.2 --- src/sys/modules/spdmem/spdmem.ioconf:1.1 Mon Aug 1 03:51:05 2011 +++ src/sys/modules/spdmem/spdmem.ioconf Tue Aug 2 18:51:35 2011 @@ -1,4 +1,4 @@ -# $NetBSD: spdmem.ioconf,v 1.1 2011/08/01 03:51:05 pgoyette Exp $ +# $NetBSD: spdmem.ioconf,v 1.2 2011/08/02 18:51:35 pgoyette Exp $ ioconf spdmem @@ -6,11 +6,11 @@ pseudo-root iic* -spdmem0 at iic? addr 0x50 -spdmem1 at iic? addr 0x51 -spdmem2 at iic? addr 0x52 -spdmem3 at iic? addr 0x53 -spdmem4 at iic? addr 0x54 -spdmem5 at iic? addr 0x55 -spdmem6 at iic? addr 0x56 -spdmem7 at iic? addr 0x57 +spdmem* at iic? addr 0x50 +spdmem* at iic? addr 0x51 +spdmem* at iic? addr 0x52 +spdmem* at iic? addr 0x53 +spdmem* at iic? addr 0x54 +spdmem* at iic? addr 0x55 +spdmem* at iic? addr 0x56 +spdmem* at iic? addr 0x57
CVS commit: src/sys/modules/sdtemp
Module Name:src Committed By: pgoyette Date: Tue Aug 2 18:52:35 UTC 2011 Modified Files: src/sys/modules/sdtemp: sdtemp.ioconf Log Message: Allow multiple sdtemp sensors to attach, at all valid addresses To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/sdtemp/sdtemp.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/sdtemp/sdtemp.ioconf diff -u src/sys/modules/sdtemp/sdtemp.ioconf:1.1 src/sys/modules/sdtemp/sdtemp.ioconf:1.2 --- src/sys/modules/sdtemp/sdtemp.ioconf:1.1 Sun Jul 31 16:00:21 2011 +++ src/sys/modules/sdtemp/sdtemp.ioconf Tue Aug 2 18:52:35 2011 @@ -1,4 +1,4 @@ -# $NetBSD: sdtemp.ioconf,v 1.1 2011/07/31 16:00:21 jmcneill Exp $ +# $NetBSD: sdtemp.ioconf,v 1.2 2011/08/02 18:52:35 pgoyette Exp $ ioconf sdtemp @@ -7,3 +7,10 @@ pseudo-root iic* sdtemp* at iic? addr 0x18 +sdtemp* at iic? addr 0x19 +sdtemp* at iic? addr 0x1a +sdtemp* at iic? addr 0x1b +sdtemp* at iic? addr 0x1c +sdtemp* at iic? addr 0x1d +sdtemp* at iic? addr 0x1e +sdtemp* at iic? addr 0x1f
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: cliff Date: Tue Aug 2 20:42:42 UTC 2011 Modified Files: src/sys/arch/evbmips/conf: CPMBR1400 Log Message: remove unused option RTNORFLASH To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/conf/CPMBR1400 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/evbmips/conf/CPMBR1400 diff -u src/sys/arch/evbmips/conf/CPMBR1400:1.4 src/sys/arch/evbmips/conf/CPMBR1400:1.5 --- src/sys/arch/evbmips/conf/CPMBR1400:1.4 Tue Aug 2 05:08:31 2011 +++ src/sys/arch/evbmips/conf/CPMBR1400 Tue Aug 2 20:42:42 2011 @@ -3,7 +3,6 @@ options SYMTAB_SPACE=45 # size for embedded symbol table options RT3883 -options RTNORFLASH options RTMEMSIZE=128 #options SLICKROCK options RALINK_ETH_NUM_SW_PARTITIONS=5
CVS commit: src/sys/dev/nor
Module Name:src
Committed By: cliff
Date: Tue Aug 2 20:44:10 UTC 2011
Modified Files:
src/sys/dev/nor: nor.c nor.h
Log Message:
add JEDEC Mfgr ID for Macronix
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/nor/nor.c src/sys/dev/nor/nor.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nor/nor.c
diff -u src/sys/dev/nor/nor.c:1.3 src/sys/dev/nor/nor.c:1.4
--- src/sys/dev/nor/nor.c:1.3 Wed Jul 20 03:42:55 2011
+++ src/sys/dev/nor/nor.c Tue Aug 2 20:44:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nor.c,v 1.3 2011/07/20 03:42:55 cliff Exp $ */
+/* $NetBSD: nor.c,v 1.4 2011/08/02 20:44:09 cliff Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -34,7 +34,7 @@
/* Common driver for NOR chips implementing the ONFI CFI specification */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nor.c,v 1.3 2011/07/20 03:42:55 cliff Exp $);
+__KERNEL_RCSID(0, $NetBSD: nor.c,v 1.4 2011/08/02 20:44:09 cliff Exp $);
#include locators.h
#include opt_nor.h
@@ -107,6 +107,7 @@
{ NOR_MFR_NATIONAL, National },
{ NOR_MFR_TOSHIBA, Toshiba },
{ NOR_MFR_HYNIX, Hynix },
+ { NOR_MFGR_MACRONIX, Macronix },
{ NOR_MFR_SAMSUNG, Samsung },
{ NOR_MFR_UNKNOWN, Unknown }
};
Index: src/sys/dev/nor/nor.h
diff -u src/sys/dev/nor/nor.h:1.3 src/sys/dev/nor/nor.h:1.4
--- src/sys/dev/nor/nor.h:1.3 Sun Jul 17 00:52:42 2011
+++ src/sys/dev/nor/nor.h Tue Aug 2 20:44:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nor.h,v 1.3 2011/07/17 00:52:42 dyoung Exp $ */
+/* $NetBSD: nor.h,v 1.4 2011/08/02 20:44:09 cliff Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -344,16 +344,17 @@
/* Manufacturer IDs defined by JEDEC */
enum {
- NOR_MFR_UNKNOWN = 0x00,
- NOR_MFR_AMD = 0x01,
- NOR_MFR_FUJITSU = 0x04,
- NOR_MFR_RENESAS = 0x07,
- NOR_MFR_STMICRO = 0x20,
- NOR_MFR_MICRON = 0x2c,
- NOR_MFR_NATIONAL= 0x8f,
- NOR_MFR_TOSHIBA = 0x98,
- NOR_MFR_HYNIX = 0xad,
- NOR_MFR_SAMSUNG = 0xec
+ NOR_MFR_UNKNOWN = 0x00,
+ NOR_MFR_AMD = 0x01,
+ NOR_MFR_FUJITSU = 0x04,
+ NOR_MFR_RENESAS = 0x07,
+ NOR_MFR_STMICRO = 0x20,
+ NOR_MFR_MICRON = 0x2c,
+ NOR_MFR_NATIONAL = 0x8f,
+ NOR_MFR_TOSHIBA = 0x98,
+ NOR_MFR_HYNIX = 0xad,
+ NOR_MFGR_MACRONIX = 0xc2,
+ NOR_MFR_SAMSUNG = 0xec
};
struct nor_manufacturer {
CVS commit: src/sys/kern
Module Name:src Committed By: jmcneill Date: Tue Aug 2 21:23:25 UTC 2011 Modified Files: src/sys/kern: subr_autoconf.c Log Message: Re-add include of drvctl.h, as its removal a year and a half ago broke drvctl DRVGETEVENT. To generate a diff of this commit: cvs rdiff -u -r1.216 -r1.217 src/sys/kern/subr_autoconf.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/subr_autoconf.c diff -u src/sys/kern/subr_autoconf.c:1.216 src/sys/kern/subr_autoconf.c:1.217 --- src/sys/kern/subr_autoconf.c:1.216 Wed Jun 1 02:43:33 2011 +++ src/sys/kern/subr_autoconf.c Tue Aug 2 21:23:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_autoconf.c,v 1.216 2011/06/01 02:43:33 christos Exp $ */ +/* $NetBSD: subr_autoconf.c,v 1.217 2011/08/02 21:23:24 jmcneill Exp $ */ /* * Copyright (c) 1996, 2000 Christopher G. Demetriou @@ -77,10 +77,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.216 2011/06/01 02:43:33 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.217 2011/08/02 21:23:24 jmcneill Exp $); #ifdef _KERNEL_OPT #include opt_ddb.h +#include drvctl.h #endif #include sys/param.h
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Tue Aug 2 22:45:52 UTC 2011 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h Log Message: fix the XORG_DATE. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 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.18 xsrc/external/mit/xorg-server/include/dix-config.h:1.19 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.18 Tue Aug 2 08:13:48 2011 +++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Aug 2 22:45:52 2011 @@ -352,7 +352,7 @@ #define XORG_VERSION_CURRENT (((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0) /* Xorg release date */ -#define XORG_DATE 2010-10-30 +#define XORG_DATE 2011-07-08 /* Build Xv Extension */ #define XvExtension 1
CVS commit: othersrc/external/bsd/udevfsd
Module Name:othersrc Committed By: jmcneill Date: Tue Aug 2 23:19:26 UTC 2011 Update of /cvsroot/othersrc/external/bsd/udevfsd In directory ivanova.netbsd.org:/tmp/cvs-serv8300 Log Message: Initial import of udevfsd, a simple daemon that listens for drvctl events and processes them with hooks scripts. A hook is included that creates /dev entries if they do not already exist (requires a patched MAKEDEV). Status: Vendor Tag: JMCNEILL Release Tags: udevfsd-base N othersrc/external/bsd/udevfsd/Makefile N othersrc/external/bsd/udevfsd/udevfsd.c N othersrc/external/bsd/udevfsd/udevfsd-run-hooks.in N othersrc/external/bsd/udevfsd/hooks/01-makedev No conflicts created by this import
CVS commit: othersrc/external/bsd/udevfsd
Module Name:othersrc
Committed By: jmcneill
Date: Wed Aug 3 00:06:00 UTC 2011
Modified Files:
othersrc/external/bsd/udevfsd: udevfsd.c
Log Message:
Scan already attached devices at startup and post 'device-attach' events for
them to the hooks scripts.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/udevfsd/udevfsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/udevfsd/udevfsd.c
diff -u othersrc/external/bsd/udevfsd/udevfsd.c:1.1.1.1 othersrc/external/bsd/udevfsd/udevfsd.c:1.2
--- othersrc/external/bsd/udevfsd/udevfsd.c:1.1.1.1 Tue Aug 2 23:19:26 2011
+++ othersrc/external/bsd/udevfsd/udevfsd.c Wed Aug 3 00:06:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: udevfsd.c,v 1.1.1.1 2011/08/02 23:19:26 jmcneill Exp $ */
+/* $NetBSD: udevfsd.c,v 1.2 2011/08/03 00:06:00 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -35,7 +35,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2011\
Jared D. McNeill jmcne...@invisible.ca. All rights reserved.);
-__RCSID($NetBSD: udevfsd.c,v 1.1.1.1 2011/08/02 23:19:26 jmcneill Exp $);
+__RCSID($NetBSD: udevfsd.c,v 1.2 2011/08/03 00:06:00 jmcneill Exp $);
#include sys/types.h
#include sys/ioctl.h
@@ -56,6 +56,9 @@
static int drvctl_fd = -1;
static const char *udevfsd_script = UDEVFSD_RUN_HOOKS;
+#define UDEVFSD_ATTACH_EVENT device-attach
+#define UDEVFSD_DETACH_EVENT device-detach
+
static void
udevfsd_exec(const char *path, const char *event, const char *device)
{
@@ -129,6 +132,69 @@
}
static void
+udevfsd_probe(const char *device)
+{
+ struct devlistargs laa;
+ size_t len, children, n;
+ void *p;
+ int error;
+
+ assert(drvctl_fd != -1);
+
+ memset(laa, 0, sizeof(laa));
+ if (device)
+ strlcpy(laa.l_devname, device, sizeof(laa.l_devname));
+
+ /* Get the child device count for this device */
+ error = ioctl(drvctl_fd, DRVLISTDEV, laa);
+ if (error) {
+ syslog(LOG_ERR, DRVLISTDEV failed: %m);
+ return;
+ }
+
+child_count_changed:
+ /* If this device has no children, return */
+ if (laa.l_children == 0)
+ return;
+
+ /* Allocate a buffer large enough to hold the child device names */
+ p = laa.l_childname;
+ children = laa.l_children;
+
+ len = children * sizeof(laa.l_childname[0]);
+ laa.l_childname = realloc(laa.l_childname, len);
+ if (laa.l_childname == NULL) {
+ syslog(LOG_ERR, couldn't allocate %zu bytes, len);
+ laa.l_childname = p;
+ goto done;
+ }
+
+ /* Get a list of child devices */
+ error = ioctl(drvctl_fd, DRVLISTDEV, laa);
+ if (error) {
+ syslog(LOG_ERR, DRVLISTDEV failed: %m);
+ goto done;
+ }
+
+ /* If the child count changed between DRVLISTDEV calls, retry */
+ if (children != laa.l_children)
+ goto child_count_changed;
+
+ /*
+ * For each child device, first post an attach event and
+ * then scan each one for additional devices.
+ */
+ for (n = 0; n laa.l_children; n++)
+ udevfsd_eventhandler(UDEVFSD_ATTACH_EVENT, laa.l_childname[n]);
+ for (n = 0; n laa.l_children; n++)
+ udevfsd_probe(laa.l_childname[n]);
+
+done:
+ free(laa.l_childname);
+ return;
+}
+
+static void
usage(void)
{
fprintf(stderr, usage: %s [-f]\n, getprogname());
@@ -170,6 +236,10 @@
err(EXIT_FAILURE, couldn't fork);
}
}
+
+ /* Look for devices that are already present */
+ udevfsd_probe(NULL);
+
udevfsd_eventloop();
return EXIT_SUCCESS;
CVS commit: src/sys/sys
Module Name:src Committed By: enami Date: Wed Aug 3 00:22:05 UTC 2011 Modified Files: src/sys/sys: exec_elf.h Log Message: Replace the word `NetBSD' with `SuSE' in the rest of comments for the cpp macro constatnt ELF_NOTE_SUSE_*. To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/sys/exec_elf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/exec_elf.h diff -u src/sys/sys/exec_elf.h:1.116 src/sys/sys/exec_elf.h:1.117 --- src/sys/sys/exec_elf.h:1.116 Tue Aug 2 16:44:01 2011 +++ src/sys/sys/exec_elf.h Wed Aug 3 00:22:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: exec_elf.h,v 1.116 2011/08/02 16:44:01 christos Exp $ */ +/* $NetBSD: exec_elf.h,v 1.117 2011/08/03 00:22:05 enami Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -808,10 +808,10 @@ * descsz: 8 */ #define ELF_NOTE_TYPE_SUSE_TAG 0x45537553 /* SuSE in LE */ -/* NetBSD-specific note name and description sizes */ +/* SuSE-specific note name and description sizes */ #define ELF_NOTE_SUSE_NAMESZ 8 #define ELF_NOTE_SUSE_DESCSZ 8 -/* NetBSD-specific note name */ +/* SuSE-specific note name */ #define ELF_NOTE_SUSE_NAME SuSE\0\0\0\0 /* NetBSD-specific note type: Emulation name.
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: macallan Date: Wed Aug 3 00:38:42 UTC 2011 Modified Files: src/distrib/sets/lists/xcomp: mi Log Message: obsolete renderedge.h and xaaWrapper.h To generate a diff of this commit: cvs rdiff -u -r1.130 -r1.131 src/distrib/sets/lists/xcomp/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/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.130 src/distrib/sets/lists/xcomp/mi:1.131 --- src/distrib/sets/lists/xcomp/mi:1.130 Tue Aug 2 07:56:33 2011 +++ src/distrib/sets/lists/xcomp/mi Wed Aug 3 00:38:42 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.130 2011/08/02 07:56:33 mrg Exp $ +# $NetBSD: mi,v 1.131 2011/08/03 00:38:42 macallan Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -5947,7 +5947,7 @@ ./usr/X11R7/include/xorg/region.h -unknown- xorg ./usr/X11R7/include/xorg/regionstr.h -unknown- xorg ./usr/X11R7/include/xorg/registry.h -unknown- xorg -./usr/X11R7/include/xorg/renderedge.h -unknown- xorg +./usr/X11R7/include/xorg/renderedge.h -unknown- obsolete ./usr/X11R7/include/xorg/resource.h -unknown- xorg ./usr/X11R7/include/xorg/rgb.h-unknown- xorg ./usr/X11R7/include/xorg/rrtransform.h -unknown- xorg @@ -5974,7 +5974,7 @@ ./usr/X11R7/include/xorg/window.h -unknown- xorg ./usr/X11R7/include/xorg/windowstr.h -unknown- xorg ./usr/X11R7/include/xorg/xaa.h-unknown- xorg -./usr/X11R7/include/xorg/xaaWrapper.h -unknown- xorg +./usr/X11R7/include/xorg/xaaWrapper.h -unknown- obsolete ./usr/X11R7/include/xorg/xaalocal.h -unknown- xorg ./usr/X11R7/include/xorg/xaarop.h -unknown- xorg ./usr/X11R7/include/xorg/xf1bpp.h -unknown- obsolete
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: macallan Date: Wed Aug 3 00:39:45 UTC 2011 Modified Files: src/distrib/sets/lists/xserver: md.macppc Log Message: obsolete libxf8_16bpp* To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/xserver/md.macppc 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/xserver/md.macppc diff -u src/distrib/sets/lists/xserver/md.macppc:1.59 src/distrib/sets/lists/xserver/md.macppc:1.60 --- src/distrib/sets/lists/xserver/md.macppc:1.59 Wed Mar 9 18:55:55 2011 +++ src/distrib/sets/lists/xserver/md.macppc Wed Aug 3 00:39:45 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.macppc,v 1.59 2011/03/09 18:55:55 mrg Exp $ +# $NetBSD: md.macppc,v 1.60 2011/08/03 00:39:45 macallan Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XFree86 -unknown- x11 ./usr/X11R6/bin/Xmacppc -unknown- x11 @@ -485,11 +485,11 @@ ./usr/X11R7/lib/modules/libxf4bpp.so.0 -unknown- obsolete ./usr/X11R7/lib/modules/libxf4bpp_g.a -unknown- obsolete ./usr/X11R7/lib/modules/libxf4bpp_pic.a -unknown- obsolete -./usr/X11R7/lib/modules/libxf8_16bpp.a -unknown- xorg -./usr/X11R7/lib/modules/libxf8_16bpp.so -unknown- xorg -./usr/X11R7/lib/modules/libxf8_16bpp.so.0 -unknown- xorg -./usr/X11R7/lib/modules/libxf8_16bpp_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/libxf8_16bpp_pic.a -unknown- xorg +./usr/X11R7/lib/modules/libxf8_16bpp.a -unknown- obsolete +./usr/X11R7/lib/modules/libxf8_16bpp.so -unknown- obsolete +./usr/X11R7/lib/modules/libxf8_16bpp.so.0 -unknown- obsolete +./usr/X11R7/lib/modules/libxf8_16bpp_g.a -unknown- obsolete +./usr/X11R7/lib/modules/libxf8_16bpp_pic.a -unknown- obsolete ./usr/X11R7/lib/modules/libxf8_32bpp.a -unknown- obsolete ./usr/X11R7/lib/modules/libxf8_32bpp.so -unknown- obsolete ./usr/X11R7/lib/modules/libxf8_32bpp.so.0 -unknown- obsolete
CVS commit: othersrc/external/bsd/mat/dist
Module Name:othersrc
Committed By: agc
Date: Wed Aug 3 01:09:59 UTC 2011
Modified Files:
othersrc/external/bsd/mat/dist: frontends.c
Log Message:
check for 'f' argument being given without a corresponding file
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 othersrc/external/bsd/mat/dist/frontends.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/mat/dist/frontends.c
diff -u othersrc/external/bsd/mat/dist/frontends.c:1.4 othersrc/external/bsd/mat/dist/frontends.c:1.5
--- othersrc/external/bsd/mat/dist/frontends.c:1.4 Fri Jul 15 05:33:42 2011
+++ othersrc/external/bsd/mat/dist/frontends.c Wed Aug 3 01:09:58 2011
@@ -219,6 +219,10 @@
(void) fprintf(stderr, No action specified\n);
return 0;
}
+ if (f == NULL) {
+ (void) fprintf(stderr, No file specified\n);
+ return 0;
+ }
if (reading(action) strcmp(f, -) == 0) {
/* read archive from stdin */
if ((fd = dostdin(TMPDIR, f = temp, sizeof(temp))) 0) {
@@ -365,6 +369,10 @@
(void) fprintf(stderr, Unknown flag \%c\\n, i);
}
}
+ if (archive == NULL) {
+ (void) fprintf(stderr, No file specified\n);
+ return 0;
+ }
if (reading(action) strcmp(archive, -) == 0) {
/* read archive from stdin */
if ((fd = dostdin(TMPDIR, archive = temp, sizeof(temp))) 0) {
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: mrg Date: Wed Aug 3 01:19:47 UTC 2011 Modified Files: src/distrib/sets/lists/xserver: md.i386 md.sparc64 Log Message: obsolete libxf8_16bpp*. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/distrib/sets/lists/xserver/md.i386 cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/xserver/md.sparc64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xserver/md.i386 diff -u src/distrib/sets/lists/xserver/md.i386:1.81 src/distrib/sets/lists/xserver/md.i386:1.82 --- src/distrib/sets/lists/xserver/md.i386:1.81 Wed Mar 9 18:55:55 2011 +++ src/distrib/sets/lists/xserver/md.i386 Wed Aug 3 01:19:47 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.81 2011/03/09 18:55:55 mrg Exp $ +# $NetBSD: md.i386,v 1.82 2011/08/03 01:19:47 mrg Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XFree86 -unknown- x11 ./usr/X11R6/bin/gtf -unknown- x11 @@ -693,11 +693,11 @@ ./usr/X11R7/lib/modules/libxf4bpp.so.0 -unknown- obsolete ./usr/X11R7/lib/modules/libxf4bpp_g.a -unknown- obsolete ./usr/X11R7/lib/modules/libxf4bpp_pic.a -unknown- obsolete -./usr/X11R7/lib/modules/libxf8_16bpp.a -unknown- xorg -./usr/X11R7/lib/modules/libxf8_16bpp.so -unknown- xorg -./usr/X11R7/lib/modules/libxf8_16bpp.so.0 -unknown- xorg -./usr/X11R7/lib/modules/libxf8_16bpp_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/libxf8_16bpp_pic.a -unknown- xorg +./usr/X11R7/lib/modules/libxf8_16bpp.a -unknown- obsolete +./usr/X11R7/lib/modules/libxf8_16bpp.so -unknown- obsolete +./usr/X11R7/lib/modules/libxf8_16bpp.so.0 -unknown- obsolete +./usr/X11R7/lib/modules/libxf8_16bpp_g.a -unknown- obsolete +./usr/X11R7/lib/modules/libxf8_16bpp_pic.a -unknown- obsolete ./usr/X11R7/lib/modules/libxf8_32bpp.a -unknown- obsolete ./usr/X11R7/lib/modules/libxf8_32bpp.so -unknown- obsolete ./usr/X11R7/lib/modules/libxf8_32bpp.so.0 -unknown- obsolete Index: src/distrib/sets/lists/xserver/md.sparc64 diff -u src/distrib/sets/lists/xserver/md.sparc64:1.48 src/distrib/sets/lists/xserver/md.sparc64:1.49 --- src/distrib/sets/lists/xserver/md.sparc64:1.48 Fri May 27 22:42:26 2011 +++ src/distrib/sets/lists/xserver/md.sparc64 Wed Aug 3 01:19:47 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.48 2011/05/27 22:42:26 christos Exp $ x11 +# $NetBSD: md.sparc64,v 1.49 2011/08/03 01:19:47 mrg Exp $ x11 ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XFree86 -unknown- x11 ./usr/X11R6/bin/Xsun -unknown- x11 @@ -453,11 +453,11 @@ ./usr/X11R7/lib/modules/libxf4bpp.so.0 -unknown- obsolete ./usr/X11R7/lib/modules/libxf4bpp_g.a -unknown- obsolete ./usr/X11R7/lib/modules/libxf4bpp_pic.a -unknown- obsolete -./usr/X11R7/lib/modules/libxf8_16bpp.a -unknown- xorg -./usr/X11R7/lib/modules/libxf8_16bpp.so -unknown- xorg -./usr/X11R7/lib/modules/libxf8_16bpp.so.0 -unknown- xorg -./usr/X11R7/lib/modules/libxf8_16bpp_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/libxf8_16bpp_pic.a -unknown- xorg +./usr/X11R7/lib/modules/libxf8_16bpp.a -unknown- obsolete +./usr/X11R7/lib/modules/libxf8_16bpp.so -unknown- obsolete +./usr/X11R7/lib/modules/libxf8_16bpp.so.0 -unknown- obsolete +./usr/X11R7/lib/modules/libxf8_16bpp_g.a -unknown- obsolete +./usr/X11R7/lib/modules/libxf8_16bpp_pic.a -unknown- obsolete ./usr/X11R7/lib/modules/libxf8_32bpp.a -unknown- obsolete ./usr/X11R7/lib/modules/libxf8_32bpp.so -unknown- obsolete ./usr/X11R7/lib/modules/libxf8_32bpp.so.0 -unknown- obsolete
CVS commit: xsrc/external/mit/xf86-video-chips/dist/src
Module Name:xsrc
Committed By: mrg
Date: Wed Aug 3 01:30:42 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c
Log Message:
revert a bad merge with chips 1.2.4. now this builds with 1.10 like
the upstream does.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.11 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.12
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.11 Tue Jul 26 04:48:24 2011
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c Wed Aug 3 01:30:42 2011
@@ -128,8 +128,6 @@
#include xf4bpp.h
#endif
-#include hw/xfree86/xf8_16bpp/cfb8_16.h
-
/* int10 */
#include xf86int10.h
#include vbe.h
@@ -3823,7 +3821,7 @@
}
static Bool
-local_cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
+cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
int xsize, int ysize, int dpix, int dpiy,
int width16, int width8)
{
@@ -4018,7 +4016,7 @@
#endif
case 16:
if (cPtr-Flags ChipsOverlay8plus16) {
- ret = local_cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart +
+ ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart +
cPtr-FbOffset16, FBStart, width,
height, pScrn-xDpi, pScrn-yDpi,
displayWidth, displayWidth);
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: he Date: Wed Aug 3 01:32:16 UTC 2011 Modified Files: src/distrib/sets/lists/modules: md.evbppc Log Message: Add the spdmem directory and kernel modules for booke and 4xx. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/modules/md.evbppc 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/modules/md.evbppc diff -u src/distrib/sets/lists/modules/md.evbppc:1.4 src/distrib/sets/lists/modules/md.evbppc:1.5 --- src/distrib/sets/lists/modules/md.evbppc:1.4 Wed Jul 20 04:47:30 2011 +++ src/distrib/sets/lists/modules/md.evbppc Wed Aug 3 01:32:16 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbppc,v 1.4 2011/07/20 04:47:30 matt Exp $ +# $NetBSD: md.evbppc,v 1.5 2011/08/03 01:32:16 he Exp $ ./stand/powerpc-4xx base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@ base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules base-kernel-modules kmod @@ -120,6 +120,8 @@ ./stand/powerpc-4xx/@OSRELEASE@/modules/smbfs/smbfs.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/solarisbase-kernel-modules kmod,solaris ./stand/powerpc-4xx/@OSRELEASE@/modules/solaris/solaris.kmod base-kernel-modules kmod,solaris +./stand/powerpc-4xx/@OSRELEASE@/modules/spdmembase-kernel-modules kmod +./stand/powerpc-4xx/@OSRELEASE@/modules/spdmem/spdmem.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/suserbase-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/suser/suser.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/swsensorbase-kernel-modules kmod @@ -265,6 +267,8 @@ ./stand/powerpc-booke/@OSRELEASE@/modules/smbfs/smbfs.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/solarisbase-kernel-modules kmod,solaris ./stand/powerpc-booke/@OSRELEASE@/modules/solaris/solaris.kmod base-kernel-modules kmod,solaris +./stand/powerpc-booke/@OSRELEASE@/modules/spdmem base-kernel-modules kmod +./stand/powerpc-booke/@OSRELEASE@/modules/spdmem/spdmem.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/suserbase-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/suser/suser.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/swsensorbase-kernel-modules kmod
CVS commit: xsrc/xfree/xc/lib/Xp
Module Name:xsrc
Committed By: mrg
Date: Wed Aug 3 01:33:06 UTC 2011
Modified Files:
xsrc/xfree/xc/lib/Xp: XpContext.c XpPrinter.c
Log Message:
don't use (char)NULL
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/xfree/xc/lib/Xp/XpContext.c
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/xfree/xc/lib/Xp/XpPrinter.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/lib/Xp/XpContext.c
diff -u xsrc/xfree/xc/lib/Xp/XpContext.c:1.1.1.5 xsrc/xfree/xc/lib/Xp/XpContext.c:1.2
--- xsrc/xfree/xc/lib/Xp/XpContext.c:1.1.1.5 Fri Feb 28 13:18:52 2003
+++ xsrc/xfree/xc/lib/Xp/XpContext.c Wed Aug 3 01:33:06 2011
@@ -76,7 +76,7 @@
if ( locale == (char *) NULL )
req-localeLen = 0;
-else if ( *locale == (char) NULL )
+else if ( *locale == '\0' )
req-localeLen = 0;
else {
locale_len = strlen( locale );
Index: xsrc/xfree/xc/lib/Xp/XpPrinter.c
diff -u xsrc/xfree/xc/lib/Xp/XpPrinter.c:1.1.1.4 xsrc/xfree/xc/lib/Xp/XpPrinter.c:1.2
--- xsrc/xfree/xc/lib/Xp/XpPrinter.c:1.1.1.4 Fri Feb 28 13:18:52 2003
+++ xsrc/xfree/xc/lib/Xp/XpPrinter.c Wed Aug 3 01:33:06 2011
@@ -89,7 +89,7 @@
*/
if ( printer_name == (char *) NULL )
req-printerNameLen = 0;
-else if ( *printer_name == (char) NULL )
+else if ( *printer_name == '\0' )
req-printerNameLen = 0;
else {
printer_name_len= strlen( printer_name );
@@ -99,7 +99,7 @@
if ( locale == (char *) NULL )
req-localeLen = 0;
-else if ( *locale == (char) NULL )
+else if ( *locale == '\0' )
req-localeLen = 0;
else {
locale_len = strlen( locale );
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Wed Aug 3 01:43:26 UTC 2011 Modified Files: src/distrib/sets/lists/xcomp: md.amd64 md.cats md.i386 md.macppc md.sgimips md.shark md.sparc64 src/distrib/sets/lists/xserver: md.alpha md.amd64 md.bebox md.cats md.dreamcast md.ews4800mips md.hp300 md.hpcarm md.hpcmips md.hpcsh md.luna68k md.netwinder md.newsmips md.ofppc md.prep md.sgimips md.shark md.sparc md.zaurus Log Message: obsolete libxf8_16bpp. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xcomp/md.amd64 cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xcomp/md.cats cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/xcomp/md.i386 cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/xcomp/md.macppc cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/xcomp/md.sgimips cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/xcomp/md.shark cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/xcomp/md.sparc64 cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xserver/md.bebox cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/xserver/md.cats \ src/distrib/sets/lists/xserver/md.sgimips cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/xserver/md.dreamcast \ src/distrib/sets/lists/xserver/md.ofppc cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xserver/md.ews4800mips \ src/distrib/sets/lists/xserver/md.prep cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xserver/md.hp300 cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/xserver/md.hpcarm cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/xserver/md.hpcmips cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/xserver/md.hpcsh cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/xserver/md.luna68k \ src/distrib/sets/lists/xserver/md.newsmips \ src/distrib/sets/lists/xserver/md.zaurus cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xserver/md.netwinder cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xserver/md.shark cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/xserver/md.sparc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/md.amd64 diff -u src/distrib/sets/lists/xcomp/md.amd64:1.31 src/distrib/sets/lists/xcomp/md.amd64:1.32 --- src/distrib/sets/lists/xcomp/md.amd64:1.31 Thu Jan 20 18:55:38 2011 +++ src/distrib/sets/lists/xcomp/md.amd64 Wed Aug 3 01:43:25 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.31 2011/01/20 18:55:38 jmcneill Exp $ +# $NetBSD: md.amd64,v 1.32 2011/08/03 01:43:25 mrg Exp $ ./usr/X11R6/include/xf86Optrec.h -unknown- x11 ./usr/X11R6/include/xf86Parser.h -unknown- x11 ./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11 @@ -190,7 +190,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/libvbe.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/libvgahw.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/libxf8_16bpp.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/libxf8_16bpp.so.0.debug -unknown- obsolete ./usr/libdata/lint/llib-lI810XvMC.ln -unknown- lint,xorg ./usr/libdata/lint/llib-lIntelXvMC.ln -unknown- lint,xorg ./usr/libdata/lint/llib-lchromeXvMC.ln -unknown- lint,xorg Index: src/distrib/sets/lists/xcomp/md.cats diff -u src/distrib/sets/lists/xcomp/md.cats:1.10 src/distrib/sets/lists/xcomp/md.cats:1.11 --- src/distrib/sets/lists/xcomp/md.cats:1.10 Fri May 28 05:39:56 2010 +++ src/distrib/sets/lists/xcomp/md.cats Wed Aug 3 01:43:25 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.cats,v 1.10 2010/05/28 05:39:56 lukem Exp $ +# $NetBSD: md.cats,v 1.11 2011/08/03 01:43:25 mrg Exp $ ./usr/X11R6/include/xf86Optrec.h -unknown- x11 ./usr/X11R6/include/xf86Parser.h -unknown- x11 ./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11 @@ -116,4 +116,4 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/libvbe.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/libvgahw.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/libxf8_16bpp.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/libxf8_16bpp.so.0.debug -unknown- obsolete Index: src/distrib/sets/lists/xcomp/md.i386 diff -u src/distrib/sets/lists/xcomp/md.i386:1.38 src/distrib/sets/lists/xcomp/md.i386:1.39 --- src/distrib/sets/lists/xcomp/md.i386:1.38 Thu Jan 20 18:55:38 2011 +++ src/distrib/sets/lists/xcomp/md.i386 Wed Aug 3 01:43:25 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.38 2011/01/20 18:55:38 jmcneill Exp $ +# $NetBSD: md.i386,v 1.39 2011/08/03 01:43:25 mrg Exp $ ./usr/X11R6/include/xf86Optrec.h
CVS commit: src/sbin/sysctl
Module Name:src
Committed By: christos
Date: Wed Aug 3 01:47:40 UTC 2011
Modified Files:
src/sbin/sysctl: sysctl.8 sysctl.c
Log Message:
allow -q flag to work for reads.
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sbin/sysctl/sysctl.8
cvs rdiff -u -r1.134 -r1.135 src/sbin/sysctl/sysctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/sysctl/sysctl.8
diff -u src/sbin/sysctl/sysctl.8:1.161 src/sbin/sysctl/sysctl.8:1.162
--- src/sbin/sysctl/sysctl.8:1.161 Wed Sep 30 00:30:50 2009
+++ src/sbin/sysctl/sysctl.8 Tue Aug 2 21:47:40 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: sysctl.8,v 1.161 2009/09/30 04:30:50 elad Exp $
+.\ $NetBSD: sysctl.8,v 1.162 2011/08/03 01:47:40 christos Exp $
.\
.\ Copyright (c) 2004 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -54,7 +54,7 @@
.\
.\ @(#)sysctl.8 8.1 (Berkeley) 6/6/93
.\
-.Dd September 30, 2009
+.Dd August 2, 2011
.Dt SYSCTL 8
.Os
.Sh NAME
@@ -62,7 +62,7 @@
.Nd get or set kernel state
.Sh SYNOPSIS
.Nm sysctl
-.Op Fl AdeMn
+.Op Fl AdeMnq
.Oo
.Fl r |
.Fl x
@@ -185,8 +185,11 @@
set psize=`sysctl -n hw.pagesize`
.Ed
.It Fl q
-Used to indicate that nothing should be printed for writes unless an
+Used to indicate that nothing should be printed for reads or writes unless an
error is detected.
+For reads, not finding a variable does not print an error, but exits with
+an error code.
+This is useful just for testing that a variable exists.
.It Fl r
Raw output form.
Values printed are in their raw binary forms as retrieved directly
Index: src/sbin/sysctl/sysctl.c
diff -u src/sbin/sysctl/sysctl.c:1.134 src/sbin/sysctl/sysctl.c:1.135
--- src/sbin/sysctl/sysctl.c:1.134 Fri Apr 15 21:15:54 2011
+++ src/sbin/sysctl/sysctl.c Tue Aug 2 21:47:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.c,v 1.134 2011/04/16 01:15:54 christos Exp $ */
+/* $NetBSD: sysctl.c,v 1.135 2011/08/03 01:47:40 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#if 0
static char sccsid[] = @(#)sysctl.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: sysctl.c,v 1.134 2011/04/16 01:15:54 christos Exp $);
+__RCSID($NetBSD: sysctl.c,v 1.135 2011/08/03 01:47:40 christos Exp $);
#endif
#endif /* not lint */
@@ -321,8 +321,6 @@
argc -= optind;
argv += optind;
- if (qflag !wflag)
- usage();
if (xflag rflag)
usage();
/* if ((xflag || rflag) wflag)
@@ -1540,7 +1538,7 @@
\t%s %s\n
\t%s %s\n
\t%s %s\n,
- progname, [-dne] [-x[x]|-r] variable ...,
+ progname, [-dneq] [-x[x]|-r] variable ...,
progname, [-ne] [-q] -w variable=value ...,
progname, [-dne] -a,
progname, [-dne] -A,
@@ -1688,6 +1686,10 @@
sysctlparseerror(u_int namelen, const char *pname)
{
+ if (qflag) {
+ errs++;
+ return;
+ }
sysctlperror(%s level name '%s' in '%s' is invalid\n,
lname[namelen], gsname, pname);
}
CVS commit: src/sbin/sysctl
Module Name:src Committed By: christos Date: Wed Aug 3 01:58:30 UTC 2011 Modified Files: src/sbin/sysctl: sysctl.c Log Message: no -A or -a with -q To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 src/sbin/sysctl/sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/sysctl/sysctl.c diff -u src/sbin/sysctl/sysctl.c:1.135 src/sbin/sysctl/sysctl.c:1.136 --- src/sbin/sysctl/sysctl.c:1.135 Tue Aug 2 21:47:40 2011 +++ src/sbin/sysctl/sysctl.c Tue Aug 2 21:58:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sysctl.c,v 1.135 2011/08/03 01:47:40 christos Exp $ */ +/* $NetBSD: sysctl.c,v 1.136 2011/08/03 01:58:30 christos Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ #if 0 static char sccsid[] = @(#)sysctl.c 8.1 (Berkeley) 6/6/93; #else -__RCSID($NetBSD: sysctl.c,v 1.135 2011/08/03 01:47:40 christos Exp $); +__RCSID($NetBSD: sysctl.c,v 1.136 2011/08/03 01:58:30 christos Exp $); #endif #endif /* not lint */ @@ -325,8 +325,10 @@ usage(); /* if ((xflag || rflag) wflag) usage(); */ - /* if (aflag Mflag) + /* if (aflag (Mflag || qflag)) usage(); */ + if ((aflag || Aflag) qflag) + usage(); if ((Aflag || Mflag || dflag) argc == 0 fn == NULL) aflag = 1;
CVS commit: xsrc/external/mit/twm/dist
Module Name:xsrc Committed By: mrg Date: Wed Aug 3 02:44:36 UTC 2011 Update of /cvsroot/xsrc/external/mit/twm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27499 Log Message: initial import of twm-1.0.7 Status: Vendor Tag: xorg Release Tags: twm-1-0-7 U xsrc/external/mit/twm/dist/INSTALL U xsrc/external/mit/twm/dist/config.h.in U xsrc/external/mit/twm/dist/configure U xsrc/external/mit/twm/dist/ChangeLog U xsrc/external/mit/twm/dist/depcomp U xsrc/external/mit/twm/dist/missing U xsrc/external/mit/twm/dist/config.sub U xsrc/external/mit/twm/dist/config.guess U xsrc/external/mit/twm/dist/ylwrap U xsrc/external/mit/twm/dist/COPYING U xsrc/external/mit/twm/dist/install-sh U xsrc/external/mit/twm/dist/README U xsrc/external/mit/twm/dist/aclocal.m4 U xsrc/external/mit/twm/dist/Makefile.in U xsrc/external/mit/twm/dist/configure.ac U xsrc/external/mit/twm/dist/Makefile.am U xsrc/external/mit/twm/dist/man/Makefile.in U xsrc/external/mit/twm/dist/man/Makefile.am U xsrc/external/mit/twm/dist/man/twm.man U xsrc/external/mit/twm/dist/src/siconify.bm U xsrc/external/mit/twm/dist/src/resize.h U xsrc/external/mit/twm/dist/src/gc.h U xsrc/external/mit/twm/dist/src/iconmgr.h U xsrc/external/mit/twm/dist/src/parse.h U xsrc/external/mit/twm/dist/src/version.h U xsrc/external/mit/twm/dist/src/screen.h U xsrc/external/mit/twm/dist/src/menus.c U xsrc/external/mit/twm/dist/src/gram.c U xsrc/external/mit/twm/dist/src/events.c U xsrc/external/mit/twm/dist/src/add_window.c U xsrc/external/mit/twm/dist/src/icons.h U xsrc/external/mit/twm/dist/src/cursor.c U xsrc/external/mit/twm/dist/src/util.c U xsrc/external/mit/twm/dist/src/session.h U xsrc/external/mit/twm/dist/src/list.c U xsrc/external/mit/twm/dist/src/twm.h U xsrc/external/mit/twm/dist/src/gram.y U xsrc/external/mit/twm/dist/src/lex.c U xsrc/external/mit/twm/dist/src/add_window.h U xsrc/external/mit/twm/dist/src/util.h U xsrc/external/mit/twm/dist/src/Makefile.am U xsrc/external/mit/twm/dist/src/version.c U xsrc/external/mit/twm/dist/src/gram.h U xsrc/external/mit/twm/dist/src/events.h U xsrc/external/mit/twm/dist/src/icons.c U xsrc/external/mit/twm/dist/src/iconmgr.c U xsrc/external/mit/twm/dist/src/lex.l U xsrc/external/mit/twm/dist/src/deftwmrc.sed U xsrc/external/mit/twm/dist/src/menus.h U xsrc/external/mit/twm/dist/src/resize.c U xsrc/external/mit/twm/dist/src/gc.c U xsrc/external/mit/twm/dist/src/parse.c U xsrc/external/mit/twm/dist/src/Makefile.in U xsrc/external/mit/twm/dist/src/system.twmrc U xsrc/external/mit/twm/dist/src/session.c U xsrc/external/mit/twm/dist/src/deftwmrc.c U xsrc/external/mit/twm/dist/src/list.h U xsrc/external/mit/twm/dist/src/twm.c U xsrc/external/mit/twm/dist/sample-twmrc/jim.twmrc U xsrc/external/mit/twm/dist/sample-twmrc/keith.twmrc U xsrc/external/mit/twm/dist/sample-twmrc/lemke.twmrc No conflicts created by this import
CVS commit: xsrc/external/mit/x11perf/dist
Module Name:xsrc Committed By: mrg Date: Wed Aug 3 02:44:51 UTC 2011 Update of /cvsroot/xsrc/external/mit/x11perf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20019 Log Message: initial import of x11perf 1.5.4. changes include: - Add tests for ShmGetImage Status: Vendor Tag: xorg Release Tags: x11perf-1-5-4 U xsrc/external/mit/x11perf/dist/INSTALL U xsrc/external/mit/x11perf/dist/config.h.in U xsrc/external/mit/x11perf/dist/do_rects.c U xsrc/external/mit/x11perf/dist/do_movewin.c N xsrc/external/mit/x11perf/dist/x11perfcomp.in U xsrc/external/mit/x11perf/dist/install-sh U xsrc/external/mit/x11perf/dist/fillblnk U xsrc/external/mit/x11perf/dist/bitmaps.c U xsrc/external/mit/x11perf/dist/do_tris.c U xsrc/external/mit/x11perf/dist/perfboth U xsrc/external/mit/x11perf/dist/aclocal.m4 U xsrc/external/mit/x11perf/dist/do_complex.c U xsrc/external/mit/x11perf/dist/configure.ac U xsrc/external/mit/x11perf/dist/do_lines.c U xsrc/external/mit/x11perf/dist/x11perf.c U xsrc/external/mit/x11perf/dist/do_tests.c U xsrc/external/mit/x11perf/dist/do_text.c U xsrc/external/mit/x11perf/dist/do_valgc.c U xsrc/external/mit/x11perf/dist/Xmark U xsrc/external/mit/x11perf/dist/config.sub U xsrc/external/mit/x11perf/dist/do_simple.c U xsrc/external/mit/x11perf/dist/do_segs.c U xsrc/external/mit/x11perf/dist/bitmaps.h U xsrc/external/mit/x11perf/dist/config.guess U xsrc/external/mit/x11perf/dist/COPYING U xsrc/external/mit/x11perf/dist/README U xsrc/external/mit/x11perf/dist/do_windows.c U xsrc/external/mit/x11perf/dist/Makefile.in U xsrc/external/mit/x11perf/dist/configure U xsrc/external/mit/x11perf/dist/missing U xsrc/external/mit/x11perf/dist/x11perf.h U xsrc/external/mit/x11perf/dist/do_arcs.c U xsrc/external/mit/x11perf/dist/depcomp U xsrc/external/mit/x11perf/dist/perfratio U xsrc/external/mit/x11perf/dist/Makefile.am U xsrc/external/mit/x11perf/dist/do_traps.c U xsrc/external/mit/x11perf/dist/do_dots.c U xsrc/external/mit/x11perf/dist/ChangeLog U xsrc/external/mit/x11perf/dist/do_blt.c N xsrc/external/mit/x11perf/dist/man/x11perfcomp.man N xsrc/external/mit/x11perf/dist/man/Makefile.in N xsrc/external/mit/x11perf/dist/man/x11perf.man N xsrc/external/mit/x11perf/dist/man/Xmark.man N xsrc/external/mit/x11perf/dist/man/Makefile.am No conflicts created by this import
CVS commit: xsrc/external/mit/xinit/dist
Module Name:xsrc Committed By: mrg Date: Wed Aug 3 02:44:53 UTC 2011 Update of /cvsroot/xsrc/external/mit/xinit/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4573 Log Message: initial import of xinit-1.3.1 Status: Vendor Tag: xorg Release Tags: xinit-1-3-1 U xsrc/external/mit/xinit/dist/aclocal.m4 U xsrc/external/mit/xinit/dist/autogen.sh U xsrc/external/mit/xinit/dist/ChangeLog U xsrc/external/mit/xinit/dist/config.guess U xsrc/external/mit/xinit/dist/config.h.in U xsrc/external/mit/xinit/dist/config.sub U xsrc/external/mit/xinit/dist/configure U xsrc/external/mit/xinit/dist/configure.ac U xsrc/external/mit/xinit/dist/COPYING U xsrc/external/mit/xinit/dist/cpprules.in U xsrc/external/mit/xinit/dist/depcomp U xsrc/external/mit/xinit/dist/INSTALL U xsrc/external/mit/xinit/dist/install-sh U xsrc/external/mit/xinit/dist/Makefile.am U xsrc/external/mit/xinit/dist/Makefile.in U xsrc/external/mit/xinit/dist/missing U xsrc/external/mit/xinit/dist/README U xsrc/external/mit/xinit/dist/startx.cpp C xsrc/external/mit/xinit/dist/xinit.c U xsrc/external/mit/xinit/dist/xinitrc.cpp N xsrc/external/mit/xinit/dist/launchd/console_redirect.c N xsrc/external/mit/xinit/dist/launchd/console_redirect.h N xsrc/external/mit/xinit/dist/launchd/Makefile.am N xsrc/external/mit/xinit/dist/launchd/Makefile.in N xsrc/external/mit/xinit/dist/launchd/privileged_startx/20-font_cache.cpp N xsrc/external/mit/xinit/dist/launchd/privileged_startx/10-tmpdirs.cpp N xsrc/external/mit/xinit/dist/launchd/privileged_startx/Makefile.am N xsrc/external/mit/xinit/dist/launchd/privileged_startx/client.c N xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.c N xsrc/external/mit/xinit/dist/launchd/privileged_startx/Makefile.in N xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.plist.cpp N xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.defs N xsrc/external/mit/xinit/dist/launchd/privileged_startx/server.c N xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx_types.h N xsrc/external/mit/xinit/dist/launchd/user_startx/launchd_startx.c N xsrc/external/mit/xinit/dist/launchd/user_startx/Makefile.am N xsrc/external/mit/xinit/dist/launchd/user_startx/Makefile.in N xsrc/external/mit/xinit/dist/launchd/user_startx/startx.plist.cpp N xsrc/external/mit/xinit/dist/man/Makefile.am N xsrc/external/mit/xinit/dist/man/Makefile.in N xsrc/external/mit/xinit/dist/man/startx.man N xsrc/external/mit/xinit/dist/man/xinit.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xinit/dist
CVS commit: xsrc/external/mit/xset/dist
Module Name:xsrc Committed By: mrg Date: Wed Aug 3 02:44:55 UTC 2011 Update of /cvsroot/xsrc/external/mit/xset/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25340 Log Message: initial import of xset-1.2.2 Status: Vendor Tag: xorg Release Tags: xset-1-2-2 U xsrc/external/mit/xset/dist/config.sub U xsrc/external/mit/xset/dist/COPYING U xsrc/external/mit/xset/dist/configure.ac U xsrc/external/mit/xset/dist/config.h.in U xsrc/external/mit/xset/dist/xset.c U xsrc/external/mit/xset/dist/depcomp U xsrc/external/mit/xset/dist/missing U xsrc/external/mit/xset/dist/README U xsrc/external/mit/xset/dist/Makefile.in U xsrc/external/mit/xset/dist/INSTALL U xsrc/external/mit/xset/dist/aclocal.m4 U xsrc/external/mit/xset/dist/install-sh U xsrc/external/mit/xset/dist/configure U xsrc/external/mit/xset/dist/Makefile.am U xsrc/external/mit/xset/dist/config.guess U xsrc/external/mit/xset/dist/ChangeLog N xsrc/external/mit/xset/dist/man/Makefile.in N xsrc/external/mit/xset/dist/man/xset.man N xsrc/external/mit/xset/dist/man/Makefile.am No conflicts created by this import
CVS commit: xsrc/external/mit/x11perf/dist
Module Name:xsrc Committed By: mrg Date: Wed Aug 3 02:47:13 UTC 2011 Removed Files: xsrc/external/mit/x11perf/dist: Xmark.man x11pcomp.cpp x11perf.man x11perfcomp.man Log Message: merge x11perf 1.5.4. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/x11perf/dist/Xmark.man \ xsrc/external/mit/x11perf/dist/x11perf.man cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/x11perf/dist/x11pcomp.cpp \ xsrc/external/mit/x11perf/dist/x11perfcomp.man Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xset/dist
Module Name:xsrc Committed By: mrg Date: Wed Aug 3 02:50:01 UTC 2011 Removed Files: xsrc/external/mit/xset/dist: xset.man Log Message: merge xset 1.2.2 To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/xset/dist/xset.man Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xinit/dist
Module Name:xsrc
Committed By: mrg
Date: Wed Aug 3 02:50:11 UTC 2011
Modified Files:
xsrc/external/mit/xinit/dist: xinit.c
Removed Files:
xsrc/external/mit/xinit/dist: org.x.startx.plist.cpp startx.man
xinit.man
xsrc/external/mit/xinit/dist/privileged_startx: 10-tmpdirs.cpp
20-font_cache.cpp Makefile.am Makefile.in client.c
org.x.privileged_startx.plist.cpp privileged_startx.c
privileged_startx.defs privileged_startx_types.h server.c
Log Message:
merge xinit 1.3.1
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/xinit/dist/org.x.startx.plist.cpp
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xinit/dist/startx.man \
xsrc/external/mit/xinit/dist/xinit.man
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xinit/dist/xinit.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xinit/dist/privileged_startx/10-tmpdirs.cpp \
xsrc/external/mit/xinit/dist/privileged_startx/privileged_startx.c \
xsrc/external/mit/xinit/dist/privileged_startx/privileged_startx.defs
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xinit/dist/privileged_startx/20-font_cache.cpp \
xsrc/external/mit/xinit/dist/privileged_startx/privileged_startx_types.h
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/xinit/dist/privileged_startx/Makefile.am \
xsrc/external/mit/xinit/dist/privileged_startx/client.c \
xsrc/external/mit/xinit/dist/privileged_startx/org.x.privileged_startx.plist.cpp
\
xsrc/external/mit/xinit/dist/privileged_startx/server.c
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/xinit/dist/privileged_startx/Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xinit/dist/xinit.c
diff -u xsrc/external/mit/xinit/dist/xinit.c:1.2 xsrc/external/mit/xinit/dist/xinit.c:1.3
--- xsrc/external/mit/xinit/dist/xinit.c:1.2 Sun Nov 21 03:53:10 2010
+++ xsrc/external/mit/xinit/dist/xinit.c Wed Aug 3 02:50:11 2011
@@ -380,9 +380,8 @@
else
fprintf(stderr, .);
fflush(stderr);
-}
-if (timeout)
sleep(1);
+}
if (++i timeout)
break;
}
@@ -620,7 +619,7 @@
if (!processTimeout(10, X server to shut down))
return;
-Errorx(X server slow to shut down, senging KILL signal);
+Errorx(X server slow to shut down, sending KILL signal);
if (killpg(serverpid, SIGKILL) 0) {
if (errno == ESRCH)
CVS commit: src/external/mit/xorg/bin/x11perf
Module Name:src
Committed By: mrg
Date: Wed Aug 3 02:55:30 UTC 2011
Modified Files:
src/external/mit/xorg/bin/x11perf: Makefile
Log Message:
updates for x11perf 1.5.4
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/x11perf/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/x11perf/Makefile
diff -u src/external/mit/xorg/bin/x11perf/Makefile:1.1.1.1 src/external/mit/xorg/bin/x11perf/Makefile:1.2
--- src/external/mit/xorg/bin/x11perf/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/x11perf/Makefile Wed Aug 3 02:55:30 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/08/03 02:55:30 mrg Exp $
.include bsd.own.mk
@@ -12,10 +12,12 @@
MAN= Xmark.1 x11perf.1 x11perfcomp.1
-BUILDSYMLINKS= x11pcomp.cpp x11perfcomp.cpp
+x11perfcomp: x11perfcomp.in
+ ${TOOL_SED} \
+ -e s,@x11perfcompdir@,${X11LIBDIR}/x11perfcomp,; \
+ -e s,@MKTEMP@,/usr/bin/mktemp,; \
+ ${.ALLSRC} ${.TARGET}
-CPPSCRIPTS= x11perfcomp
-CPPSCRIPTFLAGS= -DLIBPATH=${X11LIBDIR}/x11perfcomp
SCRIPTS= x11perfcomp Xmark \
fillblnk perfboth perfratio
SCRIPTSDIR_fillblnk.sh= ${X11LIBDIR}/x11perfcomp
@@ -28,6 +30,7 @@
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src
Committed By: mrg
Date: Wed Aug 3 02:56:29 UTC 2011
Modified Files:
src/external/mit/xorg/bin/xinit: Makefile
Log Message:
look in .../man as well.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xinit/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/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.5 src/external/mit/xorg/bin/xinit/Makefile:1.6
--- src/external/mit/xorg/bin/xinit/Makefile:1.5 Sun Nov 21 02:33:41 2010
+++ src/external/mit/xorg/bin/xinit/Makefile Wed Aug 3 02:56:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/11/21 02:33:41 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2011/08/03 02:56:29 mrg Exp $
.include bsd.own.mk
@@ -31,6 +31,7 @@
X11MANCPP= yes
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
CVS commit: src/external/mit/xorg/bin/xset
Module Name:src
Committed By: mrg
Date: Wed Aug 3 02:57:23 UTC 2011
Modified Files:
src/external/mit/xorg/bin/xset: Makefile
Log Message:
look in .../man also.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xset/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/xset/Makefile
diff -u src/external/mit/xorg/bin/xset/Makefile:1.1.1.1 src/external/mit/xorg/bin/xset/Makefile:1.2
--- src/external/mit/xorg/bin/xset/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xset/Makefile Wed Aug 3 02:57:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/08/03 02:57:23 mrg Exp $
.include bsd.own.mk
@@ -11,6 +11,7 @@
DPADD+= ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: mrg
Date: Wed Aug 3 03:06:00 UTC 2011
Modified Files:
xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c
xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c
Removed Files:
xsrc/external/mit/libX11/dist/man: XFreeModifierMap.man
xsrc/external/mit/libX11/dist/specs: xmlrules.in
Log Message:
merge libX11 1.4.4
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libX11/dist/man/XFreeModifierMap.man
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libX11/dist/specs/xmlrules.in
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
diff -u xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.3 xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.4
--- xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.3 Sat Jul 23 11:11:58 2011
+++ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c Wed Aug 3 03:06:00 2011
@@ -2680,10 +2680,9 @@
*conv-methods = *methods;
conv-methods-reset = init_state;
-conv-state = (XPointer) Xmalloc(sizeof(StateRec));
+conv-state = Xcalloc(1, sizeof(StateRec));
if (conv-state == NULL)
goto err;
-bzero((char *) conv-state, sizeof(StateRec));
state = (State) conv-state;
state-lcd = lcd;
Index: xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c
diff -u xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c:1.5 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c:1.6
--- xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c:1.5 Wed Feb 23 08:04:05 2011
+++ xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c Wed Aug 3 03:06:00 2011
@@ -86,16 +86,6 @@
#include XlcPublic.h
#include XlcPubI.h
-#if !defined(__NetBSD__) defined(_LP64) defined(__sparcv9)
-# define _MACH64_NAME sparcv9
-#else
-# undef _MACH64_NAME
-#endif /* defined(_LP64) defined(__sparcv9) */
-
-#ifdef _MACH64_NAME
-# define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1)
-#endif
-
#define XI18N_DLREL 2
#define iscomment(ch) ((ch) == '\0' || (ch) == '#')
@@ -269,35 +259,6 @@
if (strstr (dl_name, ../))
return NULL;
-#if defined (_LP64) defined (_MACH64_NAME)
-len = (lc_dir ? strlen(lc_dir) : 0 ) +
- (dl_name ? strlen(dl_name) : 0) + _MACH64_NAME_LEN + 10;
-path = Xmalloc(len + 1);
-
-if (strchr(dl_name, '/') != NULL) {
- char *tmp = strdup(dl_name);
- char *dl_dir, *dl_file;
- char *slash_p;
- slash_p = strchr(tmp, '/');
- *slash_p = '\0';
- dl_dir = tmp;
- dl_file = ++slash_p;
-
- slash_p = strrchr(lc_dir, '/');
- *slash_p = '\0';
- strcpy(path, lc_dir); strcat(path, /);
- strcat(path, dl_dir); strcat(path, /);
- strcat(path, _MACH64_NAME); strcat(path, /);
- strcat(path, dl_file); strcat(path, .so.2);
-
- *slash_p = '/';
- Xfree(tmp);
-} else {
- strcpy(path, lc_dir); strcat(path, /);
- strcat(path, _MACH64_NAME); strcat(path, /);
- strcat(path, dl_name); strcat(path, .so.2);
-}
-#else
len = (lc_dir ? strlen(lc_dir) : 0 ) +
(dl_name ? strlen(dl_name) : 0) + 10;
#if defined POSTLOCALELIBDIR
@@ -322,7 +283,6 @@
#endif
strcat(path, dl_name); strcat(path, .so.2);
}
-#endif
return path;
}
CVS commit: src
Module Name:src
Committed By: manu
Date: Wed Aug 3 04:11:17 UTC 2011
Modified Files:
src/bin/cp: cp.c utils.c
src/bin/mv: mv.c
src/distrib/sets/lists/comp: mi
src/lib/libc/gen: Makefile.inc extattr.3 extattr.c
src/lib/libc/sys: extattr_get_file.2
src/sys/sys: extattr.h
Log Message:
Make cp -p and mv preverve extended attributes, and complain if they cannot.
Also introduce library functions for copying extended attributes from one
file to another:
- extattr_copy_file, extattr_copy_fd, extattr_copy_link, with FreeBSD style,
where a namespace is to be supplied
- cpxattr, fcpxattr, lcpxattr, with Linux style, where all namespaces
accessible to the caller are copied, and the others are silently ignored.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/bin/cp/cp.c
cvs rdiff -u -r1.39 -r1.40 src/bin/cp/utils.c
cvs rdiff -u -r1.41 -r1.42 src/bin/mv/mv.c
cvs rdiff -u -r1.1651 -r1.1652 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.178 -r1.179 src/lib/libc/gen/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/gen/extattr.3
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/gen/extattr.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/sys/extattr_get_file.2
cvs rdiff -u -r1.6 -r1.7 src/sys/sys/extattr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/cp/cp.c
diff -u src/bin/cp/cp.c:1.55 src/bin/cp/cp.c:1.56
--- src/bin/cp/cp.c:1.55 Sun Feb 6 12:37:49 2011
+++ src/bin/cp/cp.c Wed Aug 3 04:11:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cp.c,v 1.55 2011/02/06 12:37:49 darcy Exp $ */
+/* $NetBSD: cp.c,v 1.56 2011/08/03 04:11:15 manu Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -43,7 +43,7 @@
#if 0
static char sccsid[] = @(#)cp.c 8.5 (Berkeley) 4/29/95;
#else
-__RCSID($NetBSD: cp.c,v 1.55 2011/02/06 12:37:49 darcy Exp $);
+__RCSID($NetBSD: cp.c,v 1.56 2011/08/03 04:11:15 manu Exp $);
#endif
#endif /* not lint */
@@ -197,6 +197,13 @@
myumask = umask(0);
(void)umask(myumask);
+ /*
+ * Warn that system extended attributes will not be preserved
+ * if not root
+ */
+ if ((myuid != 0) pflag)
+ warnx(system extended attribute will not be preserved);
+
/* Save the target base in to. */
target = argv[--argc];
if (strlcpy(to.p_path, target, sizeof(to.p_path)) = sizeof(to.p_path))
Index: src/bin/cp/utils.c
diff -u src/bin/cp/utils.c:1.39 src/bin/cp/utils.c:1.40
--- src/bin/cp/utils.c:1.39 Sun Feb 6 12:37:49 2011
+++ src/bin/cp/utils.c Wed Aug 3 04:11:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: utils.c,v 1.39 2011/02/06 12:37:49 darcy Exp $ */
+/* $NetBSD: utils.c,v 1.40 2011/08/03 04:11:15 manu Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)utils.c 8.3 (Berkeley) 4/1/94;
#else
-__RCSID($NetBSD: utils.c,v 1.39 2011/02/06 12:37:49 darcy Exp $);
+__RCSID($NetBSD: utils.c,v 1.40 2011/08/03 04:11:15 manu Exp $);
#endif
#endif /* not lint */
@@ -42,6 +42,7 @@
#include sys/param.h
#include sys/stat.h
#include sys/time.h
+#include sys/extattr.h
#include err.h
#include errno.h
@@ -227,6 +228,9 @@
}
}
+ if (pflag (fcpxattr(from_fd, to_fd) != 0))
+ warn(%s: error copying extended attributes, to.p_path);
+
(void)close(from_fd);
if (rval == 1) {
Index: src/bin/mv/mv.c
diff -u src/bin/mv/mv.c:1.41 src/bin/mv/mv.c:1.42
--- src/bin/mv/mv.c:1.41 Sun Jul 20 00:52:40 2008
+++ src/bin/mv/mv.c Wed Aug 3 04:11:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mv.c,v 1.41 2008/07/20 00:52:40 lukem Exp $ */
+/* $NetBSD: mv.c,v 1.42 2011/08/03 04:11:15 manu Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)mv.c 8.2 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: mv.c,v 1.41 2008/07/20 00:52:40 lukem Exp $);
+__RCSID($NetBSD: mv.c,v 1.42 2011/08/03 04:11:15 manu Exp $);
#endif
#endif /* not lint */
@@ -50,6 +50,7 @@
#include sys/time.h
#include sys/wait.h
#include sys/stat.h
+#include sys/extattr.h
#include err.h
#include errno.h
@@ -290,6 +291,10 @@
(void)close(to_fd);
return (1);
}
+
+ if (fcpxattr(from_fd, to_fd) == -1)
+ warn(%s: error copying extended attributes, to);
+
(void)close(from_fd);
#ifdef BSD4_4
TIMESPEC_TO_TIMEVAL(tval[0], sbp-st_atimespec);
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1651 src/distrib/sets/lists/comp/mi:1.1652
--- src/distrib/sets/lists/comp/mi:1.1651 Sun Jul 31 03:48:49 2011
+++ src/distrib/sets/lists/comp/mi Wed Aug 3 04:11:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1651 2011/07/31 03:48:49 dholland Exp $
+# $NetBSD: mi,v 1.1652 2011/08/03 04:11:15 manu Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -5973,6 +5973,7 @@
./usr/share/man/cat3/cpuset_set.0 comp-c-catman .cat
./usr/share/man/cat3/cpuset_size.0 comp-c-catman .cat
./usr/share/man/cat3/cpuset_zero.0 comp-c-catman .cat
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Wed Aug 3 05:27:08 UTC 2011
Modified Files:
src/sys/dev/pci: machfb.c
Log Message:
don't try to a 'better' vertical frequency, it's almost certainly wrong with
flat panels
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/pci/machfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/machfb.c
diff -u src/sys/dev/pci/machfb.c:1.69 src/sys/dev/pci/machfb.c:1.70
--- src/sys/dev/pci/machfb.c:1.69 Mon Aug 1 12:28:53 2011
+++ src/sys/dev/pci/machfb.c Wed Aug 3 05:27:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machfb.c,v 1.69 2011/08/01 12:28:53 mbalmer Exp $ */
+/* $NetBSD: machfb.c,v 1.70 2011/08/03 05:27:08 macallan Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@@ -34,7 +34,7 @@
#include sys/cdefs.h
__KERNEL_RCSID(0,
- $NetBSD: machfb.c,v 1.69 2011/08/01 12:28:53 mbalmer Exp $);
+ $NetBSD: machfb.c,v 1.70 2011/08/03 05:27:08 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -607,14 +607,6 @@
#ifdef MACHFB_DEBUG
edid_print(ei);
#endif
- if (ei.edid_have_range) {
-
- /* ei has dotclock in MHz, struct videomode in kHz */
- mode = pick_mode_by_dotclock(width, height,
- ei.edid_range.er_max_clock * 1000);
- if (mode != NULL)
-printf(mode: %s\n, mode-name);
- }
}
is_gx = 0;
CVS commit: othersrc/external/bsd/circa/dist
Module Name:othersrc
Committed By: agc
Date: Wed Aug 3 05:52:19 UTC 2011
Modified Files:
othersrc/external/bsd/circa/dist: circa.c circa.h libcirca.3 main.c
Log Message:
The function to circa encode/decode a file is useful in itself. Move it
from the driver program to the library itself, and rename it circa_file()
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/circa/dist/circa.c
cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/circa/dist/circa.h
cvs rdiff -u -r1.4 -r1.5 othersrc/external/bsd/circa/dist/libcirca.3 \
othersrc/external/bsd/circa/dist/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/circa/dist/circa.c
diff -u othersrc/external/bsd/circa/dist/circa.c:1.3 othersrc/external/bsd/circa/dist/circa.c:1.4
--- othersrc/external/bsd/circa/dist/circa.c:1.3 Thu May 12 05:42:18 2011
+++ othersrc/external/bsd/circa/dist/circa.c Wed Aug 3 05:52:19 2011
@@ -290,3 +290,86 @@
}
return 1;
}
+
+/* process a file - encoding or decoding */
+int
+circa_file(circa_t *circa, size_t sectorsize, int encoding, char *in, char *fout)
+{
+ uint8_t *buf;
+ uint8_t *out;
+ ssize_t outcc;
+ ssize_t cc;
+ size_t readsize;
+ FILE *fpout;
+ FILE *fpin;
+ int ok;
+
+ if (in == NULL) {
+ fpin = stdin;
+ } else if ((fpin = fopen(in, r)) == NULL) {
+ (void) fprintf(stderr, can't read '%s'\n, in);
+ return 0;
+ }
+ if (fout == NULL) {
+ fpout = stdout;
+ } else if ((fpout = fopen(fout, w)) == NULL) {
+ (void) fprintf(stderr, can't write '%s'\n, fout);
+ if (fpin != stdin) {
+ (void) fclose(fpin);
+ }
+ return 0;
+ }
+ if (encoding) {
+ /* copy the encoding paramters to output */
+ if (!circa_init(circa, sectorsize)) {
+ (void) fprintf(stderr, bad sectorsize %zu\n, sectorsize);
+ return 0;
+ }
+ readsize = circa-datasize;
+ if ((buf = calloc(1, sectorsize)) == NULL || (out = calloc(1, sectorsize)) == NULL) {
+ (void) fprintf(stderr, can't allocate sectorsize buffers\n);
+ return 0;
+ }
+ outcc = circa_put_header(circa, out, sectorsize);
+ if (write(fileno(fpout), out, (size_t)outcc) != outcc) {
+ (void) fprintf(stderr, short write\n);
+ return 0;
+ }
+ } else {
+ /* read the encoding paramters from input */
+ if (read(fileno(fpin), circa-header, sizeof(circa-header)) != sizeof(circa-header)) {
+ (void) fprintf(stderr, short read\n);
+ return 0;
+ }
+ if (circa_get_header(circa, circa-header, sizeof(circa-header)) != sizeof(circa-header) ||
+ !circa_init(circa, readsize = sectorsize = circa-header.sectorsize)) {
+ (void) fprintf(stderr, bad sectorsize %zu\n, sectorsize);
+ return 0;
+ }
+ if ((buf = calloc(1, sectorsize)) == NULL ||
+ (out = calloc(1, sectorsize)) == NULL) {
+ (void) fprintf(stderr, can't allocate sectorsize buffers\n);
+ return 0;
+ }
+ }
+ for (ok = 1 ; ok (cc = read(fileno(fpin), buf, readsize)) 0 ; ) {
+ if (encoding) {
+ outcc = circa_encode(circa, buf, (size_t)cc, out, sectorsize);
+ } else {
+ outcc = circa_decode(circa, buf, (size_t)cc, out, sectorsize);
+ }
+ if (write(fileno(fpout), out, outcc) != outcc) {
+ (void) fprintf(stderr, short write (%zd)\n, outcc);
+ ok = 0;
+ }
+ }
+ if (fpin != stdin) {
+ fclose(fpin);
+ }
+ if (fpout != stdout) {
+ fclose(fpout);
+ }
+ free(out);
+ free(buf);
+ return ok;
+}
Index: othersrc/external/bsd/circa/dist/circa.h
diff -u othersrc/external/bsd/circa/dist/circa.h:1.2 othersrc/external/bsd/circa/dist/circa.h:1.3
--- othersrc/external/bsd/circa/dist/circa.h:1.2 Thu May 12 04:11:15 2011
+++ othersrc/external/bsd/circa/dist/circa.h Wed Aug 3 05:52:19 2011
@@ -75,6 +75,8 @@
ssize_t circa_encode(circa_t */*circa*/, const void */*in*/, size_t /*insize*/, uint8_t */*out*/, size_t /*outsize*/);
ssize_t circa_decode(circa_t */*circa*/, const void */*in*/, size_t /*insize*/, uint8_t */*out*/, size_t /*outsize*/);
+int circa_file(circa_t */*circa*/, size_t /*sectorsize*/, int /*encoding*/, char */*in*/, char */*fout*/);
+
/* resilient header routines */
ssize_t circa_get_header(circa_t */*circa*/, const void */*in*/, size_t /*size*/);
ssize_t circa_put_header(circa_t */*circa*/, void */*out*/, size_t /*size*/);
Index: othersrc/external/bsd/circa/dist/libcirca.3
diff -u othersrc/external/bsd/circa/dist/libcirca.3:1.4 othersrc/external/bsd/circa/dist/libcirca.3:1.5
--- othersrc/external/bsd/circa/dist/libcirca.3:1.4 Thu May 12 08:40:02 2011
+++ othersrc/external/bsd/circa/dist/libcirca.3 Wed Aug 3 05:52:19 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: libcirca.3,v 1.4 2011/05/12 08:40:02 wiz Exp $
+.\ $NetBSD: libcirca.3,v 1.5 2011/08/03 05:52:19 agc Exp $
.\
.\ Copyright (c) 2011 Alistair Crooks a...@netbsd.org
.\ All rights reserved.
@@ -23,7 +23,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 May 11,
CVS commit: xsrc/external/mit/pixman/dist
Module Name:xsrc Committed By: mrg Date: Wed Aug 3 05:58:11 UTC 2011 Update of /cvsroot/xsrc/external/mit/pixman/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29395 Log Message: initial import of pixman-0.23.2. important changes include: - more SSE2 support - more arm neon and A8 support - several bug fixes Status: Vendor Tag: xorg Release Tags: pixman-0-23-2 U xsrc/external/mit/pixman/dist/config.guess U xsrc/external/mit/pixman/dist/missing U xsrc/external/mit/pixman/dist/INSTALL U xsrc/external/mit/pixman/dist/depcomp U xsrc/external/mit/pixman/dist/NEWS U xsrc/external/mit/pixman/dist/TODO U xsrc/external/mit/pixman/dist/pixman-1-uninstalled.pc.in U xsrc/external/mit/pixman/dist/Makefile.am U xsrc/external/mit/pixman/dist/ltmain.sh U xsrc/external/mit/pixman/dist/config.sub U xsrc/external/mit/pixman/dist/AUTHORS U xsrc/external/mit/pixman/dist/install-sh U xsrc/external/mit/pixman/dist/COPYING U xsrc/external/mit/pixman/dist/ChangeLog U xsrc/external/mit/pixman/dist/aclocal.m4 U xsrc/external/mit/pixman/dist/pixman-1.pc.in U xsrc/external/mit/pixman/dist/configure.ac U xsrc/external/mit/pixman/dist/config.h.in U xsrc/external/mit/pixman/dist/Makefile.in U xsrc/external/mit/pixman/dist/README U xsrc/external/mit/pixman/dist/configure U xsrc/external/mit/pixman/dist/test/alpha-loop.c U xsrc/external/mit/pixman/dist/test/utils.h U xsrc/external/mit/pixman/dist/test/utils.c U xsrc/external/mit/pixman/dist/test/region-translate-test.c U xsrc/external/mit/pixman/dist/test/gradient-crash-test.c U xsrc/external/mit/pixman/dist/test/Makefile.am U xsrc/external/mit/pixman/dist/test/alphamap.c U xsrc/external/mit/pixman/dist/test/pdf-op-test.c N xsrc/external/mit/pixman/dist/test/composite-traps-test.c U xsrc/external/mit/pixman/dist/test/a1-trap-test.c U xsrc/external/mit/pixman/dist/test/composite.c U xsrc/external/mit/pixman/dist/test/region-test.c U xsrc/external/mit/pixman/dist/test/oob-test.c U xsrc/external/mit/pixman/dist/test/scaling-crash-test.c U xsrc/external/mit/pixman/dist/test/blitters-test.c U xsrc/external/mit/pixman/dist/test/trap-crasher.c U xsrc/external/mit/pixman/dist/test/lowlevel-blt-bench.c U xsrc/external/mit/pixman/dist/test/stress-test.c U xsrc/external/mit/pixman/dist/test/scaling-test.c U xsrc/external/mit/pixman/dist/test/Makefile.in U xsrc/external/mit/pixman/dist/test/affine-test.c U xsrc/external/mit/pixman/dist/test/fetch-test.c N xsrc/external/mit/pixman/dist/test/scaling-helpers-test.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon.c U xsrc/external/mit/pixman/dist/pixman/pixman-version.h U xsrc/external/mit/pixman/dist/pixman/pixman-linear-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-accessor.h U xsrc/external/mit/pixman/dist/pixman/pixman-sse2.c U xsrc/external/mit/pixman/dist/pixman/pixman-fast-path.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-simd-asm.S U xsrc/external/mit/pixman/dist/pixman/pixman-version.h.in U xsrc/external/mit/pixman/dist/pixman/pixman-region16.c U xsrc/external/mit/pixman/dist/pixman/solaris-hwcap.mapfile U xsrc/external/mit/pixman/dist/pixman/pixman-edge.c U xsrc/external/mit/pixman/dist/pixman/pixman-trap.c U xsrc/external/mit/pixman/dist/pixman/pixman-gradient-walker.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine32.c U xsrc/external/mit/pixman/dist/pixman/pixman-timer.c U xsrc/external/mit/pixman/dist/pixman/pixman-matrix.c U xsrc/external/mit/pixman/dist/pixman/make-combine.pl U xsrc/external/mit/pixman/dist/pixman/pixman-arm-simd.c U xsrc/external/mit/pixman/dist/pixman/pixman.h U xsrc/external/mit/pixman/dist/pixman/pixman-mmx.c U xsrc/external/mit/pixman/dist/pixman/pixman-access.c U xsrc/external/mit/pixman/dist/pixman/Makefile.am N xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon-asm-bilinear.S U xsrc/external/mit/pixman/dist/pixman/pixman-implementation.c U xsrc/external/mit/pixman/dist/pixman/pixman-fast-path.h U xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon-asm.h U xsrc/external/mit/pixman/dist/pixman/pixman-combine32.h U xsrc/external/mit/pixman/dist/pixman/pixman-image.c U xsrc/external/mit/pixman/dist/pixman/pixman-access-accessors.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine64.h U xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon-asm.S C xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c U xsrc/external/mit/pixman/dist/pixman/pixman-solid-fill.c U xsrc/external/mit/pixman/dist/pixman/pixman-radial-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-cpu.c U xsrc/external/mit/pixman/dist/pixman/pixman-edge-accessors.c N xsrc/external/mit/pixman/dist/pixman/pixman-noop.c U xsrc/external/mit/pixman/dist/pixman/pixman-utils.c U xsrc/external/mit/pixman/dist/pixman/pixman.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine.c.template U xsrc/external/mit/pixman/dist/pixman/pixman-conical-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-compiler.h U
