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

- Add permission verification for SUID wrapper

Browse Source 
- Disable SUID wrapper per default until reviewed

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=628
This commit is contained in:
Egbert Eich 2016-04-12 15:37:50 +00:00 committed by Git OBS Bridge
parent 1a9d38c162
commit e832319079
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xorg-x11-server.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 12 15:33:45 UTC 2016 - eich@suse.com
- Add permission verification for SUID wrapper
- Disable SUID wrapper per default until reviewed
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 12 13:59:48 UTC 2016 - eich@suse.com Tue Apr 12 13:59:48 UTC 2016 - eich@suse.com

18
xorg-x11-server.spec
View File

@ -24,12 +24,21 @@
%define have_wayland 1 %define have_wayland 1
%endif %endif
%endif %endif
%define build_suid_wrapper 0
%if 0%{!?build_suid_wrapper:1}
%ifarch s390 s390x
%define build_suid_wrapper 0
%else
%if 0%{?suse_version} >= 1330 %if 0%{?suse_version} >= 1330
%define build_suid_wrapper 1 %define build_suid_wrapper 1
%define suid_wrapper_dir %{_libexecdir} %define suid_wrapper_dir %{_libexecdir}
%else %else
%define build_suid_wrapper 0 %define build_suid_wrapper 0
%endif %endif
%endif
%endif
Name: xorg-x11-server Name: xorg-x11-server
@ -242,6 +251,7 @@ This package contains the Xserver running on the Wayland Display Server.
%package wrapper %package wrapper
Summary: Xserver SUID Wrapper Summary: Xserver SUID Wrapper
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
PreReq: permissions
Requires: xorg-x11-server == %{version} Requires: xorg-x11-server == %{version}
%description wrapper %description wrapper
@ -518,6 +528,14 @@ fi
%endif %endif
%endif %endif
%if 0%{?build_suid_wrapper} == 1
%post wrapper
%set_permissions %{suid_wrapper_dir}/Xorg.wrap
%verifyscript wrapper
%verify_permissions -e %{suid_wrapper_dir}/Xorg.wrap
%endif
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%ifnarch s390 s390x %ifnarch s390 s390x