March 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63690 - /trunk/gtk/README
by rpmcruz＠svn2.opensuse.org 31 Mar '11

31 Mar '11

Author: rpmcruz Date: Fri Apr 1 01:12:47 2011 New Revision: 63690 URL: http://svn.opensuse.org/viewcvs/yast?rev=63690&view=rev Log: README file dependencies list format Modified: trunk/gtk/README Modified: trunk/gtk/README URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/README?rev=63690&r1=63689&r2… ============================================================================== --- trunk/gtk/README (original) +++ trunk/gtk/README Fri Apr 1 01:12:47 2011 @@ -17,8 +17,7 @@ To make this compile you'll need the following packages installed (at a minimum): - gcc-c++, cmake, gtk2-devel, yast2-devtools, yast2-core-devel, - yast2-libyui-devel, and libzypp-devel + gcc-c++ cmake gtk2-devel yast2-devtools yast2-core-devel yast2-libyui-devel libzypp-devel They all are distributed with Suse's CDs. -- 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] r63689 - in /branches/SuSE-Linux-11_4-Branch/gtk: VERSION VERSION.cmake package/yast2-gtk.changes src/YGTreeView.cc
by rpmcruz＠svn2.opensuse.org 31 Mar '11

31 Mar '11

Author: rpmcruz Date: Fri Apr 1 01:12:02 2011 New Revision: 63689 URL: http://svn.opensuse.org/viewcvs/yast?rev=63689&view=rev Log: Sync with trunk: fix crash (bnc#677007) Modified: branches/SuSE-Linux-11_4-Branch/gtk/VERSION branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes branches/SuSE-Linux-11_4-Branch/gtk/src/YGTreeView.cc Modified: branches/SuSE-Linux-11_4-Branch/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/VE… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/VERSION (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/VERSION Fri Apr 1 01:12:02 2011 @@ -1 +1 @@ -2.21.92 +2.21.93 Modified: branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/VE… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake Fri Apr 1 01:12:02 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "92") +SET(VERSION_PATCH "93") Modified: branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/pa… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes Fri Apr 1 01:12:02 2011 @@ -1,3 +1,11 @@ +Fri Apr 01 00:09:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.93 +- backport trunk fixes: +- firewall tool crash fix (bnc#677007). +- refer to LibreOffice rather than OpenOffice.org in help text +(bnc#675486). + ------------------------------------------------------------------- Fri Feb 11 15:05:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt Modified: branches/SuSE-Linux-11_4-Branch/gtk/src/YGTreeView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/src/YGTreeView.cc (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/src/YGTreeView.cc Fri Apr 1 01:12:02 2011 @@ -388,6 +388,7 @@ void setCell (GtkTreeIter *iter, int column, const YTableCell *cell) { + if (!cell) return; std::string label (cell->label()); if (label == "X") label = YUI::app()->glyph (YUIGlyph_CheckMark); @@ -428,8 +429,10 @@ if (item) { GtkTreeIter iter; addRow (item, &iter); - for (int i = 0; i < columns(); i++) - setCell (&iter, i, item->cell(i)); + int i = 0; + for (YTableCellIterator it = item->cellsBegin(); + it != item->cellsEnd(); it++) + setCell (&iter, i++, *it); if (item->selected()) focusItem (item, true); } -- 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] r63688 - /tags/branch-Linux-11_4-2_20_2/bootloader/
by snwint＠svn2.opensuse.org 31 Mar '11

31 Mar '11

Author: snwint Date: Thu Mar 31 12:37:31 2011 New Revision: 63688 URL: http://svn.opensuse.org/viewcvs/yast?rev=63688&view=rev Log: Created tag branch-Linux-11_4-2_20_2 for bootloader Added: tags/branch-Linux-11_4-2_20_2/bootloader/ (props changed) - copied from r63687, branches/SuSE-Linux-11_4-Branch/bootloader/ -- 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] r63687 - /tags/branch-Linux-11_4-2_20_2/
by snwint＠svn2.opensuse.org 31 Mar '11

31 Mar '11

Author: snwint Date: Thu Mar 31 12:37:30 2011 New Revision: 63687 URL: http://svn.opensuse.org/viewcvs/yast?rev=63687&view=rev Log: Created tag branch-Linux-11_4-2_20_2 Added: tags/branch-Linux-11_4-2_20_2/ -- 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] r63686 - in /branches/SuSE-Linux-11_4-Branch/bootloader: MAINTAINER VERSION package/yast2-bootloader.changes src/modules/BootGRUB.ycp
by snwint＠svn2.opensuse.org 31 Mar '11

31 Mar '11

Author: snwint Date: Thu Mar 31 12:35:50 2011 New Revision: 63686 URL: http://svn.opensuse.org/viewcvs/yast?rev=63686&view=rev Log: - fix detection of other linux partitions (bnc #675224) Modified: branches/SuSE-Linux-11_4-Branch/bootloader/MAINTAINER branches/SuSE-Linux-11_4-Branch/bootloader/VERSION branches/SuSE-Linux-11_4-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Linux-11_4-Branch/bootloader/src/modules/BootGRUB.ycp Modified: branches/SuSE-Linux-11_4-Branch/bootloader/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/bootlo… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/bootloader/MAINTAINER (original) +++ branches/SuSE-Linux-11_4-Branch/bootloader/MAINTAINER Thu Mar 31 12:35:50 2011 @@ -1 +1 @@ -Jozef Uhliarik <juhliarik(a)suse.cz> +Steffen Winterfeldt <snwint(a)suse.de> Modified: branches/SuSE-Linux-11_4-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/bootlo… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/bootloader/VERSION (original) +++ branches/SuSE-Linux-11_4-Branch/bootloader/VERSION Thu Mar 31 12:35:50 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: branches/SuSE-Linux-11_4-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/bootlo… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Linux-11_4-Branch/bootloader/package/yast2-bootloader.changes Thu Mar 31 12:35:50 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 31 12:12:40 CEST 2011 - snwint(a)suse.de + +- fix detection of other linux partitions (bnc #675224) + +------------------------------------------------------------------- Tue Feb 22 11:30:20 UTC 2011 - jreidinger(a)novell.com - during probe of partitions don't try to mount encrypted one Modified: branches/SuSE-Linux-11_4-Branch/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/bootlo… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/bootloader/src/modules/BootGRUB.ycp (original) +++ branches/SuSE-Linux-11_4-Branch/bootloader/src/modules/BootGRUB.ycp Thu Mar 31 12:35:50 2011 @@ -148,8 +148,8 @@ y2milestone ("Other primaries: %1", others); // get list of all Linux Partitions on all real disks except encrypted ones ( as we don't know password and bootloader cannot boot from it directly) - list<map> other_l = (list<map>)filter( map p, Storage::GetOtherLinuxPartitions(), - ``(p["enc_type"]:`none!=`none)); + list<map> other_l = (list<map>)filter( map p, (list<map>)Storage::GetOtherLinuxPartitions(), + ``(p["enc_type"]:`none==`none)); y2milestone ("Other linux parts: %1", other_l); list<string> destroyed_partitions -- 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] r63685 - /trunk/core/liby2util-r/src/include/y2util/Makefile.am
by aschnell＠svn2.opensuse.org 31 Mar '11

31 Mar '11

Author: aschnell Date: Thu Mar 31 11:49:31 2011 New Revision: 63685 URL: http://svn.opensuse.org/viewcvs/yast?rev=63685&view=rev Log: - pack Process.h Modified: trunk/core/liby2util-r/src/include/y2util/Makefile.am Modified: trunk/core/liby2util-r/src/include/y2util/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/include/y2u… ============================================================================== --- trunk/core/liby2util-r/src/include/y2util/Makefile.am (original) +++ trunk/core/liby2util-r/src/include/y2util/Makefile.am Thu Mar 31 11:49:31 2011 @@ -12,6 +12,7 @@ MemUsage.h \ PathInfo.h \ Pathname.h \ + Process.h \ Rep.h \ RepDef.h \ TreeItem.h \ -- 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] r63684 - in /branches/SuSE-Code-11-SP2-Branch/core: VERSION libycp/src/YCPBuiltinString.cc libycp/src/y2crypt.cc libycp/src/y2crypt.h package/yast2-core.changes
by aschnell＠svn2.opensuse.org 31 Mar '11

31 Mar '11

Author: aschnell Date: Thu Mar 31 11:28:22 2011 New Revision: 63684 URL: http://svn.opensuse.org/viewcvs/yast?rev=63684&view=rev Log: - added sha256 and sha516 password encryption (fate #309705) Modified: branches/SuSE-Code-11-SP2-Branch/core/VERSION branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinString.cc branches/SuSE-Code-11-SP2-Branch/core/libycp/src/y2crypt.cc branches/SuSE-Code-11-SP2-Branch/core/libycp/src/y2crypt.h branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes Modified: branches/SuSE-Code-11-SP2-Branch/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/core/VERSION Thu Mar 31 11:28:22 2011 @@ -1 +1 @@ -2.17.35 +2.17.36 Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinString.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinString.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinString.cc Thu Mar 31 11:28:22 2011 @@ -1337,6 +1337,68 @@ static YCPValue +s_cryptsha256(const YCPString& original) +{ + /** + * @builtin cryptsha256 + * @short Encrypts a string with sha256 + * @description + * Encrypts the string <tt>UNENCRYPTED</tt> using sha256 + * password encryption. The password is not truncated. + * + * @param string UNENCRYPTED + * @return string + * @usage cryptsha256 ("readable") -> "$5$keev8D8I$kZdbw1WYM7XJtn4cpl1S3QtoKXnxIIFVSqwadMAGLE3" + */ + + if (original.isNull ()) + return YCPNull (); + + string unencrypted = original->value(); + string encrypted; + + if (crypt_pass (unencrypted, SHA256, &encrypted)) + return YCPString (encrypted); + else + { + ycp2error ("Encryption using sha256 failed"); + return YCPNull (); + } +} + + +static YCPValue +s_cryptsha512(const YCPString& original) +{ + /** + * @builtin cryptsha512 + * @short Encrypts a string with sha512 + * @description + * Encrypts the string <tt>UNENCRYPTED</tt> using sha512 + * password encryption. The password is not truncated. + * + * @param string UNENCRYPTED + * @return string + * @usage cryptsha512 ("readable") -> "$6$QskPAFTK$R40N1UI047Bg.nD96ZYSGnx71mgbBgb.UEtKuR8bGGxuzYgXjCTxKIQmqXrgftBzA20m2P9ayrUKQQ2pnWzm70" + */ + + if (original.isNull ()) + return YCPNull (); + + string unencrypted = original->value(); + string encrypted; + + if (crypt_pass (unencrypted, SHA512, &encrypted)) + return YCPString (encrypted); + else + { + ycp2error ("Encryption using sha512 failed"); + return YCPNull (); + } +} + + +static YCPValue s_dgettext (const YCPString& domain, const YCPString& text) { /** @@ -1520,6 +1582,8 @@ { "cryptmd5", "string (string)", (void *)s_cryptmd5 }, { "cryptbigcrypt", "string (string)", (void *)s_cryptbigcrypt }, { "cryptblowfish", "string (string)", (void *)s_cryptblowfish }, + { "cryptsha256", "string (string)", (void *)s_cryptsha256 }, + { "cryptsha512", "string (string)", (void *)s_cryptsha512 }, { "regexpmatch", "boolean (string, string)", (void *)s_regexpmatch }, { "regexppos", "list<integer> (string, string)", (void *)s_regexppos }, { "regexpsub", "string (string, string, string)", (void *)s_regexpsub }, Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/y2crypt.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/y2crypt.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/y2crypt.cc Thu Mar 31 11:28:22 2011 @@ -151,6 +151,28 @@ free (salt); break; + case SHA256: + salt = make_crypt_salt ("$5$", 0); + if (!salt) + { + y2error ("Cannot create salt for sha256 crypt"); + return false; + } + newencrypted = xcrypt_r (unencrypted.c_str (), salt, &output); + free (salt); + break; + + case SHA512: + salt = make_crypt_salt ("$6$", 0); + if (!salt) + { + y2error ("Cannot create salt for sha512 crypt"); + return false; + } + newencrypted = xcrypt_r (unencrypted.c_str (), salt, &output); + free (salt); + break; + default: y2error ("Don't know crypt type %d", use_crypt); return false; Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/y2crypt.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/y2crypt.h (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/y2crypt.h Thu Mar 31 11:28:22 2011 @@ -14,7 +14,7 @@ using std::string; -enum crypt_t { CRYPT, MD5, BIGCRYPT, BLOWFISH }; +enum crypt_t { CRYPT, MD5, BIGCRYPT, BLOWFISH, SHA256, SHA512 }; bool crypt_pass (string unencrypted, crypt_t use_crypt, string* encrypted); Modified: branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes Thu Mar 31 11:28:22 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 31 11:20:29 CEST 2011 - aschnell(a)suse.de + +- added sha256 and sha516 password encryption (fate #309705) +- 2.17.36 + +------------------------------------------------------------------- Thu Mar 11 15:36:27 CET 2010 - mvidner(a)suse.cz - Fixed the regexpsub algorithm not to loop endlessly -- 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] r63683 - /branches/SuSE-Code-11-SP2-Branch/core/
by aschnell＠svn2.opensuse.org 31 Mar '11

31 Mar '11

Author: aschnell Date: Thu Mar 31 11:19:30 2011 New Revision: 63683 URL: http://svn.opensuse.org/viewcvs/yast?rev=63683&view=rev Log: - branch core from SP1 for SP2 Added: branches/SuSE-Code-11-SP2-Branch/core/ (props changed) - copied from r63682, branches/SuSE-Code-11-SP1-Branch/core/ -- 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] r63682 - in /trunk/core: VERSION libycp/src/YCPBuiltinString.cc libycp/src/y2crypt.cc libycp/src/y2crypt.h package/yast2-core.changes
by aschnell＠svn2.opensuse.org 31 Mar '11

31 Mar '11

Author: aschnell Date: Thu Mar 31 11:13:05 2011 New Revision: 63682 URL: http://svn.opensuse.org/viewcvs/yast?rev=63682&view=rev Log: - added sha256 and sha516 password encryption (fate #309705) Modified: trunk/core/VERSION trunk/core/libycp/src/YCPBuiltinString.cc trunk/core/libycp/src/y2crypt.cc trunk/core/libycp/src/y2crypt.h trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=63682&r1=63681&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Thu Mar 31 11:13:05 2011 @@ -1 +1 @@ -2.20.0 +2.21.0 Modified: trunk/core/libycp/src/YCPBuiltinString.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinString… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinString.cc (original) +++ trunk/core/libycp/src/YCPBuiltinString.cc Thu Mar 31 11:13:05 2011 @@ -1356,6 +1356,68 @@ static YCPValue +s_cryptsha256(const YCPString& original) +{ + /** + * @builtin cryptsha256 + * @short Encrypts a string with sha256 + * @description + * Encrypts the string <tt>UNENCRYPTED</tt> using sha256 + * password encryption. The password is not truncated. + * + * @param string UNENCRYPTED + * @return string + * @usage cryptsha256 ("readable") -> "$5$keev8D8I$kZdbw1WYM7XJtn4cpl1S3QtoKXnxIIFVSqwadMAGLE3" + */ + + if (original.isNull ()) + return YCPNull (); + + string unencrypted = original->value(); + string encrypted; + + if (crypt_pass (unencrypted, SHA256, &encrypted)) + return YCPString (encrypted); + else + { + ycp2error ("Encryption using sha256 failed"); + return YCPNull (); + } +} + + +static YCPValue +s_cryptsha512(const YCPString& original) +{ + /** + * @builtin cryptsha512 + * @short Encrypts a string with sha512 + * @description + * Encrypts the string <tt>UNENCRYPTED</tt> using sha512 + * password encryption. The password is not truncated. + * + * @param string UNENCRYPTED + * @return string + * @usage cryptsha512 ("readable") -> "$6$QskPAFTK$R40N1UI047Bg.nD96ZYSGnx71mgbBgb.UEtKuR8bGGxuzYgXjCTxKIQmqXrgftBzA20m2P9ayrUKQQ2pnWzm70" + */ + + if (original.isNull ()) + return YCPNull (); + + string unencrypted = original->value(); + string encrypted; + + if (crypt_pass (unencrypted, SHA512, &encrypted)) + return YCPString (encrypted); + else + { + ycp2error ("Encryption using sha512 failed"); + return YCPNull (); + } +} + + +static YCPValue s_dgettext (const YCPString& domain, const YCPString& text) { /** @@ -1542,6 +1604,8 @@ { "cryptmd5", "string (string)", (void *)s_cryptmd5, ETC }, { "cryptbigcrypt", "string (string)", (void *)s_cryptbigcrypt, ETC }, { "cryptblowfish", "string (string)", (void *)s_cryptblowfish, ETC }, + { "cryptsha256", "string (string)", (void *)s_cryptsha256, ETC }, + { "cryptsha512", "string (string)", (void *)s_cryptsha512, ETC }, { "regexpmatch", "boolean (string, string)", (void *)s_regexpmatch, ETC }, { "regexppos", "list<integer> (string, string)", (void *)s_regexppos, ETC }, { "regexpsub", "string (string, string, string)", (void *)s_regexpsub, ETC }, Modified: trunk/core/libycp/src/y2crypt.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/y2crypt.cc?rev=6… ============================================================================== --- trunk/core/libycp/src/y2crypt.cc (original) +++ trunk/core/libycp/src/y2crypt.cc Thu Mar 31 11:13:05 2011 @@ -151,6 +151,28 @@ free (salt); break; + case SHA256: + salt = make_crypt_salt ("$5$", 0); + if (!salt) + { + y2error ("Cannot create salt for sha256 crypt"); + return false; + } + newencrypted = xcrypt_r (unencrypted.c_str (), salt, &output); + free (salt); + break; + + case SHA512: + salt = make_crypt_salt ("$6$", 0); + if (!salt) + { + y2error ("Cannot create salt for sha512 crypt"); + return false; + } + newencrypted = xcrypt_r (unencrypted.c_str (), salt, &output); + free (salt); + break; + default: y2error ("Don't know crypt type %d", use_crypt); return false; Modified: trunk/core/libycp/src/y2crypt.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/y2crypt.h?rev=63… ============================================================================== --- trunk/core/libycp/src/y2crypt.h (original) +++ trunk/core/libycp/src/y2crypt.h Thu Mar 31 11:13:05 2011 @@ -14,7 +14,7 @@ using std::string; -enum crypt_t { CRYPT, MD5, BIGCRYPT, BLOWFISH }; +enum crypt_t { CRYPT, MD5, BIGCRYPT, BLOWFISH, SHA256, SHA512 }; bool crypt_pass (string unencrypted, crypt_t use_crypt, string* encrypted); Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Thu Mar 31 11:13:05 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 31 11:11:36 CEST 2011 - aschnell(a)suse.de + +- added sha256 and sha516 password encryption (fate #309705) +- 2.21.0 + +------------------------------------------------------------------- Tue Mar 15 15:51:48 UTC 2011 - coolo(a)novell.com - fix build with gcc 4.6 -- 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] r63681 - in /trunk/samba-server: package/yast2-samba-server.changes src/helps.ycp
by jsuchome＠svn2.opensuse.org 30 Mar '11

30 Mar '11

Author: jsuchome Date: Wed Mar 30 11:10:49 2011 New Revision: 63681 URL: http://svn.opensuse.org/viewcvs/yast?rev=63681&view=rev Log: - adapted help text in first dialog (bnc#579992) Modified: trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/helps.ycp Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba… ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Wed Mar 30 11:10:49 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Mar 30 11:09:37 CEST 2011 - jsuchome(a)suse.cz + +- adapted help text in first dialog (bnc#579992) + +------------------------------------------------------------------- Mon Mar 28 13:48:28 CEST 2011 - jsuchome(a)suse.cz - removed obsolete On value from 'ldap ssl' option Modified: trunk/samba-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/helps.ycp?rev=6… ============================================================================== --- trunk/samba-server/src/helps.ycp (original) +++ trunk/samba-server/src/helps.ycp Wed Mar 30 11:10:49 2011 @@ -41,7 +41,7 @@ /* Samba selecting workgroup or domain 1/1 - Installation step 1 */ "inst_step1" : _("<big>Workgroup or Domain Selection</big> -All available workgroups or domains found on your network are listed here. Select one of them or type your own new name and click Next. +Select existing name of workgroup or domain or type your own new name and click Next. "), -- 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] r63680 - /trunk/samba-server/src/helps.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '11

29 Mar '11

Author: jsuchome Date: Tue Mar 29 15:54:11 2011 New Revision: 63680 URL: http://svn.opensuse.org/viewcvs/yast?rev=63680&view=rev Log: text fixed (from taroth) Modified: trunk/samba-server/src/helps.ycp Modified: trunk/samba-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/helps.ycp?rev=6… ============================================================================== --- trunk/samba-server/src/helps.ycp (original) +++ trunk/samba-server/src/helps.ycp Tue Mar 29 15:54:11 2011 @@ -260,30 +260,30 @@ // help for LDAP Settings dialog "samba_ldap_setting_auth_widget" : _("<big>LDAP Settings</big> -Here, it is possible to determine the LDAP server to use for authentication. +Here, determine the LDAP server to use for authentication. -Setting LDAP Password Back-End allows storing user information in LDAP tree specified by URL. With LDAP Idmap Back-End, store SID/uid/gid mapping tables in LDAP. +Setting LDAP Password Back-End allows storing user information in the LDAP tree specified by the URL. With LDAP Idmap Back-End, store SID/uid/gid mapping tables in LDAP. -In Authentication section, set the credentials for LDAP server, including full Administrator DN. +In the Authentication section, set the credentials for the LDAP server, including full Administrator DN. -Search Base DN is the LDAP suffix appended to Samba specific LDAP objects. +Search Base DN is the LDAP suffix appended to Samba-specific LDAP objects. To test the connection to your LDAP server, click Test Connection. To set expert LDAP settings or use default values, click Advanced Settings."), // help for SambaLDAPSettingsSuffixesWidget - "samba_ldap_setting_suffixes_widget" : _("User Suffix specifies where users are added to LDAP tree. The value is pre-pended to the value of Search Base DN. Similarly, Group Suffix specifies the place for groups, Machine Suffix for machines and Idmap Suffix for idmap mappings."), + "samba_ldap_setting_suffixes_widget" : _("User Suffix specifies where users are added to the LDAP tree. The value is pre-pended to the value of Search Base DN. Similarly, Group Suffix specifies the place for groups, Machine Suffix for machines and Idmap Suffix for idmap mappings."), // help for SambaLDAPSettingsTimeoutsWidget - "samba_ldap_settings_timeouts_widget" : _("Replication Sleep is the amount of milliseconds Samba will wait after writing to LDAP server, so LDAP replicas can catch up. + "samba_ldap_settings_timeouts_widget" : _("Replication Sleep is the amount of milliseconds Samba will wait after writing to the LDAP server, so LDAP replicas can catch up. Time-Out specifies the timeout for LDAP operations (in seconds)."), // help for SambaLDAPSettingsSecurityWidget "samba_ldap_settings_security_widget" : _("Define whether to use SSL for LDAP connection with Use SSL or TLS."), // help for SambaLDAPSettingsMiscWidget - "samba_ldap_settings_misc_widget" : _("Delete DN specifies if delete operation deletes the complete LDAP entry or only the Samba specific attributes. -With Synchronize Passwords, define possible synchronization of LDAP password with the NT and LM hashes. See <tt>smb.conf</tt> manual page for details."), + "samba_ldap_settings_misc_widget" : _("Delete DN specifies if the delete operation deletes the complete LDAP entry or only the Samba-specific attributes. +With Synchronize Passwords, define possible synchronization of the LDAP password with the NT and LM hashes. See the <tt>smb.conf</tt> manual page for details."), ]; map <string,string> warnings = $[ -- 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] r63679 - /trunk/samba-server/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '11

29 Mar '11

Author: jsuchome Date: Tue Mar 29 15:53:56 2011 New Revision: 63679 URL: http://svn.opensuse.org/viewcvs/yast?rev=63679&view=rev Log: correct widget Modified: trunk/samba-server/src/dialogs.ycp Modified: trunk/samba-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/dialogs.ycp?rev… ============================================================================== --- trunk/samba-server/src/dialogs.ycp (original) +++ trunk/samba-server/src/dialogs.ycp Tue Mar 29 15:53:56 2011 @@ -166,7 +166,7 @@ Wizard::SetContents( caption, contents, help, true, true ); - UI::ChangeWidget(`id(`pdc), `Enabled, !has_pdc); + UI::ChangeWidget(`id("PDC"), `Enabled, !has_pdc); any ret = nil; while(true) { -- 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] r63678 - in /branches/SuSE-Code-11-SP1-Branch/restore: package/yast2-restore.changes src/Restore.ycp
by locilka＠svn2.opensuse.org 29 Mar '11

29 Mar '11

Author: locilka Date: Tue Mar 29 09:31:08 2011 New Revision: 63678 URL: http://svn.opensuse.org/viewcvs/yast?rev=63678&view=rev Log: Mounting NFS shares with 'nolock' (bnc #682064) Modified: branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes branches/SuSE-Code-11-SP1-Branch/restore/src/Restore.ycp Modified: branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/resto… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes Tue Mar 29 09:31:08 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Mar 29 09:28:49 CEST 2011 - locilka(a)suse.cz + +- Mounting NFS shares with 'nolock' (bnc #682064) + +------------------------------------------------------------------- Mon Dec 14 11:12:13 CET 2009 - locilka(a)suse.cz - Fixed restoration of unavailable packages (bnc #553400). Modified: branches/SuSE-Code-11-SP1-Branch/restore/src/Restore.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/resto… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/restore/src/Restore.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/restore/src/Restore.ycp Tue Mar 29 09:31:08 2011 @@ -410,7 +410,8 @@ y2milestone("file: %1", f); y2milestone("mpoint: %1", mpoint); - boolean result = (boolean) SCR::Execute(.target.mount, [server + ":" + dir, mpoint], "-t nfs -o ro"); + // BNC #682064: also 'nolock' is required + boolean result = (boolean) SCR::Execute(.target.mount, [server + ":" + dir, mpoint], "-t nfs -o ro,nolock"); return $[ "mounted" : result, "mountpoint" : mpoint , "file" : f, "server_dir" : dir ]; } -- 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] r63677 - in /trunk/restore: package/yast2-restore.changes src/Restore.ycp
by locilka＠svn2.opensuse.org 29 Mar '11

29 Mar '11

Author: locilka Date: Tue Mar 29 09:30:55 2011 New Revision: 63677 URL: http://svn.opensuse.org/viewcvs/yast?rev=63677&view=rev Log: Mounting NFS shares with 'nolock' (bnc #682064) Modified: trunk/restore/package/yast2-restore.changes trunk/restore/src/Restore.ycp Modified: trunk/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/package/yast2-restore.ch… ============================================================================== --- trunk/restore/package/yast2-restore.changes (original) +++ trunk/restore/package/yast2-restore.changes Tue Mar 29 09:30:55 2011 @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 29 09:28:49 CEST 2011 - locilka(a)suse.cz + +- Mounting NFS shares with 'nolock' (bnc #682064) + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/restore/src/Restore.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/Restore.ycp?rev=6367… ============================================================================== --- trunk/restore/src/Restore.ycp (original) +++ trunk/restore/src/Restore.ycp Tue Mar 29 09:30:55 2011 @@ -410,7 +410,8 @@ y2milestone("file: %1", f); y2milestone("mpoint: %1", mpoint); - boolean result = (boolean) SCR::Execute(.target.mount, [server + ":" + dir, mpoint], "-t nfs -o ro"); + // BNC #682064: also 'nolock' is required + boolean result = (boolean) SCR::Execute(.target.mount, [server + ":" + dir, mpoint], "-t nfs -o ro,nolock"); return $[ "mounted" : result, "mountpoint" : mpoint , "file" : f, "server_dir" : dir ]; } -- 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] r63676 - /tags/stable-2_21_0/samba-server/
by jsuchome＠svn2.opensuse.org 28 Mar '11

28 Mar '11

Author: jsuchome Date: Mon Mar 28 13:53:34 2011 New Revision: 63676 URL: http://svn.opensuse.org/viewcvs/yast?rev=63676&view=rev Log: Created tag stable-2_21_0 for samba-server Added: tags/stable-2_21_0/samba-server/ - copied from r63675, trunk/samba-server/ -- 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] r63675 - in /trunk/samba-server: VERSION package/yast2-samba-server.changes src/helps.ycp src/ldap-widget.ycp
by jsuchome＠svn2.opensuse.org 28 Mar '11

28 Mar '11

Author: jsuchome Date: Mon Mar 28 13:53:06 2011 New Revision: 63675 URL: http://svn.opensuse.org/viewcvs/yast?rev=63675&view=rev Log: - removed obsolete On value from 'ldap ssl' option - added help texts for LDAP settings (bnc#531523) - 2.21.0 Modified: trunk/samba-server/VERSION trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/helps.ycp trunk/samba-server/src/ldap-widget.ycp Modified: trunk/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=63675&r… ============================================================================== --- trunk/samba-server/VERSION (original) +++ trunk/samba-server/VERSION Mon Mar 28 13:53:06 2011 @@ -1 +1 @@ -2.20.2 +2.21.0 Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba… ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Mon Mar 28 13:53:06 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Mar 28 13:48:28 CEST 2011 - jsuchome(a)suse.cz + +- removed obsolete On value from 'ldap ssl' option +- added help texts for LDAP settings (bnc#531523) +- 2.21.0 + +------------------------------------------------------------------- Mon Jan 10 10:56:57 CET 2011 - locilka(a)suse.cz - Added 'samba-client' firewall service to list of services Modified: trunk/samba-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/helps.ycp?rev=6… ============================================================================== --- trunk/samba-server/src/helps.ycp (original) +++ trunk/samba-server/src/helps.ycp Mon Mar 28 13:53:06 2011 @@ -255,8 +255,35 @@ _("Inherit ACLS can be used to ensure that if default ACLs exist on parent directories, they are always honored when creating a subdirectory. -") +"), + + // help for LDAP Settings dialog + "samba_ldap_setting_auth_widget" : _("<big>LDAP Settings</big> +Here, it is possible to determine the LDAP server to use for authentication. + + +Setting LDAP Password Back-End allows storing user information in LDAP tree specified by URL. With LDAP Idmap Back-End, store SID/uid/gid mapping tables in LDAP. + +In Authentication section, set the credentials for LDAP server, including full Administrator DN. + +Search Base DN is the LDAP suffix appended to Samba specific LDAP objects. + +To test the connection to your LDAP server, click Test Connection. To set expert LDAP settings or use default values, click Advanced Settings."), + + // help for SambaLDAPSettingsSuffixesWidget + "samba_ldap_setting_suffixes_widget" : _("User Suffix specifies where users are added to LDAP tree. The value is pre-pended to the value of Search Base DN. Similarly, Group Suffix specifies the place for groups, Machine Suffix for machines and Idmap Suffix for idmap mappings."), + + // help for SambaLDAPSettingsTimeoutsWidget + "samba_ldap_settings_timeouts_widget" : _("Replication Sleep is the amount of milliseconds Samba will wait after writing to LDAP server, so LDAP replicas can catch up. +Time-Out specifies the timeout for LDAP operations (in seconds)."), + + // help for SambaLDAPSettingsSecurityWidget + "samba_ldap_settings_security_widget" : _("Define whether to use SSL for LDAP connection with Use SSL or TLS."), + + // help for SambaLDAPSettingsMiscWidget + "samba_ldap_settings_misc_widget" : _("Delete DN specifies if delete operation deletes the complete LDAP entry or only the Samba specific attributes. +With Synchronize Passwords, define possible synchronization of LDAP password with the NT and LM hashes. See <tt>smb.conf</tt> manual page for details."), ]; map <string,string> warnings = $[ Modified: trunk/samba-server/src/ldap-widget.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/ldap-widget.ycp… ============================================================================== --- trunk/samba-server/src/ldap-widget.ycp (original) +++ trunk/samba-server/src/ldap-widget.ycp Mon Mar 28 13:53:06 2011 @@ -437,9 +437,7 @@ // translators: combo box value list<list> ldap_ssl_values = [ ["Off", _("No")], // translators: combo box value -["Start_tls", _("TLS")], -// translators: combo box value -["On", _("SSL")] ]; +["Start_tls", _("TLS")], ]; void SambaLDAPSettingsSecurityWidgetInit(string key) ``{ init_ldap_combo("ldap ssl", ldap_ssl_values); -- 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] r63674 - in /trunk/network: package/yast2-network.changes src/remote/dialogs.ycp
by kmachalkova＠svn2.opensuse.org 25 Mar '11

25 Mar '11

Author: kmachalkova Date: Fri Mar 25 11:57:18 2011 New Revision: 63674 URL: http://svn.opensuse.org/viewcvs/yast?rev=63674&view=rev Log: VNC service renamed again -- make opening/closing firewall ports possible (bnc#682608) Modified: trunk/network/package/yast2-network.changes trunk/network/src/remote/dialogs.ycp 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 Fri Mar 25 11:57:18 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 25 11:48:54 CET 2011 - kmachalkova(a)suse.cz + +- Remote administration (VNC): corresponding service name is + xorg-x11-Xvnc - this makes opening/closing ports in fw work again + (bnc#682608) + +------------------------------------------------------------------- Tue Feb 15 15:19:47 CET 2011 - mvidner(a)suse.cz - DSL: linux-atm-lib.rpm was renamed to libatm1.rpm (bnc#668586) Modified: trunk/network/src/remote/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/remote/dialogs.ycp?r… ============================================================================== --- trunk/network/src/remote/dialogs.ycp (original) +++ trunk/network/src/remote/dialogs.ycp Fri Mar 25 11:57:18 2011 @@ -40,7 +40,8 @@ map<string,any> firewall_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget ($[ //Service vnc renamed to service:xorg-x11-server (#431971) - "services" : [ "service:xorg-x11-server" ], + //... and renamed again to xorg-x11-Xvnc (bnc#682608) + "services" : [ "service:xorg-x11-Xvnc" ], "display_details" : true, ]); term firewall_layout = firewall_widget["custom_widget"]:`VBox (); -- 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] r63673 - /tags/stable-2_21_1/installation/
by jsuchome＠svn2.opensuse.org 25 Mar '11

25 Mar '11

Author: jsuchome Date: Fri Mar 25 10:47:40 2011 New Revision: 63673 URL: http://svn.opensuse.org/viewcvs/yast?rev=63673&view=rev Log: Created tag stable-2_21_1 for installation Added: tags/stable-2_21_1/installation/ - copied from r63672, trunk/installation/ -- 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] r63672 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_finish.ycp
by jsuchome＠svn2.opensuse.org 25 Mar '11

25 Mar '11

Author: jsuchome Date: Fri Mar 25 10:47:31 2011 New Revision: 63672 URL: http://svn.opensuse.org/viewcvs/yast?rev=63672&view=rev Log: - show the 'before-reboot' message in RichText, so possible command can be copy-pasted (bnc#383519) - 2.21.1 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_finish.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=63672&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri Mar 25 10:47:31 2011 @@ -1 +1 @@ -2.21.0 +2.21.1 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Mar 25 10:47:31 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 25 10:26:44 CET 2011 - jsuchome(a)suse.cz + +- show the 'before-reboot' message in RichText, so possible command + can be copy-pasted (bnc#383519) +- 2.21.1 + +------------------------------------------------------------------- Thu Mar 24 16:14:02 CET 2011 - jsuchome(a)suse.cz - do not start automatic configuration for autoYaST (bnc#679435) Modified: trunk/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_fi… ============================================================================== --- trunk/installation/src/clients/inst_finish.ycp (original) +++ trunk/installation/src/clients/inst_finish.ycp Fri Mar 25 10:47:31 2011 @@ -423,7 +423,7 @@ } else Report::DisplayMessages (true, 10); - Report::Message (Misc::boot_msg); + Report::LongMessage (Misc::boot_msg); Misc::boot_msg = ""; } -- 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] r63671 - /branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in
by dmacvicar＠svn2.opensuse.org 24 Mar '11

24 Mar '11

Author: dmacvicar Date: Thu Mar 24 18:03:49 2011 New Revision: 63671 URL: http://svn.opensuse.org/viewcvs/yast?rev=63671&view=rev Log: we include the URL module@ Modified: branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in Modified: branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/packager/y… ============================================================================== --- branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in (original) +++ branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in Thu Mar 24 18:03:49 2011 @@ -8,7 +8,7 @@ BuildRequires: yast2-transfer # URLRecode.pm -BuildRequires: yast2 >= 2.17.79 +#BuildRequires: yast2 >= 2.17.79 # "keeppackages" repo property BuildRequires: yast2-pkg-bindings >= 2.17.27 -- 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] r63670 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-btrfs-dialogs.ycp storage/src/include/ep-btrfs-lib.ycp storage/src/include/ep-btrfs.ycp storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 24 Mar '11

24 Mar '11

Author: fehr Date: Thu Mar 24 17:28:28 2011 New Revision: 63670 URL: http://svn.opensuse.org/viewcvs/yast?rev=63670&view=rev Log: add code to add/remove volumes to/from BTRFS volume Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-btrfs-dialogs.ycp trunk/storage/storage/src/include/ep-btrfs-lib.ycp trunk/storage/storage/src/include/ep-btrfs.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Mar 24 17:28:28 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 24 17:27:26 CET 2011 - fehr(a)suse.de + +- add code to add/remove volumes to/from BTRFS volume + +------------------------------------------------------------------- Thu Mar 3 18:05:04 CET 2011 - fehr(a)suse.de - integrate handling of BTRFS volumes Modified: trunk/storage/storage/src/include/ep-btrfs-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-b… ============================================================================== --- trunk/storage/storage/src/include/ep-btrfs-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-btrfs-dialogs.ycp Thu Mar 24 17:28:28 2011 @@ -11,20 +11,20 @@ boolean DlgEditBtrfsVolume(map<string, any> &data) - { + { y2milestone( "DlgEditBtrfsVolume %1", data ); string device = data["device"]:"error"; map<string, any> aliases = $[ "FormatMount" : ``(MiniWorkflowStepFormatMount(data)), "Password" : ``(MiniWorkflowStepPassword(data)) - ]; + ]; map<string, any> sequence = $[ "FormatMount" : $[ `next : "Password", `finish : `finish ], "Password" : $[ `finish : `finish ] - ]; + ]; // dialog title string title = sformat(_("Edit Btrfs %1"), data["uuid"]:""); @@ -32,5 +32,181 @@ symbol widget = MiniWorkflow::Run(title, StorageIcons::lvm_lv_icon, aliases, sequence, "FormatMount"); return widget == `finish; - } + } + + ///////////////////////////////////////////////////////////////// + // Get all volumes, we can probably use as volumes in an BTRFS + // Add needed information: disksize + define list<map> GetPossibleVols( map<string,map> targetMap ) + { + list<map> ret = []; + + ////////////////////////////////////////////////////////////////////// + // add the devicename i.e /dev/hda1 or /dev/system/usr to partition list + + targetMap = mapmap( string dev, map devmap, targetMap, + { + list partitions = maplist( map part, devmap["partitions"]:[], + { + part["maindev"] = dev; + return( part ); + }); + return( $[ dev: add(devmap, "partitions", partitions) ] ); + }); + + //////////////////////////////////////////////////////////// + // Look for all partitions: + // no mountpoint + // id 0x83 + + list types_no = [ `btrfs, `extended ]; + list types_ok = [ `sw_raid, `dm, `lvm ]; + list fsids = [ Partitions::fsid_native, Partitions::fsid_lvm, Partitions::fsid_raid ]; + list allowed_enc_types = [ `none ]; + + foreach( string dev, map devmap, targetMap, + ``{ + y2milestone( "GetPossibleVols parts:%1", devmap["partitions"]:[] ); + list<map> parts = + filter( map part, devmap["partitions"]:[], + ``( size(part["mount"]:"")==0 && + !contains( types_no, part["type"]:`primary ) && + contains(allowed_enc_types, part["enc_type"]:`none) && + (!Storage::IsUsedBy(part) || part["used_by_type"]:`UB_NONE==`UB_BTRFS) && + (contains( types_ok, part["type"]:`primary ) || + contains( fsids, part["fsid"]:0 )))); + y2milestone( "GetPossibleVols filter:%1", parts ); + if( devmap["used_by_type"]:`UB_NONE!=`UB_NONE ) + { + parts = []; + y2milestone( "GetPossibleVols no parts, disk used by %1 %2", + devmap["used_by_type"]:`UB_NONE, devmap["used_by_device"]:"" ); + } + /* currently disallow usage of whole disk devices as parts of BTRFS volumes + if( size(devmap["partitions"]:[])==0 && + Storage::IsPartType(devmap["type"]:`CT_UNKNOWN) && + (!Storage::IsUsedBy(devmap) || devmap["used_by_type"]:`UB_NONE==`UB_LVM)) + { + map p = $[ "device":dev, "maindev":dev, + "size_k":devmap["size_k"]:0 ]; + if( devmap["used_by_type"]:`UB_NONE != `UB_NONE ) + { + p["used_by_type"] = devmap["used_by_type"]:`UB_NONE; + p["used_by_device"] = devmap["used_by_device"]:""; + } + parts = [ p ]; + } + */ + ret = (list<map>)merge( ret, parts ); + }); + y2milestone( "GetPossibleVols ret %1", ret ); + return( ret ); + } + + boolean CheckNumberOfDevicesForVolume(integer num) + { + if (num < 1) + { + // error popup + Popup::Error(sformat(_("Select at least one device."))); + UI::SetFocus(`id(`unselected)); + return false; + } + else + { + return true; + } + } + + string MiniWorkflowStepResizeVolumeHelptext() + { + // helptext + string helptext = _("Change the devices that are used by the BTRFS volume."); + + return helptext; + } + + + symbol MiniWorkflowStepResizeVolume(map<string, any> &data) + { + y2milestone("MiniWorkflowStepResizeVolume data:%1", data); + + string vgname = data["name"]:"error"; + list<string> pvs_new = []; + + list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, `encrypted, `type ]); + + map<string, map> target_map = Storage::GetTargetMap(); + list<map> unused_pvs = filter(map pv, GetPossibleVols(target_map), { return !Storage::IsUsedBy(pv); }); + list<map> used_pvs = filter(map pv, GetPossibleVols(target_map), { return pv["used_by_device"]:"" == data["uuid"]:""; }); + + term contents = `VBox(); + + contents = add(contents, DevicesSelectionBox::Create(unused_pvs, used_pvs, fields, nil, + _("Unused Devices:"), + _("Selected Devices:"))); + + MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepResizeVolumeHelptext()); + MiniWorkflow::SetLastStep(true); + + symbol widget = nil; + + repeat + { + widget = MiniWorkflow::UserInput(); + DevicesSelectionBox::Handle(widget); + + switch (widget) + { + case `next: + { + pvs_new = maplist(map pv, DevicesSelectionBox::GetSelectedDevices(), { + return pv["device"]:""; + }); + + if (!CheckNumberOfDevicesForVolume(size(pvs_new))) + widget = `again; + + // TODO: overall size check + } + break; + } + } + until (widget == `abort || widget == `back || widget == `next); + + if (widget == `next) + { + data["devices_new"] = pvs_new; + + widget = `finish; + } + + y2milestone("MiniWorkflowStepResizeVg data:%1 ret:%2", data, widget); + + return widget; + } + + + boolean DlgResizeBtrfsVolume(map<string, any> &data, symbol() Commit) + { + map<string, any> aliases = $[ + "TheOne" : ``(MiniWorkflowStepResizeVolume(data)), + "Commit" : ``(Commit()) + ]; + + map<string, any> sequence = $[ + "TheOne" : $[ `finish : "Commit" ], + "Commit" : $[ `finish : `finish ] + ]; + + y2milestone( "data:%1", data ); + + // dialog title + string title = sformat(_("Resize Btrfs Volume %1"), data["uuid"]:"error"); + + symbol widget = MiniWorkflow::Run(title, StorageIcons::lvm_icon, aliases, sequence, "TheOne"); + + return widget == `finish; + } + } Modified: trunk/storage/storage/src/include/ep-btrfs-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-b… ============================================================================== --- trunk/storage/storage/src/include/ep-btrfs-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-btrfs-lib.ycp Thu Mar 24 17:28:28 2011 @@ -10,88 +10,140 @@ textdomain "storage"; - void EpEditBtrfsDevice(string device) +void EpEditBtrfsDevice(string device) { - if (device == nil) + if (device == nil) { - // error popup - Popup::Error(_("No BTRFS device selected.")); - return; + // error popup + Popup::Error(_("No BTRFS device selected.")); + return; } - map<string, map> target_map = Storage::GetTargetMap(); - map<string, any> data = Storage::GetPartition(target_map, device); - y2milestone( "EpEditBtrfsDevice device:%1 data:%2", device, data ); + map<string, map> target_map = Storage::GetTargetMap(); + map<string, any> data = Storage::GetPartition(target_map, device); + y2milestone( "EpEditBtrfsDevice device:%1 data:%2", device, data ); - if (Storage::IsUsedBy(data)) + if (Storage::IsUsedBy(data)) { - // error popup - Popup::Error(sformat(_("The Btrfs %1 is in use. It cannot be + // error popup + Popup::Error(sformat(_("The Btrfs %1 is in use. It cannot be edited. To edit %1, make sure it is not used."), data["uuid"]:"")); - return; + return; } - if (DlgEditBtrfsVolume(data)) + if (DlgEditBtrfsVolume(data)) { - Storage::ChangeVolumeProperties(data); + Storage::ChangeVolumeProperties(data); - UpdateMainStatus(); - UpdateNavigationTree(nil); - TreePanel::Create(); - UpdateTableFocus(device); + UpdateMainStatus(); + UpdateNavigationTree(nil); + TreePanel::Create(); + UpdateTableFocus(device); } } - void EpDeleteBtrfsDevice(string device) +void EpDeleteBtrfsDevice(string device) { - if (device == nil) + if (device == nil) { - // error popup - Popup::Error(_("No BTRFS device selected.")); - return; + // error popup + Popup::Error(_("No BTRFS device selected.")); + return; } - map<string, map> target_map = Storage::GetTargetMap(); - map<string, any> data = Storage::GetPartition(target_map, device); - y2milestone( "EpDeletBtrfsDevice device:%1 data:%2", device, data ); + map<string, map> target_map = Storage::GetTargetMap(); + map<string, any> data = Storage::GetPartition(target_map, device); + y2milestone( "EpDeletBtrfsDevice device:%1 data:%2", device, data ); - if (!Storage::CanDelete(data, target_map["/dev/btrfs"]:$[], true)) - return; + if (!Storage::CanDelete(data, target_map["/dev/btrfs"]:$[], true)) + return; - if (EpDeleteDevice(device)) - { - any new_focus = nil; - if (UI::QueryWidget(`tree, `CurrentItem) == device) - new_focus = `md; - UpdateMainStatus(); - UpdateNavigationTree(new_focus); - TreePanel::Create(); + if (EpDeleteDevice(device)) + { + any new_focus = nil; + if (UI::QueryWidget(`tree, `CurrentItem) == device) + new_focus = `md; + UpdateMainStatus(); + UpdateNavigationTree(new_focus); + TreePanel::Create(); } + } + +boolean AddVols(string device, list<string> devs) + { + boolean ret = true; + + foreach(string dev, devs, { + Storage::SetPartitionId(dev, Partitions::fsid_native); + Storage::SetPartitionFormat(dev, false, `none); + if (!Storage::ExtendBtrfsVolume(device, dev)) + ret = false; + }); + return ret; + } + + +boolean RemoveVols(string device, list<string> devs) + { + boolean ret = true; + foreach(string dev, devs, { + Storage::UnchangePartitionId(dev); + if (!Storage::ReduceBtrfsVolume(device, dev)) + ret = false; + }); + return ret; } - void EpResizeBtrfsDevice(string device) +void EpResizeBtrfsDevice(string device) { - if (device == nil) + if (device == nil) { - // error popup - Popup::Error(_("No BTRFS device selected.")); - return; + // error popup + Popup::Error(_("No BTRFS device selected.")); + return; } - map<string, map> target_map = Storage::GetTargetMap(); - map<string, any> data = Storage::GetPartition(target_map, device); - y2milestone( "EpResizetrfsDevice device:%1 data:%2", device, data ); + map<string, map> target_map = Storage::GetTargetMap(); + map<string, any> data = Storage::GetPartition(target_map, device); + y2milestone( "EpResizeBtrfsDevice device:%1 data:%2", device, data ); - if (true/*EpDeleteDevice(device)*/) + symbol Commit() + { + list<string> devices_old = MergeDevices(data); + list<string> devices_new = data["devices_new"]:[]; + + list<string> devices_added = AddedToList(devices_old, devices_new); + list<string> devices_removed = RemovedFromList(devices_old, devices_new); + + if(size(devices_added)>0) + y2milestone("EpResizeBtrfsDevice device_added:%1", devices_added ); + if(size(devices_removed)>0) + y2milestone("EpResizeBtrfsDevice device_removed:%1", devices_removed ); + + if( size(devices_added) > 0 || size(devices_removed) > 0) { - any new_focus = nil; - if (UI::QueryWidget(`tree, `CurrentItem) == device) - new_focus = `btrfs; - UpdateMainStatus(); - UpdateNavigationTree(new_focus); - TreePanel::Create(); + AddVols(device, devices_added); + + if (!RemoveVols(device, devices_removed)) + { + // error popup + Popup::Error(_("Failed to remove some physical devices.")); + + // TODO: update data + + return `back; + } + } + + return `finish; } + if( DlgResizeBtrfsVolume(data, Commit)) + { + UpdateMainStatus(); + UpdateNavigationTree(nil); + TreePanel::Create(); + } } } Modified: trunk/storage/storage/src/include/ep-btrfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-b… ============================================================================== --- trunk/storage/storage/src/include/ep-btrfs.ycp (original) +++ trunk/storage/storage/src/include/ep-btrfs.ycp Thu Mar 24 17:28:28 2011 @@ -16,7 +16,8 @@ void EpContextMenuBtrfs(string device) { symbol widget = ContextMenu::Simple([ `item(`id(`edit), _("Edit")), - `item(`id(`delete), _("Delete"))]); + `item(`id(`delete), _("Delete")), + `item(`id(`resize), _("Resize"))]); switch (widget) { @@ -26,6 +27,9 @@ case `delete: EpDeleteBtrfsDevice(device); break; + case `resize: + EpResizeBtrfsDevice(device); + break; } } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Mar 24 17:28:28 2011 @@ -1694,10 +1694,16 @@ p["fstype"] = Partitions::btrfs_name; list<string> ls = splitstring(LibStorage::BtrfsInfo::swig_devices_get(info), "\n"); p["devices"] = ls; + ls = splitstring( LibStorage::BtrfsInfo::swig_devices_add_get(info), "\n" ); + if( size(ls)>0 ) + c["devices_add"] = ls; + ls = splitstring( LibStorage::BtrfsInfo::swig_devices_rem_get(info), "\n" ); + if( size(ls)>0 ) + c["devices_rem"] = ls; ls = splitstring(LibStorage::BtrfsInfo::swig_subvol_get(info), "\n"); if( !isempty(ls) ) p["subvol"] = maplist( string s, ls, ``{ map m = $[ "name" : s ]; return( m ); }); - if( size(p["devices"]:[])>1 ) + if( size(p["devices"]:[])+size(p["devices_add"]:[])>1 ) p["device"] = "UUID=" + p["uuid"]:""; c["partitions"] = add( c["partitions"]:[], p ); }); @@ -2754,6 +2760,30 @@ return( ret==0 ); } +global boolean ExtendBtrfsVolume( string uuid, string device ) + { + y2milestone( "ExtendBtrfsVolume uuid:%1 device:%2", uuid, device ); + integer ret = 0; + list<string> devs = [ device ]; + ret = LibStorage::StorageInterface::extendBtrfsVolume( sint, uuid, devs ); + if( ret<0 ) + y2error( "ExtendBtrfsVolume sint ret:%1", ret ); + UpdateTargetMap(); + return( ret==0 ); + } + +global boolean ReduceBtrfsVolume( string uuid, string device ) + { + y2milestone( "ReduceBtrfsVolume uuid:%1 device:%2", uuid, device ); + integer ret = 0; + list<string> devs = [ device ]; + ret = LibStorage::StorageInterface::shrinkBtrfsVolume( sint, uuid, devs ); + if( ret<0 ) + y2error( "ReduceBtrfsVolume sint ret:%1", ret ); + UpdateTargetMap(); + return( ret==0 ); + } + global boolean AddNfsVolume( string nfsdev, string opts, integer sz, string mp, boolean nfs4 ) { y2milestone("AddNfsVolume dev:%1 opts:%2 size:%3 mp:%4 nfs4:%5", nfsdev, opts, sz, mp, nfs4); -- 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] r63669 - /branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in
by dmacvicar＠svn2.opensuse.org 24 Mar '11

24 Mar '11

Author: dmacvicar Date: Thu Mar 24 16:41:11 2011 New Revision: 63669 URL: http://svn.opensuse.org/viewcvs/yast?rev=63669&view=rev Log: remove dependencies Modified: branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in Modified: branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/packager/y… ============================================================================== --- branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in (original) +++ branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in Thu Mar 24 16:41:11 2011 @@ -2,7 +2,7 @@ @HEADER@ -BuildRequires: gcc-c++ libxcrypt-devel yast2-country-data yast2-xml perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-slp +BuildRequires: gcc-c++ libxcrypt-devel yast2-xml perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-slp # HTTP.ycp BuildRequires: yast2-transfer @@ -13,8 +13,14 @@ # "keeppackages" repo property BuildRequires: yast2-pkg-bindings >= 2.17.27 +%if 0%{?suse_version} >= 1100 # Newly added RPM Requires: yast2-country-data >= 2.16.3 +BuildRequires: yast2-country-data +%else +Requires: yast2-country +BuildRequires: yast2-country +%endif # "keeppackages" repo property Requires: yast2-pkg-bindings >= 2.17.27 -- 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] r63668 - /branches/tmp/dmacvicar/zc10/packager/
by dmacvicar＠svn2.opensuse.org 24 Mar '11

24 Mar '11

Author: dmacvicar Date: Thu Mar 24 16:39:26 2011 New Revision: 63668 URL: http://svn.opensuse.org/viewcvs/yast?rev=63668&view=rev Log: (empty) Added: branches/tmp/dmacvicar/zc10/packager/ (props changed) - copied from r63667, branches/SuSE-Code-11-SP1-Branch/packager/ -- 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] r63667 - /branches/tmp/dmacvicar/zc10/packager/
by dmacvicar＠svn2.opensuse.org 24 Mar '11

24 Mar '11

Author: dmacvicar Date: Thu Mar 24 16:38:42 2011 New Revision: 63667 URL: http://svn.opensuse.org/viewcvs/yast?rev=63667&view=rev Log: (empty) Removed: branches/tmp/dmacvicar/zc10/packager/ -- 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] r63666 - /branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in
by dmacvicar＠svn2.opensuse.org 24 Mar '11

24 Mar '11

Author: dmacvicar Date: Thu Mar 24 16:32:29 2011 New Revision: 63666 URL: http://svn.opensuse.org/viewcvs/yast?rev=63666&view=rev Log: remove dependencies Modified: branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in Modified: branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/packager/y… ============================================================================== --- branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in (original) +++ branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in Thu Mar 24 16:32:29 2011 @@ -2,7 +2,7 @@ @HEADER@ -BuildRequires: gcc-c++ libxcrypt-devel yast2-country-data yast2-xml perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-slp +BuildRequires: gcc-c++ libxcrypt-devel yast2-xml perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-slp # HTTP.ycp BuildRequires: yast2-transfer @@ -16,8 +16,10 @@ %if 0%{?suse_version} >= 1100 # Newly added RPM Requires: yast2-country-data >= 2.16.3 +BuildRequires: yast2-country-data %else Requires: yast2-country +BuildRequires: yast2-country %endif # "keeppackages" repo property -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0