xorg: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/local/xserver-wrapper.c | 31 +++++++++++++------------------
2 files changed, 21 insertions(+), 18 deletions(-)
New commits:
commit ac765a310859843c0a6da67e2e6a33194ae2a20a
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 11 15:08:22 2009 +0200
xserver-wrapper: don't check the mode of /dev/dri.
It leads to a spurious error message in some cases, and isn't necessary.
diff --git a/debian/changelog b/debian/changelog
index 53b2f7c..4823e06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,10 @@ xorg (1:7.4+4) UNRELEASED; urgency=low
exist.
* xserver-wrapper: allow unprivileged -showDefaultModulePath and
-showDefaultLibPath options
- (closes: #540932).
+ * xserver-wrapper: don't check the mode of /dev/dri. It leads to a spurious
+ error message in some cases, and isn't necessary.
+ Thanks to Pierre-Loup A. Griffais for pointing out the three above items
+ (closes: #540932).
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 02 Jul 2009 17:23:57 +0300
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 2630e8f..de040d6 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -80,6 +80,8 @@
* (11 Aug 2009)
* Julien Cristau: allow unprivileged -showDefaultModulePath and
* -showDefaultLibPath options (11 Aug 2009)
+ * Julien Cristau: don't check the mode of the DRI device directory
+ * (11 Aug 2009)
*
* This is free software; you may redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -120,8 +122,6 @@
#define X_SERVER_SYMLINK "/etc/X11/X"
#define X_SOCKET_DIR "/tmp/.X11-unix"
#define X_SOCKET_DIR_MODE (S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO)
-#define X_DRI_DEVICE_DIR "/dev/dri"
-#define X_DRI_DEVICE_DIR_MODE (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
#ifndef FALSE
#define FALSE 0
@@ -312,17 +312,6 @@ main(int argc, char **argv)
exit(1);
}
- /* do a check on the directory where the DRI device is created */
- if (stat(X_DRI_DEVICE_DIR, &statbuf)) {
- /* do nothing if it doesn't exist -- no problem */
- } else {
- if (statbuf.st_mode != (S_IFDIR | X_DRI_DEVICE_DIR_MODE)) {
- (void) fprintf(stderr, "X: warning; %s has unusual mode (not %o) or "
- "is not a directory.\n", X_DRI_DEVICE_DIR,
- X_DRI_DEVICE_DIR_MODE);
- }
- }
-
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config")) {
if (setuid(getuid())) {
commit a967d578d6c2a8b177eb816d3618a0e41bb8cb04
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 11 14:40:49 2009 +0200
xserver-wrapper: add missing unprivileged options
Allow unprivileged -showDefaultModulePath and -showDefaultLibPath options
(closes: #540932).
diff --git a/debian/changelog b/debian/changelog
index 430a69a..53b2f7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ xorg (1:7.4+4) UNRELEASED; urgency=low
* xserver-wrapper: recognize /usr/bin/X as a path to the wrapper.
* xserver-wrapper: don't print an error message if Xwrapper.config doesn't
exist.
+ * xserver-wrapper: allow unprivileged -showDefaultModulePath and
+ -showDefaultLibPath options
+ (closes: #540932).
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 02 Jul 2009 17:23:57 +0300
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 40cf518..2630e8f 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -78,6 +78,8 @@
* Julien Cristau: recognize /usr/bin/X as a path to this wrapper (6 Jun 2009)
* Julien Cristau: don't print an error message if Xwrapper.config doesn't exist
* (11 Aug 2009)
+ * Julien Cristau: allow unprivileged -showDefaultModulePath and
+ * -showDefaultLibPath options (11 Aug 2009)
*
* This is free software; you may redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -359,9 +361,11 @@ main(int argc, char **argv)
/* DEBUG fprintf(stderr, "strcmp(argv[1], \"-showconfig\") = %d, strcmp(argv[1],
\"-version\" = %d\n", (strcmp(argv[1], "-showconfig")), (strcmp(argv[1],
"-version"))); */
- if (argc == 2 && ( (strncmp(argv[1], "-help", 5) == 0) ||
- (strncmp(argv[1], "-showconfig", 11) == 0) ||
- (strncmp(argv[1], "-version", 8) == 0) ) ) {
+ if (argc == 2 && ( (strcmp(argv[1], "-help") == 0) ||
+ (strcmp(argv[1], "-showconfig") == 0) ||
+ (strcmp(argv[1], "-version") == 0) ||
+ (strcmp(argv[1], "-showDefaultModulePath") == 0) ||
+ (strcmp(argv[1], "-showDefaultLibPath") == 0) ) ) {
if (setuid(getuid())) {
perror("X unable to drop setuid privileges");
exit(1);
commit b052a682b1a39928f7d73484293ebd3b255b01f1
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 11 14:34:40 2009 +0200
xserver-wrapper: don't print an error message if Xwrapper.config doesn't exist
Thanks, Pierre-Loup Griffais!
diff --git a/debian/changelog b/debian/changelog
index ad00aef..430a69a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ xorg (1:7.4+4) UNRELEASED; urgency=low
[ Julien Cristau ]
* xserver-wrapper: recognize /usr/bin/X as a path to the wrapper.
+ * xserver-wrapper: don't print an error message if Xwrapper.config doesn't
+ exist.
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 02 Jul 2009 17:23:57 +0300
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 0e37e68..40cf518 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -76,6 +76,8 @@
* minor < 64) as consoles (24 Sep 2008)
* Julien Cristau: remove the nice_value option
* Julien Cristau: recognize /usr/bin/X as a path to this wrapper (6 Jun 2009)
+ * Julien Cristau: don't print an error message if Xwrapper.config doesn't exist
+ * (11 Aug 2009)
*
* This is free software; you may redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -246,8 +248,8 @@ main(int argc, char **argv)
(void) fclose(cf);
} else {
- (void) fprintf(stderr, "X: unable to open wrapper config file %s\n",
- X_WRAPPER_CONFIG_FILE);
+ /* DEBUG (void) fprintf(stderr, "X: unable to open wrapper config file %s\n",
+ X_WRAPPER_CONFIG_FILE); */
}
if (lstat(X_SERVER_SYMLINK, &statbuf)) {
Reply to: