July 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64913 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 12:11:54 2011 New Revision: 64913 URL: http://svn.opensuse.org/viewcvs/yast?rev=64913&view=rev Log: set auto start of services correctly Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Wed Jul 20 12:11:54 2011 @@ -274,7 +274,7 @@ boolean create_ifcfg = false; string ifcfg_file = ""; - if ( Stage::initial() ) // first stage of installation - create and start FCoE VLAN interface + if ( Stage::initial() ) // first stage of installation - create and start FCoE VLAN interface { // headline of a popup: creating and starting Fibre Channel over Ethernet boolean ret = Popup::YesNoHeadline( _("Creating and starting FCoE on detected VLAN device"), @@ -431,21 +431,16 @@ void StoreServicesDialog (string id, map event) { y2milestone( "Store services dialog" ); - boolean fcoe_auto = (boolean)UI::QueryWidget( `id ("fcoe_startup_auto"), `Value ); - if ( fcoe_auto ) - { - FcoeClient::SetStartStatus( "fcoe", true ); - y2milestone( "Setting auto start of FCoE to true"); - } + boolean fcoe_auto = (boolean)UI::QueryWidget( `id ("fcoe_startup_auto"), `Value ); + FcoeClient::SetStartStatus( "fcoe", fcoe_auto ); + y2milestone ("Setting auto start of service 'fcoe' to: %1", (fcoe_auto?"true":"false") ); + boolean lldpad_auto = (boolean)UI::QueryWidget( `id ("lldpad_startup_auto"), `Value ); - if ( lldpad_auto ) - { - FcoeClient::SetStartStatus( "lldpad", true ); - y2milestone( "Setting auto start of lldpad to true"); - } + FcoeClient::SetStartStatus( "lldpad", lldpad_auto ); + y2milestone( "Setting auto start of service 'lldpad' to: %1", (lldpad_auto?"true":"false")); } void StoreInterfacesDialog (string id, map event) -- 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] r64912 - /tags/stable-2_21_6/users/
by jsuchome＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: jsuchome Date: Wed Jul 20 11:14:51 2011 New Revision: 64912 URL: http://svn.opensuse.org/viewcvs/yast?rev=64912&view=rev Log: Created tag stable-2_21_6 for users Added: tags/stable-2_21_6/users/ - copied from r64911, trunk/users/ -- 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] r64911 - in /trunk/users: VERSION package/yast2-users.changes src/UsersSimple.pm src/helps.ycp src/inst_user_first.ycp src/users_proposal.ycp src/widgets.ycp
by jsuchome＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: jsuchome Date: Wed Jul 20 11:13:45 2011 New Revision: 64911 URL: http://svn.opensuse.org/viewcvs/yast?rev=64911&view=rev Log: - remove blowfish hash from selections, make sha512 the default (fate#312321) - 2.21.6 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm trunk/users/src/helps.ycp trunk/users/src/inst_user_first.ycp trunk/users/src/users_proposal.ycp trunk/users/src/widgets.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=64911&r1=64910… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Wed Jul 20 11:13:45 2011 @@ -1 +1 @@ -2.21.5 +2.21.6 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Wed Jul 20 11:13:45 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 20 11:10:22 CEST 2011 - jsuchome(a)suse.cz + +- remove blowfish hash from selections, make sha512 the default + (fate#312321) +- 2.21.6 + +------------------------------------------------------------------- Fri Jul 15 12:45:19 CEST 2011 - jsuchome(a)suse.cz - adapted testsuite to previous change Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=649… ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Wed Jul 20 11:13:45 2011 @@ -47,7 +47,7 @@ # password encryption method -my $encryption_method = "blowfish"; +my $encryption_method = "sha512"; # mail alias for root my $root_alias = ""; Modified: trunk/users/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/helps.ycp?rev=64911&r1… ============================================================================== --- trunk/users/src/helps.ycp (original) +++ trunk/users/src/helps.ycp Wed Jul 20 11:13:45 2011 @@ -35,8 +35,6 @@ "crypt" :_("DES"), // encryption type "md5" : _("MD5"), - // encryption type - "blowfish" : _("Blowfish") ]; string method = Users::EncryptionMethod (); if (type == "ldap") Modified: trunk/users/src/inst_user_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?re… ============================================================================== --- trunk/users/src/inst_user_first.ycp (original) +++ trunk/users/src/inst_user_first.ycp Wed Jul 20 11:13:45 2011 @@ -99,8 +99,6 @@ // encryption type "md5" : _("MD5"), // encryption type - "blowfish" : _("Blowfish"), - // encryption type "sha256" : _("SHA-256"), // encryption type "sha512" : _("SHA-512"), @@ -161,12 +159,10 @@ `RadioButtonGroup (`id (`encryption_method), `VBox ( `VSpacing (0.5), // Radio button label: password encryption type - `Left (`RadioButton (`id ("des"), _("&DES (Linux default)"))), + `Left (`RadioButton (`id ("des"), _("&DES"))), // Radio button label: password encryption type `Left (`RadioButton (`id ("md5"), _("&MD5"))), // Radio button label: password encryption type - `Left (`RadioButton (`id ("blowfish"), _("&Blowfish"))), - // Radio button label: password encryption type `Left (`RadioButton (`id ("sha256"), _("SHA-&256"))), // Radio button label: password encryption type `Left (`RadioButton (`id ("sha512"), _("SHA-&512"))), @@ -205,11 +201,7 @@ ") + // Help text for password expert dialog - _(" -Blowfish is similar to MD5, but uses a different algorithm -to encrypt passwords. -"); - + _("SHA-512 is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose."); // help text for main add user dialog string main_help () { Modified: trunk/users/src/users_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_proposal.ycp?rev… ============================================================================== --- trunk/users/src/users_proposal.ycp (original) +++ trunk/users/src/users_proposal.ycp Wed Jul 20 11:13:45 2011 @@ -33,8 +33,6 @@ // encryption type "md5" : _("MD5"), // encryption type - "blowfish" : _("Blowfish"), - // encryption type "sha256" : _("SHA-256"), // encryption type "sha512" : _("SHA-512"), @@ -95,7 +93,8 @@ ahref, "/a", user["cn"]:"", user["uid"]:""); } string rest = ""; - if (UsersSimple::EncryptionMethod () != "blowfish") + // only show in summary if non-default method is used + if (UsersSimple::EncryptionMethod () != "sha512") { // summary line rest = sformat (_("Password Encryption Method: %1"), Modified: trunk/users/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/widgets.ycp?rev=64911&… ============================================================================== --- trunk/users/src/widgets.ycp (original) +++ trunk/users/src/widgets.ycp Wed Jul 20 11:13:45 2011 @@ -157,14 +157,7 @@ "); // Help text for password expert dialog 4/5 - help_text = help_text + _(" -Blowfish is similar to MD5, but uses a different algorithm -to encrypt passwords. -"); - // Help text for password expert dialog 5/5 - help_text = help_text + _(" -As a general rule of thumb, use DES if you are unsure. -"); + help_text = help_text + _("SHA-512 is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose."); UI::OpenDialog( `VBox( @@ -174,26 +167,22 @@ `HBox( `HSpacing( 2 ), // frame label - `RadioButtonGroup(`id (`methods), `Frame( _("Encryption Type"), - `VBox( + `RadioButtonGroup(`id (`methods), `Frame( _("Encryption Type"), `HBox (`HSpacing (), `VBox( `VSpacing( 0.5 ), // Radio buttons for password encryption: DES-crypt - `Left(`RadioButton(`id("des"), _("&DES (Linux default)"), + `Left(`RadioButton(`id("des"), _("&DES"), method == "des" ) ), // Radio buttons for password encryption: MD5-crypt `Left(`RadioButton(`id("md5"), _("&MD5"), method == "md5" ) ), - // Radio buttons for password encryption: blowfish-crypt - `Left(`RadioButton(`id("blowfish"), _("&Blowfish"), - method == "blowfish" ) ), // Radio buttons for password encryption: sha256 crypt `Left(`RadioButton(`id("sha256"), _("SHA-&256"), method == "sha256" ) ), // Radio buttons for password encryption: sha512 crypt `Left(`RadioButton(`id("sha512"), _("SHA-&512"), - method == "sha512" ) ) - ) - )), + method == "sha512" ) ), + `VSpacing( 0.5 ) + )))), `HSpacing( 2 ) ), `VSpacing( 0.5 ), -- 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] r64910 - /tags/stable-2_21_1/security/
by jsuchome＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: jsuchome Date: Wed Jul 20 11:05:01 2011 New Revision: 64910 URL: http://svn.opensuse.org/viewcvs/yast?rev=64910&view=rev Log: Created tag stable-2_21_1 for security Added: tags/stable-2_21_1/security/ - copied from r64909, trunk/security/ -- 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] r64909 - in /trunk/security: ./ package/ src/ testsuite/tests/
by jsuchome＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: jsuchome Date: Wed Jul 20 11:04:52 2011 New Revision: 64909 URL: http://svn.opensuse.org/viewcvs/yast?rev=64909&view=rev Log: - remove blowfish hash from selections (fate#312321) - 2.21.1 Modified: trunk/security/VERSION trunk/security/package/yast2-security.changes trunk/security/src/Security.ycp trunk/security/src/helps.ycp trunk/security/src/levels.ycp trunk/security/src/security.ycp trunk/security/src/widgets.ycp trunk/security/testsuite/tests/Level1.out trunk/security/testsuite/tests/Level2.out trunk/security/testsuite/tests/Level3.out trunk/security/testsuite/tests/Read.out trunk/security/testsuite/tests/Read.ycp trunk/security/testsuite/tests/Write.out Modified: trunk/security/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/VERSION?rev=64909&r1=64… ============================================================================== --- trunk/security/VERSION (original) +++ trunk/security/VERSION Wed Jul 20 11:04:52 2011 @@ -1 +1 @@ -2.21.0 +2.21.1 Modified: trunk/security/package/yast2-security.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/package/yast2-security.… ============================================================================== --- trunk/security/package/yast2-security.changes (original) +++ trunk/security/package/yast2-security.changes Wed Jul 20 11:04:52 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 20 11:04:03 CEST 2011 - jsuchome(a)suse.cz + +- remove blowfish hash from selections (fate#312321) +- 2.21.1 + +------------------------------------------------------------------- Tue Apr 5 11:03:35 CEST 2011 - jsuchome(a)suse.cz - added support for SHA-2 based crypto methods (fate309705) Modified: trunk/security/src/Security.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/Security.ycp?rev=64… ============================================================================== --- trunk/security/src/Security.ycp (original) +++ trunk/security/src/Security.ycp Wed Jul 20 11:04:52 2011 @@ -122,7 +122,7 @@ "GID_MIN" : "1000", "DISPLAYMANAGER_SHUTDOWN" : "all", "LASTLOG_ENAB" : "yes", - "PASSWD_ENCRYPTION" : "blowfish", + "PASSWD_ENCRYPTION" : "sha512", "GROUP_ENCRYPTION" : "md5", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", @@ -241,21 +241,11 @@ global map PasswordMaxLengths = $[ "des" : 8, "md5" : 127, - "blowfish" : 72, "sha256" : 127, "sha512" : 127 ]; /** - * List of supported password encryption ciphers - */ -list<string> Ciphers = [ - // "des", - "md5", - "blowfish", -]; - -/** * Abort function * return boolean return true if abort */ @@ -330,6 +320,7 @@ global define boolean Read() { Settings = $[]; + modified = false; /* Read security settings */ @@ -381,12 +372,19 @@ // read the password hash settings string method = PamSettings::GetDefaultValue ("CRYPT_FILES"); + // change old default to new default automatically + if (method == "blowfish") + { + y2milestone ("found 'blowfish', changing to new default 'sha512'"); + method = "sha512"; + modified = true; + } if (method == nil || method == "" || - !contains (["des","md5","blowfish","sha256","sha512"],method)) + !contains (["des","md5","sha256","sha512"],method)) { method = PamSettings::GetHashMethod (); } - if (method == "" || !contains (["des","md5","blowfish","sha256","sha512"],method)) + if (method == "" || !contains (["des","md5","sha256","sha512"],method)) method = "des"; Settings["PASSWD_ENCRYPTION"] = method; Settings["GROUP_ENCRYPTION"] = PamSettings::GetGroupHashMethod (); @@ -429,8 +427,6 @@ Settings["PERMISSION_SECURITY"] = perm; y2debug("Settings=%1", Settings); - modified = false; - // remeber the read values Settings_bak = Settings; return true; @@ -530,7 +526,7 @@ Progress::NextStage(); /* pam stuff */ - string encr = Settings["PASSWD_ENCRYPTION"]:"blowfish"; + string encr = Settings["PASSWD_ENCRYPTION"]:"sha512"; PamSettings::SetDefaultValue ("CRYPT_FILES", encr); // use cracklib? Modified: trunk/security/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/helps.ycp?rev=64909… ============================================================================== --- trunk/security/src/helps.ycp (original) +++ trunk/security/src/helps.ycp Wed Jul 20 11:04:52 2011 @@ -126,7 +126,7 @@ _("Password Encryption Method:") + /* Password dialog help 5b/8 */ -_("des, the Linux default method, works in all network environments, +_("DES, the Linux default method, works in all network environments, but it restricts you to passwords no longer than eight characters. If you need compatibility with other systems, use this method.") + @@ -135,9 +135,8 @@ distributions, but not by other systems or old software.") + /* Password dialog help 5d/8 */ -_("Blowfish is similar to MD5, but uses a different algorithm -to encrypt passwords. A lot of CPU power is needed to calculate the hash, -which makes it difficult to crack passwords with the help of a dictionary.") +_("SHA-512 is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.") + + /* Password dialog help 7/8 */ Modified: trunk/security/src/levels.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/levels.ycp?rev=6490… ============================================================================== --- trunk/security/src/levels.ycp (original) +++ trunk/security/src/levels.ycp Wed Jul 20 11:04:52 2011 @@ -66,7 +66,7 @@ "GID_MIN" : "1000", "DISPLAYMANAGER_SHUTDOWN" : "all", "LASTLOG_ENAB" : "yes", - "PASSWD_ENCRYPTION" : "blowfish", + "PASSWD_ENCRYPTION" : "sha512", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", "PASS_MIN_DAYS" : "0", @@ -108,7 +108,7 @@ "GID_MIN" : "1000", "DISPLAYMANAGER_SHUTDOWN" : "root", "LASTLOG_ENAB" : "yes", - "PASSWD_ENCRYPTION" : "blowfish", + "PASSWD_ENCRYPTION" : "sha512", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", "PASS_MIN_DAYS" : "1", @@ -150,7 +150,7 @@ "GID_MIN" : "1000", "DISPLAYMANAGER_SHUTDOWN" : "root", "LASTLOG_ENAB" : "yes", - "PASSWD_ENCRYPTION" : "blowfish", + "PASSWD_ENCRYPTION" : "sha512", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", "PASS_MIN_DAYS" : "1", Modified: trunk/security/src/security.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/security.ycp?rev=64… ============================================================================== --- trunk/security/src/security.ycp (original) +++ trunk/security/src/security.ycp Wed Jul 20 11:04:52 2011 @@ -159,7 +159,7 @@ // command line help text for 'set passwd' option "help" : _("Password encryption method"), "type" : "enum", - "typespec" : [ "des", "md5", "blowfish", "sha256", "sha512" ], + "typespec" : [ "des", "md5", "sha256", "sha512" ], ], "crack" : $[ // command line help text for 'set crack' option Modified: trunk/security/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/widgets.ycp?rev=649… ============================================================================== --- trunk/security/src/widgets.ycp (original) +++ trunk/security/src/widgets.ycp Wed Jul 20 11:04:52 2011 @@ -166,7 +166,7 @@ /* ComboBox label */ "Label" : _("P&assword Encryption Method"), /* ComboBox values */ - "Options" : [["des","DES"],["md5","MD5"],["blowfish","Blowfish"], ["sha256", "SHA-256"], ["sha512", "SHA-512"]], + "Options" : [["des","DES"],["md5","MD5"],["sha256", "SHA-256"], ["sha512", "SHA-512"]], "Value" : "des", "Notify" : "yes", ], Modified: trunk/security/testsuite/tests/Level1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Level1.… ============================================================================== --- trunk/security/testsuite/tests/Level1.out (original) +++ trunk/security/testsuite/tests/Level1.out Wed Jul 20 11:04:52 2011 @@ -78,7 +78,7 @@ Write .etc.inittab nil true Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil -Write .etc.default.passwd."CRYPT_FILES" "blowfish" true +Write .etc.default.passwd."CRYPT_FILES" "sha512" true Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib-minlen" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --pwhistory-remember" $[] Modified: trunk/security/testsuite/tests/Level2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Level2.… ============================================================================== --- trunk/security/testsuite/tests/Level2.out (original) +++ trunk/security/testsuite/tests/Level2.out Wed Jul 20 11:04:52 2011 @@ -78,7 +78,7 @@ Write .etc.inittab nil true Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil -Write .etc.default.passwd."CRYPT_FILES" "blowfish" true +Write .etc.default.passwd."CRYPT_FILES" "sha512" true Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib-minlen" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --pwhistory-remember" $[] Modified: trunk/security/testsuite/tests/Level3.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Level3.… ============================================================================== --- trunk/security/testsuite/tests/Level3.out (original) +++ trunk/security/testsuite/tests/Level3.out Wed Jul 20 11:04:52 2011 @@ -78,7 +78,7 @@ Write .etc.inittab nil true Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil -Write .etc.default.passwd."CRYPT_FILES" "blowfish" true +Write .etc.default.passwd."CRYPT_FILES" "sha512" true Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib-minlen=6" $[] Modified: trunk/security/testsuite/tests/Read.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Read.ou… ============================================================================== --- trunk/security/testsuite/tests/Read.out (original) +++ trunk/security/testsuite/tests/Read.out Wed Jul 20 11:04:52 2011 @@ -56,3 +56,4 @@ Execute .target.bash_output "/usr/sbin/pam-config -q --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -q --pwhistory" $[] Return true +Dump sha512 Modified: trunk/security/testsuite/tests/Read.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Read.yc… ============================================================================== --- trunk/security/testsuite/tests/Read.ycp (original) +++ trunk/security/testsuite/tests/Read.ycp Wed Jul 20 11:04:52 2011 @@ -14,7 +14,7 @@ { -include "testsuite.ycp"; +import "Testsuite"; import "Security"; map scr_info = $[ @@ -97,6 +97,8 @@ ] ]; -TEST(``(Security::Read()),[scr_info,$[],E],nil); +Testsuite::Test (``(Security::Read()),[scr_info,$[],E],nil); +// read blowfish, changed to sha512 +Testsuite::Dump (Security::Settings["PASSWD_ENCRYPTION"]:nil); } Modified: trunk/security/testsuite/tests/Write.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Write.o… ============================================================================== --- trunk/security/testsuite/tests/Write.out (original) +++ trunk/security/testsuite/tests/Write.out Wed Jul 20 11:04:52 2011 @@ -78,7 +78,7 @@ Write .etc.inittab nil true Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil -Write .etc.default.passwd."CRYPT_FILES" "blowfish" true +Write .etc.default.passwd."CRYPT_FILES" "sha512" true Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib-minlen" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --pwhistory-remember" $[] -- 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] r64908 - in /branches/SuSE-Code-11-SP1-Branch/packager: ./ agents/ package/ src/clients/ src/modules/
by lslezak＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: lslezak Date: Wed Jul 20 10:59:57 2011 New Revision: 64908 URL: http://svn.opensuse.org/viewcvs/yast?rev=64908&view=rev Log: backport from SP2 branch: - correctly display download progress in DownloadInAdvance libzypp mode (bnc#616708) (backported commits 62714, partly 54940) - support for download in advance mode in yast2-wagon (fate#308951) - 2.17.79.1 Added: branches/SuSE-Code-11-SP1-Branch/packager/agents/etc_zypp_conf.scr - copied unchanged from r64331, branches/SuSE-Code-11-SP2-Branch/packager/agents/etc_zypp_conf.scr Modified: branches/SuSE-Code-11-SP1-Branch/packager/ (props changed) branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Wed Jul 20 10:59:57 2011 @@ -1 +1 @@ -2.17.79 +2.17.79.1 Modified: branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am Wed Jul 20 10:59:57 2011 @@ -6,6 +6,7 @@ ag_zypp_repos scrconf_DATA = \ + etc_zypp_conf.scr \ zypp_repos.scr EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Wed Jul 20 10:59:57 2011 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Jul 20 08:58:01 UTC 2011 - lslezak(a)suse.cz + +- correctly display download progress in DownloadInAdvance + libzypp mode (bnc#616708) (backported commits 62714, + partly 54940) +- support for download in advance mode in yast2-wagon (fate#308951) +- 2.17.79.1 + +------------------------------------------------------------------- Wed Oct 27 10:14:52 CEST 2010 - mzugec(a)suse.cz - backported layout change for repository (bnc#510794) Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp Wed Jul 20 10:59:57 2011 @@ -202,7 +202,15 @@ } // returns [ int successful, list failed, list remaining ] - list commit_result = PackageInstallation::CommitPackages( current_cd_no, 0 ); + map<string,any> config = $[ "medium_nr" : current_cd_no ]; + if (PackageInstallation::DownloadInAdvance() == true) + { + config["download_mode"] = `download_in_advance; + } + + y2milestone("Commit config: %1", config); + + list commit_result = PackageInstallation::Commit(config); if (commit_result == nil || size (commit_result) == 0) { @@ -437,8 +445,13 @@ // sync package manager FIXME if (result != `abort && ! Stage::initial ()) { - y2milestone ("Calling PkgCommit (%1)", 9999); - Pkg::PkgCommit (9999); + map<string,any> config = $[]; + if (PackageInstallation::DownloadInAdvance() == true) + { + config["download_mode"] = `download_in_advance; + } + y2milestone ("Calling Pkg::Commit(%1)", config); + Pkg::Commit(config); } // BNC #443755 Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp Wed Jul 20 10:59:57 2011 @@ -21,6 +21,17 @@ import "Label"; + boolean download_in_advance = nil; + + global boolean DownloadInAdvance() + { + return download_in_advance; + } + + global void SetDownloadInAdvance(boolean enable) + { + download_in_advance = enable; + } global define any FakePackager( list<list> packages, string inst_source, boolean deleting ); @@ -81,10 +92,8 @@ * Return: [ int successful, list failed, list remaining, list srcremaining ] * **/ - global define list CommitPackages (integer media_number, - integer packages_installed) + global define list Commit(map<string,any> config) { - y2milestone("CommitPackages called: media nr. %1, packages %2", media_number, packages_installed); if ( Mode::test () ) { @@ -95,8 +104,6 @@ } // install packages from this media - y2milestone ("CommitPackages (%1,%2): Pkg::TargetGetDU() %3", - media_number, packages_installed, Pkg::TargetGetDU()); list <integer> sources = Pkg::SourceGetCurrent (false); integer source_id = sources[0]:0; @@ -111,45 +118,28 @@ y2milestone("ID of the first repository: %1", first_source); - if (media_number == 0) + if (config["medium_nr"]:0 == 0) { PackageSlideShow::SetCurrentCdNo (first_source, 1); } else { - PackageSlideShow::SetCurrentCdNo (first_source, media_number); + PackageSlideShow::SetCurrentCdNo (first_source, config["medium_nr"]:0); } PackageSlideShow::UpdateAllCdProgress (false); SlideShow::StartTimer(); - boolean do_commit = true; - if (media_number != 0) - { - list<map<string,any> > pkgs = Pkg::ResolvableProperties ("", `package, ""); - pkgs = filter (map<string,any> p, pkgs, { - return p["status"]:nil == `selected; - }); - do_commit = size (pkgs) > 0; - } - list commit_result = []; - if (do_commit) - { - // returns [ int successful, list failed, list remaining, list srcremaining ] - y2milestone ("Calling PkgCommit (%1)", media_number); - commit_result = Pkg::PkgCommit (media_number); + // returns [ int successful, list failed, list remaining, list srcremaining ] + y2milestone ("Calling Pkg::Commit (%1)", config); + commit_result = Pkg::Commit(config); - SlideShow::StopTimer(); + SlideShow::StopTimer(); - if (commit_result == nil) - { - y2error ("Bad media number %1", media_number); - return []; - } - } - else + if (commit_result == nil) { - y2milestone ("No package from media %1 left for installation", media_number); + y2error ("Commit failed: %1", Pkg::LastError()); + return []; } // see if installation of some packages failed @@ -173,6 +163,19 @@ return commit_result; }; + /** + * commitPackages marked for deletion or installation + * Return: [ int successful, list failed, list remaining, list srcremaining ] + * + **/ + global define list CommitPackages (integer media_number, + integer packages_installed) + { + // this is a backward compatible wrapper for Commit() + y2milestone ("CommitPackages (%1,%2): Pkg::TargetGetDU() %3", media_number, packages_installed, Pkg::TargetGetDU()); + return Commit($["medium_nr" : media_number]); + } + // // Fake progress bars for Mode::test () Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp Wed Jul 20 10:59:57 2011 @@ -15,6 +15,7 @@ import "Slides"; import "SlideShow"; import "String"; + import "URL"; global list<list<integer> > total_sizes_per_cd_per_src = []; // total sizes per inst-src: [ [42, 43, 44], [12, 13, 14] ] global list<list<integer> > remaining_sizes_per_cd_per_src = []; // remaining sizes @@ -27,6 +28,9 @@ global string media_type = _("Medium"); global integer total_size_installed = 0; global integer total_size_to_install = 0; + global integer total_count_to_download = 0; + global integer total_count_downloaded = 0; + global integer downloading_pct = 0; global integer min_time_per_cd = 10; // const - minimum time displayed per CD if there is something to install global integer max_time_per_cd = 7200; // const - seconds to cut off predicted time (it's bogus anyway) global integer size_column = 1; // const - column number for remaining size per CD @@ -46,7 +50,6 @@ string provide_name = ""; // currently downlaoded package name string provide_size = ""; // currently downlaoded package size - /*****************************************************************************/ /*************** Formatting functions and helpers ***************************/ /*****************************************************************************/ @@ -325,8 +328,8 @@ { if ( ! silent ) { - y2error( "SlideShow::SanityCheck(): Slide show not correctly initialized: " + - "SlideShow::InitPkgData() never called!" ); + y2error( "PackageSlideShow::SanityCheck(): Slide show not correctly initialized: " + + "PackageSlideShow::InitPkgData() never called!" ); } return false; } @@ -340,7 +343,7 @@ } else if (!silent) { - y2error(-1, "SlideShow::SanityCheck(): Illegal values for current_src (%1) or current_cd (%2)", + y2error(-1, "PackageSlideShow::SanityCheck(): Illegal values for current_src_no (%1) or current_cd_no (%2)", current_src_no, current_cd_no ); y2milestone( "total sizes: %1", total_sizes_per_cd_per_src ); } @@ -385,6 +388,50 @@ y2milestone( "SubtractPackageSize( %1 ) -> %2", pkg_size, remaining_sizes_per_cd_per_src); } + integer packages_to_download(list<list<integer> >src_mapping) + { + y2milestone("Packages to download input: %1", src_mapping); + + integer ret = 0; + + integer i = 0; + foreach(list<integer> media_mapping, src_mapping, + { + if (size(media_mapping) > 0) + { + // check if the repository is remote + string repo_url = Pkg::SourceGeneralData(i)["url"]:""; + string repo_schema = tolower(URL::Parse(repo_url)["scheme"]:""); + + if (contains(["http", "https", "ftp", "sftp"], repo_schema)) + { + integer total = 0; + foreach(integer count, media_mapping, + { + total = total + count; + } + ); + + y2milestone("Downloading %1 packages from remote repository %2", total, i); + ret = ret + total; + } + } + + i = i + 1; + } + ); + + y2milestone("Total number of packages to download: %1", ret); + + return ret; + } + + integer packages_to_install(list<list<integer> >src_mapping) + { + integer ret = ListSum(flatten(src_mapping)); + y2milestone("Total number of packages to install: %1", ret); + return ret; + } /** * Initialize internal pacakge data, such as remaining package sizes and @@ -433,10 +480,17 @@ remaining_sizes_per_cd_per_src = (list<list <integer> >) eval (total_sizes_per_cd_per_src); remaining_pkg_count_per_cd_per_src = (list<list <integer> >) eval (total_pkg_count_per_cd_per_src); total_cd_count = size( flatten( total_sizes_per_cd_per_src ) ); + total_count_to_download = packages_to_download(total_pkg_count_per_cd_per_src); + total_count_downloaded = 0; + integer total_count_to_install = packages_to_install(total_pkg_count_per_cd_per_src); + downloading_pct = 100 * total_count_to_download / (total_count_to_install + total_count_to_download); init_pkg_data_complete = true; - - y2milestone( "SlideShow::InitPkgData() done; total_sizes_per_cd_per_src: %1", total_sizes_per_cd_per_src ); - y2milestone( "SlideShow::InitPkgData(): pkg: %1", total_pkg_count_per_cd_per_src ); + + // reset the history log + SlideShow::inst_log = ""; + + y2milestone( "PackageSlideShow::InitPkgData() done; total_sizes_per_cd_per_src: %1", total_sizes_per_cd_per_src ); + y2milestone( "PackageSlideShow::InitPkgData(): pkg: %1", total_pkg_count_per_cd_per_src ); // RebuildDialog(true); } @@ -759,6 +813,27 @@ } } + // update the overall progress value (download + installation) + void UpdateTotalProgressValue() + { + integer total_progress = 0; + + if (total_count_to_download == 0) + { + // no package to download, just use the install size + total_progress = (TotalInstalledSize() * 100 / total_size_to_install); + } + else + { + // compute the total progress (use both download and installation size) + total_progress = (total_count_downloaded * downloading_pct / total_count_to_download) + + (TotalInstalledSize() * (100 - downloading_pct) / total_size_to_install); + } + + y2internal("Total package installation progress: %1%%", total_progress); + SlideShow::StageProgress( total_progress, nil ); + } + /** * Update progress widgets **/ @@ -772,7 +847,8 @@ total_size_to_install_kB = 1; } - SlideShow::StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / total_size_to_install_kB, nil /*, SlideShow::GetProgressLabel()*/ ); + // update the overall progress value (download + installation) + UpdateTotalProgressValue(); UpdateCurrentCdProgress(silent_check); @@ -912,6 +988,26 @@ SlideShow::SubProgress( pkg_percent, new_text ); } + global void DoneProvide( integer error, string reason, string name ) + { + if (error == 0) + { + total_count_downloaded = total_count_downloaded + 1; + y2milestone("Downloaded %1/%2 packages (%3%%)", total_count_downloaded, total_count_to_download, total_count_downloaded * 100 / total_count_to_download); + + // move the progress also for downloaded files + UpdateTotalProgressValue(); + + if (Pkg::CommitPolicy()["download_mode"]:`default == `download_in_advance) + { + // display download progress in DownloadInAdvance mode + // translations: progress message (part1) + SlideShow::SetGlobalProgressLabel( _("Downloading Packages...") + + // progress message (part2) + sformat(_(" (Downloaded %1 of %2 packages)"), total_count_downloaded, total_count_to_download)); + } + } + } /** * Update progress widgets for all CDs. @@ -1110,10 +1206,13 @@ */ global void SlideProvideStart (string pkg_name, integer sz, boolean remote) { - // message in the installatino log, %1 is package name, - // %2 is package size - SlideGenericProvideStart (pkg_name, sz, _("Downloading %1 (download size %2)"), - remote); + if (remote) + { + // message in the installatino log, %1 is package name, + // %2 is package size + SlideGenericProvideStart (pkg_name, sz, _("Downloading %1 (download size %2)"), + remote); + } } Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp Wed Jul 20 10:59:57 2011 @@ -80,12 +80,9 @@ global void StartProvide( string name, integer archivesize, boolean remote ) { pkg_inprogress = name; + _remote_provide = remote; - if ( remote ) - { - PackageSlideShow::SlideProvideStart (name , archivesize, remote); - _remote_provide = true; - } + PackageSlideShow::SlideProvideStart (name , archivesize, remote); } @@ -119,6 +116,7 @@ if ( _remote_provide ) { PackageSlideShow::UpdateCurrentPackageProgress( 100 ); + PackageSlideShow::DoneProvide( error, reason, name ); _remote_provide = false; } if (SlideShow::GetUserAbort()) @@ -544,8 +542,7 @@ } /** - * Install callbacks for slideshow. Should be in SlideShowCallbacks but - * that doesn't work at the moment. + * Install callbacks for slideshow. */ global void InstallSlideShowCallbacks() { Modified: branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in Wed Jul 20 10:59:57 2011 @@ -10,14 +10,14 @@ # URLRecode.pm BuildRequires: yast2 >= 2.17.79 -# "keeppackages" repo property -BuildRequires: yast2-pkg-bindings >= 2.17.27 +# Pkg::Commit() +BuildRequires: yast2-pkg-bindings >= 2.17.45.1 # Newly added RPM Requires: yast2-country-data >= 2.16.3 -# "keeppackages" repo property -Requires: yast2-pkg-bindings >= 2.17.27 +# Pkg::Commit() +Requires: yast2-pkg-bindings >= 2.17.45.1 # URLRecode.pm Requires: yast2 >= 2.17.79 -- 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] r64907 - /tags/branch-Code-11-SP1-2_17_45_1/pkg-bindings/
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 21:54:51 2011 New Revision: 64907 URL: http://svn.opensuse.org/viewcvs/yast?rev=64907&view=rev Log: Created tag branch-Code-11-SP1-2_17_45_1 for pkg-bindings Added: tags/branch-Code-11-SP1-2_17_45_1/pkg-bindings/ (props changed) - copied from r64906, branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ -- 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] r64906 - /tags/branch-Code-11-SP1-2_17_45_1/
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 21:54:48 2011 New Revision: 64906 URL: http://svn.opensuse.org/viewcvs/yast?rev=64906&view=rev Log: Created tag branch-Code-11-SP1-2_17_45_1 Added: tags/branch-Code-11-SP1-2_17_45_1/ -- 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] r64905 - /branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 21:44:50 2011 New Revision: 64905 URL: http://svn.opensuse.org/viewcvs/yast?rev=64905&view=rev Log: added missing header in *.changes Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jul 19 21:44:50 2011 @@ -1,4 +1,5 @@ ------------------------------------------------------------------- +Tue Jul 19 19:43:23 UTC 2011 - lslezak(a)suse.cz - added Pkg::Add/RemoveUpgradeRepo() and Pkg::GetUpgradeRepos() - added Pkg::CommitPolicy() -- 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] r64904 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:44:42 2011 New Revision: 64904 URL: http://svn.opensuse.org/viewcvs/yast?rev=64904&view=rev Log: - 2.17.45.1 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION Tue Jul 19 20:44:42 2011 @@ -1 +1 @@ -2.17.45 +2.17.45.1 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jul 19 20:44:42 2011 @@ -7,6 +7,7 @@ (with download_mode, dry_run... options) (FATE#308951) - added Pkg::ZConfig() function returning current libzypp config (FATE#308951) +- 2.17.45.1 ------------------------------------------------------------------- Wed Apr 21 17:22:31 UTC 2010 - lslezak(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0