Hello community, here is the log from the commit of package yast2-squid for openSUSE:Factory checked in at 2018-12-31 09:43:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-squid (Old) and /work/SRC/openSUSE:Factory/.yast2-squid.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-squid" Mon Dec 31 09:43:33 2018 rev:50 rq:657531 version:4.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-squid/yast2-squid.changes 2018-10-18 15:35:19.270368142 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-squid.new.28833/yast2-squid.changes 2018-12-31 09:43:34.778354673 +0100 @@ -1,0 +2,19 @@ +Wed Dec 12 12:24:20 UTC 2018 - Josef Reidinger <[email protected]> + +- Fix name of exception (related to fix for bsc#1118291) +- 4.1.4 + +------------------------------------------------------------------- +Tue Dec 11 08:35:22 UTC 2018 - [email protected] + +- always use absolute path to binaries (bsc#1118291) +- properly escape shell arguments (bsc#1118291) +- 4.1.3 + +------------------------------------------------------------------- +Mon Nov 26 07:51:22 UTC 2018 - Noah Davis <[email protected]> + +- Provide icon with module (boo#1109310) +- 4.1.2 + +------------------------------------------------------------------- Old: ---- yast2-squid-4.1.1.tar.bz2 New: ---- yast2-squid-4.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-squid.spec ++++++ --- /var/tmp/diff_new_pack.Srl4ZJ/_old 2018-12-31 09:43:35.130354384 +0100 +++ /var/tmp/diff_new_pack.Srl4ZJ/_new 2018-12-31 09:43:35.134354381 +0100 @@ -17,7 +17,7 @@ Name: yast2-squid -Version: 4.1.1 +Version: 4.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -76,7 +76,7 @@ %{yast_moduledir}/SquidErrorMessages.* %{yast_desktopdir}/squid.desktop %{yast_schemadir}/autoyast/rnc/squid.rnc - +%{yast_icondir} %{yast_plugindir}/libpy2ag_squid.so* %{yast_scrconfdir}/*.scr %doc %{yast_docdir} ++++++ yast2-squid-4.1.1.tar.bz2 -> yast2-squid-4.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.1/package/yast2-squid.changes new/yast2-squid-4.1.4/package/yast2-squid.changes --- old/yast2-squid-4.1.1/package/yast2-squid.changes 2018-10-17 14:36:08.000000000 +0200 +++ new/yast2-squid-4.1.4/package/yast2-squid.changes 2018-12-12 13:31:03.000000000 +0100 @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Wed Dec 12 12:24:20 UTC 2018 - Josef Reidinger <[email protected]> + +- Fix name of exception (related to fix for bsc#1118291) +- 4.1.4 + +------------------------------------------------------------------- +Tue Dec 11 08:35:22 UTC 2018 - [email protected] + +- always use absolute path to binaries (bsc#1118291) +- properly escape shell arguments (bsc#1118291) +- 4.1.3 + +------------------------------------------------------------------- +Mon Nov 26 07:51:22 UTC 2018 - Noah Davis <[email protected]> + +- Provide icon with module (boo#1109310) +- 4.1.2 + +------------------------------------------------------------------- Wed Oct 17 08:18:00 UTC 2018 - [email protected] - Avoid crash when "squid" is not installed yet (bsc#1110076) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.1/package/yast2-squid.spec new/yast2-squid-4.1.4/package/yast2-squid.spec --- old/yast2-squid-4.1.1/package/yast2-squid.spec 2018-10-17 14:36:08.000000000 +0200 +++ new/yast2-squid-4.1.4/package/yast2-squid.spec 2018-12-12 13:31:03.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-squid -Version: 4.1.1 +Version: 4.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -76,7 +76,7 @@ %{yast_moduledir}/SquidErrorMessages.* %{yast_desktopdir}/squid.desktop %{yast_schemadir}/autoyast/rnc/squid.rnc - +%{yast_icondir} %{yast_plugindir}/libpy2ag_squid.so* %{yast_scrconfdir}/*.scr %doc %{yast_docdir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.1/src/Makefile.am new/yast2-squid-4.1.4/src/Makefile.am --- old/yast2-squid-4.1.1/src/Makefile.am 2018-10-17 14:36:08.000000000 +0200 +++ new/yast2-squid-4.1.4/src/Makefile.am 2018-12-12 13:31:03.000000000 +0100 @@ -32,6 +32,10 @@ desktop_DATA = \ desktop/squid.desktop -EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(desktop_DATA) +scalabledir = @icondir@/hicolor/scalable/apps +scalable_DATA = \ + icons/hicolor/scalable/apps/yast-squid.svg -include $(top_srcdir)/Makefile.am.common \ No newline at end of file +EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(desktop_DATA) $(scalable_DATA) + +include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.1/src/icons/hicolor/scalable/apps/yast-squid.svg new/yast2-squid-4.1.4/src/icons/hicolor/scalable/apps/yast-squid.svg --- old/yast2-squid-4.1.1/src/icons/hicolor/scalable/apps/yast-squid.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-squid-4.1.4/src/icons/hicolor/scalable/apps/yast-squid.svg 2018-12-12 13:31:03.000000000 +0100 @@ -0,0 +1 @@ +<svg height="128" width="128" xmlns="http://www.w3.org/2000/svg";><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="175.322" x2="287.322" y1="72.644" y2="72.644"><stop offset="0" stop-color="#5e5c64"/><stop offset=".036" stop-color="#9a9996"/><stop offset=".071" stop-color="#5e5c64"/><stop offset=".929" stop-color="#5e5c64"/><stop offset=".964" stop-color="#9a9996"/><stop offset="1" stop-color="#5e5c64"/></linearGradient><g transform="translate(-167.322 31.356)"><g fill="#5e5c64" stroke-width="4"><rect height="24" ry="4" width="112" x="175.322" y="-7.356"/><rect height="24" ry="4" width="112" x="175.322" y="16.644"/><rect height="24" ry="4.236" width="112" x="175.322" y="40.644"/></g><rect fill="url(#a)" height="20" ry="4" width="112" x="175.322" y="60.644"/><g fill="#9a9996" stroke-width="4"><rect height="20" ry="4" width="112" x="175.322" y="-19.356"/><rect height="20" ry="4" width="112" x="175.322" y="4.644"/><rect height="20" ry="4" width="112" x="175.322" y="28.644"/><rect height="20" ry="4" width="112" x="175.322" y="52.644"/></g><path d="M223.322-15.356h60v12h-60zm0 24h60v12h-60zm0 24h60v12h-60zm0 24h60v12h-60z" fill="#3d3846"/><g fill="#5e5c64" transform="matrix(4 0 0 4 167.322 -31.356)"><path d="M14 5h15v2H14zm0 6h15v2H14zm0 6h15v2H14zm0 6h15v2H14z"/><rect height="2" ry=".5" width="1" x="4" y="4"/><rect height="2" ry=".5" width="1" x="6" y="4"/><rect height="2" ry=".5" width="1" x="4" y="10"/><rect height="2" ry=".5" width="1" x="6" y="10"/><rect height="2" ry=".5" width="1" x="4" y="16"/><rect height="2" ry=".5" width="1" x="6" y="16"/><rect height="2" ry=".5" width="1" x="4" y="22"/><rect height="2" ry=".5" width="1" x="6" y="22"/></g><g stroke-width="4" transform="translate(167.322 -31.356)"><rect fill="#e01b24" height="4" ry="2" width="4" x="24" y="44"/><rect fill="#e01b24" height="4" ry="2" width="4" x="16" y="68"/><g fill="#f6d32d"><rect height="4" ry="2" width="4" x="16" y="20"/><rect height="4" ry="2" width="4" x="24" y="68"/><rect height="4" ry="2" width="4" x="16" y="92"/></g><g fill="#33d17a"><rect height="4" ry="2" width="4" x="24" y="20"/><rect height="4" ry="2" width="4" x="16" y="44"/><rect height="4" ry="2" width="4" x="24" y="92"/></g><path d="M60 44h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zM60 20h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zM60 68h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zM60 92h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4zm8 0h4v8h-4z" fill="#3d3846"/><path d="M60 40h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zM60 16h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zM60 64h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zM60 88h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4zm8 0h4v4h-4z" fill="#241f31"/></g></g><path d="M72 44h4v52h-4zm24 28h4v24h-4z" fill="#f6d32d"/><path d="M56 24h4v24h-4zm8 20h4v28h-4zm24-20h4v24h-4zm16 24h4v24h-4z" fill="#1c71d8"/><path d="M80 24h4v48h-4zm24 0h4v24h-4z" fill="#a347ba"/><path d="M96 24h4v24h-4z" fill="#33d17a"/></svg> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.1/src/modules/Squid.rb new/yast2-squid-4.1.4/src/modules/Squid.rb --- old/yast2-squid-4.1.1/src/modules/Squid.rb 2018-10-17 14:36:08.000000000 +0200 +++ new/yast2-squid-4.1.4/src/modules/Squid.rb 2018-12-12 13:31:03.000000000 +0100 @@ -32,9 +32,12 @@ require "yast" require "y2firewall/firewalld" require "yast2/system_service" +require "fileutils" module Yast class SquidClass < Module + include Yast::Logger + def main textdomain "squid" @@ -205,21 +208,16 @@ # If dir does not exist, function returns true; def setWritePremissionsToCacheDir(dir) if !FileUtils.IsDirectory(dir) - Builtins.y2debug( - "Squid::checkWritePremissionsCacheDir() - '%1' is not directory", - dir - ) + log.warn "Squid::checkWritePremissionsCacheDir() - '#{dir}' is not directory" return true end - if Convert.to_integer( - SCR.Execute(path(".target.bash"), Ops.add("chown squid:root ", dir)) - ) != 0 || - Convert.to_integer( - SCR.Execute(path(".target.bash"), Ops.add("chmod 750 ", dir)) - ) != 0 + begin + ::FileUtils.chown("squid", "root", dir) + ::FileUtils.chmod(0o750, dir) + rescue IOError, SystemCallError => e + log.error "failed to set permissions #{e.inspect}" return false - # return (Popup::ContinueCancel(sformat(_("Unable to set correct permissions to directory %1."), dir))); end true @@ -1345,11 +1343,6 @@ def StartService ok = true # verify config file - # if ((integer)SCR::Execute(.target.bash, "squid -k parse") != 0){ - # y2error("Squid::Write - startService - 'squid -k parse' failed"); - # return false; - # } - if !IsServiceRunning() if !Service.Start("squid") ok = false
