Hello community, here is the log from the commit of package yast2-docker for openSUSE:Factory checked in at 2019-01-03 18:06:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-docker (Old) and /work/SRC/openSUSE:Factory/.yast2-docker.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-docker" Thu Jan 3 18:06:26 2019 rev:10 rq:657953 version:4.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-docker/yast2-docker.changes 2018-01-17 21:42:51.414606011 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-docker.new.28833/yast2-docker.changes 2019-01-03 18:06:29.556147583 +0100 @@ -1,0 +2,13 @@ +Wed Dec 12 12:09:46 UTC 2018 - [email protected] + +- Hardening commands execution (part of bsc#1118291). +- Replace backticks by Yast::Execute. +- 4.1.1 + +------------------------------------------------------------------- +Sun Nov 25 12:47:41 UTC 2018 - Stasiek Michalski <[email protected]> + +- Provide icon with module (boo#1109310) +- 4.1.0 + +------------------------------------------------------------------- Old: ---- yast2-docker-4.0.0.tar.bz2 New: ---- yast2-docker-4.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-docker.spec ++++++ --- /var/tmp/diff_new_pack.5Ek3n3/_old 2019-01-03 18:06:30.196147014 +0100 +++ /var/tmp/diff_new_pack.5Ek3n3/_new 2019-01-03 18:06:30.200147010 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-docker # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,12 @@ ###################################################################### # # IMPORTANT: Please do not change spec file in build service directly -# Use https://github.com/yast/yast-cio repo +# Use https://github.com/yast/yast-docker repo # ###################################################################### Name: yast2-docker -Version: 4.0.0 +Version: 4.1.1 Release: 0 BuildArch: noarch # ExcludeArch in sync with docker.spec @@ -51,7 +51,7 @@ BuildRequires: rubygem(docker-api) Summary: YaST2 - GUI for docker management -License: GPL-2.0 or GPL-3.0 +License: GPL-2.0-only OR GPL-3.0-only Group: System/YaST Url: https://github.com/yast/yast-docker @@ -72,6 +72,7 @@ %{yast_dir}/clients/*.rb %{yast_dir}/lib/ydocker %{yast_desktopdir}/docker-config.desktop +%{yast_icondir} %doc COPYING %doc README.md ++++++ yast2-docker-4.0.0.tar.bz2 -> yast2-docker-4.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-4.0.0/Rakefile new/yast2-docker-4.1.1/Rakefile --- old/yast2-docker-4.0.0/Rakefile 2017-12-20 12:26:19.000000000 +0100 +++ new/yast2-docker-4.1.1/Rakefile 2018-12-13 17:18:45.000000000 +0100 @@ -21,4 +21,5 @@ Yast::Tasks.configuration do |conf| # lets ignore license check for now conf.skip_license_check << /\.desktop$/ + conf.skip_license_check << /\.svg$/ end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-4.0.0/package/yast2-docker.changes new/yast2-docker-4.1.1/package/yast2-docker.changes --- old/yast2-docker-4.0.0/package/yast2-docker.changes 2017-12-20 12:26:19.000000000 +0100 +++ new/yast2-docker-4.1.1/package/yast2-docker.changes 2018-12-13 17:18:45.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed Dec 12 12:09:46 UTC 2018 - [email protected] + +- Hardening commands execution (part of bsc#1118291). +- Replace backticks by Yast::Execute. +- 4.1.1 + +------------------------------------------------------------------- +Sun Nov 25 12:47:41 UTC 2018 - Stasiek Michalski <[email protected]> + +- Provide icon with module (boo#1109310) +- 4.1.0 + +------------------------------------------------------------------- Wed Dec 20 10:29:04 UTC 2017 - [email protected] - Add ExcludeArch: %ix86 s390 ppc: do not build yast2-docker on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-4.0.0/package/yast2-docker.spec new/yast2-docker-4.1.1/package/yast2-docker.spec --- old/yast2-docker-4.0.0/package/yast2-docker.spec 2017-12-20 12:26:19.000000000 +0100 +++ new/yast2-docker-4.1.1/package/yast2-docker.spec 2018-12-13 17:18:45.000000000 +0100 @@ -19,12 +19,12 @@ ###################################################################### # # IMPORTANT: Please do not change spec file in build service directly -# Use https://github.com/yast/yast-cio repo +# Use https://github.com/yast/yast-docker repo # ###################################################################### Name: yast2-docker -Version: 4.0.0 +Version: 4.1.1 Release: 0 BuildArch: noarch # ExcludeArch in sync with docker.spec @@ -72,6 +72,7 @@ %{yast_dir}/clients/*.rb %{yast_dir}/lib/ydocker %{yast_desktopdir}/docker-config.desktop +%{yast_icondir} %doc COPYING %doc README.md diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-4.0.0/src/desktop/docker-config.desktop new/yast2-docker-4.1.1/src/desktop/docker-config.desktop --- old/yast2-docker-4.0.0/src/desktop/docker-config.desktop 2017-12-20 12:26:19.000000000 +0100 +++ new/yast2-docker-4.1.1/src/desktop/docker-config.desktop 2018-12-13 17:18:45.000000000 +0100 @@ -13,7 +13,7 @@ X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoinstResource= -Icon=yast-vm-install +Icon=yast-docker Exec=/sbin/yast2 docker Name=Docker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-4.0.0/src/icons/hicolor/scalable/apps/yast-docker.svg new/yast2-docker-4.1.1/src/icons/hicolor/scalable/apps/yast-docker.svg --- old/yast2-docker-4.0.0/src/icons/hicolor/scalable/apps/yast-docker.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-docker-4.1.1/src/icons/hicolor/scalable/apps/yast-docker.svg 2018-12-13 17:18:45.000000000 +0100 @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg";> +<path d="m32 96c-2.216 0-4 1.9822-4 4.4444v11.111c0 2.4622 1.784 4.4444 4 4.4444h64c2.216 0 4-1.9822 4-4.4444v-11.111c0-2.4622-1.784-4.4444-4-4.4444z" fill="#5e5c64"/> +<path d="m32 92c-2.216 0-4 1.9822-4 4.4444v11.111c0 2.4622 1.784 4.4444 4 4.4444h64c2.216 0 4-1.9822 4-4.4444v-11.111c0-2.4622-1.784-4.4444-4-4.4444z" fill="#9a9996"/> +<path d="m12 20c-2.216 0-4 1.8297-4 4.1026v71.794c0 2.2728 1.784 4.1026 4 4.1026h104c2.216 0 4-1.8297 4-4.1026v-71.794c0-2.2728-1.784-4.1026-4-4.1026z" fill="#5e5c64"/> +<path d="m12 16c-2.216 0-4 1.784-4 4v72c0 2.216 1.784 4 4 4h104c2.216 0 4-1.784 4-4v-72c0-2.216-1.784-4-4-4z" fill="#9a9996"/> +<rect x="12" y="20" width="104" height="72" ry="0" fill="#3d3846"/> +<rect x="16" y="24" width="96" height="64" ry="0" fill="#f6f5f4"/> +<rect x="24" y="44" width="64" height="32" ry="14" fill="#3584e4"/> +<rect x="24" y="60" width="64" height="24" ry="0" fill="#3584e4"/> +<rect x="96" y="64" width="8" height="12" fill="#3584e4"/> +<rect x="92" y="56" width="8" height="8" ry="4" fill="#3584e4"/> +<rect x="92" y="56" width="4" height="8" ry="0" fill="#3584e4"/> +<rect x="92" y="60" width="8" height="4" fill="#3584e4"/> +<rect transform="scale(-1,1)" x="-108" y="56" width="8" height="8" ry="4" fill="#3584e4"/> +<rect transform="scale(-1,1)" x="-108" y="56" width="4" height="8" ry="0" fill="#3584e4"/> +<rect transform="scale(-1,1)" x="-108" y="60" width="8" height="4" fill="#3584e4"/> +<circle cx="36" cy="64" r="4" fill="#fff"/> +<rect transform="scale(1,-1)" x="96" y="-84" width="8" height="8" ry="4" fill="#3584e4"/> +<rect transform="scale(1,-1)" x="96" y="-84" width="4" height="8" ry="0" fill="#3584e4"/> +<rect transform="scale(1,-1)" x="96" y="-80" width="8" height="4" fill="#3584e4"/> +<rect x="88" y="76" width="8" height="8" fill="#3584e4"/> +<rect x="24" y="72" width="44" height="12" fill="#98c1f1"/> +<rect x="40" y="32" width="12" height="12" ry="0" fill="#f6d32d"/> +<rect x="60" y="32" width="12" height="12" fill="#f6d32d"/> +<path d="m16 24h72l-16 64h-56z" fill="#fff" opacity=".2"/> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-4.0.0/src/icons/hicolor/symbolic/apps/yast-docker-symbolic.svg new/yast2-docker-4.1.1/src/icons/hicolor/symbolic/apps/yast-docker-symbolic.svg --- old/yast2-docker-4.0.0/src/icons/hicolor/symbolic/apps/yast-docker-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-docker-4.1.1/src/icons/hicolor/symbolic/apps/yast-docker-symbolic.svg 2018-12-13 17:18:45.000000000 +0100 @@ -0,0 +1,4 @@ +<svg xmlns="http://www.w3.org/2000/svg"; width="16" height="16"> + <path d="M 3 2 L 3 4 L 5 4 L 5 2 L 3 2 z M 7 2 L 7 4 L 9 4 L 9 2 L 7 2 z M 3 5 C 1.338 5 0 6.338 0 8 L 0 11 L 5 11 L 5 13 L 10 13 L 10 10 L 12 10 L 12 8 C 12 6.338 10.662 5 9 5 L 3 5 z M 13 7 L 13 8 L 13.5 8 L 14 8 L 14 10 L 15 10 L 15 8 L 15.5 8 L 16 8 L 16 7 L 15.5 7 L 15 7 C 14.723 7 14.5 7.223 14.5 7.5 C 14.5 7.223 14.275606 7.0277594 14 7 L 13.5 7 L 13 7 z M 1.5 9 C 1.777 9 2 9.223 2 9.5 C 2 9.777 1.777 10 1.5 10 C 1.223 10 1 9.777 1 9.5 C 1 9.223 1.223 9 1.5 9 z M 11 11 L 11 16 L 16 16 L 16 11 L 11 11 z M 12 12 L 13 12 L 13 13 L 14 13 L 14 12 L 15 12 L 15 14 L 14 14 L 14 15 L 13 15 L 13 14 L 12 14 L 12 12 z " fill="#c0bfbc" /> + <rect style="opacity:0.7" fill="#c0bfbc" width="5" height="2" x="0" y="11" /> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-4.0.0/src/lib/ydocker/inject_shell_dialog.rb new/yast2-docker-4.1.1/src/lib/ydocker/inject_shell_dialog.rb --- old/yast2-docker-4.0.0/src/lib/ydocker/inject_shell_dialog.rb 2017-12-20 12:26:19.000000000 +0100 +++ new/yast2-docker-4.1.1/src/lib/ydocker/inject_shell_dialog.rb 2018-12-13 17:18:45.000000000 +0100 @@ -17,6 +17,7 @@ # you may find current contact information at www.suse.com require "yast" +require "yast2/execute" require "shellwords" module YDocker @@ -101,16 +102,24 @@ def attach selected_shell = Yast::UI.QueryWidget(:shell, :Value) + docker_command = "docker exec -ti #{@container.id} %{shell}" + if Yast::UI.TextMode - Yast::UI.RunInTerminal( - "docker exec -ti #{@container.id} #{Shellwords.escape selected_shell} 2>&1" - ) + command = format(docker_command, shell: Shellwords.escape(selected_shell)) + + Yast::UI.RunInTerminal(command + " 2>&1") else - res = `xterm -e 'docker exec -ti #{@container.id} #{Shellwords.escape selected_shell} \ - || (echo "Failed to attach. Will close window in 5 seconds";sleep 5)' 2>&1` - if $CHILD_STATUS.exitstatus != 0 - Yast::Popup.Error(_("Failed to run terminal. Error: %{error}") % { error: res }) - return + begin + # Note that the selected shell is not escaped here. The whole command will + # be escaped by Yast::Execute + command = format(docker_command, shell: selected_shell) + + " || (echo \"Failed to attach. Will close window in 5 seconds\";sleep 5)" + + Yast::Execute.locally!("xterm", "-e", command) + rescue Cheetah::ExecutionFailed => error + Yast::Popup.Error( + format(_("Failed to run terminal. Error: %{error}"), error: error.message) + ) end end end
