This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit d716e91aa8f8064449761b50ee68aaf902559461 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 27 06:41:43 2015 +0100 x2goserver.spec: add workaround documentation for sudoers on *SUSE 11. Conflicts: x2goserver.spec --- debian/changelog | 1 + x2goserver.spec | 19 +++++++++++++++++++ x2goserver/doc/README.sudoers | 22 ++++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/debian/changelog b/debian/changelog index 768af5b..0ce2094 100644 --- a/debian/changelog +++ b/debian/changelog @@ -186,6 +186,7 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low - Typo fix in comment: Recommands -> Recommends. - Fix installation on OpenSUSE 12.3 and higher: has replaced pwdutils with shadow. Also affects SLE{S,D} 12. + - Add workaround documentation for sudoers on *SUSE 11. -- X2Go Release Manager <git-admin@x2go.org> Tue, 24 Feb 2015 22:11:49 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index 982f853..866af17 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -490,6 +490,18 @@ cat > "%{buildroot}/%_sysconfdir/permissions.d/perl-X2Go-Server-DB" <<-EOF EOF %endif +# Workaround for OpenSUSE 11 and SLE{S,D} 11: +# These versions do not support or have /etc/sudoers.d/. +# Installing a file in there will fail due to it being +# an orphaned directory and - worse - it will not work +# anyway. +# We move the file to the doc dir, add a README.sudo +# and also references this in our wiki on +# https://wiki.x2go.org/doku.php/doc:installation:x2goserver#workaround_for_qt... +%if 0%{?suse_version} < 1210 +rm -f "%{buildroot}/etc/sudoers.d/x2goserver" +%endif + %pre common if ! getent group x2gouser 1>/dev/null; then groupadd -r x2gouser @@ -602,6 +614,11 @@ fi %defattr(-,root,root) %doc debian/copyright %doc debian/changelog +# Workaround for sudoers on OpenSUSE 11/SLE{S,D} 11. +%if 0%{?suse_version} < 1210 +%doc x2goserver/doc/README.sudoers +%doc x2goserver/etc/sudoers.d/x2goserver +%endif # logcheck is not available on OpenSUSE, SLES/SLED, FC19 and RHEL. # Please re-check this periodically. %if 0%{?suse_version} || 0%{?fedora} < 20 || 0%{?rhel} @@ -609,7 +626,9 @@ fi %dir %{_sysconfdir}/logcheck/ignore.d.server %endif %config(noreplace) %{_sysconfdir}/logcheck/ignore.d.server/x2goserver +%if 0%{?suse_version} >= 1210 %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver +%endif %{_bindir}/x2go* %exclude %{_bindir}/x2goserver-run-extensions %exclude %{_bindir}/x2gofm diff --git a/x2goserver/doc/README.sudoers b/x2goserver/doc/README.sudoers new file mode 100644 index 0000000..2a97412 --- /dev/null +++ b/x2goserver/doc/README.sudoers @@ -0,0 +1,22 @@ +WORKAROUND FOR OPENSUSE 11 and SLES/SLED 11 +=========================================== + +Problem Description +------------------- + +OpenSUSE 11 and SLES/SLED 11 do not support /etc/sudoers.d as a place for +custom sudoers config files. + +If you are using any of these distributions and +are having issues regarding running Qt applications with elevated privileges +(e.g., via kdesu or sudo), please use this workaround. + + +Necessary Actions +----------------- + +1.) Copy the contents of the "x2goserver" file in this directory. +2.) Get elevated privileges. Either via su or sudo -i. +3.) Launch visudo. +4.) Paste the previously copied content at the end of the sudoers file. +5.) Save and exit your editor. -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git