Hello community,
here is the log from the commit of package yast2-proxy for openSUSE:Factory checked in at 2018-12-31 09:42:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-proxy (Old)
and /work/SRC/openSUSE:Factory/.yast2-proxy.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-proxy"
Mon Dec 31 09:42:21 2018 rev:17 rq:655311 version:4.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-proxy/yast2-proxy.changes 2018-07-03 23:33:10.728509715 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-proxy.new.28833/yast2-proxy.changes 2018-12-31 09:42:22.830413567 +0100
@@ -1,0 +2,23 @@
+Wed Dec 5 11:06:17 UTC 2018 - jreidinger@suse.com
+
+- always use absolute path to binaries (bsc#1118291)
+- escape properly shell arguments (bsc#1118291)
+- 4.1.0
+
+-------------------------------------------------------------------
+Sun Nov 25 23:31:29 UTC 2018 - Noah Davis
+
+- Provide icon with module (boo#1109310)
+- 4.0.3
+
+-------------------------------------------------------------------
+Tue Oct 16 15:53:35 CEST 2018 - schubi@suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Wed Aug 22 14:53:27 CEST 2018 - schubi@suse.de
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Old:
----
yast2-proxy-4.0.2.tar.bz2
New:
----
yast2-proxy-4.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-proxy.spec ++++++
--- /var/tmp/diff_new_pack.z3oUeH/_old 2018-12-31 09:42:23.246413227 +0100
+++ /var/tmp/diff_new_pack.z3oUeH/_new 2018-12-31 09:42:23.246413227 +0100
@@ -17,7 +17,7 @@
Name: yast2-proxy
-Version: 4.0.2
+Version: 4.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -39,7 +39,7 @@
Requires: yast2-ruby-bindings >= 1.0.0
Summary: YaST2 - Proxy Configuration
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: System/YaST
Url: http://en.opensuse.org/Portal:YaST
@@ -66,6 +66,8 @@
%{yast_desktopdir}/*.desktop
%{yast_scrconfdir}/*.scr
%{yast_schemadir}/autoyast/rnc/proxy.rnc
+%{yast_icondir}
+%license COPYING
%doc %{yast_docdir}
++++++ yast2-proxy-4.0.2.tar.bz2 -> yast2-proxy-4.1.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.0.2/package/yast2-proxy.changes new/yast2-proxy-4.1.0/package/yast2-proxy.changes
--- old/yast2-proxy-4.0.2/package/yast2-proxy.changes 2018-07-02 18:08:18.000000000 +0200
+++ new/yast2-proxy-4.1.0/package/yast2-proxy.changes 2018-12-05 12:22:55.000000000 +0100
@@ -1,4 +1,27 @@
-------------------------------------------------------------------
+Wed Dec 5 11:06:17 UTC 2018 - jreidinger@suse.com
+
+- always use absolute path to binaries (bsc#1118291)
+- escape properly shell arguments (bsc#1118291)
+- 4.1.0
+
+-------------------------------------------------------------------
+Sun Nov 25 23:31:29 UTC 2018 - Noah Davis
+
+- Provide icon with module (boo#1109310)
+- 4.0.3
+
+-------------------------------------------------------------------
+Tue Oct 16 15:53:35 CEST 2018 - schubi@suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Wed Aug 22 14:53:27 CEST 2018 - schubi@suse.de
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Wed Jun 27 17:14:44 CEST 2018 - schubi@suse.de
- Added additional searchkeys to desktop file (fate#321043).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.0.2/package/yast2-proxy.spec new/yast2-proxy-4.1.0/package/yast2-proxy.spec
--- old/yast2-proxy-4.0.2/package/yast2-proxy.spec 2018-07-02 18:08:18.000000000 +0200
+++ new/yast2-proxy-4.1.0/package/yast2-proxy.spec 2018-12-05 12:22:55.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-proxy
-Version: 4.0.2
+Version: 4.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -39,7 +39,7 @@
Requires: yast2-ruby-bindings >= 1.0.0
Summary: YaST2 - Proxy Configuration
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: System/YaST
Url: http://en.opensuse.org/Portal:YaST
@@ -66,6 +66,8 @@
%{yast_desktopdir}/*.desktop
%{yast_scrconfdir}/*.scr
%{yast_schemadir}/autoyast/rnc/proxy.rnc
+%{yast_icondir}
+%license COPYING
%doc %{yast_docdir}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.0.2/src/icons/hicolor/scalable/apps/yast-proxy.svg new/yast2-proxy-4.1.0/src/icons/hicolor/scalable/apps/yast-proxy.svg
--- old/yast2-proxy-4.0.2/src/icons/hicolor/scalable/apps/yast-proxy.svg 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-proxy-4.1.0/src/icons/hicolor/scalable/apps/yast-proxy.svg 2018-12-05 12:22:55.000000000 +0100
@@ -0,0 +1 @@
+<svg height="128" width="128" xmlns="http://www.w3.org/2000/svg"><radialGradient id="a" cx="70" cy="58" gradientUnits="userSpaceOnUse" r="6"><stop offset="0" stop-color="#f6d32d"/><stop offset="1" stop-color="#e5a50a"/></radialGradient><g stroke-width="4"><path d="M64 12a52 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="#3584e4"/><path d="M64 8a52 52 0 0 0-52 52 52 52 0 0 0 52 52 52 52 0 0 0 52-52A52 52 0 0 0 64 8z" fill="#1a5fb4"/><path d="M64 8a52 52 0 0 0-19.988 4.012L48 16v4l8 8h4v-6l6-4v-6l4-2V8.412A52 52 0 0 0 64 8zm-28.328 8.448A52 52 0 0 0 12 60c.02 1.224.08 2.444.184 3.66L24 74v-6l-4-6 8-6 6 4v-8l8-6 6-10-6-6h-6l2 6H28l-2-4 2-4v-4h10v-6zM94 18l-6 6v4h4v-4h8v8H84v4h-4v4h-8v12h12v-8h8l4 8h4v-8h4l4 8h4v4H72l-4 6 10 10 10 16 2 10 4.248 4.248a52 52 0 0 0 21.12-34.44L106 60l2-2 7.8 6.24A52 52 0 0 0 116 60a52 52 0 0 0-21.444-42zM30 72l-4 4v10l8 8v8.4a52 52 0 0 0 11.44 6.16L48 106v-4l6-6v-4l4-4v-8l-4-4h-8l-4-4z" fill="#1c71d8"/><path d="M12 12h72v104H12z" fill="#63452c"/><path d="M12 8h72v104H12z" fill="#986a44"/><path d="M20 68h56v36H20zm0-52h56v32H20z" fill="#63452c"/><path d="M20 72h56v32H20zm0-52h56v28H20z" fill="#865e3c"/><circle cx="70" cy="58" fill="url(#a)" r="6"/></g></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.0.2/src/modules/Proxy.rb new/yast2-proxy-4.1.0/src/modules/Proxy.rb
--- old/yast2-proxy-4.0.2/src/modules/Proxy.rb 2018-07-02 18:08:18.000000000 +0200
+++ new/yast2-proxy-4.1.0/src/modules/Proxy.rb 2018-12-05 12:22:55.000000000 +0100
@@ -1,6 +1,7 @@
# encoding: utf-8
require "yast"
+require "shellwords"
module Yast
# Configures FTP and HTTP proxies via sysconfig
@@ -280,51 +281,19 @@
test_https = https_proxy != "" && https_proxy != "http://" ? true : false
test_ftp = ftp_proxy != "" && ftp_proxy != "http://" ? true : false
- http_proxy = Builtins.mergestring(
- Builtins.splitstring(http_proxy, "\""),
- "\\\""
- )
- https_proxy = Builtins.mergestring(
- Builtins.splitstring(https_proxy, "\""),
- "\\\""
- )
- ftp_proxy = Builtins.mergestring(
- Builtins.splitstring(ftp_proxy, "\""),
- "\\\""
- )
- proxy_user = Builtins.mergestring(
- Builtins.splitstring(proxy_user, "\""),
- "\\\""
- )
- #escape also '\' character - usernames such as domain\user are causing pain to .target.bash_output
- #and to curl - #256360
- proxy_user = Builtins.mergestring(
- Builtins.splitstring(proxy_user, "\\"),
- "\\\\"
- )
- proxy_password = Builtins.mergestring(
- Builtins.splitstring(proxy_password, "\""),
- "\\\""
- )
-
- # enclose user:password into quotes, it may contain special characters (#338264)
- user_pass = proxy_user != "" ?
- Ops.add(
- Ops.add(
- Ops.add(" --proxy-user '", proxy_user),
- proxy_password != "" ? Ops.add(":", proxy_password) : ""
- ),
- "'"
- ) :
- ""
+ user_pass = ""
+ if proxy_user != ""
+ user_pass = " --proxy-user #{proxy_user.shellescape}" +
+ user_pass << ":#{proxy_password.shellescape}" if proxy_password != ""
+ end
# timeout for the connection
timeout_sec = 90
# %1 = http or ftp proxy, %2 = user:password if any, %3 = URL
- command = "curl --verbose --proxy %1 %2 --connect-timeout %3 --url %4"
+ command = "/usr/bin/curl --verbose --proxy %1 %2 --connect-timeout %3 --url %4"
http_command = Builtins.sformat(
command,
- http_proxy,
+ http_proxy.shellescape,
user_pass,
timeout_sec,
"http://www.novell.com"
@@ -332,14 +301,14 @@
# adding option --insecure to accept the certificate without asking
https_command = Builtins.sformat(
command,
- https_proxy,
+ https_proxy.shellescape,
user_pass,
timeout_sec,
"https://secure-www.novell.com --insecure"
)
ftp_command = Builtins.sformat(
command,
- ftp_proxy,
+ ftp_proxy.shellescape,
user_pass,
timeout_sec,
"ftp://ftp.novell.com"