[packages/xorg-xserver-server] - use upstream wrapper (no pam but non-root support for KMS based drivers)
arekm
arekm at pld-linux.org
Tue Nov 10 21:08:30 CET 2015
commit daf93c5d2b301119f60ff70d4be3a0f02a6cb47f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Nov 10 21:08:21 2015 +0100
- use upstream wrapper (no pam but non-root support for KMS based drivers)
xorg-xserver-server-include-defs.patch | 18 +-
xorg-xserver-server-xwrapper.patch | 321 ---------------------------------
xorg-xserver-server.spec | 17 +-
3 files changed, 19 insertions(+), 337 deletions(-)
---
diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index eaa6554..a7a5afb 100644
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -1,7 +1,6 @@
# TODO
# - consider XSELINUX by default
# - Xvfb initscript runs Xvfb as root! add user there!
-# - upstream --enable-suid-wrapper vs Xwrapper patch?
#
# Conditional build:
%bcond_with dbus # D-BUS support for configuration (if no udev)
@@ -46,8 +45,6 @@ Source10: %{name}-Xvfb.init
Source11: %{name}-Xvfb.sysconfig
Source12: xvfb-run.sh
-Patch0: %{name}-xwrapper.patch
-
Patch2: dtrace-link.patch
Patch4: %{name}-builtin-SHA1.patch
@@ -429,16 +426,13 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
%prep
%setup -q -n xorg-server-%{version}
-%patch0 -p0
%patch2 -p1
%patch4 -p1
%patch6 -p1
-
-#unfortunately breaks build
-#patch7 -p1
+%patch7 -p1
# xserver uses pixman-1 API/ABI so put that explictly here
sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h
@@ -481,6 +475,7 @@ fi
%{__autoheader}
%{__automake}
%configure \
+ --libexecdir=%{_libdir}/xorg \
--with-os-name="PLD/Linux" \
--with-os-vendor="PLD/Team" \
--with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \
@@ -508,6 +503,7 @@ fi
%{?with_wayland:--enable-xwayland} \
%{!?with_systemtap:--without-dtrace} \
--without-fop \
+ --enable-suid-wrapper \
--with-systemd-daemon
%{__make} -j1
@@ -540,6 +536,9 @@ install -d $RPM_BUILD_ROOT/etc/sysconfig
install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/Xvfb
cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/Xvfb
+# compatibility with old xwrapper
+ln -s %{_libdir}/xorg/Xorg.wraap $RPM_BUILD_ROOT%{_bindir}/Xwrapper
+
# prepare source package
install -d $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}
cp -a * $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}
@@ -585,6 +584,8 @@ fi
%attr(755,root,root) %{_bindir}/gtf
%dir %{_libdir}/xorg
%{_libdir}/xorg/protocol.txt
+%attr(755,root,root) %{_libdir}/xorg/Xorg
+%attr(4755,root,root) %{_libdir}/xorg/Xorg.wrap
%dir %{_libdir}/xorg/modules
%attr(755,root,root) %{_libdir}/xorg/modules/libexa.so
%attr(755,root,root) %{_libdir}/xorg/modules/libfb.so
@@ -617,12 +618,14 @@ fi
# overwrite these settings with local configs in /etc/X11/xorg.conf.d
%verify(not md5 mtime size) %{_datadir}/X11/xorg.conf.d/10-quirks.conf
%{_mandir}/man1/Xorg.1*
+%{_mandir}/man1/Xorg.wrap.1*
%{_mandir}/man1/Xserver.1*
%{_mandir}/man1/cvt.1*
%{_mandir}/man1/gtf.1*
%{_mandir}/man4/exa.4*
%{_mandir}/man4/fbdevhw.4*
%{_mandir}/man4/modesetting.4*
+%{_mandir}/man5/Xwrapper.config.5*
%{_mandir}/man5/xorg.conf.5*
%{_mandir}/man5/xorg.conf.d.5*
diff --git a/xorg-xserver-server-include-defs.patch b/xorg-xserver-server-include-defs.patch
index 747f19a..2667852 100644
--- a/xorg-xserver-server-include-defs.patch
+++ b/xorg-xserver-server-include-defs.patch
@@ -1,10 +1,10 @@
---- xorg-server-1.12.0/include/os.h~ 2012-01-17 00:51:54.000000000 +0100
-+++ xorg-server-1.12.0/include/os.h 2012-03-20 18:36:45.042937701 +0100
-@@ -49,6 +49,7 @@
- #ifndef OS_H
- #define OS_H
+--- xorg-server-1.18.0/hw/xfree86/xorg-wrapper.c~ 2015-11-10 19:37:11.000000000 +0100
++++ xorg-server-1.18.0/hw/xfree86/xorg-wrapper.c 2015-11-10 19:37:18.640853466 +0100
+@@ -24,6 +24,7 @@
+ */
-+#include "xorg-server.h"
- #include "misc.h"
- #include <stdarg.h>
- #include <string.h>
+ #include "dix-config.h"
++#include "xorg-config.h"
+
+ #include <errno.h>
+ #include <fcntl.h>
diff --git a/xorg-xserver-server-xwrapper.patch b/xorg-xserver-server-xwrapper.patch
deleted file mode 100644
index 0d9ff38..0000000
--- a/xorg-xserver-server-xwrapper.patch
+++ /dev/null
@@ -1,321 +0,0 @@
---- os/wrapper.c 1970-01-01 01:00:00.000000000 +0100
-+++ os/wrapper.c 2005-12-22 10:50:53.610963000 +0100
-@@ -0,0 +1,304 @@
-+/*
-+ * X server wrapper.
-+ *
-+ * This wrapper makes some sanity checks on the command line arguments
-+ * and environment variables when run with euid == 0 && euid != uid.
-+ * If the checks fail, the wrapper exits with a message.
-+ * If they succeed, it exec's the Xserver.
-+ */
-+
-+/*
-+ * Copyright (c) 1998 by The XFree86 Project, Inc. All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject
-+ * to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES
-+ * OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-+ * OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of the XFree86 Project
-+ * shall not be used in advertising or otherwise to promote the sale,
-+ * use or other dealings in this Software without prior written
-+ * authorization from the XFree86 Project.
-+ */
-+
-+/* $XFree86: xc/programs/Xserver/os/wrapper.c,v 1.1.2.5 1998/02/27 15:28:59 dawes Exp $ */
-+
-+/* This is normally set in the Imakefile */
-+#ifndef XSERVER_PATH
-+#define XSERVER_PATH "/etc/X11/X"
-+#endif
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#ifdef USE_PAM
-+#include <security/pam_appl.h>
-+#include <security/pam_misc.h>
-+#include <pwd.h>
-+#endif /* USE_PAM */
-+
-+/* Neither of these should be required for XFree86 3.3.2 */
-+#ifndef REJECT_CONFIG
-+#define REJECT_CONFIG 0
-+#endif
-+#ifndef REJECT_XKBDIR
-+#define REJECT_XKBDIR 0
-+#endif
-+
-+/* Consider LD* variables insecure ? */
-+#ifndef REMOVE_ENV_LD
-+#define REMOVE_ENV_LD 1
-+#endif
-+
-+/* Remove long environment variables? */
-+#ifndef REMOVE_LONG_ENV
-+#define REMOVE_LONG_ENV 1
-+#endif
-+
-+/* Check args and env only if running setuid (euid == 0 && euid != uid) ? */
-+#ifndef CHECK_EUID
-+#define CHECK_EUID 1
-+#endif
-+
-+/*
-+ * Maybe the locale can be faked to make isprint(3) report that everything
-+ * is printable? Avoid it by default.
-+ */
-+#ifndef USE_ISPRINT
-+#define USE_ISPRINT 0
-+#endif
-+
-+#define MAX_ARG_LENGTH 128
-+#define MAX_ENV_LENGTH 256
-+#define MAX_ENV_PATH_LENGTH 2048
-+
-+#if USE_ISPRINT
-+#include <ctype.h>
-+#define checkPrintable(c) isprint(c)
-+#else
-+#define checkPrintable(c) (((c) & 0x7f) >= 0x20 && ((c) & 0x7f) != 0x7f)
-+#endif
-+
-+enum BadCode {
-+ NotBad = 0,
-+ UnsafeArg,
-+ ArgTooLong,
-+ UnprintableArg,
-+ EnvTooLong,
-+ InternalError,
-+#ifdef USE_PAM
-+ PamFailed,
-+ PamAuthFailed,
-+#endif /* USE_PAM */
-+};
-+
-+#define ARGMSG \
-+ "\nIf the arguments used are valid, and have been rejected incorrectly\n" \
-+ "please send details of the arguments and why they are valid to\n" \
-+ "XFree86 at XFree86.org. In the meantime, you can start the Xserver as\n" \
-+ "the \"super user\" (root).\n"
-+
-+#define ENVMSG \
-+ "\nIf the environment is valid, and have been rejected incorrectly\n" \
-+ "please send details of the environment and why it is valid to\n" \
-+ "XFree86 at XFree86.org. In the meantime, you can start the Xserver as\n" \
-+ "the \"super user\" (root).\n"
-+
-+#ifdef USE_PAM
-+static struct pam_conv conv = {
-+ misc_conv,
-+ NULL
-+};
-+#endif /* USE_PAM */
-+
-+
-+int
-+main(int argc, char **argv, char **envp)
-+{
-+ enum BadCode bad = NotBad;
-+ int i, j;
-+ char *a, *e;
-+#ifdef USE_PAM
-+ pam_handle_t *pamh = NULL;
-+ struct passwd *pw;
-+ int retval;
-+
-+ pw = getpwuid(getuid());
-+ if (pw == NULL) {
-+ bad = InternalError;
-+ }
-+
-+ if (!bad) {
-+ retval = pam_start("xserver", pw->pw_name, &conv, &pamh);
-+ if (retval != PAM_SUCCESS)
-+ bad = PamFailed;
-+ }
-+
-+ if (!bad) {
-+ retval = pam_authenticate(pamh, 0);
-+ if (retval != PAM_SUCCESS) {
-+ pam_end(pamh, retval);
-+ bad = PamAuthFailed;
-+ }
-+ }
-+
-+ if (!bad) {
-+ retval = pam_acct_mgmt(pamh, 0);
-+ if (retval != PAM_SUCCESS) {
-+ pam_end(pamh, retval);
-+ bad = PamAuthFailed;
-+ }
-+ }
-+
-+ /* this is not a session, so do not do session management */
-+
-+ if (!bad) pam_end(pamh, PAM_SUCCESS);
-+#endif /* USE_PAM */
-+
-+#if CHECK_EUID
-+ if (!bad && geteuid() == 0 && getuid() != geteuid()) {
-+#else
-+ if (!bad) {
-+#endif
-+ /* Check each argv[] */
-+ for (i = 1; i < argc; i++) {
-+
-+ /* Check for known bad arguments */
-+#if REJECT_CONFIG
-+ if (strcmp(argv[i], "-config") == 0) {
-+ bad = UnsafeArg;
-+ break;
-+ }
-+#endif
-+#if REJECT_XKBDIR
-+ if (strcmp(argv[i], "-xkbdir") == 0) {
-+ bad = UnsafeArg;
-+ break;
-+ }
-+#endif
-+ if (strlen(argv[i]) > MAX_ARG_LENGTH) {
-+ bad = ArgTooLong;
-+ break;
-+ }
-+ a = argv[i];
-+ while (*a) {
-+ if (checkPrintable(*a) == 0) {
-+ bad = UnprintableArg;
-+ break;
-+ }
-+ a++;
-+ }
-+ if (bad)
-+ break;
-+ }
-+ /* Check each envp[] */
-+ if (!bad)
-+ for (i = 0; envp[i]; i++) {
-+
-+ /* Check for bad environment variables and values */
-+#if REMOVE_ENV_LD
-+ while (envp[i] && (strncmp(envp[i], "LD", 2) == 0)) {
-+ for (j = i; envp[j]; j++) {
-+ envp[j] = envp[j+1];
-+ }
-+ }
-+#endif
-+ if (envp[i] && (strlen(envp[i]) > MAX_ENV_LENGTH)) {
-+#if REMOVE_LONG_ENV
-+ for (j = i; envp[j]; j++) {
-+ envp[j] = envp[j+1];
-+ }
-+ i--;
-+#else
-+ char *eq;
-+ int len;
-+
-+ eq = strchr(envp[i], '=');
-+ if (!eq)
-+ continue;
-+ len = eq - envp[i];
-+ e = malloc(len + 1);
-+ if (!e) {
-+ bad = InternalError;
-+ break;
-+ }
-+ strncpy(e, envp[i], len);
-+ e[len] = 0;
-+ if (len >= 4 &&
-+ (strcmp(e + len - 4, "PATH") == 0 ||
-+ strcmp(e, "TERMCAP") == 0)) {
-+ if (strlen(envp[i]) > MAX_ENV_PATH_LENGTH) {
-+ bad = EnvTooLong;
-+ break;
-+ } else {
-+ free(e);
-+ }
-+ } else {
-+ bad = EnvTooLong;
-+ break;
-+ }
-+#endif
-+ }
-+ }
-+ }
-+ switch (bad) {
-+ case NotBad:
-+ execve(XSERVER_PATH, argv, envp);
-+ fprintf(stderr, "execve failed for %s (errno %d)\n", XSERVER_PATH,
-+ errno);
-+ break;
-+ case UnsafeArg:
-+ fprintf(stderr, "Command line argument number %d is unsafe\n", i);
-+ fprintf(stderr, ARGMSG);
-+ break;
-+ case ArgTooLong:
-+ fprintf(stderr, "Command line argument number %d is too long\n", i);
-+ fprintf(stderr, ARGMSG);
-+ break;
-+ case UnprintableArg:
-+ fprintf(stderr, "Command line argument number %d contains unprintable"
-+ " characters\n", i);
-+ fprintf(stderr, ARGMSG);
-+ break;
-+ case EnvTooLong:
-+ fprintf(stderr, "Environment variable `%s' is too long\n", e);
-+ fprintf(stderr, ENVMSG);
-+ break;
-+ case InternalError:
-+ fprintf(stderr, "Internal Error\n");
-+ break;
-+#ifdef USE_PAM
-+ case PamFailed:
-+ fprintf(stderr, "Authentication System Failure, "
-+ "missing or mangled PAM configuration file or module?\n");
-+ break;
-+ case PamAuthFailed:
-+ fprintf(stderr, "PAM authentication failed\n");
-+ break;
-+#endif
-+ default:
-+ fprintf(stderr, "Unknown error\n");
-+ fprintf(stderr, ARGMSG);
-+ fprintf(stderr, ENVMSG);
-+ break;
-+ }
-+ exit(1);
-+}
-+
---- os/Makefile.am 2005-12-06 16:50:35.000000000 +0100
-+++ os/Makefile.am 2006-02-05 14:36:53.211755250 +0100
-@@ -24,6 +24,11 @@
- xprintf.c \
- $(XORG_SRCS)
-
-+bin_PROGRAMS = Xwrapper
-+Xwrapper_SOURCES = wrapper.c
-+Xwrapper_CFLAGS = -DUSE_PAM -DXSERVER_PATH=\"/usr/bin/Xorg\" $(AM_CFLAGS)
-+Xwrapper_LDADD = -lpam_misc -lpam
-+
- if SECURE_RPC
- libos_la_SOURCES += $(SECURERPC_SRCS)
- endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-xserver-server.git/commitdiff/daf93c5d2b301119f60ff70d4be3a0f02a6cb47f
More information about the pld-cvs-commit
mailing list