v6.1.0 release

mviereck · Jul 30, 2019 · 98d68ca · 98d68ca
1 parent 1d9977f
commit 98d68ca
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,17 +6,27 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Project website: https://github.com/mviereck/x11docker
 
-## [Unreleased]
+## [6.1.0](https://github.com/mviereck/x11docker/releases/tag/v6.1.0) - 2019-07-30
+### Added
+ - `--clean-xhost`: Disable xhost access policies on host display.
+ - `--no-xhost`: Reintroduced for backwards compatibility. Deprecated.
+   Use `--clean-xhost`instead.
+ - `--systemd`: Reintroduced for backwards compatibility. Deprecated.
+   Use `--init=systemd` instead.
 ### Changed
  - `--home`: Allow optional host folder DIR with `--home=DIR`.
  - `--printer`: Allow optional argument `tcp|socket`.
    Allows CUPS printing for `--runtime=kata-runtime`.
  - `--share`: Dont share `--volume` along with `--device`. 
-   (Workaround for old Docker bug setting wrong file ownerships.)
+   Has been a workaround for an old Docker bug setting wrong file ownerships.
+   [#24](https://github.com/mviereck/x11docker/pull/24)
 ### Deprecated
  - `--homedir=DIR`: Use `--home=DIR` instead.
+ - `--systemd`: Use `--init=systemd` instead.
+ - `--no-xhost`: Use `--clean-xhost` instead.
 ### Fixed
  - `--xpra --clipboard`: Fix not using xpra option `--xsettings=no`.
+   [xpra ticket #2342](https://xpra.org/trac/ticket/2342)
  - Copy `/etc/skel` into empty `HOME`.
 
 ## [6.0.0](https://github.com/mviereck/x11docker/releases/tag/v6.0.0) - 2019-07-08

diff --git a/x11docker b/x11docker
@@ -11,7 +11,7 @@
 # Type 'x11docker --help' or scroll down to read usage information.
 # More documentation at:  https://github.com/mviereck/x11docker
 
-Version="6.1.0-beta"
+Version="6.1.0"
 
 usage() {                       # --help: show usage information
   echo "
@@ -210,6 +210,7 @@ X and Wayland appearance options:
      --xfishtank       Show fish tank on new X server.
 
 X and Wayland special configuration:
+     --clean-xhost     Disable xhost access policies on host display.
      --display N       Use display number N for new X server.
      --keymap LAYOUT   Set keyboard layout for new X server, e.g. de, us, ru.
                        For possible LAYOUT look at /usr/share/X11/xkb/symbols.
@@ -1670,6 +1671,14 @@ s0_active_plugins = core;composite;opengl;decor;resize;move;
   esac
   verbose "Detected host window manager: ${Hostwindowmanager:-"(none)"}"
 }
+clean_xhost() {                 # option --clean-xhost: disable xhost policies on host X
+  [ -z "$Hostdisplay" ] && note "Option --clean-xhost: No host X display found." && return 1
+  [ -z "$Hostxauthority" ] && warning "Option --clean-xhost: You host X server does not provide
+  an authentication cookie in \$XAUTHORITY.
+  Host applications started after xhost cleanup might fail to start."
+  echo "Option --clean-xhost:" 2>&1 >> $Xinitlogfile
+  DISPLAY="$Hostdisplay" XAUTHORITY="$Hostxauthority" disable_xhost 2>&1 >> $Xinitlogfile
+}
 
 #### X server setup
 check_xserver() {               # check chosen X server, auto-choose X server
@@ -6915,6 +6924,7 @@ declare_variables() {           # declare global variables
   Xtest=""                                        # enable extension Xtest yes/no. If empty, yes for --xpra/--xdummy/--xvfb, otherwise no
   Xcomposite=""                                   # +extension COMPOSITE yes/no
   Xoverip="no"                                    # Connect to X over TCP yes/no
+  Cleanxhost="no"                                 # --clean-xhost: remove xhost access policies on host X
   Iglx=""                                         # --iglx: enable indirect rendering yes/no
   Lastcheckedxserver=""
   Lastcheckedxserverresult=""
@@ -7095,9 +7105,9 @@ parse_options() {               # parse cli options
   Longoptions="$Longoptions,weston,hostwayland,kwin,kwin-xwayland,xdummy,xvfb,no-x,vcxsrv,xwin,tty"                        # more X/Wayland servers
   Longoptions="$Longoptions,wm::,desktop,exe,xonly"
   Longoptions="$Longoptions,fullscreen,size:,scale:,rotate:,dpi:,output-count:,gpu,xfishtank,border::"                     # X appearance options
-  Longoptions="$Longoptions,xhost:,no-auth,vt:,display:,env:,showenv,showid,showpid1"                                      # X and environment options
+  Longoptions="$Longoptions,xhost:,clean-xhost,no-auth,vt:,display:,env:,showenv,showid,showpid1"                          # X and environment options
   Longoptions="$Longoptions,home::,clipboard,pulseaudio::,alsa::,lang::,printer::,webcam"                                  # comfort options
-  Longoptions="$Longoptions,no-xhost,pw:,no-internet,workdir:,sharessh,limit::,pull::,runtime:"                            # advanced options
+  Longoptions="$Longoptions,pw:,no-internet,workdir:,sharessh,limit::,pull::,runtime:"                                     # advanced options
   Longoptions="$Longoptions,init::,sys-admin,sharecgroup,dbus,dbus-system,hostdbus"                                        # advanced options
   Longoptions="$Longoptions,share:,cachebasedir:,homebasedir:"                                                    # host folders
   Longoptions="$Longoptions,launcher,cleanup,license,licence,help,version,install,update,update-master,remove,wmlist"      # special options without starting X or container
@@ -7106,10 +7116,10 @@ parse_options() {               # parse cli options
   Longoptions="$Longoptions,keymap:,name:,no-entrypoint,runfromhost:,runasroot:,westonini:,interactive"                    # developer options
 
   Longoptions="$Longoptions,cachedir:,starter,trusted,untrusted,no-xtest,stdout,stderr,silent,nothing,ps"                  # removed
-  Longoptions="$Longoptions,tini,no-init,systemd,runit,openrc,sysvinit"                                                    # removed
+  Longoptions="$Longoptions,tini,no-init,runit,openrc,sysvinit"                                                            # removed
 
   Longoptions="$Longoptions,xtest,xcomposite,xorgconf:,xoverip,iglx"                                                       # experimental
-  Longoptions="$Longoptions,homedir:,sharedir:,systemd"                                                                    # deprecated
+  Longoptions="$Longoptions,homedir:,sharedir:,systemd,no-xhost"                                                           # deprecated
 
   Parsedoptions="$(getopt --options $Shortoptions --longoptions $Longoptions --name "$0" -- "$@" 2>/tmp/x11docker_parsererror)"
   [ -e /tmp/x11docker_parsererror ] && Parsererror=$(cat /tmp/x11docker_parsererror) && rm /tmp/x11docker_parsererror
@@ -7154,7 +7164,7 @@ parse_options() {               # parse cli options
          --xwin)            Xserver="--xwin" ;            Autochooseserver="no"  ;;
       -t|--tty)             Xserver="--tty" ;             Autochooseserver="no"  ;; # Do not provide any X nor Wayland
 
-     #### Influencing X server
+     #### Influencing auto-choosing X server
       -d|--desktop)    Desktopmode="yes" ;;                # image contains a desktop environment.
       -g|--gpu)        Sharegpu="yes" ;;                   # share files in /dev/dri, allow GPU usage
       -w|--wm)         case "${2:-}" in                    # choose window manager
@@ -7249,6 +7259,9 @@ ${2:-}"                ; shift ;;        # add custom root command in container
          --keymap)     Xkblayout="${2:-}" ; shift ;;       # keymap layout for xkbcomp. Compare /usr/share/X11/xkb/symbols
 
        ## X Authentication
+         --clean-xhost|--no-xhost) Cleanxhost="yes"
+                       [ "${1:-}" = "--no-xhost" ] && note "Option --no-xhost is deprecated.
+  Please use --clean-xhost instead." ;;
          --xhost)      Xhost="$2" ; shift ;;               # custom xhost setting on new X server
          --no-auth)    Xauthentication="no" ;;             # disable cookie authentication
 
@@ -7289,7 +7302,7 @@ ${2:-}"                ; shift ;;        # add custom root command in container
   Please use either option --xwin in Cygwin/X
   or run x11docker with runx in WSL or MSYS2. 
   For 'runx' look at:  https://github.com/mviereck/runx" ;;
-         --no-init|--openrc|--runit|--systemd|--sysvinit|--tini)
+         --no-init|--openrc|--runit|--sysvinit|--tini)
                        error "Option ${1:-} has been removed.
   Please use option --init=INITSYSTEM instead." ;;
          --cachedir|--nothing|--no-xtest|--ps|--silent|--starter|--stderr|--stdout|--trusted|--untrusted)
@@ -7390,6 +7403,7 @@ Parsed options:    $Parsedoptions"
   [ "$Sharecups" ]              && setup_printer                                # --printer
   [ "$Pulseaudiomode" ]         && setup_sound_pulseaudio                       # --pulseaudio
   [ "$Sharealsa" = "yes" ]      && setup_sound_alsa                             # --alsa
+  [ "$Cleanxhost" = "yes" ]     && clean_xhost                                  # --clean-xhost
 
   #### Create command to run X server [and/or Wayland compositor]
   [ "$Xserver" != "--xorg" ]    && [ -n "$Newxvt" ]              && note "Option --vt only takes effect with option --xorg."
@@ -7501,7 +7515,6 @@ todo() {
   # x11docker/check: palinopsia: check video RAM size with glxinfo
 
   # BUG --runtime=kata-runtime --nxagent: ALT-GR works wrong.
-  #                            x11docker/lxde slow to start due to menu cache
   # FIXME: myrealpath(): If realpath is missing, the path argument is returned without resolving.
   # CHECK: Xwayland with X over IP
   # FIXME: --dbus-system: slow startup (90s timeout) in arch containers for unknown reasons.

diff --git a/x11docker-gui b/x11docker-gui
@@ -288,9 +288,10 @@ start "Run GUI applications in docker containers - x11docker '$Version'"    -> o
     devaddcommands "Additional commands"                            ->  runfromhost runasroot ;
       runfromhost         "--runfromhost: Run host command on new X server. Use sh syntax:"        -> "--runfromhost=\""    @string="/usr/bin/launchy &"              "\" " | ! "" ;
       runasroot           "--runasroot: Run command as root in container. Use sh syntax:"          -> "--runasroot=\""      @string=""       "\" " | ! "" ;
-    devauth "X authentication"                                      -> noauth xhost ; 
+    devauth "X authentication"                                      -> noauth xhost cleanxhost; 
       xhost               "--xhost: Custom xhost setting on new X server. See \"man xhost\":"      -> "--xhost=\""          @string="+SI:localuser:'$Containeruser'"  "\" " | ! "" ;
       noauth              "--no-auth: Disable access restrictions of new X server. Use with care." -> "--no-auth "          | ! "" ;
+      cleanxhost          "--clean-xhost: Disable xhost access policies on host X server."         -> "--clean-xhost "      | ! "" ;
     devxconfig "X and Wayland configuration"                        -> vt display westonini;
       vt :beside          "--vt: virtual terminal/tty to use: (--xorg only)"                       -> "--vt=\""             @string="8"      "\" " | ! "";
       display :beside     "--display: display number to use (X and Wayland): "                     -> "--display=\""        @string="1000"   "\" " | ! "";