rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

- n_xorg-wrapper-anybody.patch

Browse Source 
* replace default config /etc/X11/Xwrapper, which allows
    anybody to use the wrapper, by a patch for the code, i.e.
      # rootonly, console, anybody
      allowed_users=anybody
      # yes, no, auto
      needs_root_rights=auto
    is now the default without any Xwrapper config
    (needs_root_rights=auto was already the default before)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=780
This commit is contained in:
Stefan Dirsch 2020-09-30 10:40:49 +00:00 committed by Git OBS Bridge
parent b7ed257592
commit 3d14f5f1e6
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
n_xorg-wrapper-anybody.patch Normal file
View File

@ -0,0 +1,11 @@
--- xserver-1.20.9/hw/xfree86/xorg-wrapper.c.old 2020-09-30 12:25:12.757532000 +0200
+++ xserver-1.20.9/hw/xfree86/xorg-wrapper.c 2020-09-30 12:27:12.809554000 +0200
@@ -254,7 +254,7 @@ int main(int argc, char *argv[])
int i, r, fd;
int kms_cards = 0;
int total_cards = 0;
- int allowed = CONSOLE_ONLY;
+ int allowed = ANYBODY;
int needs_root_rights = -1;
char *const empty_envp[1] = { NULL, };

13
xorg-x11-server.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Sep 30 10:30:06 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- n_xorg-wrapper-anybody.patch
* replace default config /etc/X11/Xwrapper, which allows
anybody to use the wrapper, by a patch for the code, i.e.
# rootonly, console, anybody
allowed_users=anybody
# yes, no, auto
needs_root_rights=auto
is now the default without any Xwrapper config
(needs_root_rights=auto was already the default before)
-------------------------------------------------------------------
Tue Sep 29 14:47:48 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

14
xorg-x11-server.spec
View File

@ -214,6 +214,7 @@ Patch8: u_xorg-wrapper-Drop-supplemental-group-IDs.patch
Patch9: u_xorg-wrapper-build-Build-position-independent-code.patch
Patch10: u_xorg-wrapper-Xserver-Options-Whitelist-Filter.patch
Patch11: n_xorg-wrapper-rename-Xorg.patch
Patch12: n_xorg-wrapper-anybody.patch
Patch100: u_01-Improved-ConfineToShape.patch
Patch101: u_02-DIX-ConfineTo-Don-t-bother-about-the-bounding-box-when-grabbing-a-shaped-window.patch
# PATCH-FIX-UPSTREAM u_x86emu-include-order.patch schwab@suse.de -- Change include order to avoid conflict with system header, remove duplicate definitions
@ -378,6 +379,7 @@ sh %{SOURCE92} --verify . %{SOURCE91}
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
#
%patch100 -p1
#%patch101 -p1
@ -543,16 +545,6 @@ ln -snf %{_sysconfdir}/alternatives/libglx.so %{buildroot}%{_libdir}/xorg/module
mkdir -p %{buildroot}/usr/src/xserver
xargs cp --parents --target-directory=%{buildroot}/usr/src/xserver < source-file-list
%if 0%{?build_suid_wrapper} == 1
mkdir -p %{buildroot}%{_sysconfdir}/X11
cat > %{buildroot}%{_sysconfdir}/X11/Xwrapper.config << EOF
# rootonly, console, anybody
allowed_users=anybody
# yes, no, auto
needs_root_rights=auto
EOF
%endif
%post
%tmpfiles_create xbb.conf
%ifnarch s390 s390x
@ -658,8 +650,6 @@ fi
%files wrapper
%defattr(-,root,root)
%attr(4755,root,root) %{suid_wrapper_dir}/Xorg.wrap
%dir %{_sysconfdir}/X11
%attr(0644,root,root) %config %{_sysconfdir}/X11/Xwrapper.config
%endif
%files extra