From d93e5487bcbb412916a6942a06da06284dcd5d35 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Sun, 19 Apr 2020 10:13:13 +0200 Subject: [PATCH] committing changes in /etc after apt run Package changes: +realvnc-vnc-server 6.1.1.28093 +realvnc-vnc-viewer 6.1.1.28093 --- .etckeeper | 4 ++ gconf/gconf.xml.defaults/%gconf-tree.xml | 20 +++++++ mailcap | 2 + pam.d/vncserver | 13 +++++ vnc/config | 10 ++++ vnc/get_primary_ip4 | 1 + vnc/vncelevate | 1 + vnc/vncelevatecfg | 24 ++++++++ vnc/xstartup | 71 ++++++++++++++++++++++++ 9 files changed, 146 insertions(+) create mode 100644 pam.d/vncserver create mode 100644 vnc/config create mode 120000 vnc/get_primary_ip4 create mode 120000 vnc/vncelevate create mode 100644 vnc/vncelevatecfg create mode 100755 vnc/xstartup diff --git a/.etckeeper b/.etckeeper index a419828..f319d13 100755 --- a/.etckeeper +++ b/.etckeeper @@ -814,6 +814,7 @@ maybe chmod 0644 'pam.d/sshd' maybe chmod 0644 'pam.d/su' maybe chmod 0644 'pam.d/sudo' maybe chmod 0644 'pam.d/systemd-user' +maybe chmod 0644 'pam.d/vncserver' maybe chmod 0644 'papersize' maybe chmod 0644 'passwd' maybe chmod 0600 'passwd-' @@ -1098,11 +1099,14 @@ maybe chmod 0644 'vim/vimrc' maybe chmod 0644 'vim/vimrc.tiny' maybe chmod 0755 'vnc' maybe chmod 0644 'vnc/cacerts.pem' +maybe chmod 0644 'vnc/config' maybe chmod 0755 'vnc/config.d' maybe chmod 0644 'vnc/config.d/common' maybe chmod 0755 'vnc/licensekeys' maybe chmod 0755 'vnc/licensekeys/vncserver' maybe chmod 0644 'vnc/updateid' +maybe chmod 0644 'vnc/vncelevatecfg' +maybe chmod 0755 'vnc/xstartup' maybe chmod 0644 'wgetrc' maybe chmod 0755 'wildmidi' maybe chmod 0644 'wildmidi/wildmidi.cfg' diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 68fdaad..365cff9 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -5,6 +5,23 @@ + + + + + + + + + /usr/local/bin/vnclicensewiz %s + + + + + + + + @@ -14,6 +31,9 @@ + + + diff --git a/mailcap b/mailcap index aad3e0a..bc50fbf 100644 --- a/mailcap +++ b/mailcap @@ -153,6 +153,8 @@ application/x-rpm; pi-gpk-install-local-file %s; test=test -n "$DISPLAY" application/x-redhat-package-manager; pi-gpk-install-local-file %s; test=test -n "$DISPLAY" application/x-deb; pi-gpk-install-local-file %s; test=test -n "$DISPLAY" application/x-app-package; pi-gpk-install-local-file %s; test=test -n "$DISPLAY" +application/vnclicense-key; vnclicensehelper -key %s; test=test -n "$DISPLAY" +application/vnc-shortcut; vncviewer %s; test=test -n "$DISPLAY" application/x-image; squeak %s; test=test -n "$DISPLAY" application/squeak-image; squeak %s; test=test -n "$DISPLAY" application/squeak-project; squeak %s; test=test -n "$DISPLAY" diff --git a/pam.d/vncserver b/pam.d/vncserver new file mode 100644 index 0000000..b197735 --- /dev/null +++ b/pam.d/vncserver @@ -0,0 +1,13 @@ +# Default VNC Server PAM configuration. +# This file is automatically generated. DO NOT EDIT. +# To make changes, create a file named vncserver.custom in this +# directory and create or edit /etc/vnc/config.d/common.custom to +# add 'PamApplicationName=vncserver.custom' +auth required pam_unix.so +account required pam_unix.so +session required pam_selinux.so +session optional pam_umask.so +session optional pam_limits.so +session required pam_unix.so +session optional pam_systemd.so +session optional pam_env.so diff --git a/vnc/config b/vnc/config new file mode 100644 index 0000000..8670f82 --- /dev/null +++ b/vnc/config @@ -0,0 +1,10 @@ +# Default X Server command-line parameters for VNC Server. +# +# This file is automatically generated. DO NOT EDIT. +# To override settings in this file, create or edit /etc/vnc/config.custom. + +# Continue even if standard ports fail +-pn + +# Default font path (from xset) +-fp "/usr/share/fonts/X11/misc,/usr/share/fonts/X11/Type1,built-ins" diff --git a/vnc/get_primary_ip4 b/vnc/get_primary_ip4 new file mode 120000 index 0000000..5e8b317 --- /dev/null +++ b/vnc/get_primary_ip4 @@ -0,0 +1 @@ +/usr/lib/vnc/get_primary_ip4 \ No newline at end of file diff --git a/vnc/vncelevate b/vnc/vncelevate new file mode 120000 index 0000000..41b908c --- /dev/null +++ b/vnc/vncelevate @@ -0,0 +1 @@ +/usr/lib/vnc/vncelevate \ No newline at end of file diff --git a/vnc/vncelevatecfg b/vnc/vncelevatecfg new file mode 100644 index 0000000..dc94b1a --- /dev/null +++ b/vnc/vncelevatecfg @@ -0,0 +1,24 @@ +# Default elevation commands for VNC Server. +# +# This file is automatically generated. DO NOT EDIT. +# To override settings in this file, create or edit /etc/vnc/vncelevatecfg.custom. +# +# When the process launches we rely on the fact we don't return from elevation +# command until the authentication finishes + +# Uncomment the next line to add your custom command +#CUSTOM_COMMAND= + +SU_LAUNCHCMD=xterm -T DESCRIPTION -e su - root -c COMMAND_SINGLE_ARG +SU_LAUNCHCMD=gnome-terminal --title DESCRIPTION --disable-factory -x su - root -c COMMAND_SINGLE_ARG +SU_LAUNCHCMD=gksu -u root -t DESCRIPTION COMMAND_SINGLE_ARG +# The old konsole commands did not use --nofork option. Please remove it if needed. +SU_LAUNCHCMD=konsole --title DESCRIPTION --nofork -e su - root -c COMMAND_SINGLE_ARG +#SU_LAUNCHCMD=kdesu -u root -c COMMAND_SINGLE_ARG + +SUDO_LAUNCHCMD=gksudo -D DESCRIPTION -- COMMAND +SUDO_LAUNCHCMD=kdesudo --comment DESCRIPTION -- COMMAND +SUDO_LAUNCHCMD=xterm -T DESCRIPTION -e sudo COMMAND +SUDO_LAUNCHCMD=gnome-terminal --title DESCRIPTION --disable-factory -x sudo COMMAND +# The old konsole commands did not use --nofork option. Please remove it if needed. +SUDO_LAUNCHCMD=konsole --title DESCRIPTION --nofork -e sudo COMMAND diff --git a/vnc/xstartup b/vnc/xstartup new file mode 100755 index 0000000..65782b5 --- /dev/null +++ b/vnc/xstartup @@ -0,0 +1,71 @@ +#!/bin/sh + +# Default VNC Server (Virtual-Mode) start-up script. +# +# This file is automatically generated. DO NOT EDIT. +# To override settings in this file, create or edit /etc/vnc/xstartup.custom +# and make it executable. This will then be executed instead of this file. + +# The following keymap code is designed to support VNC Viewers with US and +# Western European keyboards. If you expect VNC Viewers to have different +# keyboards, override this file as described above, making sure to preserve all +# this code. You can then change the variable assignment appropriately. For +# example, setting: +# +# targetkbMap="pc+cz+ru:2+gr:3+fr:4" +# +# ...provides support for Czech, Russian, Greek and French keyboards. +targetkbMap="pc+us+us(intl):2" +if which setxkbmap > /dev/null 2>&1 && \ + which sed > /dev/null 2>&1 && \ + which xkbcomp > /dev/null 2>&1 ; then + setxkbmap -symbols "$targetkbMap" -print | sed -n '/xkb_keymap {/,$p' | xkbcomp - $DISPLAY +fi +# End of keymap code + +[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources +xsetroot -solid grey + +if [ -f /usr/bin/gnome-session ]; then + # Some gnome session types won't work with Xvnc, try to pick a sensible + # default. + for SESSION in "ubuntu-2d" "2d-gnome" "gnome-classic" "gnome-fallback"; do + if [ -f /usr/share/gnome-session/sessions/$SESSION.session ]; then + DESKTOP_SESSION=$SESSION; export DESKTOP_SESSION + GDMSESSION=$SESSION; export GDMSESSION + STARTUP="/usr/bin/gnome-session --session=$SESSION"; export STARTUP + fi + done +fi + +unset SESSIONBIN +XTERM_COMMAND="xterm -geometry 80x24+10+10 -ls" + +if [ -x /etc/X11/Xsession ]; then SESSIONBIN="/etc/X11/Xsession" +elif [ -x /etc/X11/xdm/Xsession ]; then SESSIONBIN="/etc/X11/xdm/Xsession" +elif [ -x /etc/X11/xinit/Xsession ]; then SESSIONBIN="/etc/X11/xinit/Xsession" +elif [ -x /etc/X11/gdm/Xsession ]; then SESSIONBIN="/etc/X11/gdm/Xsession gnome-session" +elif [ -x /etc/gdm/Xsession ]; then SESSIONBIN="/etc/gdm/Xsession gnome-session" +elif [ -x /etc/kde/kdm/Xsession ]; then SESSIONBIN="/etc/kde/kdm/Xsession" +elif [ -x /usr/dt/bin/Xsession ]; then + XSTATION=1 + DTXSERVERLOCATION=local + export XSTATION DTXSERVERLOCATION + SESSIONBIN="/usr/dt/bin/Xsession" +elif [ -x /usr/dt/bin/dtsession ]; then SESSIONBIN="/usr/dt/bin/dtsession" +elif which twm > /dev/null 2>&1; then + $XTERM_COMMAND & + SESSIONBIN="twm" +fi + +if [ "x${SESSIONBIN}" = "x" ]; then + echo "No session located; just starting a terminal" + $XTERM_COMMAND + echo "Terminal closed with return code $?" +else + echo "Starting session: $SESSIONBIN" + $SESSIONBIN + echo "Session terminated with return code $?" +fi + +vncserver-virtual -kill $DISPLAY -- 2.43.0