October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52735 - /trunk/extra-packages
by jsuchome＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: jsuchome Date: Thu Oct 30 14:38:41 2008 New Revision: 52735 URL: http://svn.opensuse.org/viewcvs/yast?rev=52735&view=rev Log: yast2-fingerprint-reader is now using pam_fp instead of pam_thinkfinger Modified: trunk/extra-packages Modified: trunk/extra-packages URL: http://svn.opensuse.org/viewcvs/yast/trunk/extra-packages?rev=52735&r1=5273… ============================================================================== --- trunk/extra-packages (original) +++ trunk/extra-packages Thu Oct 30 14:38:41 2008 @@ -96,21 +96,21 @@ #if defined(__ia64__) yast2-ldap-client:pam_ldap-x86 yast2-ldap-client:nss_ldap-x86 -yast2-fingerprint-reader:pam_thinkfinger-x86 +yast2-fingerprint-reader:pam_fp-x86 yast2-kerberos-client:krb5-x86 yast2-kerberos-client:pam_krb5-x86 #endif #if defined(__powerpc64__) yast2-ldap-client:pam_ldap-64bit yast2-ldap-client:nss_ldap-64bit -yast2-fingerprint-reader:pam_thinkfinger-64bit +yast2-fingerprint-reader:pam_fp-64bit yast2-kerberos-client:krb5-64bit yast2-kerberos-client:pam_krb5-64bit #endif #if defined(__x86_64__) || defined(__s390x__) yast2-ldap-client:pam_ldap-32bit yast2-ldap-client:nss_ldap-32bit -yast2-fingerprint-reader:pam_thinkfinger-32bit +yast2-fingerprint-reader:pam_fp-32bit yast2-kerberos-client:krb5-32bit yast2-kerberos-client:pam_krb5-32bit #endif @@ -119,7 +119,7 @@ yast2-kerberos-client:krb5 yast2-kerberos-client:krb5-client yast2-kerberos-client:yast2-ntp-client -yast2-fingerprint-reader:pam_thinkfinger +yast2-fingerprint-reader:pam_fp yast2-tv:kdetv // if KDE yast2-tv:motv // plain X11 -- 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] r52734 - in /trunk/printer/src: Printer.ycp sharing.ycp
by jsmeix＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: jsmeix Date: Thu Oct 30 13:59:45 2008 New Revision: 52734 URL: http://svn.opensuse.org/viewcvs/yast?rev=52734&view=rev Log: Added Firewall Settings to the Share Printers dialog. Modified: trunk/printer/src/Printer.ycp trunk/printer/src/sharing.ycp Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=5273… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Thu Oct 30 13:59:45 2008 @@ -43,6 +43,7 @@ import "Mode"; import "Stage"; import "Service"; +import "SuSEFirewall"; /** * Prototypes @@ -222,6 +223,31 @@ */ global list< map< string, any > > driver_options = []; +/** + * Firewall configuration: + * Determined and set at runtime in the "Print via Network" and "Sharing" dialogs + * by calling Printer::FirewallConfig("read") and Printer::FirewallConfig("write") + * which calls SuSEFirewall functions to fill in the map @ref firewall_config + * except "ui_browsing_from_int", "ui_access_from_int", and "ui_deny_from_ext" + * which are the user settings in the dialog or change the SuSEFirewall settings + * according to "ui_browsing_from_int", "ui_access_from_int", and "ui_deny_from_ext". + * The entries are such that "true" is the default, reasonable and intended setting. + * In particular it is reasonable to deny CUPS Browsing packages (port 631 UDP) from the EXT zone + * to avoid "print job phishing" by announcing local queue names from a malicious external host, + * see http://www.cups.org/newsgroups.php?gcups.general+T+Q"print+job+phishing" + * @struct firewall_config + * $[ "suse_firewall_used":"true if Suse Firewall and no other firewall is used", + * "firewall_active":"true if Suse Firewall is actually running", + * "no_firewall_for_int":"true if Suse Firewall does not potect the INT zone", + * "browsing_from_int":"true if Suse Firewall does not deny CUPS Browsing (port 631 UDP) from the INT zone", + * "ui_browsing_from_int":"true if user has set in dialog not to deny CUPS Browsing from the INT zone", + * "access_from_int":"true if Suse Firewall does not deny CUPS access (port 631 TCP) from the INT zone", + * "ui_access_from_int":"true if user has set in dialog not to deny CUPS access from the INT zone", + * "deny_from_ext":"true if any CUPS access (port 631 UDP and TCP) is denied from the EXT zone", + * "ui_deny_from_ext":"true if user has set in dialog to deny any CUPS access from the EXT zone" + * ] + */ +global map< string, boolean > firewall_config = $[]; /* * Local variables: @@ -1768,6 +1794,198 @@ } /** + * Determined and set at runtime in the "Print via Network" and "Sharing" dialogs + * by calling Printer::FirewallConfig("read") and Printer::FirewallConfig("write") + * @param "read" to fill in the firewall_config map + * "write" change the SuSEFirewall settings according to the firewall_config map + * @return true on success + */ +global boolean FirewallConfig( string action ) +{ if( "read" == action ) + { // SuSEFirewall::Read shows a Progress. + // Save previous Progress state and disable showing Progress: + boolean progress_previous_state = Progress::set( false ); + if( ! SuSEFirewall::Read() ) + { // If firewall_config is the empty map, the user + // cannot change a firewall setting in the "Print via Network" and "Sharing" dialogs + // so that noting will be committed regarding the Suse Firewall. + y2milestone( "SuSEFirewall::Read failed." ); + firewall_config = $[]; + // Restore previous Progress state: + Progress::set( progress_previous_state ); + return true; + } + // Restore previous Progress state: + Progress::set( progress_previous_state ); + // Preset the firewall_config map with the defaults after a default system installation + // to have a reasonable fallback if the actual values cannot be determined: + firewall_config = $[ "suse_firewall_used":true, + "firewall_active":true, + "no_firewall_for_int":true, + "browsing_from_int":true, + "ui_browsing_from_int":true, + "access_from_int":true, + "ui_access_from_int":true, + "deny_from_ext":true, + "ui_deny_from_ext":true + ]; + // Determine whether the Suse Firewall is used: + if( SuSEFirewall::IsOtherFirewallRunning() ) + { // If not the Suse Firewall is used, the dialogs will not show + // any firewall settings and therefore the user cannot change them. + firewall_config["suse_firewall_used"] = false; + y2milestone( "Not the Suse Firewall is used, i.e. another firewall is running." ); + return true; + } + // Determine whether the Suse Firewall is active: + if( ! SuSEFirewall::IsStarted() + || ! SuSEFirewall::GetStartService() + ) + { // If the Suse Firewall is not active, the dialogs will not show + // any firewall settings because it is useless and confusing + // to let the user change firewall settings + // when the user had decided to have no firewall currently running + // or if the firewall would not be started in SuSEFirewall::Write() + firewall_config["firewall_active"] = false; + y2milestone( "The Suse Firewall is not active or would not be started in SuSEFirewall::Write." ); + return true; + } + // Determine the actual settings regarding IPP (port 631 UDB and TCP) + // and preset the user interface settings with the actual settings: + if( SuSEFirewall::GetProtectFromInternalZone() ) + { firewall_config["no_firewall_for_int"] = false; + if( ! SuSEFirewall::HaveService( "631", "UDP", "INT" ) ) + { firewall_config["browsing_from_int"] = false; + firewall_config["ui_browsing_from_int"] = false; + } + if( ! SuSEFirewall::HaveService( "631", "TCP", "INT" ) ) + { firewall_config["access_from_int"] = false; + firewall_config["ui_access_from_int"] = false; + } + } + if( SuSEFirewall::HaveService( "631", "TCP", "EXT" ) + || SuSEFirewall::HaveService( "631", "UDP", "EXT" ) + ) + { firewall_config["deny_from_ext"] = false; + firewall_config["ui_deny_from_ext"] = false; + } + y2milestone( "FirewallConfig read result: %1", firewall_config ); + } + if( "write" == action ) + { y2milestone( "FirewallConfig write using: %1", firewall_config ); + // If the Suse Firewall is used and + // if the Suse Firewall is active and + // if firewall settings have been changed by the user, + // then set and commit the new firewall settings. + // Use safe fallback values (i.e. deny access as fallback). + // Those fallback values makes the code look confusing + // for example in conditions like if(firewall_config["..."]:false) + // because the actual value is often the opposite of the fallback value. + if( firewall_config["suse_firewall_used"]:false + && firewall_config["firewall_active"]:false + && ( firewall_config["ui_browsing_from_int"]:false != firewall_config["browsing_from_int"]:true + || firewall_config["ui_access_from_int"]:false != firewall_config["access_from_int"]:true + || firewall_config["ui_deny_from_ext"]:false != firewall_config["deny_from_ext"]:true + ) + ) + { // Set new firewall settings in SuSEFirewall: + boolean write_firewall_settings_failed = false; + y2milestone( "FirewallConfig commit new firewall config: %1", firewall_config ); + if( firewall_config["ui_browsing_from_int"]:false != firewall_config["browsing_from_int"]:true ) + { if( firewall_config["ui_browsing_from_int"]:false ) + { // The user has set in dialog not to deny CUPS Browsing from the INT zone: + if( ! firewall_config["no_firewall_for_int"]:true ) + { // The Suse Firewall does potect the INT zone: + if( ! SuSEFirewall::AddService( "631", "UDP", "INT" ) ) + { y2milestone( "FirewallConfig: SuSEFirewall::AddService(631,UDP,INT) failed." ); + write_firewall_settings_failed = true; + } + } + } + else + { // The user has set in dialog to deny CUPS Browsing from the INT zone: + if( ! firewall_config["no_firewall_for_int"]:true ) + { // The Suse Firewall does potect the INT zone: + if( ! SuSEFirewall::RemoveService( "631", "UDP", "INT" ) ) + { y2milestone( "FirewallConfig: SuSEFirewall::RemoveService(631,UDP,INT) failed." ); + write_firewall_settings_failed = true; + } + } + else + { // The Suse Firewall does not potect the INT zone: + y2milestone( "FirewallConfig: Cannot deny CUPS Browsing from the INT zone because the Suse Firewall does not potect the INT zone." ); + write_firewall_settings_failed = true; + } + } + } + if( firewall_config["ui_access_from_int"]:false != firewall_config["access_from_int"]:true ) + { if( firewall_config["ui_access_from_int"]:false ) + { // The user has set in dialog not to deny CUPS access from the INT zone: + if( ! firewall_config["no_firewall_for_int"]:true ) + { // The Suse Firewall does potect the INT zone: + if( ! SuSEFirewall::AddService( "631", "TCP", "INT" ) ) + { y2milestone( "FirewallConfig: SuSEFirewall::AddService(631,TCP,INT) failed." ); + write_firewall_settings_failed = true; + } + } + } + else + { // The user has set in dialog to deny CUPS access from the INT zone: + if( ! firewall_config["no_firewall_for_int"]:true ) + { // The Suse Firewall does potect the INT zone: + if( ! SuSEFirewall::RemoveService( "631", "TCP", "INT" ) ) + { y2milestone( "FirewallConfig: SuSEFirewall::RemoveService(631,TCP,INT) failed." ); + write_firewall_settings_failed = true; + } + } + else + { // The Suse Firewall does not potect the INT zone: + y2milestone( "FirewallConfig: Cannot deny CUPS access from the INT zone because the Suse Firewall does not potect the INT zone." ); + write_firewall_settings_failed = true; + } + } + } + if( firewall_config["ui_deny_from_ext"]:false != firewall_config["deny_from_ext"]:true ) + { if( firewall_config["ui_deny_from_ext"]:false ) + { // The user has set in dialog to deny any CUPS access from the EXT zone: + if( ! SuSEFirewall::RemoveService( "631", "TCP", "EXT" ) ) + { y2milestone( "FirewallConfig: SuSEFirewall::RemoveService(631,TCP,EXT) failed." ); + write_firewall_settings_failed = true; + } + if( ! SuSEFirewall::RemoveService( "631", "UDP", "EXT" ) ) + { y2milestone( "FirewallConfig: SuSEFirewall::RemoveService(631,UDP,EXT) failed." ); + write_firewall_settings_failed = true; + } + } + else + { // The user has set in dialog not to deny deny any CUPS access from the EXT zone: + y2milestone( "FirewallConfig: Ignored to allow CUPS access from the EXT zone because it is insecure." ); + write_firewall_settings_failed = true; + } + } + // Commit the new firewall settings: + // SuSEFirewall::Write shows a Progress. + // Save previous Progress state and disable showing Progress: + boolean progress_previous_state = Progress::set( false ); + if( ! SuSEFirewall::Write() ) + { y2milestone( "FirewallConfig: SuSEFirewall::Write failed to commit firewall settings." ); + write_firewall_settings_failed = true; + } + // Restore previous Progress state: + Progress::set( progress_previous_state ); + if( write_firewall_settings_failed ) + { Popup::Error( // Message of a Popup::Error. + // Only a simple message because this error does not happen on a normal system. + _("Failed to set up the firewall settings.\nUse the specific YaST Firewall module.") + ); + return false; + } + } + } + return true; +} + +/** * Get all printer settings from the first parameter * (For use by autoinstallation.) * @param settings The YCP structure to be imported. Modified: trunk/printer/src/sharing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/sharing.ycp?rev=5273… ============================================================================== --- trunk/printer/src/sharing.ycp (original) +++ trunk/printer/src/sharing.ycp Thu Oct 30 13:59:45 2008 @@ -49,6 +49,8 @@ list< term > initial_interface_table_items = []; string initial_allow_input_value = ""; string initial_browse_address_input_value = ""; +boolean firewall_first_widget_is_checkbox = false; +boolean firewall_second_widget_is_checkbox = false; term widgetSharing = `VBox ( `VSpacing( 1 ), @@ -195,6 +197,35 @@ ) ) ), + `VSpacing( 1 ), + `Left + ( `Label + ( `id(`firewall_settings_label), + // A caption to make Firewall settings to allow remote access to CUPS: + _("Firewall Settings") + ) + ), + `HBox + ( `HSpacing( 2 ), + `VBox + ( `Left + ( `ReplacePoint + ( `id(`firewall_first_replace_point), + `Empty + ( `id(`firewall_first_widget) + ) + ) + ), + `Left + ( `ReplacePoint + ( `id(`firewall_second_replace_point), + `Empty + ( `id(`firewall_second_widget) + ) + ) + ) + ) + ), `VSpacing( 1 ) ); @@ -246,6 +277,30 @@ boolean ApplySharingSettings() { sharing_has_changed = false; + // Do the Firewall stuff first of all: + boolean firewall_allow_from_int = true; + boolean firewall_deny_from_ext = true; + if( firewall_first_widget_is_checkbox ) + { firewall_allow_from_int = (boolean)UI::QueryWidget( `firewall_first_widget, `Value ); + y2milestone( "firewall_allow_from_int value: '%1'", firewall_allow_from_int ); + Printer::firewall_config["ui_access_from_int"] = firewall_allow_from_int; + } + if( firewall_second_widget_is_checkbox ) + { firewall_deny_from_ext = (boolean)UI::QueryWidget( `firewall_second_widget, `Value ); + y2milestone( "firewall_deny_from_ext value: '%1'", firewall_deny_from_ext ); + Printer::firewall_config["ui_deny_from_ext"] = firewall_deny_from_ext; + } + if( Printer::firewall_config["access_from_int"]:false != firewall_allow_from_int + || Printer::firewall_config["deny_from_ext"]:false != firewall_deny_from_ext + ) + { // The user has changed a Firewall setting: + sharing_has_changed = true; + if( ! Printer::FirewallConfig( "write" ) ) + { // No error message here because Printer::FirewallConfig shows already error messages: + return false; + } + } + // Do the CUPS sharing stuff after the Firewall stuff. // Get the actual settings and values from the dialog. // It does not work well to query the RadioButtonGroup with something like // UI::QueryWidget(`deny_or_allow_remote_access,`CurrentButton)) @@ -542,6 +597,9 @@ UI::ChangeWidget( `allow_input_label, `Enabled, false ); UI::ChangeWidget( `browse_address_input, `Enabled, false ); UI::ChangeWidget( `browse_address_input_label, `Enabled, false ); + UI::ChangeWidget( `firewall_settings_label, `Enabled, false ); + UI::ChangeWidget( `firewall_first_widget, `Enabled, false ); + UI::ChangeWidget( `firewall_second_widget, `Enabled, false ); } // Regardless whether or not the "Share Printers" dialog is useless, // fill in the values of the current settings in the system: @@ -748,6 +806,95 @@ UI::ChangeWidget( `id(`allow_input), `Value, initial_allow_input_value ); y2milestone( "Initial initial_browse_address_input_value: %1", initial_browse_address_input_value ); UI::ChangeWidget( `id(`browse_address_input), `Value, initial_browse_address_input_value ); + y2milestone( "Initial browse_address_values: %1", browse_address_values ); + // Determine the Firewall settings. + // Ignore errors because Printer::FirewallConfig results a firewall_config fallback map. + Printer::FirewallConfig( "read" ); + // Set the content and values for the firewall related widgets in the dialog: + if( ! Printer::firewall_config["suse_firewall_used"]:true ) + { // Not the Suse Firewall but another firewall is used: + UI::ReplaceWidget( `firewall_first_replace_point, + `Label + ( `id(`firewall_first_widget), + // Label when not the Suse Firewall but another firewall is used: + _("Not the Suse Firewall but another firewall is used") + ) + ); + UI::ReplaceWidget( `firewall_second_replace_point, + `Empty + ( `id(`firewall_second_widget) + ) + ); + } + else + { // The Suse Firewall is used: + if( ! Printer::firewall_config["firewall_active"]:true ) + { // The Suse Firewall is not running: + UI::ReplaceWidget( `firewall_first_replace_point, + `Label + ( `id(`firewall_first_widget), + // Label when the Suse Firewall is not running: + _("The Suse Firewall is not active") + ) + ); + UI::ReplaceWidget( `firewall_second_replace_point, + `Empty + ( `id(`firewall_second_widget) + ) + ); + } + else + { // The Suse Firewall is running: + if( ! Printer::firewall_config["no_firewall_for_int"]:true ) + { // The Suse Firewall does potect the INT zone: + // Let the user deny or allow CUPS access from the INT zone here: + UI::ReplaceWidget( `firewall_first_replace_point, + `CheckBox + ( `id(`firewall_first_widget), + // CheckBox whether or not the Suse Firewall allows CUPS access from the INT zone: + _("Allow access from the internal network zone"), + Printer::firewall_config["access_from_int"]:true + ) + ); + firewall_first_widget_is_checkbox = true; + } + else + { // The Suse Firewall does not potect the INT zone: + UI::ReplaceWidget( `firewall_first_replace_point, + `Label + ( `id(`firewall_first_widget), + // Label when the Suse Firewall does not potect the internal network zone + // which means that CUPS access from the INT zone is allowed: + _("Access from the internal network zone is allowed") + ) + ); + } + if( ! Printer::firewall_config["deny_from_ext"]:true ) + { // The Suse Firewall does not deny CUPS access from the EXT zone. + // Let the user deny CUPS access from the EXT zone here: + UI::ReplaceWidget( `firewall_second_replace_point, + `CheckBox + ( `id(`firewall_second_widget), + // CheckBox whether or not the Suse Firewall denies CUPS access from the EXT zone: + _("Deny access from the external network zone"), + false + ) + ); + firewall_second_widget_is_checkbox = true; + } + else + { // The Suse Firewall denies CUPS access from the EXT zone. + // Do not let the user allow CUPS access from the EXT zone here: + UI::ReplaceWidget( `firewall_second_replace_point, + `Label + ( `id(`firewall_second_widget), + // Label when the Suse Firewall denies CUPS access from the external network zone: + _("Access from the external network zone is denied") + ) + ); + } + } + } y2milestone( "leaving initSharing" ); } -- 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] r52733 - /tags/stable-2_17_10/online-update/
by locilka＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: locilka Date: Thu Oct 30 13:59:05 2008 New Revision: 52733 URL: http://svn.opensuse.org/viewcvs/yast?rev=52733&view=rev Log: Created tag stable-2_17_10 for online-update Added: tags/stable-2_17_10/online-update/ - copied from r52732, trunk/online-update/ -- 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] r52732 - in /trunk/online-update: VERSION package/yast2-online-update.changes yast2-online-update.spec.in
by locilka＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: locilka Date: Thu Oct 30 13:52:18 2008 New Revision: 52732 URL: http://svn.opensuse.org/viewcvs/yast?rev=52732&view=rev Log: - Fixed 'Conflicts with yast2-wagon' (bnc #439934). - 2.17.10 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/yast2-online-update.spec.in Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=52732&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Thu Oct 30 13:52:18 2008 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Thu Oct 30 13:52:18 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 30 13:50:48 CET 2008 - locilka(a)suse.cz + +- Fixed 'Conflicts with yast2-wagon' (bnc #439934). +- 2.17.10 + +------------------------------------------------------------------- Wed Oct 22 15:26:51 CEST 2008 - locilka(a)suse.cz - PatchCD control file moved to yast2-wagon. Modified: trunk/online-update/yast2-online-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/yast2-online-updat… ============================================================================== --- trunk/online-update/yast2-online-update.spec.in (original) +++ trunk/online-update/yast2-online-update.spec.in Thu Oct 30 13:52:18 2008 @@ -16,9 +16,6 @@ Obsoletes: yast2-trans-online-update y2t_online_update BuildArchitectures: noarch -# PatchCD desktop file moved to yast2-wagon -Conflicts: yast2-wagon >= 2.17.3 - Summary: YaST2 online update %description @@ -48,6 +45,9 @@ Requires: yast2-online-update Group: System/YaST +# PatchCD desktop file moved to yast2-wagon +Conflicts: yast2-wagon <= 2.17.3 + %description frontend - -- 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] r52731 - /tags/stable-2_17_48/network/
by mzugec＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: mzugec Date: Thu Oct 30 12:19:35 2008 New Revision: 52731 URL: http://svn.opensuse.org/viewcvs/yast?rev=52731&view=rev Log: Created tag stable-2_17_48 for network Added: tags/stable-2_17_48/network/ - copied from r52730, trunk/network/ -- 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] r52730 - /tags/stable-2_17_48/
by mzugec＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: mzugec Date: Thu Oct 30 12:19:28 2008 New Revision: 52730 URL: http://svn.opensuse.org/viewcvs/yast?rev=52730&view=rev Log: Created tag stable-2_17_48 Added: tags/stable-2_17_48/ -- 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] r52729 - in /trunk/network: VERSION package/yast2-network.changes src/modules/Lan.ycp src/modules/NetHwDetection.ycp
by mzugec＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: mzugec Date: Thu Oct 30 12:19:20 2008 New Revision: 52729 URL: http://svn.opensuse.org/viewcvs/yast?rev=52729&view=rev Log: for bridged proposal skip devices with no ifcfg (bnc#440132) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Lan.ycp trunk/network/src/modules/NetHwDetection.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=52729&r1=527… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Oct 30 12:19:20 2008 @@ -1 +1 @@ -2.17.47 +2.17.48 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Oct 30 12:19:20 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 30 10:38:26 CET 2008 - mzugec(a)suse.de + +- for bridged proposal skip devices with no ifcfg (bnc#440132) +- 2.14.48 + +------------------------------------------------------------------- Thu Oct 30 10:32:12 CET 2008 - mzugec(a)suse.de - address dialog layout (bnc#439100) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Thu Oct 30 12:19:20 2008 @@ -780,27 +780,29 @@ // and add old device name into bridge_ports foreach(integer current, any config, LanItems::Items, { string ifcfg = LanItems::Items[current, "ifcfg"]:""; - if (! (NetworkInterfaces::GetType(ifcfg)=="br")){ - NetworkInterfaces::Edit(ifcfg); - string new_ifcfg = sformat("br%1", NetworkInterfaces::GetFreeDevice("br")); - y2milestone("old configuration %1, bridge %2", ifcfg, new_ifcfg); - NetworkInterfaces::Name = new_ifcfg; - NetworkInterfaces::Current["BRIDGE"]="yes"; - NetworkInterfaces::Current["BRIDGE_PORTS"]=ifcfg; - // remove description - will be replaced by new (real) one - NetworkInterfaces::Current=remove(NetworkInterfaces::Current, "NAME"); - if( NetworkInterfaces::Commit() ){ - NetworkInterfaces::Delete(ifcfg); - NetworkInterfaces::Commit(); - - LanItems::Items[current, "ifcfg"] = new_ifcfg; - LanItems::modified=true; - LanItems::force_restart=true; - y2internal("List %1", NetworkInterfaces::List("")); - // re-read configuration to see new items in UI - LanItems::Read(); - } else y2error("error while proposing bridge device for %1", ifcfg); - } else y2internal("skipping bridge ..."); + if (size(ifcfg)>0){ + if (! (NetworkInterfaces::GetType(ifcfg)=="br")){ + NetworkInterfaces::Edit(ifcfg); + string new_ifcfg = sformat("br%1", NetworkInterfaces::GetFreeDevice("br")); + y2milestone("old configuration %1, bridge %2", ifcfg, new_ifcfg); + NetworkInterfaces::Name = new_ifcfg; + NetworkInterfaces::Current["BRIDGE"]="yes"; + NetworkInterfaces::Current["BRIDGE_PORTS"]=ifcfg; + // remove description - will be replaced by new (real) one + NetworkInterfaces::Current=remove(NetworkInterfaces::Current, "NAME"); + if( NetworkInterfaces::Commit() ){ + NetworkInterfaces::Delete(ifcfg); + NetworkInterfaces::Commit(); + + LanItems::Items[current, "ifcfg"] = new_ifcfg; + LanItems::modified=true; + LanItems::force_restart=true; + y2internal("List %1", NetworkInterfaces::List("")); + // re-read configuration to see new items in UI + LanItems::Read(); + } else y2error("error while proposing bridge device for %1", ifcfg); + } else y2internal("skipping bridge ..."); + } else y2warning("empty ifcfg"); }); } else { Modified: trunk/network/src/modules/NetHwDetection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/NetHwDetecti… ============================================================================== --- trunk/network/src/modules/NetHwDetection.ycp (original) +++ trunk/network/src/modules/NetHwDetection.ycp Thu Oct 30 12:19:20 2008 @@ -126,7 +126,7 @@ // { y2milestone("Setting link up for interface %1", ifc); SCR::Execute(.target.bash, sformat("ip link set %1 up", ifc)); -// } else y2milestone("Link for %1 interface is already up, do nothing", ifc); +// } else y2milestone("Link for %1 interface is already up, nothing to do", ifc); }); } else y2error("Error while execute %1 : %2", command, output); -- 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] r52728 - in /trunk/storage/storage/src: include/partition_defines.ycp inst_custom_part.ycp
by aschnell＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: aschnell Date: Thu Oct 30 11:56:43 2008 New Revision: 52728 URL: http://svn.opensuse.org/viewcvs/yast?rev=52728&view=rev Log: - removed two obsolete functions Modified: trunk/storage/storage/src/include/partition_defines.ycp trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/include/partition_defines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/part… ============================================================================== --- trunk/storage/storage/src/include/partition_defines.ycp (original) +++ trunk/storage/storage/src/include/partition_defines.ycp Thu Oct 30 11:56:43 2008 @@ -116,26 +116,6 @@ }; -/*--------------------------------------------------------------------- - * Convert <number-of-bytes> to XXX.X MB or XXX.X GB or XXX.X TB - * - * see also ByteToHumanStringWithZero ! - * Return value: string "unknown" if input == 0 - *---------------------------------------------------------------------- - * TODO: remove - */ -string ByteToHumanString(integer number) -{ - if (number == 0) - { - // column description, if disk space is not known - return _("unknown"); - } - - return String::FormatSizeWithPrecision(number, 2, false); -}; - - /*--------------------------------------------------------------------- * get a list of not used mountpoints *------------------------------------ @@ -169,29 +149,6 @@ }; -/*--------------------------------------------------------------------- - * Convert <number-of-bytes> to XXX.X MB or XXX.X GB or XXX.X TB - * - * see also ByteToHumanString ! - * Return value: string "0" if input == 0 - *---------------------------------------------------------------------- - * TODO: remove - */ -/* -string ByteToHumanStringWithZero(integer number) -{ - if (number == 0) - { - // label text, short for Megabyte (MB) - return "0 " + _("MB"); - } - else - { - return ByteToHumanString(number); - } -}; -*/ - //////////////////////////////////////////////////////////////////////// // input: // win_size_f: new size of wimdows partion in bytes as float Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Thu Oct 30 11:56:43 2008 @@ -878,7 +878,7 @@ Use the maximum allowed value? "), int_end_cyl, disk["label"]:"", - ByteToHumanString(Storage::MaxSizeLabelK( disk )*1024), + Storage::KByteToHumanString(Storage::MaxSizeLabelK(disk)), max_cyl ); boolean ans = Popup::YesNo( text ); -- 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] r52727 - in /trunk/storage/storage/src/include: custom_part_lib.ycp ep-dialogs.ycp ep-hd-dialogs.ycp
by aschnell＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: aschnell Date: Thu Oct 30 11:37:12 2008 New Revision: 52727 URL: http://svn.opensuse.org/viewcvs/yast?rev=52727&view=rev Log: - check minimal size of volume for file system Modified: trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/include/ep-hd-dialogs.ycp Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Thu Oct 30 11:37:12 2008 @@ -469,45 +469,29 @@ } -define boolean check_ok_fssize( integer siz, map part ) - ``{ +boolean +check_ok_fssize(integer size_k, map volume) +{ boolean ret = true; - if( part["format"]:false ) - { - symbol fs = part["used_fs"]:`unknown; - integer min_size = FileSystems::MinFsSizeK( fs ) * 1024; - y2milestone( "check_ok_fssize fs:%1 size:%2", fs, min_size ); - if( fs==`reiser && siz<min_size ) - { - // popup text - Popup::Warning(_("Your partition is too small to use ReiserFS. -ReiserFS is a journaling file system that requires -at least 30 MB space for the journal alone. -Use ReiserFS on larger partitions. -")); - ret = false; - } - else if( fs==`jfs && siz<min_size ) - { - Popup::Warning(_("Your partition is too small to use JFS. -JFS is a journaling file system that requires -at least 16 MB space for the journal alone. -Use JFS on larger partitions. -")); - ret = false; - } - else if( fs!=`unknown && siz<min_size ) - { - // warning message, %1 is replaced by fs name (e.g. Ext3) - // %2 is prelaced by a size (e.g. 10 MB) - Popup::Warning(sformat(_("Your partition is too small to use %1. + + symbol fs = volume["used_fs"]:`unknown; + integer min_size_k = FileSystems::MinFsSizeK(fs); + y2milestone("check_ok_fssize fs:%1 size_k:%2 min_size_k:%3", fs, size_k, min_size_k); + + if (size_k < min_size_k) + { + // warning message, %1 is replaced by fs name (e.g. Ext3) + // %2 is prelaced by a size (e.g. 10 MB) + Popup::Warning(sformat(_("Your partition is too small to use %1. The minimum size for this file system is %2. -"), FileSystems::GetName(fs,""), Storage::ByteToHumanString(min_size) )); - ret = false; - } - } - return( ret ); - }; +"), FileSystems::GetName(fs, ""), Storage::KByteToHumanString(min_size_k))); + + ret = false; + } + + return ret; +} + /** * Do all checks concerning mount points, uuid, volume labels and Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Thu Oct 30 11:37:12 2008 @@ -302,7 +302,17 @@ { if (ret_mp["field"]:`none != `none) UI::SetFocus(`id(ret_mp["field"]:`none)); + widget = `again; + continue; + } + } + + if (do_format) + { + if (!check_ok_fssize(data["size_k"]:0, data)) + { widget = `again; + continue; } } Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Thu Oct 30 11:37:12 2008 @@ -247,6 +247,8 @@ } } + data["size_k"] = Region::Length(data["region"]:[0, 0]) * cyl_size / 1024; + if (data["type"]:`unknown == `extended) { widget = `finish; -- 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] r52726 - in /trunk/qt: package/yast2-qt.changes src/YQBusyIndicator.cc src/YQBusyIndicator.h
by tgoettlicher＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: tgoettlicher Date: Thu Oct 30 11:28:24 2008 New Revision: 52726 URL: http://svn.opensuse.org/viewcvs/yast?rev=52726&view=rev Log: Fixed QPainter warnings in YQBusyIndicator Modified: trunk/qt/package/yast2-qt.changes trunk/qt/src/YQBusyIndicator.cc trunk/qt/src/YQBusyIndicator.h Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Thu Oct 30 11:28:24 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Oct 30 11:04:26 CET 2008 - tgoettlicher(a)suse.de + +- Fixed QPainter warnings in YQBusyIndicator + +------------------------------------------------------------------- Tue Oct 28 17:14:07 CET 2008 - sh(a)suse.de - (coolo) Fixed bnc #427632: Steps in wizard not updated Modified: trunk/qt/src/YQBusyIndicator.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQBusyIndicator.cc?rev=52… ============================================================================== --- trunk/qt/src/YQBusyIndicator.cc (original) +++ trunk/qt/src/YQBusyIndicator.cc Thu Oct 30 11:28:24 2008 @@ -23,8 +23,8 @@ #include <QTimer> #include <QVBoxLayout> #include <QFrame> - #include <QPainter> +#include <math.h> #define YUILogComponent "qt-ui" #include "YUILog.h" @@ -86,24 +86,26 @@ _alive=false; } -void BusyBar::paintEvent(QPaintEvent * e) +void BusyBar::paintEvent( QPaintEvent * e ) { QPalette palette = QApplication::palette(); - QColor foreground = palette.color(QPalette::Active, QPalette::Highlight); - QColor background = palette.color(QPalette::Active, QPalette::Base); + QColor foreground = palette.color( QPalette::Active, QPalette::Highlight ); + QColor background = palette.color( QPalette::Active, QPalette::Base ); QPainter painter(this); - QLinearGradient gradient(0, 0, width()-1, 0); - gradient.setColorAt( std::min(_position - STEP_SIZE, 0.0), background ); - gradient.setColorAt(_position, foreground ); - gradient.setColorAt( std::max(_position + STEP_SIZE, 1.0), background ); - - painter.setBrush(gradient); - painter.setPen(Qt::NoPen); - painter.drawRect(rect()); + QLinearGradient gradient(0, 0, width()-1, 0 ); + + gradient.setColorAt( 0.0, background ); + gradient.setColorAt( _position, foreground ); + gradient.setColorAt( 1.0, background ); + + painter.setBrush( gradient ); + painter.setPen( Qt::NoPen ); + painter.drawRect( rect() ); + painter.end(); - QFrame::paintEvent(e); + QFrame::paintEvent( e ); } Modified: trunk/qt/src/YQBusyIndicator.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQBusyIndicator.h?rev=527… ============================================================================== --- trunk/qt/src/YQBusyIndicator.h (original) +++ trunk/qt/src/YQBusyIndicator.h Thu Oct 30 11:28:24 2008 @@ -146,7 +146,7 @@ void paintEvent(QPaintEvent *event); private: - float _position; // the position of the bar + double _position; // the position of the bar bool _rightwards; // direction the bar moves QTimer * _timer; bool _alive; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0