xorg: Changes to 'debian-experimental'
debian/changelog | 10 ++++++--
debian/local/xserver-wrapper.c | 49 +++++++++++++++++++++++++++++++----------
debian/scripts/vars.amd64 | 2 -
3 files changed, 47 insertions(+), 14 deletions(-)
New commits:
commit ff81ac5a2a40e919f0c63ed42c353a4c7bc7fea0
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 30 16:28:00 2007 +0200
Make xserver-xorg-video-all depend on xserver-xorg-video-vmware on amd64.
diff --git a/debian/changelog b/debian/changelog
index fbef274..c50dc09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,10 @@ xorg (1:7.2-2) UNRELEASED; urgency=low
(closes: #408114).
* Add patch from Guillem Jover <guillem@debian.org> to add console detection
support for GNU/kFreeBSD to the X server wrapper (closes: #413454).
+ * Add xserver-xorg-video-vmware to xserver-xorg-video-all's dependencies on
+ amd64 (closes: #413492).
- -- Julien Cristau <jcristau@debian.org> Fri, 30 Mar 2007 16:19:15 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 30 Mar 2007 16:26:46 +0200
xorg (1:7.2-1) experimental; urgency=low
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 44d764f..cb97d8f 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -3,7 +3,7 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-nv, xserver-xorg-video-rendition, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sis, xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vga, xserver-xorg-video-v4l"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-nv, xserver-xorg-video-rendition, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sis, xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vga, xserver-xorg-video-v4l, xserver-xorg-video-vmware"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
commit 782a56c0324fccc022c2fede534977a47dca0a18
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 30 16:24:10 2007 +0200
Add console detection on kfreebsd to the X server wrapper.
Thanks to Guillem Jover for the patch (bug#413454).
diff --git a/debian/changelog b/debian/changelog
index db8b86b..fbef274 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,10 @@ xorg (1:7.2-2) UNRELEASED; urgency=low
* dexconf: don't add fontpaths in /usr/X11R6.
* dexconf: point to the xorg.conf manpage, not /etc/X11/xorg.conf
(closes: #408114).
+ * Add patch from Guillem Jover <guillem@debian.org> to add console detection
+ support for GNU/kFreeBSD to the X server wrapper (closes: #413454).
- -- Julien Cristau <jcristau@debian.org> Fri, 30 Mar 2007 02:56:35 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 30 Mar 2007 16:19:15 +0200
xorg (1:7.2-1) experimental; urgency=low
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index b6dd80f..0d42920 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -66,6 +66,10 @@
* Branden Robinson: chdir() to the directory where the X server symlink is kept
* before executing its target, so that relative symlinks work
* (1 Aug 2003)
+ * Guillem Jover: add console detection support for GNU/kFreeBSD, and some
+ * messages at build and run time to allow the user to know
+ * what failed on unsupported systems
+ * (30 Mar 2007)
*
* This is free software; you may redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -102,7 +106,12 @@
# include <sys/resource.h>
#endif
+#if defined(__linux__)
#define VT_MAJOR_DEV 4
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#include <sys/consio.h>
+#endif
+
#define X_WRAPPER_CONFIG_FILE "/etc/X11/Xwrapper.config"
#define X_SERVER_SYMLINK_DIR "/etc/X11"
#define X_SERVER_SYMLINK "/etc/X11/X"
@@ -138,10 +147,37 @@ getSecLevel(char *security)
}
static int
-checkSecLevel(SecurityLevel level)
+onConsole()
{
+#if defined(__linux__)
struct stat s;
+ /* see if stdin is a virtual console device */
+ if (fstat(0, &s) != 0) {
+ (void) fprintf(stderr, "X: cannot stat stdin\n");
+ return FALSE;
+ }
+ if (S_ISCHR(s.st_mode) &&
+ ((s.st_rdev >> 8) & 0xff) == VT_MAJOR_DEV &&
+ (s.st_rdev & 0xff) < 64) {
+ return TRUE;
+ }
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ int idx;
+
+ if (ioctl(0, VT_GETINDEX, &idx) != -1)
+ return TRUE;
+#else
+#warning This program needs porting to your kernel.
+ (void) fprintf(stderr, "X: unable to determine if running on a console\n");
+#endif
+
+ return FALSE;
+}
+
+static int
+checkSecLevel(SecurityLevel level)
+{
switch (level) {
case RootOnly:
if (getuid() == 0) { /* real uid is root */
@@ -152,16 +188,7 @@ checkSecLevel(SecurityLevel level)
break;
case Console:
if (getuid() == 0) return TRUE; /* root */
- /* see if stdin is a virtual console device */
- if (fstat(0, &s) != 0) {
- (void) fprintf(stderr,"X: cannot stat stdin\n");
- return FALSE;
- }
- if (S_ISCHR(s.st_mode) &&
- ((s.st_rdev >> 8) & 0xff) == VT_MAJOR_DEV &&
- (s.st_rdev & 0xff) < 64) {
- return TRUE;
- }
+ return onConsole();
break;
case Anybody:
return TRUE;
commit e819c38da92afb6089e6b056a7547272c271101c
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 30 16:11:30 2007 +0200
Add bug closer for #408114.
diff --git a/debian/changelog b/debian/changelog
index f445d26..db8b86b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ xorg (1:7.2-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Drop references to obsolete modules in the debconf templates.
* dexconf: don't add fontpaths in /usr/X11R6.
+ * dexconf: point to the xorg.conf manpage, not /etc/X11/xorg.conf
+ (closes: #408114).
-- Julien Cristau <jcristau@debian.org> Fri, 30 Mar 2007 02:56:35 +0200
Reply to: