October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41492 - /branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc
by sh-sh-sh＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: sh-sh-sh Date: Fri Oct 19 19:02:04 2007 New Revision: 41492 URL: http://svn.opensuse.org/viewcvs/yast?rev=41492&view=rev Log: fixed notify Modified: branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc Modified: branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSelect… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc Fri Oct 19 19:02:04 2007 @@ -69,11 +69,8 @@ connect( _qt_listBox, SIGNAL( doubleClicked( QListBoxItem * ) ), this, SLOT ( slotActivated( QListBoxItem * ) ) ); - if ( notify() ) - { - connect( &_timer, SIGNAL( timeout() ), - this, SLOT ( returnImmediately() ) ); - } + connect( &_timer, SIGNAL( timeout() ), + this, SLOT ( returnImmediately() ) ); } @@ -299,7 +296,7 @@ // Avoid overwriting a (more important) Activated event with a // SelectionChanged event - y2milestone( "sending selbox event" ); + y2debug( "sending selbox event" ); YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::SelectionChanged ) ); } } @@ -307,11 +304,10 @@ void YQSelectionBox::returnDelayed() { - y2milestone( "Starting selbox timer" ); + y2debug( "Starting selbox timer" ); _timer.start( 250, true ); // millisec, singleShot } - #include "YQSelectionBox.moc" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41491 - /branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui
by gs＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: gs Date: Fri Oct 19 18:10:32 2007 New Revision: 41491 URL: http://svn.opensuse.org/viewcvs/yast?rev=41491&view=rev Log: comment MenuButton Modified: branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Modified: branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/REA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui (original) +++ branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Fri Oct 19 18:10:32 2007 @@ -121,7 +121,8 @@ NCMenuButton/NCPopupMenu ------------------------ what about default button? -TODO: not yet ported completely! (only dummy rebuildMenuTree() added) +FIXME: not yet working correctly for submenus + only dummy rebuildMenuTree() added NCPkgPopupDiskspace ------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41490 - /branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc
by gs＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: gs Date: Fri Oct 19 18:09:47 2007 New Revision: 41490 URL: http://svn.opensuse.org/viewcvs/yast?rev=41490&view=rev Log: remove logging Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc Fri Oct 19 18:09:47 2007 @@ -73,7 +73,7 @@ NCursesEvent ret; switch ( ch ) { case KEY_RIGHT: - if ( menu->findItem(getCurrentItem()+1)->hasChildren() ) + if ( menu->findItem(getCurrentItem()+1 )->hasChildren() ) ret = NCursesEvent::button; break; case KEY_LEFT: @@ -103,7 +103,6 @@ : -1; YMenuItem * item = menu->findItem( selection + 1 ); - NCMIL << "Item: " << item->label() << endl; if ( !item ) return again; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41489 - in /branches/tmp/sh/mod-ui/ncurses/src: NCMenuButton.cc NCMenuButton.h NCPopupMenu.cc NCPopupMenu.h
by gs＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: gs Date: Fri Oct 19 17:57:36 2007 New Revision: 41489 URL: http://svn.opensuse.org/viewcvs/yast?rev=41489&view=rev Log: more fixes - but not yet working correctly Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.h branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCM… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc Fri Oct 19 17:57:36 2007 @@ -189,6 +189,7 @@ { wpos at( ScreenPos() + wpos( win->height(), 0 ) ); NCPopupMenu * dialog = new NCPopupMenu( at, + this, itemsBegin(), itemsEnd() ); YUI_CHECK_NEW( dialog ); @@ -202,8 +203,7 @@ NCursesEvent ret = NCursesEvent::menu; // FIXME - check this - dialog->setSelectedItem( findMenuItem( selection ) ); - YStringWidgetID * selectionID = new YStringWidgetID( dialog->selectedItem()->label() ); + YStringWidgetID * selectionID = new YStringWidgetID( findMenuItem( selection )->label() ); ret.selection = selectionID; YDialog::deleteTopmostDialog(); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCM… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.h Fri Oct 19 17:57:36 2007 @@ -75,6 +75,8 @@ virtual void setEnabled( bool do_bv ); + YMenuItem * findItem( int selection ) { return findMenuItem( selection ); } + virtual bool setKeyboardFocus() { if ( !grabFocus() ) return YWidget::setKeyboardFocus(); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc Fri Oct 19 17:57:36 2007 @@ -30,9 +30,9 @@ // // DESCRIPTION : // -NCPopupMenu::NCPopupMenu( const wpos at, YItemIterator begin, YItemIterator end ) +NCPopupMenu::NCPopupMenu( const wpos at, NCMenuButton * menuButton, YItemIterator begin, YItemIterator end ) : NCPopupTable( at ) - , _selectedItem( 0 ) + , menu( menuButton ) { vector<string> row( 2 ); createList( row ); @@ -73,8 +73,7 @@ NCursesEvent ret; switch ( ch ) { case KEY_RIGHT: - //if ( menu.itemList()[getCurrentItem()]->hasChildren() ) - if ( selectedItem()->hasChildren() ) + if ( menu->findItem(getCurrentItem()+1)->hasChildren() ) ret = NCursesEvent::button; break; case KEY_LEFT: @@ -103,13 +102,20 @@ int selection = ( postevent == NCursesEvent::button ) ? getCurrentItem() : -1; + YMenuItem * item = menu->findItem( selection + 1 ); + NCMIL << "Item: " << item->label() << endl; + + if ( !item ) + return again; + if ( selection != -1 ) { - if ( _selectedItem && _selectedItem->hasChildren() ) { + if ( item->hasChildren() ) { // post submenu wpos at( ScreenPos() + wpos( selection, inparent.Sze.W - 1 ) ); NCPopupMenu * dialog = new NCPopupMenu( at, - _selectedItem->childrenBegin(), - _selectedItem->childrenEnd() ); + menu, + item->childrenBegin(), + item->childrenEnd() ); YUI_CHECK_NEW( dialog ); again = (dialog->post( &postevent ) == NCursesEvent::CONTINUE); @@ -117,7 +123,7 @@ } else { // store selection //postevent.detail = menu.itemList()[selection]->getIndex(); - postevent.detail = _selectedItem->index(); + postevent.detail = item->index(); } } return again; Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h Fri Oct 19 17:57:36 2007 @@ -25,7 +25,7 @@ using namespace std; #include "NCPopupTable.h" - +#include "NCMenuButton.h" /////////////////////////////////////////////////////////////////// // @@ -40,7 +40,7 @@ private: - YMenuItem * _selectedItem; + NCMenuButton * menu; protected: @@ -49,12 +49,13 @@ public: - NCPopupMenu( const wpos at, YItemIterator begin, YItemIterator end ); + NCPopupMenu( const wpos at, + NCMenuButton * menu, + YItemIterator begin, + YItemIterator end); virtual ~NCPopupMenu(); - YMenuItem * selectedItem() { return _selectedItem; } - void setSelectedItem ( YMenuItem * item ) { _selectedItem = item; } }; /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41488 - /branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox2.ycp
by sh-sh-sh＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: sh-sh-sh Date: Fri Oct 19 16:00:23 2007 New Revision: 41488 URL: http://svn.opensuse.org/viewcvs/yast?rev=41488&view=rev Log: dump items to log Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox2.ycp Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox2.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/doc… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox2.ycp (original) +++ branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox2.ycp Fri Oct 19 16:00:23 2007 @@ -17,6 +17,9 @@ ); UI::UserInput(); + any items = UI::QueryWidget(`pizza, `Items); + y2debug( "Items:\n%1", items ); + // Get the input from the selection box. // // Notice: The return value of UI::UserInput() does NOT return this value! -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41487 - /tags/stable-2_16_0/squid/
by dfiser＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: dfiser Date: Fri Oct 19 13:50:27 2007 New Revision: 41487 URL: http://svn.opensuse.org/viewcvs/yast?rev=41487&view=rev Log: Created tag stable-2_16_0 for squid Added: tags/stable-2_16_0/squid/ - copied from r41486, trunk/squid/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41486 - in /trunk/squid: ./ agents/src/ package/ src/ testsuite/tests/
by dfiser＠svn.opensuse.org 19 Oct '07

19 Oct '07

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… ============================================================================== --- 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… ============================================================================== --- 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.change… ============================================================================== --- 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(a)suse.cz + +- 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(a)suse.cz - 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… ============================================================================== --- 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… ============================================================================== --- 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… ============================================================================== --- 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?… ============================================================================== --- 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?… ============================================================================== --- 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=41… ============================================================================== --- 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41485 - /branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc
by sh-sh-sh＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: sh-sh-sh Date: Fri Oct 19 13:25:03 2007 New Revision: 41485 URL: http://svn.opensuse.org/viewcvs/yast?rev=41485&view=rev Log: Reverted bubli's last change: Use virtual function that some derived classes override, not changing the item directly without telling the derived class about it. As the comment in that code block says, it's an exceptional case and an app error anyway if this code branch ever gets executed. But when it is, let's do it correctly. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc Fri Oct 19 13:25:03 2007 @@ -178,10 +178,10 @@ { //deselect old item oldSelectedItem->setSelected( false ); - //explicitely set a new item to selected state + //and inform parent widget that a new item has been selected //(i.e. override initial selection in construction like this: //`item(`id(1),"foo"), `item (`id(2), "bar, true) ) - item->setSelected( true ); + selectItem( item ); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41484 - in /trunk/s390: VERSION package/yast2-s390.changes src/zfcp/dialogs.ycp
by mzugec＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: mzugec Date: Fri Oct 19 13:12:55 2007 New Revision: 41484 URL: http://svn.opensuse.org/viewcvs/yast?rev=41484&view=rev Log: allow to select zfcp WWPN and LUN manually (#332690) Modified: trunk/s390/VERSION trunk/s390/package/yast2-s390.changes trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/VERSION?rev=41484&r1=41483&… ============================================================================== --- trunk/s390/VERSION (original) +++ trunk/s390/VERSION Fri Oct 19 13:12:55 2007 @@ -1 +1 @@ -2.15.1 +2.16.0 Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Fri Oct 19 13:12:55 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 19 13:13:17 CEST 2007 - mzugec(a)suse.de + +- allow to select zfcp WWPN and LUN manually (#332690) +- 2.16.0 + +------------------------------------------------------------------- Thu Aug 30 09:40:46 CEST 2007 - mzugec(a)suse.cz - zfcp discovery in add dialog (fate#300869) Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=41… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Oct 19 13:12:55 2007 @@ -292,15 +292,15 @@ `VSpacing (2), `HBox( // text entry - `ComboBox(`id(`wwpn), `opt(`hstretch), _("&WWPN"), + `ComboBox(`id(`wwpn), `opt(`hstretch, `editable), _("&WWPN"), [ ZFCPController::previous_settings["wwpn"]:"" ]), - `PushButton(`id(`get_wwpn), _("Get WWPN's")) + `PushButton(`id(`get_wwpn), _("Get WWPNs")) ), `VSpacing (2), `HBox( // text entry - `ComboBox(`id(`fcp_lun), _("&FCP-LUN"), [ fcp_lun ]), - `PushButton(`id(`get_lun), _("Get LUN's")) + `ComboBox(`id(`fcp_lun), `opt(`editable), _("&FCP-LUN"), [ fcp_lun ]), + `PushButton(`id(`get_lun), _("Get LUNs")) ), `VStretch () ), `HStretch ()); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41483 - /tags/stable-2_16_0/printer/
by mzugec＠svn.opensuse.org 19 Oct '07

19 Oct '07

Author: mzugec Date: Fri Oct 19 12:57:05 2007 New Revision: 41483 URL: http://svn.opensuse.org/viewcvs/yast?rev=41483&view=rev Log: Created tag stable-2_16_0 for printer Added: tags/stable-2_16_0/printer/ - copied from r41482, trunk/printer/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0