Mailinglist Archive: yast-commit (535 mails)

< Previous Next >
[yast-commit] r41486 - in /trunk/squid: ./ agents/src/ package/ src/ testsuite/tests/
  • From: dfiser@xxxxxxxxxxxxxxxx
  • Date: Fri, 19 Oct 2007 11:50:14 -0000
  • Message-id: <20071019115015.2D679266AA@xxxxxxxxxxxxxxxx>
Author: dfiser
Date: Fri Oct 19 13:50:14 2007
New Revision: 41486

URL: http://svn.opensuse.org/viewcvs/yast?rev=41486&view=rev
Log:
 - Modified testsuites and .spec.in file according to new SCR agent.
 - v2.16.0

Modified:
    trunk/squid/VERSION
    trunk/squid/agents/src/Makefile.am
    trunk/squid/package/yast2-squid.changes
    trunk/squid/src/Squid.ycp
    trunk/squid/testsuite/tests/Squid-Read.out
    trunk/squid/testsuite/tests/Squid-Read.ycp
    trunk/squid/testsuite/tests/Squid.out
    trunk/squid/testsuite/tests/Squid.ycp
    trunk/squid/yast2-squid.spec.in

Modified: trunk/squid/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/VERSION?rev=41486&r1=41485&r2=41486&view=diff
==============================================================================
--- trunk/squid/VERSION (original)
+++ trunk/squid/VERSION Fri Oct 19 13:50:14 2007
@@ -1 +1 @@
-2.15.5
+2.16.0

Modified: trunk/squid/agents/src/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/src/Makefile.am?rev=41486&r1=41485&r2=41486&view=diff
==============================================================================
--- trunk/squid/agents/src/Makefile.am (original)
+++ trunk/squid/agents/src/Makefile.am Fri Oct 19 13:50:14 2007
@@ -10,7 +10,8 @@
 liby2ag_squid_la_SOURCES =     \
        squid_agent.cpp squid_agent.h           \
        squid_parser.cpp squid_parser.h         \
-       squid_file.cpp squid_file.h
+       squid_file.cpp squid_file.h \
+    debug.h
 
 liby2ag_squid_la_LDFLAGS = -version-info 2:0
 liby2ag_squid_la_LIBADD = @AGENT_LIBADD@

Modified: trunk/squid/package/yast2-squid.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/package/yast2-squid.changes?rev=41486&r1=41485&r2=41486&view=diff
==============================================================================
--- trunk/squid/package/yast2-squid.changes (original)
+++ trunk/squid/package/yast2-squid.changes Fri Oct 19 13:50:14 2007
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Fri Oct 19 12:53:19 CEST 2007 - dfiser@xxxxxxx
+
+- Fixed problem with OpenFirewallWidget. (It did not open port on
+  firewall)
+- Created new SCR agent for squid.conf file.
+- v2.16.0
+
+-------------------------------------------------------------------
 Tue Sep 11 13:42:58 CEST 2007 - dfiser@xxxxxxx
 
 - Fixed bug in autoyast client (it did not write configuration to

Modified: trunk/squid/src/Squid.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=41486&r1=41485&r2=41486&view=diff
==============================================================================
--- trunk/squid/src/Squid.ycp (original)
+++ trunk/squid/src/Squid.ycp Fri Oct 19 13:50:14 2007
@@ -550,9 +550,9 @@
     foreach (string value, (list<string>)merge(format1, format2),
         {
             if (contains(available_options, value)){
-                foreach (string val, (list<string>)SCR::Read( add(squid_path, value)),
+                foreach (list<string> params, (list<list<string> >)SCR::Read( add(squid_path, value)),
                     {
-                        params = remove(split(val, " \t"), 0); // remove first param
+                        params = remove(params, 0); // remove first param
                         if (contains(format2, value)){ // if it is format 2 remove also second param
                             if (size(params) > 1){
                                 params = remove(params, 0);

Modified: trunk/squid/testsuite/tests/Squid-Read.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/testsuite/tests/Squid-Read.out?rev=41486&r1=41485&r2=41486&view=diff
==============================================================================
--- trunk/squid/testsuite/tests/Squid-Read.out (original)
+++ trunk/squid/testsuite/tests/Squid-Read.out Fri Oct 19 13:50:14 2007
@@ -1,76 +1,76 @@
 Dump   Squid::readHttpPorts()
-Read   .etc.squid."http_port" ["localhost:3128", "80 transparent"]
+Read   .etc.squid."http_port" [["localhost:3128"], ["80", "transparent"]]
 Return true
 Dump   Squid::http_ports
 Return [$["host":"localhost", "port":"3128"], $["host":"", "port":"80", "transparent":true]]
 Dump   ------------------------------
 Dump   Squid::readHttpAccesses()
-Read   .etc.squid."http_access" ["allow manager localhost", "deny manager", "deny !Safe_ports", "deny CONNECT  !SSL_ports", "allow localhost", "allow  localhost_public", "deny all"]
+Read   .etc.squid."http_access" [["allow", "manager", "localhost"], ["deny", "manager"], ["deny", "!Safe_ports"], ["deny", "CONNECT", "!SSL_ports"], ["allow", "localhost"], ["allow", "localhost_public"], ["deny", "all"]]
 Return true
 Dump   Squid::http_accesses
 Return [$["acl":["manager", "localhost"], "allow":true], $["acl":["manager"], "allow":false], $["acl":["!Safe_ports"], "allow":false], $["acl":["CONNECT", "!SSL_ports"], "allow":false], $["acl":["localhost"], "allow":true], $["acl":["localhost_public"], "allow":true], $["acl":["all"], "allow":false]]
 Dump   ------------------------------
 Dump   Squid::readRefreshPatterns()
-Read   .etc.squid."refresh_pattern" ["^ftp:\t\t1440\t20%\t10080", "-i ^gopher:\t1440\t0%\t1440", ".\t\t0\t20%\t4320"]
+Read   .etc.squid."refresh_pattern" [["^ftp:", "1440", "20%", "10080"], ["-i", "^gopher:", "1440", "0%", "1440"], [".", "0", "20%", "4320"]]
 Return true
 Dump   Squid::refresh_patterns
 Return [$["case_sensitive":true, "max":"10080", "min":"1440", "percent":"20", "regexp":"^ftp:"], $["case_sensitive":false, "max":"1440", "min":"1440", "percent":"0", "regexp":"^gopher:"], $["case_sensitive":true, "max":"4320", "min":"0", "percent":"20", "regexp":"."]]
 Dump   ------------------------------
 Dump   Squid::readACLs()
-Read   .etc.squid."acl" ["QUERY urlpath_regex cgi-bin \\?", "apache rep_header Server ^Apache", "all src 0.0.0.0/0.0.0.0", "manager proto cache_object", "localhost src  \t  \t 127.0.0.1/255.255.255.255", "localhost_public src 10.20.1.241/255.255.255.255", "to_localhost dst 127.0.0.0/8", "SSL_ports port  443", "Safe_ports port 80", "Safe_ports port 21", "Safe_ports port    443", "Safe_ports port 70", "Safe_ports port 210", "Safe_ports port 1025-65535", "Safe_ports port 280", "Safe_ports port 488", "Safe_ports port 591", "Safe_ports port 777", "CONNECT method CONNECT"]
+Read   .etc.squid."acl" [["QUERY", "urlpath_regex", "cgi-bin", "\\?"], ["apache", "rep_header", "Server", "^Apache"], ["all", "src", "0.0.0.0/0.0.0.0"], ["manager", "proto", "cache_object"], ["localhost", "src", "127.0.0.1/255.255.255.255"], ["localhost_public", "src", "10.20.1.241/255.255.255.255"], ["to_localhost", "dst", "127.0.0.0/8"], ["SSL_ports", "port", " 443"], ["Safe_ports", "port", "80"], ["Safe_ports", "port", "21"], ["Safe_ports", "port", "443"], ["Safe_ports", "port", "70"], ["Safe_ports", "port", "210"], ["Safe_ports", "port", "1025-65535"], ["Safe_ports", "port", "280"], ["Safe_ports", "port", "488"], ["Safe_ports", "port", "591"], ["Safe_ports", "port", "777"], ["CONNECT", "method", "CONNECT"]]
 Return true
 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"]]
+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   ------------------------------
 Dump   Squid::readRestSetting()
-Read   .etc.squid."access_log" ["/var/log/squid/access.log"]
-Read   .etc.squid."cache_dir" ["ufs /var/cache/squid 100 16 256"]
-Read   .etc.squid."cache_log" ["/var/log/squid/cache.log"]
-Read   .etc.squid."cache_mem" ["80 MB"]
-Read   .etc.squid."cache_mgr" ["webmaster"]
-Read   .etc.squid."cache_replacement_policy" ["lru"]
-Read   .etc.squid."cache_store_log" ["/var/log/squid/store.log"]
-Read   .etc.squid."cache_swap_high" ["95"]
-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"]
-Read   .etc.squid."memory_replacement_policy" ["heap GDSF"]
-Read   .etc.squid."minimum_object_size" ["0 KB"]
+Read   .etc.squid."access_log" [["/var/log/squid/access.log"]]
+Read   .etc.squid."cache_dir" [["ufs", "/var/cache/squid", "100", "16", "256"]]
+Read   .etc.squid."cache_log" [["/var/log/squid/cache.log"]]
+Read   .etc.squid."cache_mem" [["80", "MB"]]
+Read   .etc.squid."cache_mgr" [["webmaster"]]
+Read   .etc.squid."cache_replacement_policy" [["lru"]]
+Read   .etc.squid."cache_store_log" [["/var/log/squid/store.log"]]
+Read   .etc.squid."cache_swap_high" [["95"]]
+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"]]
+Read   .etc.squid."memory_replacement_policy" [["heap", "GDSF"]]
+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"]]
 Dump   ------------------------------
 Dump   Squid::Read()
-Read   .etc.squid."http_port" ["localhost:3128", "80 transparent"]
-Read   .etc.squid."refresh_pattern" ["^ftp:\t\t1440\t20%\t10080", "-i ^gopher:\t1440\t0%\t1440", ".\t\t0\t20%\t4320"]
-Read   .etc.squid."acl" ["QUERY urlpath_regex cgi-bin \\?", "apache rep_header Server ^Apache", "all src 0.0.0.0/0.0.0.0", "manager proto cache_object", "localhost src  \t  \t 127.0.0.1/255.255.255.255", "localhost_public src 10.20.1.241/255.255.255.255", "to_localhost dst 127.0.0.0/8", "SSL_ports port  443", "Safe_ports port 80", "Safe_ports port 21", "Safe_ports port    443", "Safe_ports port 70", "Safe_ports port 210", "Safe_ports port 1025-65535", "Safe_ports port 280", "Safe_ports port 488", "Safe_ports port 591", "Safe_ports port 777", "CONNECT method CONNECT"]
-Read   .etc.squid."http_access" ["allow manager localhost", "deny manager", "deny !Safe_ports", "deny CONNECT  !SSL_ports", "allow localhost", "allow  localhost_public", "deny all"]
-Read   .etc.squid."access_log" ["/var/log/squid/access.log"]
-Read   .etc.squid."cache_dir" ["ufs /var/cache/squid 100 16 256"]
-Read   .etc.squid."cache_log" ["/var/log/squid/cache.log"]
-Read   .etc.squid."cache_mem" ["80 MB"]
-Read   .etc.squid."cache_mgr" ["webmaster"]
-Read   .etc.squid."cache_replacement_policy" ["lru"]
-Read   .etc.squid."cache_store_log" ["/var/log/squid/store.log"]
-Read   .etc.squid."cache_swap_high" ["95"]
-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"]
-Read   .etc.squid."memory_replacement_policy" ["heap GDSF"]
-Read   .etc.squid."minimum_object_size" ["0 KB"]
+Read   .etc.squid."http_port" [["localhost:3128"], ["80", "transparent"]]
+Read   .etc.squid."refresh_pattern" [["^ftp:", "1440", "20%", "10080"], ["-i", "^gopher:", "1440", "0%", "1440"], [".", "0", "20%", "4320"]]
+Read   .etc.squid."acl" [["QUERY", "urlpath_regex", "cgi-bin", "\\?"], ["apache", "rep_header", "Server", "^Apache"], ["all", "src", "0.0.0.0/0.0.0.0"], ["manager", "proto", "cache_object"], ["localhost", "src", "127.0.0.1/255.255.255.255"], ["localhost_public", "src", "10.20.1.241/255.255.255.255"], ["to_localhost", "dst", "127.0.0.0/8"], ["SSL_ports", "port", " 443"], ["Safe_ports", "port", "80"], ["Safe_ports", "port", "21"], ["Safe_ports", "port", "443"], ["Safe_ports", "port", "70"], ["Safe_ports", "port", "210"], ["Safe_ports", "port", "1025-65535"], ["Safe_ports", "port", "280"], ["Safe_ports", "port", "488"], ["Safe_ports", "port", "591"], ["Safe_ports", "port", "777"], ["CONNECT", "method", "CONNECT"]]
+Read   .etc.squid."http_access" [["allow", "manager", "localhost"], ["deny", "manager"], ["deny", "!Safe_ports"], ["deny", "CONNECT", "!SSL_ports"], ["allow", "localhost"], ["allow", "localhost_public"], ["deny", "all"]]
+Read   .etc.squid."access_log" [["/var/log/squid/access.log"]]
+Read   .etc.squid."cache_dir" [["ufs", "/var/cache/squid", "100", "16", "256"]]
+Read   .etc.squid."cache_log" [["/var/log/squid/cache.log"]]
+Read   .etc.squid."cache_mem" [["80", "MB"]]
+Read   .etc.squid."cache_mgr" [["webmaster"]]
+Read   .etc.squid."cache_replacement_policy" [["lru"]]
+Read   .etc.squid."cache_store_log" [["/var/log/squid/store.log"]]
+Read   .etc.squid."cache_swap_high" [["95"]]
+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"]]
+Read   .etc.squid."memory_replacement_policy" [["heap", "GDSF"]]
+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"]]
 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"]]
+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
 Return [$["case_sensitive":true, "max":"10080", "min":"1440", "percent":"20", "regexp":"^ftp:"], $["case_sensitive":false, "max":"1440", "min":"1440", "percent":"0", "regexp":"^gopher:"], $["case_sensitive":true, "max":"4320", "min":"0", "percent":"20", "regexp":"."]]
 Dump   Squid::http_accesses
@@ -80,27 +80,27 @@
 Dump   ------------------------------
 Dump   ----testing defualt values----
 Dump   Squid:Read()
-Read   .etc.squid."http_port" ["localhost:3128", "80 transparent"]
-Read   .etc.squid."refresh_pattern" ["^ftp:\t\t1440\t20%\t10080", "-i ^gopher:\t1440\t0%\t1440", ".\t\t0\t20%\t4320"]
-Read   .etc.squid."acl" ["QUERY urlpath_regex cgi-bin \\?", "apache rep_header Server ^Apache", "all src 0.0.0.0/0.0.0.0", "manager proto cache_object", "localhost src  \t  \t 127.0.0.1/255.255.255.255", "localhost_public src 10.20.1.241/255.255.255.255", "to_localhost dst 127.0.0.0/8", "SSL_ports port  443", "Safe_ports port 80", "Safe_ports port 21", "Safe_ports port    443", "Safe_ports port 70", "Safe_ports port 210", "Safe_ports port 1025-65535", "Safe_ports port 280", "Safe_ports port 488", "Safe_ports port 591", "Safe_ports port 777", "CONNECT method CONNECT"]
-Read   .etc.squid."http_access" ["allow manager localhost", "deny manager", "deny !Safe_ports", "deny CONNECT  !SSL_ports", "allow localhost", "allow  localhost_public", "deny all"]
-Read   .etc.squid."access_log" ["/var/log/squid/access.log"]
-Read   .etc.squid."cache_dir" ["ufs /var/cache/squid 100 16 256"]
-Read   .etc.squid."cache_log" ["/var/log/squid/cache.log"]
+Read   .etc.squid."http_port" [["localhost:3128"], ["80", "transparent"]]
+Read   .etc.squid."refresh_pattern" [["^ftp:", "1440", "20%", "10080"], ["-i", "^gopher:", "1440", "0%", "1440"], [".", "0", "20%", "4320"]]
+Read   .etc.squid."acl" [["QUERY", "urlpath_regex", "cgi-bin", "\\?"], ["apache", "rep_header", "Server", "^Apache"], ["all", "src", "0.0.0.0/0.0.0.0"], ["manager", "proto", "cache_object"], ["localhost", "src", "127.0.0.1/255.255.255.255"], ["localhost_public", "src", "10.20.1.241/255.255.255.255"], ["to_localhost", "dst", "127.0.0.0/8"], ["SSL_ports", "port", " 443"], ["Safe_ports", "port", "80"], ["Safe_ports", "port", "21"], ["Safe_ports", "port", "443"], ["Safe_ports", "port", "70"], ["Safe_ports", "port", "210"], ["Safe_ports", "port", "1025-65535"], ["Safe_ports", "port", "280"], ["Safe_ports", "port", "488"], ["Safe_ports", "port", "591"], ["Safe_ports", "port", "777"], ["CONNECT", "method", "CONNECT"]]
+Read   .etc.squid."http_access" [["allow", "manager", "localhost"], ["deny", "manager"], ["deny", "!Safe_ports"], ["deny", "CONNECT", "!SSL_ports"], ["allow", "localhost"], ["allow", "localhost_public"], ["deny", "all"]]
+Read   .etc.squid."access_log" [["/var/log/squid/access.log"]]
+Read   .etc.squid."cache_dir" [["ufs", "/var/cache/squid", "100", "16", "256"]]
+Read   .etc.squid."cache_log" [["/var/log/squid/cache.log"]]
 Read   .etc.squid."cache_mem" nil
-Read   .etc.squid."cache_mgr" ["webmaster"]
-Read   .etc.squid."cache_replacement_policy" ["lru"]
-Read   .etc.squid."cache_store_log" ["/var/log/squid/store.log"]
-Read   .etc.squid."cache_swap_high" ["95"]
-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"]
+Read   .etc.squid."cache_mgr" [["webmaster"]]
+Read   .etc.squid."cache_replacement_policy" [["lru"]]
+Read   .etc.squid."cache_store_log" [["/var/log/squid/store.log"]]
+Read   .etc.squid."cache_swap_high" [["95"]]
+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"]]
 Read   .etc.squid."memory_replacement_policy" nil
-Read   .etc.squid."minimum_object_size" ["0 KB"]
+Read   .etc.squid."minimum_object_size" [["0", "KB"]]
 Return true
 Dump   Squid::settings["cache_mem"]:["1"] == Squid::parameters["cache_mem"]:["2"]
 Return true

Modified: trunk/squid/testsuite/tests/Squid-Read.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/testsuite/tests/Squid-Read.ycp?rev=41486&r1=41485&r2=41486&view=diff
==============================================================================
--- trunk/squid/testsuite/tests/Squid-Read.ycp (original)
+++ trunk/squid/testsuite/tests/Squid-Read.ycp Fri Oct 19 13:50:14 2007
@@ -4,58 +4,58 @@
 
 map READ = $[
     "squid" : $[
-        "http_port" : ["localhost:3128", "80 transparent"],
-        "acl" : ["QUERY urlpath_regex cgi-bin \\?",
-                 "apache rep_header Server ^Apache",
-                 "all src 0.0.0.0/0.0.0.0",
-                 "manager proto cache_object",
-                 "localhost src  \t  \t 127.0.0.1/255.255.255.255",
-                 "localhost_public src 10.20.1.241/255.255.255.255",
-                 "to_localhost dst 127.0.0.0/8",
-                 "SSL_ports port  443",
-                 "Safe_ports port 80",
-                 "Safe_ports port 21",
-                 "Safe_ports port    443",
-                 "Safe_ports port 70",
-                 "Safe_ports port 210",
-                 "Safe_ports port 1025-65535",
-                 "Safe_ports port 280",
-                 "Safe_ports port 488",
-                 "Safe_ports port 591",
-                 "Safe_ports port 777",
-                 "CONNECT method CONNECT"],
-        "http_access" : ["allow manager localhost",
-                         "deny manager",
-                         "deny !Safe_ports",
-                         "deny CONNECT  !SSL_ports",
-                         "allow localhost",
-                         "allow  localhost_public",
-                         "deny all"],
-       "refresh_pattern" : ["^ftp:\t\t1440\t20%\t10080",
-                            "-i ^gopher:\t1440\t0%\t1440",
-                            ".\t\t0\t20%\t4320"],
-
-       "cache_dir" : ["ufs /var/cache/squid 100 16 256"],
-       "cache_mem" : ["80 MB"],
-       "cache_swap_low" : ["90"],
-       "cache_swap_high" : ["95"],
-       "maximum_object_size" : ["4096 KB"],
-       "minimum_object_size" : ["0 KB"],
-       "cache_replacement_policy" : ["lru"],
-       "memory_replacement_policy" : ["heap GDSF"],
-
-       "access_log" : ["/var/log/squid/access.log"],
-       "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"],
-       "cache_mgr" : ["webmaster"],
-       "ftp_passive" : ["on"]
+        "http_port" : [["localhost:3128"], ["80", "transparent"]],
+        "acl" : [["QUERY", "urlpath_regex", "cgi-bin", "\\?"],
+                 ["apache", "rep_header", "Server", "^Apache"],
+                 ["all", "src", "0.0.0.0/0.0.0.0"],
+                 ["manager", "proto", "cache_object"],
+                 ["localhost", "src", "127.0.0.1/255.255.255.255"],
+                 ["localhost_public", "src", "10.20.1.241/255.255.255.255"],
+                 ["to_localhost", "dst", "127.0.0.0/8"],
+                 ["SSL_ports", "port", " 443"],
+                 ["Safe_ports", "port", "80"],
+                 ["Safe_ports", "port", "21"],
+                 ["Safe_ports", "port", "443"],
+                 ["Safe_ports", "port", "70"],
+                 ["Safe_ports", "port", "210"],
+                 ["Safe_ports", "port", "1025-65535"],
+                 ["Safe_ports", "port", "280"],
+                 ["Safe_ports", "port", "488"],
+                 ["Safe_ports", "port", "591"],
+                 ["Safe_ports", "port", "777"],
+                 ["CONNECT", "method", "CONNECT"]],
+        "http_access" : [["allow", "manager", "localhost"],
+                         ["deny", "manager"],
+                         ["deny", "!Safe_ports"],
+                         ["deny", "CONNECT", "!SSL_ports"],
+                         ["allow", "localhost"],
+                         ["allow", "localhost_public"],
+                         ["deny", "all"]],
+       "refresh_pattern" : [["^ftp:", "1440", "20%", "10080"],
+                            ["-i", "^gopher:", "1440", "0%", "1440"],
+                            [".", "0", "20%", "4320"]],
+
+       "cache_dir" : [["ufs", "/var/cache/squid", "100", "16", "256"]],
+       "cache_mem" : [["80", "MB"]],
+       "cache_swap_low" : [["90"]],
+       "cache_swap_high" : [["95"]],
+       "maximum_object_size" : [["4096", "KB"]],
+       "minimum_object_size" : [["0", "KB"]],
+       "cache_replacement_policy" : [["lru"]],
+       "memory_replacement_policy" : [["heap", "GDSF"]],
+
+       "access_log" : [["/var/log/squid/access.log"]],
+       "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"]],
+       "cache_mgr" : [["webmaster"]],
+       "ftp_passive" : [["on"]]
     ]
 ];
 READ = $["etc" : READ];

Modified: trunk/squid/testsuite/tests/Squid.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/testsuite/tests/Squid.out?rev=41486&r1=41485&r2=41486&view=diff
==============================================================================
--- trunk/squid/testsuite/tests/Squid.out (original)
+++ trunk/squid/testsuite/tests/Squid.out Fri Oct 19 13:50:14 2007
@@ -1,30 +1,30 @@
-Read   .etc.squid."http_port" ["localhost:3128", "80 transparent"]
-Read   .etc.squid."refresh_pattern" ["^ftp:\t\t1440\t20%\t10080", "-i ^gopher:\t1440\t0%\t1440", ".\t\t0\t20%\t4320"]
-Read   .etc.squid."acl" ["QUERY urlpath_regex cgi-bin \\?", "apache rep_header Server ^Apache", "all src 0.0.0.0/0.0.0.0", "manager proto cache_object", "localhost src  \t  \t 127.0.0.1/255.255.255.255", "localhost_public src 10.20.1.241/255.255.255.255", "to_localhost dst 127.0.0.0/8", "SSL_ports port  443", "Safe_ports port 80", "Safe_ports port 21", "Safe_ports port    443", "Safe_ports port 70", "Safe_ports port 210", "Safe_ports port 1025-65535", "Safe_ports port 280", "Safe_ports port 488", "Safe_ports port 591", "Safe_ports port 777", "CONNECT method CONNECT"]
-Read   .etc.squid."http_access" ["allow manager localhost", "deny manager", "deny !Safe_ports", "deny CONNECT  !SSL_ports", "allow localhost", "allow  localhost_public", "deny all"]
-Read   .etc.squid."access_log" ["/var/log/squid/access.log"]
-Read   .etc.squid."cache_dir" ["ufs /var/cache/squid 100 16 256"]
-Read   .etc.squid."cache_log" ["/var/log/squid/cache.log"]
-Read   .etc.squid."cache_mem" ["80 MB"]
-Read   .etc.squid."cache_mgr" ["webmaster"]
-Read   .etc.squid."cache_replacement_policy" ["lru"]
-Read   .etc.squid."cache_store_log" ["/var/log/squid/store.log"]
-Read   .etc.squid."cache_swap_high" ["95"]
-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"]
-Read   .etc.squid."memory_replacement_policy" ["heap GDSF"]
-Read   .etc.squid."minimum_object_size" ["0 KB"]
+Read   .etc.squid."http_port" [["localhost:3128"], ["80", "transparent"]]
+Read   .etc.squid."refresh_pattern" [["^ftp:", "1440", "20%", "10080"], ["-i", "^gopher:", "1440", "0%", "1440"], [".", "0", "20%", "4320"]]
+Read   .etc.squid."acl" [["QUERY", "urlpath_regex", "cgi-bin", "\\?"], ["apache", "rep_header", "Server", "^Apache"], ["all", "src", "0.0.0.0/0.0.0.0"], ["manager", "proto", "cache_object"], ["localhost", "src", "127.0.0.1/255.255.255.255"], ["localhost_public", "src", "10.20.1.241/255.255.255.255"], ["to_localhost", "dst", "127.0.0.0/8"], ["SSL_ports", "port", " 443"], ["Safe_ports", "port", "80"], ["Safe_ports", "port", "21"], ["Safe_ports", "port", "443"], ["Safe_ports", "port", "70"], ["Safe_ports", "port", "210"], ["Safe_ports", "port", "1025-65535"], ["Safe_ports", "port", "280"], ["Safe_ports", "port", "488"], ["Safe_ports", "port", "591"], ["Safe_ports", "port", "777"], ["CONNECT", "method", "CONNECT"]]
+Read   .etc.squid."http_access" [["allow", "manager", "localhost"], ["deny", "manager"], ["deny", "!Safe_ports"], ["deny", "CONNECT", "!SSL_ports"], ["allow", "localhost"], ["allow", "localhost_public"], ["deny", "all"]]
+Read   .etc.squid."access_log" [["/var/log/squid/access.log"]]
+Read   .etc.squid."cache_dir" [["ufs", "/var/cache/squid", "100", "16", "256"]]
+Read   .etc.squid."cache_log" [["/var/log/squid/cache.log"]]
+Read   .etc.squid."cache_mem" [["80", "MB"]]
+Read   .etc.squid."cache_mgr" [["webmaster"]]
+Read   .etc.squid."cache_replacement_policy" [["lru"]]
+Read   .etc.squid."cache_store_log" [["/var/log/squid/store.log"]]
+Read   .etc.squid."cache_swap_high" [["95"]]
+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"]]
+Read   .etc.squid."memory_replacement_policy" [["heap", "GDSF"]]
+Read   .etc.squid."minimum_object_size" [["0", "KB"]]
 Dump   ==================================================
 Dump   =====================  ACL  ======================
 Dump   ==================================================
 Dump   
 Dump   GetACLs()
-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"]]
+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   
 Dump   GetACL(0)
 Return $["name":"QUERY", "options":["cgi-bin \\?"], "type":"urlpath_regex"]
@@ -68,13 +68,13 @@
 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"]
-Read   .etc.squid."no_cache" ["deny QUERY"]
-Read   .etc.squid."access_log" ["/var/log/squid/access.log"]
+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"]
-Read   .etc.squid."no_cache" ["deny QUERY"]
-Read   .etc.squid."access_log" ["/var/log/squid/access.log"]
+Read   .etc.squid."no_cache" [["deny", "QUERY"]]
+Read   .etc.squid."access_log" [["/var/log/squid/access.log"]]
 Return ["http_access"]
 Dump   ==================================================
 Dump   ================  HTTP_ACCESS  ===================

Modified: trunk/squid/testsuite/tests/Squid.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/testsuite/tests/Squid.ycp?rev=41486&r1=41485&r2=41486&view=diff
==============================================================================
--- trunk/squid/testsuite/tests/Squid.ycp (original)
+++ trunk/squid/testsuite/tests/Squid.ycp Fri Oct 19 13:50:14 2007
@@ -4,60 +4,60 @@
 include "testsuite.ycp";
 map READ = $[
     "squid" : $[
-        "http_port" : ["localhost:3128", "80 transparent"],
-        "acl" : ["QUERY urlpath_regex cgi-bin \\?",
-                 "apache rep_header Server ^Apache",
-                 "all src 0.0.0.0/0.0.0.0",
-                 "manager proto cache_object",
-                 "localhost src  \t  \t 127.0.0.1/255.255.255.255",
-                 "localhost_public src 10.20.1.241/255.255.255.255",
-                 "to_localhost dst 127.0.0.0/8",
-                 "SSL_ports port  443",
-                 "Safe_ports port 80",
-                 "Safe_ports port 21",
-                 "Safe_ports port    443",
-                 "Safe_ports port 70",
-                 "Safe_ports port 210",
-                 "Safe_ports port 1025-65535",
-                 "Safe_ports port 280",
-                 "Safe_ports port 488",
-                 "Safe_ports port 591",
-                 "Safe_ports port 777",
-                 "CONNECT method CONNECT"],
-        "http_access" : ["allow manager localhost",
-                         "deny manager",
-                         "deny !Safe_ports",
-                         "deny CONNECT  !SSL_ports",
-                         "allow localhost",
-                         "allow  localhost_public",
-                         "deny all"],
-       "refresh_pattern" : ["^ftp:\t\t1440\t20%\t10080",
-                            "-i ^gopher:\t1440\t0%\t1440",
-                            ".\t\t0\t20%\t4320"],
-
-       "cache_dir" : ["ufs /var/cache/squid 100 16 256"],
-       "cache_mem" : ["80 MB"],
-       "cache_swap_low" : ["90"],
-       "cache_swap_high" : ["95"],
-       "maximum_object_size" : ["4096 KB"],
-       "minimum_object_size" : ["0 KB"],
-       "cache_replacement_policy" : ["lru"],
-       "memory_replacement_policy" : ["heap GDSF"],
-
-       "access_log" : ["/var/log/squid/access.log"],
-       "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"],
-       "cache_mgr" : ["webmaster"],
-       "ftp_passive" : ["on"],
+        "http_port" : [["localhost:3128"], ["80", "transparent"]],
+        "acl" : [["QUERY", "urlpath_regex", "cgi-bin", "\\?"],
+                 ["apache", "rep_header", "Server", "^Apache"],
+                 ["all", "src", "0.0.0.0/0.0.0.0"],
+                 ["manager", "proto", "cache_object"],
+                 ["localhost", "src", "127.0.0.1/255.255.255.255"],
+                 ["localhost_public", "src", "10.20.1.241/255.255.255.255"],
+                 ["to_localhost", "dst", "127.0.0.0/8"],
+                 ["SSL_ports", "port", " 443"],
+                 ["Safe_ports", "port", "80"],
+                 ["Safe_ports", "port", "21"],
+                 ["Safe_ports", "port", "443"],
+                 ["Safe_ports", "port", "70"],
+                 ["Safe_ports", "port", "210"],
+                 ["Safe_ports", "port", "1025-65535"],
+                 ["Safe_ports", "port", "280"],
+                 ["Safe_ports", "port", "488"],
+                 ["Safe_ports", "port", "591"],
+                 ["Safe_ports", "port", "777"],
+                 ["CONNECT", "method", "CONNECT"]],
+        "http_access" : [["allow", "manager", "localhost"],
+                         ["deny", "manager"],
+                         ["deny", "!Safe_ports"],
+                         ["deny", "CONNECT", "!SSL_ports"],
+                         ["allow", "localhost"],
+                         ["allow", "localhost_public"],
+                         ["deny", "all"]],
+       "refresh_pattern" : [["^ftp:", "1440", "20%", "10080"],
+                            ["-i", "^gopher:", "1440", "0%", "1440"],
+                            [".", "0", "20%", "4320"]],
+
+       "cache_dir" : [["ufs", "/var/cache/squid", "100", "16", "256"]],
+       "cache_mem" : [["80", "MB"]],
+       "cache_swap_low" : [["90"]],
+       "cache_swap_high" : [["95"]],
+       "maximum_object_size" : [["4096", "KB"]],
+       "minimum_object_size" : [["0", "KB"]],
+       "cache_replacement_policy" : [["lru"]],
+       "memory_replacement_policy" : [["heap", "GDSF"]],
+
+       "access_log" : [["/var/log/squid/access.log"]],
+       "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"]],
+       "cache_mgr" : [["webmaster"]],
+       "ftp_passive" : [["on"]],
 
-       "no_cache" : ["deny QUERY"]
+       "no_cache" : [["deny", "QUERY"]]
     ]
 ];
 READ = $["etc" : READ];

Modified: trunk/squid/yast2-squid.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/yast2-squid.spec.in?rev=41486&r1=41485&r2=41486&view=diff
==============================================================================
--- trunk/squid/yast2-squid.spec.in (original)
+++ trunk/squid/yast2-squid.spec.in Fri Oct 19 13:50:14 2007
@@ -1,10 +1,11 @@
 @HEADER-COMMENT@
 
 @HEADER@
-Requires:      yast2 filesystem
-BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-core-devel boost-devel
+Requires:      yast2 filesystem boost
+BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools
+BuildRequires: yast2-testsuite yast2-core-devel boost-devel gcc-c++
 
-BuildArchitectures:    noarch
+#BuildArchitectures:   noarch
 
 Summary:       Configuration of squid
 
@@ -16,6 +17,7 @@
 @BUILD@
 
 @INSTALL@
+rm -rf %{buildroot}/@plugindir@/libpy2ag_squid.la
 
 @CLEAN@
 
@@ -31,5 +33,7 @@
 @moduledir@/SquidErrorMessages.*
 @desktopdir@/squid.desktop
 @schemadir@/autoyast/rnc/squid.rnc
+
+@plugindir@/libpy2ag_squid.so*
 @scrconfdir@/*.scr
 %doc @docdir@

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages