Merge branch 'main' into dev

ChangeLog.md

@@ -44,6 +44,15 @@ indefinitely if a viewer's network connection drops while it is dragging the
 mouse. A new Xvnc command-line option (`-pointerlocktimeout`) can be used to
 specify the time limit.
 
+4. The RPM and DEB packages generated by the TurboVNC build/packaging system
+now include a polkit rules file that prevents various authentication dialogs
+("Authentication is required to create a color managed device", "Authentication
+is required to access the PC/SC daemon", "Authentication is required to refresh
+the system repositories") from popping up when using the GNOME window manager
+with the TurboVNC Server on Ubuntu 23.10 and later (if the `polkitd-pkla`
+package is not installed) and on RHEL 7 and Fedora 19 and later (if the
+`polkit-pkla-compat` package is not installed.)
+
 
 3.1.1
 =====

release/makedpkg.in

@@ -87,11 +87,28 @@ EOF
 if [ "$SYSCONFDIR" = "/etc" ]; then
 mkdir -p $TMPDIR/etc/polkit-1/localauthority/50-local.d
 cat > $TMPDIR/etc/polkit-1/localauthority/50-local.d/45-turbovnc-gnome3.pkla << EOF
-[Eliminate GNOME 3 dialogs in TurboVNC]
+[Eliminate GNOME 3+ dialogs in TurboVNC]
 Identity=unix-user:*
 Action=org.freedesktop.color-manager.create-device;org.freedesktop.color-manager.create-profile;org.freedesktop.color-manager.delete-device;org.freedesktop.color-manager.delete-profile;org.freedesktop.color-manager.modify-device;org.freedesktop.color-manager.modify-profile;org.debian.pcsc-lite.access_pcsc;org.freedesktop.packagekit.system-sources-refresh;org.freedesktop.packagekit.system-network-proxy-configure
 ResultAny=no
 EOF
+mkdir -p $TMPDIR/etc/polkit-1/rules.d
+cat > $TMPDIR/etc/polkit-1/rules.d/45-turbovnc-gnome3.rules << EOF
+// Eliminate GNOME 3+ dialogs in TurboVNC
+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" ||
+ action.id == "org.debian.pcsc-lite.access_pcsc" ||
+ action.id == "org.freedesktop.packagekit.system-sources-refresh" ||
+ action.id == "org.freedesktop.packagekit.system-network-proxy-configure") &&
+ !subject.local)
+ return polkit.Result.NO;
+});
+EOF
 fi
 
 if [ "$BUILDVIEWER" = "1" -a ! "$DATADIR" = "/usr/share" ]; then

release/rpm.spec.in

@@ -174,11 +174,28 @@ EOF
 %if "%{sysconfdir}" == "%{_sysconfdir}"
 mkdir -p %{buildroot}/%{sysconfdir}/polkit-1/localauthority/50-local.d
 cat > %{buildroot}/%{sysconfdir}/polkit-1/localauthority/50-local.d/45-turbovnc-gnome3.pkla << EOF
-[Eliminate GNOME 3 dialogs in TurboVNC]
+[Eliminate GNOME 3+ dialogs in TurboVNC]
 Identity=unix-user:*
 Action=org.freedesktop.color-manager.create-device;org.freedesktop.color-manager.create-profile;org.freedesktop.color-manager.delete-device;org.freedesktop.color-manager.delete-profile;org.freedesktop.color-manager.modify-device;org.freedesktop.color-manager.modify-profile;org.debian.pcsc-lite.access_pcsc;org.freedesktop.packagekit.system-sources-refresh;org.freedesktop.packagekit.system-network-proxy-configure
 ResultAny=no
 EOF
+mkdir -p %{buildroot}/%{sysconfdir}/polkit-1/rules.d
+cat > %{buildroot}/%{sysconfdir}/polkit-1/rules.d/45-turbovnc-gnome3.rules << EOF
+// Eliminate GNOME 3+ dialogs in TurboVNC
+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" ||
+ action.id == "org.debian.pcsc-lite.access_pcsc" ||
+ action.id == "org.freedesktop.packagekit.system-sources-refresh" ||
+ action.id == "org.freedesktop.packagekit.system-network-proxy-configure") &&
+ !subject.local)
+ return polkit.Result.NO;
+});
+EOF
 %endif
 %endif
 
@@ -259,6 +276,7 @@ fi
  %attr(0750,root,polkitd) %dir %{sysconfdir}/polkit-1/localauthority
  %dir %{sysconfdir}/polkit-1/localauthority/50-local.d
  %config %{sysconfdir}/polkit-1/localauthority/50-local.d/45-turbovnc-gnome3.pkla
+ %config %{sysconfdir}/polkit-1/rules.d/45-turbovnc-gnome3.rules
  %endif
 %endif