Hello community,
here is the log from the commit of package yast2-journal for openSUSE:Factory
checked in at 2018-12-31 09:42:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-journal (Old)
and /work/SRC/openSUSE:Factory/.yast2-journal.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-journal"
Mon Dec 31 09:42:52 2018 rev:12 rq:656080 version:4.1.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-journal/yast2-journal.changes
2018-11-22 13:24:32.014062035 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-journal.new.28833/yast2-journal.changes
2018-12-31 09:42:53.794388225 +0100
@@ -1,0 +2,13 @@
+Fri Dec 7 08:57:35 UTC 2018 - jreidin...@suse.com
+
+- always use absolute path to binaries (bsc#1118291)
+- properly escape shell arguments (bsc#1118291)
+- 4.1.5
+
+-------------------------------------------------------------------
+Sun Nov 25 16:06:43 UTC 2018 - Stasiek Michalski <hel...@mailbox.org>
+
+- Provide icon with module (boo#1109310)
+- 4.1.4
+
+-------------------------------------------------------------------
Old:
----
yast2-journal-4.1.3.tar.bz2
New:
----
yast2-journal-4.1.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-journal.spec ++++++
--- /var/tmp/diff_new_pack.luXBav/_old 2018-12-31 09:42:54.170387918 +0100
+++ /var/tmp/diff_new_pack.luXBav/_new 2018-12-31 09:42:54.170387918 +0100
@@ -17,7 +17,7 @@
Name: yast2-journal
-Version: 4.1.3
+Version: 4.1.5
Release: 0
BuildArch: noarch
@@ -67,6 +67,7 @@
%{yast_dir}/clients/*.rb
%{yast_dir}/lib
%{yast_desktopdir}/journal.desktop
+%{yast_icondir}
%doc COPYING
%doc README.md
++++++ yast2-journal-4.1.3.tar.bz2 -> yast2-journal-4.1.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-journal-4.1.3/Rakefile
new/yast2-journal-4.1.5/Rakefile
--- old/yast2-journal-4.1.3/Rakefile 2018-11-20 16:30:30.000000000 +0100
+++ new/yast2-journal-4.1.5/Rakefile 2018-12-07 15:55:54.000000000 +0100
@@ -22,4 +22,5 @@
conf.skip_license_check << /test\/data\/*/
# Desktop files are just metadata
conf.skip_license_check << /.*desktop$/
+ conf.skip_license_check << /.*svg$/
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-journal-4.1.3/package/yast2-journal.changes
new/yast2-journal-4.1.5/package/yast2-journal.changes
--- old/yast2-journal-4.1.3/package/yast2-journal.changes 2018-11-20
16:30:30.000000000 +0100
+++ new/yast2-journal-4.1.5/package/yast2-journal.changes 2018-12-07
15:55:54.000000000 +0100
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Fri Dec 7 08:57:35 UTC 2018 - jreidin...@suse.com
+
+- always use absolute path to binaries (bsc#1118291)
+- properly escape shell arguments (bsc#1118291)
+- 4.1.5
+
+-------------------------------------------------------------------
+Sun Nov 25 16:06:43 UTC 2018 - Stasiek Michalski <hel...@mailbox.org>
+
+- Provide icon with module (boo#1109310)
+- 4.1.4
+
+-------------------------------------------------------------------
Thu Oct 25 13:30:09 UTC 2018 - mvid...@suse.com
- Adjust for libyui-ncurses-tools split (bsc#1113291)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-journal-4.1.3/package/yast2-journal.spec
new/yast2-journal-4.1.5/package/yast2-journal.spec
--- old/yast2-journal-4.1.3/package/yast2-journal.spec 2018-11-20
16:30:30.000000000 +0100
+++ new/yast2-journal-4.1.5/package/yast2-journal.spec 2018-12-07
15:55:54.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-journal
-Version: 4.1.3
+Version: 4.1.5
Release: 0
BuildArch: noarch
@@ -67,6 +67,7 @@
%{yast_dir}/clients/*.rb
%{yast_dir}/lib
%{yast_desktopdir}/journal.desktop
+%{yast_icondir}
%doc COPYING
%doc README.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-journal-4.1.3/src/desktop/journal.desktop
new/yast2-journal-4.1.5/src/desktop/journal.desktop
--- old/yast2-journal-4.1.3/src/desktop/journal.desktop 2018-11-20
16:30:30.000000000 +0100
+++ new/yast2-journal-4.1.5/src/desktop/journal.desktop 2018-12-07
15:55:54.000000000 +0100
@@ -14,7 +14,7 @@
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstResource=
-Icon=yast-messages
+Icon=yast-journal
Exec=/sbin/yast2 journal
Name=Systemd Journal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-journal-4.1.3/src/icons/hicolor/scalable/apps/yast-journal.svg
new/yast2-journal-4.1.5/src/icons/hicolor/scalable/apps/yast-journal.svg
--- old/yast2-journal-4.1.3/src/icons/hicolor/scalable/apps/yast-journal.svg
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-journal-4.1.5/src/icons/hicolor/scalable/apps/yast-journal.svg
2018-12-07 15:55:54.000000000 +0100
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 128 128.00001"
xmlns="http://www.w3.org/2000/svg";>
+<defs>
+<linearGradient id="a" x1="47.968" x2="47" y1="1110.1" y2="1106.5"
gradientTransform="matrix(2 0 0 2 0 -2117)" gradientUnits="userSpaceOnUse">
+<stop stop-color="#f6f5f4" offset="0"/>
+<stop stop-color="#fcfcfc" offset="1"/>
+</linearGradient>
+<linearGradient id="b" x1="23" x2="26.679" y1="24" y2="25.83"
gradientTransform="scale(4)" gradientUnits="userSpaceOnUse">
+<stop stop-color="#f6f5f4" offset="0"/>
+<stop stop-color="#deddda" offset="1"/>
+</linearGradient>
+</defs>
+<rect x="100" y="20" width="12" height="24" ry="4" fill="#e01b24"/>
+<rect x="26" y="80" width="78" height="32" ry="8" fill="#241f31"/>
+<rect x="24" y="96" width="70" height="16" ry="0" fill="#241f31"/>
+<rect x="28" y="72" width="76" height="36" ry="8" fill="#fff"/>
+<rect x="28" y="72" width="34" height="36" ry="0" fill="#fff"/>
+<path d="m28 68v36h68c4.432 0 8-3.568 8-8v-20c0-4.432-3.568-8-8-8z"
fill="url(#a)"/>
+<path d="m28 64v36h68c4.432 0 8-3.568 8-8v-20c0-4.432-3.568-8-8-8z"
fill="url(#b)"/>
+<rect x="24" y="84" width="68" height="12" ry="0" fill="#241f31"/>
+<rect x="24" y="76" width="80" height="20" ry="8" fill="#241f31"/>
+<rect x="100" y="32" width="12" height="24" ry="4" fill="#f6d32d"/>
+<rect x="100" y="44" width="12" height="24" ry="4" fill="#33d17a"/>
+<rect x="100" y="60" width="12" height="24" ry="4" fill="#3584e4"/>
+<rect x="32" y="8" width="72" height="84" ry="8" fill="#3d3846"/>
+<path d="m24 8v84h40v-84h-32v2c0 1.108-0.892 2-2 2s-2-0.892-2-2v-2z"
fill="#3d3846"/>
+<g transform="matrix(1.75 0 0 1.75 36 -1888.4)" fill="#588f1c">
+<g transform="matrix(.26458 0 0 .26458 -10.591 -38.473)" fill="#588f1c">
+<circle cx="507.46" cy="3582.8" r="0" fill="#588f1c" opacity=".3"/>
+</g>
+</g>
+<path d="m28 10v86h4v-86c0 1.108-0.892 2-2 2s-2-0.892-2-2z" fill="#241f31"/>
+<path d="m52 28c-4.432 0-8 3.568-8 8v20.04c0 4.432 3.568 8 8 8h32c4.432 0
8-3.568 8-8v-20.04c0-4.432-3.568-8-8-8zm0 8h32v20.04h-32z" fill="#fff"/>
+<rect x="52" y="68" width="32" height="8" ry="3.7076" fill="#fff"/>
+<rect x="52" y="72" width="32" height="4" ry="0" fill="#fff"/>
+<rect x="56" y="40" width="24" height="4" fill="#fff"/>
+<rect x="56" y="48" width="20" height="4.04" fill="#fff"/>
+</svg>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-journal-4.1.3/src/icons/hicolor/symbolic/yast-journal-symbolic.svg
new/yast2-journal-4.1.5/src/icons/hicolor/symbolic/yast-journal-symbolic.svg
---
old/yast2-journal-4.1.3/src/icons/hicolor/symbolic/yast-journal-symbolic.svg
1970-01-01 01:00:00.000000000 +0100
+++
new/yast2-journal-4.1.5/src/icons/hicolor/symbolic/yast-journal-symbolic.svg
2018-12-07 15:55:54.000000000 +0100
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg"; width="16" height="16">
+ <path d="M 1.8769531 0 C 0.83662619 0 1.4802974e-16 0.83662617 0 1.8769531 L
0 11.123047 C 0 12.163374 0.83662617 13 1.8769531 13 L 10 13 L 10 11 L 2 11 L 2
2 L 14 2 L 14 10 L 16 10 L 16 1.8769531 C 16 0.83662619 15.163374 1.4802974e-16
14.123047 0 L 1.8769531 0 z M 3 3 L 3 4 L 13 4 L 13 3 L 3 3 z M 3 5 L 3 6 L 12
6 L 12 5 L 3 5 z M 3 7 L 3 8 L 10 8 L 10 7 L 3 7 z M 3 9 L 3 10 L 11 10 L 11 9
L 3 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 M
6 14 C 5.446 14 5 14.446 5 15 L 5 16 L 6 16 L 10 16 L 10 15 L 10 14 L 6 14 z "
fill="#c0bfbc" />
+</svg>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-journal-4.1.3/src/lib/y2journal/journalctl.rb
new/yast2-journal-4.1.5/src/lib/y2journal/journalctl.rb
--- old/yast2-journal-4.1.3/src/lib/y2journal/journalctl.rb 2018-11-20
16:30:30.000000000 +0100
+++ new/yast2-journal-4.1.5/src/lib/y2journal/journalctl.rb 2018-12-07
15:55:54.000000000 +0100
@@ -17,14 +17,13 @@
# you may find current contact information at www.suse.com
require "y2journal/journalctl_exception"
+require "shellwords"
module Y2Journal
# Wrapper for journalctl invocation
class Journalctl
# Agent used internally
BASH_SCR_PATH = Yast::Path.new(".target.bash_output")
- # Base journalctl command
- COMMAND = "LANG=C journalctl".freeze
# Format understood by journalctl options
TIME_FORMAT = "%Y-%m-%d %H:%M:%S".freeze
# Ordered list of priority values supported by journalctl
@@ -60,7 +59,7 @@
# Full journalctl command
def command
- "#{COMMAND} #{options_string} #{matches_string}".strip.squeeze(" ")
+ "LANG=C /usr/bin/journalctl #{options_string}
#{matches_string}".strip.squeeze(" ")
end
# Output resulting of executing the command
@@ -84,14 +83,14 @@
strings = []
@options.each_pair do |option, value|
if value.nil?
- strings << "--#{option}"
+ strings << "--#{option.to_s.shellescape}"
else
# In order to handle options with multiple values, make sure it's an
# array and remove nils (they make no sense with multiple values)
values = [value].flatten.compact
values.each do |v|
v = v.strftime(TIME_FORMAT) if v.respond_to?(:strftime)
- strings << "--#{option}=\"#{v}\""
+ strings << "--#{option.to_s.shellescape}=#{v.to_s.shellescape}"
end
end
end
@@ -99,7 +98,7 @@
end
def matches_string
- @matches_string ||= @matches.join(" ")
+ @matches_string ||= @matches.map(&:shellescape).join(" ")
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-journal-4.1.3/test/journalctl_test.rb
new/yast2-journal-4.1.5/test/journalctl_test.rb
--- old/yast2-journal-4.1.3/test/journalctl_test.rb 2018-11-20
16:30:30.000000000 +0100
+++ new/yast2-journal-4.1.5/test/journalctl_test.rb 2018-12-07
15:55:54.000000000 +0100
@@ -95,7 +95,7 @@
let(:option) { "value" }
it "assigns the string" do
- expect(subject).to match(/journalctl --option=\"value\"/)
+ expect(subject).to match(/journalctl --option=value/)
end
end
@@ -103,7 +103,7 @@
let(:option) { -1 }
it "assigns the value as a string" do
- expect(subject).to match(/journalctl --option=\"-1\"/)
+ expect(subject).to match(/journalctl --option=-1/)
end
end
@@ -112,7 +112,7 @@
it "assigns the formatted time" do
expect(subject)
- .to match(/journalctl --option=\"2014-01-02 03:04:05\"/)
+ .to match(/journalctl --option=2014-01-02\\ 03:04:05/)
end
end
@@ -120,8 +120,8 @@
let(:option) { ["value", Time.new(2014, 1, 2, 3, 4, 5)] }
it "includes the option as many times as needed" do
- expect(subject).to include('--option="2014-01-02 03:04:05"')
- expect(subject).to include('--option="value"')
+ expect(subject).to include('--option=2014-01-02\\ 03:04:05')
+ expect(subject).to include("--option=value")
end
end
end
