Hello community, here is the log from the commit of package yast2-proxy for openSUSE:Factory checked in at 2018-07-03 23:33:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-proxy (Old) and /work/SRC/openSUSE:Factory/.yast2-proxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-proxy" Tue Jul 3 23:33:08 2018 rev:16 rq:620295 version:4.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-proxy/yast2-proxy.changes 2018-04-26 13:27:14.307805036 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-proxy.new/yast2-proxy.changes 2018-07-03 23:33:10.728509715 +0200 @@ -1,0 +2,13 @@ +Wed Jun 27 17:14:44 CEST 2018 - [email protected] + +- Added additional searchkeys to desktop file (fate#321043). +- 4.0.2 + +------------------------------------------------------------------- +Thu May 10 09:18:19 UTC 2018 - [email protected] + +- Clean up the no_proxy value: not all clients ignore spaces + (bsc#1089796) +- 4.0.1 + +------------------------------------------------------------------- Old: ---- yast2-proxy-4.0.0.tar.bz2 New: ---- yast2-proxy-4.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-proxy.spec ++++++ --- /var/tmp/diff_new_pack.8vNGPT/_old 2018-07-03 23:33:11.152509106 +0200 +++ /var/tmp/diff_new_pack.8vNGPT/_new 2018-07-03 23:33:11.156509100 +0200 @@ -17,7 +17,7 @@ Name: yast2-proxy -Version: 4.0.0 +Version: 4.0.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-proxy-4.0.0.tar.bz2 -> yast2-proxy-4.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.0.0/package/yast2-proxy.changes new/yast2-proxy-4.0.2/package/yast2-proxy.changes --- old/yast2-proxy-4.0.0/package/yast2-proxy.changes 2018-04-11 10:32:53.000000000 +0200 +++ new/yast2-proxy-4.0.2/package/yast2-proxy.changes 2018-07-02 18:08:18.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed Jun 27 17:14:44 CEST 2018 - [email protected] + +- Added additional searchkeys to desktop file (fate#321043). +- 4.0.2 + +------------------------------------------------------------------- +Thu May 10 09:18:19 UTC 2018 - [email protected] + +- Clean up the no_proxy value: not all clients ignore spaces + (bsc#1089796) +- 4.0.1 + +------------------------------------------------------------------- Fri Apr 6 18:52:59 UTC 2018 - [email protected] - bnc#1087957 - version bump diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.0.0/package/yast2-proxy.spec new/yast2-proxy-4.0.2/package/yast2-proxy.spec --- old/yast2-proxy-4.0.0/package/yast2-proxy.spec 2018-04-11 10:32:53.000000000 +0200 +++ new/yast2-proxy-4.0.2/package/yast2-proxy.spec 2018-07-02 18:08:18.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-proxy # -# Copyright (c) 2013 SUSE LINUX Products 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 @@ -17,14 +17,12 @@ Name: yast2-proxy -Version: 4.0.0 +Version: 4.0.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0+ BuildRequires: update-desktop-files BuildRequires: yast2-buildtools >= 3.1.10 BuildRequires: rubygem(rspec) @@ -41,6 +39,8 @@ Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - Proxy Configuration +License: GPL-2.0+ +Group: System/YaST Url: http://en.opensuse.org/Portal:YaST %description diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.0.0/src/desktop/proxy.desktop new/yast2-proxy-4.0.2/src/desktop/proxy.desktop --- old/yast2-proxy-4.0.0/src/desktop/proxy.desktop 2018-04-11 10:32:53.000000000 +0200 +++ new/yast2-proxy-4.0.2/src/desktop/proxy.desktop 2018-07-02 18:08:18.000000000 +0200 @@ -15,6 +15,7 @@ X-SuSE-YaST-AutoInstResource=proxy X-SuSE-YaST-AutoInstClonable=true X-SuSE-YaST-AutoInstSchema=proxy.rnc +X-SuSE-YaST-Keywords=network,internet,access Icon=yast-proxy Exec=xdg-su -c "/sbin/yast2 proxy" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.0.0/src/modules/Proxy.rb new/yast2-proxy-4.0.2/src/modules/Proxy.rb --- old/yast2-proxy-4.0.0/src/modules/Proxy.rb 2018-04-11 10:32:53.000000000 +0200 +++ new/yast2-proxy-4.0.2/src/modules/Proxy.rb 2018-07-02 18:08:18.000000000 +0200 @@ -29,6 +29,28 @@ @pass = "" end + # domains that should not be proxied; reader + # @return [String] + def no_proxy_domains + clean_up_no_proxy(@no) + end + + # domains that should not be proxied; writer + # @param value [String] + def no_proxy_domains=(value) + @no = clean_up_no_proxy(value) + end + + # Compatibility: + publish :variable => :no, :type => "string" + + # we need "publish :variable" but it defines an attr_accessor + # so let's undefine it + remove_method :no + remove_method :"no=" + alias_method :no, :no_proxy_domains + alias_method :"no=", :"no_proxy_domains=" + # Display popup at the end of the proxy configuration # @param [Boolean] modified true if proxy settings have been modified def ProxyFinishPopup(modified) @@ -71,8 +93,7 @@ @https = "" if @https == nil @ftp = Convert.to_string(SCR.Read(path(".sysconfig.proxy.FTP_PROXY"))) @ftp = "" if @ftp == nil - @no = Convert.to_string(SCR.Read(path(".sysconfig.proxy.NO_PROXY"))) - @no = "" if @no == nil + self.no_proxy_domains = SCR.Read(path(".sysconfig.proxy.NO_PROXY")) || "" @enabled = Convert.to_string( SCR.Read(path(".sysconfig.proxy.PROXY_ENABLED")) ) == "yes" @@ -108,7 +129,7 @@ SCR.Write(path(".sysconfig.proxy.HTTP_PROXY"), @http) SCR.Write(path(".sysconfig.proxy.HTTPS_PROXY"), @https) SCR.Write(path(".sysconfig.proxy.FTP_PROXY"), @ftp) - SCR.Write(path(".sysconfig.proxy.NO_PROXY"), @no) + SCR.Write(path(".sysconfig.proxy.NO_PROXY"), no_proxy_domains) SCR.Write(path(".sysconfig.proxy"), nil) end @@ -132,7 +153,7 @@ # bnc#305163 "--proxy" => @http, # bsc#923788 - "--noproxy" => @no + "--noproxy" => no_proxy_domains } # proxy is used, write /root/.curlrc @@ -210,7 +231,7 @@ @http = Ops.get_string(settings, "http_proxy", "") @https = Ops.get_string(settings, "https_proxy", "") @ftp = Ops.get_string(settings, "ftp_proxy", "") - @no = Ops.get_string(settings, "no_proxy", "localhost") + self.no_proxy_domains = Ops.get_string(settings, "no_proxy", "localhost") @user = Ops.get_string(settings, "proxy_user", "") @pass = Ops.get_string(settings, "proxy_password", "") @@ -401,7 +422,7 @@ "http_proxy" => @http, "https_proxy" => @https, "ftp_proxy" => @ftp, - "no_proxy" => @no, + "no_proxy" => no_proxy_domains, "proxy_user" => @user, "proxy_password" => @pass } @@ -480,7 +501,7 @@ "http_proxy" => @http, "HTTPS_PROXY" => @https, "FTP_PROXY" => @ftp, - "NO_PROXY" => @no + "NO_PROXY" => no_proxy_domains } end @@ -491,7 +512,6 @@ publish :variable => :http, :type => "string" publish :variable => :https, :type => "string" publish :variable => :ftp, :type => "string" - publish :variable => :no, :type => "string" publish :variable => :user, :type => "string" publish :variable => :pass, :type => "string" publish :function => :Read, :type => "boolean ()" @@ -503,6 +523,13 @@ publish :function => :GetModified, :type => "boolean ()" publish :function => :SetModified, :type => "void ()" publish :function => :GetEnvironment, :type => "map <string, string> ()" + + private + + # Clean up the no_proxy value: not all clients ignore spaces (bsc#1089796) + def clean_up_no_proxy(v) + v.gsub(" ", "") + end end Proxy = ProxyClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.0.0/test/write_test.rb new/yast2-proxy-4.0.2/test/write_test.rb --- old/yast2-proxy-4.0.0/test/write_test.rb 2018-04-11 10:32:53.000000000 +0200 +++ new/yast2-proxy-4.0.2/test/write_test.rb 2018-07-02 18:08:18.000000000 +0200 @@ -93,6 +93,22 @@ expect(subject.WriteCurlrc).to be true end + it "writes a no-proxy setting without spaces" do + subject.Import({ "enabled" => true, + "http_proxy" => "proxy.example.org:3128", + "no_proxy" => "example.org, example.com, localhost" }) + expect(Yast::SCR).to receive(:Write). + with(path(".root.curlrc.\"--noproxy\""), + "example.org,example.com,localhost"). + once.and_return true + + allow(Yast::SCR).to receive(:Write). + with(path_matching(/^\.root\.curlrc/), anything). + and_return true + + expect(subject.WriteCurlrc).to be true + end + it "escapes user name" do subject.Import({ "enabled" => true, "http_proxy" => "proxy.example.org:3128",
