This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from ad81e38d x2golistsessions_root: Improve hypen-escaping in previous commit. new 4354877d x2goruncommand: Support GNOME-based Ubuntu sessions (via X2Go Kdrive) as provided by Ubuntu 18.04 or later. new 65990298 GNOME sessions: Avoid firing up of a polkit-1 authentication dialog requesting admin credentials to register a new color map device. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 9 +++++++++ debian/x2goserver.install | 2 ++ x2goserver.spec | 9 +++++++++ x2goserver/Makefile | 6 ++++++ x2goserver/bin/x2goruncommand | 15 +++++++++++++-- .../10-vendor.d/x2goserver-no-colord.pkla | 10 ++++++++++ .../etc/polkit-1/rules.d/10-x2goserver-no-colord.rules | 17 +++++++++++++++++ 7 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 x2goserver/etc/polkit-1/localauthority/10-vendor.d/x2goserver-no-colord.pkla create mode 100644 x2goserver/etc/polkit-1/rules.d/10-x2goserver-no-colord.rules -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 4354877dea35eef4f2b1689d8c65d8bf769e5f3b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Sep 28 20:59:25 2019 +0200 x2goruncommand: Support GNOME-based Ubuntu sessions (via X2Go Kdrive) as provided by Ubuntu 18.04 or later. --- debian/changelog | 2 ++ x2goserver/bin/x2goruncommand | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3cd45bf7..86692f5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium - Add man page for x2gocleansessions. - x2goserver/man/man8/x2golistsessions_root.8: Mention --all-servers option. (Fixes: #1395). + - x2goruncommand: Support GNOME-based Ubuntu sessions (via X2Go Kdrive) + as provided by Ubuntu 18.04 or later. * debian/x2goserver.postinst: + Drop duplicate sourcing of debconf includes. + Add Dutch debconf translation. Thanks to Frans Spiesschaert. diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 34fcc816..5a553043 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -128,7 +128,7 @@ fi # Note that we are assuming that the user has gnome-session # 3.9.90-0ubuntu12.1 or later on 14.04, or 3.9.90-0ubuntu16.1 on # 14.10, which added --disable-acceleration-check . -# Ubuntu 15.04 (vivid) & later: +# Ubuntu 15.04 (vivid) up to 17.10 (artful): # GNOME -> gnome-session --session=gnome-flashback-metacity --disable-acceleration-check # UNITY -> gnome-session --session=ubuntu # (GNOME3 based desktop shells) @@ -142,10 +142,21 @@ fi # # Also note that the XDG_CURRENT_DESKTOP value comes from # "DesktopNames" in the /usr/share/xsessions/ .desktop file +# Ubuntu 18.04 (bionic) & later (must use X2Go Kdrive) +# +# UBUNTU (GNOME-based) -> +# env GNOME_SHELL_SESSION_MODE=ubuntu +# gnome-session --session=ubuntu if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 15.04" | bc)" == "1" ]; then + + if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 18.04" | bc)" == "1" ]; then + export DESKTOP_SESSION="ubuntu" + export XGD_SESSION_DESKTOP="$DESKTOP_SESSION" + export GNOME_SHELL_SESSION_MODE="ubuntu" + args=" --session=ubuntu" + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 15.04" | bc)" == "1" ] && [ "$(echo "$DISTRIB_RELEASE <= 17.11" | bc)" == "1" ]; then export DESKTOP_SESSION="gnome-flashback-metacity" if [ -z "$GTK_MODULES" ] ; then export GTK_MODULES="unity-gtk-module" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 65990298c99aca393f33cdbe47d528277d3fe25d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Sep 28 21:15:03 2019 +0200 GNOME sessions: Avoid firing up of a polkit-1 authentication dialog requesting admin credentials to register a new color map device. See GNOME bug: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/issues/273 --- debian/changelog | 7 +++++++ debian/x2goserver.install | 2 ++ x2goserver.spec | 9 +++++++++ x2goserver/Makefile | 6 ++++++ .../10-vendor.d/x2goserver-no-colord.pkla | 10 ++++++++++ .../etc/polkit-1/rules.d/10-x2goserver-no-colord.rules | 17 +++++++++++++++++ 6 files changed, 51 insertions(+) diff --git a/debian/changelog b/debian/changelog index 86692f5e..018166c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,13 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium option. (Fixes: #1395). - x2goruncommand: Support GNOME-based Ubuntu sessions (via X2Go Kdrive) as provided by Ubuntu 18.04 or later. + - GNOME sessions: Avoid firing up of a polkit-1 authentication dialog + requesting admin credentials to register a new color map device. + See GNOME bug: + https://gitlab.gnome.org/GNOME/gnome-settings-daemon/issues/273 + This change only gets activated for Debian for now and focuses + on policykit-1 (<= 0.105). (Debian maintainers of policykit-1 + are holding back newer versions for unknown reason). * debian/x2goserver.postinst: + Drop duplicate sourcing of debconf includes. + Add Dutch debconf translation. Thanks to Frans Spiesschaert. diff --git a/debian/x2goserver.install b/debian/x2goserver.install index c76a876b..e1524cce 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -1,4 +1,6 @@ etc/logcheck/ignore.d.server/x2goserver +x2goserver/etc/polkit-1/localauthority/10-vendor.d/x2goserver-no-colord.pkla etc/polkit-1/localauthority/10-vendor.d/ +#x2goserver/etc/polkit-1/rules.d/x2goserver-no-colord.rules etc/polkit-1/rules.d/ etc/sudoers.d/x2goserver etc/x2go/x2go_logout* usr/bin/x2gobasepath diff --git a/x2goserver.spec b/x2goserver.spec index 5fd1adfc..a52c1ac1 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -159,6 +159,11 @@ Requires: x2goserver-xsession Suggests: x2goserver-fmbindings Suggests: x2goserver-printing %endif +#Requires: polkit-pkla-compat (or polkit <= 0.105) +# -> /etc/polkit-1/localauthority/10-vendor.d/x2goserver-no-colord.pkla +#or +#Requires: polkit (>= 0.106) +# -> /etc/polkit-1/rules.d/x2goserver-no-colord.rules %{?perl_default_filter} @@ -896,6 +901,10 @@ fi %if ( ! 0%{?suse_version} ) || 0%{?suse_version} >= 1210 %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %endif +### polkit (<= 0.105) +#%config(noreplace) %{_sysconfdir}/polkit-1/localauthority/10-vendor.d/x2goserver-no-colord.pkla +## polkit (>= 0.106) +#%config(noreplace) %{_sysconfdir}/polkit-1/rules.d/x2goserver-no-colord.rules %{_bindir}/x2go* %exclude %{_bindir}/x2goserver-run-extensions %exclude %{_bindir}/x2gofm diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 746e83ea..9a53a015 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -142,6 +142,12 @@ install_config: $(INSTALL_FILE) etc/sudoers.d/x2goserver $(DESTDIR)/etc/sudoers.d/ $(INSTALL_DIR) $(DESTDIR)/etc/logcheck/ignore.d.server || true $(INSTALL_FILE) etc/logcheck/ignore.d.server/x2goserver $(DESTDIR)/etc/logcheck/ignore.d.server/ + # keep this commented out, until x2goserver.spec knows how to + # handle pkla/rules file installation for what RPM distro / version + #$(INSTALL_DIR) $(DESTDIR)/etc/polkit-1/localauthority/10-vendor.d/ || true + #$(INSTALL_FILE) etc/polkit-1/localauthority/10-vendor.d/x2goserver-no-colord.pkla $(DESTDIR)/etc/polkit-1/localauthority/10-vendor.d/ + #$(INSTALL_DIR) $(DESTDIR)/etc/polkit-1/rules.d/ || true + #$(INSTALL_FILE) etc/polkit-1/rules.d/x2goserver-no-colord.rules $(DESTDIR)/etc/polkit-1/rules.d/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) diff --git a/x2goserver/etc/polkit-1/localauthority/10-vendor.d/x2goserver-no-colord.pkla b/x2goserver/etc/polkit-1/localauthority/10-vendor.d/x2goserver-no-colord.pkla new file mode 100644 index 00000000..b8824b0b --- /dev/null +++ b/x2goserver/etc/polkit-1/localauthority/10-vendor.d/x2goserver-no-colord.pkla @@ -0,0 +1,10 @@ +# GNOME sessions in X2Go Server will try to create a color-manager +# map device on session startup. Let's disable colord support on +# this host entirely as a workaround. +# +# See: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/issues/273 + +[Allow all users to manage color devices] +Identity=unix-user:* +Action=org.freedesktop.color-manager.* +ResultAny=no diff --git a/x2goserver/etc/polkit-1/rules.d/10-x2goserver-no-colord.rules b/x2goserver/etc/polkit-1/rules.d/10-x2goserver-no-colord.rules new file mode 100644 index 00000000..054f0735 --- /dev/null +++ b/x2goserver/etc/polkit-1/rules.d/10-x2goserver-no-colord.rules @@ -0,0 +1,17 @@ +# GNOME sessions in X2Go Server will try to create a color-manager +# map device on session startup. Let's disable colord support on +# this host entirely as a workaround. +# +# See: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/issues/273 + +polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.color-manager.create-device" || + action.id == "org.freedesktop.color-manager.create-profile" || + action.id == "org.freedesktop.color-manager.delete-device" || + action.id == "org.freedesktop.color-manager.delete-profile" || + action.id == "org.freedesktop.color-manager.modify-device" || + action.id == "org.freedesktop.color-manager.modify-profile") + { + return polkit.Result.NO; + } +}); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org