Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2018-12-31 09:44:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country" Mon Dec 31 09:44:33 2018 rev:198 rq:659341 version:4.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2018-11-22 13:24:20.342074196 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-country.new.28833/yast2-country.changes 2018-12-31 09:44:34.778305531 +0100 @@ -1,0 +2,15 @@ +Tue Dec 18 14:29:34 UTC 2018 - [email protected] + +- always use absolute path to binaries (bsc#1118291) +- properly escape shell arguments (bsc#1118291) +- drop policy kit definitions as yast2-dbus-server is already + dropped +- 4.1.7 + +------------------------------------------------------------------- +Sat Nov 24 16:24:01 UTC 2018 - Stasiek Michalski <[email protected]> + +- Provide icon with module (boo#1109310) +- 4.1.6 + +------------------------------------------------------------------- Old: ---- org.opensuse.yast.modules.yapi.language.policy org.opensuse.yast.modules.yapi.time.policy yast2-country-4.1.5.tar.bz2 New: ---- yast2-country-4.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.DPIiVo/_old 2018-12-31 09:44:35.158305220 +0100 +++ /var/tmp/diff_new_pack.DPIiVo/_new 2018-12-31 09:44:35.162305217 +0100 @@ -17,17 +17,13 @@ Name: yast2-country -Version: 4.1.5 +Version: 4.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -#policy files for YaPI dbus interface -Source1: org.opensuse.yast.modules.yapi.time.policy -Source2: org.opensuse.yast.modules.yapi.language.policy BuildRequires: perl-XML-Writer -BuildRequires: polkit-devel BuildRequires: update-desktop-files BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-perl-bindings @@ -85,8 +81,6 @@ # Policies mkdir -p $RPM_BUILD_ROOT/usr/share/polkit-1/actions -install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ -install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ # common %files @@ -110,12 +104,10 @@ %{yast_schemadir}/autoyast/rnc/*.rnc %{yast_desktopdir}/yast-language.desktop %{yast_desktopdir}/timezone.desktop +%{yast_icondir} %ifnarch s390 s390x %{yast_desktopdir}/keyboard.desktop %endif -%dir /usr/share/polkit-1 -%dir /usr/share/polkit-1/actions -%attr(644,root,root) %config /usr/share/polkit-1/actions/org.opensuse.yast.modules.yapi.*.policy %package data Requires: yast2-ruby-bindings >= 1.0.0 ++++++ yast2-country-4.1.5.tar.bz2 -> yast2-country-4.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/console/src/modules/Console.rb new/yast2-country-4.1.7/console/src/modules/Console.rb --- old/yast2-country-4.1.5/console/src/modules/Console.rb 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/console/src/modules/Console.rb 2018-12-18 16:27:38.000000000 +0100 @@ -157,7 +157,7 @@ # upgrade: disable old entries for serial console SCR.Execute( path(".target.bash"), - "sed -i '/^\\(hvc\\|hvsi\\|S[0-9]\\)/s@^.*@#&@' /etc/inittab" + "/usr/bin/sed -i '/^\\(hvc\\|hvsi\\|S[0-9]\\)/s@^.*@#&@' /etc/inittab" ) # find out if the baud rate is not present on command line (bnc#602743) @@ -173,13 +173,13 @@ SCR.Execute( path(".target.bash"), Builtins.sformat( - "grep -E '^cons:' /etc/inittab || /bin/echo 'cons:12345:respawn:/sbin/smart_agetty -L %1 console' >> /etc/inittab", + "/usr/bin/grep -E '^cons:' /etc/inittab || /usr/bin/echo 'cons:12345:respawn:/sbin/smart_agetty -L %1 console' >> /etc/inittab", rate ) ) SCR.Execute( path(".target.bash"), - "grep -Ew ^console /etc/securetty || /bin/echo console >> /etc/securetty" + "/usr/bin/grep -Ew ^console /etc/securetty || /usr/bin/echo console >> /etc/securetty" ) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/keyboard/src/Makefile.am new/yast2-country-4.1.7/keyboard/src/Makefile.am --- old/yast2-country-4.1.5/keyboard/src/Makefile.am 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/keyboard/src/Makefile.am 2018-12-18 16:27:38.000000000 +0100 @@ -34,7 +34,14 @@ ywidgets_DATA = \ lib/y2country/widgets/keyboard_selection.rb +symbolicdir = @icondir@/hicolor/symbolic/apps +symbolic_DATA = \ + icons/hicolor/symbolic/apps/yast-keyboard-symbolic.svg +scalabledir = @icondir@/hicolor/scalable/apps +scalable_DATA = \ + icons/hicolor/scalable/apps/yast-keyboard.svg + EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) \ - $(schemafiles_DATA) $(ydata_DATA) $(desktop_DATA) $(ywidgets_DATA) + $(schemafiles_DATA) $(ydata_DATA) $(desktop_DATA) $(ywidgets_DATA) $(symbolic_DATA) $(scalable_DATA) include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/keyboard/src/icons/hicolor/scalable/apps/yast-keyboard.svg new/yast2-country-4.1.7/keyboard/src/icons/hicolor/scalable/apps/yast-keyboard.svg --- old/yast2-country-4.1.5/keyboard/src/icons/hicolor/scalable/apps/yast-keyboard.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-4.1.7/keyboard/src/icons/hicolor/scalable/apps/yast-keyboard.svg 2018-12-18 16:27:38.000000000 +0100 @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> +<defs> +<linearGradient id="c" x1="2" x2="62" y1="17" y2="17" gradientTransform="translate(0,-2)" gradientUnits="userSpaceOnUse"> +<stop stop-color="#9a9996" offset="0"/> +<stop stop-color="#deddda" offset=".033333"/> +<stop stop-color="#9a9996" offset=".066667"/> +<stop stop-color="#9a9996" offset=".93333"/> +<stop stop-color="#deddda" offset=".96667"/> +<stop stop-color="#9a9996" offset="1"/> +</linearGradient> +<linearGradient id="b" x1="4" x2="60" y1="14" y2="14" gradientUnits="userSpaceOnUse"> +<stop stop-color="#deddda" offset="0"/> +<stop stop-color="#c0bfbc" offset="1"/> +</linearGradient> +</defs> +<g transform="matrix(2,0,0,2,0,34)"> +<rect x="2" y="-1" width="60" height="34" ry="4" fill="url(#c)"/> +<rect x="2" y="-3" width="60" height="34" ry="4" fill="url(#b)"/> +<rect x="6" y="-1" width="4" height="5" ry="1"/> +<rect x="6" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="6" y="8" width="6" height="4" ry="1"/> +<rect x="6" y="7" width="6" height="4" ry="1" fill="#241f31"/> +<rect x="6" y="16" width="8" height="4" ry="1"/> +<rect x="6" y="15" width="8" height="4" ry="1" fill="#241f31"/> +<rect x="6" y="24" width="4" height="4" ry="1"/> +<rect x="6" y="23" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="12" y="24" width="4" height="4" ry="1"/> +<rect x="12" y="23" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="18" y="24" width="28" height="4" ry="1"/> +<rect x="18" y="23" width="28" height="4" ry="1" fill="#241f31"/> +<rect x="48" y="24" width="4" height="4" ry="1"/> +<rect x="48" y="23" width="4" height="4" ry="1.0243" fill="#241f31"/> +<rect x="54" y="24" width="4" height="4" ry="1"/> +<rect x="54" y="23" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="14" y="8" width="4" height="4" ry="1"/> +<rect x="14" y="7" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="20" y="8" width="4" height="4" ry="1"/> +<rect x="20" y="7" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="26" y="8" width="4" height="4" ry="1"/> +<rect x="26" y="7" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="32" y="8" width="4" height="4" ry="1"/> +<rect x="32" y="7" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="38" y="8" width="4" height="4" ry="1"/> +<rect x="38" y="7" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="44" y="8" width="4" height="4" ry="1"/> +<rect x="44" y="7" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="16" y="16" width="4" height="4" ry="1"/> +<rect x="16" y="15" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="22" y="16" width="4" height="4" ry="1"/> +<rect x="22" y="15" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="28" y="16" width="4" height="4" ry="1"/> +<rect x="28" y="15" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="34" y="16" width="4" height="4" ry="1"/> +<rect x="34" y="15" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="40" y="16" width="4" height="4" ry="1"/> +<rect x="40" y="15" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="46" y="16" width="4" height="4" ry="1"/> +<rect x="46" y="15" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="50" y="8" width="8" height="4" ry="1"/> +<rect x="50" y="7" width="8" height="4" ry="1" fill="#241f31"/> +<rect x="52" y="16" width="6" height="4" ry="1"/> +<rect x="52" y="15" width="6" height="4" ry="1" fill="#241f31"/> +<rect x="12" y="-1" width="4" height="5" ry="1"/> +<rect x="12" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="18" y="-1" width="4" height="5" ry="1"/> +<rect x="18" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="24" y="-1" width="4" height="5" ry="1"/> +<rect x="24" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="30" y="-1" width="4" height="5" ry="1"/> +<rect x="30" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="36" y="-1" width="4" height="5" ry="1"/> +<rect x="36" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="42" y="-1" width="4" height="5" ry="1"/> +<rect x="42" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="48" y="-1" width="4" height="5" ry="1"/> +<rect x="48" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +<rect x="54" y="-1" width="4" height="5" ry="1"/> +<rect x="54" y="-1" width="4" height="4" ry="1" fill="#241f31"/> +</g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/keyboard/src/icons/hicolor/symbolic/apps/yast-keyboard-symbolic.svg new/yast2-country-4.1.7/keyboard/src/icons/hicolor/symbolic/apps/yast-keyboard-symbolic.svg --- old/yast2-country-4.1.5/keyboard/src/icons/hicolor/symbolic/apps/yast-keyboard-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-4.1.7/keyboard/src/icons/hicolor/symbolic/apps/yast-keyboard-symbolic.svg 2018-12-18 16:27:38.000000000 +0100 @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + id="svg4" + version="1.1" + height="16" + width="16"> + <metadata + id="metadata10"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs8" /> + <path + id="path2" + d="M 1 2 C 0.446 2 0 2.446 0 3 L 0 12 C 0 12.554 0.446 13 1 13 L 10 13 L 10 11 L 4 11 L 4 10 L 10 10 L 12 10 L 13 10 L 14 10 L 16 10 L 16 3 C 16 2.446 15.554 2 15 2 L 1 2 z M 2 4 L 4 4 L 4 5 L 2 5 L 2 4 z M 5 4 L 6 4 L 6 5 L 5 5 L 5 4 z M 7 4 L 8 4 L 8 5 L 7 5 L 7 4 z M 9 4 L 10 4 L 10 5 L 9 5 L 9 4 z M 11 4 L 12 4 L 12 5 L 11 5 L 11 4 z M 13 4 L 14 4 L 14 5 L 13 5 L 13 4 z M 2 6 L 3 6 L 3 7 L 2 7 L 2 6 z M 4 6 L 5 6 L 5 7 L 4 7 L 4 6 z M 6 6 L 7 6 L 7 7 L 6 7 L 6 6 z M 8 6 L 9 6 L 9 7 L 8 7 L 8 6 z M 10 6 L 11 6 L 11 7 L 10 7 L 10 6 z M 12 6 L 14 6 L 14 7 L 12 7 L 12 6 z M 2 8 L 4 8 L 4 9 L 2 9 L 2 8 z M 5 8 L 6 8 L 6 9 L 5 9 L 5 8 z M 7 8 L 8 8 L 8 9 L 7 9 L 7 8 z M 9 8 L 10 8 L 10 9 L 9 9 L 9 8 z M 11 8 L 14 8 L 14 9 L 11 9 L 11 8 z M 2 10 L 3 10 L 3 11 L 2 11 L 2 10 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 " + style="fill:#c0bfbc" /> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/keyboard/src/modules/Keyboard.rb new/yast2-country-4.1.7/keyboard/src/modules/Keyboard.rb --- old/yast2-country-4.1.5/keyboard/src/modules/Keyboard.rb 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/keyboard/src/modules/Keyboard.rb 2018-12-18 16:27:38.000000000 +0100 @@ -90,6 +90,8 @@ # require "yast" +require "shellwords" + module Yast class KeyboardClass < Module include Yast::Logger @@ -378,9 +380,8 @@ x11data = {} if Ops.greater_than(SCR.Read(path(".target.size"), cmd), 0) - file = Ops.add(Directory.tmpdir, "/xkbctrl.out") - cmd = Ops.add(Ops.add(cmd, " "), keymap) - SCR.Execute(path(".target.bash"), Ops.add(Ops.add(cmd, " > "), file)) + file = File.join(Directory.tmpdir, "xkbctrl.out") + SCR.Execute(path(".target.bash"), "#{cmd} #{keymap.shellescape} > #{file.shellescape}") x11data = Convert.to_map(SCR.Read(path(".target.ycp"), file)) else Builtins.y2warning("/usr/sbin/xkbctrl not found") @@ -551,12 +552,14 @@ return false # Error end - @ckb_cmd = "/bin/loadkeys #{loadkeys_devices} #{keymap}" + # loadkeys is already escaped and it is multiple params inside, so cannot be escaped here + @ckb_cmd = "/usr/bin/loadkeys #{loadkeys_devices} #{keymap.shellescape}" # X11 command... # do not try to run this with remote X display if Ops.greater_than(Builtins.size(@Apply), 0) && x11_setup_needed - @xkb_cmd = Ops.add(Ops.add(XVersion.binPath, "/setxkbmap "), @Apply) + # Apply cannot be escaped as it is already set of parameters. But it is at least our string and not user provided. + @xkb_cmd = "#{File.join(XVersion.binPath, "setxkbmap")} #{@Apply}" else @xkb_cmd = "" end @@ -865,11 +868,11 @@ if Stage.initial # do use --root option, running in chroot does not work (bsc#1074481) - cmd = "/usr/bin/systemd-firstboot --root '#{Installation.destdir}' --keymap '#{chomped_keymap}'" + cmd = "/usr/bin/systemd-firstboot --root #{Installation.destdir.shellescape} --keymap #{chomped_keymap.shellescape}" result = WFM.Execute(path(".local.bash_output"), cmd) else # this sets both the console and the X11 keyboard (see "man localectl") - cmd = "/usr/bin/localectl set-keymap #{chomped_keymap}" + cmd = "/usr/bin/localectl set-keymap #{chomped_keymap.shellescape}" result = SCR.Execute(path(".target.bash_output"), cmd) end @@ -1406,7 +1409,7 @@ # Enables autorepeat if needed def enable_autorepeat return nil unless Stage.initial && !Mode.live_installation && !xen_running - cmd = "xset r on" + cmd = "/usr/bin/xset r on" log.info "calling xset to fix autorepeat problem: #{cmd}" SCR.Execute(path(".target.bash"), cmd) end @@ -1454,7 +1457,7 @@ # @return [String] ready to be passed to the loadkeys command def loadkeys_devices tty_dev_names = Dir["/dev/tty*"].grep_v(/ttyAMA/) - tty_dev_names.map { |d| "-C #{d}" }.join(" ") + tty_dev_names.map { |d| "-C #{d.shellescape}" }.join(" ") end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/keyboard/test/keyboard_test.rb new/yast2-country-4.1.7/keyboard/test/keyboard_test.rb --- old/yast2-country-4.1.5/keyboard/test/keyboard_test.rb 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/keyboard/test/keyboard_test.rb 2018-12-18 16:27:38.000000000 +0100 @@ -77,7 +77,7 @@ it "writes the configuration" do expect(WFM).to receive(:Execute).with(path(".local.bash_output"), - "/usr/bin/systemd-firstboot --root '/mnt' --keymap 'es'").and_return("exit" => 0) + "/usr/bin/systemd-firstboot --root /mnt --keymap es").and_return("exit" => 0) expect(AsciiFile).to receive(:AppendLine).with(anything, ["Keytable:", "es.map.gz"]) Keyboard.Set("spanish") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/language/src/Makefile.am new/yast2-country-4.1.7/language/src/Makefile.am --- old/yast2-country-4.1.5/language/src/Makefile.am 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/language/src/Makefile.am 2018-12-18 16:27:38.000000000 +0100 @@ -96,6 +96,13 @@ desktop_DATA = \ desktop/yast-language.desktop -EXTRA_DIST = $(module_DATA) $(module1_DATA) $(client_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(ydata_DATA) $(desktop_DATA) $(ylib_DATA) $(ywidgets_DATA) +symbolicdir = @icondir@/hicolor/symbolic/apps +symbolic_DATA = \ + icons/hicolor/symbolic/apps/yast-language-symbolic.svg +scalabledir = @icondir@/hicolor/scalable/apps +scalable_DATA = \ + icons/hicolor/scalable/apps/yast-language.svg + +EXTRA_DIST = $(module_DATA) $(module1_DATA) $(client_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(ydata_DATA) $(desktop_DATA) $(ylib_DATA) $(ywidgets_DATA) $(symbolic_DATA) $(scalable_DATA) include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/language/src/icons/hicolor/scalable/apps/yast-language.svg new/yast2-country-4.1.7/language/src/icons/hicolor/scalable/apps/yast-language.svg --- old/yast2-country-4.1.5/language/src/icons/hicolor/scalable/apps/yast-language.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-4.1.7/language/src/icons/hicolor/scalable/apps/yast-language.svg 2018-12-18 16:27:38.000000000 +0100 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg";> +<g transform="matrix(2,0,0,2,-2,32)"> +<rect x="7" y="-9" width="34" height="49" ry="2" fill="#c0bfbc"/> +<rect x="7" y="-10" width="34" height="48" ry="2" fill="#f6f5f4"/> +<path d="m15 4h16v4l-6 8 8 4v4l-10-6-6 6h-2v-2l14-16h-8l-2 2-4-2z" fill="#c0bfbc"/> +<path d="m15 6h16v4l-6 8 8 4v4l-10-6-6 6-2-2 14-16h-8l-2 2z" fill="#333"/> +<path d="m27 0v2h-6l-2-2v-2z" fill="#c0bfbc"/> +<path d="m27 2v2h-6l-2-4z" fill="#333"/> +<rect x="25" y="-6" width="34" height="48" ry="2" fill="#1a5fb4"/> +<rect x="25" y="-8" width="34" height="48" ry="2" fill="#3584e4"/> +<path d="m39 4-8 24 5.1016-1 1.8984-5h8l1.8984 5 5.1016 1-8-24zm2 8h2l2 4h-6z" fill="#1a5fb4"/> +<path d="m39 6-8 22h6l2-6h6l2 6h6l-8-22zm2 6h2l2 6h-6z" fill="#fff"/> +</g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/language/src/icons/hicolor/symbolic/apps/yast-language-symbolic.svg new/yast2-country-4.1.7/language/src/icons/hicolor/symbolic/apps/yast-language-symbolic.svg --- old/yast2-country-4.1.5/language/src/icons/hicolor/symbolic/apps/yast-language-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-4.1.7/language/src/icons/hicolor/symbolic/apps/yast-language-symbolic.svg 2018-12-18 16:27:38.000000000 +0100 @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg"; width="16" height="16"> + <path d="M 5 0 C 4.446 0 4 0.446 4 1 L 4 12 C 4 12.554 4.446 13 5 13 L 10 13 L 10 10 L 12.457031 10 L 11.384766 7.5 L 8.6152344 7.5 L 7.4589844 10.197266 L 6.5410156 9.8027344 L 10 1.7304688 L 13.458984 9.8027344 L 13 10 L 16 10 L 16 1 C 16 0.446 15.554 0 15 0 L 5 0 z M 1 3 C 0.446 3 0 3.446 0 4 L 0 15 C 0 15.554 0.446 16 1 16 L 10 16 L 10 14 L 3 14 L 2 14 L 2 5 L 3 5 L 3 3 L 1 3 z M 10 4.2675781 L 9.0429688 6.5 L 10.957031 6.5 L 10 4.2675781 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" /> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/language/src/modules/Language.rb new/yast2-country-4.1.7/language/src/modules/Language.rb --- old/yast2-country-4.1.5/language/src/modules/Language.rb 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/language/src/modules/Language.rb 2018-12-18 16:27:38.000000000 +0100 @@ -29,6 +29,8 @@ # $Id$ require "yast" +require "shellwords" + module Yast class LanguageClass < Module DEFAULT_FALLBACK_LANGUAGE = "en_US".freeze @@ -293,9 +295,7 @@ # return the map of all supported countries and language codes def GetLocales if @locales == nil || @locales == {} - out = Convert.to_map( - SCR.Execute(path(".target.bash_output"), "/usr/bin/locale -a") - ) + out = SCR.Execute(path(".target.bash_output"), "/usr/bin/locale -a") Builtins.foreach( Builtins.splitstring(Ops.get_string(out, "stdout", ""), "\n") ) do |l| @@ -941,10 +941,10 @@ cmd = if Stage.initial # do use --root option, running in chroot does not work - "/usr/bin/systemd-firstboot --root '#{Installation.destdir}' --locale '#{loc}'" + "/usr/bin/systemd-firstboot --root #{Installation.destdir.shellescape} --locale #{loc.shellescape}" else # this sets both the locale (see "man localectl") - "/usr/bin/localectl set-locale #{locale_out}" + "/usr/bin/localectl set-locale #{locale_out.shellescape}" end log.info "Making language setting persistent: #{cmd}" result = if Stage.initial diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/language/testsuite/tests/Save.out new/yast2-country-4.1.7/language/testsuite/tests/Save.out --- old/yast2-country-4.1.5/language/testsuite/tests/Save.out 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/language/testsuite/tests/Save.out 2018-12-18 16:27:38.000000000 +0100 @@ -2,5 +2,5 @@ Read .target.dir "/usr/share/YaST2/data/languages" [] Write .sysconfig.language.INSTALLED_LANGUAGES "en_US" true Write .sysconfig.language nil true -Execute .target.bash_output "/usr/bin/localectl set-locale LANG=en_US.UTF-8" $["exit":0] +Execute .target.bash_output "/usr/bin/localectl set-locale LANG\\=en_US.UTF-8" $["exit":0] Return nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/package/org.opensuse.yast.modules.yapi.language.policy new/yast2-country-4.1.7/package/org.opensuse.yast.modules.yapi.language.policy --- old/yast2-country-4.1.5/package/org.opensuse.yast.modules.yapi.language.policy 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/package/org.opensuse.yast.modules.yapi.language.policy 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE policyconfig PUBLIC - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" - "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd";> -<policyconfig> - - <vendor>YaST Webservice Project</vendor> - <vendor_url>http://en.opensuse.org/Portal:YaST</vendor_url> - -<!-- -Rights for languages ---> - - <action id="org.opensuse.yast.modules.yapi.language.read"> - <description>Reading languages settings</description> - <message>Authentication is required to read languages settings</message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>no</allow_active> - </defaults> - </action> - <action id="org.opensuse.yast.modules.yapi.language.write"> - <description>Writing new language settings</description> - <message>Authentication is required to edit language settings</message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>no</allow_active> - </defaults> - </action> - -</policyconfig> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/package/org.opensuse.yast.modules.yapi.time.policy new/yast2-country-4.1.7/package/org.opensuse.yast.modules.yapi.time.policy --- old/yast2-country-4.1.5/package/org.opensuse.yast.modules.yapi.time.policy 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/package/org.opensuse.yast.modules.yapi.time.policy 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE policyconfig PUBLIC - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" - "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd";> -<policyconfig> - - <vendor>YaST Webservice Project</vendor> - <vendor_url>http://en.opensuse.org/Portal:YaST</vendor_url> - -<!-- -Rights for system.time ---> - - <action id="org.opensuse.yast.modules.yapi.time.read"> - <description>Reading system time settings</description> - <message>Authentication is required to read system time settings</message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>no</allow_active> - </defaults> - </action> - <action id="org.opensuse.yast.modules.yapi.time.write"> - <description>Writing system time settings</description> - <message>Authentication is required to read system time settings</message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>no</allow_active> - </defaults> - </action> - -</policyconfig> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/package/yast2-country.changes new/yast2-country-4.1.7/package/yast2-country.changes --- old/yast2-country-4.1.5/package/yast2-country.changes 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/package/yast2-country.changes 2018-12-18 16:27:38.000000000 +0100 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Tue Dec 18 14:29:34 UTC 2018 - [email protected] + +- always use absolute path to binaries (bsc#1118291) +- properly escape shell arguments (bsc#1118291) +- drop policy kit definitions as yast2-dbus-server is already + dropped +- 4.1.7 + +------------------------------------------------------------------- +Sat Nov 24 16:24:01 UTC 2018 - Stasiek Michalski <[email protected]> + +- Provide icon with module (boo#1109310) +- 4.1.6 + +------------------------------------------------------------------- Tue Nov 20 09:25:14 UTC 2018 - [email protected] - Aligned "Synchronize Now" button and "NTP Server Address" box not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/package/yast2-country.spec new/yast2-country-4.1.7/package/yast2-country.spec --- old/yast2-country-4.1.5/package/yast2-country.spec 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/package/yast2-country.spec 2018-12-18 16:27:38.000000000 +0100 @@ -17,17 +17,13 @@ Name: yast2-country -Version: 4.1.5 +Version: 4.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -#policy files for YaPI dbus interface -Source1: org.opensuse.yast.modules.yapi.time.policy -Source2: org.opensuse.yast.modules.yapi.language.policy BuildRequires: perl-XML-Writer -BuildRequires: polkit-devel BuildRequires: update-desktop-files BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-perl-bindings @@ -85,8 +81,6 @@ # Policies mkdir -p $RPM_BUILD_ROOT/usr/share/polkit-1/actions -install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ -install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ # common %files @@ -110,12 +104,10 @@ %{yast_schemadir}/autoyast/rnc/*.rnc %{yast_desktopdir}/yast-language.desktop %{yast_desktopdir}/timezone.desktop +%{yast_icondir} %ifnarch s390 s390x %{yast_desktopdir}/keyboard.desktop %endif -%dir /usr/share/polkit-1 -%dir /usr/share/polkit-1/actions -%attr(644,root,root) %config /usr/share/polkit-1/actions/org.opensuse.yast.modules.yapi.*.policy %package data Requires: yast2-ruby-bindings >= 1.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/timezone/src/Makefile.am new/yast2-country-4.1.7/timezone/src/Makefile.am --- old/yast2-country-4.1.5/timezone/src/Makefile.am 2018-11-20 12:41:40.000000000 +0100 +++ new/yast2-country-4.1.7/timezone/src/Makefile.am 2018-12-18 16:27:38.000000000 +0100 @@ -32,6 +32,13 @@ desktop_DATA = \ desktop/timezone.desktop -EXTRA_DIST = $(module_DATA) $(module1_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(ydata_DATA) $(desktop_DATA) +symbolicdir = @icondir@/hicolor/symbolic/apps +symbolic_DATA = \ + icons/hicolor/symbolic/apps/yast-timezone-symbolic.svg +scalabledir = @icondir@/hicolor/scalable/apps +scalable_DATA = \ + icons/hicolor/scalable/apps/yast-timezone.svg -include $(top_srcdir)/Makefile.am.common \ No newline at end of file +EXTRA_DIST = $(module_DATA) $(module1_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(ydata_DATA) $(desktop_DATA) $(symbolic_DATA) $(scalable_DATA) + +include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/timezone/src/icons/hicolor/scalable/apps/yast-timezone.svg new/yast2-country-4.1.7/timezone/src/icons/hicolor/scalable/apps/yast-timezone.svg --- old/yast2-country-4.1.5/timezone/src/icons/hicolor/scalable/apps/yast-timezone.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-4.1.7/timezone/src/icons/hicolor/scalable/apps/yast-timezone.svg 2018-12-18 16:27:38.000000000 +0100 @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg version="1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg";> +<defs> +<linearGradient id="a" x1="2" x2="30" y1="16" y2="16" gradientTransform="scale(4)" gradientUnits="userSpaceOnUse"> +<stop stop-color="#9a9996" offset="0"/> +<stop stop-color="#9a9996" offset=".14286"/> +<stop stop-color="#deddda" offset=".25"/> +<stop stop-color="#9a9996" offset=".39286"/> +<stop stop-color="#9a9996" offset="1"/> +</linearGradient> +</defs> +<path d="m64 8c-31.024 0-56 24.976-56 56s24.976 56 56 56 56-24.976 56-56-24.976-56-56-56z" fill="url(#a)" /> +<rect transform="matrix(0,-1,-1,0,0,0)" x="-116" y="-120" width="112" height="112" rx="56" ry="56" fill="#deddda" /> +<path d="m64 8a52 52 0 0 0 -52 52 52 52 0 0 0 52 52 52 52 0 0 0 52 -52 52 52 0 0 0 -52 -52z" fill="#241f31" /> +<path d="m64 56.268 24-24.267 4 4-24 24z" fill="#77767b" /> +<path d="m64 52a8 8 0 0 0 -8 8 8 8 0 0 0 8 8 8 8 0 0 0 8 -8 8 8 0 0 0 -8 -8z" fill="#c0bfbc" /> +<rect x="60" y="60" width="8" height="48" ry="0" fill="#f6f5f4" /> +<rect x="16" y="56" width="42" height="4" fill="#e01b24" /> +<path d="m64 48a8 8 0 0 0 -8 8 8 8 0 0 0 8 8 8 8 0 0 0 8 -8 8 8 0 0 0 -8 -8z" fill="#deddda" /> +<circle cx="64" cy="56" r="4" fill="#333" /> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.5/timezone/src/icons/hicolor/symbolic/apps/yast-timezone-symbolic.svg new/yast2-country-4.1.7/timezone/src/icons/hicolor/symbolic/apps/yast-timezone-symbolic.svg --- old/yast2-country-4.1.5/timezone/src/icons/hicolor/symbolic/apps/yast-timezone-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-4.1.7/timezone/src/icons/hicolor/symbolic/apps/yast-timezone-symbolic.svg 2018-12-18 16:27:38.000000000 +0100 @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg"; width="16" height="16"> + <path d="M 8 0 C 3.581722 0 0 3.581722 0 8 C 0 12.418278 3.581722 16 8 16 C 8.6752049 15.9962 9.3472143 15.90696 10 15.734375 L 10 13.650391 C 9.3580344 13.879696 8.6816864 13.997925 8 14 C 4.6862915 14 2 11.313708 2 8 C 2 4.6862915 4.6862915 2 8 2 C 11.313708 2 14 4.6862915 14 8 C 13.9973 8.6817991 13.878408 9.3581503 13.648438 10 L 15.740234 10 C 15.910846 9.3469609 15.998128 8.6749555 16 8 C 16 3.581722 12.418278 0 8 0 z M 7.5 3 L 7.5 7.1347656 A 1 1 0 0 0 7 8 A 1 1 0 0 0 7.0351562 8.2578125 L 3.6464844 11.646484 L 4.3535156 12.353516 L 7.7421875 8.9648438 A 1 1 0 0 0 8 9 A 1 1 0 0 0 8.8632812 8.5 L 11 8.5 L 11 7.5 L 8.8652344 7.5 A 1 1 0 0 0 8.5 7.1367188 L 8.5 3 L 7.5 3 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" /> +</svg>
