Hello community, here is the log from the commit of package yast2-squid for openSUSE:Factory checked in at 2015-07-08 06:59:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-squid (Old) and /work/SRC/openSUSE:Factory/.yast2-squid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-squid" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-squid/yast2-squid.changes 2014-12-05 21:04:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-squid.new/yast2-squid.changes 2015-07-08 06:59:17.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 2 12:32:25 UTC 2015 - [email protected] + +- remove obsolete emulate_http_log config option (bnc#928896) +- 3.1.4 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-squid.spec ++++++ --- /var/tmp/diff_new_pack.bszUED/_old 2015-07-08 06:59:18.000000000 +0200 +++ /var/tmp/diff_new_pack.bszUED/_new 2015-07-08 06:59:18.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-squid # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 ++++++ yast2-squid-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.4/CONTRIBUTING.md new/yast2-squid-3.1.4/CONTRIBUTING.md --- old/yast2-squid-3.1.4/CONTRIBUTING.md 2014-12-04 11:17:14.000000000 +0100 +++ new/yast2-squid-3.1.4/CONTRIBUTING.md 2015-07-02 16:02:39.000000000 +0200 @@ -12,13 +12,13 @@ ----------- If you find a problem, please report it either using -[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +[Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) or [GitHub issues](../../issues). (For Bugzilla, use the [simplified registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) if you don't have an account yet.) If you find a problem, please report it either using -[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee that every bug will be fixed, but we'll try. When creating a bug report, please follow our [bug reporting @@ -71,7 +71,7 @@ [widely used conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). -If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +If your commit is related to a bug in Bugzilla or an issue on GitHub, make sure you mention it in the commit message for cross-reference. Use format like bnc#775814 or gh#yast/yast-foo#42. See also [GitHub autolinking](https://help.github.com/articles/github-flavored-markdown#references) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.4/package/yast2-squid.changes new/yast2-squid-3.1.4/package/yast2-squid.changes --- old/yast2-squid-3.1.4/package/yast2-squid.changes 2014-12-04 11:17:14.000000000 +0100 +++ new/yast2-squid-3.1.4/package/yast2-squid.changes 2015-07-02 16:02:39.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 2 12:32:25 UTC 2015 - [email protected] + +- remove obsolete emulate_http_log config option (bnc#928896) +- 3.1.4 + +------------------------------------------------------------------- Thu Dec 4 09:51:38 UTC 2014 - [email protected] - remove X-KDE-Library from desktop file (bnc#899104) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.4/package/yast2-squid.spec new/yast2-squid-3.1.4/package/yast2-squid.spec --- old/yast2-squid-3.1.4/package/yast2-squid.spec 2014-12-04 11:17:14.000000000 +0100 +++ new/yast2-squid-3.1.4/package/yast2-squid.spec 2015-07-02 16:02:39.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-squid # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -23,18 +23,24 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0 -Requires: yast2 >= 2.21.22 -BuildRequires: perl-XML-Writer update-desktop-files yast2 +Requires: yast2 >= 2.21.22 +BuildRequires: boost-devel +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: perl-XML-Writer +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-core-devel BuildRequires: yast2-devtools >= 3.1.10 -BuildRequires: yast2-testsuite yast2-core-devel boost-devel gcc-c++ libtool +BuildRequires: yast2-testsuite #BuildArchitectures: noarch Requires: yast2-ruby-bindings >= 1.0.0 -Summary: Configuration of squid +Summary: Configuration of squid +License: GPL-2.0 +Group: System/YaST %description Configuration of squid @@ -50,7 +56,6 @@ rm -rf %{buildroot}/%{yast_plugindir}/libpy2ag_squid.la - %files %defattr(-,root,root) %dir %{yast_yncludedir}/squid @@ -67,3 +72,5 @@ %{yast_plugindir}/libpy2ag_squid.so* %{yast_scrconfdir}/*.scr %doc %{yast_docdir} + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.4/src/include/squid/dialogs.rb new/yast2-squid-3.1.4/src/include/squid/dialogs.rb --- old/yast2-squid-3.1.4/src/include/squid/dialogs.rb 2014-12-04 11:17:14.000000000 +0100 +++ new/yast2-squid-3.1.4/src/include/squid/dialogs.rb 2015-07-02 16:02:39.000000000 +0200 @@ -335,8 +335,7 @@ PushButton(Id(:cache_store_log_browse), Label.BrowseButton) ) ) - ), - Left(CheckBox(Id("emulate_httpd_log"), _("&Emulate httpd Log?"))) + ) ) ) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.4/src/include/squid/inits.rb new/yast2-squid-3.1.4/src/include/squid/inits.rb --- old/yast2-squid-3.1.4/src/include/squid/inits.rb 2014-12-04 11:17:14.000000000 +0100 +++ new/yast2-squid-3.1.4/src/include/squid/inits.rb 2015-07-02 16:02:39.000000000 +0200 @@ -446,12 +446,7 @@ Ops.get(set, "cache_store_log", []), 0, "" - ), - "emulate_httpd_log" => Ops.get_string( - Ops.get(set, "emulate_httpd_log", []), - 0, - "" - ) == "on" ? true : false + ) } ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.4/src/include/squid/store_del.rb new/yast2-squid-3.1.4/src/include/squid/store_del.rb --- old/yast2-squid-3.1.4/src/include/squid/store_del.rb 2014-12-04 11:17:14.000000000 +0100 +++ new/yast2-squid-3.1.4/src/include/squid/store_del.rb 2015-07-02 16:02:39.000000000 +0200 @@ -567,9 +567,6 @@ cache_store_log = Convert.to_string( UI.QueryWidget(Id("cache_store_log"), :Value) ) - emulate_httpd_log = Convert.to_boolean( - UI.QueryWidget(Id("emulate_httpd_log"), :Value) - ) ? "on" : "off" if Builtins.size(access_log) == 0 ok = false @@ -642,9 +639,6 @@ cache_store_log = Convert.to_string( UI.QueryWidget(Id("cache_store_log"), :Value) ) - emulate_httpd_log = Convert.to_boolean( - UI.QueryWidget(Id("emulate_httpd_log"), :Value) - ) ? "on" : "off" tmp = Squid.GetSetting("access_log") Squid.SetSetting( @@ -653,7 +647,6 @@ ) Squid.SetSetting("cache_log", [cache_log]) Squid.SetSetting("cache_store_log", [cache_store_log]) - Squid.SetSetting("emulate_httpd_log", [emulate_httpd_log]) nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.4/src/modules/Squid.rb new/yast2-squid-3.1.4/src/modules/Squid.rb --- old/yast2-squid-3.1.4/src/modules/Squid.rb 2014-12-04 11:17:14.000000000 +0100 +++ new/yast2-squid-3.1.4/src/modules/Squid.rb 2015-07-02 16:02:39.000000000 +0200 @@ -122,7 +122,6 @@ "access_log" => ["/var/log/squid/access.log"], "cache_log" => ["/var/log/squid/cache.log"], "cache_store_log" => ["/var/log/squid/store.log"], - "emulate_httpd_log" => ["off"], "connect_timeout" => ["2", "minutes"], "client_lifetime" => ["1", "days"], "error_directory" => ["/usr/share/squid/errors/en"], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.4/testsuite/tests/Squid-Read.out new/yast2-squid-3.1.4/testsuite/tests/Squid-Read.out --- old/yast2-squid-3.1.4/testsuite/tests/Squid-Read.out 2014-12-04 11:17:14.000000000 +0100 +++ new/yast2-squid-3.1.4/testsuite/tests/Squid-Read.out 2015-07-02 16:02:39.000000000 +0200 @@ -34,7 +34,6 @@ Read .etc.squid."cache_swap_low" [["90"]] Read .etc.squid."client_lifetime" [["1", "day"]] Read .etc.squid."connect_timeout" [["2", "minutes"]] -Read .etc.squid."emulate_httpd_log" [["off"]] Read .etc.squid."error_directory" [["/usr/share/squid/errors/English"]] Read .etc.squid."ftp_passive" [["on"]] Read .etc.squid."maximum_object_size" [["4096", "KB"]] @@ -42,7 +41,7 @@ Read .etc.squid."minimum_object_size" [["0", "KB"]] Return true Dump Squid::settings -Return $["access_log":["/var/log/squid/access.log"], "cache_dir":["ufs", "/var/cache/squid", "100", "16", "256"], "cache_log":["/var/log/squid/cache.log"], "cache_mem":["80", "MB"], "cache_mgr":["webmaster"], "cache_replacement_policy":["lru"], "cache_store_log":["/var/log/squid/store.log"], "cache_swap_high":["95"], "cache_swap_low":["90"], "client_lifetime":["1", "days"], "connect_timeout":["2", "minutes"], "emulate_httpd_log":["off"], "error_directory":["/usr/share/squid/errors/English"], "ftp_passive":["on"], "maximum_object_size":["4096", "KB"], "memory_replacement_policy":["heap GDSF"], "minimum_object_size":["0", "KB"]] +Return $["access_log":["/var/log/squid/access.log"], "cache_dir":["ufs", "/var/cache/squid", "100", "16", "256"], "cache_log":["/var/log/squid/cache.log"], "cache_mem":["80", "MB"], "cache_mgr":["webmaster"], "cache_replacement_policy":["lru"], "cache_store_log":["/var/log/squid/store.log"], "cache_swap_high":["95"], "cache_swap_low":["90"], "client_lifetime":["1", "days"], "connect_timeout":["2", "minutes"], "error_directory":["/usr/share/squid/errors/English"], "ftp_passive":["on"], "maximum_object_size":["4096", "KB"], "memory_replacement_policy":["heap GDSF"], "minimum_object_size":["0", "KB"]] Dump ------------------------------ Dump Squid::Read() Read .etc.squid."http_port" [["localhost:3128"], ["80", "transparent"]] @@ -60,7 +59,6 @@ Read .etc.squid."cache_swap_low" [["90"]] Read .etc.squid."client_lifetime" [["1", "day"]] Read .etc.squid."connect_timeout" [["2", "minutes"]] -Read .etc.squid."emulate_httpd_log" [["off"]] Read .etc.squid."error_directory" [["/usr/share/squid/errors/English"]] Read .etc.squid."ftp_passive" [["on"]] Read .etc.squid."maximum_object_size" [["4096", "KB"]] @@ -68,7 +66,7 @@ Read .etc.squid."minimum_object_size" [["0", "KB"]] Return true Dump Squid::settings -Return $["access_log":["/var/log/squid/access.log"], "cache_dir":["ufs", "/var/cache/squid", "100", "16", "256"], "cache_log":["/var/log/squid/cache.log"], "cache_mem":["80", "MB"], "cache_mgr":["webmaster"], "cache_replacement_policy":["lru"], "cache_store_log":["/var/log/squid/store.log"], "cache_swap_high":["95"], "cache_swap_low":["90"], "client_lifetime":["1", "days"], "connect_timeout":["2", "minutes"], "emulate_httpd_log":["off"], "error_directory":["/usr/share/squid/errors/English"], "ftp_passive":["on"], "maximum_object_size":["4096", "KB"], "memory_replacement_policy":["heap GDSF"], "minimum_object_size":["0", "KB"]] +Return $["access_log":["/var/log/squid/access.log"], "cache_dir":["ufs", "/var/cache/squid", "100", "16", "256"], "cache_log":["/var/log/squid/cache.log"], "cache_mem":["80", "MB"], "cache_mgr":["webmaster"], "cache_replacement_policy":["lru"], "cache_store_log":["/var/log/squid/store.log"], "cache_swap_high":["95"], "cache_swap_low":["90"], "client_lifetime":["1", "days"], "connect_timeout":["2", "minutes"], "error_directory":["/usr/share/squid/errors/English"], "ftp_passive":["on"], "maximum_object_size":["4096", "KB"], "memory_replacement_policy":["heap GDSF"], "minimum_object_size":["0", "KB"]] Dump Squid::acls Return [$["name":"QUERY", "options":["cgi-bin \\?"], "type":"urlpath_regex"], $["name":"apache", "options":["Server", "^Apache"], "type":"rep_header"], $["name":"all", "options":["0.0.0.0/0.0.0.0"], "type":"src"], $["name":"manager", "options":["cache_object"], "type":"proto"], $["name":"localhost", "options":["127.0.0.1/255.255.255.255"], "type":"src"], $["name":"localhost_public", "options":["10.20.1.241/255.255.255.255"], "type":"src"], $["name":"to_localhost", "options":["127.0.0.0/8"], "type":"dst"], $["name":"SSL_ports", "options":[" 443"], "type":"port"], $["name":"Safe_ports", "options":["80"], "type":"port"], $["name":"Safe_ports", "options":["21"], "type":"port"], $["name":"Safe_ports", "options":["443"], "type":"port"], $["name":"Safe_ports", "options":["70"], "type":"port"], $["name":"Safe_ports", "options":["210"], "type":"port"], $["name":"Safe_ports", "options":["1025-65535"], "type":"port"], $["name":"Safe_ports", "options":["280"], "type":"port"], $["name":"Safe_ports", "options":["488"], "type":"port"], $["name":"Safe_ports", "options":["591"], "type":"port"], $["name":"Safe_ports", "options":["777"], "type":"port"], $["name":"CONNECT", "options":["CONNECT"], "type":"method"]] Dump Squid::refresh_patterns @@ -95,7 +93,6 @@ Read .etc.squid."cache_swap_low" [["90"]] Read .etc.squid."client_lifetime" [["1", "day"]] Read .etc.squid."connect_timeout" [["2", "minutes"]] -Read .etc.squid."emulate_httpd_log" [["off"]] Read .etc.squid."error_directory" [["/usr/share/squid/errors/English"]] Read .etc.squid."ftp_passive" [["on"]] Read .etc.squid."maximum_object_size" [["4096", "KB"]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.4/testsuite/tests/Squid-Read.rb new/yast2-squid-3.1.4/testsuite/tests/Squid-Read.rb --- old/yast2-squid-3.1.4/testsuite/tests/Squid-Read.rb 2014-12-04 11:17:14.000000000 +0100 +++ new/yast2-squid-3.1.4/testsuite/tests/Squid-Read.rb 2015-07-02 16:02:39.000000000 +0200 @@ -60,7 +60,6 @@ "cache_log" => [["/var/log/squid/cache.log"]], "cache_store_log" => [["/var/log/squid/store.log"]], "cache_swap_log" => [["none"]], - "emulate_httpd_log" => [["off"]], "connect_timeout" => [["2", "minutes"]], "client_lifetime" => [["1", "day"]], "error_directory" => [["/usr/share/squid/errors/English"]], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.4/testsuite/tests/Squid.out new/yast2-squid-3.1.4/testsuite/tests/Squid.out --- old/yast2-squid-3.1.4/testsuite/tests/Squid.out 2014-12-04 11:17:14.000000000 +0100 +++ new/yast2-squid-3.1.4/testsuite/tests/Squid.out 2015-07-02 16:02:39.000000000 +0200 @@ -13,7 +13,6 @@ Read .etc.squid."cache_swap_low" [["90"]] Read .etc.squid."client_lifetime" [["1", "day"]] Read .etc.squid."connect_timeout" [["2", "minutes"]] -Read .etc.squid."emulate_httpd_log" [["off"]] Read .etc.squid."error_directory" [["/usr/share/squid/errors/English"]] Read .etc.squid."ftp_passive" [["on"]] Read .etc.squid."maximum_object_size" [["4096", "KB"]] @@ -67,12 +66,12 @@ Return 10 Dump Dump ACLIsUsedBy(0) - QUERY -Dir .etc.squid: ["access_log", "acl", "cache_dir", "cache_log", "cache_mem", "cache_mgr", "cache_replacement_policy", "cache_store_log", "cache_swap_high", "cache_swap_log", "cache_swap_low", "client_lifetime", "connect_timeout", "emulate_httpd_log", "error_directory", "ftp_passive", "http_access", "http_port", "maximum_object_size", "memory_replacement_policy", "minimum_object_size", "no_cache", "refresh_pattern"] +Dir .etc.squid: ["access_log", "acl", "cache_dir", "cache_log", "cache_mem", "cache_mgr", "cache_replacement_policy", "cache_store_log", "cache_swap_high", "cache_swap_log", "cache_swap_low", "client_lifetime", "connect_timeout", "error_directory", "ftp_passive", "http_access", "http_port", "maximum_object_size", "memory_replacement_policy", "minimum_object_size", "no_cache", "refresh_pattern"] Read .etc.squid."no_cache" [["deny", "QUERY"]] Read .etc.squid."access_log" [["/var/log/squid/access.log"]] Return ["no_cache"] Dump ACLIsUsedBy(1) -Dir .etc.squid: ["access_log", "acl", "cache_dir", "cache_log", "cache_mem", "cache_mgr", "cache_replacement_policy", "cache_store_log", "cache_swap_high", "cache_swap_log", "cache_swap_low", "client_lifetime", "connect_timeout", "emulate_httpd_log", "error_directory", "ftp_passive", "http_access", "http_port", "maximum_object_size", "memory_replacement_policy", "minimum_object_size", "no_cache", "refresh_pattern"] +Dir .etc.squid: ["access_log", "acl", "cache_dir", "cache_log", "cache_mem", "cache_mgr", "cache_replacement_policy", "cache_store_log", "cache_swap_high", "cache_swap_log", "cache_swap_low", "client_lifetime", "connect_timeout", "error_directory", "ftp_passive", "http_access", "http_port", "maximum_object_size", "memory_replacement_policy", "minimum_object_size", "no_cache", "refresh_pattern"] Read .etc.squid."no_cache" [["deny", "QUERY"]] Read .etc.squid."access_log" [["/var/log/squid/access.log"]] Return ["http_access"] @@ -128,7 +127,7 @@ Dump ================================================== Dump Dump GetSettings() -Return $["access_log":["/var/log/squid/access.log"], "cache_dir":["ufs", "/var/cache/squid", "100", "16", "256"], "cache_log":["/var/log/squid/cache.log"], "cache_mem":["80", "MB"], "cache_mgr":["webmaster"], "cache_replacement_policy":["lru"], "cache_store_log":["/var/log/squid/store.log"], "cache_swap_high":["95"], "cache_swap_low":["90"], "client_lifetime":["1", "days"], "connect_timeout":["2", "minutes"], "emulate_httpd_log":["off"], "error_directory":["/usr/share/squid/errors/English"], "ftp_passive":["on"], "maximum_object_size":["4096", "KB"], "memory_replacement_policy":["heap GDSF"], "minimum_object_size":["0", "KB"]] +Return $["access_log":["/var/log/squid/access.log"], "cache_dir":["ufs", "/var/cache/squid", "100", "16", "256"], "cache_log":["/var/log/squid/cache.log"], "cache_mem":["80", "MB"], "cache_mgr":["webmaster"], "cache_replacement_policy":["lru"], "cache_store_log":["/var/log/squid/store.log"], "cache_swap_high":["95"], "cache_swap_low":["90"], "client_lifetime":["1", "days"], "connect_timeout":["2", "minutes"], "error_directory":["/usr/share/squid/errors/English"], "ftp_passive":["on"], "maximum_object_size":["4096", "KB"], "memory_replacement_policy":["heap GDSF"], "minimum_object_size":["0", "KB"]] Dump Dump GetSetting("cache_dir") Return ["ufs", "/var/cache/squid", "100", "16", "256"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.4/testsuite/tests/Squid.rb new/yast2-squid-3.1.4/testsuite/tests/Squid.rb --- old/yast2-squid-3.1.4/testsuite/tests/Squid.rb 2014-12-04 11:17:14.000000000 +0100 +++ new/yast2-squid-3.1.4/testsuite/tests/Squid.rb 2015-07-02 16:02:39.000000000 +0200 @@ -61,7 +61,6 @@ "cache_log" => [["/var/log/squid/cache.log"]], "cache_store_log" => [["/var/log/squid/store.log"]], "cache_swap_log" => [["none"]], - "emulate_httpd_log" => [["off"]], "connect_timeout" => [["2", "minutes"]], "client_lifetime" => [["1", "day"]], "error_directory" => [["/usr/share/squid/errors/English"]],
