xorg: Changes to 'debian-experimental'
debian/TODO | 4
debian/changelog | 341 +++
debian/compat | 2
debian/control | 39
debian/copyright | 59
debian/local/Xsession.5 | 7
debian/local/Xsession.d/35x11-common_xhost-local | 10
debian/local/Xsession.d/50x11-common_determine-startup | 3
debian/local/Xwrapper.config.5 | 103
debian/local/control | 1
debian/local/debian-setup-keyboard | 21
debian/local/debian-x11-keymap.fdi | 10
debian/local/dexconf | 240 --
debian/local/dexconf.1 | 246 --
debian/local/xorg.conf | 96
debian/local/xserver-wrapper.c | 379 ---
debian/po/POTFILES.in | 1
debian/po/ar.po | 462 ----
debian/po/ast.po | 495 ----
debian/po/be.po | 464 ----
debian/po/bg.po | 1023 ---------
debian/po/bn.po | 176 -
debian/po/bs.po | 1032 ---------
debian/po/ca.po | 505 ----
debian/po/cs.po | 1506 --------------
debian/po/da.po | 1628 ---------------
debian/po/de.po | 1049 ----------
debian/po/dz.po | 1003 ---------
debian/po/el.po | 524 -----
debian/po/eo.po | 473 ----
debian/po/es.po | 1066 ----------
debian/po/eu.po | 497 ----
debian/po/fi.po | 1002 ---------
debian/po/fr.po | 521 ----
debian/po/gl.po | 1350 ------------
debian/po/gu.po | 451 ----
debian/po/he.po | 451 ----
debian/po/hr.po | 984 ---------
debian/po/hu.po | 1412 -------------
debian/po/id.po | 481 ----
debian/po/it.po | 1052 ----------
debian/po/ja.po | 482 ----
debian/po/kk.po | 450 ----
debian/po/km.po | 963 ---------
debian/po/ko.po | 454 ----
debian/po/ku.po | 76
debian/po/lt.po | 985 ---------
debian/po/ml.po | 476 ----
debian/po/mr.po | 983 ---------
debian/po/nb.po | 991 ---------
debian/po/ne.po | 991 ---------
debian/po/nl.po | 1752 ----------------
debian/po/nn.po | 1016 ---------
debian/po/pl.po | 1646 ---------------
debian/po/pothead.in | 30
debian/po/pt.po | 1605 ---------------
debian/po/pt_BR.po | 1779 -----------------
debian/po/ro.po | 510 ----
debian/po/ru.po | 1025 ---------
debian/po/sk.po | 976 ---------
debian/po/sq.po | 1021 ---------
debian/po/sv.po | 504 ----
debian/po/ta.po | 983 ---------
debian/po/templates.pot | 53
debian/po/th.po | 929 --------
debian/po/tr.po | 1025 ---------
debian/po/vi.po | 468 ----
debian/po/wo.po | 483 ----
debian/po/zh_CN.po | 932 --------
debian/po/zh_TW.po | 925 --------
debian/rules | 129 -
debian/scripts/debconf-updatepo | 197 -
debian/scripts/validate-posix-sh | 63
debian/scripts/vars.alpha | 14
debian/scripts/vars.amd64 | 28
debian/scripts/vars.arm | 13
debian/scripts/vars.arm64 | 9
debian/scripts/vars.armeb | 13
debian/scripts/vars.armel | 13
debian/scripts/vars.armhf | 17
debian/scripts/vars.hppa | 4
debian/scripts/vars.hurd-i386 | 17
debian/scripts/vars.i386 | 27
debian/scripts/vars.ia64 | 12
debian/scripts/vars.kfreebsd-amd64 | 16
debian/scripts/vars.kfreebsd-i386 | 16
debian/scripts/vars.m32r | 13
debian/scripts/vars.m68k | 13
debian/scripts/vars.mips | 14
debian/scripts/vars.mipsel | 13
debian/scripts/vars.powerpc | 7
debian/scripts/vars.powerpcspe | 24
debian/scripts/vars.ppc64 | 23
debian/scripts/vars.ppc64el | 8
debian/scripts/vars.s390 | 8
debian/scripts/vars.sh4 | 14
debian/scripts/vars.sparc | 14
debian/scripts/vars.sparc64 | 14
debian/scripts/vars.x32 | 1
debian/x11-common.config.in | 89
debian/x11-common.init | 92
debian/x11-common.manpages | 1
debian/x11-common.postinst | 12
debian/x11-common.postinst.in | 85
debian/x11-common.postrm.in | 36
debian/x11-common.templates | 22
debian/xbase-clients.postinst.in | 20
debian/xbase-clients.postrm.in | 20
debian/xbase-clients.preinst.in | 20
debian/xserver-xorg.examples | 1
debian/xserver-xorg.install | 3
debian/xserver-xorg.manpages | 1
debian/xserver-xorg.postinst.in | 160 -
debian/xserver-xorg.postrm | 43
debian/xserver-xorg.postrm.in | 53
debian/xserver-xorg.preinst.in | 40
debian/xserver-xorg.prerm.in | 33
debian/xutils.postinst.in | 35
debian/xutils.postrm.in | 31
debian/xutils.preinst.in | 31
xsf-docs/.gitignore | 2
xsf-docs/COPYING | 19
xsf-docs/Makefile | 64
xsf-docs/asciidoc-xhtml11.css | 424 ++++
xsf-docs/asciidoc-xhtml11.js | 128 +
xsf-docs/faq/general.txt | 96
xsf-docs/howto/build-mesa.txt | 217 ++
xsf-docs/howto/configure-input.txt | 193 +
xsf-docs/howto/report-bugs.txt | 62
xsf-docs/howto/triage-bugs.txt | 104
xsf-docs/howto/use-gdb.txt | 179 +
xsf-docs/howto/use-xrandr.txt | 214 ++
xsf-docs/howtos | 1
xsf-docs/index.txt | 51
xsf-docs/reference/dependencies.txt | 260 ++
xsf-docs/reference/experimental.txt | 98
xsf-docs/reference/git-usage.txt | 200 +
xsf-docs/reference/squeeze-backports.txt | 70
xsf-docs/reference/upstream-contacts.txt | 46
xsf-docs/upstream-features.txt | 17
xsf-docs/xsf.css | 8
xsf-docs/xsf.png |binary
xsf-docs/xsf.svg | 234 ++
143 files changed, 3361 insertions(+), 46590 deletions(-)
New commits:
commit 408bc9dc3b3dfe04be5cff174fc7486db0c7f733
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 21 10:00:38 2015 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 71578dc..f0a356c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg (1:7.7+10) UNRELEASED; urgency=medium
+xorg (1:7.7+10) experimental; urgency=medium
* Stop shipping the /usr/bin/X setuid wrapper and associated
Xwrapper.config, those are now in xserver-xorg-legacy.
* Convert d/rules to dh.
- -- Julien Cristau <jcristau@debian.org> Wed, 12 Aug 2015 16:36:47 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 21 Aug 2015 09:46:32 +0200
xorg (1:7.7+9) unstable; urgency=medium
commit 13494370b66cecbc9c8646cdd2305618d1103ef8
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 12 16:37:44 2015 +0200
Remove the X wrapper
Stop shipping the /usr/bin/X setuid wrapper and associated
Xwrapper.config, they are now in xserver-xorg-legacy.
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 973d2cc..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-* Xwrapper.config should really move away from x11-common, now that we
- only have one X server to deal with
-* Merge xserver-xorg and xserver-xorg-core? What about the circular dep?
-
diff --git a/debian/changelog b/debian/changelog
index 552666a..71578dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.7+10) UNRELEASED; urgency=medium
+
+ * Stop shipping the /usr/bin/X setuid wrapper and associated
+ Xwrapper.config, those are now in xserver-xorg-legacy.
+ * Convert d/rules to dh.
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 12 Aug 2015 16:36:47 +0200
+
xorg (1:7.7+9) unstable; urgency=medium
* Remove the siliconmotion driver from xserver-xorg-video-all.
diff --git a/debian/control b/debian/control
index 5fa71fe..a87cb94 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,8 @@ Description: X Window System (X.Org) infrastructure
Package: xserver-xorg
Architecture: any
Depends:
- xserver-xorg-core (>= 2:1.15.0.901),
+ xserver-xorg-core (>= 2:1.17.2-2),
+ xserver-xorg-legacy [!linux-any],
xserver-xorg-video-all | xorg-driver-video,
xserver-xorg-input-all | xorg-driver-input,
xserver-xorg-input-evdev [linux-any],
diff --git a/debian/local/Xwrapper.config.5 b/debian/local/Xwrapper.config.5
deleted file mode 100644
index acbf070..0000000
--- a/debian/local/Xwrapper.config.5
+++ /dev/null
@@ -1,103 +0,0 @@
-.\" Copyright 2000, 2003, 2004 Progeny Linux Systems, Inc.
-.\" Author: Branden Robinson <branden@progeny.com>
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL; if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.TH Xwrapper.config 5 "2004\-10\-31" "Debian Project"
-.SH NAME
-Xwrapper.config \- configuration options for X server wrapper
-.SH DESCRIPTION
-.I /etc/X11/Xwrapper.config
-contains a set of flags that determine some of the behavior of Debian's X
-server wrapper, which is installed on the system as
-.IR /usr/bin/X .
-The purpose of the wrapper, and of this configuration file, is twofold.
-.PP
-Firstly, it is intended to implement sound security practices.
-Since the X server requires superuser privileges, it may be unwise to
-permit just any user on the system to execute it.
-Even if the X server is not exploitable in the sense of permitting ordinary
-users to gain elevated privileges, a poorly\-written or
-insufficiently\-tested hardware driver for the X server may cause bus
-lockups and freeze the system, an unpleasant experience for anyone using it
-at the time.
-.PP
-Secondly, a wrapper is a convenient place to set up an execution
-environment for the X server distinct from the configurable parameters
-of the X server itself.
-.PP
-.B Xwrapper.config
-may be edited by hand, but it is typically configured via
-.BR debconf (7),
-the Debian configuration tool.
-The X server wrapper is part of the
-.I x11\-common
-Debian package; therefore, the parameters of
-.B Xwrapper.config
-may be changed with the command
-.RS
-.BR "dpkg\-reconfigure x11\-common" .
-.RE
-See
-.BR dpkg\-reconfigure (8)
-for more information.
-.PP
-The format of
-.B Xwrapper.config
-is a text file containing a series of lines of the form
-.TP
-.IB name = value
-.PP
-where
-.I name
-is a variable name containing any combination of numbers, letters, or
-underscore (_) characters, and
-.I value
-is any combination of letters, numbers, underscores (_), or dashes (\-).
-.I value
-may also contain spaces as long as there is at least one character from the
-list above bounding the space(s) on both sides.
-Whitespace before and after
-.IR name ,
-.IR value ,
-or the equals sign is legal but ignored.
-Any lines not matching the above described legal format are ignored.
-Note that this specification may change as the X server wrapper develops.
-.PP
-Available options are:
-.TP
-.B allowed_users
-may be set to one of the following values:
-.BR rootonly ,
-.BR console ,
-or
-.BR anybody .
-.B rootonly
-indicates that only the root user may start the X server;
-.B console
-indicates that root, or any user whose controlling TTY is a
-virtual console, may start the X server; and
-.B anybody
-indicates that any user may start the X server.
-.SH AUTHORS
-The X server wrapper was written by Stephen Early, Mark Eichin, and Branden
-Robinson for the Debian Project, with valuable contributions from Erik
-Troan, Topi Miettinen, and Colin Phipps.
-This manual page was written by Branden Robinson with sponsorship from
-Progeny Linux Systems.
-.SH SEE ALSO
-.BR debconf (7),
-.BR dpkg\-reconfigure (8)
-.\" vim:set et tw=80:
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
deleted file mode 100644
index 08e02e3..0000000
--- a/debian/local/xserver-wrapper.c
+++ /dev/null
@@ -1,380 +0,0 @@
-/* xserver-wrapper.c - a simple wrapper for X servers that decides whether to
- * let them be run.
- *
- * By Stephen Early
- *
- * Stephen Early: modified to use /etc/X11/X symlink with security level of
- * 'Console' if /etc/X11/Xserver does not exist
- * Mark W. Eichin: permit non-privileged -showconfig (6 May 1997)
- * Mark W. Eichin: fix sense of error check for -showconfig (11 May 1997)
- * Mark W. Eichin: drop privileges on alternate -config, even if we do pass the
- * security check, to prevent using the error handling to read
- * the first line of any protected file (19 Sep 1997)
- * Erik Troan: prevent buffer overruns (25 Mar 1998)
- * Topi Miettinen: plug file descriptor leak (26 Apr 1998)
- * Branden Robinson: only fclose() if file was opened (3 May 1999)
- * Colin Phipps: minor device number check should be < 64, not < 128, or we
- * catch serial terminals (26 Feb 2000)
- * Branden Robinson: ensure sanity of X server socket directory (13 Jun 2000)
- * Branden Robinson: make all paths #defines
- * more helpful socket dir error messages (29 Jun 2000)
- * Branden Robinson: bail out if the config file contains only the silly
- * default X server name (XF86_NONE) (30 Jul 2000)
- * Branden Robinson: increase verbosity when wrapper config not found
- * (2 Oct 2000)
- * Branden Robinson:
- * - new configuration file, Xwrapper.config, with different format
- * (name=value)
- * - now just exec's /etc/X11/X; whatever this symlink points
- * to will be used as the X server
- * - config file specifies allowed user types as before (root only,
- * console users, anyone)
- * - config file specifies nice value to use for server
- * (17 Nov 2000)
- * Branden Robinson: now accepts hyphens in variable contents (24 Nov 2000)
- * Branden Robinson: fix dumb errors left over from debugging (3 Dec 2000)
- * Branden Robinson: let root start the server even if he isn't on a
- * console, and the security level is console (11 Dec 2000)
- * Branden Robinson: check out the X server symlink with readlink; abort if
- * it's not a symlink, or if it points back to this wrapper
- * (24 Feb 2001)
- * Branden Robinson: whoops; readlink() doesn't null-terminate the target
- * string (27 Feb 20001)
- * Branden Robinson: add more info to "suspicious" error messages (16 Mar 2001)
- * Branden Robinson: also allow unprivileged use of "-version" option
- * (13 Jul 2001)
- * Branden Robinson: check mode of DRI device directory, if it exists, and warn
- * if it is weird (28 Aug 2001)
- * Branden Robinson: skip lines in Xwrapper.config that don't match expected
- * format (9 Dec 2001)
- * Branden Robinson: fix logic that was supposed to also allow unprivileged use
- * of "-version" option but which actually forbade both
- * "-showconfig" and "-verbose"; also let unprivileged users
- * specify "-help" option to get a usage message (26 Dec 2001)
- * Branden Robinson: change nice() usage to fit SuSv2 semantics; see Debian Bug
- * #140012 (2 Apr 2002)
- * Branden Robinson: *sigh* Ben Collins changed our FROZEN C library back to
- * pre-SuSv2 nice() semantics, so rewrote the nice() error
- * handling; also correct limits on legal nice values from
- * -20 <= x <= 20 to -20 <= x <= 19 (29 Apr 2002)
- * Branden Robinson: make the nice() error handling switchable with a #define
- * between SuSv2 semantics and old-style semantics
- * (16 Oct 2002)
- * Branden Robinson: stop using the GNU extension strnlen() to appease the
- * Debian GNU/NetBSD geeks, who are using BSD's C library
- * (16 Oct 2002)
- * 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)
- * Brice Goglin: drop privileges on alternate config file given with
- * -xf86config (14 Jun 2007)
- * Loïc Minier: on Linux, also consider alternate tty devices (major 5 and
- * 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)
- * 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)
- * Julien Cristau: also drop group privileges (1 Nov 2011)
- * Julien Cristau: disallow major 5 again for consoles (15 Dec 2011)
- *
- * This is free software; you may redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2,
- * or (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License with
- * the Debian operating system, in /usr/share/common-licenses/GPL; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#if defined(__linux__)
-#define TTY_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"
-#define X_SOCKET_DIR "/tmp/.X11-unix"
-#define X_SOCKET_DIR_MODE (S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO)
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-typedef enum {
- RootOnly,
- Console,
- Anybody
-} SecurityLevel;
-
-static SecurityLevel
-getSecLevel(char *security)
-{
- char *c;
-
- for (c = security; *c; c++) *c = toupper(*c);
-
- if (strncmp(security,"ROOTONLY",8) == 0) return RootOnly;
- if (strncmp(security,"CONSOLE",7) == 0) return Console;
- if (strncmp(security,"ANYBODY",7) == 0) return Anybody;
- return RootOnly;
-}
-
-static int
-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) &&
- (major(s.st_rdev) == TTY_MAJOR_DEV &&
- minor(s.st_rdev) < 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 */
- return TRUE;
- } else {
- return FALSE;
- }
- break;
- case Console:
- if (getuid() == 0) return TRUE; /* root */
- return onConsole();
- break;
- case Anybody:
- return TRUE;
- }
- return FALSE;
-}
-
-int
-main(int argc, char **argv)
-{
- FILE *cf;
- struct stat statbuf;
- char xserver[1025];
- char line[1024];
- char var[65];
- char value[257];
- int length;
- int i;
- char *val;
- mode_t mask;
- SecurityLevel level = RootOnly;
-
- /* attempt to use our config file */
- cf = fopen(X_WRAPPER_CONFIG_FILE, "r");
-
- if (cf) {
- /* parse it */
-
- val = fgets(line, 1024, cf);
-
- while (val != NULL) {
- var[0] = '\0';
- value[0] = '\0';
- if (sscanf(line, " %64[A-Za-z0-9_] = %256[A-Za-z0-9_ -] ",
- var, value) > 0) {
- /* truncate extra spaces at end of value */
- length = strlen(value);
- if (length > 256) {
- length = 256;
- }
- for (i = (length - 1); (value[i] == ' '); i--) {
- value[i] = '\0';
- }
- /* DEBUG (void) fprintf(stderr, "var: %s, value: %s.\n", var, value); */
- if (strncasecmp(var, "allowed_users", 64) == 0) {
- level = getSecLevel(value);
- /* DEBUG (void) fprintf(stderr, "security level set to %d\n", level); */
- }
- }
- val = fgets(line, 1024, cf);
- }
-
- (void) fclose(cf);
- } else {
- /* DEBUG (void) fprintf(stderr, "X: unable to open wrapper config file %s\n",
- X_WRAPPER_CONFIG_FILE); */
- }
-
- i = lstat(X_SERVER_SYMLINK, &statbuf);
- if (i < 0 && errno != ENOENT) {
- (void) fprintf(stderr, "X: cannot stat %s (%s), aborting.\n",
- X_SERVER_SYMLINK, strerror(errno));
- exit(1);
- }
-
- if (i < 0) {
- strcpy(xserver, "/usr/bin/Xorg");
- } else {
- i = readlink(X_SERVER_SYMLINK, xserver, 1024);
-
- if (i < 0) {
- (void) fprintf(stderr, "X: cannot read %s symbolic link (%s), aborting.\n",
- X_SERVER_SYMLINK, strerror(errno));
- exit(1);
- }
- xserver[i] = '\0'; /* readlink() does not null-terminate the string */
-
- if ((strcmp(xserver, "/usr/bin/X11/X") == 0) ||
- (strcmp(xserver, "/usr/X11R6/bin/X") == 0) ||
- (strcmp(xserver, "/usr/bin/X") == 0)) {
- (void) fprintf(stderr, "X: %s points back to X wrapper executable, "
- "aborting.\n", X_SERVER_SYMLINK);
- exit(1);
- }
- }
-
- if (access(xserver, X_OK)) { /* access() uses real uid */
- (void) fprintf(stderr, "%s is not executable\n", val);
- exit(1);
- }
-
- /* do we have permission to run the X server? */
- if (checkSecLevel(level)) {
- /* check for a sane server socket dir */
- mask = umask(0);
- /* some stupid kernels can't set the sticky bit during a mkdir() */
- if (!(mkdir(X_SOCKET_DIR, X_SOCKET_DIR_MODE))) {
- (void) chmod(X_SOCKET_DIR, X_SOCKET_DIR_MODE);
- }
- (void) umask(mask);
-
- /* do paranoid checks on the directory where the X server creates its socket */
- if (lstat(X_SOCKET_DIR, &statbuf)) {
- (void) fprintf(stderr, "X: cannot stat %s (%s), aborting.\n",
- X_SOCKET_DIR, strerror(errno));
- exit(1);
- }
-
- if ((statbuf.st_uid != 0) || (statbuf.st_gid != 0)) {
- (void) fprintf(stderr, "X: %s has suspicious ownership (not root:root), "
- "aborting.\n", X_SOCKET_DIR);
- exit(1);
- }
-
- if (statbuf.st_mode != (S_IFDIR | X_SOCKET_DIR_MODE)) {
- (void) fprintf(stderr, "X: %s has suspicious mode (not %o) or is not a "
- "directory, aborting.\n", X_SOCKET_DIR, X_SOCKET_DIR_MODE);
- exit(1);
- }
-
- for (i = 1; i < argc; i++) {
- if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config")) {
- if (setgid(getgid()) || setuid(getuid())) {
- perror("X unable to drop setuid privileges for alternate config");
- exit(1);
- }
- } else if (strlen(argv[i]) > 256) {
- if (setgid(getgid()) || setuid(getuid())) {
- perror("X unable to drop setuid privileges for suspiciously long "
- "argument");
- exit(1);
- }
- }
- }
-
- /* run the X server */
- seteuid(0);
-
- /* DEBUG exit(0); */
-
- /*
- * change to the directory where the X server symlink is so that a relative
- * symlink will work and execute the X server
- */
- if (xserver[0] != '/' && chdir(X_SERVER_SYMLINK_DIR)) {
- (void) fprintf(stderr, "X: cannot chdir() to %s (%s), aborting.\n",
- X_SERVER_SYMLINK_DIR, strerror(errno));
- exit(1);
- }
- (void) execv(xserver, argv);
- (void) fprintf(stderr, "X: exec of %s failed\n", xserver);
- exit(1);
-
- } else {
- /* DEBUG fprintf(stderr, "argc = %d, argv[1] = \"%s\"\n", argc, argv[1]); */
- /* 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 && ( (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 (setgid(getgid()) || setuid(getuid())) {
- perror("X unable to drop setuid privileges");
- exit(1);
- }
- execv(xserver,argv);
- (void) fprintf(stderr, "X: unprivileged exec of %s failed, "
- "aborting.\n", xserver);
- exit(1);
- } else {
- (void) fprintf(stderr, "X: user not authorized to run the X "
- "server, aborting.\n");
- exit(1);
- }
- }
-
- (void) fprintf(stderr, "X: Impossible! Unreachable statement reached!\n");
- exit(1);
-}
-
-/*
- * vim:set cindent et fo=tcroq sts=2 sw=2 tw=80:
- */
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
deleted file mode 100644
index 0116585..0000000
--- a/debian/po/POTFILES.in
+++ /dev/null
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] x11-common.templates
diff --git a/debian/po/ar.po b/debian/po/ar.po
deleted file mode 100644
index aedbb64..0000000
--- a/debian/po/ar.po
+++ /dev/null
@@ -1,462 +0,0 @@
-# translation of ar.po to Arabic
-# xserver-xorg translation
-# Copyright (C) 2006 The Arabeyes Project
-# This file is distributed under the same license as the xserver-xorg package.
-#
-# Ossama M. Khayat <okhayat@yahoo.com>, 2006, 2007, 2008.
-msgid ""
-msgstr ""
-"Project-Id-Version: ar\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2009-06-02 20:32+0200\n"
-"PO-Revision-Date: 2008-06-12 03:41+0300\n"
-"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
-"Language-Team: Arabic <support@arabeyes.org>\n"
-"Language: ar\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=4; plural=n%100==1 || n==0 ? 0 : n%100==2 ? 2 : n"
-"%100>=3 && n%100<=10 ? 2 : 3;\n"
-
-#. Type: select
-#. Choices
-#: ../x11-common.templates:2001
-msgid "Root Only"
-msgstr "المستخدم root فقط"
-
-#. Type: select
-#. Choices
-#: ../x11-common.templates:2001
-msgid "Console Users Only"
-msgstr "مستخدمي الطرفية فقط"
-
-#. Type: select
-#. Choices
-#: ../x11-common.templates:2001
-msgid "Anybody"
-msgstr "أي أحد"
-
-#. Type: select
-#. Description
-#: ../x11-common.templates:2002
-msgid "Users allowed to start the X server:"
-msgstr "المستخدمين المسموح لهم تشغيل خادم X:"
-
-#. Type: select
-#. Description
-#: ../x11-common.templates:2002
-msgid ""
-"Because the X server runs with superuser privileges, it may be unwise to "
-"permit any user to start it, for security reasons. On the other hand, it is "
-"even more unwise to run general-purpose X client programs as root, which is "
-"what may happen if only root is permitted to start the X server. A good "
-"compromise is to permit the X server to be started only by users logged in "
-"to one of the virtual consoles."
-msgstr ""
-"لأن خادم X يعمل بصلاحية المستخدم الخارق، فقد لا يكون من الحكمة السماح لأي "
-"مستخدم بتشغيله، لأسباب أمنية. من ناحية أخرى، فليس من الحكمة أيضاً تشغيل برامج "
-"X العامة كمستخدم root، والذي قد يحدث إن كان المستخدم root هو الوحيد الذي "
-"يمكنه تشغيل خادم X. لذا، فإن الحل الأمثل لهذه المعضلة هو السماح فقط لمستخدمي "
-"النظام عبر أحد الطرفيات الوهمية."
-
-#~ msgid "Nice value for the X server:"
-#~ msgstr "قيمة nice لخادم X:"
-
-#~ msgid ""
-#~ "When using operating system kernels with a particular scheduling "
-#~ "strategy, it has been widely noted that the X server's performance "
-#~ "improves when it is run at a higher process priority than the default; a "
-#~ "process's priority is known as its \"nice\" value. These values range "
-#~ "from -20 (extremely high priority, or \"not nice\" to other processes) to "
-#~ "19 (extremely low priority). The default nice value for ordinary "
-#~ "processes is 0, and this is also the recommend value for the X server."
-#~ msgstr ""
-#~ "عند استخدام نواة نظام تشغيل ذات استراتيجية جدولة معينة، لوحظ بشكل كبير "
-#~ "بأن كفاءة خادم X تتحسن عند تشغيله بأولوية عملية أعلى من الافتراضية، والتي "
-#~ "تعرف بقيمة \"nice\". وتتراوح هذه القيمة بين -20 (والتي هي الأولوية "
-#~ "المرتفعة جداً، أو التي \"ليست لطيفة\" للعمليات الأخرى) إلى 19 (والتي هي "
-#~ "الأولوية المنخفضة جداً). تكون قيمة nice للعمليات العادية هي 0، وهذه هي "
-#~ "القيمة المستحسنة أيضاً لخادم X."
-
-#~ msgid ""
-#~ "Values outside the range of -10 to 0 are not recommended; too negative, "
-#~ "and the X server will interfere with important system tasks. Too "
-#~ "positive, and the X server will be sluggish and unresponsive."
-#~ msgstr ""
-#~ "القيم التي تقل عن -10 أو تزيد عن 0 ليست مستحسنة؛ فإن كانت أقل من -10 فإن "
-#~ "خادم X سيتعارض مع مهام النظام الضرورية. وإن كانت أكبر من 0 فستبطئ عمل "
-#~ "خادم X وتثبطه."
-
-#~ msgid "Incorrect nice value"
-#~ msgstr "قيمة nice غير صالحة"
-
-#~ msgid "Please enter an integer between -20 and 19."
-#~ msgstr "الرجاء إدخال قيمة صحيحة بين -20 و 19"
-
-#~ msgid "Major possible upgrade issues"
-#~ msgstr "قد تكون هناك مشاكل عامة في الترقية"
-
-#~ msgid ""
-#~ "Some users have reported that upon upgrade to the current package set, "
-#~ "their xserver package was no longer installed. Because there is no easy "
-#~ "way around this problem, you should be sure to check that the xserver-"
-#~ "xorg package is installed after upgrade. If it is not installed and you "
-#~ "require it, it is recommended that you install the xorg package to make "
-#~ "sure you have a fully functional X setup."
-#~ msgstr ""
-#~ "أبلغنا بعض المستخدمين بأنه عند الترقية إلى مجموعة الحزم الحالية، فإن حزمة "
-#~ "xserver لا يتم تثبيتها. ولإنه ليست هناك طريقة سهلة لحل هذه المعضلة، فعليك "
-#~ "بالتأكد من تثبيت حزمة xserver-xorg بعد الترقية. إن تكن الحزمة مثبتةً وكنت "
-#~ "بحاجة لها، فمن المستحسن أن تقوم بتثبيت حزمة xorg كي تضمن الحصول على إعداد "
-#~ "لخادم X يمكنك العمل به."
-
-#~ msgid "Cannot remove /usr/X11R6/bin directory"
-#~ msgstr "لا يمكن إزالة الدليل /usr/X11R6/bin"
-
-#~ msgid ""
-#~ "This upgrade requires that the /usr/X11R6/bin directory be removed and "
-#~ "replaced with a symlink. An attempt was made to do so, but it failed, "
-#~ "most likely because the directory is not yet empty. You must move the "
-#~ "files that are currently in the directory out of the way so that the "
-#~ "installation can complete. If you like, you may move them back after the "
-#~ "symlink is in place."
-#~ msgstr ""
-#~ "تتطلب عملية الترقية هذه إزالة الدليل /usr/X11R6/bin و استبداله برابط "
-#~ "رمزي. لقد حاولنا القيام بذلك، ولكن العملية فشلت، ويبدو أن هذا بسبب أن "
-#~ "الدليل غير فارغ. عليك بنقل الملفات الموجودة حالياً في الدليل كي يتمكن "
-#~ "برنامج التثبيت من إتمام هذه العملية. إن أردت، يمكن إعادة الملفات إلى حيث "
-#~ "كانت بعد إنشاء الرابط الرمزي."
-
-#~ msgid ""
-#~ "This package installation will now fail and exit so that you can do this. "
-#~ "Please re-run your upgrade procedure after you have cleaned out the "
-#~ "directory."
-#~ msgstr ""
-#~ "ستفشل عملية تثبيت الحزمة هذه وتتوقف كي تستطيع القيام بهذا. الرجاء إعادة "
-#~ "تشغيل عملية الترقية بعد أن تنتهي من تنظيف الدليل."
-
-#~ msgid "Video card's bus identifier:"
-#~ msgstr "مُعرّف ناقل بطاقة الفيديو:"
-
-#~ msgid ""
-#~ "Users of PowerPC machines, and users of any computer with multiple video "
-#~ "devices, should specify the BusID of the video card in an accepted bus-"
-#~ "specific format."
-#~ msgstr ""
-#~ "يجب على مستخدمي PowerPC، أو مستخدمي أية حاسب يحتوي عدة أجهزة فيديو، تحديد "
-#~ "قيمة BusID لبطاقة الفيديو بنسق معيّن مقبول."
-
-#~ msgid "Examples:"
-#~ msgstr "أمثلة:"
-
-#~ msgid ""
-#~ "For users of multi-head setups, this option will configure only one of "
-#~ "the heads. Further configuration will have to be done manually in the X "
-#~ "server configuration file, /etc/X11/xorg.conf."
-#~ msgstr ""
-#~ "لمستخدمي إعدادات الرؤوس المتعددة، سيقوم هذا الخيار بتهيئة واحد من الرؤوس "
-#~ "فقط. ويجب إتمام التهيئة يدوياً في ملف تهيئة خادم X، /etc/X11/xorg.conf."
-
-#~ msgid ""
-#~ "You may wish to use the \"lspci\" command to determine the bus location "
-#~ "of your PCI, AGP, or PCI-Express video card."
-#~ msgstr ""
-#~ "قد يساعدك تنفيذ الأمر \"lspci\" كي تتمكن من التعرف على موقع ناقل PCI، أو "
-#~ "AGP، أو PCI-Express الخاص ببطاقة الفيديو."
-
-#~ msgid ""
-#~ "When possible, this question has been pre-answered for you and you should "
-#~ "accept the default unless you know it doesn't work."
-#~ msgstr ""
-#~ "أينما أمكن، فقد تمت الإجابة على هذا السؤال مسبقاً بالنيابة عنك وعليك بقبول "
-#~ "الجواب الافتراضي إلا إن كنت تعلم أنه لن يصلح."
-
-#~ msgid "Incorrect format for the bus identifier"
-#~ msgstr "نسق مُعرّف الناقل غير صحيح"
-
-#~ msgid "Use kernel framebuffer device interface?"
-#~ msgstr "استخدام واجهة جهاز framebuffer الخاصة بالنواة؟"
-
-#~ msgid ""
-#~ "Rather than communicating directly with the video hardware, the X server "
-#~ "may be configured to perform some operations, such as video mode "
-#~ "switching, via the kernel's framebuffer driver."
-#~ msgstr ""
-#~ "بدلاً من التواصل مباشرة مع عتاد الفيديو، يمكن تهيئة خادم X لتأدية بعض "
-#~ "الأعمال، كتبديل وضع الفيديو عبر مُشغل kernel framebuffer."
-
-#~ msgid ""
-#~ "In theory, either approach should work, but in practice, sometimes one "
-#~ "does and the other does not. Enabling this option is the safe bet, but "
-#~ "feel free to turn it off if it appears to cause problems."
-#~ msgstr ""
-#~ "نظرياً، يجب أن تصلح أي من الطريقتين، ولكن عملياً، قد تصلح طريقة ولا تصلح "
-#~ "الأخرى. تمكين هذا الخيار هو الاختيار الأفضل، ولكن لا تتردد بتعطيله إن "
-#~ "كان يبدو أن يسبب أية مشاكل."
-
-#~ msgid "XKB rule set to use:"
-#~ msgstr "مجموعة أحكام XKB المطلوب استخدامها:"
-
-#~ msgid ""
-#~ "For the X server to handle the keyboard correctly, an XKB rule set must "
-#~ "be chosen."
-#~ msgstr ""
-#~ "كي يتمكن خادم X من التعامل مع لوحة المفاتيح بشكل صحيح، يجب اختيار مجموعة "
-#~ "أحكام XKB."
-
-#~ msgid "Users of most keyboards should enter \"xorg\"."
-#~ msgstr "مستخدي معظم لوحات المفاتيح يجب أن يدخلوا الاسم \"xorg\"."
-
-#~ msgid ""
-#~ "Experienced users can use any defined XKB rule set. If the xkb-data "
-#~ "package has been unpacked, see the /usr/share/X11/xkb/rules directory for "
-#~ "available rule sets."
-#~ msgstr ""
-#~ "يمكن لخبراء المستخدمين استخدام أية مجموعة أحكام XKB. إن تم استخراج "
-#~ "محتويات الحزمة xkb-data، فانظر في الدليل /usr/share/X11/xkb/rules للاطلاع "
-#~ "على مجموعات الأحكام المتوفرة."
-
-#~ msgid "When in doubt, this value should be set to \"xorg\"."
-#~ msgstr "عندما تكون في شك، يجب تحديد القيمة بـ\"xorg\"."
-
-#~ msgid "Keyboard model:"
-#~ msgstr "طراز لوحة المفاتيح:"
-
-#~ msgid ""
-#~ "For the X server to handle the keyboard correctly, a keyboard model must "
-#~ "be entered. Available models depend on which XKB rule set is in use."
-#~ msgstr ""
-#~ "كي يتمكن خادم X من التحكم بلوحة المفاتيح مباشرة، يجب اختيار طرازها. تعتمد "
-#~ "الطرازات المتوفرة على مجموعة أحكام XKB المستخدمة."
-
-#~ msgid ""
-#~ " With the \"xorg\" rule set:\n"
-#~ " - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in\n"
-#~ " the United States. Has no \"logo\" or \"menu\" keys;\n"
-#~ " - pc104: similar to pc101 model, with additional keys, usually engraved\n"
-#~ " with a \"logo\" symbol and a \"menu\" symbol;\n"
-#~ " - pc102: similar to pc101 and often found in Europe. Includes a \"< >\" "
-#~ "key;\n"
-#~ " - pc105: similar to pc104 and often found in Europe. Includes a \"< >\" "
-#~ "key;\n"
-#~ " - macintosh: Macintosh keyboards using the new input layer with Linux\n"
-#~ " keycodes;\n"
-#~ " - macintosh_old: Macintosh keyboards not using the new input layer;\n"
-#~ " - type4: Sun Type4 keyboards;\n"
-#~ " - type5: Sun Type5 keyboards."
-#~ msgstr ""
-#~ " باستخدام مجموعة أحكام \"xorg\":\n"
-#~ " - pc101: لوحة مفاتيح IBM PC/AT تحتوي 101 زر، شائعة في\n"
-#~ " الولايات المتحدة. ليس لها أي \"شعار\" أو أزرار \"قائمة\"\n"
-#~ " - pc104: شبيهة بطراز pc101، وتحتوي مفاتيح إضافية، محفورة عادة برمز\n"
-#~ " \"الشعار\" ورمز \"القائمة\";\n"
-#~ " - pc102: شبيهة بطراز pc101 وغالباً ما تكون في أوروبا. تشمل مفتاح \"< >"
-#~ "\";\n"
-#~ " - pc105: شبيهة بطراز pc104 وغالباً ما تكون في أوروبا. تشمل مفتاح \"< >"
-#~ "\";\n"
-#~ " - macintosh: لوحات مفاتيح ماكنتوش تستخدم طبقة الإدخال الجديدة مع رموز\n"
-#~ " مفاتيح لينكس;\n"
-#~ " - macintosh_old: لوحات مفاتيح ماكنتوش التي لا تستخدم طبقة الإدخال "
-#~ "الجديدة.\n"
-#~ " - type4: لوحات مفاتيح Sun Type4;\n"
-#~ " - type5: لوحات مفاتيح Sun Type5."
-
-#~ msgid ""
-#~ "Laptop keyboards often do not have as many keys as standalone models; "
-#~ "laptop users should select the keyboard model most closely approximated "
-#~ "by the above."
-#~ msgstr ""
-#~ "لا تحتوي لوحات مفاتيح أجهزة الحاسب المحمولة عادة عدد مفاتيح يساوي لوحات "
-#~ "المفاتيح المنفصلة؛ على مستخدمي أجهزة الحاسب المحمولة اختيار طراز لوحة "
-#~ "المفاتيح المشابهة تقريباً لما هو أعلاه."
Reply to: